More hacking on page headers and footers: added toggles for rules and headers on...

diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index b83bfeb96fbfd655545de25a5ce3bb605fe4bfe1..ac45dade2deb06455886b8866ca9cd34ee0a181a 100644 (file)
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -205,10 +205,12 @@
 
       <xsl:apply-templates select="." mode="running.head.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'TableofContents'"/>
       </xsl:apply-templates>
 
       <xsl:apply-templates select="." mode="running.foot.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'TableofContents'"/>
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
@@ -231,10 +233,12 @@
 
       <xsl:apply-templates select="." mode="running.head.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofFigures'"/>
       </xsl:apply-templates>
 
       <xsl:apply-templates select="." mode="running.foot.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofFigures'"/>
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
@@ -260,10 +264,12 @@
 
       <xsl:apply-templates select="." mode="running.head.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofTables'"/>
       </xsl:apply-templates>
 
       <xsl:apply-templates select="." mode="running.foot.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofTables'"/>
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
@@ -289,10 +295,12 @@
 
       <xsl:apply-templates select="." mode="running.head.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofExamples'"/>
       </xsl:apply-templates>
 
       <xsl:apply-templates select="." mode="running.foot.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofExamples'"/>
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
@@ -318,10 +326,12 @@
 
       <xsl:apply-templates select="." mode="running.head.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofEquations'"/>
       </xsl:apply-templates>
 
       <xsl:apply-templates select="." mode="running.foot.mode">
         <xsl:with-param name="master-reference" select="$lot-master-reference"/>
+        <xsl:with-param name="gentext-key" select="'ListofEquations'"/>
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index 6241cdff20a12fbab1791a8d851263ee07cdd78e..916c98ab86eb98e1f4f3e7a7768030c7a3742a63 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -36,10 +36,7 @@
   </xsl:variable>
 
   <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="column.count"
-                      select="$column.count.of.index"/>
-    </xsl:call-template>
+    <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 541e8a4a2178b720ff389107960582dbb28439f1..ead67539c16f3bea644a2c2d2e3a94ff85987d0b 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -15,13 +15,6 @@
 
 <!-- ==================================================================== -->
 
-<xsl:param name="column.count.titlepage" select="1"/>
-<xsl:param name="column.count.lot" select="1"/>
-<xsl:param name="column.count.front" select="1"/>
-<xsl:param name="column.count.body" select="1"/>
-<xsl:param name="column.count.back" select="1"/>
-<xsl:param name="column.count.index" select="2"/>
-
 <xsl:template name="setup.pagemasters">
   <fo:layout-master-set>
     <!-- blank pages -->
@@ -1164,13 +1157,39 @@
 
 <!-- ==================================================================== -->
 
-<xsl:template match="*" mode="running.head.mode">
-  <xsl:param name="master-reference" select="'unknown'"/>
-  <!-- by default, nothing -->
+<xsl:template name="head.sep.rule">
+  <xsl:if test="$header.rule != 0">
+    <xsl:attribute name="border-bottom-width">1px</xsl:attribute>
+    <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
+    <xsl:attribute name="border-bottom-color">black</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="foot.sep.rule">
+  <xsl:if test="$footer.rule != 0">
+    <xsl:attribute name="border-top-width">1px</xsl:attribute>
+    <xsl:attribute name="border-top-style">solid</xsl:attribute>
+    <xsl:attribute name="border-top-color">black</xsl:attribute>
+  </xsl:if>
 </xsl:template>
 
-<xsl:template match="preface|chapter|appendix" mode="running.head.mode">
+<xsl:template match="*" mode="running.head.mode">
   <xsl:param name="master-reference" select="'unknown'"/>
+  <xsl:param name="gentext-key" select="'TableofContents'"/>
+
+  <!-- remove -draft from reference -->
+  <xsl:variable name="flow-name">
+    <xsl:choose>
+      <xsl:when test="contains($master-reference, '-draft')">
+        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$master-reference"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:message>running head for <xsl:value-of select="local-name(.)"/> with ref <xsl:value-of select="$flow-name"/></xsl:message>
 
   <xsl:variable name="draft">
     <xsl:choose>
