Ignore:
Timestamp:
20/02/09 14:59:11 (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/rfc2629.xslt

    r440 r446  
    372372    /rfc/@ipr = 'trust200811' or
    373373    /rfc/@ipr = 'noModificationTrust200811' or
    374     /rfc/@ipr = 'noDerivativesTrust200811'
     374    /rfc/@ipr = 'noDerivativesTrust200902' or
     375    /rfc/@ipr = 'trust200902' or
     376    /rfc/@ipr = 'noModificationTrust200902' or
     377    /rfc/@ipr = 'noDerivativesTrust200902' or
     378    /rfc/@ipr = 'pre5378Trust200902'
     379  )" />
     380
     381<xsl:variable name="ipr-2009-02" select="(
     382    $ipr-2008-11 and ($xml2rfc-ext-pub-year &gt;= 2010 or ($xml2rfc-ext-pub-year &gt;= 2009 and $xml2rfc-ext-pub-month-numeric >= 02))
    375383  )" />
    376384
     
    833841    <xsl:when test="/rfc/@ipr = 'full2026'" />
    834842    <xsl:when test="/rfc/@ipr = 'noDerivativeWorks'" />
     843    <xsl:when test="/rfc/@ipr = 'noDerivativeWorksNow'" />
    835844    <xsl:when test="/rfc/@ipr = 'none'" />
    836845    <xsl:when test="/rfc/@ipr = 'full3667'" />
     
    843852    <xsl:when test="/rfc/@ipr = 'noModificationTrust200811'" />
    844853    <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200811'" />
     854    <xsl:when test="/rfc/@ipr = 'trust200902'" />
     855    <xsl:when test="/rfc/@ipr = 'noModificationTrust200902'" />
     856    <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200902'" />
     857    <xsl:when test="/rfc/@ipr = 'pre5378Trust200902'" />
    845858    <xsl:otherwise>
    846859      <xsl:call-template name="error">
     
    869882    </xsl:choose>
    870883  </xsl:if>
    871          
     884 
     885  <xsl:apply-templates select="x:boilerplate"/>
    872886  <xsl:apply-templates select="abstract" />
    873887  <xsl:apply-templates select="note" />
     
    13221336      <xsl:choose>
    13231337        <xsl:when test="string-length($target) &gt; 0">
    1324           <xsl:text>&#8220;</xsl:text><a href="{$target}"><xsl:value-of select="front/title" /></a><xsl:text>&#8221;</xsl:text>
     1338          <xsl:text>&#8220;</xsl:text>
     1339          <a href="{$target}"><xsl:value-of select="normalize-space(front/title)" /></a>
     1340          <xsl:text>&#8221;</xsl:text>
    13251341        </xsl:when>
    13261342        <xsl:otherwise>
    1327           <xsl:text>&#8220;</xsl:text><xsl:value-of select="front/title" /><xsl:text>&#8221;</xsl:text>
     1343          <xsl:text>&#8220;</xsl:text>
     1344          <xsl:value-of select="normalize-space(front/title)" />
     1345          <xsl:text>&#8221;</xsl:text>
    13281346        </xsl:otherwise>
    13291347      </xsl:choose>
     
    16781696    <xsl:choose>
    16791697      <xsl:when test="@myns:unnumbered"></xsl:when>
     1698      <xsl:when test="ancestor::x:boilerplate"></xsl:when>
    16801699      <xsl:otherwise><xsl:call-template name="get-section-number" /></xsl:otherwise>
    16811700    </xsl:choose>
    16821701  </xsl:variable>
    16831702   
    1684   <xsl:if test="not(ancestor::section) and not(@myns:notoclink)">
     1703  <xsl:if test="not(ancestor::section) and not(ancestor::x:boilerplate) and not(@myns:notoclink)">
    16851704    <xsl:call-template name="insert-conditional-hrule"/>
    16861705  </xsl:if>
     
    16881707  <xsl:variable name="elemtype">
    16891708    <xsl:choose>
    1690       <xsl:when test="count(ancestor::section) = 0">h1</xsl:when>
    1691       <xsl:when test="count(ancestor::section) = 1">h2</xsl:when>
    1692       <xsl:when test="count(ancestor::section) = 2">h3</xsl:when>
    1693       <xsl:when test="count(ancestor::section) = 3">h4</xsl:when>
    1694       <xsl:otherwise>h5</xsl:otherwise>
     1709      <xsl:when test="count(ancestor::section) &lt;= 4">h<xsl:value-of select="1 + count(ancestor::section)"/></xsl:when>
     1710      <xsl:otherwise>h6</xsl:otherwise>
    16951711    </xsl:choose>
    16961712  </xsl:variable>
     
    26902706  page-break-after: avoid;
    26912707}
    2692 h2 a {
    2693   color: black;
    2694 }
    2695 h3 {
     2708h3, h4, h5, h6 {
    26962709  font-size: 10pt;
    26972710  page-break-after: avoid;
    26982711}
    2699 h3 a {
    2700   color: black;
    2701 }
    2702 h4 {
    2703   font-size: 10pt;
    2704   page-break-after: avoid;
    2705 }
    2706 h4 a {
    2707   color: black;
    2708 }
    2709 h5 {
    2710   font-size: 10pt;
    2711   page-break-after: avoid;
    2712 }
    2713 h5 a {
     2712h2 a, h3 a, h4 a, h5 a, h6 a {
    27142713  color: black;
    27152714}
     
    35543553            not be created, and it may not be published except as an Internet-Draft.
    35553554          </xsl:when>
     3555 
     3556          <!-- as of Feb 2009 -->
     3557          <xsl:when test="/rfc/@ipr = 'trust200902'">
     3558            This Internet-Draft is submitted to IETF pursuant to, and in full
     3559            conformance with, the provisions of BCP 78 and BCP 79.
     3560          </xsl:when>
     3561          <xsl:when test="/rfc/@ipr = 'noModificationTrust200902'">
     3562            This Internet-Draft is submitted to IETF pursuant to, and in full
     3563            conformance with, the provisions of BCP 78 and BCP 79.
     3564            This document may not be modified, and derivative works of it may
     3565            not be created, except to format it for publication as an RFC or
     3566            to translate it into languages other than English.
     3567          </xsl:when>
     3568          <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200902'">
     3569            This Internet-Draft is submitted to IETF pursuant to, and in full
     3570            conformance with, the provisions of BCP 78 and BCP 79.
     3571            This document may not be modified, and derivative works of it may
     3572            not be created, and it may not be published except as an Internet-Draft.
     3573          </xsl:when>
     3574          <xsl:when test="/rfc/@ipr = 'pre5378Trust200902'">
     3575            This Internet-Draft is submitted to IETF pursuant to, and in full
     3576            conformance with, the provisions of BCP 78 and BCP 79.
     3577            This document may contain material from IETF Documents or IETF Contributions published or
     3578            made publicly available before November 10, 2008. The person(s) controlling the copyright in
     3579            some of this material may not have granted the IETF Trust the right to allow modifications of such
     3580            material outside the IETF Standards Process. Without obtaining an adequate license from the
     3581            person(s) controlling the copyright in such materials, this document may not be modified outside
     3582            the IETF Standards Process, and derivative works of it may not be created outside the IETF
     3583            Standards Process, except to format it for publication as an RFC or to translate it into languages
     3584            other than English.
     3585          </xsl:when>
     3586 
    35563587          <xsl:otherwise>
    35573588            CONFORMANCE UNDEFINED.
     
    36263657    </xsl:otherwise>
    36273658  </xsl:choose>
    3628  
    36293659  </section>
    3630 
     3660 
    36313661  <xsl:choose>
    36323662    <xsl:when test="$ipr-2008-11">
     
    36363666          as the document authors.  All rights reserved.
    36373667        </t>
    3638         <t>   
    3639           This document is subject to BCP 78 and the IETF Trust's Legal
    3640           Provisions Relating to IETF Documents
    3641           (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>) in effect on the date of
    3642           publication of this document.  Please review these documents
    3643           carefully, as they describe your rights and restrictions with respect
    3644           to this document.
    3645         </t>
     3668        <xsl:choose>
     3669          <xsl:when test="$ipr-2009-02">
     3670            <t>
     3671              This document is subject to BCP 78 and the IETF Trust's Legal
     3672              Provisions Relating to IETF Documents in effect on the date of
     3673              publication of this document
     3674              (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>).
     3675              Please review these documents carefully, as they describe your rights and restrictions with
     3676              respect to this document.
     3677            </t>
     3678          </xsl:when>
     3679          <xsl:otherwise>
     3680            <t>
     3681              This document is subject to BCP 78 and the IETF Trust's Legal
     3682              Provisions Relating to IETF Documents
     3683              (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>) in effect on the date of
     3684              publication of this document.  Please review these documents
     3685              carefully, as they describe your rights and restrictions with respect
     3686              to this document.
     3687            </t>
     3688          </xsl:otherwise>
     3689        </xsl:choose>
     3690       
     3691        <!-- special case: RFC5378 escape applies to RFCs as well -->
     3692        <xsl:if test="/rfc/@ipr = 'pre5378Trust200902' and /rfc/@number">
     3693          <t>
     3694            This document may contain material from IETF Documents or IETF Contributions published or
     3695            made publicly available before November 10, 2008. The person(s) controlling the copyright in
     3696            some of this material may not have granted the IETF Trust the right to allow modifications of such
     3697            material outside the IETF Standards Process. Without obtaining an adequate license from the
     3698            person(s) controlling the copyright in such materials, this document may not be modified outside
     3699            the IETF Standards Process, and derivative works of it may not be created outside the IETF
     3700            Standards Process, except to format it for publication as an RFC or to translate it into languages
     3701            other than English.
     3702          </t>
     3703        </xsl:if>
     3704       
    36463705      </section>
    36473706    </xsl:when>
     
    44894548</xsl:template>
    44904549
     4550<!-- boilerplate -->
     4551<xsl:template match="x:boilerplate">
     4552  <xsl:apply-templates/>
     4553</xsl:template>
     4554
    44914555<!-- experimental annotation support -->
    44924556
     
    52215285    <xsl:text>http://greenbytes.de/tech/webdav/rfc2629.xslt, </xsl:text>
    52225286    <!-- when RCS keyword substitution in place, add version info -->
    5223     <xsl:if test="contains('$Revision: 1.415 $',':')">
    5224       <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.415 $', 'Revision: '),'$','')),', ')" />
     5287    <xsl:if test="contains('$Revision: 1.421 $',':')">
     5288      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.421 $', 'Revision: '),'$','')),', ')" />
    52255289    </xsl:if>
    5226     <xsl:if test="contains('$Date: 2009-01-29 15:06:08 $',':')">
    5227       <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-01-29 15:06:08 $', 'Date: '),'$','')),', ')" />
     5290    <xsl:if test="contains('$Date: 2009-02-20 13:12:03 $',':')">
     5291      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-02-20 13:12:03 $', 'Date: '),'$','')),', ')" />
    52285292    </xsl:if>
    52295293    <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.