From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 16 Mar 2009 06:44:07 +0000 (+0000)
Subject: Use new param exsl.node.set.available to test, handles Xalan bug.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8257a966207088ee704b1239807e7f04f8600afc;p=docbook-dsssl

Use new param exsl.node.set.available to test, handles Xalan bug.
---

diff --git a/xsl/html/chunk-code.xsl b/xsl/html/chunk-code.xsl
index 92729fc11..8f63a55b0 100644
--- a/xsl/html/chunk-code.xsl
+++ b/xsl/html/chunk-code.xsl
@@ -413,10 +413,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/chunkfast.xsl b/xsl/html/chunkfast.xsl
index 777e878d6..d7e910b19 100644
--- a/xsl/html/chunkfast.xsl
+++ b/xsl/html/chunkfast.xsl
@@ -25,7 +25,7 @@
 
 <xsl:template name="process-chunk-element">
   <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="genid" select="generate-id()"/>
 
       <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
diff --git a/xsl/html/footnote.xsl b/xsl/html/footnote.xsl
index 2e7a0ad3d..3b6dc2313 100644
--- a/xsl/html/footnote.xsl
+++ b/xsl/html/footnote.xsl
@@ -187,7 +187,7 @@ linkend/id: <xsl:value-of select="@linkend"/>
   </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">
@@ -274,7 +274,8 @@ linkend/id: <xsl:value-of select="@linkend"/>
       </div>
     </xsl:when>
 
-    <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')">
+    <xsl:when test="$html.cleanup != 0 and 
+                    $exsl.node.set.available != 0">
       <div>
         <xsl:apply-templates select="." mode="class.attribute"/>
         <xsl:apply-templates select="*[1]" mode="footnote.body.number"/>
diff --git a/xsl/html/html-rtf.xsl b/xsl/html/html-rtf.xsl
index a0b24d842..bd53d96d1 100644
--- a/xsl/html/html-rtf.xsl
+++ b/xsl/html/html-rtf.xsl
@@ -108,7 +108,7 @@
 <xsl:template name="unwrap.p">
   <xsl:param name="p"/>
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')
+    <xsl:when test="$exsl.node.set.available != 0
                     and function-available('set:leading')
                     and function-available('set:trailing')">
       <xsl:apply-templates select="exsl:node-set($p)" mode="unwrap.p"/>
@@ -301,7 +301,7 @@
 <xsl:template name="remove.empty.div">
   <xsl:param name="div"/>
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
+    <xsl:when test="$exsl.node.set.available != 0">
       <xsl:apply-templates select="exsl:node-set($div)" mode="remove.empty.div"/>
     </xsl:when>
     <xsl:otherwise>
diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 4db5339b8..0beb4d65a 100644
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -310,3 +310,4 @@
 <!ENTITY glossary.sort SYSTEM "../params/glossary.sort.xml">
 <!ENTITY javahelp.encoding SYSTEM "../params/javahelp.encoding.xml">
 <!ENTITY writing.mode SYSTEM "../params/writing.mode.xml">
+<!ENTITY exsl.node.set.available SYSTEM "../params/exsl.node.set.available.xml">
diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 586ec4a1e..9c7622f5f 100644
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -265,6 +265,7 @@ $Id$
 &highlight.xslthl.config;
 &highlight.default.language;
 &email.delimiters.enabled;
+&exsl.node.set.available;
 </reference>
 <reference xml:id="annos"><title>Annotations</title>
 &annotation.support;
@@ -497,6 +498,7 @@ around all these parameters.</para>
 <src:fragref linkend="email.delimiters.enabled.frag"/>
 <src:fragref linkend="emphasis.propagates.style.frag"/>
 <src:fragref linkend="entry.propagates.style.frag"/>
+<src:fragref linkend="exsl.node.set.available.frag"/>
 <src:fragref linkend="firstterm.only.link.frag"/>
 <src:fragref linkend="footer.rule.frag"/>
 <src:fragref linkend="footnote.number.format.frag"/>
diff --git a/xsl/html/verbatim.xsl b/xsl/html/verbatim.xsl
index e0e059aa1..a9ae0d652 100644
--- a/xsl/html/verbatim.xsl
+++ b/xsl/html/verbatim.xsl
@@ -341,7 +341,7 @@
        or I have to rely on CSS. -->
 
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
+    <xsl:when test="$exsl.node.set.available != 0">
       <xsl:apply-templates select="exsl:node-set($rtf)" mode="make.verbatim.mode"/>
     </xsl:when>
     <xsl:otherwise>
diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 84e1d5dae..8157579f4 100644
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -234,7 +234,7 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
+    <xsl:when test="$exsl.node.set.available != 0">
       <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/>
     </xsl:when>
     <xsl:otherwise>