Ignore:
Timestamp:
Feb 20, 2009, 6:59:11 AM (11 years ago)
Author:
julian.reschke@…
Message:

Update to latest version of rfc2629.xslt, and add experimental version of xml2rfc.tcl (supporting the new IPR escape clause), use that clause in P1..P7 (but not for the method registrations).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • rfc2629xslt/rfc2629toXHTML.xslt

    r440 r446  
    179179<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)     )   )"/>
    180180
    181 <xsl:variable name="ipr-2008-11" select="(     /rfc/@number and     ($xml2rfc-ext-pub-year &gt;= 2009 or ($xml2rfc-ext-pub-year &gt;= 2008 and $xml2rfc-ext-pub-month-numeric &gt;= 11))   )   or   (     /rfc/@ipr = 'trust200811' or     /rfc/@ipr = 'noModificationTrust200811' or     /rfc/@ipr = 'noDerivativesTrust200811'   )"/>
     181<xsl:variable name="ipr-2008-11" select="(     /rfc/@number and     ($xml2rfc-ext-pub-year &gt;= 2009 or ($xml2rfc-ext-pub-year &gt;= 2008 and $xml2rfc-ext-pub-month-numeric &gt;= 11))   )   or   (     /rfc/@ipr = 'trust200811' or     /rfc/@ipr = 'noModificationTrust200811' or     /rfc/@ipr = 'noDerivativesTrust200902' or     /rfc/@ipr = 'trust200902' or     /rfc/@ipr = 'noModificationTrust200902' or     /rfc/@ipr = 'noDerivativesTrust200902' or     /rfc/@ipr = 'pre5378Trust200902'   )"/>
     182
     183<xsl:variable name="ipr-2009-02" select="(     $ipr-2008-11 and ($xml2rfc-ext-pub-year &gt;= 2010 or ($xml2rfc-ext-pub-year &gt;= 2009 and $xml2rfc-ext-pub-month-numeric &gt;= 02))   )"/>
    182184
    183185<!-- funding switch --> 
     
    633635    <xsl:when test="/rfc/@ipr = 'full2026'"/>
    634636    <xsl:when test="/rfc/@ipr = 'noDerivativeWorks'"/>
     637    <xsl:when test="/rfc/@ipr = 'noDerivativeWorksNow'"/>
    635638    <xsl:when test="/rfc/@ipr = 'none'"/>
    636639    <xsl:when test="/rfc/@ipr = 'full3667'"/>
     
    643646    <xsl:when test="/rfc/@ipr = 'noModificationTrust200811'"/>
    644647    <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200811'"/>
     648    <xsl:when test="/rfc/@ipr = 'trust200902'"/>
     649    <xsl:when test="/rfc/@ipr = 'noModificationTrust200902'"/>
     650    <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200902'"/>
     651    <xsl:when test="/rfc/@ipr = 'pre5378Trust200902'"/>
    645652    <xsl:otherwise>
    646653      <xsl:call-template name="error">
     
    669676    </xsl:choose>
    670677  </xsl:if>
    671          
     678 
     679  <xsl:apply-templates select="x:boilerplate"/>
    672680  <xsl:apply-templates select="abstract"/>
    673681  <xsl:apply-templates select="note"/>
     
    11221130      <xsl:choose>
    11231131        <xsl:when test="string-length($target) &gt; 0">
    1124           <xsl:text>&#8220;</xsl:text><a href="{$target}"><xsl:value-of select="front/title"/></a><xsl:text>&#8221;</xsl:text>
     1132          <xsl:text>&#8220;</xsl:text>
     1133          <a href="{$target}"><xsl:value-of select="normalize-space(front/title)"/></a>
     1134          <xsl:text>&#8221;</xsl:text>
    11251135        </xsl:when>
    11261136        <xsl:otherwise>
    1127           <xsl:text>&#8220;</xsl:text><xsl:value-of select="front/title"/><xsl:text>&#8221;</xsl:text>
     1137          <xsl:text>&#8220;</xsl:text>
     1138          <xsl:value-of select="normalize-space(front/title)"/>
     1139          <xsl:text>&#8221;</xsl:text>
    11281140        </xsl:otherwise>
    11291141      </xsl:choose>
     
    14781490    <xsl:choose>
    14791491      <xsl:when test="@myns:unnumbered"/>
     1492      <xsl:when test="ancestor::x:boilerplate"/>
    14801493      <xsl:otherwise><xsl:call-template name="get-section-number"/></xsl:otherwise>
    14811494    </xsl:choose>
    14821495  </xsl:variable>
    14831496   
    1484   <xsl:if test="not(ancestor::section) and not(@myns:notoclink)">
     1497  <xsl:if test="not(ancestor::section) and not(ancestor::x:boilerplate) and not(@myns:notoclink)">
    14851498    <xsl:call-template name="insert-conditional-hrule"/>
    14861499  </xsl:if>
     
    14881501  <xsl:variable name="elemtype">
    14891502    <xsl:choose>
    1490       <xsl:when test="count(ancestor::section) = 0">h1</xsl:when>
    1491       <xsl:when test="count(ancestor::section) = 1">h2</xsl:when>
    1492       <xsl:when test="count(ancestor::section) = 2">h3</xsl:when>
    1493       <xsl:when test="count(ancestor::section) = 3">h4</xsl:when>
    1494       <xsl:otherwise>h5</xsl:otherwise>
     1503      <xsl:when test="count(ancestor::section) &lt;= 4">h<xsl:value-of select="1 + count(ancestor::section)"/></xsl:when>
     1504      <xsl:otherwise>h6</xsl:otherwise>
    14951505    </xsl:choose>
    14961506  </xsl:variable>
     
    24902500  page-break-after: avoid;
    24912501}
    2492 h2 a {
    2493   color: black;
    2494 }
    2495 h3 {
     2502h3, h4, h5, h6 {
    24962503  font-size: 10pt;
    24972504  page-break-after: avoid;
    24982505}
    2499 h3 a {
    2500   color: black;
    2501 }
    2502 h4 {
    2503   font-size: 10pt;
    2504   page-break-after: avoid;
    2505 }
    2506 h4 a {
    2507   color: black;
    2508 }
    2509 h5 {
    2510   font-size: 10pt;
    2511   page-break-after: avoid;
    2512 }
    2513 h5 a {
     2506h2 a, h3 a, h4 a, h5 a, h6 a {
    25142507  color: black;
    25152508}
     
    33543347            not be created, and it may not be published except as an Internet-Draft.
    33553348          </xsl:when>
     3349 
     3350          <!-- as of Feb 2009 -->
     3351          <xsl:when test="/rfc/@ipr = 'trust200902'">
     3352            This Internet-Draft is submitted to IETF pursuant to, and in full
     3353            conformance with, the provisions of BCP 78 and BCP 79.
     3354          </xsl:when>
     3355          <xsl:when test="/rfc/@ipr = 'noModificationTrust200902'">
     3356            This Internet-Draft is submitted to IETF pursuant to, and in full
     3357            conformance with, the provisions of BCP 78 and BCP 79.
     3358            This document may not be modified, and derivative works of it may
     3359            not be created, except to format it for publication as an RFC or
     3360            to translate it into languages other than English.
     3361          </xsl:when>
     3362          <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200902'">
     3363            This Internet-Draft is submitted to IETF pursuant to, and in full
     3364            conformance with, the provisions of BCP 78 and BCP 79.
     3365            This document may not be modified, and derivative works of it may
     3366            not be created, and it may not be published except as an Internet-Draft.
     3367          </xsl:when>
     3368          <xsl:when test="/rfc/@ipr = 'pre5378Trust200902'">
     3369            This Internet-Draft is submitted to IETF pursuant to, and in full
     3370            conformance with, the provisions of BCP 78 and BCP 79.
     3371            This document may contain material from IETF Documents or IETF Contributions published or
     3372            made publicly available before November 10, 2008. The person(s) controlling the copyright in
     3373            some of this material may not have granted the IETF Trust the right to allow modifications of such
     3374            material outside the IETF Standards Process. Without obtaining an adequate license from the
     3375            person(s) controlling the copyright in such materials, this document may not be modified outside
     3376            the IETF Standards Process, and derivative works of it may not be created outside the IETF
     3377            Standards Process, except to format it for publication as an RFC or to translate it into languages
     3378            other than English.
     3379          </xsl:when>
     3380 
    33563381          <xsl:otherwise>
    33573382            CONFORMANCE UNDEFINED.
     
    34263451    </xsl:otherwise>
    34273452  </xsl:choose>
    3428  
    34293453  </section>
    3430 
     3454 
    34313455  <xsl:choose>
    34323456    <xsl:when test="$ipr-2008-11">
     
    34363460          as the document authors.  All rights reserved.
    34373461        </t>
    3438         <t>   
    3439           This document is subject to BCP 78 and the IETF Trust's Legal
    3440           Provisions Relating to IETF Documents
    3441           (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>) in effect on the date of
    3442           publication of this document.  Please review these documents
    3443           carefully, as they describe your rights and restrictions with respect
    3444           to this document.
    3445         </t>
     3462        <xsl:choose>
     3463          <xsl:when test="$ipr-2009-02">
     3464            <t>
     3465              This document is subject to BCP 78 and the IETF Trust's Legal
     3466              Provisions Relating to IETF Documents in effect on the date of
     3467              publication of this document
     3468              (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>).
     3469              Please review these documents carefully, as they describe your rights and restrictions with
     3470              respect to this document.
     3471            </t>
     3472          </xsl:when>
     3473          <xsl:otherwise>
     3474            <t>
     3475              This document is subject to BCP 78 and the IETF Trust's Legal
     3476              Provisions Relating to IETF Documents
     3477              (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>) in effect on the date of
     3478              publication of this document.  Please review these documents
     3479              carefully, as they describe your rights and restrictions with respect
     3480              to this document.
     3481            </t>
     3482          </xsl:otherwise>
     3483        </xsl:choose>
     3484       
     3485        <!-- special case: RFC5378 escape applies to RFCs as well -->
     3486        <xsl:if test="/rfc/@ipr = 'pre5378Trust200902' and /rfc/@number">
     3487          <t>
     3488            This document may contain material from IETF Documents or IETF Contributions published or
     3489            made publicly available before November 10, 2008. The person(s) controlling the copyright in
     3490            some of this material may not have granted the IETF Trust the right to allow modifications of such
     3491            material outside the IETF Standards Process. Without obtaining an adequate license from the
     3492            person(s) controlling the copyright in such materials, this document may not be modified outside
     3493            the IETF Standards Process, and derivative works of it may not be created outside the IETF
     3494            Standards Process, except to format it for publication as an RFC or to translate it into languages
     3495            other than English.
     3496          </t>
     3497        </xsl:if>
     3498       
    34463499      </section>
    34473500    </xsl:when>
     
    42894342</xsl:template>
    42904343
     4344<!-- boilerplate -->
     4345<xsl:template match="x:boilerplate">
     4346  <xsl:apply-templates/>
     4347</xsl:template>
     4348
    42914349<!-- experimental annotation support -->
    42924350
     
    50205078    <xsl:text>http://greenbytes.de/tech/webdav/rfc2629.xslt, </xsl:text>
    50215079    <!-- when RCS keyword substitution in place, add version info -->
    5022     <xsl:if test="contains('$Revision: 1.415 $',':')">
    5023       <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.415 $', 'Revision: '),'$','')),', ')"/>
     5080    <xsl:if test="contains('$Revision: 1.421 $',':')">
     5081      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.421 $', 'Revision: '),'$','')),', ')"/>
    50245082    </xsl:if>
    5025     <xsl:if test="contains('$Date: 2009-01-29 15:06:08 $',':')">
    5026       <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-01-29 15:06:08 $', 'Date: '),'$','')),', ')"/>
     5083    <xsl:if test="contains('$Date: 2009-02-20 13:12:03 $',':')">
     5084      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-02-20 13:12:03 $', 'Date: '),'$','')),', ')"/>
    50275085    </xsl:if>
    50285086    <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))"/>
Note: See TracChangeset for help on using the changeset viewer.