Added property sets to control page header and footer content formatting

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 0021f1ef76255f31b95792aece1e73d08c586edd..c4c628c130a52daf97a2142e1674f1eae57555a1 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -1378,50 +1378,53 @@
   </fo:block>
 -->
 
-  <!-- sequence can be odd, even, first, blank -->
-  <!-- position can be left, center, right -->
-  <xsl:choose>
-    <xsl:when test="$sequence = 'blank'">
-      <!-- nothing -->
-    </xsl:when>
+  <fo:block xsl:use-attribute-sets="header.content.properties">
 
-    <xsl:when test="$position='left'">
-      <!-- Same for odd, even, empty, and blank sequences -->
-      <xsl:call-template name="draft.text"/>
-    </xsl:when>
+    <!-- sequence can be odd, even, first, blank -->
+    <!-- position can be left, center, right -->
+    <xsl:choose>
+      <xsl:when test="$sequence = 'blank'">
+        <!-- nothing -->
+      </xsl:when>
 
-    <xsl:when test="($sequence='odd' or $sequence='even') and $position='center'">
-      <xsl:if test="$pageclass != 'titlepage'">
-        <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-sequence"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="object.title.markup"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:when>
+      <xsl:when test="$position='left'">
+        <!-- Same for odd, even, empty, and blank sequences -->
+        <xsl:call-template name="draft.text"/>
+      </xsl:when>
 
-    <xsl:when test="$position='center'">
-      <!-- nothing for empty and blank sequences -->
-    </xsl:when>
+      <xsl:when test="($sequence='odd' or $sequence='even') and $position='center'">
+        <xsl:if test="$pageclass != 'titlepage'">
+          <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-sequence"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:apply-templates select="." mode="object.title.markup"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:if>
+      </xsl:when>
 
-    <xsl:when test="$position='right'">
-      <!-- Same for odd, even, empty, and blank sequences -->
-      <xsl:call-template name="draft.text"/>
-    </xsl:when>
+      <xsl:when test="$position='center'">
+        <!-- nothing for empty and blank sequences -->
+      </xsl:when>
 
-    <xsl:when test="$sequence = 'first'">
-      <!-- nothing for first pages -->
-    </xsl:when>
+      <xsl:when test="$position='right'">
+        <!-- Same for odd, even, empty, and blank sequences -->
+        <xsl:call-template name="draft.text"/>
+      </xsl:when>
 
-    <xsl:when test="$sequence = 'blank'">
-      <!-- nothing for blank pages -->
-    </xsl:when>
-  </xsl:choose>
+      <xsl:when test="$sequence = 'first'">
+        <!-- nothing for first pages -->
+      </xsl:when>
+
+      <xsl:when test="$sequence = 'blank'">
+        <!-- nothing for blank pages -->
+      </xsl:when>
+    </xsl:choose>
+  </fo:block>
 </xsl:template>
 
 <xsl:template name="draft.text">
@@ -1594,43 +1597,46 @@
   </fo:block>
 -->
 
-  <!-- sequence can be odd, even, first, blank -->
-  <!-- position can be left, center, right -->
-  <xsl:choose>
-    <xsl:when test="$sequence='blank'">
-      <xsl:choose>
-        <xsl:when test="$double.sided != 0 and $position = 'left'">
-          <fo:page-number/>
-        </xsl:when>
-        <xsl:when test="$double.sided = 0 and $position = 'center'">
-          <fo:page-number/>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- nop -->
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
+  <fo:block xsl:use-attribute-sets="footer.content.properties">
 
-    <xsl:when test="$pageclass='titlepage'">
-      <!-- nop: other titlepage sequences have no footer -->
-    </xsl:when>
+    <!-- sequence can be odd, even, first, blank -->
+    <!-- position can be left, center, right -->
+    <xsl:choose>
+      <xsl:when test="$sequence='blank'">
+        <xsl:choose>
+          <xsl:when test="$double.sided != 0 and $position = 'left'">
+            <fo:page-number/>
+          </xsl:when>
+          <xsl:when test="$double.sided = 0 and $position = 'center'">
+            <fo:page-number/>
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- nop -->
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
 
