Fix footnotes in table titles

diff --git a/xsl/fo/footnote.xsl b/xsl/fo/footnote.xsl
index be9ef8f166ed3b4e703191f1b7469887d50608ec..4f832983a14e668a3677e31bc0ece33239c27db1 100644 (file)
--- a/xsl/fo/footnote.xsl
+++ b/xsl/fo/footnote.xsl
@@ -65,8 +65,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:variable name="pfoot" select="preceding::footnote"/>
-      <xsl:variable name="ptfoot" select="preceding::table//footnote
-                                          |preceding::informaltable//footnote"/>
+      <xsl:variable name="ptfoot" select="preceding::tgroup//footnote"/>
       <xsl:number value="count($pfoot) - count($ptfoot) + 1" format="1"/>
     </xsl:otherwise>
   </xsl:choose>

diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 68651cad4a4f7c00504abc66b1d8811e837b4431..8b48fd2ee873923cd1a9c9cbb5f992e200f5dbb9 100644 (file)
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -35,7 +35,9 @@
 <xsl:template name="formal.object.heading">
   <xsl:param name="object" select="."/>
   <fo:block xsl:use-attribute-sets="formal.title.properties">
-    <xsl:apply-templates select="$object" mode="object.title.markup"/>
+    <xsl:apply-templates select="$object" mode="object.title.markup">
+      <xsl:with-param name="allow-anchors" select="1"/>
+    </xsl:apply-templates>
   </fo:block>
 </xsl:template>
 
@@ -253,12 +255,12 @@
   </xsl:variable>
 
   <xsl:variable name="footnotes">
-    <xsl:if test=".//footnote">
+    <xsl:if test="tgroup//footnote">
       <fo:block font-family="{$body.font.family}"
                 font-size="{$footnote.font.size}"
                 keep-together.within-column="1"
                 keep-with-previous="always">
-        <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
+        <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>
       </fo:block>
     </xsl:if>
   </xsl:variable>
@@ -349,12 +351,12 @@
   </xsl:variable>
 
   <xsl:variable name="footnotes">
-    <xsl:if test=".//footnote">
+    <xsl:if test="tgroup//footnote">
       <fo:block font-family="{$body.font.family}"
                 font-size="{$footnote.font.size}"
                 keep-together.within-column="1"
                 keep-with-previous="always">
-        <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
+        <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>
       </fo:block>
     </xsl:if>
   </xsl:variable>

diff --git a/xsl/html/footnote.xsl b/xsl/html/footnote.xsl
index 3e1aec579f93a88c7dc4be19bd6eeebd60b1e22e..7d51df8ef93182e1a19d204b48bd0363512d2b84 100644 (file)
--- a/xsl/html/footnote.xsl
+++ b/xsl/html/footnote.xsl
@@ -24,7 +24,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="ancestor::table|ancestor::informaltable">
+    <xsl:when test="ancestor::tgroup">
       <sup>
         <xsl:text>[</xsl:text>
         <a name="{$name}" href="{$href}">
@@ -65,7 +65,7 @@
 
 <xsl:template match="footnote" mode="footnote.number">
   <xsl:choose>
-    <xsl:when test="ancestor::table or ancestor::informaltable">
+    <xsl:when test="ancestor::tgroup">
       <xsl:number level="any" from="table|informaltable" format="a"/>
     </xsl:when>
     <xsl:when test="ancestor::refentry">
@@ -190,7 +190,7 @@
 <xsl:template name="process.footnotes">
   <xsl:variable name="footnotes" select=".//footnote"/>
   <xsl:variable name="table.footnotes"
-                select=".//table//footnote|.//informaltable//footnote"/>
+                select=".//tgroup//footnote"/>
 
   <!-- Only bother to do this if there's at least one non-table footnote -->
   <xsl:if test="count($footnotes)>count($table.footnotes)">
@@ -235,7 +235,7 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="informaltable//footnote|table//footnote"
+<xsl:template match="tgroup//footnote"
               mode="process.footnote.mode">
 </xsl:template>