From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 29 Jan 2014 02:55:52 +0000 (+0000)
Subject: Adjust handling of namespace fixup to streamline distro builds.
X-Git-Tag: release/1.79.1~6^2~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb6d177131786eb0c974f997392f56d6f38d97d5;p=docbook-dsssl

Adjust handling of namespace fixup to streamline distro builds.
---

diff --git a/xsl/html/chunk-code.xsl b/xsl/html/chunk-code.xsl
index 04aea32e9..6cb08c718 100644
--- a/xsl/html/chunk-code.xsl
+++ b/xsl/html/chunk-code.xsl
@@ -2,9 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
                 xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
-                exclude-result-prefixes="exsl cf ng db"
+                exclude-result-prefixes="exsl cf"
                 version="1.0">
 
 <!-- ********************************************************************
@@ -440,12 +438,8 @@
     <xsl:call-template name="get.doc.title"/>
   </xsl:variable>
   <xsl:choose>
-    <!-- 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.-->
-    <xsl:when test="$exsl.node.set.available != 0 
-                    and (*/self::ng:* or */self::db:*)">
-
+    <xsl:when test="$exsl.node.set.available != 0 and 
+                  namespace-uri(/*) = 'http://docbook.org/ns/docbook'">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$doc.title"/>
@@ -453,14 +447,14 @@
           <xsl:text>namesp. cut</xsl:text>
         </xsl:with-param>
         <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
+          <xsl:text>stripped namespace before processing</xsl:text>
         </xsl:with-param>
       </xsl:call-template>
 
       <xsl:apply-templates select="exsl:node-set($no.namespace)"/>
     </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
+    <!-- Can't process unless namespace fixed with exsl node-set()-->
+    <xsl:when test="namespace-uri(/*) = 'http://docbook.org/ns/docbook'">
       <xsl:message terminate="yes">
         <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
         <xsl:text> cannot proceed.</xsl:text>
diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index 9dc17185d..2ff460255 100644
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -1,10 +1,8 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
                 xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
                 version="1.0"
-                exclude-result-prefixes="exsl cf ng db">
+                exclude-result-prefixes="exsl cf">
 
 <!-- ********************************************************************
      $Id$
@@ -29,11 +27,11 @@
 <xsl:variable name="chunk.hierarchy">
   <xsl:if test="$chunk.fast != 0">
     <xsl:choose>
-      <!-- Are we handling a docbook5 document? -->
-      <xsl:when test="$exsl.node.set.available != 0
-                      and (*/self::ng:* or */self::db:*)">
+      <!-- Do we need to fix namespace? -->
+      <xsl:when test="$exsl.node.set.available != 0 and 
+                    namespace-uri(/*) = 'http://docbook.org/ns/docbook'">
         <xsl:if test="$chunk.quietly = 0">
-          <xsl:message>Computing stripped namespace chunks...</xsl:message>
+          <xsl:message>Computing chunks...</xsl:message>
         </xsl:if>
         <xsl:apply-templates mode="find.chunks" select="exsl:node-set($no.namespace)"/>
       </xsl:when>
@@ -41,7 +39,6 @@
         <xsl:if test="$chunk.quietly = 0">
           <xsl:message>Computing chunks...</xsl:message>
         </xsl:if>
-
         <xsl:apply-templates select="/*" mode="find.chunks"/>
       </xsl:when>
       <xsl:otherwise>
diff --git a/xsl/html/chunktoc.xsl b/xsl/html/chunktoc.xsl
index 6fc636517..1a375a4a1 100644
--- a/xsl/html/chunktoc.xsl
+++ b/xsl/html/chunktoc.xsl
@@ -1,9 +1,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:db="http://docbook.org/ns/docbook"
-                xmlns:ng="http://docbook.org/docbook-ng"
 		version="1.0"
-                exclude-result-prefixes="doc db ng">
+                exclude-result-prefixes="doc">
 
 <!-- ********************************************************************
      $Id$
@@ -225,12 +223,8 @@
         <xsl:text>The chunk.toc file is not set.</xsl:text>
       </xsl:message>
     </xsl:when>
-    <!-- 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="$exsl.node.set.available != 0
-                    and (*/self::ng:* or */self::db:*)">
+    <xsl:when test="$exsl.node.set.available != 0 and 
+                  namespace-uri(/*) = 'http://docbook.org/ns/docbook'">
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$doc.title"/>
@@ -241,23 +235,10 @@
           <xsl:text>stripped namespace before processing</xsl:text>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
+      <xsl:apply-templates select="exsl:node-set($no.namespace)"/>
     </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
+    <!-- Can't process unless namespace is correct -->
+    <xsl:when test="namespace-uri(/*) = 'http://docbook.org/ns/docbook'">
       <xsl:message terminate="yes">
         <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
         <xsl:text> cannot proceed.</xsl:text>