From: Mauritz Jeanson <mj@johanneberg.com>
Date: Sat, 13 Oct 2007 07:03:17 +0000 (+0000)
Subject: Added a "not(ancestor::title)" test to work around "too many nested
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6619bdc9e7be4737a99ed2a8532956d3ba29258f;p=docbook-dsssl

Added a "not(ancestor::title)" test to work around "too many nested
apply-templates" problems when processing xrefs or links in no.anchor.mode mode.
Hopefully, this closes bug #1811721.
---

diff --git a/xsl/common/titles.xsl b/xsl/common/titles.xsl
index 907871fab..8416de3ac 100644
--- a/xsl/common/titles.xsl
+++ b/xsl/common/titles.xsl
@@ -710,25 +710,39 @@ title of the element. This does not include the label.
     </xsl:when>
 
     <xsl:otherwise>
-      <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-
-      <xsl:apply-templates select="$target" mode="xref-to">
-        <xsl:with-param name="referrer" select="."/>
-        <xsl:with-param name="xrefstyle">
-          <xsl:choose>
-            <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-              <xsl:value-of select="@role"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@xrefstyle"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+      
+      <xsl:choose>
+	<!-- Watch out for the case when there is a xref or link inside 
+	     a title. See bug #1811721. -->
+	<xsl:when test="not(ancestor::title)">
+	  <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
+	  
+	  <xsl:apply-templates select="$target" mode="xref-to">
+	    
+	    <xsl:with-param name="referrer" select="."/>
+	    <xsl:with-param name="xrefstyle">
+	      <xsl:choose>
+		<xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
+		  <xsl:value-of select="@role"/>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:value-of select="@xrefstyle"/>
+		</xsl:otherwise>
+	      </xsl:choose>
+	    </xsl:with-param>
+	  </xsl:apply-templates>
+	  
+	  <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
+	</xsl:when>
+	
+	<xsl:otherwise>
+	  <xsl:apply-templates/>
+	</xsl:otherwise>
+      
+      </xsl:choose>
     </xsl:otherwise>
   </xsl:choose>
+
 </xsl:template>
 
 <!-- ============================================================ -->