@@ -1193,17 +1212,19 @@
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:variable name="head-first">
+  <xsl:variable name="head-blank">
     <fo:table table-layout="fixed" width="100%">
       <fo:table-column column-number="1" column-width="33%"/>
       <fo:table-column column-number="2" column-width="34%"/>
       <fo:table-column column-number="3" column-width="33%"/>
       <fo:table-body>
-        <fo:table-row>
+        <fo:table-row height="14pt">
           <fo:table-cell text-align="left"
                          relative-align="baseline"
                          display-align="before">
-            <fo:block/>
+            <fo:block>
+              <xsl:value-of select="$draft"/>
+            </fo:block>
           </fo:table-cell>
           <fo:table-cell text-align="center"
                          relative-align="baseline"
@@ -1222,27 +1243,62 @@
     </fo:table>
   </xsl:variable>
 
-  <xsl:variable name="head-odd">
+  <xsl:variable name="head-empty">
     <fo:table table-layout="fixed" width="100%">
+      <xsl:call-template name="head.sep.rule"/>
       <fo:table-column column-number="1" column-width="33%"/>
       <fo:table-column column-number="2" column-width="34%"/>
       <fo:table-column column-number="3" column-width="33%"/>
       <fo:table-body>
-        <fo:table-row>
+        <fo:table-row height="14pt">
           <fo:table-cell text-align="left"
                          relative-align="baseline"
                          display-align="before">
+            <fo:block>
+              <xsl:value-of select="$draft"/>
+            </fo:block>
+          </fo:table-cell>
+          <fo:table-cell text-align="center"
+                         relative-align="baseline"
+                         display-align="before">
             <fo:block/>
           </fo:table-cell>
+          <fo:table-cell text-align="right"
+                         relative-align="baseline"
+                         display-align="before">
+            <fo:block>
+              <xsl:value-of select="$draft"/>
+            </fo:block>
+          </fo:table-cell>
+        </fo:table-row>
+      </fo:table-body>
+    </fo:table>
+  </xsl:variable>
+
+  <xsl:variable name="head-even">
+    <fo:table table-layout="fixed" width="100%">
+      <xsl:call-template name="head.sep.rule"/>
+      <fo:table-column column-number="1" column-width="33%"/>
+      <fo:table-column column-number="2" column-width="34%"/>
+      <fo:table-column column-number="3" column-width="33%"/>
+      <fo:table-body>
+        <fo:table-row height="14pt">
+          <fo:table-cell text-align="left"
+                         relative-align="baseline"
+                         display-align="before">
+            <fo:block>
+              <xsl:value-of select="$draft"/>
+            </fo:block>
+          </fo:table-cell>
           <fo:table-cell text-align="center"
                          relative-align="baseline"
                          display-align="before">
             <fo:block>
               <xsl:choose>
-                <xsl:when test="(/book or /set) and ($double.sided != 0)">
-                  <fo:retrieve-marker retrieve-class-name="section.head.marker"
-                                      retrieve-position="first-including-carryover"
-                                      retrieve-boundary="page"/>
+                <xsl:when test="starts-with($master-reference, 'lot')">
+                  <xsl:call-template name="gentext">
+                    <xsl:with-param name="key" select="$gentext-key"/>
+                  </xsl:call-template>
                 </xsl:when>
                 <xsl:otherwise>
                   <xsl:apply-templates select="." mode="object.title.markup"/>
@@ -1262,13 +1318,14 @@
     </fo:table>
   </xsl:variable>
 
-  <xsl:variable name="head-even">
+  <xsl:variable name="head-odd">
     <fo:table table-layout="fixed" width="100%">
+      <xsl:call-template name="head.sep.rule"/>
       <fo:table-column column-number="1" column-width="33%"/>
       <fo:table-column column-number="2" column-width="34%"/>
       <fo:table-column column-number="3" column-width="33%"/>
       <fo:table-body>
-        <fo:table-row>
+        <fo:table-row height="14pt">
           <fo:table-cell text-align="left"
                          relative-align="baseline"
                          display-align="before">
