From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 14 Mar 2002 18:39:34 +0000 (+0000)
Subject: Handle revisionflag a little better on copyrights
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceed547f090b269f2036f223fb6be1b36fe23fc2;p=docbook-dsssl

Handle revisionflag a little better on copyrights
---

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index 12107070d..9b13713aa 100644
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -1260,10 +1260,10 @@ year range is <quote>1991-1992</quote> but discretely it's
     <xsl:when test="$print.ranges = 0">
       <xsl:choose>
         <xsl:when test="count($years) = 1">
-          <xsl:value-of select="$years[1]"/>
+          <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="$years[1]"/>
+          <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
           <xsl:text>, </xsl:text>
           <xsl:call-template name="copyright.years">
             <xsl:with-param name="years"
diff --git a/xsl/html/lists.xsl b/xsl/html/lists.xsl
index 813855a21..bbdf382c1 100644
--- a/xsl/html/lists.xsl
+++ b/xsl/html/lists.xsl
@@ -81,7 +81,7 @@
     </xsl:if>
 
     <xsl:choose>
-      <xsl:when test="$show.revisionflag and @revisionflag">
+      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
 	<div class="{@revisionflag}">
 	  <xsl:apply-templates/>
 	</div>
@@ -195,7 +195,7 @@
     </xsl:if>
 
     <xsl:choose>
-      <xsl:when test="$show.revisionflag and @revisionflag">
+      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
 	<div class="{@revisionflag}">
 	  <xsl:apply-templates/>
 	</div>
@@ -400,7 +400,7 @@
 
 <xsl:template match="varlistentry/listitem">
   <xsl:choose>
-    <xsl:when test="$show.revisionflag and @revisionflag">
+    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
       <div class="{@revisionflag}">
 	<xsl:apply-templates/>
       </div>
diff --git a/xsl/html/titlepage.xsl b/xsl/html/titlepage.xsl
index 862f01a62..c3aa9fac4 100644
--- a/xsl/html/titlepage.xsl
+++ b/xsl/html/titlepage.xsl
@@ -295,19 +295,32 @@
 </xsl:template>
 
 <xsl:template match="year" mode="titlepage.mode">
-  <xsl:apply-templates/><xsl:text>, </xsl:text>
-</xsl:template>
-
-<xsl:template match="year[position()=last()]" mode="titlepage.mode">
-  <xsl:apply-templates/>
+  <xsl:choose>
+    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+      <span class="{@revisionflag}">
+        <xsl:apply-templates mode="titlepage.mode"/>
+      </span>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates mode="titlepage.mode"/>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template match="holder" mode="titlepage.mode">
-  <xsl:apply-templates/><xsl:text>, </xsl:text>
-</xsl:template>
-
-<xsl:template match="holder[position()=last()]" mode="titlepage.mode">
-  <xsl:apply-templates/>
+  <xsl:choose>
+    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
+      <span class="{@revisionflag}">
+        <xsl:apply-templates mode="titlepage.mode"/>
+      </span>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates mode="titlepage.mode"/>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:if test="position() &lt; last()">
+    <xsl:text>, </xsl:text>
+  </xsl:if>
 </xsl:template>
 
 <xsl:template match="corpauthor" mode="titlepage.mode">
@@ -710,7 +723,7 @@
   <h1 class="{name(.)}">
     <a name="{$id}"/>
     <xsl:choose>
-      <xsl:when test="$show.revisionflag and @revisionflag">
+      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
 	<span class="{@revisionflag}">
 	  <xsl:apply-templates mode="titlepage.mode"/>
 	</span>