When $generate.legalnotice.link is non-zero and

$use.id.as.filename is also non-zero, if a legalnotice has an ID,
then instead of assigning the "ln-<generatedID>" basename to the
output file for that legalnotice, just use its real ID as the
basename for the file -- as we do when chunking other elements
that have IDs.

diff --git a/xsl/html/chunk-code.xsl b/xsl/html/chunk-code.xsl
index a889041080434ae8471fc2cadb8c591b04fc33ec..39ee812bc2d583279fe0ec8c554c02f28a14e2a6 100644 (file)
--- a/xsl/html/chunk-code.xsl
+++ b/xsl/html/chunk-code.xsl
@@ -83,10 +83,25 @@
       </xsl:when>
       <!-- Special case -->
       <xsl:when test="self::legalnotice and $generate.legalnotice.link != 0">
-        <xsl:variable name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:variable>
-        <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+        <xsl:choose>
+          <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0">
+            <!-- * if this legalnotice has an ID, then go ahead and use -->
+            <!-- * just the value of that ID as the basename for the file -->
+            <!-- * (that is, without prepending an "ln-" too it) -->
+            <xsl:value-of select="(@id|@xml:id)[1]"/>
+            <xsl:value-of select="$html.ext"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- * otherwise, if this legalnotice does not have an ID, -->
+            <!-- * then we generate one an ID... -->
+            <xsl:variable name="id">
+              <xsl:call-template name="object.id"/>
+            </xsl:variable>
+            <!-- * ...and then we take that generated ID, prepend an -->
+            <!-- * "ln-" to it, and use that as the basename for the file -->
+            <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </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. -->