--- test/html.dtd	1994/04/04 23:58:38	1.7.2.3
+++ test/html.dtd	1994/09/23 22:46:51	1.19
@@ -1,55 +1,182 @@
 <!--	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.3 1994/04/04 23:58:38 connolly Exp $
+	$Id: html.dtd,v 1.19 1994/09/23 22:46:51 connolly Exp $
+
+	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 % HTML.Version
+	"-//IETF//DTD HTML//EN//2.0"
+
+        -- Typical usage:
 
-<!-- DTD definitions -->
+            <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+	    <html>
+	    ...
+	    </html>
+	--
+	>
+
+
+<!--================== Feature Test Entities ==============================-->
+
+<!ENTITY % HTML.Recommended "IGNORE"
+	-- Certain features of the language are necessary for compatibility
+	   with widespread usage, but they may compromise the structural
+	   integrity of a document. This feature test entity enables
+	   a more prescriptive document type definition that eliminates
+	   the above features.
+	-->
+
+<![ %HTML.Recommended [
+	<!ENTITY % HTML.Deprecated "IGNORE">
+]]>
+
+<!ENTITY % HTML.Deprecated "INCLUDE"
+	-- Certain features of the language are necessary for compatibility
+	   with earlier versions of the specification, but they tend
+	   to be used an implemented inconsistently, and their use is
+	   deprecated. This feature test entity enables a document type
+	   definition that eliminates these features.
+	-->
+
+<!ENTITY % HTML.Highlighting "INCLUDE">
+<!ENTITY % HTML.Forms "INCLUDE">
+
+<!--================== Imported Names =====================================-->
+
+<!ENTITY % Content-Type "CDATA"
+	-- meaning a MIME content type, as per RFC1521
+	-->
+
+<!ENTITY % HTTP-Method "GET | POST"
+	-- as per HTTP specification
+	-->
+
+<!ENTITY % URI "CDATA"
+        -- The term URI means a CDATA attribute
+           whose value is a Uniform Resource Identifier,
+           as defined by 
+	"Universal Resource Identifiers" by Tim Berners-Lee
+	aka http://info.cern.ch/hypertext/WWW/Addressing/URL/URI_Overview.html
+	aka RFC 1630
+
+	Note that CDATA attributes are limited by the LITLEN
+	capacity (1024 in the current version of html.decl),
+	so that URIs in HTML have a bounded length.
 
-<!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. --
+<!-- DTD "macros" -->
+
+<!ENTITY % heading "H1|H2|H3|H4|H5|H6">
+
+<!ENTITY % list " UL | OL | DIR | MENU " >
+
+
+<!--================ Character mnemonic entities ==========================-->
+
+<!ENTITY % ISOlat1 PUBLIC
+  "-//IETF//ENTITIES Added Latin 1 for HTML//EN">
+%ISOlat1;
+
+<!ENTITY amp CDATA "&#38;"     -- ampersand          -->
+<!ENTITY gt CDATA "&#62;"      -- greater than       -->
+<!ENTITY lt CDATA "&#60;"      -- less than          -->
+<!ENTITY quot CDATA "&#34;"    -- double quote       -->
+
+
+<!--=================== Text Markup =======================================-->
+
+<![ %HTML.Highlighting [
+
+<!ENTITY % font " TT | B | I ">
+
+<!ENTITY % phrase "EM | STRONG | CODE | SAMP | KBD | VAR | CITE ">
+
+<!ENTITY % text "#PCDATA | A | IMG | BR | %phrase | %font">
+
+<!ENTITY % pre.content "#PCDATA | A | HR | BR | %font | %phrase">
+
+<!ELEMENT (%font;|%phrase) - - (%text)+>
 
+]]>
+
+<!ENTITY % text "#PCDATA | A | IMG | BR">
+
+<!ELEMENT BR    - O EMPTY>
+
+
+<!--================== Link Markup ========================================-->
+
+<![ %HTML.Recommended [
+	<!ENTITY % linkName "ID">
+]]>
+
+<!ENTITY % linkName "CDATA">
+
+<!ENTITY % linkType "NAME"
+	-- a list of these will be specified at a later date -->
+
+<!ENTITY % linkExtraAttributes
+        "REL %linkType #IMPLIED -- forward relationship type --
+        REV %linkType #IMPLIED -- reversed relationship type
+                              to referent data --
         URN CDATA #IMPLIED -- universal resource number --
 
         TITLE CDATA #IMPLIED -- advisory only --
-
         METHODS NAMES #IMPLIED -- supported public methods of the object:
                                         TEXTSEARCH, GET, HEAD, ... --
-
         ">
 
+<![ %HTML.Recommended [
+	<!ENTITY % A.content   "(%text)+"
+	-- <H1><a name="xxx">Heading</a></H1>
+		is preferred to
+	   <a name="xxx"><H1>Heading</H1></a>
+	-->
+]]>
+
+<!ENTITY % A.content   "(%heading|%text)+">
 
