Add support for side body margins and side static content regions.

Fixes bug 3389931.

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 9c96bc1f9cfeceb19a5d91d88f8692392d05ff68..8cd845e088ca7f0eb25ca206bd91c6819b00c652 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -29,16 +29,32 @@
     <xsl:value-of select="$symbol.font.family"/>
 </xsl:param>
 
-<xsl:param name="margin.left.inner">
+<!-- These are internal parameters are for the individual precedence attributes -->
+<xsl:param name="region.start.precedence">
   <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:value-of select="$page.margin.inner"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.margin.inner"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:otherwise>
+    <xsl:when test="$side.region.precedence = 'true'">true</xsl:when>
+    <xsl:otherwise>false</xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<xsl:param name="region.end.precedence">
+  <xsl:choose>
+    <xsl:when test="$side.region.precedence = 'true'">true</xsl:when>
+    <xsl:otherwise>false</xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<xsl:param name="region.before.precedence">
+  <xsl:choose>
+    <xsl:when test="$side.region.precedence = 'true'">false</xsl:when>
+    <xsl:otherwise>true</xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<xsl:param name="region.after.precedence">
+  <xsl:choose>
+    <xsl:when test="$side.region.precedence = 'true'">false</xsl:when>
+    <xsl:otherwise>true</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
 
@@ -67,16 +83,32 @@
       <fo:region-body display-align="center"
                       margin-bottom="{$body.margin.bottom}"
                       margin-top="{$body.margin.top}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
         <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
           <xsl:attribute name="region-name">blank-body</xsl:attribute>
         </xsl:if>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-blank"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-blank"
                        extent="{$region.after.extent}"
-                        display-align="after"/>
+                       precedence="{$region.after.precedence}"
+                       display-align="after"/>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">blank</xsl:with-param>
+        <xsl:with-param name="pageclass">blank</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">blank</xsl:with-param>
+        <xsl:with-param name="pageclass">blank</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <!-- title pages -->
@@ -103,13 +135,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.titlepage}"
                       column-count="{$column.count.titlepage}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-first"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="titlepage-odd"
@@ -135,13 +183,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.titlepage}"
                       column-count="{$column.count.titlepage}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-odd"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="titlepage-even"
@@ -167,13 +231,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.titlepage}"
                       column-count="{$column.count.titlepage}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-even"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <!-- list-of-title pages -->
@@ -200,13 +280,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.lot}"
                       column-count="{$column.count.lot}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-first"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">lot</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">lot</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="lot-odd"
@@ -232,13 +328,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.lot}"
                       column-count="{$column.count.lot}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-odd"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">lot</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">lot</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="lot-even"
@@ -264,13 +376,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.lot}"
                       column-count="{$column.count.lot}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-even"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">lot</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">lot</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <!-- frontmatter pages -->
@@ -297,13 +425,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.front}"
                       column-count="{$column.count.front}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-first"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">front</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">front</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="front-odd"
@@ -329,13 +473,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.front}"
                       column-count="{$column.count.front}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-odd"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">front</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">front</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="front-even"
@@ -361,13 +521,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.front}"
                       column-count="{$column.count.front}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-even"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                         display-align="after"/>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">front</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">front</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <!-- body pages -->
@@ -397,13 +573,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.body}"
                       column-count="{$column.count.body}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-first"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">body</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">body</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="body-odd"
@@ -429,13 +621,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.body}"
                       column-count="{$column.count.body}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-odd"
                        extent="{$region.after.extent}"
+                       precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="pageclass">body</xsl:with-param>
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="pageclass">body</xsl:with-param>
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="body-even"
@@ -461,13 +669,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.body}"
                       column-count="{$column.count.body}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-even"
                        extent="{$region.after.extent}"
+                       precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="pageclass">body</xsl:with-param>
+        <xsl:with-param name="sequence">even</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="pageclass">body</xsl:with-param>
+        <xsl:with-param name="sequence">even</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <!-- backmatter pages -->
@@ -494,13 +718,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.back}"
                       column-count="{$column.count.back}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-first"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">back</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">back</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="back-odd"
@@ -526,13 +766,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.back}"
                       column-count="{$column.count.back}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-odd"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">back</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">back</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="back-even"
@@ -558,13 +814,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.back}"
                       column-count="{$column.count.back}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-even"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">back</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">back</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <!-- index pages -->
@@ -591,13 +863,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.index}"
                       column-count="{$column.count.index}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-first"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-first"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">index</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">first</xsl:with-param>
+        <xsl:with-param name="pageclass">index</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="index-odd"
@@ -623,13 +911,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.index}"
                       column-count="{$column.count.index}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-odd"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-odd"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">index</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">odd</xsl:with-param>
