From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 19 Apr 2012 18:42:11 +0000 (+0000)
Subject: Fix TOC processing for topic element.
X-Git-Tag: release/1.79.1~6^2~478
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfbb49ce76a1713e4a472c185228deee774016c5;p=docbook-dsssl

Fix TOC processing for topic element.
---

diff --git a/xsl/fo/autotoc.xsl b/xsl/fo/autotoc.xsl
index e6aa17454..04e44060f 100644
--- a/xsl/fo/autotoc.xsl
+++ b/xsl/fo/autotoc.xsl
@@ -69,6 +69,7 @@
                         |$toc-context/chapter
                         |$toc-context/appendix
                         |$toc-context/article
+                        |$toc-context/topic
                         |$toc-context/bibliography
                         |$toc-context/glossary
                         |$toc-context/index"/>
@@ -110,7 +111,7 @@
   </xsl:variable>
 
   <xsl:variable name="nodes" select="section|sect1|refentry
-                                     |article|bibliography|glossary
+                                     |article|topic|bibliography|glossary
                                      |qandaset[$qanda.in.toc != 0]
                                      |appendix|index"/>
   <xsl:if test="$nodes">
@@ -390,7 +391,7 @@
   </xsl:call-template>
 
   <xsl:variable name="nodes" select="glossary|bibliography|preface|chapter
-                                     |reference|part|article|appendix|index"/>
+                                     |reference|part|article|topic|appendix|index"/>
 
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
 
@@ -461,7 +462,7 @@
   </xsl:call-template>
 
   <xsl:variable name="nodes" select="chapter|appendix|preface|reference|
-                                     refentry|article|index|glossary|
+                                     refentry|article|topic|index|glossary|
                                      bibliography"/>
 
   <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
@@ -718,7 +719,15 @@
   </xsl:if>
 </xsl:template>
 
-<xsl:template match="sect5|simplesect|topic" mode="toc">
+<xsl:template match="sect5|simplesect" mode="toc">
+  <xsl:param name="toc-context" select="."/>
+
+  <xsl:call-template name="toc.line">
+    <xsl:with-param name="toc-context" select="$toc-context"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="topic" mode="toc">
   <xsl:param name="toc-context" select="."/>
 
   <xsl:call-template name="toc.line">
diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index ed42ec99e..3a066326f 100644
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -926,11 +926,23 @@
   <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
 
   <xsl:apply-templates select="." mode="page.sequence">
-    <xsl:with-param name="master-reference"
-                    select="$master-reference"/>
-  </xsl:apply-templates> 
+    <xsl:with-param name="master-reference" select="$master-reference"/>
+    <xsl:with-param name="content">
+      <xsl:element name="fo:{$section.container.element}">
+        <xsl:attribute name="id"><xsl:value-of 
+                            select="$id"/></xsl:attribute>
+        <xsl:call-template name="topic.titlepage"/>
+    
+        <xsl:apply-templates/>
+
+      </xsl:element>
+    </xsl:with-param>
+  </xsl:apply-templates>
 </xsl:template>
 
 <xsl:template match="topic/info"></xsl:template>
diff --git a/xsl/fo/fop1.xsl b/xsl/fo/fop1.xsl
index 46d18b948..9cea9ce84 100644
--- a/xsl/fo/fop1.xsl
+++ b/xsl/fo/fop1.xsl
@@ -28,7 +28,7 @@
 </xsl:template>
 
 <xsl:template match="set|book|part|reference|
-                     preface|chapter|appendix|article
+                     preface|chapter|appendix|article|topic
                      |glossary|bibliography|index|setindex
                      |refentry
                      |sect1|sect2|sect3|sect4|sect5|section"
@@ -74,7 +74,7 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
+                    and (book|part|reference|preface|chapter|appendix|article|topic
                          |glossary|bibliography|index|setindex
                          |refentry
                          |sect1|sect2|sect3|sect4|sect5|section)">
@@ -99,7 +99,7 @@
 </xsl:template>
 
 <xsl:template match="set|book|part|reference|
-                     preface|chapter|appendix|article
+                     preface|chapter|appendix|article|topic
                      |glossary|bibliography|index|setindex
                      |refentry
                      |sect1|sect2|sect3|sect4|sect5|section"
diff --git a/xsl/fo/titlepage.templates.xml b/xsl/fo/titlepage.templates.xml
index 9dd7e1cc5..4e283c596 100644
--- a/xsl/fo/titlepage.templates.xml
+++ b/xsl/fo/titlepage.templates.xml
@@ -857,6 +857,9 @@
 <t:titlepage t:element="topic" t:wrapper="fo:block">
   <t:titlepage-content t:side="recto">
     <title
+	   t:force="1"
+	   t:named-template="component.title"
+	   param:node="ancestor-or-self::topic[1]"
 	   margin-left="{$title.margin.left}"
 	   font-family="{$title.fontset}"/>
     <subtitle
diff --git a/xsl/fo/xep.xsl b/xsl/fo/xep.xsl
index 4e89d4219..782ab378e 100644
--- a/xsl/fo/xep.xsl
+++ b/xsl/fo/xep.xsl
@@ -112,7 +112,7 @@
 </xsl:template>
 
 <xsl:template match="set|book|part|reference|preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
+                     |glossary|bibliography|index|setindex|topic
                      |refentry|refsynopsisdiv
                      |refsect1|refsect2|refsect3|refsection
                      |sect1|sect2|sect3|sect4|sect5|section"
@@ -152,7 +152,7 @@
       </xsl:variable>
       <xsl:if test="contains($toc.params, 'toc')
                     and set|book|part|reference|section|sect1|refentry
-                        |article|bibliography|glossary|chapter
+                        |article|topic|bibliography|glossary|chapter
                         |appendix">
         <rx:bookmark internal-destination="toc...{$id}">
           <rx:bookmark-label>