Ignore:
Timestamp:
01/01/10 16:11:53 (13 years ago)
Author:
julian.reschke@…
Message:

Update to latest version of xml2rfc and rfc2629.xslt, bump document dates

File:
1 edited

Legend:

Unmodified
Added
Removed

  • rfc2629xslt/rfc2629.xslt

    r729 r741  
    290290</xsl:param>
    291291
    292 <!-- experimental support for http://tools.ietf.org/html/draft-iab-streams-headers-boilerplates-08, work in progress -->
     292<!-- experimental support for RFC 5741, work in progress -->
    293293
    294294<xsl:param name="xml2rfc-ext-hab">
    … …  
    299299  </xsl:call-template>
    300300</xsl:param>
    301 <xsl:param name="xml2rfc-ext-consensus">
     301
     302<!-- experimental support for TLP 4.0, work in progress -->
     303
     304<xsl:param name="xml2rfc-ext-tlp">
    302305  <xsl:call-template name="parse-pis">
    303306    <xsl:with-param name="nodes" select="/processing-instruction('rfc-ext')"/>
    304     <xsl:with-param name="attr" select="'consensus'"/>
    305     <xsl:with-param name="default" select="'yes'"/>
     307    <xsl:with-param name="attr" select="'tlp'"/>
     308    <xsl:with-param name="default" select="''"/>
    306309  </xsl:call-template>
    307310</xsl:param>
    … …  
    426429    </xsl:otherwise>
    427430  </xsl:choose>
     431</xsl:variable>
     432
     433<!-- Header format as defined in RFC 5741, and deployed end of Dec 2009 -->
     434<xsl:variable name="header-format">
     435  <xsl:choose>
     436    <xsl:when test="$pub-yearmonth >= 201001 or
     437      ($rfcno=5741 or $rfcno=5742 or $rfcno=5743)"
     438      >2010</xsl:when>
     439    <xsl:otherwise/>
     440  </xsl:choose>   
    428441</xsl:variable>
    429442
    … …  
    24782491  <xsl:if test="$xml2rfc-private=''">
    24792492    <xsl:choose>
    2480       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='independent'">
    2481         <myns:item>Independent<!-- Stream--></myns:item>
     2493      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='independent'">
     2494        <myns:item>Independent Submission</myns:item>
    24822495      </xsl:when>
    2483       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='IETF'">
    2484         <myns:item>Internet Engineering Task Force</myns:item>
     2496      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='IETF'">
     2497        <myns:item>Internet Engineering Task Force (IETF)</myns:item>
    24852498      </xsl:when>
    2486       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='IRTF'">
    2487         <myns:item>Internet Research Task Force</myns:item>
     2499      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='IRTF'">
     2500        <myns:item>Internet Research Task Force (IRTF)</myns:item>
    24882501      </xsl:when>
    2489       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='IAB'">
    2490         <myns:item>Internet Architecture Board</myns:item>
     2502      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='IAB'">
     2503        <myns:item>Internet Architecture Board (IAB)</myns:item>
    24912504      </xsl:when>
    24922505      <xsl:when test="/rfc/front/workgroup and (not(/rfc/@number) or /rfc/@number='')">
    … …  
    25052518      </xsl:choose>
    25062519    </myns:item>
    2507     <xsl:if test="/rfc/@docName and $mode!='nroff'">
    2508       <myns:item>
    2509         &lt;<xsl:value-of select="/rfc/@docName" />&gt;
    2510       </myns:item>
    2511     </xsl:if>
    25122520    <xsl:if test="/rfc/@obsoletes and /rfc/@obsoletes!=''">
    25132521      <myns:item>
    … …  
    25382546      </myns:item>
    25392547    </xsl:if>
    2540     <xsl:if test="$mode!='nroff'">
    2541       <myns:item>
    2542         <xsl:choose>
    2543           <xsl:when test="/rfc/@number">
    2544             <xsl:text>Category: </xsl:text>
    2545           </xsl:when>
    2546           <xsl:otherwise>
    2547             <xsl:text>Intended status: </xsl:text>
    2548           </xsl:otherwise>
    2549         </xsl:choose>
    2550         <xsl:call-template name="get-category-long" />
    2551       </myns:item>
    2552     </xsl:if>
     2548    <myns:item>
     2549      <xsl:choose>
     2550        <xsl:when test="/rfc/@number">
     2551          <xsl:text>Category: </xsl:text>
     2552        </xsl:when>
     2553        <xsl:otherwise>
     2554          <xsl:text>Intended status: </xsl:text>
     2555        </xsl:otherwise>
     2556      </xsl:choose>
     2557      <xsl:call-template name="get-category-long" />
     2558    </myns:item>
    25532559    <xsl:if test="/rfc/@ipr and not(/rfc/@number)">
    25542560       <myns:item>Expires: <xsl:call-template name="expirydate" /></myns:item>
    … …  
    25592565  <xsl:if test="$xml2rfc-private!=''">
    25602566    <myns:item><xsl:value-of select="$xml2rfc-private" /></myns:item>
     2567  </xsl:if>
     2568 
     2569  <xsl:if test="$header-format='2010' and /rfc/@number">
     2570    <myns:item>ISSN: 2070-1721</myns:item>
    25612571  </xsl:if>
    25622572</xsl:template>
    … …  
    39693979          </xsl:when>
    39703980 
     3981          <!-- as of Feb 2010 -->
     3982          <xsl:when test="$xml2rfc-ext-tlp='4' and (/rfc/@ipr = 'trust200902'
     3983                          or /rfc/@ipr = 'noModificationTrust200902'
     3984                          or /rfc/@ipr = 'noDerivativesTrust200902'
     3985                          or /rfc/@ipr = 'pre5378Trust200902')">
     3986            This Internet-Draft is submitted in full conformance with
     3987            the provisions of BCP 78 and BCP 79.
     3988          </xsl:when>
     3989 
    39713990          <!-- as of Nov 2008, Feb 2009 and Sep 2009 -->
    39723991          <xsl:when test="/rfc/@ipr = 'trust200811'
    … …  
    41304149          (IETF).
    41314150          <xsl:choose>
    4132             <xsl:when test="$xml2rfc-ext-consensus='yes'">
     4151            <xsl:when test="not(/rfc/@consensus) or /rfc/@consensus='yes'">
    41334152              It represents the consensus of the IETF community.  It has
    41344153              received public review and has been approved for publication by
    … …  
    41424161        </xsl:when>
    41434162        <xsl:when test="$submissionType='IAB'">
    4144           This document is a product of the Internet Architecture Board (IAB),
     4163          This document is a product of the Internet Architecture Board (IAB)
    41454164          and represents information that the IAB has deemed valuable to
    41464165          provide for permanent record.
    41474166        </xsl:when>
    41484167        <xsl:when test="$submissionType='IRTF'">
    4149           <xsl:variable name="wg">
    4150             <xsl:choose>
    4151               <xsl:when test="/rfc/front/workgroup">
    4152                 <xsl:value-of select="/rfc/front/workgroup"/>
    4153               </xsl:when>
    4154               <xsl:otherwise>
    4155                 WORKGROUP INFO MISSING
    4156                 <xsl:call-template name="error">
    4157                   <xsl:with-param name="msg" select="concat('Missing value for /rfc/front/workgroup: ', /rfc/front/workgroup)"/>
    4158                   <xsl:with-param name="inline" select="'no'"/>
    4159                 </xsl:call-template>
    4160               </xsl:otherwise>
    4161             </xsl:choose>
    4162           </xsl:variable>
    4163          
    41644168          This document is a product of the Internet Research Task Force (IRTF).
    41654169          The IRTF publishes the results of Internet-related research and
    … …  
    41674171          deployment.
    41684172          <xsl:choose>
    4169             <xsl:when test="$xml2rfc-ext-consensus='yes'">
     4173            <xsl:when test="(not(/rfc/@consensus) or /rfc/@consensus='yes') and /rfc/front/workgroup!=''">
    41704174              This RFC represents the consensus of the
    4171               <xsl:value-of select="$wg"/> Research Group of the Internet
     4175              <xsl:value-of select="/rfc/front/workgroup"/> Research Group of the Internet
    41724176              Research Task Force (IRTF).
    41734177            </xsl:when>
     4178            <xsl:when test="/rfc/@consensus='no' and /rfc/front/workgroup!=''">
     4179              This RFC represents the individual opinion(s) of one or more
     4180              members of the <xsl:value-of select="/rfc/front/workgroup"/> Research Group of the
     4181              Internet Research Task Force (IRTF).
     4182            </xsl:when>
    41744183            <xsl:otherwise>
    4175               This RFC represents the individual opinion(s) of one or more
    4176               members of the <xsl:value-of select="$wg"/> Research Group of the
    4177               Internet Research Task Force (IRTF).
     4184              <!-- no research group -->
    41784185            </xsl:otherwise>
    41794186          </xsl:choose>
    … …  
    41944201          <xsl:choose>
    41954202            <xsl:when test="/rfc/@category='bcp'">
    4196               Further information on BCPs is available in Section 2 of RFC XXXX.
     4203              Further information on BCPs is available in Section 2 of RFC 5741.
    41974204            </xsl:when>
    41984205            <xsl:when test="/rfc/@category='std'">
    41994206              Further information on Internet Standards is available in Section
    4200               2 of RFC XXXX.
     4207              2 of RFC 5741.
    42014208            </xsl:when>
    42024209            <xsl:otherwise>
    4203               Not all documents approved by the IESG are candidate for any
    4204               level of Internet Standards; see Section 2 of RFC XXXX.
     4210              Not all documents approved by the IESG are a candidate for any
     4211              level of Internet Standard; see Section 2 of RFC 5741.
    42054212            </xsl:otherwise>
    42064213          </xsl:choose>
    … …  
    42094216          <xsl:variable name="approver">
    42104217            <xsl:choose>
    4211               <xsl:when test="/rfc/@submissionType='IAB'">IAB</xsl:when>
    4212               <xsl:when test="/rfc/@submissionType='IRTF'">IRSG</xsl:when>
     4218              <xsl:when test="$submissionType='IAB'">IAB</xsl:when>
     4219              <xsl:when test="$submissionType='IRTF'">IRSG</xsl:when>
    42134220              <xsl:otherwise>RFC Editor</xsl:otherwise>
    42144221            </xsl:choose>
    … …  
    42174224          Documents approved for publication by the
    42184225          <xsl:value-of select="$approver"/> are not a candidate for any level
    4219           of Internet Standard; see Section 2 of RFC XXXX.
     4226          of Internet Standard; see Section 2 of RFC 5741.
    42204227        </xsl:otherwise>
    42214228      </xsl:choose>
    … …  
    42384245        </t>
    42394246        <xsl:choose>
     4247          <xsl:when test="$ipr-2009-09 and $xml2rfc-ext-tlp='4'">
     4248            <t>
     4249              This document is subject to BCP 78 and the IETF Trust's Legal
     4250              Provisions Relating to IETF Documents (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>)
     4251              in effect on the date of publication of this document. Please
     4252              review these documents carefully, as they describe your rights
     4253              and restrictions with respect to this document.
     4254              <xsl:if test="$submissionType='IETF'">
     4255                Code Components extracted from this document must include
     4256                Simplified BSD License text as described in Section 4.e of the
     4257                Trust Legal Provisions and are provided without warranty as
     4258                described in the Simplified BSD License.
     4259              </xsl:if>
     4260            </t>
     4261          </xsl:when>
    42404262          <xsl:when test="$ipr-2009-09">
    42414263            <t>
    … …  
    59675989    <xsl:text>http://greenbytes.de/tech/webdav/rfc2629.xslt, </xsl:text>
    59685990    <!-- when RCS keyword substitution in place, add version info -->
    5969     <xsl:if test="contains('$Revision: 1.485 $',':')">
    5970       <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.485 $', 'Revision: '),'$','')),', ')" />
     5991    <xsl:if test="contains('$Revision: 1.497 $',':')">
     5992      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.497 $', 'Revision: '),'$','')),', ')" />
    59715993    </xsl:if>
    5972     <xsl:if test="contains('$Date: 2009-11-28 15:36:33 $',':')">
    5973       <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-11-28 15:36:33 $', 'Date: '),'$','')),', ')" />
     5994    <xsl:if test="contains('$Date: 2009-12-30 19:57:37 $',':')">
     5995      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-12-30 19:57:37 $', 'Date: '),'$','')),', ')" />
    59745996    </xsl:if>
    59755997    <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.