Fix formatting of formal object titles.

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 4d73ffb343abd7a379d546b0193c53b4145f0bd4..7acd80647718ad2c6049cd461a9fd263704b5fcb 100644 (file)
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -19,18 +19,8 @@
   </xsl:variable>
 
   <fo:block id="{$id}"
-            space-before.minimum="1em"
-            space-before.optimum="1.5em"
-            space-before.maximum="2em"
-            space-after.minimum="1em"
-            space-after.optimum="1.5em"
-            space-after.maximum="2em"
-            keep-with-previous.within-column="always">
-    <xsl:call-template name="formal.object.heading">
-       <xsl:with-param name="title">
-         <xsl:apply-templates select="." mode="title.markup"/>
-       </xsl:with-param>
-    </xsl:call-template>
+            xsl:use-attribute-sets="formal.object.properties">
+    <xsl:call-template name="formal.object.heading"/>
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
@@ -38,7 +28,7 @@
 <xsl:template name="formal.object.heading">
   <xsl:param name="title"></xsl:param>
   <fo:block xsl:use-attribute-sets="formal.title.properties">
-    <xsl:copy-of select="$title"/>
+    <xsl:apply-templates select="." mode="object.title.markup"/>
   </fo:block>
 </xsl:template>
 
@@ -71,21 +61,10 @@
     select=".//colspec[contains(@colwidth, '*')]"/>
 
   <fo:table-and-caption id="{$id}"
-      keep-together.within-column="always"
-      space-before.minimum="0.8em"
-      space-before.optimum="1em"
-      space-before.maximum="1.2em"
-      space-after.minimum="0.8em"
-      space-after.optimum="1em"
-      space-after.maximum="1.2em">
+                        xsl:use-attribute-sets="formal.object.properties">
     <fo:table-caption>
-      <fo:block font-weight='bold'
-          space-after.minimum="0.2em"
-          space-after.optimum="0.5em"
-          space-after.maximum="0.8em"
-          keep-with-next.within-column="always"
-          hyphenate="false">
-         <xsl:apply-templates select="." mode="title.markup"/>
+      <fo:block xsl:use-attribute-sets="formal.title.properties">
+        <xsl:apply-templates select="." mode="object.title.markup"/>
       </fo:block>
     </fo:table-caption>
     <fo:table>

diff --git a/xsl/fo/param.xsl b/xsl/fo/param.xsl
index bb17c8ce12bd0b9b0a4221173472c0a91ac44446..903af931cd3cb96bddee8fcd1c55d09fbd8188c3 100644 (file)
--- a/xsl/fo/param.xsl
+++ b/xsl/fo/param.xsl
@@ -139,6 +139,17 @@ and the <sgmltag class="attribute">format</sgmltag> attribute is
 </refdescription>
 </doc:variable>
 
+<!-- ==================================================================== -->
+<xsl:attribute-set name="formal.object.properties">
+  <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
+  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+  <xsl:attribute name="space-before.maximum">2em</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>
+  <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
+</xsl:attribute-set>
+
 <!-- ==================================================================== -->
 <xsl:attribute-set name="formal.title.properties"
                    use-attribute-sets="normal.para.spacing">