From 292d34ff00e55225d7c37d7e79faef9eeacaacb3 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 8 Apr 2009 07:44:54 +0000
Subject: [PATCH] Convert function-available test for node-set() function to
 test of $exsl.node.set.available param.

---
 xsl/eclipse/eclipse.xsl          | 4 +---
 xsl/epub/docbook.xsl             | 5 +----
 xsl/htmlhelp/htmlhelp-common.xsl | 8 +++-----
 xsl/javahelp/javahelp.xsl        | 5 +----
 xsl/manpages/table.xsl           | 2 +-
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/xsl/eclipse/eclipse.xsl b/xsl/eclipse/eclipse.xsl
index 97d6ea4e7..ac5a26537 100644
--- a/xsl/eclipse/eclipse.xsl
+++ b/xsl/eclipse/eclipse.xsl
@@ -29,9 +29,7 @@
          toss the namespace and continue.  Use the docbook5 namespaced
          stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
+    <xsl:when test="$exsl.node.set.available != 0
                     and (*/self::ng:* or */self::db:*)">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
diff --git a/xsl/epub/docbook.xsl b/xsl/epub/docbook.xsl
index 151478a38..4a09691b7 100644
--- a/xsl/epub/docbook.xsl
+++ b/xsl/epub/docbook.xsl
@@ -100,10 +100,7 @@
         toss the namespace and continue.  Use the docbook5 namespaced
         stylesheets for DocBook5 if you don't want to use this feature.-->
       <!-- include extra test for Xalan quirk -->
-      <xsl:when
-        test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
+      <xsl:when test="$exsl.node.set.available != 0
                     and (*/self::ng:* or */self::db:*)">
         <xsl:call-template name="log.message">
           <xsl:with-param name="level">Note</xsl:with-param>
diff --git a/xsl/htmlhelp/htmlhelp-common.xsl b/xsl/htmlhelp/htmlhelp-common.xsl
index 4108fbfd7..40f7a7624 100644
--- a/xsl/htmlhelp/htmlhelp-common.xsl
+++ b/xsl/htmlhelp/htmlhelp-common.xsl
@@ -45,10 +45,7 @@
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
          toss the namespace and continue.  Use the docbook5 namespaced
          stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
+    <xsl:when test="$exsl.node.set.available != 0
                     and (*/self::ng:* or */self::db:*)">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
@@ -381,7 +378,8 @@ Enhanced decompilation=</xsl:text>
     </xsl:choose>
   </xsl:variable>
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set') and function-available('set:distinct')">
+    <xsl:when test="$exsl.node.set.available != 0
+                    and function-available('set:distinct')">
       <xsl:for-each select="set:distinct(exsl:node-set($imagelist)/filename)">
         <xsl:value-of select="."/>
         <xsl:text>&#10;</xsl:text>
diff --git a/xsl/javahelp/javahelp.xsl b/xsl/javahelp/javahelp.xsl
index 29f897c66..9668c99df 100644
--- a/xsl/javahelp/javahelp.xsl
+++ b/xsl/javahelp/javahelp.xsl
@@ -33,10 +33,7 @@
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
          toss the namespace and continue.  Use the docbook5 namespaced
          stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
+    <xsl:when test="$exsl.node.set.available != 0
                     and (*/self::ng:* or */self::db:*)">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
diff --git a/xsl/manpages/table.xsl b/xsl/manpages/table.xsl
index 8321bd308..cc747cc83 100644
--- a/xsl/manpages/table.xsl
+++ b/xsl/manpages/table.xsl
@@ -600,7 +600,7 @@
       <xsl:apply-templates select="."/>
     </xsl:variable>
     <xsl:choose>
-      <xsl:when test="function-available('exsl:node-set')">
+      <xsl:when test="$exsl.node.set.available != 0">
         <xsl:variable name="html-nodes" select="exsl:node-set($html)"/>
         <xsl:choose>
           <xsl:when test="$html-nodes//p">
-- 
2.49.0