-    <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
-      <fo:page-number/>
-    </xsl:when>
+      <xsl:when test="$pageclass='titlepage'">
+        <!-- nop: other titlepage sequences have no footer -->
+      </xsl:when>
 
-    <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
-      <fo:page-number/>
-    </xsl:when>
+      <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
+        <fo:page-number/>
+      </xsl:when>
 
-    <xsl:when test="$double.sided = 0 and $position='center'">
-      <fo:page-number/>
-    </xsl:when>
+      <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
+        <fo:page-number/>
+      </xsl:when>
 
-    <xsl:otherwise>
-      <!-- nop -->
-    </xsl:otherwise>
-  </xsl:choose>
+      <xsl:when test="$double.sided = 0 and $position='center'">
+        <fo:page-number/>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <!-- nop -->
+      </xsl:otherwise>
+    </xsl:choose>
+  </fo:block>
 </xsl:template>
 
 <!-- ==================================================================== -->

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index efbfc984defe3fde24a6685a06d47fc0b774e2bb..0f456ffe901e367e4afffb98daa3375eb0d3d44a 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -178,4 +178,6 @@
 <!ENTITY table.cell.border.thickness SYSTEM "../params/table.cell.border.thickness.xml">
 <!ENTITY table.frame.border.color SYSTEM "../params/table.frame.border.color.xml">
 <!ENTITY table.frame.border.style SYSTEM "../params/table.frame.border.style.xml">
-<!ENTITY table.frame.border.thickness SYSTEM "../params/table.frame.border.thickness.xml">
\ No newline at end of file
+<!ENTITY table.frame.border.thickness SYSTEM "../params/table.frame.border.thickness.xml">
+<!ENTITY header.content.properties SYSTEM "../params/header.content.properties.xml">
+<!ENTITY footer.content.properties SYSTEM "../params/footer.content.properties.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 1f7e149a3f4daecd7dfce969dbb04ea501f5f89f..ae85e3b48eb4186fcb341eec0e97a87179a30f50 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -325,6 +325,8 @@ zero by default, so this is simply the page-master region-left.
 &footers.on.blank.pages;
 &header.rule;
 &footer.rule;
+&header.content.properties;
+&footer.content.properties;
 </reference>
 
 <reference><title>Font Families</title>
@@ -469,6 +471,7 @@ 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.content.properties.frag"/>
 <src:fragref linkend="footer.rule.frag"/>
 <src:fragref linkend="footers.on.blank.pages.frag"/>
 <src:fragref linkend="footnote.font.size.frag"/>
@@ -490,6 +493,7 @@ 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.content.properties.frag"/>
 <src:fragref linkend="header.rule.frag"/>
 <src:fragref linkend="headers.on.blank.pages.frag"/>
 <src:fragref linkend="hyphenate.frag"/>

diff --git a/xsl/params/footer.content.properties.xml b/xsl/params/footer.content.properties.xml
new file mode 100644 (file)
index 0000000..231323c
--- /dev/null
+++ b/xsl/params/footer.content.properties.xml
@@ -0,0 +1,26 @@
+<refentry id="footer.content.properties">
+<refmeta>
+<refentrytitle>footer.content.properties</refentrytitle>
+<refmiscinfo role="type"></refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>footer.content.properties</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='footer.content.properties.frag'>
+<xsl:attribute-set name="footer.content.properties">
+  <xsl:attribute name="font-family">
+    <xsl:value-of select="$body.font.family"/>
+  </xsl:attribute>
+</xsl:attribute-set>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Properties of page footer content.</para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/header.content.properties.xml b/xsl/params/header.content.properties.xml
new file mode 100644 (file)
index 0000000..9429d68
--- /dev/null
+++ b/xsl/params/header.content.properties.xml
@@ -0,0 +1,26 @@
+<refentry id="header.content.properties">
+<refmeta>
+<refentrytitle>header.content.properties</refentrytitle>
+<refmiscinfo role="type"></refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>header.content.properties</refname>
+<refpurpose></refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='header.content.properties.frag'>
+<xsl:attribute-set name="header.content.properties">
+  <xsl:attribute name="font-family">
+    <xsl:value-of select="$body.font.family"/>
+  </xsl:attribute>
+</xsl:attribute-set>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Properties of page header content.</para>
+
+</refsect1>
+</refentry>