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/rfc2629toXHTML.xslt

    r227 r230  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22<!--Auto-generated from rfc2629.xslt through HTMLtoXHTML.xslt-->
    3 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ed="http://greenbytes.de/2002/rfcedit" xmlns:date="http://exslt.org/dates-and-times" xmlns:exslt="http://exslt.org/common" xmlns:msxsl="urn:schemas-microsoft-com:xslt" xmlns:myns="mailto:julian.reschke@greenbytes.de?subject=rcf2629.xslt" xmlns:saxon="http://icl.com/saxon" xmlns:x="http://purl.org/net/xml2rfc/ext" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="date ed exslt msxsl myns saxon x xhtml">
     3<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ed="http://greenbytes.de/2002/rfcedit" xmlns:date="http://exslt.org/dates-and-times" xmlns:exslt="http://exslt.org/common" xmlns:msxsl="urn:schemas-microsoft-com:xslt" xmlns:myns="mailto:julian.reschke@greenbytes.de?subject=rcf2629.xslt" xmlns:saxon-old="http://icl.com/saxon" xmlns:saxon="http://saxon.sf.net/" xmlns:x="http://purl.org/net/xml2rfc/ext" xmlns:xhtml="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="date ed exslt msxsl myns saxon saxon-old x xhtml">
    44
    55<xsl:strip-space elements="back front list middle rfc section"/>               
     
    169169<xsl:variable name="ipr-rfc4748" select="(   $ipr-rfc3667 and     (       (/rfc/@number &gt; 4671) or       ($xml2rfc-ext-pub-year &gt; 2006) or       ($xml2rfc-ext-pub-year &gt; 2005 and $xml2rfc-ext-pub-month-numeric &gt;= 11)     )   )"/>
    170170
    171 <xsl:variable name="ipr-2007-08" select="(   $ipr-rfc4748 and     (       (/rfc/@number &gt; 5000         and /rfc/@number != 5020         and /rfc/@number != 5021         and /rfc/@number != 5034         and /rfc/@number != 5052         and /rfc/@number != 5065         and /rfc/@number != 5094) or       ($xml2rfc-ext-pub-year &gt; 2008) or       (not(/rfc/@number) and $xml2rfc-ext-pub-year &gt; 2007 and $xml2rfc-ext-pub-month-numeric &gt;= 9)     )   )"/>
     171<xsl:variable name="ipr-2007-08" select="(   $ipr-rfc4748 and     (       (/rfc/@number &gt; 5000         and /rfc/@number != 5020         and /rfc/@number != 5021         and /rfc/@number != 5034         and /rfc/@number != 5052         and /rfc/@number != 5065         and /rfc/@number != 5094) or       ($xml2rfc-ext-pub-year &gt;= 2008) or       (not(/rfc/@number) and $xml2rfc-ext-pub-year &gt;= 2007 and $xml2rfc-ext-pub-month-numeric &gt;= 9)     )   )"/>
    172172
    173173<!-- funding switch --> 
     
    13581358<xsl:template match="section|appendix">
    13591359
     1360  <xsl:if test="self::appendix">
     1361    <xsl:call-template name="warning">
     1362      <xsl:with-param name="inline" select="'no'"/>
     1363      <xsl:with-param name="msg">The "appendix" element is deprecated, use "section" inside "back" instead.</xsl:with-param>
     1364    </xsl:call-template>
     1365  </xsl:if>
     1366
    13601367  <xsl:variable name="sectionNumber">
    13611368    <xsl:choose>
     
    36423649        <xsl:call-template name="warning">
    36433650          <xsl:with-param name="inline" select="'no'"/>
    3644           <xsl:with-param name="msg" select="concat('front matter mentions RFC',$rfcNo,' for which there is no reference element')"/>
     3651          <xsl:with-param name="msg" select="concat('front matter mentions RFC ',$rfcNo,' for which there is no reference element')"/>
    36453652        </xsl:call-template>
    36463653      </xsl:if>
     
    46054612    <xsl:text>http://greenbytes.de/tech/webdav/rfc2629.xslt, </xsl:text>
    46064613    <!-- when RCS keyword substitution in place, add version info -->
    4607     <xsl:if test="contains('$Revision: 1.362 $',':')">
    4608       <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.362 $', 'Revision: '),'$','')),', ')"/>
     4614    <xsl:if test="contains('$Revision: 1.365 $',':')">
     4615      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.365 $', 'Revision: '),'$','')),', ')"/>
    46094616    </xsl:if>
    4610     <xsl:if test="contains('$Date: 2008-02-29 17:10:19 $',':')">
    4611       <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2008-02-29 17:10:19 $', 'Date: '),'$','')),', ')"/>
     4617    <xsl:if test="contains('$Date: 2008-03-07 07:17:25 $',':')">
     4618      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2008-03-07 07:17:25 $', 'Date: '),'$','')),', ')"/>
    46124619    </xsl:if>
    46134620    <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))"/>
     
    47654772<!-- diag support -->
    47664773<xsl:template name="lineno">
     4774  <xsl:if test="function-available('saxon-old:line-number')">
     4775    <xsl:if test="saxon-old:line-number() &gt; 0">
     4776      <xsl:text> (at line </xsl:text>
     4777      <xsl:value-of select="saxon-old:line-number()"/>
     4778      <xsl:text>)</xsl:text>
     4779    </xsl:if>
     4780  </xsl:if>
    47674781  <xsl:if test="function-available('saxon:line-number')">
    47684782    <xsl:if test="saxon:line-number() &gt; 0">
Note: See TracChangeset for help on using the changeset viewer.