SF.net SVN: docbook:[9124] trunk/xsl

[<bob...@us...>]

Revision: 9124
          http://docbook.svn.sourceforge.net/docbook/?rev=9124&view=rev
Author:   bobstayton
Date:     2011-10-09 21:04:08 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
Table title with tocentry="0" attribute is now omitted from the
table of contents. Fixes bug 3279748.

Modified Paths:
--------------
    trunk/xsl/fo/division.xsl
    trunk/xsl/html/autotoc.xsl
    trunk/xsl/html/chunk-common.xsl

Modified: trunk/xsl/fo/division.xsl
===================================================================
--- trunk/xsl/fo/division.xsl	2011-10-09 20:51:44 UTC (rev 9123)
+++ trunk/xsl/fo/division.xsl	2011-10-09 21:04:08 UTC (rev 9124)
@@ -333,7 +333,7 @@
       <xsl:with-param name="content">
         <xsl:call-template name="list.of.titles">
           <xsl:with-param name="titles" select="'table'"/>
-          <xsl:with-param name="nodes" select=".//table"/>
+          <xsl:with-param name="nodes" select=".//table[not(@tocentry = 0)]"/>
         </xsl:call-template>
       </xsl:with-param>
     </xsl:call-template>

Modified: trunk/xsl/html/autotoc.xsl
===================================================================
--- trunk/xsl/html/autotoc.xsl	2011-10-09 20:51:44 UTC (rev 9123)
+++ trunk/xsl/html/autotoc.xsl	2011-10-09 21:04:08 UTC (rev 9124)
@@ -125,7 +125,7 @@
   <xsl:if test="contains($toc.params, 'table')">
     <xsl:call-template name="list.of.titles">
       <xsl:with-param name="titles" select="'table'"/>
-      <xsl:with-param name="nodes" select=".//table"/>
+      <xsl:with-param name="nodes" select=".//table[not(@tocentry = 0)]"/>
     </xsl:call-template>
   </xsl:if>
 

Modified: trunk/xsl/html/chunk-common.xsl
===================================================================
--- trunk/xsl/html/chunk-common.xsl	2011-10-09 20:51:44 UTC (rev 9123)
+++ trunk/xsl/html/chunk-common.xsl	2011-10-09 21:04:08 UTC (rev 9124)
@@ -517,7 +517,7 @@
             <xsl:with-param name="lot">
               <xsl:call-template name="list.of.titles">
                 <xsl:with-param name="titles" select="'table'"/>
-                <xsl:with-param name="nodes" select=".//table"/>
+                <xsl:with-param name="nodes" select=".//table[not(@tocentry = 0)]"/>
               </xsl:call-template>
             </xsl:with-param>
           </xsl:call-template>
@@ -525,7 +525,7 @@
         <xsl:otherwise>
           <xsl:call-template name="list.of.titles">
             <xsl:with-param name="titles" select="'table'"/>
-            <xsl:with-param name="nodes" select=".//table"/>
+            <xsl:with-param name="nodes" select=".//table[not(@tocentry = 0)]"/>
           </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.