@@ -1280,13 +1337,24 @@
                          relative-align="baseline"
                          display-align="before">
             <fo:block>
-              <xsl:apply-templates select="." mode="object.title.markup"/>
+              <xsl:choose>
+                <xsl:when test="ancestor::book and ($double.sided != 0)">
+                  <fo:retrieve-marker retrieve-class-name="section.head.marker"
+                                      retrieve-position="first-including-carryover"
+                                      retrieve-boundary="page"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:apply-templates select="." mode="object.title.markup"/>
+                </xsl:otherwise>
+              </xsl:choose>
             </fo:block>
           </fo:table-cell>
           <fo:table-cell text-align="right"
                          relative-align="baseline"
                          display-align="before">
-            <fo:block/>
+            <fo:block>
+              <xsl:value-of select="$draft"/>
+            </fo:block>
           </fo:table-cell>
         </fo:table-row>
       </fo:table-body>
@@ -1295,34 +1363,47 @@
 
   <xsl:choose>
     <xsl:when test="starts-with($master-reference, 'titlepage')">
-      <!-- no headers -->
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-first">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:copy-of select="$head-blank"/>
+        </fo:block>
+      </fo:static-content>
+
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-odd">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:copy-of select="$head-blank"/>
+        </fo:block>
+      </fo:static-content>
+
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-even">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:copy-of select="$head-blank"/>
+        </fo:block>
+      </fo:static-content>
+
+      <fo:static-content flow-name="xsl-region-before-blank">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:if test="$headers.on.blank.pages != 0">
+            <xsl:copy-of select="$head-empty"/>
+          </xsl:if>
+        </fo:block>
+      </fo:static-content>
     </xsl:when>
-    <xsl:when test="$master-reference = 'lot'
-                    or $master-reference = 'front'
-                    or $master-reference = 'body'
-                    or $master-reference = 'back'
-                    or $master-reference = 'index'
-                    or $master-reference = 'lot-draft'
-                    or $master-reference = 'front-draft'
-                    or $master-reference = 'body-draft'
-                    or $master-reference = 'back-draft'
-                    or $master-reference = 'index-draft'">
-      <xsl:if test="$master-reference != 'blank'">
-        <fo:static-content flow-name="xsl-region-before-{$master-reference}-first">
-          <fo:block margin-left="{$title.margin.left}">
-            <xsl:copy-of select="$head-first"/>
-            <fo:block/>
-          </fo:block>
-        </fo:static-content>
-      </xsl:if>
 
-      <fo:static-content flow-name="xsl-region-before-{$master-reference}-odd">
+    <xsl:when test="starts-with($master-reference, 'lot')">
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-first">
         <fo:block margin-left="{$title.margin.left}">
-          <xsl:copy-of select="$head-odd"/>
+          <xsl:copy-of select="$head-empty"/>
+        </fo:block>
+      </fo:static-content>
+
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-odd">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:copy-of select="$head-even"/> <!-- yes, even -->
         </fo:block>
       </fo:static-content>
 
-      <fo:static-content flow-name="xsl-region-before-{$master-reference}-even">
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-even">
         <fo:block margin-left="{$title.margin.left}">
           <xsl:copy-of select="$head-even"/>
         </fo:block>
@@ -1330,18 +1411,39 @@
 
       <fo:static-content flow-name="xsl-region-before-blank">
         <fo:block margin-left="{$title.margin.left}">
-          <!-- no headers on blank pages by default -->
+          <xsl:if test="$headers.on.blank.pages != 0">
+            <xsl:copy-of select="$head-empty"/>
+          </xsl:if>
         </fo:block>
       </fo:static-content>
     </xsl:when>
