Changeset 713 for xml2rfc


Ignore:
Timestamp:
Oct 11, 2009, 9:49:29 AM (10 years ago)
Author:
julian.reschke@…
Message:

upgrade to latest version of rfc2629.xslt/xml2rfc.tcl; remove now superfluous empty <organization/> elements in references

Location:
xml2rfc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • xml2rfc/rfc2629.dtd

    r448 r713  
    11<!--
    2   revised DTD for the RFC document series, draft of 2000-02-23
     2  revised DTD for the RFC document series, draft of 2009-10-06
    33  -->
    44
  • xml2rfc/xml2rfc.tcl

    r704 r713  
    1212global prog prog_version prog_url prog_ack
    1313set prog "xml2rfc"
    14 set prog_version "v1.34pre4"
     14set prog_version "v1.34pre5"
    1515set prog_url "http://xml.resource.org/"
    1616set prog_ack \
     
    55645564        } elseif {[string first "trust" [string tolower $attrs(ipr)]] < 0} {
    55655565            set newP 1
    5566         } elseif {$ymd < "20091201"} {
    5567             # TLP 2009 09 copyright notice beginning with Dec 2009
     5566        } elseif {$ymd < "20091101"} {
     5567            # TLP 2009 09 copyright notice beginning with Nov 2009
    55685568            set newP 7
    55695569        }
     
    55735573    if {$newP == 8} {
    55745574        # RFCs: include escape clause in Copyright Notice
    5575         # IDs: include in Status Of This Memo (produced elsewhere), for date before Dec 2009
     5575        # IDs: include in Status Of This Memo (produced elsewhere), for date before Nov 2009
    55765576        if {![string compare $attrs(ipr) "pre5378Trust200902"] && \
    5577             ([string compare $attrs(number) ""] || $ymd >= "20091201")} {
     5577            ([string compare $attrs(number) ""] || $ymd >= "20091101")} {
    55785578            set copyshort $copyshortTrust200909esc
    55795579        } else {
     
    57465746
    57475747        set organization [find_element organization $av(.CHILDREN)]
    5748         array set ov [list abbrev ""]
    5749         if {[string compare $organization ""]} {
    5750             array set ov $elem($organization)
     5748        if {[llength $organization] == 1} {
     5749          array set ov [list abbrev ""]
     5750          if {[string compare $organization ""]} {
     5751              array set ov $elem($organization)
     5752          }
    57515753        }
    57525754
     
    57585760            lappend block1 $av(fullname)
    57595761        }
    5760         if {[string compare $ov(.CTEXT) ""]} {
     5762        if {[llength $organization] == 1 && [string compare $ov(.CTEXT) ""]} {
    57615763            lappend block1 $ov(.CTEXT)
    57625764        }
     
    62896291            set ymd [clock format $attrs(.PARSEDDATE) -format "%Y%m%d" \
    62906292                           -gmt true]
    6291             if {($ymd >= "20091201") \
     6293            if {($ymd >= "20091101") \
    62926294                    && ![string compare $ipreal pre5378Trust200902]} {
    62936295                set ipreal trust200902
     
    63386340        set organization [find_element organization $av(.CHILDREN)]
    63396341        array set ov [list abbrev ""]
    6340         if {[string compare $organization ""]} {
    6341             array set ov $elem($organization)
    6342         }
    6343         if {![string compare $ov(abbrev) ""]} {
    6344             set ov(abbrev) $ov(.CTEXT)
     6342        if {[llength $organization] == 1} {
     6343          if {[string compare $organization ""]} {
     6344              array set ov $elem($organization)
     6345          }
     6346          if {![string compare $ov(abbrev) ""]} {
     6347              set ov(abbrev) $ov(.CTEXT)
     6348          }
    63456349        }
    63466350
     
    64286432      set cutoff 20090701
    64296433    } else {
    6430       set cutoff 20091201
     6434      set cutoff 20091101
    64316435    }
    64326436
     
    1722917233                              section           "*"] \
    1723017234          title         {}                           \
    17231           author        [list organization      ""   \
     17235          author        [list organization      "?"   \
    1723217236                              address           "*"] \
    1723317237          organization  {}                           \
Note: See TracChangeset for help on using the changeset viewer.