From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 8 Jan 2002 13:39:36 +0000 (+0000)
Subject: Make root.filename supercede use.id.as.filename
X-Git-Tag: release/1.79.1~6^2~5983
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=912bc7eaca9fb017fafb6f2b8106de4ed6fa997a;p=docbook-dsssl

Make root.filename supercede use.id.as.filename
---

diff --git a/xsl/html/chunk.xsl b/xsl/html/chunk.xsl
index 361b35006..c8de36c4b 100644
--- a/xsl/html/chunk.xsl
+++ b/xsl/html/chunk.xsl
@@ -156,17 +156,17 @@
       <xsl:when test="$dbhtml-filename != ''">
         <xsl:value-of select="$dbhtml-filename"/>
       </xsl:when>
+      <!-- if this is the root element, use the root.filename -->
+      <xsl:when test="not(parent::*) and $root.filename != ''">
+        <xsl:value-of select="$root.filename"/>
+        <xsl:value-of select="$html.ext"/>
+      </xsl:when>
       <!-- if there's no dbhtml filename, and if we're to use IDs as -->
       <!-- filenames, then use the ID to generate the filename. -->
       <xsl:when test="@id and $use.id.as.filename != 0">
         <xsl:value-of select="@id"/>
         <xsl:value-of select="$html.ext"/>
       </xsl:when>
-      <!-- if this is the root element, use the root.filename -->
-      <xsl:when test="not(parent::*)">
-        <xsl:value-of select="$root.filename"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
       <xsl:otherwise></xsl:otherwise>
     </xsl:choose>
   </xsl:variable>