+        <xsl:with-param name="pageclass">index</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <fo:simple-page-master master-name="index-even"
@@ -655,13 +959,29 @@
                       margin-top="{$body.margin.top}"
                       column-gap="{$column.gap.index}"
                       column-count="{$column.count.index}">
+        <xsl:attribute name="margin-{$direction.align.start}">
+          <xsl:value-of select="$body.margin.outer"/>
+        </xsl:attribute>
+        <xsl:attribute name="margin-{$direction.align.end}">
+          <xsl:value-of select="$body.margin.inner"/>
+        </xsl:attribute>
       </fo:region-body>
       <fo:region-before region-name="xsl-region-before-even"
                         extent="{$region.before.extent}"
+                        precedence="{$region.before.precedence}"
                         display-align="before"/>
       <fo:region-after region-name="xsl-region-after-even"
                        extent="{$region.after.extent}"
+                        precedence="{$region.after.precedence}"
                        display-align="after"/>
+      <xsl:call-template name="region.outer">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">index</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="region.inner">
+        <xsl:with-param name="sequence">even</xsl:with-param>
+        <xsl:with-param name="pageclass">index</xsl:with-param>
+      </xsl:call-template>
     </fo:simple-page-master>
 
     <xsl:if test="$draft.mode != 'no'">
@@ -687,6 +1007,12 @@
         </xsl:if>
         <fo:region-body margin-bottom="{$body.margin.bottom}"
                         margin-top="{$body.margin.top}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -701,10 +1027,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-blank"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-blank"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">blank</xsl:with-param>
+          <xsl:with-param name="pageclass">blank</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">blank</xsl:with-param>
+          <xsl:with-param name="pageclass">blank</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <!-- draft title pages -->
@@ -731,6 +1067,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.titlepage}"
                         column-count="{$column.count.titlepage}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -745,10 +1087,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-first"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-first"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="titlepage-odd-draft"
@@ -774,6 +1126,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.titlepage}"
                         column-count="{$column.count.titlepage}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -788,10 +1146,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-odd"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-odd"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="titlepage-even-draft"
@@ -817,6 +1185,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.titlepage}"
                         column-count="{$column.count.titlepage}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -831,10 +1205,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-even"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-even"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">titlepage</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <!-- draft list-of-title pages -->
@@ -861,6 +1245,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.lot}"
                         column-count="{$column.count.lot}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -875,10 +1265,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-first"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-first"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">lot</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">lot</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="lot-odd-draft"
@@ -904,6 +1304,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.lot}"
                         column-count="{$column.count.lot}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -918,10 +1324,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-odd"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-odd"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">lot</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">lot</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="lot-even-draft"
@@ -947,6 +1363,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.lot}"
                         column-count="{$column.count.lot}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -961,10 +1383,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-even"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-even"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">lot</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">lot</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <!-- draft frontmatter pages -->
@@ -991,6 +1423,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.front}"
                         column-count="{$column.count.front}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1005,10 +1443,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-first"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-first"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">front</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">front</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="front-odd-draft"
@@ -1034,6 +1482,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.front}"
                         column-count="{$column.count.front}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1048,10 +1502,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-odd"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-odd"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">front</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">front</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="front-even-draft"
@@ -1077,6 +1541,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.front}"
                         column-count="{$column.count.front}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1091,10 +1561,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-even"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-even"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">front</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">front</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <!-- draft body pages -->
@@ -1121,6 +1601,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.body}"
                         column-count="{$column.count.body}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1135,10 +1621,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-first"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-first"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">body</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">body</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="body-odd-draft"
@@ -1164,6 +1660,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.body}"
                         column-count="{$column.count.body}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1178,10 +1680,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-odd"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-odd"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">body</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">body</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="body-even-draft"
@@ -1207,6 +1719,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.body}"
                         column-count="{$column.count.body}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1221,10 +1739,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-even"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-even"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">body</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">body</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <!-- draft backmatter pages -->
@@ -1251,6 +1779,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.back}"
                         column-count="{$column.count.back}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1265,10 +1799,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-first"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-first"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">back</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">back</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="back-odd-draft"
@@ -1294,6 +1838,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.back}"
                         column-count="{$column.count.back}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1308,10 +1858,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-odd"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-odd"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">back</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">back</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="back-even-draft"
@@ -1337,6 +1897,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.back}"
                         column-count="{$column.count.back}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1351,10 +1917,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-even"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-even"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">back</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">back</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <!-- draft index pages -->
@@ -1381,6 +1957,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.index}"
                         column-count="{$column.count.index}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1395,10 +1977,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-first"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-first"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">index</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">first</xsl:with-param>
