Move IDs from page-sequences down to titlepage blocks

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 5ebdb2f9929c33e5939670c24a6450af0c6a6f7d..3e31abfdb7c098394bfe78c564bdc70392e65815 100644 (file)
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -26,8 +26,7 @@
         <xsl:call-template name="select.pagemaster"/>
       </xsl:variable>
 
-      <fo:page-sequence id="{$id}"
-                        hyphenate="{$hyphenate}"
+      <fo:page-sequence hyphenate="{$hyphenate}"
                         master-reference="{$master-reference}">
         <xsl:attribute name="language">
           <xsl:call-template name="l10n.language"/>
@@ -47,7 +46,9 @@
         </xsl:apply-templates>
 
         <fo:flow flow-name="xsl-region-body">
-          <xsl:call-template name="bibliography.titlepage"/>
+          <fo:block id="{$id}">
+            <xsl:call-template name="bibliography.titlepage"/>
+          </fo:block>
           <xsl:apply-templates/>
         </fo:flow>
       </fo:page-sequence>
@@ -58,8 +59,8 @@
                 space-before.optimum="1.5em"
                 space-before.maximum="2em">
         <xsl:call-template name="bibliography.titlepage"/>
-        <xsl:apply-templates/>
       </fo:block>
+      <xsl:apply-templates/>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>

diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index afbe92a735a94e3465aeb89376fb868a225d4292..a77694a8710be3a066a701ca6760388ba62e4489 100644 (file)
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -63,8 +63,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -98,7 +97,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="dedication.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="dedication.titlepage"/>
+      </fo:block>
       <xsl:apply-templates/>
     </fo:flow>
   </fo:page-sequence>
@@ -121,8 +122,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -143,7 +143,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="colophon.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="colophon.titlepage"/>
+      </fo:block>
       <xsl:apply-templates/>
     </fo:flow>
   </fo:page-sequence>
@@ -164,8 +166,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -188,7 +189,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="preface.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="preface.titlepage"/>
+      </fo:block>
 
       <xsl:variable name="toc.params">
         <xsl:call-template name="find.path.params">
@@ -221,8 +224,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -255,7 +257,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="chapter.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="chapter.titlepage"/>
+      </fo:block>
 
       <xsl:variable name="toc.params">
         <xsl:call-template name="find.path.params">
@@ -287,8 +291,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -321,7 +324,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="appendix.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="appendix.titlepage"/>
+      </fo:block>
 
       <xsl:variable name="toc.params">
         <xsl:call-template name="find.path.params">
@@ -354,8 +359,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -389,7 +393,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="article.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="article.titlepage"/>
+      </fo:block>
 
       <xsl:variable name="toc.params">
         <xsl:call-template name="find.path.params">

diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index 58f3734e101c887623c1d1819e68bff4305cbae9..ab38d405b73a870faa717dea8791f67b30099b12 100644 (file)
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -65,8 +65,7 @@
   </xsl:variable>
 
   <xsl:if test="$preamble">
-    <fo:page-sequence id="{$id}"
-                      hyphenate="{$hyphenate}"
+    <fo:page-sequence hyphenate="{$hyphenate}"
                       master-reference="{$titlepage-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -87,7 +86,9 @@
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.titlepage"/>
+        <fo:block id="{$id}">
+          <xsl:call-template name="set.titlepage"/>
+        </fo:block>
       </fo:flow>
     </fo:page-sequence>
   </xsl:if>
@@ -163,8 +164,7 @@
   </xsl:variable>
 
   <xsl:if test="$preamble">
-    <fo:page-sequence id="{$id}"
-                      hyphenate="{$hyphenate}"
+    <fo:page-sequence hyphenate="{$hyphenate}"
                       master-reference="{$titlepage-master-reference}"
                       initial-page-number="1">
       <xsl:attribute name="language">
@@ -186,7 +186,9 @@
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="book.titlepage"/>
+        <fo:block id="{$id}">
+          <xsl:call-template name="book.titlepage"/>
+        </fo:block>
       </fo:flow>
     </fo:page-sequence>
   </xsl:if>
@@ -437,8 +439,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$titlepage-master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -468,7 +469,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="part.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="part.titlepage"/>
+      </fo:block>
       <xsl:copy-of select="$additional.content"/>
     </fo:flow>
   </fo:page-sequence>

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index b881436b9e2b89907e8f10a427d3277b17d59705..3a45a5d898aac7190bb5ea0ca9a6508e4f59fe77 100644 (file)
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -16,12 +16,7 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="glossary">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:block id="{$id}">
-    <xsl:call-template name="make-glossary"/>
-  </fo:block>
+  <xsl:call-template name="make-glossary"/>
 </xsl:template>
 
 <xsl:template match="glossdiv/title"/>
@@ -38,6 +33,10 @@
                                            or self::glossdiv
                                            or self::glossentry)]"/>
 
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
   <xsl:variable name="presentation">
     <xsl:call-template name="dbfo-attribute">
       <xsl:with-param name="pis"
