From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 29 Oct 2012 18:09:53 +0000 (+0000)
Subject: Fix bug #3563697 where template make-relative-filename was using a
X-Git-Tag: release/1.79.1~6^2~294
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32271c4f62f1e335308f4b5c689aa9e60c769072;p=docbook-dsssl

Fix bug #3563697 where template make-relative-filename was using a
global param chunk.base.dir instead of its local param base.dir.  Now it uses base.dir.
---

diff --git a/xsl/html/chunker.xsl b/xsl/html/chunker.xsl
index df958c80b..0e44f4d5a 100644
--- a/xsl/html/chunker.xsl
+++ b/xsl/html/chunker.xsl
@@ -60,13 +60,13 @@
     <!-- put Saxon first to work around a bug in libxslt -->
     <xsl:when test="element-available('saxon:output')">
       <!-- Saxon doesn't make the chunks relative -->
-      <xsl:value-of select="concat($chunk.base.dir,$base.name)"/>
+      <xsl:value-of select="concat($base.dir,$base.name)"/>
     </xsl:when>
     <xsl:when test="element-available('exsl:document')">
       <!-- EXSL document does make the chunks relative, I think -->
       <xsl:choose>
         <xsl:when test="count(parent::*) = 0">
-          <xsl:value-of select="concat($chunk.base.dir,$base.name)"/>
+          <xsl:value-of select="concat($base.dir,$base.name)"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="$base.name"/>
@@ -75,7 +75,7 @@
     </xsl:when>
     <xsl:when test="element-available('redirect:write')">
       <!-- Xalan doesn't make the chunks relative -->
-      <xsl:value-of select="concat($chunk.base.dir,$base.name)"/>
+      <xsl:value-of select="concat($base.dir,$base.name)"/>
     </xsl:when>
     <xsl:otherwise>
       <xsl:message terminate="yes">