--- test/html.dtd	1994/04/01 19:21:25	1.7
+++ test/html.dtd	1994/04/07 00:33:25	1.7.2.4
@@ -3,24 +3,11 @@
         Document Type Definition for the HyperText Markup Language
         as used by the World Wide Web application (HTML DTD).
 
-	$Id: html.dtd,v 1.7 1994/04/01 19:21:25 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 % headelement
-         " TITLE | NEXTID |ISINDEX" >
 
-<!ENTITY % bodyelement
-         "P | HR | %heading |
-         %list | DL | ADDRESS | PRE | BLOCKQUOTE
-        | %literal">
-
-<!ENTITY % oldstyle "%headelement | %bodyelement | #PCDATA">
+<!-- DTD definitions -->
 
 <!ENTITY % URL "CDATA"
         -- The term URL means a CDATA attribute
@@ -28,9 +15,10 @@
            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:
@@ -45,17 +33,24 @@
         METHODS NAMES #IMPLIED -- supported public methods of the object:
                                         TEXTSEARCH, GET, HEAD, ... --
 
+	--@# content-type --
         ">
 
 
 <!-- Document Element -->
 
-<!ELEMENT HTML O O  (( HEAD | BODY | %oldstyle )*, PLAINTEXT?)>
+<!ELEMENT HTML O O  (HEAD, BODY)>
 