@@ -65,7 +64,9 @@
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:call-template name="glossary.titlepage"/>
+  <fo:block id="{$id}">
+    <xsl:call-template name="glossary.titlepage"/>
+  </fo:block>
 
   <xsl:if test="$preamble">
     <xsl:apply-templates select="$preamble"/>
@@ -116,8 +117,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -205,8 +205,6 @@
 <!-- Glossary collection -->
 
 <xsl:template match="glossary[@role='auto']" priority="2">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
   <xsl:if test="$glossary.collection = ''">
     <xsl:message>
       <xsl:text>Warning: processing automatic glossary </xsl:text>
@@ -214,9 +212,7 @@
     </xsl:message>
   </xsl:if>
 
-  <fo:block id="{$id}">
-    <xsl:call-template name="make-auto-glossary"/>
-  </fo:block>
+  <xsl:call-template name="make-auto-glossary"/>
 </xsl:template>
 
 <xsl:template name="make-auto-glossary">
@@ -227,6 +223,10 @@
                                            or self::glossdiv
                                            or self::glossentry)]"/>
 
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
   <xsl:variable name="presentation">
     <xsl:call-template name="dbfo-attribute">
       <xsl:with-param name="pis"
@@ -261,7 +261,9 @@
     </xsl:message>
   </xsl:if>
 
-  <xsl:call-template name="glossary.titlepage"/>
+  <fo:block id="{$id}">
+    <xsl:call-template name="glossary.titlepage"/>
+  </fo:block>
 
   <xsl:if test="$preamble">
     <xsl:apply-templates select="$preamble"/>
@@ -369,8 +371,7 @@
     </xsl:message>
   </xsl:if>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index 1d59cdc0c5876c189f54163ce6d6a45613fa4023..1f728f6abbfa185b74ef317006bbb268f1f58f9c 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -32,13 +32,13 @@
     <xsl:otherwise>
       <fo:block id="{$id}">
         <xsl:call-template name="index.titlepage"/>
-        <xsl:apply-templates/>
-        <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-          <xsl:call-template name="generate-index">
-            <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-          </xsl:call-template>
-        </xsl:if>
       </fo:block>
+      <xsl:apply-templates/>
+      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
+        <xsl:call-template name="generate-index">
+          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
+        </xsl:call-template>
+      </xsl:if>
     </xsl:otherwise>
   </xsl:choose>
  </xsl:if>
@@ -58,8 +58,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -79,7 +78,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="index.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="index.titlepage"/>
+      </fo:block>
       <xsl:apply-templates/>
       <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
 
@@ -126,8 +127,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -147,7 +147,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="setindex.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="setindex.titlepage"/>
+      </fo:block>
       <xsl:apply-templates/>
       <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
 

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index d47b0249755095a1fcffe13ba31a6c9ccd973d32..ac89ec3cb98d2890ec7be5c2bda91fbf3010c266 100644 (file)
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -24,8 +24,7 @@
       <xsl:call-template name="select.pagemaster"/>
     </xsl:variable>
 
-    <fo:page-sequence id="{$id}"
-                      hyphenate="{$hyphenate}"
+    <fo:page-sequence hyphenate="{$hyphenate}"
                       master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -45,7 +44,9 @@
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="reference.titlepage"/>
+        <fo:block id="{$id}">
+          <xsl:call-template name="reference.titlepage"/>
+        </fo:block>
       </fo:flow>
     </fo:page-sequence>
   </xsl:if>
@@ -66,8 +67,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -89,7 +89,9 @@
     <fo:flow flow-name="xsl-region-body">
       <xsl:apply-templates select=".." mode="reference.titlepage.mode"/>
       <xsl:if test="title">
-        <xsl:call-template name="partintro.titlepage"/>
+        <fo:block id="{$id}">
+          <xsl:call-template name="partintro.titlepage"/>
+        </fo:block>
       </xsl:if>
       <xsl:apply-templates/>
     </fo:flow>

diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 41f9dc50516924fffcdce9e07639aedf88096851..503b74fe7c4924ae7b11f68a642a5184f1488043 100644 (file)
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -51,8 +51,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -72,7 +71,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="section.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="section.titlepage"/>
+      </fo:block>
 
       <xsl:variable name="toc.params">
         <xsl:call-template name="find.path.params">
@@ -174,8 +175,7 @@
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
-  <fo:page-sequence id="{$id}"
-                    hyphenate="{$hyphenate}"
+  <fo:page-sequence hyphenate="{$hyphenate}"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
@@ -195,7 +195,9 @@
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="sect1.titlepage"/>
+      <fo:block id="{$id}">
+        <xsl:call-template name="sect1.titlepage"/>
+      </fo:block>
 
       <xsl:variable name="toc.params">
         <xsl:call-template name="find.path.params">