From d3d85882b14e14da7c2992adf5915956e6b8da77 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 2 Sep 2004 04:13:53 +0000
Subject: [PATCH] Added templates to set initial-page-number and
 force-page-count for page-sequences so they can be customized.

---
 xsl/fo/biblio.xsl    |  19 ++--
 xsl/fo/component.xsl | 183 +++++++++++-------------------
 xsl/fo/division.xsl  | 264 ++++++++++++++++++++++++-------------------
 xsl/fo/glossary.xsl  |  40 ++++---
 xsl/fo/index.xsl     |  40 ++++---
 xsl/fo/pagesetup.xsl |  72 +++++++++++-
 xsl/fo/refentry.xsl  |  60 +++++-----
 xsl/fo/sections.xsl  |  40 ++++---
 xsl/fo/toc.xsl       |  34 ++++--
 9 files changed, 413 insertions(+), 339 deletions(-)

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index fef36baca..8a3c408cd 100644
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -36,15 +36,16 @@
             <xsl:with-param name="master-reference" select="$master-reference"/>
           </xsl:call-template>
         </xsl:attribute>
-        <xsl:choose>
-          <xsl:when test="$double.sided != 0">
-            <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-            <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:attribute name="initial-page-number">
+          <xsl:call-template name="initial.page.number">
+            <xsl:with-param name="master-reference" select="$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="$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'"/>
diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index df1585f64..1ecdd2221 100644
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -100,31 +100,18 @@
         <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:call-template>
     </xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="not(preceding::chapter
-                          or preceding::preface
-                          or preceding::appendix
-                          or preceding::article
-                          or preceding::dedication
-                          or parent::part
-                          or parent::reference)">
-        <!-- if there is a preceding component or we're in a part, the -->
-        <!-- page numbering will already be adjusted -->
-        <xsl:attribute name="initial-page-number">1</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -186,15 +173,16 @@
         <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:call-template>
     </xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$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'"/>
@@ -254,16 +242,17 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <!-- Page numbering for a preface doesn't restart; it continues from the ToC -->
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -335,30 +324,17 @@
         <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:call-template>
     </xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="not(preceding::chapter
-                          or preceding::appendix
-                          or preceding::article
-                          or preceding::dedication
-                          or parent::part
-                          or parent::reference)">
-        <!-- if there is a preceding component or we're in a part, the -->
-        <!-- page numbering will already be adjusted -->
-        <xsl:attribute name="initial-page-number">1</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -429,30 +405,17 @@
         <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:call-template>
     </xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="not(preceding::chapter
-                          or preceding::appendix
-                          or preceding::article
-                          or preceding::dedication
-                          or parent::part
-                          or parent::reference)">
-        <!-- if there is a preceding component or we're in a part, the -->
-        <!-- page numbering will already be adjusted -->
-        <xsl:attribute name="initial-page-number">1</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -524,31 +487,17 @@
         <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:call-template>
     </xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="not(preceding::chapter
-                          or preceding::preface
-                          or preceding::appendix
-                          or preceding::article
-                          or preceding::dedication
-                          or parent::part
-                          or parent::reference)">
-        <!-- if there is a preceding component or we're in a part, the -->
-        <!-- page numbering will already be adjusted -->
-        <xsl:attribute name="initial-page-number">1</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index cec8f7c83..354c97b31 100644
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -91,15 +91,21 @@
                           select="$titlepage-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+
+      <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'"/>
@@ -140,7 +146,6 @@
 
   <xsl:if test="contains($toc.params, 'toc')">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      format="i"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -152,15 +157,18 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:attribute name="initial-page-number">
+        <xsl:call-template name="initial.page.number">
+          <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">
@@ -228,8 +236,7 @@
 
   <xsl:if test="$preamble">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$titlepage-master-reference}"
-                      initial-page-number="1">
+                      master-reference="{$titlepage-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -239,15 +246,18 @@
                           select="$titlepage-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
@@ -291,7 +301,6 @@
 
   <xsl:if test="contains($toc.params, 'toc')">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      format="i"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -303,15 +312,19 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
@@ -347,7 +360,6 @@
 
   <xsl:if test="contains($toc.params,'figure') and .//figure">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      format="i"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -359,15 +371,19 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
@@ -406,7 +422,6 @@
 
   <xsl:if test="contains($toc.params,'table') and .//table">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      format="i"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -418,15 +433,19 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
@@ -465,7 +484,6 @@
 
   <xsl:if test="contains($toc.params,'example') and .//example">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      format="i"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -477,15 +495,19 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
@@ -524,7 +546,6 @@
 
   <xsl:if test="contains($toc.params,'equation') and .//equation">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      format="i"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -536,15 +557,20 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
@@ -583,7 +609,6 @@
 
   <xsl:if test="contains($toc.params,'procedure') and .//procedure">
     <fo:page-sequence hyphenate="{$hyphenate}"
-                      format="i"
                       master-reference="{$lot-master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
@@ -595,15 +620,19 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
@@ -683,26 +712,19 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <xsl:choose>
-      <xsl:when test="not(preceding::chapter)
-                      and not(preceding::part)">
-        <!-- if there is a preceding chapter or part, page numbering will already -->
-        <!-- be adjusted, otherwise restart the page numbers -->
-        <xsl:attribute name="initial-page-number">1</xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <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">
@@ -772,15 +794,19 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
       </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <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">
diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index 0be4a3a42..42d648758 100644
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -128,15 +128,17 @@
       </xsl:call-template>
     </xsl:attribute>
     
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -417,15 +419,17 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index fa856a0ad..447e69b27 100644
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -75,15 +75,17 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -169,15 +171,17 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 9072e47b9..01f3bd2ec 100644
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -1993,13 +1993,83 @@
   <xsl:param name="master-reference" select="''"/>
 
   <xsl:choose>
-    <xsl:when test="$element = 'toc'">i</xsl:when>
+    <xsl:when test="$element = 'toc' and self::book">i</xsl:when>
     <xsl:when test="$element = 'preface'">i</xsl:when>
     <xsl:when test="$element = 'dedication'">i</xsl:when>
     <xsl:otherwise>1</xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
+<xsl:template name="initial.page.number">
+  <xsl:param name="element" select="local-name(.)"/>
+  <xsl:param name="master-reference" select="''"/>
+
+  <xsl:choose>
+    <!-- double-sided output -->
+    <xsl:when test="$double.sided != 0">
+      <xsl:choose>
+        <xsl:when test="$element = 'toc'">auto-odd</xsl:when>
+        <xsl:when test="$element = 'book'">1</xsl:when>
+        <xsl:when test="$element = 'preface'">auto-odd</xsl:when>
+        <xsl:when test="$element = 'part' and not(preceding::chapter)
+                        and not(preceding::part)">1</xsl:when>
+        <xsl:when test="($element = 'dedication' or $element = 'article') and
+                        not(preceding::chapter
+                            or preceding::preface
+                            or preceding::appendix
+                            or preceding::article
+                            or preceding::dedication
+                            or parent::part
+                            or parent::reference)">1</xsl:when>
+        <xsl:when test="($element = 'chapter' or $element = 'appendix') and
+                        not(preceding::chapter
+                            or preceding::appendix
+                            or preceding::article
+                            or preceding::dedication
+                            or parent::part
+                            or parent::reference)">1</xsl:when>
+        <xsl:otherwise>auto-odd</xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+
+    <!-- single-sided output -->
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="$element = 'toc'">auto</xsl:when>
+        <xsl:when test="$element = 'preface'">auto</xsl:when>
+        <xsl:when test="($element = 'dedication' or $element = 'article') and
+                        not(preceding::chapter
+                            or preceding::preface
+                            or preceding::appendix
+                            or preceding::article
+                            or preceding::dedication
+                            or parent::part
+                            or parent::reference)">1</xsl:when>
+        <xsl:when test="($element = 'chapter' or $element = 'appendix') and
+                        not(preceding::chapter
+                            or preceding::appendix
+                            or preceding::article
+                            or preceding::dedication
+                            or parent::part
+                            or parent::reference)">1</xsl:when>
+        <xsl:otherwise>auto</xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="force.page.count">
+  <xsl:param name="element" select="local-name(.)"/>
+  <xsl:param name="master-reference" select="''"/>
+
+  <xsl:choose>
+    <!-- double-sided output -->
+    <xsl:when test="$double.sided != 0">end-on-even</xsl:when>
+    <!-- single-sided output -->
+    <xsl:otherwise>no-force</xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 </xsl:stylesheet>
diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 2922099ac..cea6b8d3e 100644
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -36,15 +36,17 @@
         </xsl:call-template>
       </xsl:attribute>
 
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0">
-          <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:attribute name="initial-page-number">
+        <xsl:call-template name="initial.page.number">
+          <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+        </xsl:call-template>
+      </xsl:attribute>
 
       <xsl:attribute name="hyphenation-character">
         <xsl:call-template name="gentext">
@@ -104,15 +106,17 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -186,15 +190,17 @@
           </xsl:call-template>
         </xsl:attribute>
 
-        <xsl:choose>
-          <xsl:when test="$double.sided != 0">
-            <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-            <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:attribute name="initial-page-number">
+          <xsl:call-template name="initial.page.number">
+            <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+          </xsl:call-template>
+        </xsl:attribute>
 
         <xsl:attribute name="hyphenation-character">
           <xsl:call-template name="gentext">
diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 17982fb46..4977516f8 100644
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -125,15 +125,17 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -319,15 +321,17 @@
       </xsl:call-template>
     </xsl:attribute>
 
-    <xsl:choose>
-      <xsl:when test="$double.sided != 0">
-        <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:attribute name="initial-page-number">
+      <xsl:call-template name="initial.page.number">
+        <xsl:with-param name="master-reference" select="$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="$master-reference"/>
+      </xsl:call-template>
+    </xsl:attribute>
 
     <xsl:attribute name="hyphenation-character">
       <xsl:call-template name="gentext">
diff --git a/xsl/fo/toc.xsl b/xsl/fo/toc.xsl
index 257766fb5..8368537b4 100644
--- a/xsl/fo/toc.xsl
+++ b/xsl/fo/toc.xsl
@@ -40,15 +40,20 @@
             </xsl:call-template>
           </xsl:attribute>
 
-          <xsl:choose>
-            <xsl:when test="$double.sided != 0">
-              <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-              <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
+          <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="$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="$master-reference"/>
+            </xsl:call-template>
+          </xsl:attribute>
 
           <xsl:attribute name="hyphenation-character">
             <xsl:call-template name="gentext">
@@ -96,9 +101,14 @@
                               select="$master-reference"/>
             </xsl:call-template>
           </xsl:attribute>
-          <xsl:if test="$double.sided != 0">
-            <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          </xsl:if>
+
+          <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="$master-reference"/>
+            </xsl:call-template>
+          </xsl:attribute>
 
           <xsl:attribute name="hyphenation-character">
             <xsl:call-template name="gentext">
-- 
2.40.0