From: Bob Stayton <bobs@sagehill.net>
Date: Sun, 27 Nov 2011 00:12:10 +0000 (+0000)
Subject: Check in new params for FO side regions in page masters.
X-Git-Tag: release/1.79.1~6^2~608
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68e4905c1e0e2f25e7935958ba282172873112ca;p=docbook-dsssl

Check in new params for FO side regions in page masters.
---

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index a9322609e..2e1e5478c 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -345,3 +345,12 @@
 <!ENTITY calloutlist.properties SYSTEM "../params/calloutlist.properties.xml">
 <!ENTITY task.properties SYSTEM "../params/task.properties.xml">
 <!ENTITY generate.consistent.ids SYSTEM "../params/generate.consistent.ids.xml">
+<!ENTITY region.inner.extent SYSTEM "../params/region.inner.extent.xml">
+<!ENTITY region.outer.extent SYSTEM "../params/region.outer.extent.xml">
+<!ENTITY body.margin.inner SYSTEM "../params/body.margin.inner.xml">
+<!ENTITY body.margin.outer SYSTEM "../params/body.margin.outer.xml">
+<!ENTITY side.region.precedence SYSTEM "../params/side.region.precedence.xml">
+<!ENTITY inner.region.content.properties SYSTEM "../params/inner.region.content.properties.xml">
+<!ENTITY outer.region.content.properties SYSTEM "../params/outer.region.content.properties.xml">
+<!ENTITY region.inner.properties SYSTEM "../params/region.inner.properties.xml">
+<!ENTITY region.outer.properties SYSTEM "../params/region.outer.properties.xml">
diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 8a5d3c410..3fd61c29a 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -375,6 +375,8 @@ zero by default, so this is simply the page-master margin-right.
 &double.sided;
 &body.margin.bottom;
 &body.margin.top;
+&body.margin.inner;
+&body.margin.outer;
 &body.start.indent;
 &body.end.indent;
 &alignment;
@@ -394,6 +396,8 @@ zero by default, so this is simply the page-master margin-right.
 &column.gap.titlepage;
 &region.after.extent;
 &region.before.extent;
+&region.inner.extent;
+&region.outer.extent;
 &default.units;
 &normal.para.spacing;
 &body.font.master;
@@ -415,6 +419,11 @@ zero by default, so this is simply the page-master margin-right.
 &header.content.properties;
 &footer.content.properties;
 &marker.section.level;
+&side.region.precedence;
+&region.inner.properties;
+&region.outer.properties;
+&inner.region.content.properties;
+&outer.region.content.properties;
 </reference>
 <reference xml:id="fonts"><title>Font Families</title>
 &body.font.family;
@@ -896,6 +905,15 @@ around all these parameters.</para>
 <src:fragref linkend="xref.properties.frag"/>
 <src:fragref linkend="xref.title-page.separator.frag"/>
 <src:fragref linkend="xref.with.number.and.title.frag"/>
+<src:fragref linkend="region.inner.extent.frag"/>
+<src:fragref linkend="region.outer.extent.frag"/>
+<src:fragref linkend="body.margin.inner.frag"/>
+<src:fragref linkend="body.margin.outer.frag"/>
+<src:fragref linkend="side.region.precedence.frag"/>
+<src:fragref linkend="inner.region.content.properties.frag"/>
+<src:fragref linkend="outer.region.content.properties.frag"/>
+<src:fragref linkend="region.inner.properties.frag"/>
+<src:fragref linkend="region.outer.properties.frag"/>
 
 </xsl:stylesheet>
 </src:fragment>