Ignore:
Timestamp:
Mar 8, 2008, 1:17:34 AM (12 years ago)
Author:
julian.reschke@…
Message:

Update to xml2rfc 1.33 (only affects Makefiles), update to latest version of rfc2629.xslt, change Makefile to allow Saxon to keep line numbers from source files.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • rfc2629xslt/rfc2629.xslt

    r227 r230  
    3838                xmlns:msxsl="urn:schemas-microsoft-com:xslt"
    3939                xmlns:myns="mailto:julian.reschke@greenbytes.de?subject=rcf2629.xslt"
    40                 xmlns:saxon="http://icl.com/saxon"
     40                xmlns:saxon-old="http://icl.com/saxon"
     41                xmlns:saxon="http://saxon.sf.net/"
    4142                xmlns:x="http://purl.org/net/xml2rfc/ext"
    4243                xmlns:xhtml="http://www.w3.org/1999/xhtml"
    4344
    44                 exclude-result-prefixes="date ed exslt msxsl myns saxon x xhtml"
     45                exclude-result-prefixes="date ed exslt msxsl myns saxon saxon-old x xhtml"
    4546                >
    4647
     
    339340        and /rfc/@number != 5065
    340341        and /rfc/@number != 5094) or
    341       ($xml2rfc-ext-pub-year > 2008) or
    342       (not(/rfc/@number) and $xml2rfc-ext-pub-year > 2007 and $xml2rfc-ext-pub-month-numeric >= 9)
     342      ($xml2rfc-ext-pub-year >= 2008) or
     343      (not(/rfc/@number) and $xml2rfc-ext-pub-year >= 2007 and $xml2rfc-ext-pub-month-numeric >= 9)
    343344    )
    344345  )" />
     
    15371538<xsl:template match="section|appendix">
    15381539
     1540  <xsl:if test="self::appendix">
     1541    <xsl:call-template name="warning">
     1542      <xsl:with-param name="inline" select="'no'"/>
     1543      <xsl:with-param name="msg">The "appendix" element is deprecated, use "section" inside "back" instead.</xsl:with-param>
     1544    </xsl:call-template>
     1545  </xsl:if>
     1546
    15391547  <xsl:variable name="sectionNumber">
    15401548    <xsl:choose>
     
    38213829        <xsl:call-template name="warning">
    38223830          <xsl:with-param name="inline" select="'no'"/>
    3823           <xsl:with-param name="msg" select="concat('front matter mentions RFC',$rfcNo,' for which there is no reference element')"/>
     3831          <xsl:with-param name="msg" select="concat('front matter mentions RFC ',$rfcNo,' for which there is no reference element')"/>
    38243832        </xsl:call-template>
    38253833      </xsl:if>
     
    47844792    <xsl:text>http://greenbytes.de/tech/webdav/rfc2629.xslt, </xsl:text>
    47854793    <!-- when RCS keyword substitution in place, add version info -->
    4786     <xsl:if test="contains('$Revision: 1.362 $',':')">
    4787       <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.362 $', 'Revision: '),'$','')),', ')" />
     4794    <xsl:if test="contains('$Revision: 1.365 $',':')">
     4795      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.365 $', 'Revision: '),'$','')),', ')" />
    47884796    </xsl:if>
    4789     <xsl:if test="contains('$Date: 2008-02-29 17:10:19 $',':')">
    4790       <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2008-02-29 17:10:19 $', 'Date: '),'$','')),', ')" />
     4797    <xsl:if test="contains('$Date: 2008-03-07 07:17:25 $',':')">
     4798      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2008-03-07 07:17:25 $', 'Date: '),'$','')),', ')" />
    47914799    </xsl:if>
    47924800    <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))" />
     
    49444952<!-- diag support -->
    49454953<xsl:template name="lineno">
     4954  <xsl:if test="function-available('saxon-old:line-number')">
     4955    <xsl:if test="saxon-old:line-number() > 0">
     4956      <xsl:text> (at line </xsl:text>
     4957      <xsl:value-of select="saxon-old:line-number()"/>
     4958      <xsl:text>)</xsl:text>
     4959    </xsl:if>
     4960  </xsl:if>
    49464961  <xsl:if test="function-available('saxon:line-number')">
    49474962    <xsl:if test="saxon:line-number() > 0">
Note: See TracChangeset for help on using the changeset viewer.