Changeset 448 for xml2rfc

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:

• rfc2629.dtd (modified) (2 diffs)
• xml2rfc.tcl (modified) (8 diffs)

xml2rfc/rfc2629.dtd

@@ -1 +1 @@
 <!--
-  revised DTD for the RFC document series, draft of 2008-03-06
-  -->
-
-<!-- hacked by jre 2009-02-20, adding experimental support for @ipr=pre5378Trust200902 -->
+  revised DTD for the RFC document series, draft of 2000-02-23
+  -->
+
 
 <!--
@@ -111 +110 @@
                       |full3978|noModification3978|noDerivatives3978
                       |trust200811|noModificationTrust200811|noDerivativesTrust200811
+                      |trust200902|noModificationTrust200902|noDerivativesTrust200902
                       |pre5378Trust200902)
                                          #IMPLIED

xml2rfc/xml2rfc.tcl

@@ -12 +12 @@
 global prog prog_version prog_url prog_ack
 set prog "xml2rfc"
-set prog_version "v1.34pre2-jr"
-# hacked by jre 2009-02-20, adding experimental support for @ipr=pre5378Trust200902
+set prog_version "v1.34pre2"
 set prog_url "http://xml.resource.org/"
 set prog_ack \
@@ -4128 +4127 @@
 #         Section 6.a Submission Compliance
 #         Section 6.c Derivative Works and Publication Limitations
+#     February, 2009 update to Trust's Legal Provisions
+#         trust200902 and noDerivativesTrust200902 have the same text
+#         as the respective 200811 values.  noModificationTrust200902
+#         is slightly modified from the 200811 wording, and
+#         pre5378Trust200902 is new in this revision.
 set iprstatus \
              { {full2026
@@ -4228 +4232 @@
 not be created, and it may not be published except as an Internet-Draft."}
 
+               {trust200902
+"This Internet-Draft is submitted to IETF in full
+conformance with the provisions of BCP 78 and BCP 79."}
+
+               {noModificationTrust200902
+"This Internet-Draft is submitted to IETF in full
+conformance with the provisions of BCP 78 and BCP 79.
+This document may not be modified, and derivative works of it may
+not be created, except to format it for publication as an RFC or
+to translate it into languages other than English."}
+
+               {noDerivativesTrust200902
+"This Internet-Draft is submitted to IETF in full
+conformance with the provisions of BCP 78 and BCP 79.
+This document may not be modified, and derivative works of it may
+not be created, and it may not be published except as an Internet-Draft."}
+
                {pre5378Trust200902
-"This Internet-Draft is submitted to IETF pursuant to, and in full
-conformance with, the provisions of BCP 78 and BCP 79."}
+"This Internet-Draft is submitted to IETF in full
+conformance with the provisions of BCP 78 and BCP 79.
+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."}
+
  }
 
@@ -4302 +4335 @@
                    }
                     if {   [regexp -- {[0-9]$} $attrs(ipr)]
-                        && ![regexp -- {trust200811$} [string tolower $attrs(ipr)]]} {
+                        && ![regexp -- {trust200902$} [string tolower $attrs(ipr)]]} {
                         unexpected warning \
-                            "ipr=\"$attrs(ipr)\" attribute value is outdated compared to Trust Legal Provisions"
+                            "ipr=\"$attrs(ipr)\" attribute value is outdated compared to Trust Legal Provisions of 2/2009"
                     }
                     #if {[string compare $attrs(ipr) $ipr]} {
@@ -5464 +5497 @@
     global counter elem passno xref
     global options copyrightP iprP
-    global copyshort copyshort1 copyshort2 copyshort3 copyshort4 copyshort4prerfc5378escape
+    global copyshort copyshort1 copyshort2 copyshort3 copyshort4 copyshort5
     global funding funding1 funding2
     global backP
@@ -5493 +5526 @@
 
     # XXX why is newP set two different places
-    set newP 6
+    set newP 7
     if {[string compare $attrs(number) ""]} {
         if {$attrs(number) <= 2499} {
@@ -5525 +5558 @@
         }
     }
-    if {$newP == 6} {
+    if {$newP == 7} {
+        set copyshort $copyshort5
+        set funding ""
+        set copyrightP -1
+        set iprP 0
+    } elseif {$newP == 6} {
         set copyshort $copyshort4
         set funding ""
         set copyrightP -1
         set iprP 0
-        
-        # escape clause
-        if {[string first "pre5378" $attrs(ipr)] >= 0} {
-          set copyshort $copyshort4prerfc5378escape
-        }
     } elseif {$newP == 5} {
         set copyshort ""
@@ -5964 +5997 @@
 to this document."}
 
-# RFC 5378 escape clause, same as copyshort4 plus escape clause
-set copyshort4prerfc5378escape \
+# Trust, try 2.
+set copyshort5 \
 {"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."
-
-"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."}
+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."}
 
 # From the ietf/1id-guidelines.txt file, Section 5.