- Use set:has-same-node

* xslt/docbook/common/db-chunk.xsl:
* xslt/docbook/common/db-label.xsl:
* xslt/docbook/common/db-xref.xsl:
- Use set:has-same-node

svn path=/trunk/; revision=995

3 files changed, 7 insertions, 3 deletions

diff --git a/xslt/docbook/common/db-chunk.xsl b/xslt/docbook/common/db-chunk.xsl
index 2367a99..cbff948 100644
--- a/xslt/docbook/common/db-chunk.xsl
+++ b/xslt/docbook/common/db-chunk.xsl
@@ -18,6 +18,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
+                xmlns:set="http://exslt.org/sets"
                 extension-element-prefixes="exsl"
                 version="1.0">
 
@@ -140,7 +141,7 @@ chunking mechanism without having to duplicate the content-generation code.
       <xsl:when test="$template = 'info'">
         <xsl:value-of select="$db.chunk.info_basename"/>
       </xsl:when>
-      <xsl:when test="$node = /*">
+      <xsl:when test="set:has-same-node($node, /*)">
         <xsl:value-of select="$db.chunk.basename"/>
       </xsl:when>
       <xsl:otherwise>
diff --git a/xslt/docbook/common/db-label.xsl b/xslt/docbook/common/db-label.xsl
index 15d4445..1967393 100644
--- a/xslt/docbook/common/db-label.xsl
+++ b/xslt/docbook/common/db-label.xsl
@@ -17,6 +17,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:set="http://exslt.org/sets"
                 xmlns:msg="http://www.gnome.org/~shaunm/gnome-doc-utils/l10n"
                 version="1.0">
 
@@ -423,7 +424,8 @@ REMARK: Document this mode
     </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="increment"
-                select="number($this/ancestor::*[number($depth)] = $chunk)"/>
+                select="number(set:has-same-node($this/ancestor::*[number($depth)],
+                                                 $chunk ))"/>
   <xsl:choose>
     <xsl:when test="$pos = count($notes)">
       <xsl:value-of select="$count + $increment"/>
diff --git a/xslt/docbook/common/db-xref.xsl b/xslt/docbook/common/db-xref.xsl
index 99e1fb4..d116a97 100644
--- a/xslt/docbook/common/db-xref.xsl
+++ b/xslt/docbook/common/db-xref.xsl
@@ -17,6 +17,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:set="http://exslt.org/sets"
                 version="1.0">
 
 <!--!!==========================================================================
@@ -357,7 +358,7 @@ REMARK: Talk about how this works with chunking
       <xsl:value-of
        select="concat($db.chunk.info_basename, $db.chunk.extension)"/>
     </xsl:when>
-    <xsl:when test="$target = /*">
+    <xsl:when test="set:has-same-node($target, /*)">
       <xsl:value-of select="concat($db.chunk.basename, $db.chunk.extension)"/>
     </xsl:when>
     <xsl:when test="$is_chunk">