From: Bob Stayton <bobs@sagehill.net>
Date: Sun, 22 Jun 2003 20:19:57 +0000 (+0000)
Subject: Separate qanda set title properties from section heading
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5094dafafe8bc97b40eb03421c5cae543922a5c;p=docbook-dsssl

Separate qanda set title properties from section heading
properties so they can be customized without conflict.
---

diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index ed3f47968..d44773a0e 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -207,3 +207,10 @@
 <!ENTITY column.gap.index SYSTEM "../params/column.gap.index.xml">
 <!ENTITY column.gap.lot SYSTEM "../params/column.gap.lot.xml">
 <!ENTITY column.gap.titlepage SYSTEM "../params/column.gap.titlepage.xml">
+<!ENTITY qanda.title.properties SYSTEM "../params/qanda.title.properties.xml">
+<!ENTITY qanda.title.level1.properties SYSTEM "../params/qanda.title.level1.properties.xml">
+<!ENTITY qanda.title.level2.properties SYSTEM "../params/qanda.title.level2.properties.xml">
+<!ENTITY qanda.title.level3.properties SYSTEM "../params/qanda.title.level3.properties.xml">
+<!ENTITY qanda.title.level4.properties SYSTEM "../params/qanda.title.level4.properties.xml">
+<!ENTITY qanda.title.level5.properties SYSTEM "../params/qanda.title.level5.properties.xml">
+<!ENTITY qanda.title.level6.properties SYSTEM "../params/qanda.title.level6.properties.xml">
diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index a036831cb..98f54bab9 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -388,6 +388,13 @@ zero by default, so this is simply the page-master region-left.
 &table.properties;
 &procedure.properties;
 &root.properties;
+&qanda.title.properties;
+&qanda.title.level1.properties;
+&qanda.title.level2.properties;
+&qanda.title.level3.properties;
+&qanda.title.level4.properties;
+&qanda.title.level5.properties;
+&qanda.title.level6.properties;
 </reference>
 
 <reference><title>Profiling</title>
diff --git a/xsl/fo/qandaset.xsl b/xsl/fo/qandaset.xsl
index 2898b2871..86992b139 100644
--- a/xsl/fo/qandaset.xsl
+++ b/xsl/fo/qandaset.xsl
@@ -59,7 +59,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:call-template name="section.heading">
+  <xsl:call-template name="qanda.heading">
     <xsl:with-param name="level" select="$sectlvl + 1"/>
     <xsl:with-param name="marker" select="0"/>
     <xsl:with-param name="title">
@@ -107,7 +107,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:call-template name="section.heading">
+  <xsl:call-template name="qanda.heading">
     <xsl:with-param name="level"  select="$sectlvl + 1 + count(ancestor::qandadiv)"/>
     <xsl:with-param name="marker" select="0"/>
     <xsl:with-param name="title">
@@ -228,4 +228,58 @@
   <xsl:apply-templates/>
 </xsl:template>
 
+<xsl:template name="qanda.heading">
+  <xsl:param name="level" select="1"/>
+  <xsl:param name="marker" select="0"/>
+  <xsl:param name="title"/>
+  <xsl:param name="titleabbrev"/>
+
+  <fo:block xsl:use-attribute-sets="qanda.title.properties">
+    <xsl:if test="$marker != 0">
+      <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:if>
+    <xsl:choose>
+      <xsl:when test="$level=1">
+        <fo:block xsl:use-attribute-sets="qanda.title.level1.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=2">
+        <fo:block xsl:use-attribute-sets="qanda.title.level2.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=3">
+        <fo:block xsl:use-attribute-sets="qanda.title.level3.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=4">
+        <fo:block xsl:use-attribute-sets="qanda.title.level4.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:when test="$level=5">
+        <fo:block xsl:use-attribute-sets="qanda.title.level5.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:block xsl:use-attribute-sets="qanda.title.level6.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
+      </xsl:otherwise>
+    </xsl:choose>
+  </fo:block>
+</xsl:template>
+
 </xsl:stylesheet>