Removed the [&scope;] predicate from the target variable in the template with name...

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 bf42732f5cdd51e80ffe6904d8cb707872379c9e..0061d075b7e514b0a56a27092bf8f9296a7ff76b 100644 (file)
--- 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 43db3b9f6b8959ad99e1574a886ed2bd2db3f801..fef362472f04079a12d251647f9d63b8c527f7d4 100644 (file)
--- 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"/>