Change semantics of generate.section.toc.level; 0 no longer means ignored it now...

diff --git a/xsl/html/param.xsl b/xsl/html/param.xsl
index 5abf9be7a746642cfb68b6c5d36dd66f8f96dee8..d5d2bedd016d2b29cd6087ac3404099fd1915491 100644 (file)
--- a/xsl/html/param.xsl
+++ b/xsl/html/param.xsl
@@ -938,29 +938,28 @@ in the CALS table.
 <refpurpose>Generate TOCs inside Sections?</refpurpose>
 <refdescription>
 <para>If non-zero, a Table of Contents will be generated inside section
-elements. If <parameter>generate.section.toc.level</parameter> is non-zero,
-it may suppress some section TOCs.
+elements. Note that
+<parameter>generate.section.toc.level</parameter>
+may suppress some section TOCs.
 </para>
 </refdescription>
 </doc:param>
 
 <!-- ==================================================================== -->
-<xsl:param name="generate.section.toc.level" select='3' doc:type='integer'/>
+<xsl:param name="generate.section.toc.level" select='10' doc:type='integer'/>
 
 <doc:param name="generate.section.toc.level" xmlns="">
 <refpurpose>Control depth of TOC generation in sections</refpurpose>
 <refdescription>
-<para>If non-zero, <parameter>generate.section.toc.level</parameter> controls
-the depth of section in which TOCs will be generated. Note that this is
-related to, but not the same as <parameter>toc.section.depth</parameter>,
-which controls the depth to which TOC entries will be generated in a given
-TOC.</para>
+<para>The <parameter>generate.section.toc.level</parameter> parameter
+controls the depth of section in which TOCs will be generated. Note
+that this is related to, but not the same as
+<parameter>toc.section.depth</parameter>, which controls the depth to
+which TOC entries will be generated in a given TOC.</para>
 <para>If, for example, <parameter>generate.section.toc.level</parameter>
 is <literal>3</literal>, TOCs will be generated in first, second, and third
 level sections, but not in fourth level sections.
 </para>
-<para>If <parameter>generate.section.toc.level</parameter> is zero, it has
-no effect.</para>
 </refdescription>
 </doc:param>
 

diff --git a/xsl/html/sections.xsl b/xsl/html/sections.xsl
index 2c89eebd928facd8d03985a751f1b8f20b980406..648ca766b65096f52a4f241cfe0fb20758d41960 100644 (file)
--- a/xsl/html/sections.xsl
+++ b/xsl/html/sections.xsl
@@ -22,8 +22,7 @@
     <a name="{$id}"/>
     <xsl:call-template name="section.titlepage"/>
     <xsl:if test="($generate.section.toc != '0'
-                   and ($generate.section.toc.level = 0
-                        or $depth &lt;= $generate.section.toc.level))
+                   and $depth &lt;= $generate.section.toc.level)
                   or refentry">
       <xsl:call-template name="section.toc"/>
     </xsl:if>
@@ -70,8 +69,7 @@
     <a name="{$id}"/>
     <xsl:call-template name="sect1.titlepage"/>
     <xsl:if test="($generate.section.toc != '0'
-                   and ($generate.section.toc.level = 0
-                        or $generate.section.toc.level &gt;= 1))
+                   and $generate.section.toc.level &gt;= 1)
                   or refentry">
       <xsl:call-template name="section.toc"/>
     </xsl:if>
@@ -93,8 +91,7 @@
     <a name="{$id}"/>
     <xsl:call-template name="sect2.titlepage"/>
     <xsl:if test="($generate.section.toc != '0'
-                   and ($generate.section.toc.level = 0
-                        or $generate.section.toc.level &gt;= 2))
+                   and $generate.section.toc.level &gt;= 2)
                   or refentry">
       <xsl:call-template name="section.toc"/>
     </xsl:if>
@@ -115,8 +112,7 @@
     <a name="{$id}"/>
     <xsl:call-template name="sect3.titlepage"/>
     <xsl:if test="($generate.section.toc != '0'
-                   and ($generate.section.toc.level = 0
-                        or $generate.section.toc.level &gt;= 3))
+                   and $generate.section.toc.level &gt;= 3)
                   or refentry">
       <xsl:call-template name="section.toc"/>
     </xsl:if>
@@ -137,8 +133,7 @@
     <a name="{$id}"/>
     <xsl:call-template name="sect4.titlepage"/>
     <xsl:if test="($generate.section.toc != '0'
-                   and ($generate.section.toc.level = 0
-                        or $generate.section.toc.level &gt;= 4))
+                   and $generate.section.toc.level &gt;= 4)
                   or refentry">
       <xsl:call-template name="section.toc"/>
     </xsl:if>
@@ -159,8 +154,7 @@
     <a name="{$id}"/>
     <xsl:call-template name="sect5.titlepage"/>
     <xsl:if test="($generate.section.toc != '0'
-                   and ($generate.section.toc.level = 0
-                        or $generate.section.toc.level &gt;= 5))
+                   and $generate.section.toc.level &gt;= 5)
                   or refentry">
       <xsl:call-template name="section.toc"/>
     </xsl:if>