--- test/html.dtd	1994/04/04 23:58:38	1.7.2.3
+++ test/html.dtd	1994/04/07 00:33:25	1.7.2.4
@@ -3,30 +3,22 @@
         Document Type Definition for the HyperText Markup Language
         as used by the World Wide Web application (HTML DTD).
 
-        $Id: html.dtd,v 1.7.2.3 1994/04/04 23:58:38 connolly Exp $
+        $Id: html.dtd,v 1.7.2.4 1994/04/07 00:33:25 connolly Exp $
 -->
 
 
 <!-- DTD definitions -->
 
-<!ENTITY % heading "H1|H2|H3|H4|H5|H6" >
-<!ENTITY % list " UL | OL | DIR | MENU ">
-<!ENTITY % literal " XMP | LISTING ">
-
-<!ENTITY % bodyelement
-         "P | HR | %heading |
-         %list | DL | ADDRESS | PRE | BLOCKQUOTE
-        | %literal">
-
 <!ENTITY % URL "CDATA"
         -- The term URL means a CDATA attribute
            whose value is a Uniform Resource Locator,
            as defined. (A URN may also be usable here when defined.)
         -->
 
+<!ENTITY % Content-Type "CDATA" -- meaning a MIME content type -->
+
 <!ENTITY % linkattributes
-        "NAME NMTOKEN #IMPLIED
-        HREF %URL;  #IMPLIED
+        "HREF %URL;  #IMPLIED
         REL CDATA #IMPLIED -- forward relationship type --
         REV CDATA #IMPLIED -- reversed relationship type
                               to referent data:
@@ -41,6 +33,7 @@
         METHODS NAMES #IMPLIED -- supported public methods of the object:
                                         TEXTSEARCH, GET, HEAD, ... --
 
+	--@# content-type --
         ">
 
 
@@ -48,9 +41,15 @@
 
 <!ELEMENT HTML O O  (HEAD, BODY)>
 