-<!ELEMENT HEAD - -  ( TITLE?  & ISINDEX?  & NEXTID?  & LINK*
+<!-- Head -->
+
+<!ELEMENT HEAD O O  ( TITLE?  & ISINDEX? & NEXTID? & LINK*
                               & BASE?)>
 
-<!ELEMENT TITLE - -  RCDATA
+<!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
              window title.
@@ -66,161 +61,157 @@
              documents containing ISINDEX.
           -->
 
-<!ELEMENT NEXTID - O EMPTY>
-<!ATTLIST NEXTID N NAME #REQUIRED
-          -- The number should be a name suitable for use
-             for the ID of a new element. When used, the value
-             has its numeric part incremented. EG Z67 becomes Z68
-          -->
 <!ELEMENT LINK - O EMPTY>
 <!ATTLIST LINK
-        %linkattributes>
+        %linkattributes
+	>
         
 <!ELEMENT BASE - O EMPTY    -- Reference context for URLS -->
 <!ATTLIST BASE
-
         HREF %URL; #IMPLIED
-
-        >
-<!ENTITY % inline "EM | TT | STRONG | B | I | U |
-                        CODE | SAMP | KBD | KEY | VAR | DFN | CITE "
         >
 
-<!ELEMENT (%inline;) - - (#PCDATA)>
 
-<!ENTITY % text "#PCDATA | IMG | %inline;">
+<!-- Body -->
 
-<!ENTITY % htext "A | %text"    -- Plus links, no structure -->
+<!ELEMENT BODY O O  ANY -- empty P version @# -->
+
+<!-- Text -->
 
-<!ENTITY % stext                -- as htext but also nested structure --
-                        "P | HR | %list | DL | ADDRESS
-                        | PRE | BLOCKQUOTE
-                        | %literal | %htext">
+<!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 - -  (%bodyelement|%htext;)*>
+<!ENTITY % htext "A | %text"    -- Plus links, no structure -->
 
+<!ELEMENT (%inline;) - - (%htext)+>
+<!ELEMENT (%fonts;)  - - (%htext)+>
 
-<!ELEMENT A     - -  (%text)>
+<!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 EMPTY -- separates paragraphs -->
+<!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 | %stext;)*>
-<!--    Content should match ((DT,(%htext;)+)+,(DD,(%stext;)+))
-        But mixed content is messy.  -Dan Connolly
-  -->
-
-<!ELEMENT DT    - O EMPTY>
-<!ELEMENT DD    - O EMPTY>
-
-<!ELEMENT (UL|OL) - -  (%htext;|LI|P)+>
-<!ELEMENT (DIR|MENU) - -  (%htext;|LI)+>
-<!--    Content should match ((LI,(%htext;)+)+)
-        But mixed content is messy.
-  -->
-<!ATTLIST (%list)
-        COMPACT NAME #IMPLIED -- COMPACT, etc.--
+
+<!-- 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
         >
 
-<!ELEMENT LI    - O EMPTY>
+<!-- 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 BLOCKQUOTE - - (%htext;|P)+
+<!ELEMENT DT    - O (%htext)+>
+<!ELEMENT DD    - O (%htext|%block)+>
+
+<!ELEMENT (%list) - -  (LI)+>
+<!ELEMENT LI    - O (%htext|%block)+>
+
+<!ELEMENT BLOCKQUOTE - - ((%htext)+, ADDRESS?)+ -- @# Hmm... --
         -- for quoting some other source -->
 
-<!ELEMENT ADDRESS - - (%htext;|P)+>
+<!ELEMENT ADDRESS - - (%htext;)+>
 
-<!ELEMENT PRE - - (#PCDATA|%inline|A|P)+>
-<!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. -->
-<!ENTITY AElig "&#198;"  -- capital AE diphthong (ligature) -->
-<!ENTITY Aacute "&#193;" -- capital A, acute accent -->
-<!ENTITY Acirc "&#194;"  -- capital A, circumflex accent -->
-<!ENTITY Agrave "&#192;" -- capital A, grave accent -->
-<!ENTITY Aring "&#197;"  -- capital A, ring -->
-<!ENTITY Atilde "&#195;" -- capital A, tilde -->
-<!ENTITY Auml "&#196;"   -- capital A, dieresis or umlaut mark -->
-<!ENTITY Ccedil "&#199;" -- capital C, cedilla -->
-<!ENTITY ETH "&#208;"    -- capital Eth, Icelandic -->
-<!ENTITY Eacute "&#201;" -- capital E, acute accent -->
-<!ENTITY Ecirc "&#202;"  -- capital E, circumflex accent -->
-<!ENTITY Egrave "&#200;" -- capital E, grave accent -->
-<!ENTITY Euml "&#203;"   -- capital E, dieresis or umlaut mark -->
-<!ENTITY Iacute "&#205;" -- capital I, acute accent -->
-<!ENTITY Icirc "&#206;"  -- capital I, circumflex accent -->
-<!ENTITY Igrave "&#204;" -- capital I, grave accent -->
-<!ENTITY Iuml "&#207;"   -- capital I, dieresis or umlaut mark -->
-<!ENTITY Ntilde "&#209;" -- capital N, tilde -->
-<!ENTITY Oacute "&#211;" -- capital O, acute accent -->
-<!ENTITY Ocirc "&#212;"  -- capital O, circumflex accent -->
-<!ENTITY Ograve "&#210;" -- capital O, grave accent -->
-<!ENTITY Oslash "&#216;" -- capital O, slash -->
-<!ENTITY Otilde "&#213;" -- capital O, tilde -->
-<!ENTITY Ouml "&#214;"   -- capital O, dieresis or umlaut mark -->
-<!ENTITY THORN "&#222;"  -- capital THORN, Icelandic -->
-<!ENTITY Uacute "&#218;" -- capital U, acute accent -->
-<!ENTITY Ucirc "&#219;"  -- capital U, circumflex accent -->
-<!ENTITY Ugrave "&#217;" -- capital U, grave accent -->
-<!ENTITY Uuml "&#220;"   -- capital U, dieresis or umlaut mark -->
-<!ENTITY Yacute "&#221;" -- capital Y, acute accent -->
-<!ENTITY aacute "&#225;" -- small a, acute accent -->
-<!ENTITY acirc "&#226;"  -- small a, circumflex accent -->
-<!ENTITY aelig "&#230;"  -- small ae diphthong (ligature) -->
-<!ENTITY agrave "&#224;" -- small a, grave accent -->
+
+<!ENTITY % ISOlat1 PUBLIC
+  "ISO 8879:1986//ENTITIES Added Latin 1//EN">
+%ISOlat1;
+
 <!ENTITY amp "&#38;"     -- ampersand -->
-<!ENTITY aring "&#229;"  -- small a, ring -->
-<!ENTITY atilde "&#227;" -- small a, tilde -->
-<!ENTITY auml "&#228;"   -- small a, dieresis or umlaut mark -->
-<!ENTITY ccedil "&#231;" -- small c, cedilla -->
-<!ENTITY eacute "&#233;" -- small e, acute accent -->
-<!ENTITY ecirc "&#234;"  -- small e, circumflex accent -->
-<!ENTITY egrave "&#232;" -- small e, grave accent -->
-<!ENTITY eth "&#240;"    -- small eth, Icelandic -->
-<!ENTITY euml "&#235;"   -- small e, dieresis or umlaut mark -->
 <!ENTITY gt "&#62;"      -- greater than -->
-<!ENTITY iacute "&#237;" -- small i, acute accent -->
-<!ENTITY icirc "&#238;"  -- small i, circumflex accent -->
-<!ENTITY igrave "&#236;" -- small i, grave accent -->
-<!ENTITY iuml "&#239;"   -- small i, dieresis or umlaut mark -->
 <!ENTITY lt "&#60;"      -- less than -->
-<!ENTITY nbsp "&#32;"    --  should be NON_BREAKING space -->
-<!ENTITY ntilde "&#241;" -- small n, tilde -->
-<!ENTITY oacute "&#243;" -- small o, acute accent -->
-<!ENTITY ocirc "&#244;"  -- small o, circumflex accent -->
-<!ENTITY ograve "&#242;" -- small o, grave accent -->
-<!ENTITY oslash "&#248;" -- small o, slash -->
-<!ENTITY otilde "&#245;" -- small o, tilde -->
-<!ENTITY ouml "&#246;"   -- small o, dieresis or umlaut mark -->
-<!ENTITY szlig "&#223;"  -- small sharp s, German (sz ligature) -->
-<!ENTITY thorn "&#254;"  -- small thorn, Icelandic -->
-<!ENTITY uacute "&#250;" -- small u, acute accent -->
-<!ENTITY ucirc "&#251;"  -- small u, circumflex accent -->
-<!ENTITY ugrave "&#249;" -- small u, grave accent -->
-<!ENTITY uuml "&#252;"   -- small u, dieresis or umlaut mark -->
-<!ENTITY yacute "&#253;" -- small y, acute accent -->
-<!ENTITY yuml "&#255;"   -- small y, dieresis or umlaut mark -->
-
-<!-- deprecated elements -->
-
-<!ELEMENT (%literal) - -  CDATA>
-
-<!ELEMENT PLAINTEXT - O EMPTY>
-
-<!-- Local Variables: -->
-<!-- mode: sgml -->
-<!-- compile-command: "sgmls -s -p " -->
-<!-- end: -->
+<!ENTITY nbsp "<? nonbreaking-space>">
+<!-- @# should add entites for processing instructions
+	for line break, centering, etc. -->
+