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

diff --git a/xsl/html/chunk.xsl b/xsl/html/chunk.xsl
index 361b35006cb2eed0c19a378dc1dd38672b72a703..c8de36c4bf13c1c09214ea3a5632073b7c09b867 100644 (file)
--- 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>