Return-Path: 
 <forrest-cvs-return-1255-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org
Received: (qmail 32295 invoked from network); 8 Sep 2003 12:31:11 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 8 Sep 2003 12:31:11 -0000
Received: (qmail 71135 invoked by uid 500); 8 Sep 2003 12:31:07 -0000
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 71091 invoked by uid 500); 8 Sep 2003 12:31:07 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 71074 invoked from network); 8 Sep 2003 12:31:07 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 8 Sep 2003 12:31:07 -0000
Received: (qmail 11816 invoked by uid 1352); 8 Sep 2003 12:02:54 -0000
Date: 8 Sep 2003 12:02:54 -0000
Message-ID: <20030908120254.11815.qmail@minotaur.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/skins/common/xslt/html
 document2html.xsl
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

jefft       2003/09/08 05:02:54

  Modified:    src/resources/skins/common/xslt/html document2html.xsl
  Log:
  Better <version> handling, including parsing of CVS $Revision$ tags to extract
  the version
  
  Revision  Changes    Path
  1.28      +30 -20    xml-forrest/src/resources/skins/common/xslt/html/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/html/document2html.xsl,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- document2html.xsl	6 Sep 2003 14:22:27 -0000	1.27
  +++ document2html.xsl	8 Sep 2003 12:02:54 -0000	1.28
  @@ -81,24 +81,18 @@
             <xsl:value-of select="header/subtitle"/>
           </h3>
         </xsl:if>
  -      <xsl:if test="header/authors">
  -        <p>
  -          <font size="-2">
  -            <xsl:for-each select="header/authors/person">
  -              <xsl:choose>
  -                <xsl:when test="position()=1">by&#160;</xsl:when>
  -                <xsl:otherwise>,&#160;</xsl:otherwise>
  -              </xsl:choose>
  -              <xsl:value-of select="@name"/>
  -            </xsl:for-each>
  -          </font>
  -        </p>
  -      </xsl:if>
         <xsl:apply-templates select="header/version"/>
         <xsl:apply-templates select="header/type"/>
         <xsl:apply-templates select="header/notice"/>
         <xsl:apply-templates select="header/abstract"/>
         <xsl:apply-templates select="body"/>
  +      <div class="attribution">
  +        <xsl:apply-templates select="header/authors"/>
  +        <xsl:if test="header/authors and header/version">
  +          <xsl:text>; </xsl:text>
  +        </xsl:if>
  +        <xsl:apply-templates select="header/version"/>
  +      </div>
       </div>
     </xsl:template>
   
  @@ -366,20 +360,36 @@
         </a>
       </xsl:if>
     </xsl:template>
  -  
  +
  +  <xsl:template match="header/authors">
  +    <xsl:for-each select="person">
  +      <xsl:choose>
  +        <xsl:when test="position()=1">by&#160;</xsl:when>
  +        <xsl:otherwise>,&#160;</xsl:otherwise>
  +      </xsl:choose>
  +      <xsl:value-of select="@name"/>
  +    </xsl:for-each>
  +  </xsl:template>
  +
     <xsl:template match="version">
  -    <p class="version">
  -    <!-- FIXME: i18n Transformer here -->
  -    <xsl:text>Version: </xsl:text>
  +    <span class="version">
         <xsl:apply-templates select="@major"/>
         <xsl:apply-templates select="@minor"/>
         <xsl:apply-templates select="@fix"/>
         <xsl:apply-templates select="@tag"/>
  -    </p>
  +      <xsl:choose>
  +        <xsl:when test="starts-with(., '$Revision: ')">
  +          version <xsl:value-of select="substring(., 12, string-length(.) -11-2)"/>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <xsl:value-of select="."/>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +    </span>
     </xsl:template>
     
     <xsl:template match="@major">
  -     <xsl:value-of select="."/>
  +     v<xsl:value-of select="."/>
     </xsl:template>
     
     <xsl:template match="@minor">