Fixed bug #1326440 where 'title' in generate.toc was not supported in FO.

diff --git a/xsl/fo/autotoc.xsl b/xsl/fo/autotoc.xsl
index f229476b4d79c269ad2f46eba6b07b8668a3b7d6..df16f62ed453501b7910ee6a07453aa64c078def 100644 (file)
--- a/xsl/fo/autotoc.xsl
+++ b/xsl/fo/autotoc.xsl
@@ -53,6 +53,7 @@
 
 <xsl:template name="division.toc">
   <xsl:param name="toc-context" select="."/>
+  <xsl:param name="toc.title.p" select="true()"/>
 
   <xsl:variable name="cid">
     <xsl:call-template name="object.id">
@@ -83,7 +84,9 @@
           </xsl:call-template>
         </xsl:attribute>
       </xsl:if>
-      <xsl:call-template name="table.of.contents.titlepage"/>
+      <xsl:if test="$toc.title.p">
+        <xsl:call-template name="table.of.contents.titlepage"/>
+      </xsl:if>
       <xsl:apply-templates select="$nodes" mode="toc">
         <xsl:with-param name="toc-context" select="$toc-context"/>
       </xsl:apply-templates>
@@ -93,6 +96,7 @@
 
 <xsl:template name="component.toc">
   <xsl:param name="toc-context" select="."/>
+  <xsl:param name="toc.title.p" select="true()"/>
 
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
@@ -110,7 +114,9 @@
   <xsl:if test="$nodes">
     <fo:block id="toc...{$id}"
               xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:call-template name="table.of.contents.titlepage"/>
+      <xsl:if test="$toc.title.p">
+        <xsl:call-template name="table.of.contents.titlepage"/>
+      </xsl:if>
       <xsl:apply-templates select="$nodes" mode="toc">
         <xsl:with-param name="toc-context" select="$toc-context"/>
       </xsl:apply-templates>

diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index b5a9b2721e466150990a0aae2635f73c4ca1ae80..fdf6ccddefb9d119dd9a9ab8c77c7db3ac3b1227 100644 (file)
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -39,7 +39,7 @@
   <xsl:variable name="level">
     <xsl:choose>
       <xsl:when test="ancestor::section">
-       <xsl:value-of select="count(ancestor::section)+1"/>
+        <xsl:value-of select="count(ancestor::section)+1"/>
       </xsl:when>
       <xsl:when test="ancestor::sect5">6</xsl:when>
       <xsl:when test="ancestor::sect4">5</xsl:when>
@@ -95,9 +95,9 @@
          font-size there... -->
     <xsl:choose>
       <xsl:when test="$level=2">
-       <fo:block xsl:use-attribute-sets="section.title.level2.properties">
-         <xsl:copy-of select="$title"/>
-       </fo:block>
+        <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">
@@ -115,13 +115,13 @@
         </fo:block>
       </xsl:when>
       <xsl:when test="$level=6">
-       <fo:block xsl:use-attribute-sets="section.title.level6.properties">
-         <xsl:copy-of select="$title"/>
-       </fo:block>
+        <fo:block xsl:use-attribute-sets="section.title.level6.properties">
+          <xsl:copy-of select="$title"/>
+        </fo:block>
       </xsl:when>
       <xsl:otherwise>
-       <!-- not in a section: do nothing special -->
-       <xsl:copy-of select="$title"/>
+        <!-- not in a section: do nothing special -->
+        <xsl:copy-of select="$title"/>
       </xsl:otherwise>
     </xsl:choose>
   </fo:block>
@@ -348,11 +348,15 @@
 
       <xsl:variable name="toc.params">
         <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
+          <xsl:with-param name="table" 
+                          select="normalize-space($generate.toc)"/>
         </xsl:call-template>
       </xsl:variable>
       <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc"/>
+        <xsl:call-template name="component.toc">
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
         <xsl:call-template name="component.toc.separator"/>
       </xsl:if>
 
@@ -439,7 +443,10 @@
         </xsl:call-template>
       </xsl:variable>
       <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc"/>
+        <xsl:call-template name="component.toc">
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
         <xsl:call-template name="component.toc.separator"/>
       </xsl:if>
       <xsl:apply-templates/>
@@ -526,7 +533,10 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc"/>
+        <xsl:call-template name="component.toc">
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
         <xsl:call-template name="component.toc.separator"/>
       </xsl:if>
       <xsl:apply-templates/>
