From 1063b52fd3e9f06a253d04d89b1fdff52b0818f6 Mon Sep 17 00:00:00 2001
From: Mauritz Jeanson <mj@johanneberg.com>
Date: Wed, 12 Sep 2007 20:59:57 +0000
Subject: [PATCH] Refactored legalnotice/revhistory chunking, so that the
 use.id.as.filename parameter as well as the dbhtml_filename PI are taken into
 account. A new named template in titlepage.xsl is used to compute the
 filename.

---
 xsl/html/chunk-common.xsl | 24 ++++--------
 xsl/html/titlepage.xsl    | 82 +++++++++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index 8b0fdae9d..a89c382e5 100644
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -1734,13 +1734,8 @@
   <!-- * 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="$ln-node"/>
-    </xsl:call-template>
-  </xsl:param>
+  <xsl:param name="ln-node" select="(//legalnotice)[1]"/>
+  
   <xsl:param name="linktype">
     <xsl:choose>
       <xsl:when test="contains($html.head.legalnotice.link.types, ' ')">
@@ -1760,18 +1755,13 @@
               substring-after($html.head.legalnotice.link.types, ' ')),' ')"/>
   <xsl:if test="not($linktype = '')">
 
-    <!-- Use 'ln-' prefix if there is no @id/@xml:id -->
+    <!-- Compute name of legalnotice file (see titlepage.xsl) -->
     <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:call-template name="ln.or.rh.filename">
+	<xsl:with-param name="node" select="$ln-node"/>
+      </xsl:call-template>
     </xsl:variable>
-
+   
     <link rel="{$linktype}">
       <xsl:attribute name="href">
         <xsl:value-of select="$file"/>
diff --git a/xsl/html/titlepage.xsl b/xsl/html/titlepage.xsl
index 7b9a8cf63..9be4b1342 100644
--- a/xsl/html/titlepage.xsl
+++ b/xsl/html/titlepage.xsl
@@ -529,20 +529,14 @@
 <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">
+      
+      <!-- Compute name of legalnotice file -->
+      <xsl:variable name="file">
+	<xsl:call-template name="ln.or.rh.filename"/>
+      </xsl:variable>
+
       <xsl:variable name="filename">
         <xsl:call-template name="make-relative-filename">
           <xsl:with-param name="base.dir" select="$base.dir"/>
@@ -758,18 +752,6 @@
 
   <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>
@@ -798,6 +780,14 @@
   
   <xsl:choose>
     <xsl:when test="$generate.revhistory.link != 0">
+      
+      <!-- Compute name of revhistory file -->
+      <xsl:variable name="file">
+	<xsl:call-template name="ln.or.rh.filename">
+	  <xsl:with-param name="is.ln" select="false()"/>
+	</xsl:call-template>
+      </xsl:variable>
+
       <xsl:variable name="filename">
         <xsl:call-template name="make-relative-filename">
           <xsl:with-param name="base.dir" select="$base.dir"/>
@@ -992,6 +982,50 @@
   </span>
 </xsl:template>
 
+<!-- This template computes the filename for legalnotice and revhistory chunks -->
+<xsl:template name="ln.or.rh.filename">
+  <xsl:param name="node" select="."/>
+  <xsl:param name="is.ln" select="true()"/>
+
+  <xsl:variable name="dbhtml-filename">
+    <xsl:call-template name="pi.dbhtml_filename">
+      <xsl:with-param name="node" select="$node"/>
+    </xsl:call-template>
+  </xsl:variable>
+ 
+  <xsl:choose>
+    <!--  1. If there is a dbhtml_filename PI, use that -->
+    <xsl:when test="$dbhtml-filename != ''">
+      <xsl:value-of select="$dbhtml-filename"/>
+    </xsl:when>
+    <xsl:when test="($node/@id or $node/@xml:id) and not($use.id.as.filename = 0)">
+      <!-- * 2. If this legalnotice/revhistory 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-" or "rh-" to it) -->
+      <xsl:value-of select="($node/@id|$node/@xml:id)[1]"/>
+      <xsl:value-of select="$html.ext"/>
+    </xsl:when>
+    <xsl:when test="not ($node/@id or $node/@xml:id) or $use.id.as.filename = 0">
+      <!-- * 3. Otherwise, if this legalnotice/revhistory does not have an ID, or -->
+      <!-- * if $use.id.as.filename = 0 -->
+      <!-- * then we generate an ID... -->
+      <xsl:variable name="id">
+	<xsl:value-of select="generate-id($node)"/>
+      </xsl:variable>
+      <!-- * ...and then we take that generated ID, prepend a -->
+      <!-- * prefix to it, and use that as the basename for the file -->
+      <xsl:choose>
+	<xsl:when test="$is.ln">
+	  <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:value-of select="concat('rh-',$id,$html.ext)"/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+    
 <!-- ==================================================================== -->
 
 </xsl:stylesheet>
-- 
2.40.0