Fixed bug 1545377 xml:id not supported in glossary.xsl.

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index 179f9e3096585d514a294eb1b04ce00e8169ff9e..a90be8eadcdcc656e1d35f7bb15cd480597b100e 100644 (file)
--- 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 8ca0223b59bc04876f15a92a1082f22256519880..47f19f58aed2ddae68ab77456e31d9dd0c51a8ba 100644 (file)
--- 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>