From: Bob Stayton <bobs@sagehill.net>
Date: Tue, 11 Feb 2014 22:59:05 +0000 (+0000)
Subject: Fix check for nested links.
X-Git-Tag: release/1.79.1~6^2~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=584f02507f39e38ffca57b3f72966e2bb9fbf904;p=docbook-dsssl

Fix check for nested links.
---

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 2c1ce46d7..6fc48dfc1 100644
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -31,7 +31,7 @@
   <xsl:param name="xhref" select="$node/@xlink:href"/>
 
   <!-- check for nested links, which are undefined in the output -->
-  <xsl:if test="$node/ancestor::*[@xlink:href or @linkend]">
+  <xsl:if test="($linkend or $xhref) and $node/ancestor::*[@xlink:href or @linkend]">
     <xsl:message>
       <xsl:text>WARNING: nested link may be undefined in output: </xsl:text>
       <xsl:text>&lt;</xsl:text>
@@ -41,14 +41,16 @@
         <xsl:when test="$linkend">
           <xsl:text>@linkend = '</xsl:text>
           <xsl:value-of select="$linkend"/>
-          <xsl:text>'.</xsl:text>
+          <xsl:text>'&gt;</xsl:text>
         </xsl:when>
         <xsl:when test="$xhref">
           <xsl:text>@xlink:href = '</xsl:text>
           <xsl:value-of select="$xhref"/>
-          <xsl:text>'.</xsl:text>
+          <xsl:text>'&gt;</xsl:text>
         </xsl:when>
       </xsl:choose>
+      <xsl:text> nested inside parent element </xsl:text>
+      <xsl:value-of select="name($node/parent::*)"/>
     </xsl:message>
   </xsl:if>