From 12abf65a279e71bbb0904d296ee6dfa27a56bd81 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 8 Apr 2009 07:37:42 +0000
Subject: [PATCH] Convert function-available for node-set() to use new
 $exsl.node.set.available param in test.

---
 xsl/fo/autoidx-kosek.xsl      | 3 +--
 xsl/fo/autoidx.xsl            | 3 +--
 xsl/fo/docbook.xsl            | 5 +----
 xsl/html/autoidx-kosek.xsl    | 3 +--
 xsl/html/autoidx.xsl          | 3 +--
 xsl/html/chunk-changebars.xsl | 4 ++--
 xsl/html/chunk-common.xsl     | 4 ++--
 xsl/html/chunktoc.xsl         | 4 +---
 xsl/html/docbook.xsl          | 4 +---
 9 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/xsl/fo/autoidx-kosek.xsl b/xsl/fo/autoidx-kosek.xsl
index bfb17b101..bbd826a5a 100644
--- a/xsl/fo/autoidx-kosek.xsl
+++ b/xsl/fo/autoidx-kosek.xsl
@@ -59,8 +59,7 @@
   </xsl:if>
 
 
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
+  <xsl:if test="$exsl.node.set.available = 0">
     <xsl:message terminate="yes">
       <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
       <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index 684f788c2..727843d10 100644
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -169,8 +169,7 @@
   </xsl:if>
 
 
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
+  <xsl:if test="$exsl.node.set.available = 0">
     <xsl:message terminate="yes">
       <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
       <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index b40f9e0bd..400e15a2f 100644
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -131,10 +131,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/html/autoidx-kosek.xsl b/xsl/html/autoidx-kosek.xsl
index 6f7338150..a81b10548 100644
--- a/xsl/html/autoidx-kosek.xsl
+++ b/xsl/html/autoidx-kosek.xsl
@@ -50,8 +50,7 @@
     </xsl:message>
   </xsl:if>
 
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
+  <xsl:if test="$exsl.node.set.available = 0">
     <xsl:message terminate="yes">
       <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
       <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
diff --git a/xsl/html/autoidx.xsl b/xsl/html/autoidx.xsl
index 4a14c63dd..8137bc831 100644
--- a/xsl/html/autoidx.xsl
+++ b/xsl/html/autoidx.xsl
@@ -172,8 +172,7 @@
   </xsl:if>
 
 
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
+  <xsl:if test="$exsl.node.set.available = 0">
     <xsl:message terminate="yes">
       <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
       <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
diff --git a/xsl/html/chunk-changebars.xsl b/xsl/html/chunk-changebars.xsl
index 899e3013d..c94bd4cf4 100644
--- a/xsl/html/chunk-changebars.xsl
+++ b/xsl/html/chunk-changebars.xsl
@@ -42,7 +42,7 @@
   </xsl:param>
 
   <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
+    <xsl:when test="$chunk.fast != 0 and $exsl.node.set.available != 0">
       <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
       <xsl:variable name="genid" select="generate-id()"/>
 
@@ -96,4 +96,4 @@
 
 <xsl:include href="chunk-code.xsl"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index 26c8fdbc5..c606c18a8 100644
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -29,7 +29,7 @@
 <xsl:variable name="chunk.hierarchy">
   <xsl:if test="$chunk.fast != 0">
     <xsl:choose>
-      <xsl:when test="function-available('exsl:node-set')">
+      <xsl:when test="$exsl.node.set.available != 0">
         <xsl:message>Computing chunks...</xsl:message>
         <xsl:apply-templates select="/*" mode="find.chunks"/>
       </xsl:when>
@@ -51,7 +51,7 @@
   </xsl:param>
 
   <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
+    <xsl:when test="$chunk.fast != 0 and $exsl.node.set.available != 0">
       <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
       <xsl:variable name="genid" select="generate-id()"/>
 
diff --git a/xsl/html/chunktoc.xsl b/xsl/html/chunktoc.xsl
index a00aa4d54..542368678 100644
--- a/xsl/html/chunktoc.xsl
+++ b/xsl/html/chunktoc.xsl
@@ -223,9 +223,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/html/docbook.xsl b/xsl/html/docbook.xsl
index 55ab47d7c..c7f29f454 100644
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -341,9 +341,7 @@ body { background-image: url('</xsl:text>
          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>
-- 
2.40.0