+
     <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unexpected master-reference (</xsl:text>
-        <xsl:value-of select="$master-reference"/>
-        <xsl:text>) in running.head.mode for </xsl:text>
-        <xsl:value-of select="name(.)"/>
-        <xsl:text>. No header generated.</xsl:text>
-      </xsl:message>
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-first">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:copy-of select="$head-empty"/>
+        </fo:block>
+      </fo:static-content>
+
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-odd">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:copy-of select="$head-odd"/>
+        </fo:block>
+      </fo:static-content>
+
+      <fo:static-content flow-name="xsl-region-before-{$flow-name}-even">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:copy-of select="$head-even"/>
+        </fo:block>
+      </fo:static-content>
+
+      <fo:static-content flow-name="xsl-region-before-blank">
+        <fo:block margin-left="{$title.margin.left}">
+          <xsl:if test="$headers.on.blank.pages != 0">
+            <xsl:copy-of select="$head-empty"/>
+          </xsl:if>
+        </fo:block>
+      </fo:static-content>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
@@ -1350,6 +1452,19 @@
 
 <xsl:template match="*" mode="running.foot.mode">
   <xsl:param name="master-reference" select="'unknown'"/>
+  <xsl:param name="gentext-key" select="'TableofContents'"/>
+
+  <!-- remove -draft from reference -->
+  <xsl:variable name="flow-name">
+    <xsl:choose>
+      <xsl:when test="contains($master-reference, '-draft')">
+        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$master-reference"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
 
   <!-- by default, the page number -->
   <xsl:variable name="foot">
@@ -1372,7 +1487,15 @@
 
   <xsl:choose>
     <xsl:when test="starts-with($master-reference,'titlepage')">
-      <!-- no footers -->
+      <!-- no footers; but maybe footers on a following blank page -->
+      <fo:static-content flow-name="xsl-region-after-blank">
+        <fo:block text-align="{$align-even}" margin-left="{$title.margin.left}">
+          <xsl:if test="$footers.on.blank.pages != 0">
+            <xsl:call-template name="foot.sep.rule"/>
+            <xsl:copy-of select="$foot"/>
+          </xsl:if>
+        </fo:block>
+      </fo:static-content>
     </xsl:when>
     <xsl:when test="$master-reference = 'titlepage'
                     or $master-reference = 'lot'
@@ -1386,26 +1509,30 @@
                     or $master-reference = 'body-draft'
                     or $master-reference = 'back-draft'
                     or $master-reference = 'index-draft'">
-      <xsl:if test="$master-reference != 'blank'">
-        <fo:static-content flow-name="xsl-region-after-{$master-reference}-first">
-          <fo:block text-align="{$align-odd}" margin-left="{$title.margin.left}">
-            <xsl:copy-of select="$foot"/>
-          </fo:block>
-        </fo:static-content>
-      </xsl:if>
-      <fo:static-content flow-name="xsl-region-after-{$master-reference}-odd">
+      <fo:static-content flow-name="xsl-region-after-{$flow-name}-first">
         <fo:block text-align="{$align-odd}" margin-left="{$title.margin.left}">
+          <xsl:call-template name="foot.sep.rule"/>
           <xsl:copy-of select="$foot"/>
         </fo:block>
       </fo:static-content>
-      <fo:static-content flow-name="xsl-region-after-{$master-reference}-even">
+      <fo:static-content flow-name="xsl-region-after-{$flow-name}-odd">
+        <fo:block text-align="{$align-odd}" margin-left="{$title.margin.left}">
+          <xsl:call-template name="foot.sep.rule"/>
+          <xsl:copy-of select="$foot"/>
+        </fo:block>
+      </fo:static-content>
+      <fo:static-content flow-name="xsl-region-after-{$flow-name}-even">
         <fo:block text-align="{$align-even}" margin-left="{$title.margin.left}">
+          <xsl:call-template name="foot.sep.rule"/>
           <xsl:copy-of select="$foot"/>
         </fo:block>
       </fo:static-content>
       <fo:static-content flow-name="xsl-region-after-blank">
         <fo:block text-align="{$align-even}" margin-left="{$title.margin.left}">
-          <xsl:copy-of select="$foot"/>
+          <xsl:if test="$footers.on.blank.pages != 0">
+            <xsl:call-template name="foot.sep.rule"/>
+            <xsl:copy-of select="$foot"/>
+          </xsl:if>
         </fo:block>
       </fo:static-content>
     </xsl:when>

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 11a1e443b9a54f78ab777ebd0d39a105ad0e7378..a426035a61e32dfade84c44ed3e1dc0ad2820336 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -42,6 +42,8 @@
 <!ENTITY draft.mode SYSTEM "../params/draft.mode.xml">
 <!ENTITY draft.watermark.image SYSTEM "../params/draft.watermark.image.xml">
 <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml">
