From: Mauritz Jeanson <mj@johanneberg.com>
Date: Sat, 5 Jan 2008 16:06:30 +0000 (+0000)
Subject: Added modifications to support nested set elements. See bug #1853172.
X-Git-Tag: release/1.79.1~6^2~1565
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dba4aba3fc4fe2866f029be95b3ccf69bb6ed573;p=docbook-dsssl

Added modifications to support nested set elements. See bug #1853172.
---

diff --git a/xsl/fo/autotoc.xsl b/xsl/fo/autotoc.xsl
index 30f327782..99f3c8842 100644
--- a/xsl/fo/autotoc.xsl
+++ b/xsl/fo/autotoc.xsl
@@ -29,7 +29,7 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:variable name="nodes" select="book|setindex"/>
+  <xsl:variable name="nodes" select=".|book|set|setindex"/>
 
   <xsl:if test="$nodes">
     <fo:block id="toc...{$id}"
@@ -385,6 +385,42 @@
   </xsl:if>
 </xsl:template>
 
+<xsl:template match="set" mode="toc">
+  <xsl:param name="toc-context" select="."/>
+
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
+  <xsl:variable name="cid">
+    <xsl:call-template name="object.id">
+      <xsl:with-param name="object" select="$toc-context"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:call-template name="toc.line">
+    <xsl:with-param name="toc-context" select="$toc-context"/>
+  </xsl:call-template>
+
+  <xsl:variable name="nodes" select="set|book|setindex"/>
+
+  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
+
+  <xsl:if test="$toc.section.depth > 0 
+                and $toc.max.depth > $depth.from.context
+                and $nodes">
+    <fo:block id="toc.{$cid}.{$id}">
+      <xsl:attribute name="margin-left">
+        <xsl:call-template name="set.toc.indent"/>
+      </xsl:attribute>
+      
+      <xsl:apply-templates select="$nodes" mode="toc">
+        <xsl:with-param name="toc-context" select="$toc-context"/>
+      </xsl:apply-templates>
+    </fo:block>
+  </xsl:if>
+</xsl:template>
+
 <xsl:template match="part" mode="toc">
   <xsl:param name="toc-context" select="."/>
 
diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index 0b53b77bf..4249248cb 100644
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -63,9 +63,9 @@
   </xsl:variable>
 
   <xsl:variable name="preamble"
-                select="*[not(self::book or self::setindex)]"/>
+                select="*[not(self::book or self::set or self::setindex)]"/>
 
-  <xsl:variable name="content" select="book|setindex"/>
+  <xsl:variable name="content" select="book|set|setindex"/>
 
   <xsl:variable name="titlepage-master-reference">
     <xsl:call-template name="select.pagemaster">