Updated

diff --git a/slides/xsl/.cvsignore b/slides/xsl/.cvsignore
deleted file mode 100644 (file)
index ef85d3c..0000000
--- a/slides/xsl/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-titlepage-fo-plain.xsl
-param.xsl
-param.xml
-param.html

diff --git a/slides/xsl/Makefile b/slides/xsl/Makefile
index f419674e71f8b933ddc3bb2b370f414bfddf80cc..08210cb1c0c2c541dc326ba5e4337e9b99b180d1 100644 (file)
--- a/slides/xsl/Makefile
+++ b/slides/xsl/Makefile
@@ -1,32 +1,11 @@
 include ../../cvstools/Makefile.incl
-TTLTEMPLATEXSL=/sourceforge/docbook/xsl/template/titlepage.xsl
 
-PARAMPROF=.param.profiled
-PARAMSTRIP=.param.stripped
+.PHONY: fo xhtml
 
-all: titlepage-fo-plain.xsl param.xsl
+all: fo xhtml
 
-%.xsl: %.xml
-       $(XSLT) $< $(TTLTEMPLATEXSL) $@
+fo:
+       $(MAKE) -C fo
 
-xml: param.xml
-
-html: param.html
-
-param.html: param.xml
-       $(XSLT) $< ../../xsl/docsrc/lrefentry.xsl $@
-
-param.xml: param.xweb
-       $(XSLT) $< ../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html
-       $(XSLT) $(PARAMPROF) ../../xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
-       $(XSLT) $(PARAMSTRIP) ../../litprog/wdocbook.xsl $@
-       $(RM) $(PARAMPROF) $(PARAMSTRIP)
-
-param.xsl: param.xweb
-       $(XSLT) $< ../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html
-       $(XSLT) $(PARAMPROF) ../../xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
-       $(XSLT) $(PARAMSTRIP) ../../litprog/xtangle.xsl $@
-       $(RM) $(PARAMPROF) $(PARAMSTRIP)
-
-clean:
-       rm -f titlepage-fo-plain.xsl
+xhtml:
+       $(MAKE) -C xhtml

