Made changes in namespace declarations to prevent xmllint's

canonicalizer from treating them as relative namespace URIs.

  - Changed xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService"
    to xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService";
    Saxon accepts either form
    (see http://www.saxonica.com/documentation/extensibility/functions.html);
    to Saxon, "the part of the URI before the final '/' is immaterial".

  - Changed, e.g. xmlns:xverb="com.nwalsh.xalan.Verbatim" to
    xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"; Xalan accepts
    either form
    (see http://xml.apache.org/xalan-j/extensions.html#java-namespace-declare);
    just as Saxon does, it will "simply use the string to the
    right of the rightmost forward slash as the Java class name".

  - Changed xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
    to xmlns:redirect="http://xml.apache.org/xalan/redirect", and
    adjusted associated code to make the current Xalan redirect spec.
    (see http://xml.apache.org/xalan-j/apidocs/org/apache/xalan/lib/Redirect.html)

diff --git a/xsl/html/autoidx-kimber.xsl b/xsl/html/autoidx-kimber.xsl
index 39d262d928965775849dda844e6aa1ef7d78f1b1..20c977dbb5717a7337643ca78cc71daff94d65fc 100644 (file)
--- a/xsl/html/autoidx-kimber.xsl
+++ b/xsl/html/autoidx-kimber.xsl
@@ -14,7 +14,7 @@
                 (string-length($role) = 0 and string-length($type) = 0))'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService"
+                xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService"
                 exclude-result-prefixes="k"
                 version="1.0">
 

diff --git a/xsl/html/autoidx-kosek.xsl b/xsl/html/autoidx-kosek.xsl
index e8f6335c3cc4d9dc43f47408fc7969981182ca54..5291a165cc7ccb67f5274db1c5d58daa6f7ce384 100644 (file)
--- a/xsl/html/autoidx-kosek.xsl
+++ b/xsl/html/autoidx-kosek.xsl
@@ -13,7 +13,7 @@
                 xmlns:i="urn:cz-kosek:functions:index"
                 xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
                 xmlns:func="http://exslt.org/functions"
-                xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService"
+                xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService"
                 xmlns:exslt="http://exslt.org/common"
                 extension-element-prefixes="func exslt"
                 exclude-result-prefixes="func exslt i l k"

diff --git a/xsl/html/callout.xsl b/xsl/html/callout.xsl
index 03f4dc4a0fd2570966f3ed57cc8c33ef2c530a54..d539c7f914bab9dcacaff2a55c7ead44430eb950 100644 (file)
--- a/xsl/html/callout.xsl
+++ b/xsl/html/callout.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:xverb="com.nwalsh.xalan.Verbatim"
+                xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"
                 xmlns:lxslt="http://xml.apache.org/xslt"
                 exclude-result-prefixes="sverb xverb lxslt"
                 version='1.0'>

diff --git a/xsl/html/chunker.xsl b/xsl/html/chunker.xsl
index bbd3da205fb2458953d87dedf662e86e68465f66..7bd2bc2984418898b3ed3b30744753594ce32152 100644 (file)
--- a/xsl/html/chunker.xsl
+++ b/xsl/html/chunker.xsl
@@ -1,12 +1,12 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:saxon="http://icl.com/saxon"
                 xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
+                xmlns:redirect="http://xml.apache.org/xalan/redirect"
                 xmlns:exsl="http://exslt.org/common"
                 xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
                version="1.0"
                 exclude-result-prefixes="doc"
-                extension-element-prefixes="saxon xalanredirect lxslt exsl">
+                extension-element-prefixes="saxon redirect lxslt exsl">
 
 <!-- ********************************************************************
      $Id$
@@ -21,7 +21,7 @@
 <!-- ==================================================================== -->
 
 <!-- This stylesheet works with XSLT implementations that support -->
-<!-- exsl:document, saxon:output, or xalanredirect:write -->
+<!-- exsl:document, saxon:output, or Xalan's redirect:write -->
 <!-- Note: Only Saxon 6.4.2 or later is supported. -->
 
 <xsl:param name="chunker.output.method" select="'html'"/>
@@ -60,7 +60,7 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:when>
-    <xsl:when test="element-available('xalanredirect:write')">
+    <xsl:when test="element-available('redirect:write')">
       <!-- Xalan doesn't make the chunks relative -->
       <xsl:value-of select="concat($base.dir,$base.name)"/>
     </xsl:when>
@@ -353,11 +353,11 @@
       </xsl:choose>
     </xsl:when>
 
-    <xsl:when test="element-available('xalanredirect:write')">
-      <!-- Xalan uses xalanredirect -->
-      <xalanredirect:write file="{$filename}">
+    <xsl:when test="element-available('redirect:write')">
+      <!-- Xalan uses redirect -->
+      <redirect:write file="{$filename}">
         <xsl:copy-of select="$content"/>
-      </xalanredirect:write>
+      </redirect:write>
     </xsl:when>
 
     <xsl:otherwise>

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 66cabde2aab1992d3ab3e4140ae0ed887fb5f610..103cf13dd5309af18734ed9e922db676502ee6f0 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -3,8 +3,8 @@
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
                 xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics"
-                xmlns:ximg="xaln://com.nwalsh.xalan.ImageIntrinsics"
-                xmlns:xtext="com.nwalsh.xalan.Text"
+                xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics"
+                xmlns:xtext="xalan://com.nwalsh.xalan.Text"
                 xmlns:lxslt="http://xml.apache.org/xslt"
                 exclude-result-prefixes="xlink stext xtext lxslt simg ximg"
                 extension-element-prefixes="stext xtext"

diff --git a/xsl/html/oldchunker.xsl b/xsl/html/oldchunker.xsl
index b9f0fed96b6f290ee2e2cd9bccd928c3b0e988a9..1c9d3181d365c63e23e697f76ca71c95e4777668 100644 (file)
--- a/xsl/html/oldchunker.xsl
+++ b/xsl/html/oldchunker.xsl
@@ -1,11 +1,11 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:saxon="http://icl.com/saxon"
                 xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
+                xmlns:redirect="http://xml.apache.org/xalan/redirect"
                 xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
                version="1.1"
                 exclude-result-prefixes="doc"
-                extension-element-prefixes="saxon xalanredirect lxslt">
+                extension-element-prefixes="saxon redirect lxslt">
 
 <!-- ********************************************************************
      $Id$
@@ -120,10 +120,10 @@ in default.encoding, set this parameter to value <literal>native</literal>.
       </saxon:output>
     </xsl:when>
     <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan uses xalanredirect -->
-      <xalanredirect:write file="{$filename}">
+      <!-- Xalan uses redirect -->
+      <redirect:write file="{$filename}">
         <xsl:copy-of select="$content"/>
-      </xalanredirect:write>
+      </redirect:write>
     </xsl:when>
     <xsl:otherwise>
       <!-- it doesn't matter since we won't be making chunks... -->
@@ -183,10 +183,10 @@ in default.encoding, set this parameter to value <literal>native</literal>.
       </saxon:output>
     </xsl:when>
     <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan uses xalanredirect -->
-      <xalanredirect:write file="{$filename}">
+      <!-- Xalan uses redirect -->
+      <redirect:write file="{$filename}">
         <xsl:copy-of select="$content"/>
-      </xalanredirect:write>
+      </redirect:write>
     </xsl:when>
     <xsl:otherwise>
       <!-- it doesn't matter since we won't be making chunks... -->

diff --git a/xsl/html/table.xsl b/xsl/html/table.xsl
index a11ffe028e2a1a461d5f62e51a0e21fc4d13f9f2..8fac0e6b7e48ea66545e42cca0173625083c2bbb 100644 (file)
--- a/xsl/html/table.xsl
+++ b/xsl/html/table.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
                 xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:xtbl="com.nwalsh.xalan.Table"
+                xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
                 xmlns:lxslt="http://xml.apache.org/xslt"
                 xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
                 exclude-result-prefixes="doc stbl xtbl lxslt ptbl"

diff --git a/xsl/html/verbatim.xsl b/xsl/html/verbatim.xsl
index bb1e0c77ed614751169bd937e83c53768a3a092a..618d9e606362696883183a84fabd7cdf32e7828b 100644 (file)
--- a/xsl/html/verbatim.xsl
+++ b/xsl/html/verbatim.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:xverb="com.nwalsh.xalan.Verbatim"
+                xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"
                 xmlns:lxslt="http://xml.apache.org/xslt"
                 xmlns:exsl="http://exslt.org/common"
                 exclude-result-prefixes="sverb xverb lxslt exsl"