--- test/html.dtd	1994/04/01 20:30:17	1.7.2.2
+++ test/html.dtd	1994/06/13 20:55:50	1.16
@@ -1,158 +1,89 @@
 <!--	html.dtd
 
-        Document Type Definition for the HyperText Markup Language
-        as used by the World Wide Web application (HTML DTD).
+        Document Type Definition for the HyperText Markup Language (HTML DTD)
 
-        $Id: html.dtd,v 1.7.2.2 1994/04/01 20:30:17 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 % linkattributes
-        "NAME NMTOKEN #IMPLIED
-        HREF %URL;  #IMPLIED
-        REL CDATA #IMPLIED -- forward relationship type --
-        REV CDATA #IMPLIED -- reversed relationship type
-                              to referent data:
-
-                                PARENT CHILD, SIBLING, NEXT, TOP,
-                                DEFINITION, UPDATE, ORIGINAL etc. --
-
-        URN CDATA #IMPLIED -- universal resource number --
-
-        TITLE CDATA #IMPLIED -- advisory only --
-
-        METHODS NAMES #IMPLIED -- supported public methods of the object:
-                                        TEXTSEARCH, GET, HEAD, ... --
-
-        ">
-
-
-<!-- Document Element -->
-
-<!ELEMENT HTML O O  (HEAD, BODY)>
-
-<!ELEMENT HEAD O O  ( TITLE?  & ISINDEX?  & NEXTID?  & LINK*
-                              & BASE?)>
-
-<!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
-             window title.
-          -->
-
-<!ELEMENT ISINDEX - O EMPTY
-          -- WWW clients should offer the option to perform a search on
-             documents containing ISINDEX.
-          -->
-
-<!ELEMENT LINK - O EMPTY>
-<!ATTLIST LINK
-        %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)+>
+	$Id: html.dtd,v 1.16 1994/06/13 20:55:50 connolly Exp $
 
-<!ENTITY % text "#PCDATA | IMG | %inline; | BR">
-
-<!ENTITY % htext "A | %text"    -- Plus links, no structure -->
-
-<!ENTITY % stext                -- as htext but also nested structure --
-                        "P | HR | %list | DL | ADDRESS
-                        | PRE | BLOCKQUOTE
-                        | %literal | %htext">
-
-<!ENTITY % block                -- as htext but also nested structure --
-                        "P | HR | %list | DL
-                        | PRE | BLOCKQUOTE
-                        | %literal">
-
-
-<!ELEMENT BODY O O  (%heading | %block)+>
-
-
-<!ELEMENT A     - -  ANY>
-<!ATTLIST A
-        %linkattributes;
-        >
-
-<!ELEMENT IMG    - O EMPTY --  Embedded image -->
-<!ATTLIST IMG
-        SRC %URL;  #IMPLIED     -- URL of document to embed --
-        >
-
-
-<!ELEMENT P     - O (%htext)+ -- paragraph -->
-<!ELEMENT (HR|BR)    - O EMPTY -- horizontal rule -->
-
-<!ELEMENT ( %heading )  - -  (%htext;)+>
-
-<!ELEMENT DL    - -  (DT+, DD)+>
-<!--    structured DL's
-  -->
-
-<!ELEMENT DT    - O (%htext)+>
-<!ELEMENT DD    - O (%htext|%block)+>
-
-<!ELEMENT (%list) - -  (LI)+>
-
-<!ATTLIST (%list)
-        COMPACT NAME #IMPLIED -- COMPACT, etc.--
-        >
-
-<!ELEMENT LI    - O (%htext|%block)+>
-
-<!ELEMENT BLOCKQUOTE - - (P+, ADDRESS?)+
-        -- for quoting some other source -->
-
-<!ELEMENT ADDRESS - - (%htext;)+>
-
-<!ELEMENT PRE - - (#PCDATA | TT | B | I | U | A | P | BR)+>
-<!ATTLIST PRE
-        WIDTH NUMBER #implied
-        >
-
-<!-- Mnemonic character entities. -->
+	Author: Daniel W. Connolly <connolly@hal.com>
+	See Also: html.decl, html-0.dtd, html-1.dtd
+		  http://www.hal.com/%7Econnolly/html-spec/index.html
+		  http://info.cern.ch/hypertext/WWW/MarkUp2/MarkUp.html
+-->
 
-<!ENTITY % ISOlat1 PUBLIC
-  "ISO 8879:1986//ENTITIES Added Latin 1//EN">
-%ISOlat1;
+<!ENTITY HTML.Version
+	"-//W3O//DTD WWW HTML 2.0//EN"
 
-<!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
-	for line break, centering, etc. -->
+        -- Typical usage:
 
-<!-- deprecated elements -->
+            <!DOCTYPE HTML PUBLIC "-//W3O//DTD WWW HTML 2.0//EN">
+	    <html>
+	    ...
+	    </html>
+	--
+	>
+
+
+<!-- Imported Names -->
+
+<!ENTITY % Content-Type "CDATA"
+	-- meaning a MIME content type, as per RFC1521
+	-->
+
+<!ENTITY % HTTP-Method "GET | POST">
+
+
+<!-- Include level 1 DTD + block extensions -->
+
+<!ENTITY % block-2 "| FORM | ISINDEX"
+	--@# ISINDEX in BODY? -->
+
+<!ENTITY % html-1 PUBLIC "-//W3O//DTD WWW HTML 2.0 Level 1//EN">
+%html-1;
+
+
+<!-- Forms  -->
+
+<!ELEMENT FORM - - %body.content -(FORM) +(INPUT|SELECT|TEXTAREA)>
+<!ATTLIST FORM
+	ACTION %URI #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 %URI #IMPLIED -- for image inputs -- 
+	CHECKED (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
+	MULTIPLE (MULTIPLE) #IMPLIED
+	>
+
+<!ELEMENT OPTION - O (#PCDATA)>
+<!ATTLIST OPTION
+	SELECTED (SELECTED) #IMPLIED
+	VALUE CDATA #IMPLIED
+	>
+
+<!ELEMENT TEXTAREA - - (#PCDATA)>
+<!ATTLIST TEXTAREA
+	NAME CDATA #REQUIRED
+	ROWS NUMBER #REQUIRED -- @#implied? --
+	COLS NUMBER #REQUIRED
+	>
 
-<!ELEMENT (%literal) - -  CDATA>
 
-<!ELEMENT PLAINTEXT - O EMPTY>