From ef90881c2b9362740d447a382b8ccf6a6af3c19b Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Tue, 8 Mar 2005 07:50:55 +0000
Subject: [PATCH] Fixed indent problems introduced with $body.start.indent. FOP
 reverts back to using $title.margin.left.

---
 xsl/params/blockquote.properties.xml      |  4 ++--
 xsl/params/component.title.properties.xml |  3 ++-
 xsl/params/section.title.properties.xml   |  3 ++-
 xsl/params/title.margin.left.xml          | 24 ++++++++++++++++++-----
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/xsl/params/blockquote.properties.xml b/xsl/params/blockquote.properties.xml
index 1803adb18..7a0f237ca 100644
--- a/xsl/params/blockquote.properties.xml
+++ b/xsl/params/blockquote.properties.xml
@@ -7,8 +7,8 @@
 <refsynopsisdiv>
 <src:fragment id='blockquote.properties.frag'>
 <xsl:attribute-set name="blockquote.properties">
-<xsl:attribute name="start-indent">0.5in</xsl:attribute>
-<xsl:attribute name="end-indent">0.5in</xsl:attribute>
+<xsl:attribute name="margin-left">0.5in</xsl:attribute>
+<xsl:attribute name="margin-right">0.5in</xsl:attribute>
 <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
 <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
 <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
diff --git a/xsl/params/component.title.properties.xml b/xsl/params/component.title.properties.xml
index 5eb76c9e9..c9dbe836a 100644
--- a/xsl/params/component.title.properties.xml
+++ b/xsl/params/component.title.properties.xml
@@ -19,7 +19,8 @@
   <xsl:attribute name="space-before.maximum"><xsl:value-of
             select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
   <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
+  <xsl:attribute name="start-indent"><xsl:value-of 
+                 select="$title.margin.left"/></xsl:attribute>
 </xsl:attribute-set>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xsl/params/section.title.properties.xml b/xsl/params/section.title.properties.xml
index b6150aadd..a2c1f7e66 100644
--- a/xsl/params/section.title.properties.xml
+++ b/xsl/params/section.title.properties.xml
@@ -20,7 +20,8 @@
   <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
   <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
   <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
+  <xsl:attribute name="start-indent"><xsl:value-of 
+                 select="$title.margin.left"/></xsl:attribute>
 </xsl:attribute-set>
 </src:fragment>
 </refsynopsisdiv>
diff --git a/xsl/params/title.margin.left.xml b/xsl/params/title.margin.left.xml
index a135b0a4b..dfd2990a8 100644
--- a/xsl/params/title.margin.left.xml
+++ b/xsl/params/title.margin.left.xml
@@ -12,6 +12,7 @@
 <src:fragment id='title.margin.left.frag'>
 <xsl:param name="title.margin.left">
   <xsl:choose>
+    <xsl:when test="$fop.extensions != 0">-4pc</xsl:when>
     <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when>
     <xsl:otherwise>0pt</xsl:otherwise>
   </xsl:choose>
@@ -21,12 +22,25 @@
 
 <refsect1><title>Description</title>
 
-<para>This parameter adjusts the left margin for titles,
-effectively leaving the titles at the left
-margin and indenting the body text.
-The default value is -4pc, which means the
+<para>This parameter provides
+one means of adjusting the left margin for titles.
+The left margin of the body region
+is calculated to include this space,
+and titles are outdented to the left by this amount,
+effectively leaving titles at the left margin
+and the body text indented.
+Currently this method is only used for FOP because
+it cannot properly use the <parameter>body.start.indent</parameter>
+parameter.
+the relative 
+</para>
+<para>
+The default value for FOP is -4pc, which means the
 body text is indented 4 picas relative to
 the titles.
+The default value for other processors is 0pt, and
+the body indent is provided by the <parameter>body.start.indent</parameter>
+parameter.
 </para>
 <para>
 If you set the value to zero, be sure to still include
@@ -34,7 +48,7 @@ a unit indicator such as <literal>0pt</literal>, or
 the FO processor will report errors.
 </para>
 <para>
-This parameter is set to 0pt if the
+This parameter must be set to 0pt if the
 <parameter>passivetex.extensions</parameter>
 parameter is nonzero because PassiveTeX cannot handle
 the math expression with negative values 
-- 
2.40.0