Changeset 448 for xml2rfc


Ignore:
Timestamp:
Feb 24, 2009, 1:31:57 PM (11 years ago)
Author:
julian.reschke@…
Message:

Update to xml2rfc 1.34pre3 and latest version of rfc2629.xslt

Location:
xml2rfc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • xml2rfc/rfc2629.dtd

    r446 r448  
    11<!--
    2   revised DTD for the RFC document series, draft of 2008-03-06
    3   -->
    4 
    5 <!-- hacked by jre 2009-02-20, adding experimental support for @ipr=pre5378Trust200902 -->
     2  revised DTD for the RFC document series, draft of 2000-02-23
     3  -->
     4
    65
    76<!--
     
    111110                      |full3978|noModification3978|noDerivatives3978
    112111                      |trust200811|noModificationTrust200811|noDerivativesTrust200811
     112                      |trust200902|noModificationTrust200902|noDerivativesTrust200902
    113113                      |pre5378Trust200902)
    114114                                         #IMPLIED
  • xml2rfc/xml2rfc.tcl

    r447 r448  
    1212global prog prog_version prog_url prog_ack
    1313set prog "xml2rfc"
    14 set prog_version "v1.34pre2-jr"
    15 # hacked by jre 2009-02-20, adding experimental support for @ipr=pre5378Trust200902
     14set prog_version "v1.34pre2"
    1615set prog_url "http://xml.resource.org/"
    1716set prog_ack \
     
    41284127#         Section 6.a Submission Compliance
    41294128#         Section 6.c Derivative Works and Publication Limitations
     4129#     February, 2009 update to Trust's Legal Provisions
     4130#         trust200902 and noDerivativesTrust200902 have the same text
     4131#         as the respective 200811 values.  noModificationTrust200902
     4132#         is slightly modified from the 200811 wording, and
     4133#         pre5378Trust200902 is new in this revision.
    41304134set iprstatus \
    41314135             { {full2026
     
    42284232not be created, and it may not be published except as an Internet-Draft."}
    42294233
     4234               {trust200902
     4235"This Internet-Draft is submitted to IETF in full
     4236conformance with the provisions of BCP&nbsp;78 and BCP&nbsp;79."}
     4237
     4238               {noModificationTrust200902
     4239"This Internet-Draft is submitted to IETF in full
     4240conformance with the provisions of BCP&nbsp;78 and BCP&nbsp;79.
     4241This document may not be modified, and derivative works of it may
     4242not be created, except to format it for publication as an RFC or
     4243to translate it into languages other than English."}
     4244
     4245               {noDerivativesTrust200902
     4246"This Internet-Draft is submitted to IETF in full
     4247conformance with the provisions of BCP&nbsp;78 and BCP&nbsp;79.
     4248This document may not be modified, and derivative works of it may
     4249not be created, and it may not be published except as an Internet-Draft."}
     4250
    42304251               {pre5378Trust200902
    4231 "This Internet-Draft is submitted to IETF pursuant to, and in full
    4232 conformance with, the provisions of BCP 78 and BCP 79."}
     4252"This Internet-Draft is submitted to IETF in full
     4253conformance with the provisions of BCP&nbsp;78 and BCP&nbsp;79.
     4254This document may contain material from IETF Documents or IETF
     4255Contributions published or made publicly available before November
     425610, 2008. The person(s) controlling the copyright in some of this
     4257material may not have granted the IETF Trust the right to allow
     4258modifications of such material outside the IETF Standards Process.
     4259Without obtaining an adequate license from the person(s) controlling
     4260the copyright in such materials, this document may not be modified
     4261outside the IETF Standards Process, and derivative works of it may
     4262not be created outside the IETF Standards Process, except to format
     4263it for publication as an RFC or to translate it into languages other
     4264than English."}
     4265
    42334266 }
    42344267
     
    43024335                   }
    43034336                    if {   [regexp -- {[0-9]$} $attrs(ipr)]
    4304                         && ![regexp -- {trust200811$} [string tolower $attrs(ipr)]]} {
     4337                        && ![regexp -- {trust200902$} [string tolower $attrs(ipr)]]} {
    43054338                        unexpected warning \
    4306                             "ipr=\"$attrs(ipr)\" attribute value is outdated compared to Trust Legal Provisions"
     4339                            "ipr=\"$attrs(ipr)\" attribute value is outdated compared to Trust Legal Provisions of 2/2009"
    43074340                    }
    43084341                    #if {[string compare $attrs(ipr) $ipr]} {
     
    54645497    global counter elem passno xref
    54655498    global options copyrightP iprP
    5466     global copyshort copyshort1 copyshort2 copyshort3 copyshort4 copyshort4prerfc5378escape
     5499    global copyshort copyshort1 copyshort2 copyshort3 copyshort4 copyshort5
    54675500    global funding funding1 funding2
    54685501    global backP
     
    54935526
    54945527    # XXX why is newP set two different places
    5495     set newP 6
     5528    set newP 7
    54965529    if {[string compare $attrs(number) ""]} {
    54975530        if {$attrs(number) <= 2499} {
     
    55255558        }
    55265559    }
    5527     if {$newP == 6} {
     5560    if {$newP == 7} {
     5561        set copyshort $copyshort5
     5562        set funding ""
     5563        set copyrightP -1
     5564        set iprP 0
     5565    } elseif {$newP == 6} {
    55285566        set copyshort $copyshort4
    55295567        set funding ""
    55305568        set copyrightP -1
    55315569        set iprP 0
    5532        
    5533         # escape clause
    5534         if {[string first "pre5378" $attrs(ipr)] >= 0} {
    5535           set copyshort $copyshort4prerfc5378escape
    5536         }
    55375570    } elseif {$newP == 5} {
    55385571        set copyshort ""
     
    59645997to this document."}
    59655998
    5966 # RFC 5378 escape clause, same as copyshort4 plus escape clause
    5967 set copyshort4prerfc5378escape \
     5999# Trust, try 2.
     6000set copyshort5 \
    59686001{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
    59696002document authors.  All rights reserved."
    59706003
    59716004"This document is subject to BCP 78 and the IETF Trust's Legal
    5972 Provisions Relating to IETF Documents
    5973 (http://trustee.ietf.org/license-info) in effect on the date of
    5974 publication of this document.  Please review these documents
    5975 carefully, as they describe your rights and restrictions with respect
    5976 to this document."
    5977 
    5978 "This document may contain material from IETF Documents or IETF Contributions published or
    5979 made publicly available before November 10, 2008. The person(s) controlling the copyright in
    5980 some of this material may not have granted the IETF Trust the right to allow modifications of such
    5981 material outside the IETF Standards Process. Without obtaining an adequate license from the
    5982 person(s) controlling the copyright in such materials, this document may not be modified outside
    5983 the IETF Standards Process, and derivative works of it may not be created outside the IETF
    5984 Standards Process, except to format it for publication as an RFC or to translate it into languages
    5985 other than English."}
     6005Provisions Relating to IETF Documents in effect on the date of
     6006publication of this document (http://trustee.ietf.org/license-info).
     6007Please review these documents carefully, as they describe your
     6008rights and restrictions with respect to this document."}
    59866009
    59876010# From the ietf/1id-guidelines.txt file, Section 5.
Note: See TracChangeset for help on using the changeset viewer.