Updated header/footer properties to avoid missmatched margins caused by title.margin...

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index c4c628c130a52daf97a2142e1674f1eae57555a1..eb6205b5d6282348cced21e3efcb1b16fbd4b900 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -1248,7 +1248,7 @@
   </xsl:variable>
 
   <fo:static-content flow-name="xsl-region-before-first">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="header.content.properties">
       <xsl:call-template name="header.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'first'"/>
@@ -1258,7 +1258,7 @@
   </fo:static-content>
 
   <fo:static-content flow-name="xsl-region-before-odd">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="header.content.properties">
       <xsl:call-template name="header.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'odd'"/>
@@ -1268,7 +1268,7 @@
   </fo:static-content>
 
   <fo:static-content flow-name="xsl-region-before-even">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="header.content.properties">
       <xsl:call-template name="header.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'even'"/>
@@ -1278,7 +1278,7 @@
   </fo:static-content>
 
   <fo:static-content flow-name="xsl-region-before-blank">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="header.content.properties">
       <xsl:call-template name="header.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'blank'"/>
@@ -1378,7 +1378,7 @@
   </fo:block>
 -->
 
-  <fo:block xsl:use-attribute-sets="header.content.properties">
+  <fo:block>
 
     <!-- sequence can be odd, even, first, blank -->
     <!-- position can be left, center, right -->
@@ -1467,7 +1467,7 @@
   </xsl:variable>
 
   <fo:static-content flow-name="xsl-region-after-first">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="footer.content.properties">
       <xsl:call-template name="footer.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'first'"/>
@@ -1477,7 +1477,7 @@
   </fo:static-content>
 
   <fo:static-content flow-name="xsl-region-after-odd">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="footer.content.properties">
       <xsl:call-template name="footer.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'odd'"/>
@@ -1487,7 +1487,7 @@
   </fo:static-content>
 
   <fo:static-content flow-name="xsl-region-after-even">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="footer.content.properties">
       <xsl:call-template name="footer.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'even'"/>
@@ -1497,7 +1497,7 @@
   </fo:static-content>
 
   <fo:static-content flow-name="xsl-region-after-blank">
-    <fo:block margin-left="{$title.margin.left}">
+    <fo:block xsl:use-attribute-sets="footer.content.properties">
       <xsl:call-template name="footer.table">
         <xsl:with-param name="pageclass" select="$pageclass"/>
         <xsl:with-param name="sequence" select="'blank'"/>
@@ -1597,7 +1597,7 @@
   </fo:block>
 -->
 
-  <fo:block xsl:use-attribute-sets="footer.content.properties">
+  <fo:block>
 
     <!-- sequence can be odd, even, first, blank -->
     <!-- position can be left, center, right -->

diff --git a/xsl/params/footer.content.properties.xml b/xsl/params/footer.content.properties.xml
index 231323c50f9dcfa316f2b2673d5cf350e2590f29..8c3e1a5da2d23c1bae75b669f543b9f5711c549b 100644 (file)
--- a/xsl/params/footer.content.properties.xml
+++ b/xsl/params/footer.content.properties.xml
@@ -14,6 +14,12 @@
   <xsl:attribute name="font-family">
     <xsl:value-of select="$body.font.family"/>
   </xsl:attribute>
+  <xsl:attribute name="margin-left">
+    <xsl:value-of select="$title.margin.left"/>
+  </xsl:attribute>
+  <xsl:attribute name="margin-right">
+    <xsl:value-of select="$title.margin.left"/>
+  </xsl:attribute>
 </xsl:attribute-set>
 </src:fragment>
 </refsynopsisdiv>

diff --git a/xsl/params/header.content.properties.xml b/xsl/params/header.content.properties.xml
index 9429d68bd3e73560289b43be21844722f1e8044e..8cba5b97ac7fe94ec64e992a820e46491fce9c2c 100644 (file)
--- a/xsl/params/header.content.properties.xml
+++ b/xsl/params/header.content.properties.xml
@@ -14,6 +14,12 @@
   <xsl:attribute name="font-family">
     <xsl:value-of select="$body.font.family"/>
   </xsl:attribute>
+  <xsl:attribute name="margin-left">
+    <xsl:value-of select="$title.margin.left"/>
+  </xsl:attribute>
+  <xsl:attribute name="margin-right">
+    <xsl:value-of select="$title.margin.left"/>
+  </xsl:attribute>
 </xsl:attribute-set>
 </src:fragment>
 </refsynopsisdiv>