Fixed bug #605761 where article/appendix title did not respect

the $title.margin.left setting.  Use a new
article.appendix.title.properties attribute set.

diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index a4170a0f36b59aa0896628a1859ab6f8041e775d..a0871a87d4f1bbf38384be89f66426e29a3389f1 100644 (file)
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -542,6 +542,10 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
+  <xsl:variable name="title">
+    <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
   <xsl:variable name="titleabbrev">
     <xsl:apply-templates select="." mode="titleabbrev.markup"/>
   </xsl:variable>
@@ -565,13 +569,19 @@
       </xsl:attribute>
     </xsl:if>
 
-    <xsl:call-template name="section.heading">
-      <xsl:with-param name="level" select="2"/>
-      <xsl:with-param name="title">
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </xsl:with-param>
-      <xsl:with-param name="titleabbrev" select="$titleabbrev"/>
-    </xsl:call-template>
+    <fo:block xsl:use-attribute-sets="article.appendix.title.properties">
+      <fo:marker marker-class-name="section.head.marker">
+        <xsl:choose>
+          <xsl:when test="$titleabbrev = ''">
+            <xsl:value-of select="$title"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$titleabbrev"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </fo:marker>
+      <xsl:copy-of select="$title"/>
+    </fo:block>
 
     <xsl:apply-templates/>
   </fo:block>