From a5fd91365149c8b696e76a7a696a6191b3ae3930 Mon Sep 17 00:00:00 2001
From: Mauritz Jeanson <mj@johanneberg.com>
Date: Wed, 12 Sep 2007 16:05:03 +0000
Subject: [PATCH] An update to the fix for bug #1790495 (r7433): The "ln-"
 prefix is output only when the legalnotice doesn't have an @id/@xml:id, in
 which case the stylesheets generate an ID value, resulting in a filename like
 "ln-7e0fwgj.html". This is useful because without the prefix, you wouldn't
 know that the file contained a legalnotice. The same logic is also applied to
 revhistory, using an "rh-" prefix.

---
 xsl/html/chunk-common.xsl | 20 ++++++++++++++++++--
 xsl/html/titlepage.xsl    | 33 +++++++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index f368af134..8b0fdae9d 100644
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -1733,9 +1733,12 @@
   <!-- * the following ID is used as part of the legalnotice filename; -->
   <!-- * we need it in order to construct the filename for use in the -->
   <!-- * value of the href attribute on the link -->
+
+<xsl:param name="ln-node" select="(//legalnotice)[1]"/>
+
   <xsl:param name="id">
     <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="(//legalnotice)[1]"/>
+      <xsl:with-param name="object" select="$ln-node"/>
     </xsl:call-template>
   </xsl:param>
   <xsl:param name="linktype">
@@ -1756,9 +1759,22 @@
               normalize-space(
               substring-after($html.head.legalnotice.link.types, ' ')),' ')"/>
   <xsl:if test="not($linktype = '')">
+
+    <!-- Use 'ln-' prefix if there is no @id/@xml:id -->
+    <xsl:variable name="file">
+      <xsl:choose>
+	<xsl:when test="$ln-node/@id or $ln-node/@xml:id">
+	  <xsl:value-of select="concat($id,$html.ext)"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
     <link rel="{$linktype}">
       <xsl:attribute name="href">
-        <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+        <xsl:value-of select="$file"/>
       </xsl:attribute>
       <xsl:attribute name="title">
         <xsl:apply-templates select="(//legalnotice)[1]"
diff --git a/xsl/html/titlepage.xsl b/xsl/html/titlepage.xsl
index fcaa66732..7b9a8cf63 100644
--- a/xsl/html/titlepage.xsl
+++ b/xsl/html/titlepage.xsl
@@ -528,12 +528,25 @@
 
 <xsl:template match="legalnotice" mode="titlepage.mode">
   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+
+  <!-- Use 'ln-' prefix if there is no @id/@xml:id -->
+  <xsl:variable name="file">
+    <xsl:choose>
+      <xsl:when test="@id or @xml:id">
+	<xsl:value-of select="concat($id,$html.ext)"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <xsl:choose>
     <xsl:when test="$generate.legalnotice.link != 0">
       <xsl:variable name="filename">
         <xsl:call-template name="make-relative-filename">
           <xsl:with-param name="base.dir" select="$base.dir"/>
-	  <xsl:with-param name="base.name" select="concat('ln-',$id,$html.ext)"/>
+	  <xsl:with-param name="base.name" select="$file"/>
         </xsl:call-template>
       </xsl:variable>
 
@@ -541,7 +554,7 @@
         <xsl:apply-templates select="." mode="title.markup"/>
       </xsl:variable>
 
-      <a href="{concat('ln-',$id,$html.ext)}">
+      <a href="{$file}">
         <xsl:copy-of select="$title"/>
       </a>
 
@@ -745,6 +758,18 @@
 
   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
 
+ <!-- Use 'rh-' prefix if there is no @id/@xml:id -->
+  <xsl:variable name="file">
+    <xsl:choose>
+      <xsl:when test="@id or @xml:id">
+	<xsl:value-of select="concat($id,$html.ext)"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:value-of select="concat('rh-',$id,$html.ext)"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <xsl:variable name="title">
     <xsl:call-template name="gentext">
       <xsl:with-param name="key">RevHistory</xsl:with-param>
@@ -776,11 +801,11 @@
       <xsl:variable name="filename">
         <xsl:call-template name="make-relative-filename">
           <xsl:with-param name="base.dir" select="$base.dir"/>
-          <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
+          <xsl:with-param name="base.name" select="$file"/>
         </xsl:call-template>
       </xsl:variable>
 
-      <a href="{concat($id,$html.ext)}">
+      <a href="{$file}">
         <xsl:copy-of select="$title"/>
       </a>
 
-- 
2.40.0