From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 29 Oct 2012 23:18:22 +0000 (+0000)
Subject: Replace docbook.xsl with docbook-no-doctype.xsl in xsl:import
X-Git-Tag: release/1.79.1~6^2~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=793e2e779648adee02a1c5058cc192dc713b230e;p=docbook-dsssl

Replace docbook.xsl with docbook-no-doctype.xsl in xsl:import
elements so the chunking stylesheet can generate output
without a doctype if needed.
---

diff --git a/xsl/xhtml/html2xhtml.xsl b/xsl/xhtml/html2xhtml.xsl
index 52ee16a58..30478f654 100644
--- a/xsl/xhtml/html2xhtml.xsl
+++ b/xsl/xhtml/html2xhtml.xsl
@@ -50,11 +50,22 @@
 <xsl:template match="xsl:import">
   <xsl:copy>
     <xsl:attribute name="href">
-      <xsl:call-template name="string.subst">
-        <xsl:with-param name="string" select="@href"/>
-        <xsl:with-param name="target">/html/</xsl:with-param>
-        <xsl:with-param name="replacement">/xhtml/</xsl:with-param>
-      </xsl:call-template>
+      <xsl:choose>
+        <!-- Fix problem of hardwired doctype in the xsl:output
+        of docbook.xsl, replacing it with an identical file
+        but with no doctype in the xsl:output element. The
+        chunking stylesheet adds the doctype for the chunks. -->
+        <xsl:when test="@href = 'docbook.xsl'">
+          <xsl:text>docbook-no-doctype.xsl</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="string.subst">
+            <xsl:with-param name="string" select="@href"/>
+            <xsl:with-param name="target">/html/</xsl:with-param>
+            <xsl:with-param name="replacement">/xhtml/</xsl:with-param>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:attribute>
   </xsl:copy>
 </xsl:template>