lynx-dev 2.8.3dev.3 patch 1 - "DTD" parsing tweaks

[Klaus Weide]

* Changes in SortaSGML extra element info for BUTTON, LABEL (they were
  quite wrong, addresses a bug reported about gratuitous line breaks
  by LABEL in P), as well as a few others (FORM, FIELDSET, LEGEND, SELECT,
  INS, DEL).

Index: lynx2-8-3/WWW/Library/Implementation/HTMLDTD.c
--- orig/lynx2-8-3/WWW/Library/Implementation/HTMLDTD.c Fri, 04 Jun 1999 
20:57:16 -0500
+++ lynx2-8-3/WWW/Library/Implementation/HTMLDTD.c Wed, 07 Jul 1999 02:46:43 
-0500
@@ -1159,7 +1159,7 @@
 #define T_BQ           0x0200, 0xAFBCF,0xAFFFF,0xB6680,0xB6FAF,0x8031F,0x00000
  /* { "BR"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_EMPTY }, */
 #define T_BR           0x1000, 0x00000,0x00000,0x377BF,0x77FBF,0x8101F,0x00001
-#define T_BUTTON       0x0200, 0x0BB0B,0x0FF3B,0x0378F,0x37FAF,0x8035F,0x00000
+#define T_BUTTON       0x2000, 0x0BB07,0x0FF37,0x0378F,0x37FBF,0x8135F,0x00000
  /* { "CAPTION" , caption_attr, HTML_CAPTION_ATTRIBUTES, SGML_MIXED }, */
 #define T_CAPTION      0x0100, 0x0B04F,0x8FFFF,0x06A00,0xB6FA7,0x8035F,0x00000
  /* { "CENTER" , div_attr,     HTML_DIV_ATTRIBUTES,    SGML_MIXED }, */
@@ -1179,7 +1179,7 @@
  /* { "DD"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_EMPTY }, */
 #define T_DD           0x0400, 0x0FBCF,0x8FFFF,0x00800,0xB6FFF,0x8071F,0x00001
  /* { "DEL"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
-#define T_DEL          0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
+#define T_DEL          0x0002, 0x8BBCF,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
  /* { "DFN"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
 #define T_DFN          0x0002, 0x8B0CF,0x8FFFF,0x8778F,0xF7FBF,0x00003,0x00000
  /* { "DIR"    , ulist_attr,   HTML_UL_ATTRIBUTES,     SGML_MIXED }, */
@@ -1197,7 +1197,7 @@
  /* { "EMBED"  , embed_attr,   HTML_EMBED_ATTRIBUTES,  SGML_EMPTY }, */
 #define T_EMBED        0x2000, 0x8F107,0x8FFF7,0xB6FBF,0xB7FBF,0x1FF7F,0x00001
  /* { "FIELDSET", fieldset_attr,HTML_FIELDSET_ATTRIBUTES, SGML_MIXED }, */
-#define T_FIELDSET     0x0200, 0x0FB42,0x0FF5F,0x07787,0x37FF7,0x8805F,0x00000
+#define T_FIELDSET     0x0200, 0x8FB4F,0x8FF7F,0x86787,0xB7FF7,0x8805F,0x00000
  /* { "FIG"    , fig_attr,     HTML_FIG_ATTRIBUTES,    SGML_MIXED }, */
 #define T_FIG          0x0200, 0x0FB00,0x8FFFF,0x36680,0xB6FBF,0x8834F,0x00000
  /* { "FN"     , fn_attr,      HTML_FN_ATTRIBUTES,     SGML_MIXED }, */
@@ -1205,7 +1205,7 @@
  /* { "FONT"   , font_attr,    HTML_FONT_ATTRIBUTES,   SGML_EMPTY }, */
 #define T_FONT         0x0001, 0x8B04F,0x8FFFF,0xB778F,0xF7FBF,0x00001,0x00014
  /* { "FORM"   , form_attr,    HTML_FORM_ATTRIBUTES,   SGML_EMPTY }, */
