Added force-page-count="end-on-even" to each page-sequence when

double-sided output so last page of document ends on even page.

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 7777b64dd581ee29fe6e9597d5414ea6888b2e05..d38559631ebf788fefe5a0461c80550dc7b96770 100644 (file)
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -34,9 +34,15 @@
         <xsl:attribute name="format">
           <xsl:call-template name="page.number.format"/>
         </xsl:attribute>
-        <xsl:if test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-        </xsl:if>
+        <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="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 87599430a2ea51b51cd879cc82a440baae461312..596ee9f5e008505a2c89ea3e7a5611f634eb56b4 100644 (file)
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -115,9 +115,14 @@
       </xsl:when>
     </xsl:choose>
 
-    <xsl:if test="$double.sided = 0">
-      <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-    </xsl:if>
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -180,6 +185,7 @@
     <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>
@@ -246,6 +252,7 @@
     <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>
@@ -336,9 +343,14 @@
       </xsl:when>
     </xsl:choose>
 
-    <xsl:if test="$double.sided = 0">
-      <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-    </xsl:if>
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -423,9 +435,14 @@
       </xsl:when>
     </xsl:choose>
 
-    <xsl:if test="$double.sided = 0">
-      <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-    </xsl:if>
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -512,9 +529,14 @@
       </xsl:when>
     </xsl:choose>
 
-    <xsl:if test="$double.sided = 0">
-      <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-    </xsl:if>
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">

diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index e588754606156a2717b6db4b9998a0ab444042ac..7f5e4a4628244e1351ea4f6f2287b6e6f3c179f2 100644 (file)
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -91,6 +91,7 @@
       <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>
@@ -149,6 +150,7 @@
       <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>
@@ -232,6 +234,7 @@
       <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>
@@ -293,6 +296,7 @@
       <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>
@@ -346,6 +350,7 @@
       <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>
@@ -402,6 +407,7 @@
       <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>
@@ -458,6 +464,7 @@
       <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>
@@ -514,6 +521,7 @@
       <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>
@@ -570,6 +578,7 @@
       <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>
@@ -662,9 +671,15 @@
         <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
       </xsl:when>
     </xsl:choose>
-    <xsl:if test="$double.sided = 0">
-      <xsl:attribute name="force-page-count">no-force</xsl:attribute>
-    </xsl:if>
+
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -735,6 +750,7 @@
       <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>

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index 838d377efe4582690a052b28d5563062cfe5f87c..645759eac6185a2c97a71579eff6931e989d75a4 100644 (file)
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -125,9 +125,16 @@
     <xsl:attribute name="format">
       <xsl:call-template name="page.number.format"/>
     </xsl:attribute>
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-    </xsl:if>
+    
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -405,9 +412,16 @@
     <xsl:attribute name="format">
       <xsl:call-template name="page.number.format"/>
     </xsl:attribute>
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-    </xsl:if>
+
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index 38cb4b203d362fe4f718b54a53381d640f61b7d0..e6f15444e461289b9889e1eb75c18bcfa7667817 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -72,9 +72,16 @@
     <xsl:attribute name="format">
       <xsl:call-template name="page.number.format"/>
     </xsl:attribute>
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-    </xsl:if>
+
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -157,9 +164,16 @@
     <xsl:attribute name="format">
       <xsl:call-template name="page.number.format"/>
     </xsl:attribute>
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-    </xsl:if>
+
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 201b4ed86b3948421ef080f26b05afbdb1fd8f5c..01ce1be329981de29d56d5e3ab71ff96bb485e92 100644 (file)
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -33,9 +33,16 @@
       <xsl:attribute name="format">
         <xsl:call-template name="page.number.format"/>
       </xsl:attribute>
-      <xsl:if test="$double.sided != 0">
-        <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-      </xsl:if>
+
+      <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="hyphenation-character">
         <xsl:call-template name="gentext">
@@ -92,9 +99,16 @@
     <xsl:attribute name="format">
       <xsl:call-template name="page.number.format"/>
     </xsl:attribute>
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-    </xsl:if>
+
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -165,9 +179,16 @@
         <xsl:attribute name="format">
           <xsl:call-template name="page.number.format"/>
         </xsl:attribute>
-        <xsl:if test="$double.sided != 0">
-          <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-        </xsl:if>
+
+        <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="hyphenation-character">
           <xsl:call-template name="gentext">

diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 7a40402c12ceaa96c0dd4e859dc3ce7f653ace12..5d584f4c42df8a03af2be6ca2113dca0ef38f0bd 100644 (file)
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -106,9 +106,16 @@
     <xsl:attribute name="format">
       <xsl:call-template name="page.number.format"/>
     </xsl:attribute>
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-    </xsl:if>
+
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">
@@ -273,9 +280,16 @@
     <xsl:attribute name="format">
       <xsl:call-template name="page.number.format"/>
     </xsl:attribute>
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-    </xsl:if>
+
+    <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="hyphenation-character">
       <xsl:call-template name="gentext">

diff --git a/xsl/fo/toc.xsl b/xsl/fo/toc.xsl
index 3e4a62208d7df1e69fb78f20feaab9597f04d323..4df0e0453b48ceb59263feb112915eda719b0a23 100644 (file)
--- a/xsl/fo/toc.xsl
+++ b/xsl/fo/toc.xsl
@@ -37,9 +37,16 @@
               <xsl:with-param name="element" select="'toc'"/>
             </xsl:call-template>
           </xsl:attribute>
-          <xsl:if test="$double.sided != 0">
-            <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
-          </xsl:if>
+
+          <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="hyphenation-character">
             <xsl:call-template name="gentext">