From 8e10598a964f60c36d79c9ad82746f2761efd596 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 9 Oct 2006 06:29:58 +0000
Subject: [PATCH] Add support for Xalan to add root node xml:base for db5 docs.

---
 xsl/fo/docbook.xsl      |  8 ++++++--
 xsl/html/chunk-code.xsl |  9 ++++++---
 xsl/html/docbook.xsl    | 18 ++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index e57978a6c..c6d094d98 100644
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -117,13 +117,17 @@
 
 <xsl:template match="/">
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')
-		    and (*/self::ng:* or */self::db:*)">
+    <!-- include extra test for Xalan quirk -->
+    <xsl:when test="(function-available('exsl:node-set') or
+                     contains(system-property('xsl:vendor'),
+                       'Apache Software Foundation'))
+                    and (*/self::ng:* or */self::db:*)">
       <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
 	   toss the namespace and continue. Someday we'll reverse this logic
 	   and add the namespace to documents that don't have one.
 	   But not before the whole stylesheet has been converted to use
 	   namespaces. i.e., don't hold your breath -->
+      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
       <xsl:variable name="nons">
         <xsl:apply-templates mode="stripNS"/>
       </xsl:variable>
diff --git a/xsl/html/chunk-code.xsl b/xsl/html/chunk-code.xsl
index 76e17a703..6134d4e4d 100644
--- a/xsl/html/chunk-code.xsl
+++ b/xsl/html/chunk-code.xsl
@@ -467,14 +467,17 @@
 
 <xsl:template match="/">
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')
-		    and (*/self::ng:* or */self::db:*)">
+    <!-- include extra test for Xalan quirk -->
+    <xsl:when test="(function-available('exsl:node-set') or
+                     contains(system-property('xsl:vendor'),
+                       'Apache Software Foundation'))
+                    and (*/self::ng:* or */self::db:*)">
       <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
 	   toss the namespace and continue. Someday we'll reverse this logic
 	   and add the namespace to documents that don't have one.
 	   But not before the whole stylesheet has been converted to use
 	   namespaces. i.e., don't hold your breath -->
-      <xsl:message>Stripping NS from DocBook 5/NG document.</xsl:message>
+      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
       <xsl:variable name="nons">
 	<xsl:apply-templates mode="stripNS"/>
       </xsl:variable>
diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index b4ad72109..de85f17dc 100644
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -85,13 +85,16 @@
 
 <xsl:template match="*">
   <xsl:message>
-    <xsl:text>No template matches </xsl:text>
-    <xsl:value-of select="name(.)"/>
+    <xsl:text>Element </xsl:text>
+    <xsl:value-of select="local-name(.)"/>
+    <xsl:text> in namespace '</xsl:text>
+    <xsl:value-of select="namespace-uri(.)"/>
+    <xsl:text>' encountered</xsl:text>
     <xsl:if test="parent::*">
       <xsl:text> in </xsl:text>
       <xsl:value-of select="name(parent::*)"/>
     </xsl:if>
-    <xsl:text>.</xsl:text>
+    <xsl:text>, but no template matches.</xsl:text>
   </xsl:message>
 
   <font color="red">
@@ -324,14 +327,17 @@ body { background-image: url('</xsl:text>
 
 <xsl:template match="/">
   <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')
-		    and (*/self::ng:* or */self::db:*)">
+    <!-- include extra test for Xalan quirk -->
+    <xsl:when test="(function-available('exsl:node-set') or
+                     contains(system-property('xsl:vendor'),
+                       'Apache Software Foundation'))
+                    and (*/self::ng:* or */self::db:*)">
       <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
 	   toss the namespace and continue. Someday we'll reverse this logic
 	   and add the namespace to documents that don't have one.
 	   But not before the whole stylesheet has been converted to use
 	   namespaces. i.e., don't hold your breath -->
-      <xsl:message>Stripping NS from DocBook 5/NG document.</xsl:message>
+      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
       <xsl:variable name="nons">
 	<xsl:apply-templates mode="stripNS"/>
       </xsl:variable>
-- 
2.40.0