From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 7 Feb 2014 19:02:24 +0000 (+0000)
Subject: fix bug in namespace fixup syntax.
X-Git-Tag: release/1.79.1~6^2~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7125921e7fec3d6aa3a9b359de46953d358092a0;p=docbook-dsssl

fix bug in namespace fixup syntax.
---

diff --git a/xsl/webhelp/xsl/webhelp-common.xsl b/xsl/webhelp/xsl/webhelp-common.xsl
index b0ef80e94..47b2f5662 100644
--- a/xsl/webhelp/xsl/webhelp-common.xsl
+++ b/xsl/webhelp/xsl/webhelp-common.xsl
@@ -416,13 +416,13 @@ border: none; background: none; font-weight: none; color: none; }
 		</xsl:call-template>
 		<xsl:apply-templates select="exsl:node-set($nons)"/>
 	  </xsl:when>
-	  <!-- Can't process unless namespace removed -->
-	  <xsl:when test="*/self::ng:* or */self::db:*">
-		<xsl:message terminate="yes">
-		  <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
-		  <xsl:text> cannot proceed.</xsl:text>
-		</xsl:message>
-	  </xsl:when>
+          <!-- 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>
+            </xsl:message>
+          </xsl:when>
 	  <xsl:otherwise>
 		<xsl:choose>
 		  <xsl:when test="$rootid != ''">