From: Jirka Kosek <jirka@kosek.cz>
Date: Tue, 17 Sep 2019 21:44:20 +0000 (+0200)
Subject: Reference to indexterm location specified by zone is not rendered if there is nested... 
X-Git-Tag: snapshot-ndw-test/2019-10-04~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2235a9354468037f9b4dddd2fd7bd7cf2482be24;p=docbook-dsssl

Reference to indexterm location specified by zone is not rendered if there is nested phrase (secondary, tertiary, ...)
---

diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index 7e2d5af4f..b7a93e752 100644
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -329,7 +329,7 @@
     <xsl:value-of select="d:primary"/>
     <xsl:choose>
       <xsl:when test="$index.links.to.section = 1">
-        <xsl:for-each select="$refs[@zone != '' or generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
+        <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
           <xsl:apply-templates select="." mode="reference">
             <xsl:with-param name="position" select="position()"/>
             <xsl:with-param name="scope" select="$scope"/>
@@ -420,7 +420,7 @@
     <xsl:value-of select="d:secondary"/>
     <xsl:choose>
       <xsl:when test="$index.links.to.section = 1">
-        <xsl:for-each select="$refs[@zone != '' or generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[&scope;])]">
+        <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[&scope;])]">
           <xsl:apply-templates select="." mode="reference">
             <xsl:with-param name="position" select="position()"/>
             <xsl:with-param name="scope" select="$scope"/>
@@ -513,7 +513,7 @@
     <xsl:value-of select="d:tertiary"/>
     <xsl:choose>
       <xsl:when test="$index.links.to.section = 1">
-        <xsl:for-each select="$refs[@zone != '' or generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[&scope;])]">
+        <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &sep;, &section.id;))[&scope;])]">
           <xsl:apply-templates select="." mode="reference">
             <xsl:with-param name="position" select="position()"/>
             <xsl:with-param name="scope" select="$scope"/>