--- test/html.dtd	1994/04/01 19:21:25	1.7
+++ test/html.dtd	1994/04/04 23:58:38	1.7.2.3
@@ -3,25 +3,21 @@
         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.3 1994/04/04 23:58:38 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">
-
 <!ENTITY % URL "CDATA"
         -- The term URL means a CDATA attribute
            whose value is a Uniform Resource Locator,
@@ -50,12 +46,12 @@
 
 <!-- Document Element -->
 
-<!ELEMENT HTML O O  (( HEAD | BODY | %oldstyle )*, PLAINTEXT?)>
+<!ELEMENT HTML O O  (HEAD, BODY)>
 
-<!ELEMENT HEAD - -  ( TITLE?  & ISINDEX?  & NEXTID?  & LINK*
+<!ELEMENT HEAD O O  ( TITLE?  & ISINDEX?  & NEXTID?  & LINK*
                               & BASE?)>
 
-<!ELEMENT TITLE - -  RCDATA
+<!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,12 +62,6 @@
              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>
@@ -82,13 +72,14 @@
         HREF %URL; #IMPLIED
 
         >
-<!ENTITY % inline "EM | TT | STRONG | B | I | U |
+<!ENTITY % inline "EM | STRONG |
                         CODE | SAMP | KBD | KEY | VAR | DFN | CITE "
         >
 
-<!ELEMENT (%inline;) - - (#PCDATA)>
+<!ELEMENT (%inline;) - - (#PCDATA | A)+>
+<!ELEMENT (B | I | U | TT) - - (#PCDATA | A)+>
 
-<!ENTITY % text "#PCDATA | IMG | %inline;">
+<!ENTITY % text "#PCDATA | IMG | %inline; | BR">
 
 <!ENTITY % htext "A | %text"    -- Plus links, no structure -->
 
@@ -97,11 +88,16 @@
                         | PRE | BLOCKQUOTE
                         | %literal | %htext">
 
+<!ENTITY % block                -- as htext but also nested structure --
+                        "P | HR | %list | DL
+                        | PRE | BLOCKQUOTE | ADDRESS
+                        | %literal">
+
 
-<!ELEMENT BODY - -  (%bodyelement|%htext;)*>
+<!ELEMENT BODY O O  (%heading | %block)+>
 
 
-<!ELEMENT A     - -  (%text)>
+<!ELEMENT A     - -  ANY>
 <!ATTLIST A
         %linkattributes;
         >
@@ -112,107 +108,48 @@
         >
 
 
-<!ELEMENT P     - O EMPTY -- separates paragraphs -->
-<!ELEMENT HR    - O EMPTY -- horizontal rule -->
+<!ELEMENT P     - O (%htext)+ -- paragraph -->
+<!ELEMENT (HR|BR)    - O EMPTY -- horizontal rule -->
 
 <!ELEMENT ( %heading )  - -  (%htext;)+>
 
-<!ELEMENT DL    - -  (DT | DD | %stext;)*>
-<!--    Content should match ((DT,(%htext;)+)+,(DD,(%stext;)+))
-        But mixed content is messy.  -Dan Connolly
+<!ELEMENT DL    - -  (DT+, DD+)+>
+<!--    structured DL's
   -->
 
-<!ELEMENT DT    - O EMPTY>
-<!ELEMENT DD    - O EMPTY>
+<!ELEMENT DT    - O (%htext)+>
+<!ELEMENT DD    - O (%htext|%block)+>
+
+<!ELEMENT (%list) - -  (LI)+>
 
-<!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.--
         >
 
-<!ELEMENT LI    - O EMPTY>
+<!ELEMENT LI    - O (%htext|%block)+>
 
-<!ELEMENT BLOCKQUOTE - - (%htext;|P)+
+<!ELEMENT BLOCKQUOTE - - ((%htext|P)+, ADDRESS?)+
         -- for quoting some other source -->
 
-<!ELEMENT ADDRESS - - (%htext;|P)+>
+<!ELEMENT ADDRESS - - (%htext;)+>
 
-<!ELEMENT PRE - - (#PCDATA|%inline|A|P)+>
+<!ELEMENT PRE - - (#PCDATA | TT | B | I | U | A | P | BR)+>
 <!ATTLIST PRE
         WIDTH NUMBER #implied
         >
 
 <!-- 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 -->
+<!ENTITY nbsp "&#32;"    --  @@should be NON_BREAKING space -->
+<!-- @@ should add entites for processing instructions
+	for line break, centering, etc. -->
 
 <!-- deprecated elements -->
 
@@ -220,7 +157,3 @@
 
 <!ELEMENT PLAINTEXT - O EMPTY>
 
-<!-- Local Variables: -->
-<!-- mode: sgml -->
-<!-- compile-command: "sgmls -s -p " -->
-<!-- end: -->