Changeset 713 for xml2rfc

Timestamp:

11/10/09 16:49:29 (12 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:

• rfc2629.dtd (modified) (1 diff)
• xml2rfc.tcl (modified) (9 diffs)

xml2rfc/rfc2629.dtd

@@ -1 +1 @@
 <!--
-  revised DTD for the RFC document series, draft of 2000-02-23
+  revised DTD for the RFC document series, draft of 2009-10-06
   -->
 

xml2rfc/xml2rfc.tcl

@@ -12 +12 @@
 global prog prog_version prog_url prog_ack
 set prog "xml2rfc"
-set prog_version "v1.34pre4"
+set prog_version "v1.34pre5"
 set prog_url "http://xml.resource.org/"
 set prog_ack \
@@ -5564 +5564 @@
         } elseif {[string first "trust" [string tolower $attrs(ipr)]] < 0} {
             set newP 1
-        } elseif {$ymd < "20091201"} {
-            # TLP 2009 09 copyright notice beginning with Dec 2009
+        } elseif {$ymd < "20091101"} {
+            # TLP 2009 09 copyright notice beginning with Nov 2009
             set newP 7
         }
@@ -5573 +5573 @@
     if {$newP == 8} {
         # RFCs: include escape clause in Copyright Notice
-        # IDs: include in Status Of This Memo (produced elsewhere), for date before Dec 2009
+        # IDs: include in Status Of This Memo (produced elsewhere), for date before Nov 2009
         if {![string compare $attrs(ipr) "pre5378Trust200902"] && \
-            ([string compare $attrs(number) ""] || $ymd >= "20091201")} {
+            ([string compare $attrs(number) ""] || $ymd >= "20091101")} {
             set copyshort $copyshortTrust200909esc
         } else {
@@ -5746 +5746 @@
 
         set organization [find_element organization $av(.CHILDREN)]
-        array set ov [list abbrev ""]
-        if {[string compare $organization ""]} {
-            array set ov $elem($organization)
+        if {[llength $organization] == 1} {
+          array set ov [list abbrev ""]
+          if {[string compare $organization ""]} {
+              array set ov $elem($organization)
+          }
         }
 
@@ -5758 +5760 @@
             lappend block1 $av(fullname)
         }
-        if {[string compare $ov(.CTEXT) ""]} {
+        if {[llength $organization] == 1 && [string compare $ov(.CTEXT) ""]} {
             lappend block1 $ov(.CTEXT)
         }
@@ -6289 +6291 @@
             set ymd [clock format $attrs(.PARSEDDATE) -format "%Y%m%d" \
                            -gmt true]
-            if {($ymd >= "20091201") \
+            if {($ymd >= "20091101") \
                     && ![string compare $ipreal pre5378Trust200902]} {
                 set ipreal trust200902
@@ -6338 +6340 @@
         set organization [find_element organization $av(.CHILDREN)]
         array set ov [list abbrev ""]
-        if {[string compare $organization ""]} {
-            array set ov $elem($organization)
-        }
-        if {![string compare $ov(abbrev) ""]} {
-            set ov(abbrev) $ov(.CTEXT)
+        if {[llength $organization] == 1} {
+          if {[string compare $organization ""]} {
+              array set ov $elem($organization)
+          }
+          if {![string compare $ov(abbrev) ""]} {
+              set ov(abbrev) $ov(.CTEXT)
+          }
         }
 
@@ -6428 +6432 @@
       set cutoff 20090701
     } else {
-      set cutoff 20091201
+      set cutoff 20091101
     }
 
@@ -17229 +17233 @@
                               section           "*"] \
           title         {}                           \
-          author        [list organization      ""   \
+          author        [list organization      "?"   \
                               address           "*"] \
           organization  {}                           \