From: Mauritz Jeanson <mj@johanneberg.com>
Date: Mon, 10 Sep 2007 17:16:55 +0000 (+0000)
Subject: Removed the [&scope;] predicate from the target variable in the template with name... 
X-Git-Tag: release/1.79.1~6^2~1662
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c611d7f8ba052fe569c2904ab864d69eda29fa5;p=docbook-dsssl

Removed the [&scope;] predicate from the target variable in the template with name="reference".
This filter was the cause of missing index backlinks when @zone and @type were used on indexterms,
with index.on.type=1. Closes bug #1680836.
---

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index bf42732f5..0061d075b 100644
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -700,7 +700,7 @@
   <xsl:choose>
     <xsl:when test="contains($zones, ' ')">
       <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
+      <xsl:variable name="target" select="key('id', $zone)"/>
 
       <xsl:variable name="id">
         <xsl:call-template name="object.id">
@@ -725,7 +725,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
+      <xsl:variable name="target" select="key('id', $zone)"/>
 
       <xsl:variable name="id">
         <xsl:call-template name="object.id">
diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index 43db3b9f6..fef362472 100644
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -507,7 +507,7 @@
   <xsl:choose>
     <xsl:when test="contains($zones, ' ')">
       <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
+      <xsl:variable name="target" select="key('sections', $zone)"/>
 
       <a>
         <xsl:apply-templates select="." mode="class.attribute"/>
@@ -530,7 +530,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
+      <xsl:variable name="target" select="key('sections', $zone)"/>
 
       <a>
         <xsl:apply-templates select="." mode="class.attribute"/>