From 813d7f7d567b3004aa01da578b1c9ebdeb0aebb9 Mon Sep 17 00:00:00 2001
From: Jason Fox <jason-fox@users.noreply.github.com>
Date: Wed, 18 Dec 2024 23:05:56 +0100
Subject: [PATCH] Expand titles

---
 Customization/xsl/scrollspy.xsl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Customization/xsl/scrollspy.xsl b/Customization/xsl/scrollspy.xsl
index 1ed1973..c4279eb 100644
--- a/Customization/xsl/scrollspy.xsl
+++ b/Customization/xsl/scrollspy.xsl
@@ -134,7 +134,7 @@
   />
 
   <xsl:template
-    match="*[@id and (contains(@class, ' topic/section ') or contains(@class, ' topic/example '))]"
+    match="*[@id and ./*[contains(@class, ' topic/title ')] and (contains(@class, ' topic/section ') or contains(@class, ' topic/example '))]"
     mode="scrollspy"
   >
     <xsl:choose>
@@ -144,7 +144,7 @@
             <xsl:text>#</xsl:text>
             <xsl:sequence select="dita-ot:generate-id(parent::*/parent::*/@id, @id)"/>
           </xsl:attribute>
-          <xsl:value-of select="*[contains(@class, ' topic/title ')]"/>
+          <xsl:apply-templates select="*[contains(@class, ' topic/title ')]" mode="scrollspy-section-title"/>
         </a>
       </xsl:when>
       <xsl:when test="$BOOTSTRAP_SCROLLSPY_TOC = ('nav-pill')">
@@ -153,7 +153,7 @@
             <xsl:text>#</xsl:text>
             <xsl:sequence select="dita-ot:generate-id(parent::*/parent::*/@id, @id)"/>
           </xsl:attribute>
-          <xsl:value-of select="*[contains(@class, ' topic/title ')]"/>
+          <xsl:apply-templates select="*[contains(@class, ' topic/title ')]" mode="scrollspy-section-title"/>
         </a>
       </xsl:when>
       <xsl:otherwise>
@@ -163,14 +163,16 @@
               <xsl:text>#</xsl:text>
               <xsl:sequence select="dita-ot:generate-id(parent::*/parent::*/@id, @id)"/>
             </xsl:attribute>
-            <xsl:value-of select="*[contains(@class, ' topic/title ')]"/>
+            <xsl:apply-templates select="*[contains(@class, ' topic/title ')]" mode="scrollspy-section-title"/>
           </a>
         </li>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-
+  <xsl:template match="*[contains(@class, ' topic/title ')]" mode="scrollspy-section-title">
+    <xsl:apply-templates/>
+  </xsl:template>
 
   <xsl:template match="*" mode="scrollspy"/>
 </xsl:stylesheet>