Author: manuel
Date: 2007-04-01 03:41:56 -0600 (Sun, 01 Apr 2007)
New Revision: 7999
Modified:
branches/new-xsl/docbook-xsl-snapshot/VERSION
branches/new-xsl/docbook-xsl-snapshot/common/entities.ent
branches/new-xsl/docbook-xsl-snapshot/fo/division.xsl
branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
Log:
Updated docbook-xsl-snapshot to r6768
Modified: branches/new-xsl/docbook-xsl-snapshot/VERSION
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/VERSION 2007-04-01 05:41:19 UTC
(rev 7998)
+++ branches/new-xsl/docbook-xsl-snapshot/VERSION 2007-04-01 09:41:56 UTC
(rev 7999)
@@ -17,7 +17,7 @@
<fm:project>
<fm:Project>DocBook</fm:Project>
<fm:Branch>XSL Stylesheets</fm:Branch>
- <fm:Version>snapshot_6761</fm:Version>
+ <fm:Version>snapshot_6768</fm:Version>
<!--
<fm:License>MIT/X Consortium License</fm:License>
-->
Modified: branches/new-xsl/docbook-xsl-snapshot/common/entities.ent
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/common/entities.ent 2007-04-01
05:41:19 UTC (rev 7998)
+++ branches/new-xsl/docbook-xsl-snapshot/common/entities.ent 2007-04-01
09:41:56 UTC (rev 7999)
@@ -54,17 +54,17 @@
(string-length($role) = 0 and string-length($type) = 0))'>
<!ENTITY setup-language-variable '
-<xsl:variable name="language">
+<xsl:variable name="language" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:call-template name="l10n.language"/>
</xsl:variable>
-<xsl:variable name="lowercase">
+<xsl:variable name="lowercase"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:call-template name="gentext">
<xsl:with-param name="key">normalize.sort.input</xsl:with-param>
</xsl:call-template>
</xsl:variable>
-<xsl:variable name="uppercase">
+<xsl:variable name="uppercase"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:call-template name="gentext">
<xsl:with-param name="key">normalize.sort.output</xsl:with-param>
</xsl:call-template>
Modified: branches/new-xsl/docbook-xsl-snapshot/fo/division.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/fo/division.xsl 2007-04-01
05:41:19 UTC (rev 7998)
+++ branches/new-xsl/docbook-xsl-snapshot/fo/division.xsl 2007-04-01
09:41:56 UTC (rev 7999)
@@ -242,77 +242,49 @@
</xsl:call-template>
</xsl:variable>
- <xsl:variable name="lot-master-reference">
- <xsl:call-template name="select.pagemaster">
- <xsl:with-param name="pageclass" select="'lot'"/>
- </xsl:call-template>
- </xsl:variable>
+ <xsl:call-template name="front.cover"/>
<xsl:if test="$preamble">
- <fo:page-sequence hyphenate="{$hyphenate}"
- master-reference="{$titlepage-master-reference}">
- <xsl:attribute name="language">
- <xsl:call-template name="l10n.language"/>
- </xsl:attribute>
- <xsl:attribute name="format">
- <xsl:call-template name="page.number.format">
- <xsl:with-param name="master-reference"
- select="$titlepage-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="initial-page-number">
- <xsl:call-template name="initial.page.number">
- <xsl:with-param name="master-reference"
- select="$titlepage-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="force-page-count">
- <xsl:call-template name="force.page.count">
- <xsl:with-param name="master-reference"
- select="$titlepage-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="hyphenation-character">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'hyphenation-character'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-push-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-push-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-remain-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-remain-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-reference"
select="$titlepage-master-reference"/>
- </xsl:apply-templates>
-
- <xsl:apply-templates select="." mode="running.foot.mode">
- <xsl:with-param name="master-reference"
select="$titlepage-master-reference"/>
- </xsl:apply-templates>
-
- <fo:flow flow-name="xsl-region-body">
- <xsl:call-template name="set.flow.properties">
- <xsl:with-param name="element" select="local-name(.)"/>
- <xsl:with-param name="master-reference"
- select="$titlepage-master-reference"/>
- </xsl:call-template>
-
+ <xsl:call-template name="page.sequence">
+ <xsl:with-param name="master-reference"
+ select="$titlepage-master-reference"/>
+ <xsl:with-param name="content">
<fo:block id="{$id}">
<xsl:call-template name="book.titlepage"/>
</fo:block>
- </fo:flow>
- </fo:page-sequence>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
<xsl:apply-templates select="dedication" mode="dedication"/>
+ <xsl:call-template name="make.book.tocs"/>
+
+ <xsl:apply-templates select="$content"/>
+
+ <xsl:call-template name="back.cover"/>
+
+</xsl:template>
+
+<xsl:template match="book/bookinfo"></xsl:template>
+<xsl:template match="book/info"></xsl:template>
+<xsl:template match="book/title"></xsl:template>
+<xsl:template match="book/subtitle"></xsl:template>
+<xsl:template match="book/titleabbrev"></xsl:template>
+
+<!-- Placeholder templates -->
+<xsl:template name="front.cover"/>
+<xsl:template name="back.cover"/>
+
+<!-- ================================================================= -->
+<xsl:template name="make.book.tocs">
+
+ <xsl:variable name="lot-master-reference">
+ <xsl:call-template name="select.pagemaster">
+ <xsl:with-param name="pageclass" select="'lot'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
<xsl:variable name="toc.params">
<xsl:call-template name="find.path.params">
<xsl:with-param name="table" select="normalize-space($generate.toc)"/>
@@ -320,423 +292,99 @@
</xsl:variable>
<xsl:if test="contains($toc.params, 'toc')">
- <fo:page-sequence hyphenate="{$hyphenate}"
- master-reference="{$lot-master-reference}">
- <xsl:attribute name="language">
- <xsl:call-template name="l10n.language"/>
- </xsl:attribute>
- <xsl:attribute name="format">
- <xsl:call-template name="page.number.format">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="initial-page-number">
- <xsl:call-template name="initial.page.number">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="force-page-count">
- <xsl:call-template name="force.page.count">
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="hyphenation-character">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'hyphenation-character'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-push-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-push-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-remain-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-remain-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'TableofContents'"/>
- </xsl:apply-templates>
-
- <xsl:apply-templates select="." mode="running.foot.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'TableofContents'"/>
- </xsl:apply-templates>
-
- <fo:flow flow-name="xsl-region-body">
- <xsl:call-template name="set.flow.properties">
- <xsl:with-param name="element" select="local-name(.)"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
-
+ <xsl:call-template name="page.sequence">
+ <xsl:with-param name="master-reference"
+ select="$lot-master-reference"/>
+ <xsl:with-param name="element" select="'toc'"/>
+ <xsl:with-param name="gentext-key" select="'TableofContents'"/>
+ <xsl:with-param name="content">
<xsl:call-template name="division.toc">
<xsl:with-param name="toc.title.p"
select="contains($toc.params, 'title')"/>
</xsl:call-template>
- </fo:flow>
- </fo:page-sequence>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
<xsl:if test="contains($toc.params,'figure') and .//figure">
- <fo:page-sequence hyphenate="{$hyphenate}"
- master-reference="{$lot-master-reference}">
- <xsl:attribute name="language">
- <xsl:call-template name="l10n.language"/>
- </xsl:attribute>
- <xsl:attribute name="format">
- <xsl:call-template name="page.number.format">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="initial-page-number">
- <xsl:call-template name="initial.page.number">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="force-page-count">
- <xsl:call-template name="force.page.count">
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="hyphenation-character">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'hyphenation-character'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-push-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-push-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-remain-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-remain-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofFigures'"/>
- </xsl:apply-templates>
-
- <xsl:apply-templates select="." mode="running.foot.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofFigures'"/>
- </xsl:apply-templates>
-
- <fo:flow flow-name="xsl-region-body">
- <xsl:call-template name="set.flow.properties">
- <xsl:with-param name="element" select="local-name(.)"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
-
+ <xsl:call-template name="page.sequence">
+ <xsl:with-param name="master-reference"
+ select="$lot-master-reference"/>
+ <xsl:with-param name="element" select="'toc'"/>
+ <xsl:with-param name="gentext-key" select="'ListofFigures'"/>
+ <xsl:with-param name="content">
<xsl:call-template name="list.of.titles">
<xsl:with-param name="titles" select="'figure'"/>
<xsl:with-param name="nodes" select=".//figure"/>
</xsl:call-template>
- </fo:flow>
- </fo:page-sequence>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
<xsl:if test="contains($toc.params,'table') and .//table">
- <fo:page-sequence hyphenate="{$hyphenate}"
- master-reference="{$lot-master-reference}">
- <xsl:attribute name="language">
- <xsl:call-template name="l10n.language"/>
- </xsl:attribute>
- <xsl:attribute name="format">
- <xsl:call-template name="page.number.format">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="initial-page-number">
- <xsl:call-template name="initial.page.number">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="force-page-count">
- <xsl:call-template name="force.page.count">
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="hyphenation-character">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'hyphenation-character'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-push-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-push-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-remain-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-remain-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofTables'"/>
- </xsl:apply-templates>
-
- <xsl:apply-templates select="." mode="running.foot.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofTables'"/>
- </xsl:apply-templates>
-
- <fo:flow flow-name="xsl-region-body">
- <xsl:call-template name="set.flow.properties">
- <xsl:with-param name="element" select="local-name(.)"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
-
+ <xsl:call-template name="page.sequence">
+ <xsl:with-param name="master-reference"
+ select="$lot-master-reference"/>
+ <xsl:with-param name="element" select="'toc'"/>
+ <xsl:with-param name="gentext-key" select="'ListofTables'"/>
+ <xsl:with-param name="content">
<xsl:call-template name="list.of.titles">
<xsl:with-param name="titles" select="'table'"/>
<xsl:with-param name="nodes" select=".//table"/>
</xsl:call-template>
- </fo:flow>
- </fo:page-sequence>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
<xsl:if test="contains($toc.params,'example') and .//example">
- <fo:page-sequence hyphenate="{$hyphenate}"
- master-reference="{$lot-master-reference}">
- <xsl:attribute name="language">
- <xsl:call-template name="l10n.language"/>
- </xsl:attribute>
- <xsl:attribute name="format">
- <xsl:call-template name="page.number.format">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="initial-page-number">
- <xsl:call-template name="initial.page.number">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="force-page-count">
- <xsl:call-template name="force.page.count">
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="hyphenation-character">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'hyphenation-character'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-push-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-push-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-remain-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-remain-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofExamples'"/>
- </xsl:apply-templates>
-
- <xsl:apply-templates select="." mode="running.foot.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofExamples'"/>
- </xsl:apply-templates>
-
- <fo:flow flow-name="xsl-region-body">
- <xsl:call-template name="set.flow.properties">
- <xsl:with-param name="element" select="local-name(.)"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
-
+ <xsl:call-template name="page.sequence">
+ <xsl:with-param name="master-reference"
+ select="$lot-master-reference"/>
+ <xsl:with-param name="element" select="'toc'"/>
+ <xsl:with-param name="gentext-key" select="'ListofExample'"/>
+ <xsl:with-param name="content">
<xsl:call-template name="list.of.titles">
<xsl:with-param name="titles" select="'example'"/>
<xsl:with-param name="nodes" select=".//example"/>
</xsl:call-template>
- </fo:flow>
- </fo:page-sequence>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
- <xsl:if test="contains($toc.params,'equation') and .//equation">
- <fo:page-sequence hyphenate="{$hyphenate}"
- master-reference="{$lot-master-reference}">
- <xsl:attribute name="language">
- <xsl:call-template name="l10n.language"/>
- </xsl:attribute>
- <xsl:attribute name="format">
- <xsl:call-template name="page.number.format">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="initial-page-number">
- <xsl:call-template name="initial.page.number">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="force-page-count">
- <xsl:call-template name="force.page.count">
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="hyphenation-character">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'hyphenation-character'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-push-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-push-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-remain-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-remain-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofEquations'"/>
- </xsl:apply-templates>
-
- <xsl:apply-templates select="." mode="running.foot.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofEquations'"/>
- </xsl:apply-templates>
-
- <fo:flow flow-name="xsl-region-body">
- <xsl:call-template name="set.flow.properties">
- <xsl:with-param name="element" select="local-name(.)"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
-
+ <xsl:if test="contains($toc.params,'equation') and
+ .//equation[title or info/title]">
+ <xsl:call-template name="page.sequence">
+ <xsl:with-param name="master-reference"
+ select="$lot-master-reference"/>
+ <xsl:with-param name="element" select="'toc'"/>
+ <xsl:with-param name="gentext-key" select="'ListofEquations'"/>
+ <xsl:with-param name="content">
<xsl:call-template name="list.of.titles">
<xsl:with-param name="titles" select="'equation'"/>
- <xsl:with-param name="nodes" select=".//equation[title or
info/title]"/>
+ <xsl:with-param name="nodes"
+ select=".//equation[title or info/title]"/>
</xsl:call-template>
- </fo:flow>
- </fo:page-sequence>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
- <xsl:if test="contains($toc.params,'procedure') and .//procedure">
- <fo:page-sequence hyphenate="{$hyphenate}"
- master-reference="{$lot-master-reference}">
- <xsl:attribute name="language">
- <xsl:call-template name="l10n.language"/>
- </xsl:attribute>
- <xsl:attribute name="format">
- <xsl:call-template name="page.number.format">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="initial-page-number">
- <xsl:call-template name="initial.page.number">
- <xsl:with-param name="element" select="'toc'"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="force-page-count">
- <xsl:call-template name="force.page.count">
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:attribute name="hyphenation-character">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key" select="'hyphenation-character'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-push-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-push-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
- <xsl:attribute name="hyphenation-remain-character-count">
- <xsl:call-template name="gentext">
- <xsl:with-param name="key"
select="'hyphenation-remain-character-count'"/>
- </xsl:call-template>
- </xsl:attribute>
-
- <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofProcedures'"/>
- </xsl:apply-templates>
-
- <xsl:apply-templates select="." mode="running.foot.mode">
- <xsl:with-param name="master-reference"
select="$lot-master-reference"/>
- <xsl:with-param name="gentext-key" select="'ListofProcedures'"/>
- </xsl:apply-templates>
-
- <fo:flow flow-name="xsl-region-body">
- <xsl:call-template name="set.flow.properties">
- <xsl:with-param name="element" select="local-name(.)"/>
- <xsl:with-param name="master-reference"
- select="$lot-master-reference"/>
- </xsl:call-template>
-
+ <xsl:if test="contains($toc.params,'procedure') and
+ .//procedure[title or info/title]">
+ <xsl:call-template name="page.sequence">
+ <xsl:with-param name="master-reference"
+ select="$lot-master-reference"/>
+ <xsl:with-param name="element" select="'toc'"/>
+ <xsl:with-param name="gentext-key" select="'ListofProcedures'"/>
+ <xsl:with-param name="content">
<xsl:call-template name="list.of.titles">
<xsl:with-param name="titles" select="'procedure'"/>
- <xsl:with-param name="nodes" select=".//procedure[title]"/>
+ <xsl:with-param name="nodes"
+ select=".//procedure[title or info/title]"/>
</xsl:call-template>
- </fo:flow>
- </fo:page-sequence>
+ </xsl:with-param>
+ </xsl:call-template>
</xsl:if>
-
- <xsl:apply-templates select="$content"/>
</xsl:template>
-
-<xsl:template match="book/bookinfo"></xsl:template>
-<xsl:template match="book/info"></xsl:template>
-<xsl:template match="book/title"></xsl:template>
-<xsl:template match="book/subtitle"></xsl:template>
-<xsl:template match="book/titleabbrev"></xsl:template>
-
<!-- ==================================================================== -->
<xsl:template match="part">
Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl 2007-04-01
05:41:19 UTC (rev 7998)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl 2007-04-01
09:41:56 UTC (rev 7999)
@@ -316,7 +316,7 @@
<span>
<xsl:apply-templates select="." mode="class.attribute"/>
<xsl:apply-templates mode="titlepage.mode"/>
- </span>
+ </span><xsl:text> </xsl:text>
</xsl:when>
<xsl:otherwise>
<div>
Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl 2007-04-01
05:41:19 UTC (rev 7998)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl 2007-04-01
09:41:56 UTC (rev 7999)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="US-ASCII"?>
<!--This file was created automatically by html2xhtml-->
<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks";
xmlns:exsl="http://exslt.org/common"; xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns="http://www.w3.org/1999/xhtml"; exclude-result-prefixes="suwl exsl"
version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks";
xmlns:exsl="http://exslt.org/common"; xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns="http://www.w3.org/1999/xhtml"; exclude-result-prefixes="suwl exsl xlink"
version="1.0">
<!-- ********************************************************************
$Id$
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
