Improve support for titleabbrev in the TOC; suppress speakernotes in the TOC

diff --git a/slides/xsl/slides.xsl b/slides/xsl/slides.xsl
index 450fae481faa1fda2add5c240667464fb33b8ce4..f29f5de47e258bb8dff2e12b84424def34fc198c 100644 (file)
--- a/slides/xsl/slides.xsl
+++ b/slides/xsl/slides.xsl
@@ -1071,7 +1071,14 @@ if (selectBrowser() == "ie5") {
   <div class="toc-section" id="{$id}">
     <img src="{$graphics.dir}/{$minus.image}" alt="-"/>
     <a href="{$thissection}" target="foil">
-      <xsl:apply-templates select="title" mode="toc"/>
+      <xsl:choose>
+        <xsl:when test="titleabbrev">
+          <xsl:apply-templates select="titleabbrev" mode="toc"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="title" mode="toc"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </a>
     <xsl:apply-templates select="foil" mode="toc"/>
   </div>
@@ -1086,7 +1093,14 @@ if (selectBrowser() == "ie5") {
   <div id="{$id}" class="toc-foil">
     <img src="{$graphics.dir}/{$bullet.image}" alt="-"/>
     <a href="{$foil}" target="foil">
-      <xsl:apply-templates select="title" mode="toc"/>
+      <xsl:choose>
+        <xsl:when test="titleabbrev">
+          <xsl:apply-templates select="titleabbrev" mode="toc"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="title" mode="toc"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </a>
   </div>
 </xsl:template>
@@ -1095,6 +1109,10 @@ if (selectBrowser() == "ie5") {
   <xsl:apply-templates mode="toc"/>
 </xsl:template>
 
+<xsl:template match="speakernotes" mode="toc">
+  <!-- nop -->
+</xsl:template>
+
 <!-- ============================================================ -->
 
 <xsl:template match="slidesinfo" mode="ns-toc">
@@ -1169,6 +1187,10 @@ if (selectBrowser() == "ie5") {
   <xsl:text>');&#10;</xsl:text>
 </xsl:template>
 
+<xsl:template match="speakernotes" mode="ns-toc">
+  <!-- nop -->
+</xsl:template>
+
 <!-- ============================================================ -->
 
 </xsl:stylesheet>