Changeset 448 for rfc2629xslt/rfc2629.rnc

Timestamp:

24/02/09 21:31:57 (12 years ago)

Author:

julian.reschke@…

Message:

Update to xml2rfc 1.34pre3 and latest version of rfc2629.xslt

File:

• rfc2629xslt/rfc2629.rnc (modified) (11 diffs)

rfc2629xslt/rfc2629.rnc

@@ -1 @@
-# revised DTD for the RFC document series, draft of 2008-02-01
+# revised DTD for the RFC document series, draft of 2008-03-06
+
+# Typical invocation:
+#     <!DOCTYPE rfc PUBLIC "-//IETF//DTD RFC 2629//EN"
+#                          "http://xml.resource.org/authoring/rfc2629.dtd" [
+#       ... dtd subset ...
+#     ]>
+#   or
+#     <!DOCTYPE rfc SYSTEM "rfc2629.dtd" [
+#       ... dtd subset ...
+#     ]>
 
 # Contents
 # 
+#   Character entities
+# 
 #   DTD data types
 # 
@@ -12 +24 @@
 # 
 #   Back matter
+
+# Character entities
 
 # DTD data types:
@@ -52 +66 @@
   [ a:defaultValue = "" ] attribute obsoletes { NUMBERS }?,
   [ a:defaultValue = "" ] attribute updates { NUMBERS }?,
-  [ a:defaultValue = "info" ] attribute category { "std" | "bcp" | "info" | "exp" | "historic" }?,
+  attribute category { "std" | "bcp" | "info" | "exp" | "historic" }?,
   attribute seriesNo { NUMBER }?,
   attribute ipr {
@@ -67 +81 @@
     | "noModificationTrust200811"
     | "noDerivativesTrust200811"
+    | "trust200902"
+    | "noModificationTrust200902"
+    | "noDerivativesTrust200902"
+    | "pre5378Trust200902"
   }?,
   attribute iprExtract { xsd:IDREF }?,
+  [ a:defaultValue = "IETF" ]
   attribute submissionType { "IETF" | "independent" }?,
   attribute docName { ATEXT }?,
@@ -145 +164 @@
 attlist.note &= attribute title { ATEXT }
 # The body
-
 middle = element middle { attlist.middle, section+ }
 attlist.middle &= empty
 section =
   element section {
-    attlist.section, ((t | figure | texttable | iref)* , section*)
+    attlist.section, (t | figure | texttable | iref)*, section*
   }
 attlist.section &=
   attribute anchor { xsd:ID }?,
   attribute title { ATEXT },
-  [ a:defaultValue = "default" ] attribute toc { "include" | "exclude" | "default" }?
+  [ a:defaultValue = "default" ]
+  attribute toc { "include" | "exclude" | "default" }?
 # use of <appendix/> is deprecated...
 # <!ELEMENT appendix    ((t|figure|texttable|iref)*,appendix*)>
@@ -178 +197 @@
      | vspace)*
   }
-attlist.t &= attribute anchor { xsd:ID }?, attribute hangText { ATEXT }?
+attlist.t &=
+  attribute anchor { xsd:ID }?,
+  attribute hangText { ATEXT }?
 # the value of the style attribute is inherited from the closest 
 # parent
@@ -190 +211 @@
   attribute target { xsd:IDREF },
   [ a:defaultValue = "false" ] attribute pageno { "true" | "false" }?,
-  [ a:defaultValue = "default" ] attribute format { "counter" | "title" | "none" | "default" }?
+  [ a:defaultValue = "default" ]
+  attribute format { "counter" | "title" | "none" | "default" }?
 eref = element eref { attlist.eref, CTEXT }
 attlist.eref &= attribute target { URI }
@@ -204 +226 @@
 spanx = element spanx { attlist.spanx, CTEXT }
 attlist.spanx &=
-  [ a:defaultValue = "preserve" ] attribute xml:space { "default" | "preserve" }?,
+  [ a:defaultValue = "preserve" ]
+  attribute xml:space { "default" | "preserve" }?,
   [ a:defaultValue = "emph" ] attribute style { ATEXT }?
 vspace = element vspace { attlist.vspace, empty }
@@ -210 +233 @@
   [ a:defaultValue = "0" ] attribute blankLines { NUMBER }?
 figure =
-  element figure { attlist.figure, iref*, preamble?, artwork, postamble? }
+  element figure {
+    attlist.figure, iref*, preamble?, artwork, postamble?
+  }
 attlist.figure &=
   attribute anchor { xsd:ID }?,
   [ a:defaultValue = "" ] attribute title { ATEXT }?,
-  [ a:defaultValue = "false" ] attribute suppress-title { "true" | "false" }?,
-  [ a:defaultValue = "" ] attribute src { ATEXT }?,
-  [ a:defaultValue = "left" ] attribute align { "left" | "center" | "right" }?,
+  [ a:defaultValue = "false" ]
+  attribute suppress-title { "true" | "false" }?,
+  attribute src { URI }?,
+  [ a:defaultValue = "left" ]
+  attribute align { "left" | "center" | "right" }?,
   [ a:defaultValue = "" ] attribute alt { ATEXT }?,
-  [ a:defaultValue = "" ] attribute width { NUMBER }?,
-  [ a:defaultValue = "" ] attribute height { NUMBER }?
+  [ a:defaultValue = "" ] attribute width { ATEXT }?,
+  [ a:defaultValue = "" ] attribute height { ATEXT }?
 preamble =
   element preamble {
@@ -227 +254 @@
 artwork = element artwork { attlist.artwork, TEXT* }
 attlist.artwork &=
-  [ a:defaultValue = "preserve" ] attribute xml:space { "default" | "preserve" }?,
+  [ a:defaultValue = "preserve" ]
+  attribute xml:space { "default" | "preserve" }?,
   [ a:defaultValue = "" ] attribute name { ATEXT }?,
   [ a:defaultValue = "" ] attribute type { ATEXT }?,
   attribute src { URI }?,
-  [ a:defaultValue = "left" ] attribute align { "left" | "center" | "right" }?,
+  [ a:defaultValue = "left" ]
+  attribute align { "left" | "center" | "right" }?,
   [ a:defaultValue = "" ] attribute alt { ATEXT }?,
   [ a:defaultValue = "" ] attribute width { ATEXT }?,
@@ -247 +276 @@
   attribute anchor { xsd:ID }?,
   [ a:defaultValue = "" ] attribute title { ATEXT }?,
-  [ a:defaultValue = "false" ] attribute suppress-title { "true" | "false" }?,
-  [ a:defaultValue = "center" ] attribute align { "left" | "center" | "right" }?,
-  [ a:defaultValue = "full" ] attribute style { "all" | "none" | "headers" | "full" }?
+  [ a:defaultValue = "false" ]
+  attribute suppress-title { "true" | "false" }?,
+  [ a:defaultValue = "center" ]
+  attribute align { "left" | "center" | "right" }?,
+  [ a:defaultValue = "full" ]
+  attribute style { "all" | "none" | "headers" | "full" }?
 ttcol = element ttcol { attlist.ttcol, CTEXT }
 attlist.ttcol &=
   attribute width { ATEXT }?,
-  [ a:defaultValue = "left" ] attribute align { "left" | "center" | "right" }?
+  [ a:defaultValue = "left" ]
+  attribute align { "left" | "center" | "right" }?
 c = element c { attlist.c, (TEXT | xref | eref | iref | cref | spanx)* }
 attlist.c &= empty