Table title with tocentry="0" attribute is now omitted from the

table of contents. Fixes bug 3279748.

diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index 334b4f3195b7645400f67db03486797a18671419..4bdec7fac5779be28e9cffd68f452609b63d0ea0 100644 (file)
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -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>

diff --git a/xsl/html/autotoc.xsl b/xsl/html/autotoc.xsl
index 1af8d74125b356a83a278445aad9aec3eb4a1b50..0357355e5888b22b0ebd5af860b477ac0b0714c0 100644 (file)
--- a/xsl/html/autotoc.xsl
+++ b/xsl/html/autotoc.xsl
@@ -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>
 

diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index 652e9f37266bb3d5f5836528d1b15fc1fa830bc6..08227d209334a12d26300d781f99d6c4bed0b3a5 100644 (file)
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -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>