-#define T_FORM         0x0080, 0x0FF6F,0x0FF7F,0x36E07,0x33F07,0x88DFF,0x00000
+#define T_FORM         0x0080, 0x0FF6F,0x0FF7F,0x36E07,0x32F07,0x88DFF,0x00000
  /* { "FRAME"  , frame_attr,   HTML_FRAME_ATTRIBUTES,  SGML_EMPTY }, */
 #define T_FRAME        0x10000,0x00000,0x00000,0x10000,0x10000,0x9FFFF,0x00001
  /* { "FRAMESET", frameset_attr,HTML_FRAMESET_ATTRIBUTES, SGML_MIXED }, */
@@ -1237,7 +1237,7 @@
  /* { "INPUT"  , input_attr,   HTML_INPUT_ATTRIBUTES,  SGML_EMPTY }, */
 #define T_INPUT        0x0040, 0x00000,0x00000,0x03F87,0x37F87,0x8904F,0x00001
  /* { "INS"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
-#define T_INS          0x0002, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
+#define T_INS          0x0002, 0x8BBCF,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
  /* { "ISINDEX" , isindex_attr, HTML_ISINDEX_ATTRIBUTES,SGML_EMPTY }, */
 #define T_ISINDEX      0x8000, 0x00000,0x00000,0x7778F,0x7FFAF,0x80007,0x00001
  /* { "KBD"    , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
@@ -1245,8 +1245,8 @@
  /* { "KEYGEN" , keygen_attr,  HTML_KEYGEN_ATTRIBUTES, SGML_EMPTY }, */
 #define T_KEYGEN       0x0040, 0x00000,0x00000,0x07FB7,0x37FB7,0x80070,0x00001
  /* { "LABEL"  , label_attr,   HTML_LABEL_ATTRIBUTES,  SGML_MIXED }, */
-#define T_LABEL        0x0020, 0x9FFFF,0x9FFFF,0x9FFFF,0x9FFFF,0x00007,0x00000
-#define T_LEGEND       0x0002, 0x0B04F,0x0FF7F,0x00200,0x37FA7,0x00003,0x00000
+#define T_LABEL        0x0002, 0x0304F,0x0FFFF,0x0679F,0x36FBF,0x00007,0x00000
+#define T_LEGEND       0x0002, 0x0B04F,0x8FF7F,0x00200,0xB7FA7,0x00003,0x00000
  /* { "LH"     , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_EMPTY }, */
 #define T_LH           0x0400, 0x0BB7F,0x8FFFF,0x00800,0x97FFF,0x8071F,0x00001
  /* { "LI"     , list_attr,    HTML_LI_ATTRIBUTES,     SGML_EMPTY }, */
@@ -1296,7 +1296,7 @@
  /* { "SCRIPT" , script_attr,  HTML_SCRIPT_ATTRIBUTES, SGML_LITTERAL }, */
 #define T_SCRIPT       0x2000, 0x00000,0x00000,0x77F9F,0x77FFF,0x87F5F,0x00000
  /* { "SELECT" , select_attr,  HTML_SELECT_ATTRIBUTES, SGML_MIXED }, */
-#define T_SELECT       0x0040, 0x08000,0x08000,0x03FAF,0x13FBF,0x80F5F,0x00008
+#define T_SELECT       0x0040, 0x08000,0x08000,0x03FAF,0x33FBF,0x80F5F,0x00008
 #define T_SHY          0x1000, 0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
  /* { "SMALL"  , gen_attr,     HTML_GEN_ATTRIBUTES,    SGML_MIXED }, */
 #define T_SMALL        0x0001, 0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
Index: lynx2-8-3/WWW/Library/Implementation/SGML.h
--- orig/lynx2-8-3/WWW/Library/Implementation/SGML.h Fri, 04 Jun 1999 20:45:47 
-0500
+++ lynx2-8-3/WWW/Library/Implementation/SGML.h Wed, 07 Jul 1999 05:07:11 -0500
@@ -69,7 +69,7 @@
                                    text directly */
     /* insertions */
 #define Tgc_BRlike     0x01000 /* BR,IMG,TAB allowed in any text */
-#define Tgc_APPLETlike 0x02000 /* APPLET,OBJECT,EMBED,SCRIPT */
+#define Tgc_APPLETlike 0x02000 /* APPLET,OBJECT,EMBED,SCRIPT;BUTTON */
 #define Tgc_HRlike     0x04000 /* HR,MARQUEE can contain all kinds of things
                                    and/or are not allowed (?) in running text 
*/
 #define Tgc_MAPlike    0x08000 /* MAP,AREA some specials that never contain