+<!ENTITY footer.rule SYSTEM "../params/footer.rule.xml">
+<!ENTITY footers.on.blank.pages SYSTEM "../params/footers.on.blank.pages.xml">
 <!ENTITY footnote.font.size SYSTEM "../params/footnote.font.size.xml">
 <!ENTITY fop.extensions SYSTEM "../params/fop.extensions.xml">
 <!ENTITY formal.object.properties SYSTEM "../params/formal.object.properties.xml">
@@ -53,13 +55,15 @@
 <!ENTITY function.parens SYSTEM "../params/function.parens.xml">
 <!ENTITY generate.index SYSTEM "../params/generate.index.xml">
 <!ENTITY generate.toc SYSTEM "../params/generate.toc.xml">
-<!ENTITY glossary.collection SYSTEM "../params/glossary.collection.xml">
-<!ENTITY glossterm.width SYSTEM "../params/glossterm.width.xml">
-<!ENTITY glossterm.separation SYSTEM "../params/glossterm.separation.xml">
 <!ENTITY glossary.as.blocks SYSTEM "../params/glossary.as.blocks.xml">
+<!ENTITY glossary.collection SYSTEM "../params/glossary.collection.xml">
 <!ENTITY glosslist.as.blocks SYSTEM "../params/glosslist.as.blocks.xml">
 <!ENTITY glossterm.auto.link SYSTEM "../params/glossterm.auto.link.xml">
+<!ENTITY glossterm.separation SYSTEM "../params/glossterm.separation.xml">
+<!ENTITY glossterm.width SYSTEM "../params/glossterm.width.xml">
 <!ENTITY graphic.default.extension SYSTEM "../params/graphic.default.extension.xml">
+<!ENTITY header.rule SYSTEM "../params/header.rule.xml">
+<!ENTITY headers.on.blank.pages SYSTEM "../params/headers.on.blank.pages.xml">
 <!ENTITY hyphenate SYSTEM "../params/hyphenate.xml">
 <!ENTITY informal.object.properties SYSTEM "../params/informal.object.properties.xml">
 <!ENTITY insert.xref.page.number SYSTEM "../params/insert.xref.page.number.xml">
@@ -93,6 +97,7 @@
 <!ENTITY process.empty.source.toc SYSTEM "../params/process.empty.source.toc.xml">
 <!ENTITY process.source.toc SYSTEM "../params/process.source.toc.xml">
 <!ENTITY profile.arch SYSTEM "../params/profile.arch.xml">
+<!ENTITY profile.attribute SYSTEM "../params/profile.attribute.xml">
 <!ENTITY profile.condition SYSTEM "../params/profile.condition.xml">
 <!ENTITY profile.conformance SYSTEM "../params/profile.conformance.xml">
 <!ENTITY profile.lang SYSTEM "../params/profile.lang.xml">
@@ -101,11 +106,10 @@
 <!ENTITY profile.revisionflag SYSTEM "../params/profile.revisionflag.xml">
 <!ENTITY profile.role SYSTEM "../params/profile.role.xml">
 <!ENTITY profile.security SYSTEM "../params/profile.security.xml">
+<!ENTITY profile.separator SYSTEM "../params/profile.separator.xml">
 <!ENTITY profile.userlevel SYSTEM "../params/profile.userlevel.xml">
-<!ENTITY profile.vendor SYSTEM "../params/profile.vendor.xml">
-<!ENTITY profile.attribute SYSTEM "../params/profile.attribute.xml">
 <!ENTITY profile.value SYSTEM "../params/profile.value.xml">
-<!ENTITY profile.separator SYSTEM "../params/profile.separator.xml">
+<!ENTITY profile.vendor SYSTEM "../params/profile.vendor.xml">
 <!ENTITY punct.honorific SYSTEM "../params/punct.honorific.xml">
 <!ENTITY qanda.inherit.numeration SYSTEM "../params/qanda.inherit.numeration.xml">
 <!ENTITY qandadiv.autolabel SYSTEM "../params/qandadiv.autolabel.xml">
