From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 17 Feb 2014 19:40:26 +0000 (+0000)
Subject: Fix up chunk.base.dir if it contains OEBPS, instead of generating an error.
X-Git-Tag: release/1.79.1~6^2~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84b3ad2af6480c51a5be52444b0a156b29307aae;p=docbook-dsssl

Fix up chunk.base.dir if it contains OEBPS, instead of generating an error.
---

diff --git a/xsl/epub3/epub3-element-mods.xsl b/xsl/epub3/epub3-element-mods.xsl
index ad7792d63..8e202bfb9 100644
--- a/xsl/epub3/epub3-element-mods.xsl
+++ b/xsl/epub3/epub3-element-mods.xsl
@@ -52,14 +52,14 @@ article  toc,title,figure,table,example,equation
 
 <!-- HTML chunk output goes to $base.dir/OEPBS -->
 <xsl:variable name="chunk.base.dir">
-  <xsl:if test="$base.dir != '' and contains($base.dir, $epub.oebps.dir)">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the $base.dir param must not include the </xsl:text>
-      <xsl:value-of select="$epub.oebps.dir"/>
-      <xsl:text> directory in its path. Exiting.</xsl:text>
-    </xsl:message>
-  </xsl:if>
   <xsl:choose>
+    <xsl:when test="$base.dir != '' and contains($base.dir, $epub.oebps.dir)">
+      <xsl:value-of select="substring-before($base.dir, $epub.oebps.dir)"/>
+    </xsl:when>
+    <!-- If epub.oebps.dir reset but base.dir still has OEBPS: -->
+    <xsl:when test="$base.dir != '' and contains($base.dir, 'OEBPS')">
+      <xsl:value-of select="substring-before($base.dir, 'OEBPS')"/>
+    </xsl:when>
     <xsl:when test="string-length($base.dir) = 0"></xsl:when>
     <!-- make sure to add trailing slash if omitted by user -->
     <xsl:when test="substring($base.dir, string-length($base.dir), 1) = '/'">