From 2c5926ca1bc1638facd3f1e657ea02a19362aa5b Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 24 Aug 2006 08:20:57 +0000
Subject: [PATCH] Fixed bug 1545377 xml:id not supported in glossary.xsl.

---
 xsl/fo/glossary.xsl   | 8 ++++----
 xsl/html/glossary.xsl | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index 179f9e309..a90be8ead 100644
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -642,7 +642,7 @@ GlossEntry ::=
 
 <xsl:template match="glossentry/glosssee" mode="glossary.as.list">
   <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
+  <xsl:variable name="targets" select="key('id', $otherterm)"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <fo:block>
@@ -711,7 +711,7 @@ GlossEntry ::=
 
 <xsl:template match="glossseealso" mode="glossary.as.list">
   <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
+  <xsl:variable name="targets" select="key('id', $otherterm)"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:choose>
@@ -846,7 +846,7 @@ GlossEntry ::=
 
 <xsl:template match="glossentry/glosssee" mode="glossary.as.blocks">
   <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
+  <xsl:variable name="targets" select="key('id', $otherterm)"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:variable name="template">
@@ -919,7 +919,7 @@ GlossEntry ::=
 
 <xsl:template match="glossseealso" mode="glossary.as.blocks">
   <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
+  <xsl:variable name="targets" select="key('id', $otherterm)"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:choose>
diff --git a/xsl/html/glossary.xsl b/xsl/html/glossary.xsl
index 8ca0223b5..47f19f58a 100644
--- a/xsl/html/glossary.xsl
+++ b/xsl/html/glossary.xsl
@@ -186,7 +186,7 @@ GlossEntry ::=
 
 <xsl:template match="glossentry/glosssee">
   <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
+  <xsl:variable name="targets" select="key('id', $otherterm)"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <dd>
@@ -257,7 +257,7 @@ GlossEntry ::=
 
 <xsl:template match="glossseealso">
   <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="//node()[@id=$otherterm]"/>
+  <xsl:variable name="targets" select="key('id', $otherterm)"/>
   <xsl:variable name="target" select="$targets[1]"/>
 
   <xsl:choose>
-- 
2.50.1