-<!ELEMENT HEAD O O  ( TITLE?  & ISINDEX?  & NEXTID?  & LINK*
+<!-- Head -->
+
+<!ELEMENT HEAD O O  ( TITLE?  & ISINDEX? & NEXTID? & LINK*
                               & BASE?)>
 
+<!ELEMENT NEXTID - O EMPTY -- @# obsolete -->
+<!ATTLIST NEXTID
+	N ID #REQUIRED -- next available id -->
+
 <!ELEMENT TITLE - -  (#PCDATA)
           -- The TITLE element is not considered part of the flow of text.
              It should be displayed, for example as the page header or
@@ -64,79 +63,144 @@
 
 <!ELEMENT LINK - O EMPTY>
 <!ATTLIST LINK
-        %linkattributes>
+        %linkattributes
+	>
         
 <!ELEMENT BASE - O EMPTY    -- Reference context for URLS -->
 <!ATTLIST BASE
-
         HREF %URL; #IMPLIED
-
-        >
-<!ENTITY % inline "EM | STRONG |
-                        CODE | SAMP | KBD | KEY | VAR | DFN | CITE "
         >
 
-<!ELEMENT (%inline;) - - (#PCDATA | A)+>
-<!ELEMENT (B | I | U | TT) - - (#PCDATA | A)+>
 
-<!ENTITY % text "#PCDATA | IMG | %inline; | BR">
+<!-- Body -->
 
-<!ENTITY % htext "A | %text"    -- Plus links, no structure -->
+<!ELEMENT BODY O O  ANY -- empty P version @# -->
 
-<!ENTITY % stext                -- as htext but also nested structure --
-                        "P | HR | %list | DL | ADDRESS
-                        | PRE | BLOCKQUOTE
-                        | %literal | %htext">
+<!-- Text -->
 
-<!ENTITY % block                -- as htext but also nested structure --
-                        "P | HR | %list | DL
-                        | PRE | BLOCKQUOTE | ADDRESS
-                        | %literal">
+<!ENTITY % inline "EM | STRONG |
+                        CODE | SAMP | KBD | KEY | VAR | DFN | CITE "
+        >
+<!ENTITY % fonts "B | I | U | TT">
 
+<!ENTITY % text "#PCDATA | IMG | %inline; | %fonts; | BR | P"
+	-- @# yuk: P in textflows --
+	 --@# BR -> &br; --
+	 --@# yuk: fonts -- >
 
-<!ELEMENT BODY O O  (%heading | %block)+>
+<!ENTITY % htext "A | %text"    -- Plus links, no structure -->
 
+<!ELEMENT (%inline;) - - (%htext)+>
+<!ELEMENT (%fonts;)  - - (%htext)+>
 
-<!ELEMENT A     - -  ANY>
+<!ELEMENT A     - -  ANY -(A)>
 <!ATTLIST A
-        %linkattributes;
+	NAME NMTOKEN #IMPLIED -- @# dangit! this should be ID! --
+	%linkattributes;
         >
 
 <!ELEMENT IMG    - O EMPTY --  Embedded image -->
 <!ATTLIST IMG
         SRC %URL;  #IMPLIED     -- URL of document to embed --
+	ALT CDATA #IMPLIED
+	ALIGN (top|middle|bottom|left|center|right) #IMPLIED --@#supported?--
         >
 
 
-<!ELEMENT P     - O (%htext)+ -- paragraph -->
-<!ELEMENT (HR|BR)    - O EMPTY -- horizontal rule -->
+<!ELEMENT P     - O EMPTY -- paragraph separator @# -->
+<!ELEMENT HR    - O EMPTY -- horizontal rule -->
+<!ELEMENT BR    - O EMPTY -- @# BR -> &br; -->
 
+<!-- Headings -->
+
+<!ENTITY % heading "H1|H2|H3|H4|H5|H6" >
 <!ELEMENT ( %heading )  - -  (%htext;)+>
 
-<!ELEMENT DL    - -  (DT+, DD+)+>
-<!--    structured DL's
-  -->
 
-<!ELEMENT DT    - O (%htext)+>
-<!ELEMENT DD    - O (%htext|%block)+>
+<!-- Pre-formatted Text -->
 
-<!ELEMENT (%list) - -  (LI)+>
+<!ENTITY % pre "PRE | XMP | LISTING" -- @# treat XMP like pre? -->
 
-<!ATTLIST (%list)
-        COMPACT NAME #IMPLIED -- COMPACT, etc.--
+<!ELEMENT PRE - - (#PCDATA | %fonts | %inline | A | BR)+>
+		<!-- @# yuk: VAR, CITE etc. in PRE -->
+		<!-- @# P in PRE ??-->
+		<!-- @# BR -> &br; -->
+<!ELEMENT (XMP|LISTING) - - RCDATA>
+<!-- @# PLAINTEXT?? -->
+<!ATTLIST (%pre;)
+        WIDTH NUMBER #implied
         >
 
+<!-- Block Elements -->
+
+<!ENTITY % list " UL | OL | DIR | MENU ">
+
+<!ENTITY % block                -- as htext but also nested structure --
+                        "HR | %list | DL
+                        | %pre; | BLOCKQUOTE | FIG | ADDRESS 
+			| FORM">
+
+<!ELEMENT DL    - -  (DT*, DD?)+>
+<!ATTLIST DL
+	STYLE (COMPACT) #IMPLIED>
+
+<!ELEMENT DT    - O (%htext)+>
+<!ELEMENT DD    - O (%htext|%block)+>
+
+<!ELEMENT (%list) - -  (LI)+>
 <!ELEMENT LI    - O (%htext|%block)+>
 
-<!ELEMENT BLOCKQUOTE - - ((%htext|P)+, ADDRESS?)+
+<!ELEMENT BLOCKQUOTE - - ((%htext)+, ADDRESS?)+ -- @# Hmm... --
         -- for quoting some other source -->
 
 <!ELEMENT ADDRESS - - (%htext;)+>
 
-<!ELEMENT PRE - - (#PCDATA | TT | B | I | U | A | P | BR)+>
-<!ATTLIST PRE
-        WIDTH NUMBER #implied
-        >
+<!ELEMENT FIG - - (%htext;)+>
+
+<!-- Forms  -->
+
+<!ENTITY % HTTP-Method "(GET | POST)">
+<!ELEMENT FORM - - ANY -(FORM) +(INPUT|SELECT|TEXTAREA)>
+<!ATTLIST FORM
+	ACTION %URL #REQUIRED
+	METHOD %HTTP-Method #IMPLIED -- @# MAILTO? --
+	ENCTYPE %Content-Type; #IMPLIED
+	>
+
+<!ENTITY % InputType "(TEXT | PASSWORD | CHECKBOX |
+			RADIO | SUBMIT | RESET |
+			IMAGE | HIDDEN )">
+<!ELEMENT INPUT - O EMPTY>
+<!ATTLIST INPUT
+	TYPE %InputType #IMPLIED -- @# defaults to TEXT?? --
+	NAME CDATA #IMPLIED -- required for all but submit and reset --
+	VALUE CDATA #IMPLIED
+	SRC %URL #IMPLIED -- for image inputs -- 
+	STATE (CHECKED) #IMPLIED
+	SIZE CDATA #IMPLIED -- @# should be NUMBERS: delimit with space, not comma --
+	MAXLENGTH NUMBER #IMPLIED
+	ALIGN (top|middle|bottom|left|center|right) #IMPLIED --@#supported?--
+	>
+
+<!ELEMENT SELECT - - (OPTION+)>
+<!ATTLIST SELECT
+	NAME CDATA #REQUIRED
+	SIZE NUMBER #IMPLIED
+	SELECTIONS (MULTIPLE) #IMPLIED
+	>
+
+<!ELEMENT OPTION - O (#PCDATA)>
+<!ATTLIST OPTION
+	STATE (SELECTED) #IMPLIED
+	VALUE CDATA #IMPLIED
+	>
+
+<!ELEMENT TEXTAREA - - (#PCDATA)>
+<!ATTLIST TEXTAREA
+	NAME CDATA #REQUIRED
+	ROWS NUMBER #REQUIRED -- @#implied? --
+	COLS NUMBER #REQUIRED
+	>
 
 <!-- Mnemonic character entities. -->
 
@@ -147,13 +211,7 @@
 <!ENTITY amp "&#38;"     -- ampersand -->
 <!ENTITY gt "&#62;"      -- greater than -->
 <!ENTITY lt "&#60;"      -- less than -->
-<!ENTITY nbsp "&#32;"    --  @@should be NON_BREAKING space -->
-<!-- @@ should add entites for processing instructions
+<!ENTITY nbsp "<? nonbreaking-space>">
+<!-- @# should add entites for processing instructions
 	for line break, centering, etc. -->
 
-<!-- deprecated elements -->
-
-<!ELEMENT (%literal) - -  CDATA>
-
-<!ELEMENT PLAINTEXT - O EMPTY>
-