Adjusted left margins in page masters to compensate

for $title.margin.left.

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 6bf18b3badb1863bd25777a4b7b671bda462f5c7..d63f9f6c21740a16ca4878eab48acdec6d10ce23 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -23,7 +23,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.outer}"
+                          margin-left="{$page.margin.outer} - {$title.margin.left}"
                            margin-right="{$page.margin.inner}">
       <fo:region-body display-align="center"
                       margin-bottom="{$body.margin.bottom}"
@@ -46,7 +46,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                          margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -66,7 +66,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                          margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -87,7 +87,7 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
                            margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer}">
+                          margin-left="{$page.margin.outer} - {$title.margin.left}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.titlepage}"
@@ -107,7 +107,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                              margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -127,7 +127,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -148,7 +148,7 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
                            margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer}">
+                           margin-left="{$page.margin.outer} - {$title.margin.left}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.lot}"
@@ -168,7 +168,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -188,7 +188,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -209,7 +209,7 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
                            margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer}">
+                           margin-left="{$page.margin.outer} - {$title.margin.left}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.front}"
@@ -229,7 +229,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -249,7 +249,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -270,7 +270,7 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
                            margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer}">
+                           margin-left="{$page.margin.outer} - {$title.margin.left}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.body}"
@@ -290,7 +290,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -310,7 +310,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -331,7 +331,7 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
                            margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer}">
+                           margin-left="{$page.margin.outer} - {$title.margin.left}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.back}"
@@ -351,7 +351,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -371,7 +371,7 @@
                            page-height="{$page.height}"
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
+                           margin-left="{$page.margin.inner} - {$title.margin.left}"
                            margin-right="{$page.margin.outer}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
@@ -392,7 +392,7 @@
                            margin-top="{$page.margin.top}"
                            margin-bottom="{$page.margin.bottom}"
                            margin-right="{$page.margin.inner}"
-                           margin-left="{$page.margin.outer}">
+                           margin-left="{$page.margin.outer} - {$title.margin.left}">
       <fo:region-body margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.index}"
@@ -413,7 +413,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.outer}"
+                            margin-left="{$page.margin.outer} - {$title.margin.left}"
                              margin-right="{$page.margin.inner}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}">
@@ -443,7 +443,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -474,7 +474,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -506,7 +506,7 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
                              margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
+                            margin-left="{$page.margin.outer} - {$title.margin.left}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.titlepage}"
@@ -537,7 +537,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -568,7 +568,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -600,7 +600,7 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
                              margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
+                            margin-left="{$page.margin.outer} - {$title.margin.left}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.lot}"
@@ -631,7 +631,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -662,7 +662,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -694,7 +694,7 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
                              margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
+                            margin-left="{$page.margin.outer} - {$title.margin.left}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.front}"
@@ -725,7 +725,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -756,7 +756,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -788,7 +788,7 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
                              margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
+                            margin-left="{$page.margin.outer} - {$title.margin.left}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.body}"
@@ -819,7 +819,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -850,7 +850,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -882,7 +882,7 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
                              margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
+                            margin-left="{$page.margin.outer} - {$title.margin.left}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.back}"
@@ -913,7 +913,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -944,7 +944,7 @@
                              page-height="{$page.height}"
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
+                            margin-left="{$page.margin.inner} - {$title.margin.left}"
                              margin-right="{$page.margin.outer}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
@@ -976,7 +976,7 @@
                              margin-top="{$page.margin.top}"
                              margin-bottom="{$page.margin.bottom}"
                              margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
+                            margin-left="{$page.margin.outer} - {$title.margin.left}">
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.index}"