]> granicus.if.org Git - docbook-dsssl/commitdiff
Use basic initial-page-number property instead of extended force-page-count property...
authorNorman Walsh <ndw@nwalsh.com>
Tue, 16 Jul 2002 11:29:18 +0000 (11:29 +0000)
committerNorman Walsh <ndw@nwalsh.com>
Tue, 16 Jul 2002 11:29:18 +0000 (11:29 +0000)
xsl/fo/biblio.xsl
xsl/fo/component.xsl
xsl/fo/division.xsl
xsl/fo/glossary.xsl
xsl/fo/index.xsl
xsl/fo/refentry.xsl
xsl/fo/sections.xsl
xsl/fo/toc.xsl

index e4ac7861887167e89261bed83a3e6d5cec566cda..ecd9ffad252cfd9221c1b14c887b43240a622d50 100644 (file)
         <xsl:attribute name="language">
           <xsl:call-template name="l10n.language"/>
         </xsl:attribute>
+        <xsl:attribute name="format">
+          <xsl:call-template name="page.number.format"/>
+        </xsl:attribute>
         <xsl:if 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:if>
 
         <xsl:apply-templates select="." mode="running.head.mode">
index 1e25e0b04139a3485746371b13472c45598fe90f..8419ab42f958d31b09c330ab8117f0b8f50a6d52 100644 (file)
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    format="i"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
-
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-    </xsl:if>
-
-    <!-- if there is a preceding component or we're in a part, the -->
-    <!-- page numbering will already be adjusted -->
-    <xsl:if test="not(preceding::chapter
-                      or preceding::preface
-                      or preceding::appendix
-                      or preceding::article
-                      or preceding::dedication
-                      or parent::part
-                      or parent::reference)">
-      <xsl:attribute name="initial-page-number">1</xsl:attribute>
-    </xsl:if>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </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:apply-templates select="." mode="running.head.mode">
       <xsl:with-param name="master-reference" select="$master-reference"/>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    format="i"
                     master-reference="{$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:attribute>
     <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-    </xsl:if>
-
-    <!-- if there is a preceding component or we're in a part, the -->
-    <!-- page numbering will already be adjusted -->
-    <xsl:if test="not(preceding::chapter
-                      or preceding::preface
-                      or preceding::appendix
-                      or preceding::article
-                      or preceding::dedication
-                      or parent::part
-                      or parent::reference)">
-      <xsl:attribute name="initial-page-number">1</xsl:attribute>
+      <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute>
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    format="i"
                     master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
-
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-    </xsl:if>
-
-    <!-- if there is a preceding component or we're in a part, the -->
-    <!-- page numbering will already be adjusted -->
-    <xsl:if test="not(preceding::chapter
-                      or preceding::preface
-                      or preceding::appendix
-                      or preceding::article
-                      or preceding::dedication
-                      or parent::part
-                      or parent::reference)">
-      <xsl:attribute name="initial-page-number">1</xsl:attribute>
-    </xsl:if>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </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:apply-templates select="." mode="running.head.mode">
       <xsl:with-param name="master-reference" select="$master-reference"/>
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
-
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-    </xsl:if>
-
-    <!-- if there is a preceding component or we're in a part, the -->
-    <!-- page numbering will already be adjusted -->
-    <xsl:if test="not(preceding::chapter
-                      or preceding::preface
-                      or preceding::appendix
-                      or preceding::article
-                      or preceding::dedication
-                      or parent::part
-                      or parent::reference)">
-      <xsl:attribute name="initial-page-number">1</xsl:attribute>
-    </xsl:if>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </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:apply-templates select="." mode="running.head.mode">
       <xsl:with-param name="master-reference" select="$master-reference"/>
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
-
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-    </xsl:if>
-
-    <!-- if there is a preceding component or we're in a part, the -->
-    <!-- page numbering will already be adjusted -->
-    <xsl:if test="not(preceding::chapter
-                      or preceding::preface
-                      or preceding::appendix
-                      or preceding::article
-                      or preceding::dedication
-                      or parent::part
-                      or parent::reference)">
-      <xsl:attribute name="initial-page-number">1</xsl:attribute>
-    </xsl:if>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </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:apply-templates select="." mode="running.head.mode">
       <xsl:with-param name="master-reference" select="$master-reference"/>
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
-
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-    </xsl:if>
-
-    <!-- if there is a preceding component or we're in a part, the -->
-    <!-- page numbering will already be adjusted -->
-    <xsl:if test="not(preceding::chapter
-                      or preceding::preface
-                      or preceding::appendix
-                      or preceding::article
-                      or preceding::dedication
-                      or parent::part
-                      or parent::reference)">
-      <xsl:attribute name="initial-page-number">1</xsl:attribute>
-    </xsl:if>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </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:apply-templates select="." mode="running.head.mode">
       <xsl:with-param name="master-reference" select="$master-reference"/>
