Added parameters for header/footer table minimum height.

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index c18a7714cf186619e10756eccce39451a2e36877..3581bbf71d4818817a435bbcc5095ee759851cc2 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -1540,16 +1540,9 @@
 
       <fo:table-body>
         <fo:table-row>
-          <xsl:choose>
-            <xsl:when test="not($fop1.extensions = 0)">
-              <!-- * for any explanation of why this is here, see -->
-              <!-- * http://wiki.apache.org/xmlgraphics-fop/Troubleshooting/CommonLogMessages -->
-              <xsl:attribute name="block-progression-dimension.minimum">14pt</xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="height">14pt</xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
+          <xsl:attribute name="block-progression-dimension.minimum">
+            <xsl:value-of select="$header.table.height"/>
+          </xsl:attribute>
           <fo:table-cell text-align="left"
                          display-align="before">
             <xsl:if test="$fop.extensions = 0">
@@ -1871,16 +1864,9 @@
 
       <fo:table-body>
         <fo:table-row>
-          <xsl:choose>
-            <xsl:when test="not($fop1.extensions = 0)">
-              <!-- * for any explanation of why this is here, see -->
-              <!-- * http://wiki.apache.org/xmlgraphics-fop/Troubleshooting/CommonLogMessages -->
-              <xsl:attribute name="block-progression-dimension.minimum">14pt</xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="height">14pt</xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
+          <xsl:attribute name="block-progression-dimension.minimum">
+            <xsl:value-of select="$footer.table.height"/>
+          </xsl:attribute>
           <fo:table-cell text-align="left"
                          display-align="after">
             <xsl:if test="$fop.extensions = 0">
@@ -2042,19 +2028,19 @@
       <xsl:choose>
         <xsl:when test="$element = 'toc'">auto-odd</xsl:when>
         <xsl:when test="$element = 'book'">1</xsl:when>
-       <!-- preface typically continues TOC roman numerals -->
-       <!-- Change page.number.format if not -->
+        <!-- preface typically continues TOC roman numerals -->
+        <!-- Change page.number.format if not -->
         <xsl:when test="$element = 'preface'">auto-odd</xsl:when>
         <xsl:when test="($element = 'dedication' or $element = 'article') 
-                   and not(preceding::chapter
+                    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="generate-id($first.book.content) =
-                       generate-id(.)">1</xsl:when>
+        <xsl:when test="generate-id($first.book.content) =
+                        generate-id(.)">1</xsl:when>
         <xsl:otherwise>auto-odd</xsl:otherwise>
       </xsl:choose>
     </xsl:when>
@@ -2073,8 +2059,8 @@
                             or preceding::dedication
                             or parent::part
                             or parent::reference)">1</xsl:when>
-       <xsl:when test="generate-id($first.book.content) =
-                       generate-id(.)">1</xsl:when>
+        <xsl:when test="generate-id($first.book.content) =
+                        generate-id(.)">1</xsl:when>
         <xsl:otherwise>auto</xsl:otherwise>
       </xsl:choose>
     </xsl:otherwise>

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 39e304993526b56c95ab1aa66bf33311d66a320b..88a53e8d42c4bdb9ba83071f3ce80eb1155afed1 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -53,6 +53,7 @@
 <!ENTITY firstterm.only.link SYSTEM "../params/firstterm.only.link.xml">
 <!ENTITY footer.rule SYSTEM "../params/footer.rule.xml">
 <!ENTITY footer.column.widths SYSTEM "../params/footer.column.widths.xml">
+<!ENTITY footer.table.height SYSTEM "../params/footer.table.height.xml">
 <!ENTITY footers.on.blank.pages SYSTEM "../params/footers.on.blank.pages.xml">
 <!ENTITY footnote.font.size SYSTEM "../params/footnote.font.size.xml">
 <!ENTITY footnote.properties SYSTEM "../params/footnote.properties.xml">
@@ -78,6 +79,7 @@
 <!ENTITY graphic.default.extension SYSTEM "../params/graphic.default.extension.xml">
 <!ENTITY header.rule SYSTEM "../params/header.rule.xml">
 <!ENTITY header.column.widths SYSTEM "../params/header.column.widths.xml">
+<!ENTITY header.table.height SYSTEM "../params/header.table.height.xml">
 <!ENTITY headers.on.blank.pages SYSTEM "../params/headers.on.blank.pages.xml">
 <!ENTITY hyphenate SYSTEM "../params/hyphenate.xml">
 <!ENTITY hyphenate.verbatim SYSTEM "../params/hyphenate.verbatim.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 3f91fede966160bce7899b9f2dab4f092e5e12bc..1c0f0e77eb793261dea51a1a7c5316ab28dfed8c 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -409,6 +409,8 @@ zero by default, so this is simply the page-master region-left.
 &footer.rule;
 &header.column.widths;
 &footer.column.widths;
+&header.table.height;
+&footer.table.height;
 &header.content.properties;
 &footer.content.properties;
 &marker.section.level;
@@ -623,6 +625,7 @@ around all these parameters.</para>
 <src:fragref linkend="footer.content.properties.frag"/>
 <src:fragref linkend="footer.rule.frag"/>
 <src:fragref linkend="footer.column.widths.frag"/>
+<src:fragref linkend="footer.table.height.frag"/>
 <src:fragref linkend="footers.on.blank.pages.frag"/>
 <src:fragref linkend="footnote.font.size.frag"/>
 <src:fragref linkend="footnote.number.format.frag"/>
@@ -653,6 +656,7 @@ around all these parameters.</para>
 <src:fragref linkend="header.content.properties.frag"/>
 <src:fragref linkend="header.rule.frag"/>
 <src:fragref linkend="header.column.widths.frag"/>
+<src:fragref linkend="header.table.height.frag"/>
 <src:fragref linkend="headers.on.blank.pages.frag"/>
 <src:fragref linkend="hyphenate.frag"/>
 <src:fragref linkend="hyphenate.verbatim.frag"/>