@@ -613,7 +623,10 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc"/>
+        <xsl:call-template name="component.toc">
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
         <xsl:call-template name="component.toc.separator"/>
       </xsl:if>
       <xsl:apply-templates/>

diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index 5811aaa9f815625f9681fcd588099035422f8308..9b462cc34e362313137a6638ebe661660b420161 100644 (file)
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -377,7 +377,10 @@
                           select="$lot-master-reference"/>
         </xsl:call-template>
 
-        <xsl:call-template name="division.toc"/>
+        <xsl:call-template name="division.toc">
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
       </fo:flow>
     </fo:page-sequence>
   </xsl:if>
@@ -910,7 +913,10 @@
 
         <xsl:call-template name="division.toc">
           <xsl:with-param name="toc-context" select="$part"/>
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
         </xsl:call-template>
+
       </fo:flow>
     </fo:page-sequence>
   </xsl:if>

diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 551fd7e1111073160ebbad95eb33793f6c9a115d..4abe2464076e6daecc3ec85cf9b78d5c2a50c212 100644 (file)
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -101,9 +101,11 @@
   </xsl:variable>
 
   <xsl:if test="contains($toc.params, 'toc')
-                and (count(ancestor::section)+1) &lt;= $generate.section.toc.level">
+                and (count(ancestor::section)+1) &lt;= 
+               $generate.section.toc.level">
     <xsl:call-template name="section.toc">
-      <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
+      <xsl:with-param name="toc.title.p" 
+                      select="contains($toc.params, 'title')"/>
     </xsl:call-template>
    <xsl:call-template name="section.toc.separator"/>
   </xsl:if>
@@ -185,8 +187,12 @@
       </xsl:variable>
 
       <xsl:if test="contains($toc.params, 'toc')
-                    and (count(ancestor::section)+1) &lt;= $generate.section.toc.level">
-        <xsl:call-template name="section.toc"/>
+                    and (count(ancestor::section)+1) &lt;= 
+                   $generate.section.toc.level">
+        <xsl:call-template name="section.toc">
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
         <xsl:call-template name="section.toc.separator"/>
       </xsl:if>
 
@@ -299,7 +305,10 @@
 
     <xsl:if test="contains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 1">
-      <xsl:call-template name="section.toc"/>
+      <xsl:call-template name="section.toc">
+        <xsl:with-param name="toc.title.p" 
+                        select="contains($toc.params, 'title')"/>
+      </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
 
@@ -382,7 +391,10 @@
 
       <xsl:if test="contains($toc.params, 'toc')
                     and $generate.section.toc.level &gt;= 1">
-        <xsl:call-template name="section.toc"/>
+        <xsl:call-template name="section.toc">
+          <xsl:with-param name="toc.title.p" 
+                          select="contains($toc.params, 'title')"/>
+        </xsl:call-template>
         <xsl:call-template name="section.toc.separator"/>
       </xsl:if>
 
@@ -408,7 +420,10 @@
 
     <xsl:if test="contains($toc.params, 'toc')
                    and $generate.section.toc.level &gt;= 2">
-      <xsl:call-template name="section.toc"/>
+      <xsl:call-template name="section.toc">
+        <xsl:with-param name="toc.title.p" 
+                        select="contains($toc.params, 'title')"/>
+      </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
 
@@ -433,7 +448,10 @@
 
     <xsl:if test="contains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 3">
-      <xsl:call-template name="section.toc"/>
+      <xsl:call-template name="section.toc">
+        <xsl:with-param name="toc.title.p" 
+                        select="contains($toc.params, 'title')"/>
+      </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
 
@@ -458,7 +476,10 @@
 
     <xsl:if test="contains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 4">
-      <xsl:call-template name="section.toc"/>
+      <xsl:call-template name="section.toc">
+        <xsl:with-param name="toc.title.p" 
+                        select="contains($toc.params, 'title')"/>
+      </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>
 
@@ -483,7 +504,10 @@
 
     <xsl:if test="contains($toc.params, 'toc')
                   and $generate.section.toc.level &gt;= 5">
-      <xsl:call-template name="section.toc"/>
+      <xsl:call-template name="section.toc">
+        <xsl:with-param name="toc.title.p" 
+                        select="contains($toc.params, 'title')"/>
+      </xsl:call-template>
       <xsl:call-template name="section.toc.separator"/>
     </xsl:if>