Rationalize margins; see new docs in the FO section

diff --git a/xsl/params/body.margin.bottom.xml b/xsl/params/body.margin.bottom.xml
index 3841c6fad920d2e9a5527757b7661d0cac9165fe..5857ffd67e51068ab57a81ac7bc914a9c794e32e 100644 (file)
--- a/xsl/params/body.margin.bottom.xml
+++ b/xsl/params/body.margin.bottom.xml
@@ -9,15 +9,15 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='body.margin.bottom.frag'><xsl:param name="body.margin.bottom">24pt</xsl:param></src:fragment>
+<src:fragment id='body.margin.bottom.frag'>
+<xsl:param name="body.margin.bottom">0.5in</xsl:param>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>The body bottom margin is the distance from the last line of text
-in the page body to the bottom page margin. Note that the page footer, if
-any, appears in the space between the body bottom margin and the page
-bottom margin.
+in the page body to the bottom of the region-after.
 </para>
 
 </refsect1>

diff --git a/xsl/params/body.margin.top.xml b/xsl/params/body.margin.top.xml
index 6ee6d227ea4cb171d5456db3cd4b454517b54392..e2465b8c435a9403b5cf1c2b58663f32b3dc1a1d 100644 (file)
--- a/xsl/params/body.margin.top.xml
+++ b/xsl/params/body.margin.top.xml
@@ -9,16 +9,15 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='body.margin.top.frag'><xsl:param name="body.margin.top">24pt</xsl:param></src:fragment>
+<src:fragment id='body.margin.top.frag'>
+<xsl:param name="body.margin.top">1in</xsl:param>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>The body top margin is the distance from the page top margin to
-the first line of text
-in the page body. Note that the page header, if
-any, appears in the space between the page top margin and the body
-top margin.
+<para>The body top margin is the distance from the top of the region-before
+to the first line of text in the page body.
 </para>
 
 </refsect1>

diff --git a/xsl/params/page.margin.bottom.xml b/xsl/params/page.margin.bottom.xml
index 9a76f3603ee83c236c2bbe941026d08a2311c686..42487c8735349ef1a06221ae0d8261fb86c93f4b 100644 (file)
--- a/xsl/params/page.margin.bottom.xml
+++ b/xsl/params/page.margin.bottom.xml
@@ -9,13 +9,15 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='page.margin.bottom.frag'><xsl:param name="page.margin.bottom">1in</xsl:param></src:fragment>
+<src:fragment id='page.margin.bottom.frag'>
+<xsl:param name="page.margin.bottom">0.5in</xsl:param>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>The bottom page margin is the distance from the physical bottom of
-the page to the last line of text (body or footer).
+<para>The bottom page margin is the distance from the bottom of the region-after
+to the physical bottom of the page.
 </para>
 
 </refsect1>

diff --git a/xsl/params/page.margin.outer.xml b/xsl/params/page.margin.outer.xml
index efee3762b1f80a16485b6f9469ccac3818d88e20..d66e11a6d7f78ee42667848c9fa747c681676dc6 100644 (file)
--- a/xsl/params/page.margin.outer.xml
+++ b/xsl/params/page.margin.outer.xml
@@ -12,7 +12,7 @@
 <src:fragment id='page.margin.outer.frag'><xsl:param name="page.margin.outer">
   <xsl:choose>
     <xsl:when test="$double.sided != 0">0.75in</xsl:when>
-    <xsl:otherwise>10pc</xsl:otherwise>
+    <xsl:otherwise>1in</xsl:otherwise>
   </xsl:choose>
 </xsl:param></src:fragment>
 </refsynopsisdiv>

diff --git a/xsl/params/page.margin.top.xml b/xsl/params/page.margin.top.xml
index 222a01ea5d86690fa76d04fb6fe68741732a884b..ba934b227ae60ac4bc0b829f375ef43321fd0324 100644 (file)
--- a/xsl/params/page.margin.top.xml
+++ b/xsl/params/page.margin.top.xml
@@ -9,14 +9,15 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='page.margin.top.frag'><xsl:param name="page.margin.top">1in</xsl:param></src:fragment>
+<src:fragment id='page.margin.top.frag'>
+<xsl:param name="page.margin.top">0in</xsl:param>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
 <para>The top page margin is the distance from the physical top of the
-page to the first line of text (body or header).
-</para>
+page to the top of the region-before.</para>
 
 </refsect1>
 </refentry>

diff --git a/xsl/params/page.width.xml b/xsl/params/page.width.xml
index 55fd9c1e965b30370f765ca61f5acd607520d06a..8c3f7b8562553063a222c7f9e48fc870a78335e4 100644 (file)
--- a/xsl/params/page.width.xml
+++ b/xsl/params/page.width.xml
@@ -24,8 +24,7 @@
 <refsect1><title>Description</title>
 
 <para>The page width is generally calculated from the
-<literal>paper.type</literal> and
-<literal>page.orientation</literal>.
+<literal>paper.type</literal> and <literal>page.orientation</literal>.
 </para>
 
 </refsect1>

diff --git a/xsl/params/region.after.extent.xml b/xsl/params/region.after.extent.xml
index 98b4739341b135c7a633881c2d981c97715abaa5..4eb863ffea5412f95dbcad7a805f27c5e5d71f79 100644 (file)
--- a/xsl/params/region.after.extent.xml
+++ b/xsl/params/region.after.extent.xml
@@ -9,7 +9,9 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='region.after.extent.frag'><xsl:param name="region.after.extent" select="'12pt'"/></src:fragment>
+<src:fragment id='region.after.extent.frag'>
+<xsl:param name="region.after.extent" select="'0.5in'"/>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>

diff --git a/xsl/params/region.before.extent.xml b/xsl/params/region.before.extent.xml
index 6656c1e42b41c9cbfd3ae7aed353383fd88e7215..363befb3e1f83c817592b07b4a7d16d5a04c96a8 100644 (file)
--- a/xsl/params/region.before.extent.xml
+++ b/xsl/params/region.before.extent.xml
@@ -9,7 +9,9 @@
 </refnamediv>
 
 <refsynopsisdiv>
-<src:fragment id='region.before.extent.frag'><xsl:param name="region.before.extent" select="'12pt'"/></src:fragment>
+<src:fragment id='region.before.extent.frag'>
+<xsl:param name="region.before.extent" select="'0.5in'"/>
+</src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>