index ac45dade2deb06455886b8866ca9cd34ee0a181a..7b823b2260a2270061bf51e2e6e8502a73985d5d 100644 (file)
     <fo:page-sequence id="{$id}"
                       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:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
       <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:call-template>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
-
+      <xsl:attribute name="format">
+        <xsl:call-template name="page.number.format"/>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
       <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:call-template>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
       <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:call-template>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
       <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:call-template>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
       <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:call-template>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
       <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:call-template>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </xsl:attribute>
 
-    <!-- if there is a preceding chapter or part, page numbering will already -->
-    <!-- be adjusted, otherwise restart the page numbers -->
-    <xsl:if test="not(preceding::chapter or preceding::preface)
-                  and not(preceding::part)">
-      <xsl:attribute name="initial-page-number">1</xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$double.sided != 0">
-      <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
-    </xsl:if>
+    <xsl:choose>
+      <xsl:when test="not(preceding::chapter or preceding::preface)
+                      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:apply-templates select="." mode="running.head.mode">
       <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
index 95afbd13cd5bcb1f392e2d5dde7f7c6b37b695f6..c98e8fcda115e520e22e640ca1838ed807ee224c 100644 (file)
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </xsl:attribute>
     <xsl:if 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:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </xsl:attribute>
     <xsl:if 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:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
index 916c98ab86eb98e1f4f3e7a7768030c7a3742a63..c4d026268c6391a7c1a4340f603cd15d79bdaf33 100644 (file)
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </xsl:attribute>
     <xsl:if 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:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
index b6791f708fb43c56935b71e09ae5ae31f33913e0..02c09f58d64070030a261acac57223aed4be8238 100644 (file)
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
+      <xsl:attribute name="format">
+        <xsl:call-template name="page.number.format"/>
+      </xsl:attribute>
       <xsl:if 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:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </xsl:attribute>
     <xsl:if 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:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
         <xsl:attribute name="language">
           <xsl:call-template name="l10n.language"/>
         </xsl:attribute>
+        <xsl:attribute name="format">
+          <xsl:call-template name="page.number.format"/>
+        </xsl:attribute>
         <xsl:if 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:if>
 
         <xsl:apply-templates select="." mode="running.head.mode">
index 97d15b839a29f580e06aefca72231521dbc3719c..e7f917f048c021698da44271339bfb765ae92525 100644 (file)
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </xsl:attribute>
     <xsl:if 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:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
+    <xsl:attribute name="format">
+      <xsl:call-template name="page.number.format"/>
+    </xsl:attribute>
     <xsl:if 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:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
index d913540c375f2da1fc869ad4bff0203aed9d4cab..ac091ae7d346b43f2e5874ba42a700d4347736a0 100644 (file)
           <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:call-template>
+          </xsl:attribute>
           <xsl:if 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:if>
 
           <xsl:apply-templates select="." mode="running.head.mode">
           <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:call-template>
+          </xsl:attribute>
           <xsl:if 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:if>
 
           <xsl:apply-templates select="." mode="running.head.mode">