From 78cf66ead6975d6f1c81e0f4bbfe4a6884e16bde Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Fri, 19 Dec 2003 14:41:48 +0000
Subject: [PATCH] Slides #813038: make sure foilgroup toc is inside
 foilgroup-body

---
 slides/xsl/html/slides-common.xsl | 14 ++++++++------
 slides/xsl/html/tables.xsl        |  6 ++++++
 slides/xsl/html/w3c.xsl           |  6 ++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/slides/xsl/html/slides-common.xsl b/slides/xsl/html/slides-common.xsl
index 4b060efac..63a08b073 100644
--- a/slides/xsl/html/slides-common.xsl
+++ b/slides/xsl/html/slides-common.xsl
@@ -1064,6 +1064,8 @@
               <xsl:with-param name="prev" select="$prev"/>
             </xsl:call-template>
 
+	    <!-- n.b. the foilgroup-body template is responsible for generating -->
+	    <!-- the foilgroup toc -->
             <div class="foilgroup-body">
               <xsl:call-template name="foilgroup-body">
                 <xsl:with-param name="home" select="$home"/>
@@ -1071,12 +1073,6 @@
                 <xsl:with-param name="next" select="$next"/>
                 <xsl:with-param name="prev" select="$prev"/>
               </xsl:call-template>
-
-              <xsl:if test="$foilgroup.toc != 0">
-                <dl class="toc">
-                  <xsl:apply-templates select="foil" mode="toc"/>
-                </dl>
-              </xsl:if>
             </div>
 
             <div id="overlayDiv">
@@ -1112,6 +1108,12 @@
 
   <xsl:apply-templates select="*[name(.) != 'foil'
                                 and name(.) != 'foilgroup']"/>
+
+  <xsl:if test="$foilgroup.toc != 0">
+    <dl class="toc">
+      <xsl:apply-templates select="foil" mode="toc"/>
+    </dl>
+  </xsl:if>
 </xsl:template>
 
 <xsl:template name="foilgroup-top-nav">
diff --git a/slides/xsl/html/tables.xsl b/slides/xsl/html/tables.xsl
index 43e71100d..046252854 100644
--- a/slides/xsl/html/tables.xsl
+++ b/slides/xsl/html/tables.xsl
@@ -39,6 +39,12 @@
           <xsl:apply-templates select="*[name(.) != 'foil'
                                          and name(.) != 'foilgroup']"/>
         </div>
+
+	<xsl:if test="$foilgroup.toc != 0">
+	  <dl class="toc">
+	    <xsl:apply-templates select="foil" mode="toc"/>
+	  </dl>
+	</xsl:if>
       </td>
     </tr>
   </table>
diff --git a/slides/xsl/html/w3c.xsl b/slides/xsl/html/w3c.xsl
index 1b31805a7..0d3471831 100644
--- a/slides/xsl/html/w3c.xsl
+++ b/slides/xsl/html/w3c.xsl
@@ -360,6 +360,12 @@
   <xsl:apply-templates select="*[name(.) != 'title'
                                 and name(.) != 'foil'
                                 and name(.) != 'foilgroup']"/>
+
+  <xsl:if test="$foilgroup.toc != 0">
+    <dl class="toc">
+      <xsl:apply-templates select="foil" mode="toc"/>
+    </dl>
+  </xsl:if>
 </xsl:template>
 
 <!-- ====================================================================== -->
-- 
2.40.0