diff --git a/slides/xsl/fo-plain.xsl b/slides/xsl/fo-plain.xsl
deleted file mode 100644 (file)
index 4e51f6f..0000000
--- a/slides/xsl/fo-plain.xsl
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<xsl:import href="/sourceforge/docbook/xsl/fo/docbook.xsl"/>
-<xsl:include href="titlepage-fo-plain.xsl"/>
-
-<xsl:param name="local.l10n.xml" select="document('')"/>
-<i18n xmlns="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en">
-    <l:context name="title">
-      <l:template name="slides" text="%t"/>
-      <l:template name="foilgroup" text="%t"/>
-      <l:template name="foil" text="%t"/>
-    </l:context>
-  </l:l10n>
-</i18n>
-
-<xsl:param name="page.orientation" select="'landscape'"/>
-
-<xsl:param name="slide.title.font.family" select="'Helvetica'"/>
-<xsl:param name="slide.font.family" select="'Helvetica'"/>
-
-<xsl:param name="body.font.master" select="18"/>
-
-<xsl:attribute-set name="slides.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$slide.font.family"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="foilgroup.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$slide.font.family"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="foil.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$slide.font.family"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-size">18pt</xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="speakernote.properties">
-  <xsl:attribute name="font-family">Times Roman</xsl:attribute>
-  <xsl:attribute name="font-style">italic</xsl:attribute>
-  <xsl:attribute name="font-size">12pt</xsl:attribute>
-  <xsl:attribute name="font-weight">normal</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="slides.titlepage.recto.style"/>
-<xsl:attribute-set name="slides.titlepage.verso.style"/>
-<xsl:attribute-set name="foilgroup.titlepage.recto.style"/>
-<xsl:attribute-set name="foilgroup.titlepage.verso.style"/>
-<xsl:attribute-set name="foil.titlepage.recto.style"/>
-<xsl:attribute-set name="foil.titlepage.verso.style"/>
-
-<!-- ============================================================ -->
-
-<xsl:template name="user.pagemasters">
-  <fo:page-sequence-master master-name="twoside1-with-titlepage">
-    <fo:repeatable-page-master-alternatives>
-      <fo:conditional-page-master-reference master-reference="titlepage-first"
-                                            page-position="first"/>
-      <fo:conditional-page-master-reference master-reference="blank"
-                                            blank-or-not-blank="blank"/>
-      <fo:conditional-page-master-reference master-reference="body-odd"
-                                            odd-or-even="odd"/>
-      <fo:conditional-page-master-reference master-reference="body-even"
-                                            odd-or-even="even"/>
-    </fo:repeatable-page-master-alternatives>
-  </fo:page-sequence-master>
-
-  <fo:page-sequence-master master-name="oneside1-with-titlepage">
-    <fo:repeatable-page-master-alternatives>
-      <fo:conditional-page-master-reference master-reference="titlepage-first"
-                                            page-position="first"/>
-      <fo:conditional-page-master-reference master-reference="body-odd"/>
-    </fo:repeatable-page-master-alternatives>
-  </fo:page-sequence-master>
-
-  <fo:page-sequence-master master-name="titlepage1">
-    <fo:repeatable-page-master-alternatives>
-      <fo:conditional-page-master-reference master-reference="titlepage-first"
-                                            page-position="first"/>
-      <fo:conditional-page-master-reference master-reference="body-odd"/>
-    </fo:repeatable-page-master-alternatives>
-  </fo:page-sequence-master>
-</xsl:template>
-
-<xsl:template match="*" mode="running.head.mode">
-  <xsl:param name="master-reference" select="'unknown'"/>
-  <!-- use the foilgroup title if there is one -->
-  <fo:static-content flow-name="xsl-region-before">
-    <fo:block text-align="center" font-size="14pt">
-      <xsl:apply-templates select="ancestor-or-self::foilgroup"
-                           mode="object.title.markup"/>
-    </fo:block>
-  </fo:static-content>
-</xsl:template>
-
-<xsl:template match="*" mode="running.foot.mode">
-  <xsl:param name="master-reference" select="'unknown'"/>
-  <xsl:variable name="foot">
-    <fo:page-number/>
-  </xsl:variable>
-  <!-- by default, the page number -->
-  <xsl:choose>
-    <xsl:when test="$master-reference='titlepage1'"></xsl:when>
-    <xsl:when test="$master-reference='oneside1-with-titlepage'">
-      <fo:static-content flow-name="xsl-region-after">
-        <fo:block text-align="center" font-size="14pt">
-          <xsl:copy-of select="$foot"/>
-        </fo:block>
-      </fo:static-content>
-    </xsl:when>
-    <xsl:when test="$master-reference='twoside1-with-titlepage'">
-      <fo:static-content flow-name="xsl-region-after-left">
-        <fo:block text-align="left" font-size="14pt">
-          <xsl:copy-of select="$foot"/>
-        </fo:block>
-      </fo:static-content>
-      <fo:static-content flow-name="xsl-region-after-right">
-        <fo:block text-align="right" font-size="14pt">
-          <xsl:copy-of select="$foot"/>
-        </fo:block>
-      </fo:static-content>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unexpected master-reference (</xsl:text>
-        <xsl:value-of select="$master-reference"/>
-        <xsl:text>) in running.foot.mode for </xsl:text>
-        <xsl:value-of select="name(.)"/>
-        <xsl:text>. No footer generated.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="select.user.pagemaster">
-  <xsl:param name="element"/>
-  <xsl:param name="pageclass"/>
-  <xsl:param name="default-pagemaster"/>
-
-  <xsl:choose>
-    <xsl:when test="$element = 'slides'">titlepage1</xsl:when>
-    <xsl:when test="$double.sided != 0">twoside1-with-titlepage</xsl:when>
-    <xsl:otherwise>oneside1-with-titlepage</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="slides">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <fo:flow flow-name="xsl-region-body"
-             xsl:use-attribute-sets="slides.properties">
-      <xsl:call-template name="slides.titlepage"/>
-      <xsl:apply-templates select="speakernotes"/>
-      <xsl:apply-templates select="foil"/>
-    </fo:flow>
-  </fo:page-sequence>
-  <xsl:apply-templates select="foilgroup"/>
-</xsl:template>
-
-<xsl:template match="slidesinfo"/>
-
-<xsl:template match="slides" mode="title.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(slidesinfo/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="foilgroup">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <fo:flow flow-name="xsl-region-body"
-             xsl:use-attribute-sets="foilgroup.properties">
-      <xsl:call-template name="foilgroup.titlepage"/>
-      <xsl:apply-templates select="speakernotes"/>
-      <xsl:apply-templates select="foil"/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="foilgroup/title">
-  <!-- suppress -->
-</xsl:template>
-
-<xsl:template match="slides/foilgroup/title" mode="titlepage.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="title" mode="foilgroup.titlepage.recto.mode">
-  <fo:block>
-    <fo:inline color="white">.</fo:inline>
-    <fo:block space-before="2in">
-      <xsl:apply-templates select="." mode="titlepage.mode"/>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="foilgroupinfo"/>
-
-<!-- ============================================================ -->
-
-<xsl:template match="foil">
-  <fo:block break-before="page"
-            xsl:use-attribute-sets="foil.properties">
-    <xsl:call-template name="foil.titlepage"/>
-
-    <fo:block xsl:use-attribute-sets="foil.properties">
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="foilinfo"/>
-<xsl:template match="foil/title"/>
-<xsl:template match="foil/titleabbrev"/>
-
-<!-- ============================================================ -->
-
-<xsl:template match="speakernotes">
-  <fo:block xsl:use-attribute-sets="speakernote.properties">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-</xsl:stylesheet>

