Changeset 799 for xml2rfc

Timestamp:

01/04/10 07:49:35 (11 years ago)

Author:

julian.reschke@…

Message:

latest versions of rfc2629.xslt and xml2rfc.tcl, bump up document dates

Location:

xml2rfc

Files:

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

xml2rfc/rfc2629.dtd

@@ -115 +115 @@
           iprExtract  IDREF              #IMPLIED
           submissionType
-                      (IETF|independent) "IETF"
+                      (IETF|IAB|IRTF|independent) "IETF"
           docName     %ATEXT;            #IMPLIED
           xml:lang    %ATEXT;            "en">

xml2rfc/xml2rfc.tcl

@@ -12 +12 @@
 global prog prog_version prog_url prog_ack
 set prog "xml2rfc"
-set prog_version "v1.34"
+set prog_version "v1.35"
 set prog_url "http://xml.resource.org/"
 set prog_ack \
@@ -4233 +4233 @@
 
                {trust200902
-"This Internet-Draft is submitted to IETF in full
+"This Internet-Draft is submitted %TOIETF% in full
 conformance with the provisions of BCP 78 and BCP 79."}
 
                {noModificationTrust200902
-"This Internet-Draft is submitted to IETF in full
+"This Internet-Draft is submitted %TOIETF% in full
 conformance with the provisions of BCP 78 and BCP 79.
 This document may not be modified, and derivative works of it may
@@ -4244 +4244 @@
 
                {noDerivativesTrust200902
-"This Internet-Draft is submitted to IETF in full
+"This Internet-Draft is submitted %TOIETF% in full
 conformance with the provisions of BCP 78 and BCP 79.
 This document may not be modified, and derivative works of it may
@@ -4250 +4250 @@
 
                {pre5378Trust200902
-"This Internet-Draft is submitted to IETF in full
+"This Internet-Draft is submitted %TOIETF% in full
 conformance with the provisions of BCP 78 and BCP 79.
 This document may contain material from IETF Documents or IETF
@@ -4346 +4346 @@
                 if {![catch { set attrs(submissionType) }]} {
                     switch -- $attrs(submissionType) {
-                        IETF - independent {}
+                        IETF - IRTF - IAB - independent {}
                         default {
                             unexpected error \
@@ -5336 +5336 @@
 
 "The limited permissions granted above are perpetual and will not be
-revoked by the Internet Society or its successors or assignees."
+revoked by the Internet Society or its successors or assigns."
 
 "This document and the information contained herein is provided on an
@@ -5491 +5491 @@
 the IETF Administrative Support Activity (IASA)."
 
+
+# get the publication date in seconds; returns 0 when not available
+
+proc get_publication_date_seconds {date} {
+    global elem
+
+    array set dv $elem($date)
+
+    set three [clock format [clock seconds] -format "%B %Y %d"]
+
+    if {[catch { set dv(year) }]} {
+        set dv(year) [lindex $three 1]
+    }
+    if {[catch { set dv(month) }]} {
+        if {(![string compare $dv(year) [lindex $three 1]])} {
+            set dv(month) [lindex $three 0]
+            set dv(day) [string trimleft [lindex $three 2] 0]
+        } else {
+            unexpected error "I can't synthesize a date in $dv(year)"
+        }
+    } elseif {[catch { set dv(day) }]} {
+        if {(![string compare $dv(month) [lindex $three 0]]) \
+                && (![string compare $dv(year) [lindex $three 1]])} {
+            set dv(day) [string trimleft [lindex $three 2] 0]
+        }
+    }
+    set elem($date) [array get dv]
+    
+    if {[catch { set day $dv(day) }]} {
+        set day 1
+    }
+    if {[catch {set secs [clock scan "$dv(month) $day, $dv(year)" -gmt true]}]} {
+        set secs 0
+    }
+    
+    return $secs
+}
+
+
 #       }}}2 Other IPR texts
 #       {{{2 Pass 2 (and subsequent) stuff for the whole document
@@ -5499 +5538 @@
     global copyshort copyshort1 copyshort2 copyshort3 copyshortTrust200811 \
            copyshortTrust200909 copyshortTrust200902 \
-           copyshortTrust200902esc copyshortTrust200909esc
+           codeComponents200909 pre5378escapeClause
     global funding funding1 funding2
     global backP
@@ -5527 +5566 @@
     }
 
-    set newP 8
+    set newP 9
+    if {![info exists fv(.PARSEDDATE)]} {
+        set date [find_element date $fv(.CHILDREN)]
+        set secs [get_publication_date_seconds $date]
+        set fv(.PARSEDDATE) $secs
+        set elem($front) [array get fv]
+    }
     if {[catch { clock format $fv(.PARSEDDATE) -format "%Y%m%d" -gmt true } \
                ymd]} {
@@ -5534 +5579 @@
         set ymd ""
     }
-
+    
     if {[string compare $attrs(number) ""]} {
         if {$attrs(number) <= 2499} {
@@ -5557 +5602 @@
             # for the RFCs listed above
             set newP 7
+        } elseif {$ymd < "20100101"} {
+            set newP 8
         }
     } elseif {[string compare $attrs(ipr) ""]} {
@@ -5567 +5614 @@
             # TLP 2009 09 copyright notice beginning with Nov 2009
             set newP 7
+        } elseif {$ymd < "20100401"} {
+            # TLP 2010 01 copyright notice beginning with Apr 2010
+            set newP 8
         }
         # note: no support for 2008 11 TLP text in IDs
     }
 
-    if {$newP == 8} {
+    if {$newP == 9} {
+        set copyshort $copyshortTrust200909
+
+        if {![catch { set attrs(submissionType) }]} {
+          switch -- $attrs(submissionType) {
+            IETF {
+              regsub -all -- %CODECOMPONENTS% $copyshort $codeComponents200909 copyshort
+              # in the code components statement, say "Simplied BSD License"
+              regsub -all -- %SIMPLIFIED% $copyshort "Simplified " copyshort
+            }
+            default {
+              regsub -all -- %CODECOMPONENTS% $copyshort "" copyshort
+            }
+          }
+        }
+          
         # RFCs: include escape clause in Copyright Notice
         # 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 >= "20091101")} {
-            set copyshort $copyshortTrust200909esc
-        } else {
-            set copyshort $copyshortTrust200909
+            lappend copyshort $pre5378escapeClause
+        }
+        set funding ""
+        set copyrightP -1
+        set iprP 0
+    } elseif {$newP == 8} {
+        set copyshort $copyshortTrust200909
+        # pre-201004: append code component clause unconditionally
+        regsub -all -- %CODECOMPONENTS% $copyshort $codeComponents200909 copyshort
+        # in the code components statement, say "BSD License"
+        regsub -all -- %SIMPLIFIED% $copyshort "" copyshort
+          
+        # RFCs: include escape clause in Copyright Notice
+        # 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 >= "20091101")} {
+            lappend copyshort $pre5378escapeClause
         }
         set funding ""
@@ -5584 +5663 @@
         set iprP 0
     } elseif {$newP == 7} {
+        set copyshort $copyshortTrust200902
         # RFCs: include escape clause in Copyright Notice
         # IDs: include in Status Of This Memo (produced elsewhere)
         if {![string compare $attrs(ipr) "pre5378Trust200902"] && \
             [string compare $attrs(number) ""]} {
-            set copyshort $copyshortTrust200902esc
-        } else {
-            set copyshort $copyshortTrust200902
+            lappend copyshort $pre5378escapeClause
         }
         set funding ""
@@ -5860 +5938 @@
                         set copylong $copylong3
                     }
+                    default {
+                        unexpected error \
+                            "submissionType=\"$attrs(submissionType)\" unexpected for this boilerplate"
+                    }
                 }
                 set validity $validity1
@@ -5869 +5951 @@
                     independent {
                         set copylong $copylong5
+                    }
+                    default {
+                        unexpected error \
+                            "submissionType=\"$attrs(submissionType)\" unexpected for this boilerplate"
                     }
                 }
@@ -6002 +6088 @@
 #       {{{2 Front texts (either for the rfc or a reference)
 
-global copyshort copyshort1 copyshort2 idinfo idaburl idshurl
+global copyshort copyshort1 copyshort2 idinfo idinfo2 idaburl idshurl
 
 set idaburl "http://www.ietf.org/ietf/1id-abstracts.txt"
@@ -6044 +6130 @@
 rights and restrictions with respect to this document."}
 
-set copyshortTrust200902esc \
-{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
-document authors.  All rights reserved."
-
-"This document is subject to BCP 78 and the IETF Trust's Legal
-Provisions Relating to IETF Documents in effect on the date of
-publication of this document (http://trustee.ietf.org/license-info).
-Please review these documents carefully, as they describe your
-rights and restrictions with respect to this document."
-
+set pre5378escapeClause \
 "This document may contain material from IETF Documents or IETF
 Contributions published or made publicly available before November
@@ -6064 +6141 @@
 not be created outside the IETF Standards Process, except to format
 it for publication as an RFC or to translate it into languages other
-than English."}
+than English."
 
 set copyshortTrust200909 \
@@ -6075 +6152 @@
 publication of this document.  Please review these documents
 carefully, as they describe your rights and restrictions with respect
-to this document. Code Components extracted from this document must
+to this document.%CODECOMPONENTS%"}
+
+set codeComponents200909 \
+" Code Components extracted from this document must
 include Simplified BSD License text as described in Section 4.e of
 the Trust Legal Provisions and are provided without warranty as
-described in the BSD License."}
-
-set copyshortTrust200909esc \
-{"Copyright (c) %YEAR% IETF Trust and the persons identified as the
-document authors.  All rights reserved."
-
-"This document is subject to BCP 78 and the IETF Trust's Legal
-Provisions Relating to IETF Documents
-(http://trustee.ietf.org/license-info) in effect on the date of
-publication of this document.  Please review these documents
-carefully, as they describe your rights and restrictions with respect
-to this document. Code Components extracted from this document must
-include Simplified BSD License text as described in Section 4.e of
-the Trust Legal Provisions and are provided without warranty as
-described in the BSD License."
-
-"This document may contain material from IETF Documents or IETF
-Contributions published or made publicly available before November
-10, 2008.  The person(s) controlling the copyright in some of this
-material may not have granted the IETF Trust the right to allow
-modifications of such material outside the IETF Standards Process.
-Without obtaining an adequate license from the person(s) controlling
-the copyright in such materials, this document may not be modified
-outside the IETF Standards Process, and derivative works of it may
-not be created outside the IETF Standards Process, except to format
-it for publication as an RFC or to translate it into languages other
-than English."}
+described in the %SIMPLIFIED%BSD License."
 
 # From the ietf/1id-guidelines.txt file, Section 5.
@@ -6129 +6183 @@
 }
 
+# Shorter idinfo approved as an alternative by the IESG on 2010-1-5 and
+# announced on 2010-2-8:
+# http://www.ietf.org/mail-archive/web/ietf-announce/current/msg07008.html
+set idinfo2 {
+"%IPR%"
+
+"Internet-Drafts are working documents of the Internet Engineering
+Task Force (IETF).  Note that other groups may also distribute
+working documents as Internet-Drafts.  The list of current
+Internet-Drafts is at http://datatracker.ietf.org/drafts/current/."
+
+"Internet-Drafts are draft documents valid for a maximum of six months
+and may be updated, replaced, or obsoleted by other documents at any time.
+It is inappropriate to use Internet-Drafts as reference material or to cite
+them other than as &ldquo;work in progress.&rdquo;"
+
+"This Internet-Draft will expire on %EXPIRES%."
+}
+
 #       }}}2 Front texts (either for the rfc or a reference)
 #       {{{2 Remaining pass 2 (and subsequent) stuff
@@ -6137 +6210 @@
     global options
     global mode ofile
-    global categories copyshort idinfo idaburl idshurl iprstatus
+    global categories copyshort idinfo idinfo2 idaburl idshurl iprstatus
     global page_width center_fill_width
     global depth
@@ -6156 +6229 @@
     set date [find_element date $attrs(.CHILDREN)]
     array set dv $elem($date)
-    set three [clock format [clock seconds] -format "%B %Y %d"]
-    if {[catch { set dv(year) }]} {
-        set dv(year) [lindex $three 1]
-    }
-    if {[catch { set dv(month) }]} {
-        if {(![string compare $dv(year) [lindex $three 1]])} {
-            set dv(month) [lindex $three 0]
-            set dv(day) [string trimleft [lindex $three 2] 0]
-        } else {
-            unexpected error "I can't synthesize a date in $dv(year)"
-        }
-    } elseif {[catch { set dv(day) }]} {
-        if {(![string compare $dv(month) [lindex $three 0]]) \
-                && (![string compare $dv(year) [lindex $three 1]])} {
-            set dv(day) [string trimleft [lindex $three 2] 0]
-        }
-    }
-    set elem($date) [array get dv]
 
     array set rv $elem(1)
@@ -6199 +6254 @@
             set day 1
         }
-        if {[catch {set secs [clock scan "$dv(month) $day, $dv(year)" -gmt true]}]} {
-            set secs 0
-        }
-        set attrs(.PARSEDDATE) $secs
-        set elem($elemX) [array get attrs]
+        set secs $attrs(.PARSEDDATE)
 
         if {[info exists rv(category)]} {
@@ -6287 +6338 @@
             lappend left "Expires:$colonspace $expires"
             set category "Expires $expires"
-            set status $idinfo
             set ipreal $rv(ipr)
             set ymd [clock format $attrs(.PARSEDDATE) -format "%Y%m%d" \
@@ -6295 +6345 @@
                 set ipreal trust200902
             }
+            # Use the shorter alternative for the ID info for new IDs
+            # starting April 1, 2010.
+            if {$ymd >= 20100401} {
+                    set status $idinfo2
+            } else {
+                    set status $idinfo
+            }
             regsub -all -- "&" [lindex [lindex $iprstatus \
                                               [lsearch0 $iprstatus \
                                                         $ipreal]] 1] \
                         "\\\\\\&" ipr
+            
+            if {($ymd < "20100401")} {
+              # insert "to IETF" for documents before Feb 01 2010
+              regsub -all -- %TOIETF% $ipr "to IETF" ipr
+            } else {
+              regsub -all -- %TOIETF% $ipr "" ipr
+            }
+
             regsub -all -- %IPR% $status $ipr status
             if {![string compare $mode html]} {
@@ -10146 +10211 @@
     global eatP
 
-    if {$eatP < 0} {
+    if {($eatP < 0) && ![regexp -- {^[.,?!]} $text]} {
         set text " $text"
     }
+
     if {![string compare $buffer ""]} {
         set buffer [format %*s $indent ""]
         set buffer_align [current_align]
     }
+# print_stack_trace
     append buffer $text
 
@@ -10170 +10237 @@
         }
     }
+}
+
+# grab the current function name. Useful in debugging like this:
+# puts stderr "[get_current_function_name] your message goes here"
+proc get_current_function_name {} {
+    return [info level -1];
+}
+
+# print the current stack trace
+proc print_stack_trace {} {
+    set stack ""
+    set level -1
+    for { set x [expr {[info level] + $level}] } { $x > 0 } { incr x -1 } {
+        append stack "    called from [info level $x]\n"
+    }
+    puts stderr $stack
 }
 
@@ -10648 +10731 @@
     pcdata_html [lindex $title 0]
     write_html "</title>"
-    if {$options(.PRIVATE)} {
-        write_html -nonewline "<meta http-equiv=\"Expires\" content=\""
-        write_html -nonewline [clock format [clock seconds] \
-                                     -format "%a, %d %b %Y %T +0000" \
-                                     -gmt true]
-        write_html "\">"
-    }
 
     # Begin new meta tags.
@@ -12988 +13064 @@
     global eatP
 
-    if {$eatP < 0} {
+    if {($eatP < 0) && ![regexp -- {^[.,?!]} $text]} {
         set text " $text"
     }
@@ -17679 +17755 @@
         check_vrsn_idle
     } result]} {
-        if {[catch {package require Tk}]} {
+        if {![catch {package require Tk}]} {
             catch { wm geometry . 10x10+-100+-100 }
             catch { wm withdraw . }