+          <xsl:with-param name="pageclass">index</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="index-odd-draft"
@@ -1424,6 +2016,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.index}"
                         column-count="{$column.count.index}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1438,10 +2036,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-odd"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-odd"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">index</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">odd</xsl:with-param>
+          <xsl:with-param name="pageclass">index</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
 
       <fo:simple-page-master master-name="index-even-draft"
@@ -1467,6 +2075,12 @@
                         margin-top="{$body.margin.top}"
                         column-gap="{$column.gap.index}"
                         column-count="{$column.count.index}">
+          <xsl:attribute name="margin-{$direction.align.start}">
+            <xsl:value-of select="$body.margin.outer"/>
+          </xsl:attribute>
+          <xsl:attribute name="margin-{$direction.align.end}">
+            <xsl:value-of select="$body.margin.inner"/>
+          </xsl:attribute>
           <xsl:if test="$draft.watermark.image != ''">
             <xsl:attribute name="background-image">
               <xsl:call-template name="fo-external-image">
@@ -1481,10 +2095,20 @@
         </fo:region-body>
         <fo:region-before region-name="xsl-region-before-even"
                           extent="{$region.before.extent}"
+                          precedence="{$region.before.precedence}"
                           display-align="before"/>
         <fo:region-after region-name="xsl-region-after-even"
                          extent="{$region.after.extent}"
+                          precedence="{$region.after.precedence}"
                          display-align="after"/>
+        <xsl:call-template name="region.outer">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">index</xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="region.inner">
+          <xsl:with-param name="sequence">even</xsl:with-param>
+          <xsl:with-param name="pageclass">index</xsl:with-param>
+        </xsl:call-template>
       </fo:simple-page-master>
     </xsl:if>
 
@@ -1896,6 +2520,17 @@
   <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
     <xsl:call-template name="blank.page.content"/>
   </xsl:if>
+
+  <xsl:apply-templates select="." mode="region.inner.mode">
+    <xsl:with-param name="master-reference" select="$master-reference"/>
+    <xsl:with-param name="gentext-key" select="$gentext-key"/>
+  </xsl:apply-templates>
+
+  <xsl:apply-templates select="." mode="region.outer.mode">
+    <xsl:with-param name="master-reference" select="$master-reference"/>
+    <xsl:with-param name="gentext-key" select="$gentext-key"/>
+  </xsl:apply-templates>
+
 </xsl:template>
 
 <xsl:template name="footnote-separator">
@@ -1912,6 +2547,10 @@
   </fo:static-content>
 </xsl:template>
 
+<xsl:template name="running.side.content">
+  <xsl:apply-templates select="." mode="region.inner.mode"/>
+</xsl:template>
+
 <xsl:template name="header.table">
   <xsl:param name="pageclass" select="''"/>
   <xsl:param name="sequence" select="''"/>
@@ -2465,6 +3104,139 @@
   </fo:block>
 </xsl:template>
 
