--- test/html.dtd	1994/04/07 00:33:25	1.7.2.4
+++ test/html.dtd	1994/06/13 20:55:50	1.16
@@ -1,169 +1,52 @@
 <!--	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.4 1994/04/07 00:33:25 connolly Exp $
--->
-
-
-<!-- DTD definitions -->
-
-<!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
-        "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 --
+	$Id: html.dtd,v 1.16 1994/06/13 20:55:50 connolly Exp $
 
-        METHODS NAMES #IMPLIED -- supported public methods of the object:
-                                        TEXTSEARCH, GET, HEAD, ... --
-
-	--@# content-type --
-        ">
-
-
-<!-- Document Element -->
-
-<!ELEMENT HTML O O  (HEAD, BODY)>
-
-<!-- Head -->
-
-<!ELEMENT HEAD O O  ( TITLE?  & ISINDEX? & NEXTID? & LINK*
-                              & BASE?)>
-
-<!ELEMENT NEXTID - O EMPTY -- @# obsolete -->
-<!ATTLIST NEXTID
-	N ID #REQUIRED -- next available id -->
+	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
+-->
 
-<!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.
-          -->
+<!ENTITY HTML.Version
+	"-//W3O//DTD WWW HTML 2.0//EN"
 
-<!ELEMENT ISINDEX - O EMPTY
-          -- WWW clients should offer the option to perform a search on
-             documents containing ISINDEX.
-          -->
+        -- Typical usage:
 
-<!ELEMENT LINK - O EMPTY>
-<!ATTLIST LINK
-        %linkattributes
+            <!DOCTYPE HTML PUBLIC "-//W3O//DTD WWW HTML 2.0//EN">
+	    <html>
+	    ...
+	    </html>
+	--
 	>
-        
-<!ELEMENT BASE - O EMPTY    -- Reference context for URLS -->
-<!ATTLIST BASE
-        HREF %URL; #IMPLIED
-        >
-
-
-<!-- Body -->
-
-<!ELEMENT BODY O O  ANY -- empty P version @# -->
-
-<!-- Text -->
-
-<!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 -- >
-
-<!ENTITY % htext "A | %text"    -- Plus links, no structure -->
-
-<!ELEMENT (%inline;) - - (%htext)+>
-<!ELEMENT (%fonts;)  - - (%htext)+>
-
-<!ELEMENT A     - -  ANY -(A)>
-<!ATTLIST A
-	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 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;)+>
-
-
-<!-- Pre-formatted Text -->
-
-<!ENTITY % pre "PRE | XMP | LISTING" -- @# treat XMP like pre? -->
-
-<!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 ">
+<!-- Imported Names -->
 
-<!ENTITY % block                -- as htext but also nested structure --
-                        "HR | %list | DL
-                        | %pre; | BLOCKQUOTE | FIG | ADDRESS 
-			| FORM">
+<!ENTITY % Content-Type "CDATA"
+	-- meaning a MIME content type, as per RFC1521
+	-->
 
-<!ELEMENT DL    - -  (DT*, DD?)+>
-<!ATTLIST DL
-	STYLE (COMPACT) #IMPLIED>
+<!ENTITY % HTTP-Method "GET | POST">
 
-<!ELEMENT DT    - O (%htext)+>
-<!ELEMENT DD    - O (%htext|%block)+>
 
-<!ELEMENT (%list) - -  (LI)+>
-<!ELEMENT LI    - O (%htext|%block)+>
+<!-- Include level 1 DTD + block extensions -->
 
-<!ELEMENT BLOCKQUOTE - - ((%htext)+, ADDRESS?)+ -- @# Hmm... --
-        -- for quoting some other source -->
+<!ENTITY % block-2 "| FORM | ISINDEX"
+	--@# ISINDEX in BODY? -->
 
-<!ELEMENT ADDRESS - - (%htext;)+>
+<!ENTITY % html-1 PUBLIC "-//W3O//DTD WWW HTML 2.0 Level 1//EN">
+%html-1;
 
-<!ELEMENT FIG - - (%htext;)+>
 
 <!-- Forms  -->
 
-<!ENTITY % HTTP-Method "(GET | POST)">
-<!ELEMENT FORM - - ANY -(FORM) +(INPUT|SELECT|TEXTAREA)>
+<!ELEMENT FORM - - %body.content -(FORM) +(INPUT|SELECT|TEXTAREA)>
 <!ATTLIST FORM
-	ACTION %URL #REQUIRED
-	METHOD %HTTP-Method #IMPLIED -- @# MAILTO? --
+	ACTION %URI #REQUIRED
+	METHOD (%HTTP-Method) #IMPLIED -- @# MAILTO? --
 	ENCTYPE %Content-Type; #IMPLIED
 	>
 
@@ -175,8 +58,8 @@
 	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
+	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?--
@@ -186,12 +69,12 @@
 <!ATTLIST SELECT
 	NAME CDATA #REQUIRED
 	SIZE NUMBER #IMPLIED
-	SELECTIONS (MULTIPLE) #IMPLIED
+	MULTIPLE (MULTIPLE) #IMPLIED
 	>
 
 <!ELEMENT OPTION - O (#PCDATA)>
 <!ATTLIST OPTION
-	STATE (SELECTED) #IMPLIED
+	SELECTED (SELECTED) #IMPLIED
 	VALUE CDATA #IMPLIED
 	>
 
@@ -202,16 +85,5 @@
 	COLS NUMBER #REQUIRED
 	>
 
-<!-- Mnemonic character entities. -->
 
-<!ENTITY % ISOlat1 PUBLIC
-  "ISO 8879:1986//ENTITIES Added Latin 1//EN">
-%ISOlat1;
-
-<!ENTITY amp "&#38;"     -- ampersand -->
-<!ENTITY gt "&#62;"      -- greater than -->
-<!ENTITY lt "&#60;"      -- less than -->
-<!ENTITY nbsp "<? nonbreaking-space>">
-<!-- @# should add entites for processing instructions
-	for line break, centering, etc. -->
 
