--- rfc2629.dtd	2007-11-26 04:51:47.000000000 +0000
+++ tmp/rfc2629.dtd	2008-07-26 20:32:59.000000000 +0100
@@ -1,5 +1,5 @@
 <!--
-  revised DTD for the RFC document series, draft of 2005-10-05
+  revised DTD for the RFC document series, draft of 2008-02-01
   -->
 
 
@@ -183,7 +182,7 @@
 <!-- later on, may be (section+,appendix*,section*) -->
 <!ELEMENT middle      (section+)>
 
-<!ELEMENT section     (t|figure|texttable|iref|section)*>
+<!ELEMENT section     ((t|figure|texttable|iref)*,section*)>
 <!ATTLIST section
           anchor      ID                 #IMPLIED
           title       %ATEXT;            #REQUIRED
@@ -191,7 +190,7 @@
                                          "default">
 
 <!--
-<!ELEMENT appendix    (t|figure|texttable|iref|appendix)*>
+<!ELEMENT appendix    ((t|figure|texttable|iref)*,appendix*)>
 <!ATTLIST appendix
           anchor      ID                 #IMPLIED
           title       %ATEXT;            #REQUIRED
@@ -237,16 +236,18 @@
 
 <!ELEMENT spanx       (%CTEXT;)>
 <!ATTLIST spanx
+          xml:space   (default|preserve) "preserve"
           style       %ATEXT;            "emph">
 
 <!ELEMENT vspace      EMPTY>
 <!ATTLIST vspace
           blankLines  %NUMBER;           "0">
 
-<!ELEMENT figure      (preamble?,artwork,postamble?)>
+<!ELEMENT figure      (iref*,preamble?,artwork,postamble?)>
 <!ATTLIST figure
           anchor      ID                 #IMPLIED
           title       %ATEXT;            ""
+          suppress-title (true|false)    "false"
           src         %URI;              #IMPLIED
           align       (left|center|right) "left"
           alt         %ATEXT;            ""
@@ -254,30 +255,29 @@
           height      %ATEXT;            "">
 
 <!ELEMENT preamble    (%TEXT;|xref|eref|iref|cref|spanx)*>
-<!-- wcf s/(left|center|right)/%ATEXT;/ for align 20060109 -->
 <!ELEMENT artwork     (%TEXT;)*>
 <!ATTLIST artwork
           xml:space   (default|preserve) "preserve"
           name        %ATEXT;            ""
           type        %ATEXT;            ""
           src         %URI;              #IMPLIED
-          align       %ATEXT;            "left"
+          align       (left|center|right) "left"
           alt         %ATEXT;            ""
           width       %ATEXT;            ""
           height      %ATEXT;            "">
 
 <!ELEMENT postamble   (%TEXT;|xref|eref|iref|cref|spanx)*>
     
-<!-- wcf added style and align 20060109 -->
 <!ELEMENT texttable   (preamble?,ttcol+,c*,postamble?)>
 <!ATTLIST texttable
           anchor      ID                 #IMPLIED
           title       %ATEXT;            ""
-          style       %ATEXT;            ""
-          align       %ATEXT;            "center">
+          suppress-title (true|false)    "false"
+          align       (left|center|right) "center"
+          style       (all|none|headers|full) "full">
 <!ELEMENT ttcol       (%CTEXT;)>
 <!ATTLIST ttcol
-          width       %ATEXT;           #IMPLIED
+          width       %ATEXT;            #IMPLIED
           align       (left|center|right) "left">
 <!ELEMENT c           (%TEXT;|xref|eref|iref|cref|spanx)*>
 
