Support section.title.levelN.properties to remove hard coding of font sizes in sectio...

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index 3b37d48cc87f8d53a8c480162fb2eeaeb14547d8..f57850b6640f86231791fcd743eb84668cb0d016 100644 (file)
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -162,3 +162,9 @@
 <!ENTITY menuchoice.separator SYSTEM "../params/menuchoice.separator.xml">
 <!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml">
 <!ENTITY bibliography.numbered SYSTEM "../params/bibliography.numbered.xml">
+<!ENTITY section.title.level1.properties SYSTEM "../params/section.title.level1.properties.xml">
+<!ENTITY section.title.level2.properties SYSTEM "../params/section.title.level2.properties.xml">
+<!ENTITY section.title.level3.properties SYSTEM "../params/section.title.level3.properties.xml">
+<!ENTITY section.title.level4.properties SYSTEM "../params/section.title.level4.properties.xml">
+<!ENTITY section.title.level5.properties SYSTEM "../params/section.title.level5.properties.xml">
+<!ENTITY section.title.level6.properties SYSTEM "../params/section.title.level6.properties.xml">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index bde197c0ff636ce40691cf8fe28414a77c4a56f9..3250891773c1704ad50ba7e94b9682249445e8cd 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -343,8 +343,14 @@ zero by default, so this is simply the page-master region-left.
 &informal.object.properties;
 &monospace.verbatim.properties;
 &verbatim.properties;
-&section.title.properties;
 &sidebar.properties;
+&section.title.properties;
+&section.title.level1.properties;
+&section.title.level2.properties;
+&section.title.level3.properties;
+&section.title.level4.properties;
+&section.title.level5.properties;
+&section.title.level6.properties;
 </reference>
 
 <reference><title>Profiling</title>
@@ -529,6 +535,12 @@ around all these parameters.</para>
 <src:fragref linkend="sans.font.family.frag"/>
 <src:fragref linkend="section.autolabel.frag"/>
 <src:fragref linkend="section.label.includes.component.label.frag"/>
+<src:fragref linkend="section.title.level1.properties.frag"/>
+<src:fragref linkend="section.title.level2.properties.frag"/>
+<src:fragref linkend="section.title.level3.properties.frag"/>
+<src:fragref linkend="section.title.level4.properties.frag"/>
+<src:fragref linkend="section.title.level5.properties.frag"/>
+<src:fragref linkend="section.title.level6.properties.frag"/>
 <src:fragref linkend="section.title.properties.frag"/>
 <src:fragref linkend="segmentedlist.as.table.frag"/>
 <src:fragref linkend="shade.verbatim.frag"/>

diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index e7f917f048c021698da44271339bfb765ae92525..2453d69f9585ed0e672440031aa3f656eb2c43e1 100644 (file)
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -247,21 +247,42 @@
 <!-- ==================================================================== -->
 
 <xsl:template name="section.heading">
-  <xsl:param name="level">1</xsl:param>
-  <xsl:param name="title"></xsl:param>
-  <xsl:variable name="fsize">
+  <xsl:param name="level" select="1"/>
+  <xsl:param name="title"/>
+
+  <fo:block xsl:use-attribute-sets="section.title.properties">
     <xsl:choose>
-      <xsl:when test="$level=1">18</xsl:when>
-      <xsl:when test="$level=2">16</xsl:when>
-      <xsl:when test="$level=3">14</xsl:when>
-      <xsl:when test="$level=4">12</xsl:when>
-      <xsl:when test="$level=5">12</xsl:when>
-      <xsl:otherwise>10</xsl:otherwise>
+      <xsl:when test="$level=1">
+        <fo:block xsl:use-attribute-sets="section.title.level1.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=2">
+        <fo:block xsl:use-attribute-sets="section.title.level2.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=3">
+        <fo:block xsl:use-attribute-sets="section.title.level3.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=4">
+        <fo:block xsl:use-attribute-sets="section.title.level4.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=5">
+        <fo:block xsl:use-attribute-sets="section.title.level5.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:block xsl:use-attribute-sets="section.title.level6.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:otherwise>
     </xsl:choose>
-  </xsl:variable>
-  <fo:block xsl:use-attribute-sets="section.title.properties"
-            font-size="{$fsize}pt">
-    <xsl:copy-of select="$title"/>
     <fo:marker marker-class-name="section.head.marker">
       <xsl:copy-of select="$title"/>
     </fo:marker>