@@ -132,20 +136,20 @@
 <!ENTITY table.cell.padding SYSTEM "../params/table.cell.padding.xml">
 <!ENTITY table.entry.padding SYSTEM "../params/table.entry.padding.xml">
 <!ENTITY tablecolumns.extension SYSTEM "../params/tablecolumns.extension.xml">
-<!ENTITY textinsert.extension SYSTEM "../params/textinsert.extension.xml">
 <!ENTITY tex.math.delims SYSTEM "../params/tex.math.delims.xml">
 <!ENTITY tex.math.in.alt SYSTEM "../params/tex.math.in.alt.xml">
+<!ENTITY textinsert.extension SYSTEM "../params/textinsert.extension.xml">
 <!ENTITY title.font.family SYSTEM "../params/title.font.family.xml">
 <!ENTITY title.margin.left SYSTEM "../params/title.margin.left.xml">
 <!ENTITY toc.indent.width SYSTEM "../params/toc.indent.width.xml">
 <!ENTITY toc.margin.properties SYSTEM "../params/toc.margin.properties.xml">
 <!ENTITY toc.section.depth SYSTEM "../params/toc.section.depth.xml">
-<!ENTITY use.extensions SYSTEM "../params/use.extensions.xml">
-<!ENTITY use.role.as.xrefstyle SYSTEM "../params/use.role.as.xrefstyle.xml">
-<!ENTITY use.svg SYSTEM "../params/use.svg.xml">
 <!ENTITY ulink.footnotes SYSTEM "../params/ulink.footnotes.xml">
 <!ENTITY ulink.hyphenate SYSTEM "../params/ulink.hyphenate.xml">
 <!ENTITY ulink.show SYSTEM "../params/ulink.show.xml">
+<!ENTITY use.extensions SYSTEM "../params/use.extensions.xml">
+<!ENTITY use.role.as.xrefstyle SYSTEM "../params/use.role.as.xrefstyle.xml">
+<!ENTITY use.svg SYSTEM "../params/use.svg.xml">
 <!ENTITY variablelist.as.blocks SYSTEM "../params/variablelist.as.blocks.xml">
 <!ENTITY verbatim.properties SYSTEM "../params/verbatim.properties.xml">
 <!ENTITY xep.extensions SYSTEM "../params/xep.extensions.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 9b12aa1b0bafe90e63586e6c0be3ba9bfb83da93..f84e46e1904dad8a16c59208d2a479771242e9ab 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -301,6 +301,10 @@ zero by default, so this is simply the page-master region-left.
 &title.margin.left;
 &draft.mode;
 &draft.watermark.image;
+&headers.on.blank.pages;
+&footers.on.blank.pages;
+&header.rule;
+&footer.rule;
 </reference>
 
 <reference><title>Font Families</title>
@@ -426,6 +430,8 @@ around all these parameters.</para>
 <src:fragref linkend="draft.mode.frag"/>
 <src:fragref linkend="draft.watermark.image.frag"/>
 <src:fragref linkend="firstterm.only.link.frag"/>
+<src:fragref linkend="footer.rule.frag"/>
+<src:fragref linkend="footers.on.blank.pages.frag"/>
 <src:fragref linkend="footnote.font.size.frag"/>
 <src:fragref linkend="fop.extensions.frag"/>
 <src:fragref linkend="formal.object.properties.frag"/>
@@ -444,6 +450,8 @@ around all these parameters.</para>
 <src:fragref linkend="glossterm.separation.frag"/>
 <src:fragref linkend="glossterm.width.frag"/>
 <src:fragref linkend="graphic.default.extension.frag"/>
+<src:fragref linkend="header.rule.frag"/>
+<src:fragref linkend="headers.on.blank.pages.frag"/>
 <src:fragref linkend="hyphenate.frag"/>
 <src:fragref linkend="informal.object.properties.frag"/>
 <src:fragref linkend="insert.xref.page.number.frag"/>