From 621cbd8e401d8fa46329aee3e2ec23c5bce4d89b Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 31 Oct 2011 20:37:22 +0000
Subject: [PATCH] Fixed bug #3388088 where non-namespaced chunkfast.xsl not
 properly handling namespaced document.

---
 xsl/html/chunk-code.xsl   | 17 +++--------------
 xsl/html/chunk-common.xsl |  9 +++++++++
 xsl/html/docbook.xsl      | 19 +++++++++++++------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/xsl/html/chunk-code.xsl b/xsl/html/chunk-code.xsl
index 4fe4c272c..2829f9ae8 100644
--- a/xsl/html/chunk-code.xsl
+++ b/xsl/html/chunk-code.xsl
@@ -421,19 +421,7 @@
 	 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: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>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"/>
@@ -444,7 +432,8 @@
           <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:*">
diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index 2d10bfdb9..dfd26462a 100644
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -29,10 +29,19 @@
 <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:*)">
+        <xsl:if test="$chunk.quietly = 0">
+          <xsl:message>Computing stripped namespace chunks...</xsl:message>
+        </xsl:if>
+        <xsl:apply-templates mode="find.chunks" select="exsl:node-set($no.namespace)"/>
+      </xsl:when>
       <xsl:when test="$exsl.node.set.available != 0">
         <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/docbook.xsl b/xsl/html/docbook.xsl
index e6878c9cd..d185e19e1 100644
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -328,6 +328,16 @@ body { background-image: url('</xsl:text>
   <xsl:param name="node" select="."/>
 </xsl:template>
 
+<!-- To use the same stripped nodeset everywhere, it should
+be created as a global variable here.
+Used by docbook.xsl, chunk-code.xsl and chunkfast.xsl -->
+<xsl:variable name="no.namespace">
+  <xsl:if test="$exsl.node.set.available != 0
+                    and (*/self::ng:* or */self::db:*)">
+    <xsl:apply-templates select="/*" mode="stripNS"/>
+  </xsl:if>
+</xsl:variable>
+
 <xsl:template match="/">
   <!-- * Get a title for current doc so that we let the user -->
   <!-- * know what document we are processing at this point. -->
@@ -351,16 +361,13 @@ body { background-image: url('</xsl:text>
           <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>
-      <!--
+      <!-- DEBUG: to save stripped document.
       <xsl:message>Saving stripped document.</xsl:message>
       <xsl:call-template name="write.chunk">
         <xsl:with-param name="filename" select="'/tmp/stripped.xml'"/>
         <xsl:with-param name="method" select="'xml'"/>
         <xsl:with-param name="content">
-          <xsl:copy-of select="exsl:node-set($nons)"/>
+          <xsl:copy-of select="exsl:node-set($no.namespace)"/>
         </xsl:with-param>
       </xsl:call-template>
       -->
@@ -374,7 +381,7 @@ body { background-image: url('</xsl:text>
           <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:*">
-- 
2.40.0