+<!-- ==================================================================== -->
+<xsl:template match="*" mode="region.inner.mode">
+  <xsl:param name="master-reference" select="'unknown'"/>
+  <xsl:param name="gentext-key" select="local-name(.)"/>
+
+  <!-- remove -draft from reference -->
+  <xsl:variable name="pageclass">
+    <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>
+
+  <fo:static-content flow-name="xsl-region-inner-first">
+    <xsl:call-template name="inner.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'first'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+  <fo:static-content flow-name="xsl-region-inner-odd">
+    <xsl:call-template name="inner.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'odd'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+  <fo:static-content flow-name="xsl-region-inner-even">
+    <xsl:call-template name="inner.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'even'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+  <fo:static-content flow-name="xsl-region-inner-blank">
+    <xsl:call-template name="inner.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'blank'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+</xsl:template>
+
+<xsl:template match="*" mode="region.outer.mode">
+  <xsl:param name="master-reference" select="'unknown'"/>
+  <xsl:param name="gentext-key" select="local-name(.)"/>
+
+  <!-- remove -draft from reference -->
+  <xsl:variable name="pageclass">
+    <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>
+
+  <fo:static-content flow-name="xsl-region-outer-first">
+    <xsl:call-template name="outer.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'first'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+  <fo:static-content flow-name="xsl-region-outer-odd">
+    <xsl:call-template name="outer.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'odd'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+  <fo:static-content flow-name="xsl-region-outer-even">
+    <xsl:call-template name="outer.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'even'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+  <fo:static-content flow-name="xsl-region-outer-blank">
+    <xsl:call-template name="outer.region.content">
+      <xsl:with-param name="pageclass" select="$pageclass"/>
+      <xsl:with-param name="sequence" select="'blank'"/>
+      <xsl:with-param name="gentext-key" select="$gentext-key"/>
+    </xsl:call-template>
+  </fo:static-content>
+
+</xsl:template>
+
+<xsl:template name="inner.region.content">
+  <xsl:param name="pageclass" select="''"/>
+  <xsl:param name="sequence" select="''"/>
+  <xsl:param name="position" select="''"/>
+  <xsl:param name="gentext-key" select="''"/>
+
+  <!-- pageclass can be front, body, back -->
+  <!-- sequence can be odd, even, first, blank -->
+  <!-- position can be left, center, right -->
+
+  <!-- Customize to add side region content-->
+  <fo:block xsl:use-attribute-sets="inner.region.content.properties">
+    <!-- Add your content here -->
+  </fo:block>
+</xsl:template>
+
+<xsl:template name="outer.region.content">
+  <xsl:param name="pageclass" select="''"/>
+  <xsl:param name="sequence" select="''"/>
+  <xsl:param name="position" select="''"/>
+  <xsl:param name="gentext-key" select="''"/>
+
+  <!-- pageclass can be front, body, back -->
+  <!-- sequence can be odd, even, first, blank -->
+  <!-- position can be left, center, right -->
+
+  <!-- Customize to add side region content-->
+  <fo:block xsl:use-attribute-sets="outer.region.content.properties">
+    <!-- Add your content here -->
+  </fo:block>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 <xsl:template name="page.number.format">
@@ -2598,4 +3370,78 @@
 </xsl:template>
 <!-- ==================================================================== -->
 
+<!-- Customize this template for custom side regions -->
+<xsl:template name="region.inner">
+  <xsl:param name="sequence">blank</xsl:param>
+  <xsl:param name="classname">blank</xsl:param>
+
+  <xsl:choose>
+    <xsl:when test="$sequence = 'first' or $sequence = 'odd'">
+      <fo:region-start xsl:use-attribute-sets="region.inner.properties">
+        <xsl:attribute name="region-name">
+          <xsl:text>xsl-region-inner-</xsl:text>
+          <xsl:value-of select="$sequence"/>
+        </xsl:attribute>
+        <xsl:attribute name="precedence">
+          <xsl:value-of select="$region.start.precedence"/>
+        </xsl:attribute>
+        <xsl:attribute name="extent">
+          <xsl:value-of select="$region.inner.extent"/>
+        </xsl:attribute>
+      </fo:region-start>
+    </xsl:when>
+    <xsl:otherwise>
+      <fo:region-end xsl:use-attribute-sets="region.inner.properties">
+        <xsl:attribute name="region-name">
+          <xsl:text>xsl-region-inner-</xsl:text>
+          <xsl:value-of select="$sequence"/>
+        </xsl:attribute>
+        <xsl:attribute name="precedence">
+          <xsl:value-of select="$region.end.precedence"/>
+        </xsl:attribute>
+        <xsl:attribute name="extent">
+          <xsl:value-of select="$region.inner.extent"/>
+        </xsl:attribute>
+      </fo:region-end>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!-- Customize this template for custom side regions -->
+<xsl:template name="region.outer">
+  <xsl:param name="sequence">blank</xsl:param>
+  <xsl:param name="classname">blank</xsl:param>
+
+  <xsl:choose>
+    <xsl:when test="$sequence = 'first' or $sequence = 'odd'">
+      <fo:region-end xsl:use-attribute-sets="region.outer.properties">
+        <xsl:attribute name="region-name">
+          <xsl:text>xsl-region-outer-</xsl:text>
+          <xsl:value-of select="$sequence"/>
+        </xsl:attribute>
+        <xsl:attribute name="precedence">
+          <xsl:value-of select="$region.start.precedence"/>
+        </xsl:attribute>
+        <xsl:attribute name="extent">
+          <xsl:value-of select="$region.outer.extent"/>
+        </xsl:attribute>
+      </fo:region-end>
+    </xsl:when>
+    <xsl:otherwise>
+      <fo:region-start xsl:use-attribute-sets="region.outer.properties">
+        <xsl:attribute name="region-name">
+          <xsl:text>xsl-region-outer-</xsl:text>
+          <xsl:value-of select="$sequence"/>
+        </xsl:attribute>
+        <xsl:attribute name="precedence">
+          <xsl:value-of select="$region.end.precedence"/>
+        </xsl:attribute>
+        <xsl:attribute name="extent">
+          <xsl:value-of select="$region.outer.extent"/>
+        </xsl:attribute>
+      </fo:region-start>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>