Handle revisionflag a little better on copyrights

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index 12107070d21ebba322ccbf0254f90b9a05cca2b0..9b13713aab4b369e7b9480c0971dca227bdc0a2f 100644 (file)
--- 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 813855a2127fff049658f7085d569a838f5fe9c4..bbdf382c1ff145b1102381da3f4853e55be803e5 100644 (file)
--- 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 862f01a62d2e5828d653769c136068962169a6fd..c3aa9fac47e7e5729deb668bb58a1ae7605f2eef 100644 (file)
--- 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>