Changed VERSION file to include distro title (DocBook XSL

Stylesheets), and updated HTML, FO, and manpages stylesheets to
use that in their metadata sections (e.g., in HTML, the
<meta name="generator" ...> contents).

diff --git a/xsl/VERSION b/xsl/VERSION
index 1323df619a537628fe57e39f4834c50c55d13bf7..263519878b5cd724a0fb21b50602a481def9481c 100644 (file)
--- a/xsl/VERSION
+++ b/xsl/VERSION
@@ -6,6 +6,8 @@
                 version='1.0'>
 
 <xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
+<xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/>
+<xsl:param name="DistroName">docbook-xsl</xsl:param>
 <xsl:param name="sf-relid" select="0"/>
 <xsl:strip-space elements="fm:*"/>
 
@@ -28,9 +30,9 @@
   <!-- Major security fixes -->
   </fm:Release-Focus>
   <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL>
-  <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.tar.gz?download</fm:Gzipped-Tar-URL>
-  <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.zip?download</fm:Zipped-Tar-URL>
-  <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/docbook-xsl-{VERSION}.bz2?download</fm:Bzipped-Tar-URL>
+  <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.tar.gz?download</fm:Gzipped-Tar-URL>
+  <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download</fm:Zipped-Tar-URL>
+  <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download</fm:Bzipped-Tar-URL>
   <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
   <fm:CVS-URL>http://docbook.cvs.sourceforge.net/docbook/</fm:CVS-URL>
   <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
@@ -60,9 +62,9 @@
 <xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL">
   <xsl:value-of select="local-name(.)"/>
   <xsl:text>: </xsl:text>
-  <xsl:value-of select="substring-before(., '{VERSION}')"/>
-  <xsl:value-of select="$VERSION"/>
-  <xsl:value-of select="substring-after(., '{VERSION}')"/>
+  <xsl:value-of select="substring-before(., '{DISTRONAME-VERSION}')"/>
+  <xsl:value-of select="concat($DistroName, '-', $VERSION)"/>
+  <xsl:value-of select="substring-after(., '{DISTRONAME-VERSION}')"/>
   <xsl:text>&#10;</xsl:text>
 </xsl:template>
 

diff --git a/xsl/fo/xep.xsl b/xsl/fo/xep.xsl
index a6c380beeb836fab9588b188feac3b19164e17bf..f185a2913dc42e682dd0a162b298a4d428028d27 100644 (file)
--- a/xsl/fo/xep.xsl
+++ b/xsl/fo/xep.xsl
@@ -55,7 +55,9 @@
     <xsl:element name="rx:meta-field">
       <xsl:attribute name="name">creator</xsl:attribute>
       <xsl:attribute name="value">
-        <xsl:text>DocBook XSL Stylesheets V</xsl:text>
+        <xsl:text>DocBook </xsl:text>
+        <xsl:value-of select="$DistroTitle"/>
+        <xsl:text> V</xsl:text>
         <xsl:value-of select="$VERSION"/>
       </xsl:attribute>
     </xsl:element>

diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index da2ed29d9d82d53ac668ca5794812cb5bbf277b4..c892de8d96d577c223a30aa8987341bb05a592e4 100644 (file)
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -144,7 +144,7 @@
     <base href="{$html.base}"/>
   </xsl:if>
 
-  <meta name="generator" content="DocBook XSL Stylesheets V{$VERSION}"/>
+  <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
 
   <xsl:if test="$generate.meta.abstract != 0">
     <xsl:variable name="info" select="(articleinfo

diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index 44906e8c6fdc5262f6c0fd61fdd2f3e14301a53a..90c191eb3304504fa8cca74e5f10c42015d55ec1 100644 (file)
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -183,7 +183,9 @@ db:manvolnum
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text>&#10;</xsl:text>
-    <xsl:text>&#x2302;&#x2593;" Generator: DocBook XSL Stylesheets v</xsl:text>
+    <xsl:text>&#x2302;&#x2593;" Generator: DocBook </xsl:text>
+    <xsl:value-of select="$DistroTitle"/>
+    <xsl:text> v</xsl:text>
     <xsl:call-template name="replace.dots.and.dashes">
       <xsl:with-param name="content" select="$VERSION"/>
     </xsl:call-template>