Added qanda.nested.in.toc param. Default value is zero. If

non-zero, instances of "nested" Qandaentry (ones that are children
of Answer elements) are displayed in the TOC. Closes patch 1509018
(from Daniel Leidert). Currently on affects HTML output (no patch
for FO output provided).

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 9405283c0e8754dc696a7e02ad1310e4d0a325cc..c75233fb7bb09e146c881df82c9e7ba546637eb2 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -194,6 +194,7 @@
 <!ENTITY punct.honorific SYSTEM "../params/punct.honorific.xml">
 <!ENTITY qanda.defaultlabel SYSTEM "../params/qanda.defaultlabel.xml">
 <!ENTITY qanda.inherit.numeration SYSTEM "../params/qanda.inherit.numeration.xml">
+<!ENTITY qanda.nested.in.toc SYSTEM "../params/qanda.nested.in.toc.xml">
 <!ENTITY qandadiv.autolabel SYSTEM "../params/qandadiv.autolabel.xml">
 <!ENTITY refentry.generate.name SYSTEM "../params/refentry.generate.name.xml">
 <!ENTITY refentry.generate.title SYSTEM "../params/refentry.generate.title.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 115b99ad8487aecb45a221fcbc0f7516ecb50a46..ffc72ba91bd2bdaf71624f97908959ccec314f86 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -207,6 +207,7 @@ stylesheet like this:</para>
 <reference id="qa"><title>QAndASet</title>
 &qanda.defaultlabel;
 &qanda.inherit.numeration;
+&qanda.nested.in.toc;
 </reference>
 
 <reference id="links"><title>Linking</title>
@@ -678,6 +679,7 @@ around all these parameters.</para>
 <src:fragref linkend="punct.honorific.frag"/>
 <src:fragref linkend="qanda.defaultlabel.frag"/>
 <src:fragref linkend="qanda.inherit.numeration.frag"/>
+<src:fragref linkend="qanda.nested.in.toc.frag"/>
 <src:fragref linkend="qandadiv.autolabel.frag"/>
 <src:fragref linkend="refentry.generate.name.frag"/>
 <src:fragref linkend="refentry.generate.title.frag"/>

diff --git a/xsl/html/qandaset.xsl b/xsl/html/qandaset.xsl
index 1f8ab65fe951d024926f260e9602805b669f8845..c4b8552dc15fac93f9fe49d051cf4af8e6d82a3e 100644 (file)
--- a/xsl/html/qandaset.xsl
+++ b/xsl/html/qandaset.xsl
@@ -296,6 +296,17 @@
       <xsl:value-of select="$firstch"/>
     </a>
   </dt>
+  <xsl:if test="not($qanda.nested.in.toc = 0)">
+    <xsl:apply-templates select="following-sibling::answer" mode="qandatoc.mode"/>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="answer" mode="qandatoc.mode">
+  <xsl:if test="child::qandaentry">
+    <dd>
+      <xsl:call-template name="process.qanda.toc"/>
+    </dd>
+  </xsl:if>
 </xsl:template>
 
 <!-- ==================================================================== -->

diff --git a/xsl/params/qanda.nested.in.toc.xml b/xsl/params/qanda.nested.in.toc.xml
new file mode 100644 (file)
index 0000000..d06d259
--- /dev/null
+++ b/xsl/params/qanda.nested.in.toc.xml
@@ -0,0 +1,22 @@
+<refentry id="qanda.nested.in.toc">
+<refmeta>
+<refentrytitle>qanda.nested.in.toc</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>qanda.nested.in.toc</refname>
+<refpurpose>Should nested answer/qandaentry instances appear in TOC?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='qanda.nested.in.toc.frag'><xsl:param name="qanda.nested.in.toc" select="0"/></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If true (non-zero), instances of <sgmltag>qandaentry</sgmltag>
+that are children of <sgmltag>answer</sgmltag> elements are shown in
+the TOC.</para>
+
+</refsect1>
+</refentry>