-<!-- Document Element -->
+<!ELEMENT A     - - %A.content -(A)>
+
+<!ATTLIST A
+	HREF %URI #IMPLIED
+	NAME %linkName #IMPLIED
+        %linkExtraAttributes;
+        >
 
-<!ELEMENT HTML O O  (HEAD, BODY)>
+<!--=================== Images ============================================-->
 
-<!ELEMENT HEAD O O  ( TITLE?  & ISINDEX?  & NEXTID?  & LINK*
-                              & BASE?)>
+<!ENTITY % img.alt.default "#IMPLIED"
+	-- ALT attribute required in Level 0 docs -->
+
+<!ELEMENT IMG    - O EMPTY --  Embedded image -->
+<!ATTLIST IMG
+        SRC %URI;  #REQUIRED     -- URI of document to embed --
+	ALT CDATA %img.alt.default;
+	ALIGN (top|middle|bottom) #IMPLIED
+	ISMAP (ISMAP) #IMPLIED
+        >
+
+
+<!--=================== Paragraphs=========================================-->
+
+<!ELEMENT P     - O (%text)+>
+
+
+<!--=================== Headings, Titles, Sections ========================-->
+
+<!ELEMENT HR    - O EMPTY -- horizontal rule -->
+
+<!ELEMENT ( %heading )  - -  (%text;)+>
 
 <!ELEMENT TITLE - -  (#PCDATA)
           -- The TITLE element is not considered part of the flow of text.
@@ -57,103 +184,190 @@
              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
+<!--=================== Text Flows ========================================-->
 
-        HREF %URL; #IMPLIED
+<![ %HTML.Forms [
+	<!ENTITY % block.forms "| FORM | ISINDEX">
+]]>
 
-        >
-<!ENTITY % inline "EM | STRONG |
-                        CODE | SAMP | KBD | KEY | VAR | DFN | CITE "
-        >
+<!ENTITY % block.forms "">
+
+<![ %HTML.Deprecated [
+	<!ENTITY % preformatted "PRE | XMP | LISTING">
+]]>
 
-<!ELEMENT (%inline;) - - (#PCDATA | A)+>
-<!ELEMENT (B | I | U | TT) - - (#PCDATA | A)+>
+<!ENTITY % preformatted "PRE">
 
-<!ENTITY % text "#PCDATA | IMG | %inline; | BR">
+<!ENTITY % block "P | %list | DL
+	| %preformatted
+	| BLOCKQUOTE %block.forms">
 
-<!ENTITY % htext "A | %text"    -- Plus links, no structure -->
+<!ENTITY % flow "(%text|%block)*">
 
-<!ENTITY % stext                -- as htext but also nested structure --
-                        "P | HR | %list | DL | ADDRESS
-                        | PRE | BLOCKQUOTE
-                        | %literal | %htext">
+<!ENTITY % pre.content "#PCDATA | A | HR | BR">
+<!ELEMENT PRE - - (%pre.content)+>
 
-<!ENTITY % block                -- as htext but also nested structure --
-                        "P | HR | %list | DL
-                        | PRE | BLOCKQUOTE | ADDRESS
-                        | %literal">
+<!ATTLIST PRE
+        WIDTH NUMBER #implied
+        >
 
+<![ %HTML.Deprecated [
 
-<!ELEMENT BODY O O  (%heading | %block)+>
+<!ENTITY % literal "CDATA"
+	-- special non-conforming parsing mode where
+	   the only markup signal is the end tag
+	   in full
+	-->
 
+<!ELEMENT XMP - -  %literal>
+<!ELEMENT LISTING - -  %literal>
+<!ELEMENT PLAINTEXT - O %literal>
 
-<!ELEMENT A     - -  ANY>
-<!ATTLIST A
-        %linkattributes;
-        >
+]]>
 
-<!ELEMENT IMG    - O EMPTY --  Embedded image -->
-<!ATTLIST IMG
-        SRC %URL;  #IMPLIED     -- URL of document to embed --
-        >
 
+<!--=================== Lists =============================================-->
 
-<!ELEMENT P     - O (%htext)+ -- paragraph -->
-<!ELEMENT (HR|BR)    - O EMPTY -- horizontal rule -->
+<!ELEMENT DL    - -  (DT*, DD?)+>
+<!ATTLIST DL
+	COMPACT (COMPACT) #IMPLIED>
 
-<!ELEMENT ( %heading )  - -  (%htext;)+>
+<!ELEMENT DT    - O (%text)+>
+<!ELEMENT DD    - O %flow>
 
-<!ELEMENT DL    - -  (DT+, DD+)+>
-<!--    structured DL's
-  -->
+<!ELEMENT (OL|UL) - -  (LI)+>
+<!ELEMENT (DIR|MENU) - -  (LI)+ -(%block)>
+<!ATTLIST (%list)
+	COMPACT (COMPACT) #IMPLIED>
 
-<!ELEMENT DT    - O (%htext)+>
-<!ELEMENT DD    - O (%htext|%block)+>
+<!ELEMENT LI    - O %flow>
 
-<!ELEMENT (%list) - -  (LI)+>
+<!--=================== Document Body =====================================-->
 
-<!ATTLIST (%list)
-        COMPACT NAME #IMPLIED -- COMPACT, etc.--
-        >
+<![ %HTML.Recommended [
+	<!ENTITY % body.content "(%heading|%block|HR|ADDRESS)*">
+	-- <h1>Heading</h1>
+	   <p>Text ...
+		is preferred to
+	   <h1>Heading</h1>
+	   Text ...
+	-->
+]]>
+
+<!ENTITY % body.content "(%heading | %text | %block | HR | ADDRESS)*">
+
+<!ELEMENT BODY O O  %body.content>
+
+<!ELEMENT BLOCKQUOTE - - %body.content>
+
+<![ %HTML.Recommended [
+	<!ENTITY % address.content "(%text)*">
+]]>
+<!ENTITY % address.content "(%text|P)*">
+<!ELEMENT ADDRESS - - %address.content>
+
+
+<!--================ Forms ===============================================-->
+
+<![ %HTML.Forms [
+
+<!ELEMENT FORM - - %body.content -(FORM) +(INPUT|SELECT|TEXTAREA)>
+<!ATTLIST FORM
+	ACTION %URI #REQUIRED
+	METHOD (%HTTP-Method) GET
+	ENCTYPE %Content-Type; "application/x-www-form-urlencoded"
+	>
+
+<!ENTITY % InputType "(TEXT | PASSWORD | CHECKBOX |
+			RADIO | SUBMIT | RESET |
+			IMAGE | HIDDEN )">
+<!ELEMENT INPUT - O EMPTY>
+<!ATTLIST INPUT
+	TYPE %InputType 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 -- like NUMBERS,
+				 but delimited with comma, not space --
+	MAXLENGTH NUMBER #IMPLIED
+	ALIGN (top|middle|bottom) #IMPLIED
+	>
+
+<!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
+	COLS NUMBER #REQUIRED
+	>
+
+]]>
+
+
+<!--================ Document Head ========================================-->
+
+<!ENTITY % head.link "& LINK*">
+
+<![ %HTML.Recommended [
+	<!ENTITY % head.nextid "">
+]]>
+<!ENTITY % head.nextid "& NEXTID?">
+
+<!ENTITY % head.content "TITLE & ISINDEX? & BASE? & META*
+			 %head.nextid
+			 %head.link">
 
-<!ELEMENT LI    - O (%htext|%block)+>
+<!ELEMENT HEAD O O  (%head.content)>
 
-<!ELEMENT BLOCKQUOTE - - ((%htext|P)+, ADDRESS?)+
-        -- for quoting some other source -->
+<!ELEMENT LINK - O EMPTY>
+<!ATTLIST LINK
+	HREF %URI #REQUIRED
+        %linkExtraAttributes; >
 
-<!ELEMENT ADDRESS - - (%htext;)+>
+<!ELEMENT ISINDEX - O EMPTY>
 
-<!ELEMENT PRE - - (#PCDATA | TT | B | I | U | A | P | BR)+>
-<!ATTLIST PRE
-        WIDTH NUMBER #implied
+<!ELEMENT BASE - O EMPTY>
+<!ATTLIST BASE
+        HREF %URI; #REQUIRED
         >
 
-<!-- Mnemonic character entities. -->
+<!ELEMENT NEXTID - O EMPTY>
+<!ATTLIST NEXTID N %linkName #REQUIRED>
 
-<!ENTITY % ISOlat1 PUBLIC
-  "ISO 8879:1986//ENTITIES Added Latin 1//EN">
-%ISOlat1;
+<!ELEMENT META - O EMPTY    -- Generic Metainformation -->
+<!ATTLIST META
+        HTTP-EQUIV  NAME    #IMPLIED  -- HTTP response header name  --
+        NAME        NAME    #IMPLIED  -- metainformation name       --
+        CONTENT     CDATA   #REQUIRED -- associated information     --
+        >
 
-<!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. -->
 
-<!-- deprecated elements -->
+<!--================ Document Structure ===================================-->
 
-<!ELEMENT (%literal) - -  CDATA>
+<![ %HTML.Deprecated [
+	<!ENTITY % html.content "HEAD, BODY, PLAINTEXT?">
+]]>
+<!ENTITY % html.content "HEAD, BODY">
+
+<!ELEMENT HTML O O  (%html.content)>
+<!ENTITY % version.attr "VERSION CDATA #FIXED &#34;%HTML.Version;&#34;">
+
+<!ATTLIST HTML
+	%version.attr;-- report DTD version to application --
+	>
 
-<!ELEMENT PLAINTEXT - O EMPTY>
 
