From a951954c79543a1cc4ba3ab4bd5ffc297d48b701 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Sun, 3 Apr 2005 09:22:46 +0000
Subject: [PATCH] Add footnotes in table title to table footnote set, and add
 support for table footnotes to HTML table markup.

---
 xsl/fo/footnote.xsl |  8 ++++----
 xsl/fo/formal.xsl   |  8 ++++----
 xsl/fo/htmltbl.xsl  | 12 ++++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/xsl/fo/footnote.xsl b/xsl/fo/footnote.xsl
index 3b6aa7b37..f5ce73f5b 100644
--- a/xsl/fo/footnote.xsl
+++ b/xsl/fo/footnote.xsl
@@ -32,7 +32,7 @@
 
 <xsl:template match="footnote">
   <xsl:choose>
-    <xsl:when test="ancestor::tgroup">
+    <xsl:when test="ancestor::table or ancestor::informaltable">
       <xsl:call-template name="format.footnote.mark">
         <xsl:with-param name="mark">
           <xsl:apply-templates select="." mode="footnote.number"/>
@@ -70,7 +70,7 @@
     <xsl:when test="string-length(@label) != 0">
       <xsl:value-of select="@label"/>
     </xsl:when>
-    <xsl:when test="ancestor::tgroup">
+    <xsl:when test="ancestor::table or ancestor::informaltable">
       <xsl:variable name="tfnum">
         <xsl:number level="any" from="table|informaltable" format="1"/>
       </xsl:variable>
@@ -80,7 +80,7 @@
           <xsl:value-of select="substring($table.footnote.number.symbols, $tfnum, 1)"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:number level="any" from="tgroup"
+          <xsl:number level="any" from="table|informaltable"
                       format="{$table.footnote.number.format}"/>
         </xsl:otherwise>
       </xsl:choose>
@@ -90,7 +90,7 @@
         <!-- FIXME: list in @from is probably not complete -->
         <xsl:number level="any" 
                     from="chapter|appendix|preface|article|refentry|bibliography" 
-                    count="footnote[not(@label)][not(ancestor::tgroup)]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)]" 
+                    count="footnote[not(@label)][not(ancestor::table) and not(ancestor::informaltable]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)]" 
                     format="1"/>
       </xsl:variable>
       <xsl:choose>
diff --git a/xsl/fo/formal.xsl b/xsl/fo/formal.xsl
index 5c8fd0ce4..5c879ffc8 100644
--- a/xsl/fo/formal.xsl
+++ b/xsl/fo/formal.xsl
@@ -543,11 +543,11 @@
   </xsl:variable>
 
   <xsl:variable name="footnotes">
-    <xsl:if test="tgroup//footnote">
+    <xsl:if test=".//footnote">
       <fo:block font-family="{$body.fontset}"
                 font-size="{$footnote.font.size}"
                 keep-with-previous="always">
-        <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>
+        <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
       </fo:block>
     </xsl:if>
   </xsl:variable>
@@ -687,11 +687,11 @@
   </xsl:variable>
 
   <xsl:variable name="footnotes">
-    <xsl:if test="tgroup//footnote">
+    <xsl:if test=".//footnote">
       <fo:block font-family="{$body.fontset}"
                 font-size="{$footnote.font.size}"
                 keep-with-previous="always">
-        <xsl:apply-templates select="tgroup//footnote" mode="table.footnote.mode"/>
+        <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
       </fo:block>
     </xsl:if>
   </xsl:variable>
diff --git a/xsl/fo/htmltbl.xsl b/xsl/fo/htmltbl.xsl
index 9b7182566..b839a5d44 100644
--- a/xsl/fo/htmltbl.xsl
+++ b/xsl/fo/htmltbl.xsl
@@ -36,6 +36,16 @@
     </xsl:call-template>
   </xsl:variable>
 
+  <xsl:variable name="footnotes">
+    <xsl:if test=".//footnote">
+      <fo:block font-family="{$body.fontset}"
+                font-size="{$footnote.font.size}"
+                keep-with-previous="always">
+        <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
+      </fo:block>
+    </xsl:if>
+  </xsl:variable>
+
   <xsl:choose>
     <xsl:when test="caption">
       <fo:table-and-caption id="{$id}" 
@@ -73,6 +83,7 @@
           </xsl:choose>
         </fo:table>
       </fo:table-and-caption>
+      <xsl:copy-of select="$footnotes"/>
     </xsl:when>
     <xsl:otherwise>
       <fo:block id="{$id}"
@@ -93,6 +104,7 @@
           <xsl:apply-templates mode="htmlTable"/>
         </fo:table>
       </fo:block>
+      <xsl:copy-of select="$footnotes"/>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
-- 
2.40.0