Ignore:
Timestamp:
01/01/10 16:11:53 (11 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/rfc2629toXHTML.xslt

    r729 r741  
    246246</xsl:param>
    247247
    248 <!-- experimental support for http://tools.ietf.org/html/draft-iab-streams-headers-boilerplates-08, work in progress -->
     248<!-- experimental support for RFC 5741, work in progress -->
    249249
    250250<xsl:param name="xml2rfc-ext-hab">
    … …  
    255255  </xsl:call-template>
    256256</xsl:param>
    257 <xsl:param name="xml2rfc-ext-consensus">
     257
     258<!-- experimental support for TLP 4.0, work in progress -->
     259
     260<xsl:param name="xml2rfc-ext-tlp">
    258261  <xsl:call-template name="parse-pis">
    259262    <xsl:with-param name="nodes" select="/processing-instruction('rfc-ext')"/>
    260     <xsl:with-param name="attr" select="'consensus'"/>
    261     <xsl:with-param name="default" select="'yes'"/>
     263    <xsl:with-param name="attr" select="'tlp'"/>
     264    <xsl:with-param name="default" select="''"/>
    262265  </xsl:call-template>
    263266</xsl:param>
    … …  
    357360    </xsl:otherwise>
    358361  </xsl:choose>
     362</xsl:variable>
     363
     364<!-- Header format as defined in RFC 5741, and deployed end of Dec 2009 -->
     365<xsl:variable name="header-format">
     366  <xsl:choose>
     367    <xsl:when test="$pub-yearmonth &gt;= 201001 or       ($rfcno=5741 or $rfcno=5742 or $rfcno=5743)">2010</xsl:when>
     368    <xsl:otherwise/>
     369  </xsl:choose>   
    359370</xsl:variable>
    360371
    … …  
    23582369  <xsl:if test="$xml2rfc-private=''">
    23592370    <xsl:choose>
    2360       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='independent'">
    2361         <myns:item>Independent<!-- Stream--></myns:item>
     2371      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='independent'">
     2372        <myns:item>Independent Submission</myns:item>
    23622373      </xsl:when>
    2363       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='IETF'">
    2364         <myns:item>Internet Engineering Task Force</myns:item>
     2374      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='IETF'">
     2375        <myns:item>Internet Engineering Task Force (IETF)</myns:item>
    23652376      </xsl:when>
    2366       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='IRTF'">
    2367         <myns:item>Internet Research Task Force</myns:item>
     2377      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='IRTF'">
     2378        <myns:item>Internet Research Task Force (IRTF)</myns:item>
    23682379      </xsl:when>
    2369       <xsl:when test="$xml2rfc-ext-hab='yes' and $submissionType='IAB'">
    2370         <myns:item>Internet Architecture Board</myns:item>
     2380      <xsl:when test="/rfc/@number and $header-format='2010' and $submissionType='IAB'">
     2381        <myns:item>Internet Architecture Board (IAB)</myns:item>
    23712382      </xsl:when>
    23722383      <xsl:when test="/rfc/front/workgroup and (not(/rfc/@number) or /rfc/@number='')">
    … …  
    23852396      </xsl:choose>
    23862397    </myns:item>
    2387     <xsl:if test="/rfc/@docName and $mode!='nroff'">
    2388       <myns:item>
    2389         &lt;<xsl:value-of select="/rfc/@docName"/>&gt;
    2390       </myns:item>
    2391     </xsl:if>
    23922398    <xsl:if test="/rfc/@obsoletes and /rfc/@obsoletes!=''">
    23932399      <myns:item>
    … …  
    24182424      </myns:item>
    24192425    </xsl:if>
    2420     <xsl:if test="$mode!='nroff'">
    2421       <myns:item>
    2422         <xsl:choose>
    2423           <xsl:when test="/rfc/@number">
    2424             <xsl:text>Category: </xsl:text>
    2425           </xsl:when>
    2426           <xsl:otherwise>
    2427             <xsl:text>Intended status: </xsl:text>
    2428           </xsl:otherwise>
    2429         </xsl:choose>
    2430         <xsl:call-template name="get-category-long"/>
    2431       </myns:item>
    2432     </xsl:if>
     2426    <myns:item>
     2427      <xsl:choose>
     2428        <xsl:when test="/rfc/@number">
     2429          <xsl:text>Category: </xsl:text>
     2430        </xsl:when>
     2431        <xsl:otherwise>
     2432          <xsl:text>Intended status: </xsl:text>
     2433        </xsl:otherwise>
     2434      </xsl:choose>
     2435      <xsl:call-template name="get-category-long"/>
     2436    </myns:item>
    24332437    <xsl:if test="/rfc/@ipr and not(/rfc/@number)">
    24342438       <myns:item>Expires: <xsl:call-template name="expirydate"/></myns:item>
    … …  
    24392443  <xsl:if test="$xml2rfc-private!=''">
    24402444    <myns:item><xsl:value-of select="$xml2rfc-private"/></myns:item>
     2445  </xsl:if>
     2446 
     2447  <xsl:if test="$header-format='2010' and /rfc/@number">
     2448    <myns:item>ISSN: 2070-1721</myns:item>
    24412449  </xsl:if>
    24422450</xsl:template>
    … …  
    38493857          </xsl:when>
    38503858 
     3859          <!-- as of Feb 2010 -->
     3860          <xsl:when test="$xml2rfc-ext-tlp='4' and (/rfc/@ipr = 'trust200902'                           or /rfc/@ipr = 'noModificationTrust200902'                           or /rfc/@ipr = 'noDerivativesTrust200902'                           or /rfc/@ipr = 'pre5378Trust200902')">
     3861            This Internet-Draft is submitted in full conformance with
     3862            the provisions of BCP 78 and BCP 79.
     3863          </xsl:when>
     3864 
    38513865          <!-- as of Nov 2008, Feb 2009 and Sep 2009 -->
    38523866          <xsl:when test="/rfc/@ipr = 'trust200811'                           or /rfc/@ipr = 'noModificationTrust200811'                           or /rfc/@ipr = 'noDerivativesTrust200811'                           or /rfc/@ipr = 'trust200902'                           or /rfc/@ipr = 'noModificationTrust200902'                           or /rfc/@ipr = 'noDerivativesTrust200902'                           or /rfc/@ipr = 'pre5378Trust200902'">
    … …  
    40044018          (IETF).
    40054019          <xsl:choose>
    4006             <xsl:when test="$xml2rfc-ext-consensus='yes'">
     4020            <xsl:when test="not(/rfc/@consensus) or /rfc/@consensus='yes'">
    40074021              It represents the consensus of the IETF community.  It has
    40084022              received public review and has been approved for publication by
    … …  
    40164030        </xsl:when>
    40174031        <xsl:when test="$submissionType='IAB'">
    4018           This document is a product of the Internet Architecture Board (IAB),
     4032          This document is a product of the Internet Architecture Board (IAB)
    40194033          and represents information that the IAB has deemed valuable to
    40204034          provide for permanent record.
    40214035        </xsl:when>
    40224036        <xsl:when test="$submissionType='IRTF'">
    4023           <xsl:variable name="wg">
    4024             <xsl:choose>
    4025               <xsl:when test="/rfc/front/workgroup">
    4026                 <xsl:value-of select="/rfc/front/workgroup"/>
    4027               </xsl:when>
    4028               <xsl:otherwise>
    4029                 WORKGROUP INFO MISSING
    4030                 <xsl:call-template name="error">
    4031                   <xsl:with-param name="msg" select="concat('Missing value for /rfc/front/workgroup: ', /rfc/front/workgroup)"/>
    4032                   <xsl:with-param name="inline" select="'no'"/>
    4033                 </xsl:call-template>
    4034               </xsl:otherwise>
    4035             </xsl:choose>
    4036           </xsl:variable>
    4037          
    40384037          This document is a product of the Internet Research Task Force (IRTF).
    40394038          The IRTF publishes the results of Internet-related research and
    … …  
    40414040          deployment.
    40424041          <xsl:choose>
    4043             <xsl:when test="$xml2rfc-ext-consensus='yes'">
     4042            <xsl:when test="(not(/rfc/@consensus) or /rfc/@consensus='yes') and /rfc/front/workgroup!=''">
    40444043              This RFC represents the consensus of the
    4045               <xsl:value-of select="$wg"/> Research Group of the Internet
     4044              <xsl:value-of select="/rfc/front/workgroup"/> Research Group of the Internet
    40464045              Research Task Force (IRTF).
    40474046            </xsl:when>
     4047            <xsl:when test="/rfc/@consensus='no' and /rfc/front/workgroup!=''">
     4048              This RFC represents the individual opinion(s) of one or more
     4049              members of the <xsl:value-of select="/rfc/front/workgroup"/> Research Group of the
     4050              Internet Research Task Force (IRTF).
     4051            </xsl:when>
    40484052            <xsl:otherwise>
    4049               This RFC represents the individual opinion(s) of one or more
    4050               members of the <xsl:value-of select="$wg"/> Research Group of the
    4051               Internet Research Task Force (IRTF).
     4053              <!-- no research group -->
    40524054            </xsl:otherwise>
    40534055          </xsl:choose>
    … …  
    40684070          <xsl:choose>
    40694071            <xsl:when test="/rfc/@category='bcp'">
    4070               Further information on BCPs is available in Section 2 of RFC XXXX.
     4072              Further information on BCPs is available in Section 2 of RFC 5741.
    40714073            </xsl:when>
    40724074            <xsl:when test="/rfc/@category='std'">
    40734075              Further information on Internet Standards is available in Section
    4074               2 of RFC XXXX.
     4076              2 of RFC 5741.
    40754077            </xsl:when>
    40764078            <xsl:otherwise>
    4077               Not all documents approved by the IESG are candidate for any
    4078               level of Internet Standards; see Section 2 of RFC XXXX.
     4079              Not all documents approved by the IESG are a candidate for any
     4080              level of Internet Standard; see Section 2 of RFC 5741.
    40794081            </xsl:otherwise>
    40804082          </xsl:choose>
    … …  
    40834085          <xsl:variable name="approver">
    40844086            <xsl:choose>
    4085               <xsl:when test="/rfc/@submissionType='IAB'">IAB</xsl:when>
    4086               <xsl:when test="/rfc/@submissionType='IRTF'">IRSG</xsl:when>
     4087              <xsl:when test="$submissionType='IAB'">IAB</xsl:when>
     4088              <xsl:when test="$submissionType='IRTF'">IRSG</xsl:when>
    40874089              <xsl:otherwise>RFC Editor</xsl:otherwise>
    40884090            </xsl:choose>
    … …  
    40914093          Documents approved for publication by the
    40924094          <xsl:value-of select="$approver"/> are not a candidate for any level
    4093           of Internet Standard; see Section 2 of RFC XXXX.
     4095          of Internet Standard; see Section 2 of RFC 5741.
    40944096        </xsl:otherwise>
    40954097      </xsl:choose>
    … …  
    41124114        </t>
    41134115        <xsl:choose>
     4116          <xsl:when test="$ipr-2009-09 and $xml2rfc-ext-tlp='4'">
     4117            <t>
     4118              This document is subject to BCP 78 and the IETF Trust's Legal
     4119              Provisions Relating to IETF Documents (<eref target="http://trustee.ietf.org/license-info">http://trustee.ietf.org/license-info</eref>)
     4120              in effect on the date of publication of this document. Please
     4121              review these documents carefully, as they describe your rights
     4122              and restrictions with respect to this document.
     4123              <xsl:if test="$submissionType='IETF'">
     4124                Code Components extracted from this document must include
     4125                Simplified BSD License text as described in Section 4.e of the
     4126                Trust Legal Provisions and are provided without warranty as
     4127                described in the Simplified BSD License.
     4128              </xsl:if>
     4129            </t>
     4130          </xsl:when>
    41144131          <xsl:when test="$ipr-2009-09">
    41154132            <t>
    … …  
    58405857    <xsl:text>http://greenbytes.de/tech/webdav/rfc2629.xslt, </xsl:text>
    58415858    <!-- when RCS keyword substitution in place, add version info -->
    5842     <xsl:if test="contains('$Revision: 1.485 $',':')">
    5843       <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.485 $', 'Revision: '),'$','')),', ')"/>
     5859    <xsl:if test="contains('$Revision: 1.497 $',':')">
     5860      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.497 $', 'Revision: '),'$','')),', ')"/>
    58445861    </xsl:if>
    5845     <xsl:if test="contains('$Date: 2009-11-28 15:36:33 $',':')">
    5846       <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-11-28 15:36:33 $', 'Date: '),'$','')),', ')"/>
     5862    <xsl:if test="contains('$Date: 2009-12-30 19:57:37 $',':')">
     5863      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-12-30 19:57:37 $', 'Date: '),'$','')),', ')"/>
    58475864    </xsl:if>
    58485865    <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.