Moved <fo:marker> for section heading to be first child

of its parent block, per bug #586005 (and the XSL-FO spec).

diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 2453d69f9585ed0e672440031aa3f656eb2c43e1..6eef811a894359e2f9e85f514c73f01739f4b230 100644 (file)
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -251,6 +251,9 @@
   <xsl:param name="title"/>
 
   <fo:block xsl:use-attribute-sets="section.title.properties">
+    <fo:marker marker-class-name="section.head.marker">
+      <xsl:copy-of select="$title"/>
+    </fo:marker>
     <xsl:choose>
       <xsl:when test="$level=1">
         <fo:block xsl:use-attribute-sets="section.title.level1.properties">
@@ -283,9 +286,6 @@
         </fo:block>
       </xsl:otherwise>
     </xsl:choose>
-    <fo:marker marker-class-name="section.head.marker">
-      <xsl:copy-of select="$title"/>
-    </fo:marker>
   </fo:block>
 </xsl:template>