From: bobstayton <bobs@sagehill.net>
Date: Sun, 15 Jul 2018 09:06:02 +0000 (-0700)
Subject: fix issue #41 Indexes in articles in a set collect index entries from other articles... 
X-Git-Tag: snapshot/2018-09-28-172~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31de1995dcbe15c3158cc71d7e934442b805a074;p=docbook-dsssl

fix issue #41 Indexes in articles in a set collect index entries from other articles in the set (HTML)
---

diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index d0373d82a..c51bce334 100644
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -76,7 +76,22 @@
 
 
 <xsl:template name="generate-index">
-  <xsl:param name="scope" select="(ancestor::d:book|/)[last()]"/>
+  <!-- these are all the elements that can contain an index element -->
+  <xsl:param name="scope" select="(ancestor::d:book 
+                                 | ancestor::d:appendix 
+                                 | ancestor::d:article 
+                                 | ancestor::d:chapter 
+                                 | ancestor::d:part 
+                                 | ancestor::d:preface 
+                                 | ancestor::d:sect1 
+                                 | ancestor::d:sect2 
+                                 | ancestor::d:sect3 
+                                 | ancestor::d:sect4 
+                                 | ancestor::d:sect5 
+                                 | ancestor::d:section 
+                                 | ancestor::d:set
+                                 | ancestor::d:topic 
+                                 |/)[last()]"/>
 
   <xsl:choose>
     <xsl:when test="$index.method = 'kosek'">
diff --git a/xsl/html/index.xsl b/xsl/html/index.xsl
index 851e12a6f..b310fd34a 100644
--- a/xsl/html/index.xsl
+++ b/xsl/html/index.xsl
@@ -56,7 +56,6 @@
 
       <xsl:if test="count(d:indexentry) = 0 and count(d:indexdiv) = 0">
         <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="(ancestor::d:book|/)[last()]"/>
         </xsl:call-template>
       </xsl:if>
 
@@ -88,7 +87,6 @@
 
       <xsl:if test="count(d:indexentry) = 0 and count(d:indexdiv) = 0">
         <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="/"/>
         </xsl:call-template>
       </xsl:if>