Convert function-available for node-set() to use

new $exsl.node.set.available param in test.

diff --git a/xsl/fo/autoidx-kosek.xsl b/xsl/fo/autoidx-kosek.xsl
index bfb17b10191e22c69665ef324d23f5e8bdd66687..bbd826a5a9dc5527f245cac89bfe1d3cc9938fa4 100644 (file)
--- 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 684f788c2be61504e91b4d4131461f392b29d85d..727843d109251da9011925d0cecff2ece2cf8afc 100644 (file)
--- 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 b40f9e0bdf98e66a196ff8869fc4a6f234433073..400e15a2fd0a2feab4b79c058f625b989057282f 100644 (file)
--- 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 6f7338150601e3d94e4697f5e8ec66743e87445a..a81b10548aa0ab6e1d01373e976f5193c68cb77e 100644 (file)
--- 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 4a14c63ddec07944af7c0b16f193951c4a3f4f19..8137bc83199bd6ed8121eae6e0b5ecfb2fe8acde 100644 (file)
--- 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 899e3013d0692052fecff4a4d5ef5dd5c1dd5a08..c94bd4cf40604f5cd67cfb297f6d17d799b4d216 100644 (file)
--- 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 26c8fdbc59b1638e66a09ec9971ee57516060729..c606c18a8b1a20bcfc130b65af5a4bf6571c7e21 100644 (file)
--- 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 a00aa4d543561a96e47a868e5d1ee0b2f152f192..5423686785abfdcec2ab41a215fd2813f37da159 100644 (file)
--- 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 55ab47d7cc8180a025eea0db88706cfeaba5229a..c7f29f4546ef3eea62d75744aa3e6b8065e62024 100644 (file)
--- 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>