Bug #487576: table/indexterm problems

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 743267f998efab2b8bef6f0d7cc59611b7eaf19b..90972b67e804bd1a89e5099b38fdbed22bed3622 100644 (file)
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -141,7 +141,7 @@
         <xsl:if test="count($prop-columns) != 0">
           <xsl:attribute name="table-layout">fixed</xsl:attribute>
         </xsl:if>
-        <xsl:apply-templates/>
+        <xsl:apply-templates select="tgroup"/>
       </fo:table>
     </fo:table-and-caption>
   </fo:block>
@@ -181,7 +181,7 @@
       <xsl:if test="count($prop-columns) != 0">
         <xsl:attribute name="table-layout">fixed</xsl:attribute>
       </xsl:if>
-      <xsl:apply-templates/>
+      <xsl:apply-templates select="tgroup"/>
     </fo:table>
   </fo:block>
 </xsl:template>

diff --git a/xsl/fo/table.xsl b/xsl/fo/table.xsl
index 67ae62948cc59b6210bb325e5670cd272918395f..69aa56ad610b87bd928f64d091390bd8a8e01f06 100644 (file)
--- a/xsl/fo/table.xsl
+++ b/xsl/fo/table.xsl
@@ -458,6 +458,19 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 -->
 
         <fo:block>
+          <!-- are we missing any indexterms? -->
+          <xsl:if test="not(preceding-sibling::entry)
+                        and not(parent::row/preceding-sibling::row)">
+            <!-- this is the first entry of the first row -->
+            <xsl:if test="ancestor::thead or
+                          (ancestor::tbody
+                           and not(ancestor::tbody/preceding-sibling::thead
+                                   or ancestor::tbody/preceding-sibling::tbody))">
+              <!-- of the thead or the first tbody -->
+              <xsl:apply-templates select="ancestor::tgroup/preceding-sibling::indexterm"/>
+            </xsl:if>
+          </xsl:if>
+
           <!--
           <xsl:text>(</xsl:text>
           <xsl:value-of select="$rowsep"/>