diff --git a/slides/xsl/titlepage-fo-plain.xml b/slides/xsl/titlepage-fo-plain.xml
deleted file mode 100644 (file)
index d40d8c8..0000000
--- a/slides/xsl/titlepage-fo-plain.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE t:templates [
-<!ENTITY hsize0 "10pt">
-<!ENTITY hsize1 "12pt">
-<!ENTITY hsize2 "14.4pt">
-<!ENTITY hsize3 "17.28pt">
-<!ENTITY hsize4 "20.736pt">
-<!ENTITY hsize5 "24.8832pt">
-<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
-<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
-<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
-<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
-<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
-<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
-]>
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-            xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:fo="http://www.w3.org/1999/XSL/Format"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ==================================================================== -->
-
-<t:titlepage element="slides" wrapper="fo:block">
-  <t:titlepage-content side="recto">
-      <title predicate="[1]"
-            named-template="component.title"
-            param:node="ancestor-or-self::slides[1]"
-            fo:text-align="center"
-            fo:space-after="1em"
-            fo:keep-with-next="always"
-            fo:font-size="24pt"
-            fo:font-weight="bold"
-            fo:font-family="{$slide.title.font.family}"/>
-
-    <subtitle predicate="[1]"
-             fo:text-align="center"
-             fo:font-family="{$slide.title.font.family}"/>
-
-    <corpauthor fo:font-size="&hsize4;"
-               fo:text-align="center"
-               fo:space-after="1em"/>
-    <authorgroup/>
-    <author fo:font-size="&hsize4;"
-           fo:text-align="center"
-           fo:space-after="1em"/>
-
-    <pubdate fo:font-size="&hsize3;"
-            fo:text-align="center"
-            fo:space-after="1em"/>
-
-    <confgroup fo:font-size="&hsize3;"
-              fo:text-align="center"
-              fo:space-after="1em"/>
-
-    <releaseinfo fo:font-size="&hsize3;"
-                fo:text-align="center"
-                fo:space-after="1em"/>
-
-    <copyright fo:font-size="&hsize3;"
-              fo:text-align="center"/>
-
-    <revision fo:text-align="center"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage element="foilgroup" wrapper="fo:block">
-  <t:titlepage-content side="recto">
-    <title predicate="[1]"
-          fo:font-size="24pt"
-          fo:text-align="center"
-          fo:font-weight="bold"
-          fo:font-family="{$slide.title.font.family}"/>
-    <subtitle predicate="[1]"
-             fo:font-family="{$slide.title.font.family}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage element="foil" wrapper="fo:block">
-  <t:titlepage-content side="recto">
-    <title predicate="[1]"
-          fo:font-size="22pt"
-          fo:font-weight="bold"
-          fo:text-align="center"
-          fo:font-family="{$slide.title.font.family}"/>
-    <subtitle predicate="[1]"
-             fo:font-family="{$slide.title.font.family}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-</t:templates>