Changeset 704 for xml2rfc


Ignore:
Timestamp:
Oct 2, 2009, 3:46:42 AM (10 years ago)
Author:
julian.reschke@…
Message:

Bump up document dates, update to latest versions of rfc2629.xslt and xml2rfc.tcl

File:
1 edited

Legend:

Unmodified
Added
Removed
  • xml2rfc/xml2rfc.tcl

    r701 r704  
    54975497    global counter elem passno xref
    54985498    global options copyrightP iprP
    5499     global copyshort copyshort1 copyshort2 copyshort3 copyshort4 copyshort5 \
    5500            copyshort6 copyshort7
     5499    global copyshort copyshort1 copyshort2 copyshort3 copyshortTrust200811 \
     5500           copyshortTrust200909 copyshortTrust200902 \
     5501           copyshortTrust200902esc copyshortTrust200909esc
    55015502    global funding funding1 funding2
    55025503    global backP
     
    55265527    }
    55275528
    5528     set newP 7
     5529    set newP 8
    55295530    if {[catch { clock format $fv(.PARSEDDATE) -format "%Y%m%d" -gmt true } \
    55305531               ymd]} {
     
    55345535    }
    55355536
    5536     if {$ymd >= "20091201"} {
    5537         if {![string compare $attrs(ipr) "pre5378Trust200902"]} {
    5538             set newP 9
    5539         } else {
    5540             set newP 6
    5541         }
    5542     } elseif {[string compare $attrs(number) ""]} {
     5537    if {[string compare $attrs(number) ""]} {
    55435538        if {$attrs(number) <= 2499} {
    55445539            set newP 0
     
    55535548            ([lsearch {5020 5021 5034 5052 5065 5094} $attrs(number)] > -1)} {
    55545549            set newP 4
    5555         }
    5556         if {$ymd < "20081101"} {
     5550        } elseif {$ymd < "20081101"} {
    55575551            set newP 5
    5558         } elseif {![string compare $attrs(ipr) "pre5378Trust200902"]} {
    5559             set newP 8
     5552        } elseif {$ymd < "20090201"} {
     5553            set newP 6
     5554        } elseif {$ymd < "20090901" ||
     5555            ([lsearch {5582 5621 5632 5645 5646 5681} $attrs(number)] > -1)} {
     5556            # TLP 2009 09 copyright notice beginning with Sep 2009, except
     5557            # for the RFCs listed above
     5558            set newP 7
    55605559        }
    55615560    } elseif {[string compare $attrs(ipr) ""]} {
     
    55655564        } elseif {[string first "trust" [string tolower $attrs(ipr)]] < 0} {
    55665565            set newP 1
    5567         }
    5568     }
    5569 
    5570     if {$newP == 9} {
    5571         set copyshort $copyshort7
    5572         set funding ""
    5573         set copyrightP -1
    5574         set iprP 0
    5575     } elseif {$newP == 8} {
    5576         set copyshort $copyshort6
     5566        } elseif {$ymd < "20091201"} {
     5567            # TLP 2009 09 copyright notice beginning with Dec 2009
     5568            set newP 7
     5569        }
     5570        # note: no support for 2008 11 TLP text in IDs
     5571    }
     5572
     5573    if {$newP == 8} {
     5574        # RFCs: include escape clause in Copyright Notice
     5575        # IDs: include in Status Of This Memo (produced elsewhere), for date before Dec 2009
     5576        if {![string compare $attrs(ipr) "pre5378Trust200902"] && \
     5577            ([string compare $attrs(number) ""] || $ymd >= "20091201")} {
     5578            set copyshort $copyshortTrust200909esc
     5579        } else {
     5580            set copyshort $copyshortTrust200909
     5581        }
    55775582        set funding ""
    55785583        set copyrightP -1
    55795584        set iprP 0
    55805585    } elseif {$newP == 7} {
    5581         set copyshort $copyshort5
     5586        # RFCs: include escape clause in Copyright Notice
     5587        # IDs: include in Status Of This Memo (produced elsewhere)
     5588        if {![string compare $attrs(ipr) "pre5378Trust200902"] && \
     5589            [string compare $attrs(number) ""]} {
     5590            set copyshort $copyshortTrust200902esc
     5591        } else {
     5592            set copyshort $copyshortTrust200902
     5593        }
    55825594        set funding ""
    55835595        set copyrightP -1
    55845596        set iprP 0
    55855597    } elseif {$newP == 6} {
    5586         set copyshort $copyshort4
     5598        set copyshort $copyshortTrust200811
    55875599        set funding ""
    55885600        set copyrightP -1
     
    58185830    set newP 3
    58195831    if {[string compare $attrs(number) ""]} {
     5832        # TODO: set newP using PARSEDDATE for all the options
    58205833        if {$attrs(number) <= 3707} {
    58215834            set newP 0
     
    58235836            # 4671 is a guess
    58245837            set newP 1
    5825         }
    5826         # TODO: set newP using PARSEDDATE for all the options
    5827         if {$ymd < "20081101"} {
     5838        } elseif {$ymd < "20081101"} {
    58285839            set newP 2
    58295840        }
     
    60086019
    60096020# Trust Copyright and License
    6010 set copyshort4 \
     6021# various dates, some incl pre5378 escape clause
     6022
     6023set copyshortTrust200811 \
    60116024{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
    60126025document authors.  All rights reserved."
     
    60176030publication of this document.  Please review these documents
    60186031carefully, as they describe your rights and restrictions with respect
    6019 to this document. Code Components extracted from this document must
    6020 include Simplified BSD License text as described in Section 4.e of
    6021 the Trust Legal Provisions and are provided without warranty as
    6022 described in the BSD License."}
    6023 
    6024 # Trust, try 2.
    6025 set copyshort5 \
     6032to this document."}
     6033
     6034set copyshortTrust200902 \
    60266035{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
    60276036document authors.  All rights reserved."
     
    60336042rights and restrictions with respect to this document."}
    60346043
    6035 # Trust, try 3.
    6036 set copyshort6 \
     6044set copyshortTrust200902esc \
    60376045{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
    60386046document authors.  All rights reserved."
     
    60566064than English."}
    60576065
    6058 set copyshort7 \
     6066set copyshortTrust200909 \
     6067{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
     6068document authors.  All rights reserved."
     6069
     6070"This document is subject to BCP 78 and the IETF Trust's Legal
     6071Provisions Relating to IETF Documents
     6072(http://trustee.ietf.org/license-info) in effect on the date of
     6073publication of this document.  Please review these documents
     6074carefully, as they describe your rights and restrictions with respect
     6075to this document. Code Components extracted from this document must
     6076include Simplified BSD License text as described in Section 4.e of
     6077the Trust Legal Provisions and are provided without warranty as
     6078described in the BSD License."}
     6079
     6080set copyshortTrust200909esc \
    60596081{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
    60606082document authors.  All rights reserved."
     
    1239612418proc write_status_nr {status copying afterP} {
    1239712419    global options copyrightP iprP
     12420    global page_basic_indent
    1239812421
    1239912422    if {$afterP} {
Note: See TracChangeset for help on using the changeset viewer.