about summary refs log tree commit diff stats
path: root/WWW/Library/Implementation
diff options
context:
space:
mode:
Diffstat (limited to 'WWW/Library/Implementation')
-rw-r--r--WWW/Library/Implementation/HTMLDTD.c4
-rw-r--r--WWW/Library/Implementation/SGML.c60
-rw-r--r--WWW/Library/Implementation/SGML.h7
-rw-r--r--WWW/Library/Implementation/dtd_util.c237
-rw-r--r--WWW/Library/Implementation/hdr_HTMLDTD.h8
-rw-r--r--WWW/Library/Implementation/makefile.in6
-rw-r--r--WWW/Library/Implementation/src0_HTMLDTD.h352
-rw-r--r--WWW/Library/Implementation/src0_HTMLDTD.txt410
-rw-r--r--WWW/Library/Implementation/src1_HTMLDTD.h352
-rw-r--r--WWW/Library/Implementation/src1_HTMLDTD.txt416
10 files changed, 1115 insertions, 737 deletions
diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c
index 833077f2..382c141a 100644
--- a/WWW/Library/Implementation/HTMLDTD.c
+++ b/WWW/Library/Implementation/HTMLDTD.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMLDTD.c,v 1.57 2010/09/25 00:30:56 tom Exp $
+ * $LynxId: HTMLDTD.c,v 1.58 2021/07/23 00:00:03 tom Exp $
  *
  *		Our Static DTD for HTML
  *		-----------------------
@@ -243,7 +243,7 @@ void HTSwitchDTD(int new_flag)
 
 HTTag HTTag_unrecognized =
 
-{NULL_HTTag, NULL, 0, 0, SGML_EMPTY, T__UNREC_};
+{NULL_HTTag, NULL, 0, 0, SGML_EMPTY, T__UNREC_, 0, 0};
 
 /*
  *	Utility Routine:  Useful for people building HTML objects.
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 97a25eee..7e04a6cc 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.176 2021/07/02 00:08:26 tom Exp $
+ * $LynxId: SGML.c,v 1.177 2021/07/23 20:36:47 tom Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -981,6 +981,8 @@ static void handle_sgmlatt(HTStream *me)
 #define ALT_TAGP(t) ALT_TAGP_OF_TAGNUM(TAGNUM_OF_TAGP(t))
 #define NORMAL_TAGP(t) NORMAL_TAGP_OF_TAGNUM(TAGNUM_OF_TAGP(t))
 
+#define IsTagAlias(a,b) (((a) == (b)) || ((a) - (a)->alias == (b) - (b)->alias))
+
 static BOOL element_valid_within(HTTag * new_tag, HTTag * stacked_tag, int direct)
 {
     BOOL result = YES;
@@ -989,7 +991,7 @@ static BOOL element_valid_within(HTTag * new_tag, HTTag * stacked_tag, int direc
     if (stacked_tag && new_tag) {
 	usecontains = (direct ? stacked_tag->contains : stacked_tag->icontains);
 	usecontained = (direct ? new_tag->contained : new_tag->icontained);
-	if (new_tag == stacked_tag) {
+	if (IsTagAlias(new_tag, stacked_tag)) {
 	    result = (BOOL) ((Tgc_same & usecontains) &&
 			     (Tgc_same & usecontained));
 	} else {
@@ -1000,6 +1002,26 @@ static BOOL element_valid_within(HTTag * new_tag, HTTag * stacked_tag, int direc
     return result;
 }
 
+static BOOL element_really_within(HTTag * new_tag, HTTag * stacked_tag, int direct)
+{
+    BOOL result = YES;
+    TagClass usecontains, usecontained;
+
+    if (stacked_tag && new_tag) {
+	usecontains = (direct ? stacked_tag->contains : stacked_tag->icontains);
+	usecontained = (direct ? new_tag->contained : new_tag->icontained);
+	if (IsTagAlias(new_tag, stacked_tag)) {
+	    result = (BOOL) ((Tgc_same & usecontains) &&
+			     (Tgc_same & usecontained));
+	} else {
+	    result = (BOOL) ((new_tag->tagclass & usecontains) ==
+			     new_tag->tagclass &&
+			     (stacked_tag->tagclass & usecontained) == stacked_tag->tagclass);
+	}
+    }
+    return result;
+}
+
 typedef enum {
     close_NO = 0,
     close_error = 1,
@@ -1014,7 +1036,7 @@ static canclose_t can_close(HTTag * new_tag, HTTag * stacked_tag)
 	result = close_NO;
     } else if (stacked_tag->flags & Tgf_endO) {
 	result = close_valid;
-    } else if (new_tag == stacked_tag) {
+    } else if (IsTagAlias(new_tag, stacked_tag)) {
 	result = ((Tgc_same & new_tag->canclose)
 		  ? close_error
 		  : close_NO);
@@ -1057,7 +1079,7 @@ static int is_on_stack(HTStream *me, HTTag * old_tag)
     int i = 1;
 
     for (; stacked; stacked = stacked->next, i++) {
-	if (stacked->tag == old_tag ||
+	if (IsTagAlias(stacked->tag, old_tag) ||
 	    stacked->tag == ALT_TAGP(old_tag))
 	    return i;
     }
@@ -1072,8 +1094,21 @@ static void end_element(HTStream *me, HTTag * old_tag)
     BOOL extra_action_taken = NO;
     canclose_t canclose_check = close_valid;
     int stackpos = is_on_stack(me, old_tag);
+    BOOL direct_container = YES;
 
     if (!Old_DTD) {
+	if (old_tag->aliases) {
+	    if (me->element_stack) {
+		if (!element_really_within(old_tag,
+					   me->element_stack->tag,
+					   direct_container) &&
+		    element_really_within(old_tag + 1,
+					  me->element_stack->tag,
+					  direct_container)) {
+		    ++old_tag;
+		}
+	    }
+	}
 	while (canclose_check != close_NO &&
 	       me->element_stack &&
 	       (stackpos > 1 || (!extra_action_taken && stackpos == 0))) {
@@ -1195,7 +1230,7 @@ static void end_element(HTStream *me, HTTag * old_tag)
 		    ? (me->element_stack->tag->flags & Tgf_nolyspcl)
 		    : NO);
 #ifdef WIND_DOWN_STACK
-	if (old_tag == t)
+	if (IsTagAlias(old_tag, t))
 	    return;		/* Correct sequence */
 #else
 	return;
@@ -1223,10 +1258,22 @@ static void start_element(HTStream *me)
     canclose_t canclose_check = close_valid;
 
     if (!Old_DTD) {
+	if (new_tag->aliases) {
+	    if (me->element_stack) {
+		if (!element_really_within(new_tag,
+					   me->element_stack->tag,
+					   direct_container) &&
+		    element_really_within(new_tag + 1,
+					  me->element_stack->tag,
+					  direct_container)) {
+		    ++new_tag;
+		}
+	    }
+	}
 	while (me->element_stack &&
 	       (canclose_check == close_valid ||
 		(canclose_check == close_error &&
-		 new_tag == me->element_stack->tag)) &&
+		 IsTagAlias(new_tag, me->element_stack->tag))) &&
 	       !(valid = element_valid_within(new_tag,
 					      me->element_stack->tag,
 					      direct_container))) {
@@ -1417,6 +1464,7 @@ HTTag *SGMLFindTag(const SGML_dtd * dtd,
 	/* my_casecomp() - optimized by the first character, NOT_ASCII ok */
 	diff = my_casecomp(dtd->tags[i].name, s);	/* Case insensitive */
 	if (diff == 0) {	/* success: found it */
+	    i -= dtd->tags[i].alias;
 	    *res = &dtd->tags[i];
 	    return *res;
 	}
diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h
index 9fccdda2..8b6445f6 100644
--- a/WWW/Library/Implementation/SGML.h
+++ b/WWW/Library/Implementation/SGML.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.h,v 1.46 2012/02/10 18:32:26 tom Exp $
+ * $LynxId: SGML.h,v 1.47 2021/07/22 23:34:13 tom Exp $
  *			       SGML parse and stream definition for libwww
  *                             SGML AND STRUCTURED STREAMS
  *
@@ -99,6 +99,9 @@ extern "C" {
 #define Tgc_HEADstuff	0x40000	/* HEAD,BASE,STYLE,TITLE; */
     /* special relations */
 #define Tgc_same	0x80000
+#define Tgc_DELlike	0x100000
+    /* DELlike is a class of aliases for inline DEL/INS */
+    typedef unsigned char TagAlias;
 
 /*
  * Groups for contains-data.
@@ -163,6 +166,8 @@ extern "C" {
 	TagClass canclose;	/* which classes of elements can this one close
 				   if something looks wrong ? */
 	TagFlags flags;
+	TagAlias alias;		/* extra levels, e.g, DEL/INS */
+	TagAlias aliases;	/* number of extra levels, e.g, DEL/INS */
     };
 
 /*		DTD Information
diff --git a/WWW/Library/Implementation/dtd_util.c b/WWW/Library/Implementation/dtd_util.c
index 3301d819..cb783406 100644
--- a/WWW/Library/Implementation/dtd_util.c
+++ b/WWW/Library/Implementation/dtd_util.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: dtd_util.c,v 1.79 2018/12/27 10:28:12 tom Exp $
+ * $LynxId: dtd_util.c,v 1.80 2021/07/23 00:23:04 tom Exp $
  *
  * Given a SGML_dtd structure, write a corresponding flat file, or "C" source.
  * Given the flat-file, write the "C" source.
@@ -25,7 +25,7 @@ FILE *TraceFP(void)
 /*
  * Begin the actual utility.
  */
-#define GETOPT "chl:o:ts"
+#define GETOPT "chl:o:tsx"
 
 #define NOTE(message) fprintf(output, message "\n");
 /* *INDENT-OFF* */
@@ -42,6 +42,36 @@ FILE *TraceFP(void)
 
 #define ATTR_TYPE(name) { #name, name##_attr_list }
 
+static const char alias_codes[] = "!@#$%^&*";
+
+#define DATA(name) { #name, Tgc_##name }
+static const struct {
+    const char *name;
+    TagClass tagclass;
+} class_list[] = {
+	DATA(APPLETlike),
+	DATA(Alike),
+	DATA(BODYlike),
+	DATA(BRlike),
+	DATA(DELlike),
+	DATA(DIVlike),
+	DATA(EMlike),
+	DATA(FONTlike),
+	DATA(FORMlike),
+	DATA(HEADstuff),
+	DATA(HRlike),
+	DATA(LIlike),
+	DATA(MAPlike),
+	DATA(MATHlike),
+	DATA(Plike),
+	DATA(SELECTlike),
+	DATA(TRlike),
+	DATA(ULlike),
+	DATA(formula),
+	DATA(outer),
+	DATA(same)
+};
+
 static const attr core_attr_list[] = {
 	{ "CLASS"         T(c) },
 	{ "ID"            T(i) },
@@ -110,6 +140,7 @@ static void usage(void)
 	"  -o filename  specify output (default: stdout)",
 	"  -s           strict (HTML DTD 0)",
 	"  -t           tagsoup (HTML DTD 1)",
+	"  -x           cross-check contains/contained data (repeat for more)"
     };
     unsigned n;
 
@@ -284,12 +315,31 @@ static const char *NameOfAttrs(const SGML_dtd * dtd, int which)
     return result;
 }
 
-static const char *DEF_name(const SGML_dtd * dtd, int which)
+static const char *DEF_name(const SGML_dtd * dtd, int which, unsigned alias)
 {
     const char *result = dtd->tags[which].name;
 
-    if (!strcmp(result, "OBJECT") && !first_object(dtd, which))
+    if (!strcmp(result, "OBJECT") && !first_object(dtd, which)) {
 	result = "OBJECT_PCDATA";
+    } else if (alias) {
+	char buffer[1024];
+
+	sprintf(buffer, "%s_%d", result, alias + 1);
+	result = strdup(buffer);
+    }
+    return result;
+}
+
+static const char *EXT_name(HTTag * tag)
+{
+    const char *result = tag->name;
+
+    if (tag->alias) {
+	char buffer[1024];
+
+	sprintf(buffer, "%s%c", result, alias_codes[tag->alias - 1]);
+	result = strdup(buffer);
+    }
     return result;
 }
 
@@ -487,7 +537,7 @@ static void dump_src_HTTag_Defines(FILE *output, const SGML_dtd * dtd, int which
 	    "#define T_%-13s "
 	    myFMT "," myFMT "," myFMT "," myFMT "," myFMT "," myFMT
 	    "," myFMT "\n",
-	    DEF_name(dtd, which),
+	    DEF_name(dtd, which, tag->alias),
 	    tag->tagclass,
 	    tag->contains,
 	    tag->icontains,
@@ -589,7 +639,9 @@ static void dump_src_HTTag(FILE *output, const SGML_dtd * dtd, int which)
     PrintF(output, 19, " { %s(%s),", P_macro, tag->name);
     PrintF(output, 24, "ATTR_DATA(%s), ", NameOfAttrs(dtd, which));
     PrintF(output, 14, "%s,", SGMLContent2s(tag->contents));
-    fprintf(output, "T_%s", DEF_name(dtd, which));
+    fprintf(output, "T_%s", DEF_name(dtd, which, tag->alias));
+    fprintf(output, ", %d", tag->alias);
+    fprintf(output, ", %d", tag->aliases);
     fprintf(output, "},\n");
 }
 
@@ -606,9 +658,11 @@ static void dump_source(FILE *output, const SGML_dtd * dtd, int dtd_version)
 	{0, 0}
     };
     AttrType *gt;
+    TagAlias aliases;
 
     const char *marker = "src_HTMLDTD_H";
     int j;
+    int inalias;
 
     unsigned count = 0;
     AttrInfo *data = sorted_attrs(dtd, &count);
@@ -711,8 +765,9 @@ static void dump_source(FILE *output, const SGML_dtd * dtd, int dtd_version)
     NOTE("#undef T");
     NOTE("");
     NOTE("/* tag-names */");
+    /* FIXME - are these needed other than as parameters to macros? */
     for (j = 0; j <= dtd->number_of_tags; ++j) {
-	fprintf(output, "#undef %s\n", DEF_name(dtd, j));
+	fprintf(output, "#undef %s\n", DEF_name(dtd, j, 0));
     }
     NOTE("");
     NOTE("/* these definitions are used in the tags-tables */");
@@ -745,6 +800,20 @@ static void dump_source(FILE *output, const SGML_dtd * dtd, int dtd_version)
     fprintf(output,
 	    "static const HTTag tags_table%d[HTML_ALL_ELEMENTS] = {\n",
 	    dtd_version);
+    aliases = 0;
+    inalias = -1;
+    for (j = dtd->number_of_tags - 1; j >= 0; --j) {
+	dtd->tags[j].aliases = aliases;
+	if (aliases != 0) {
+	    if ((inalias - aliases) >= j) {
+		aliases = 0;
+		inalias = -1;
+	    }
+	} else if ((aliases = dtd->tags[j].alias) != 0) {
+	    inalias = j;
+	    dtd->tags[j].aliases = aliases;
+	}
+    }
     for (j = 0; j <= dtd->number_of_tags; ++j) {
 	if (j == dtd->number_of_tags) {
 	    NOTE("/* additional (alternative variants), not counted in HTML_ELEMENTS: */");
@@ -806,7 +875,12 @@ static void dump_header(FILE *output, const SGML_dtd * dtd)
 
     fprintf(output, "    typedef enum {\n");
     for (j = 0; j < dtd->number_of_tags; ++j) {
-	fprintf(output, "\tHTML_%s,\n", dtd->tags[j].name);
+	if (dtd->tags[j].alias) {
+	    fprintf(output, "\tHTML_%s_%d,\n", dtd->tags[j].name,
+		    dtd->tags[j].alias + 1);
+	} else {
+	    fprintf(output, "\tHTML_%s,\n", dtd->tags[j].name);
+	}
     }
     NOTE("\tHTML_ALT_OBJECT");
     NOTE("    } HTMLElement;\n");
@@ -921,6 +995,7 @@ static void dump_flat_TagClass(FILE *output, const char *name, TagClass theClass
     DUMP(BODYlike);
     DUMP(HEADstuff);
     DUMP(same);
+    DUMP(DELlike);
     if (theClass)
 	fprintf(output, " OOPS:%#x", theClass);
     fprintf(output, "\n");
@@ -953,7 +1028,7 @@ static void dump_flat_TagFlags(FILE *output, const char *name, TagFlags theFlags
 
 static void dump_flat_HTTag(FILE *output, unsigned n, HTTag * tag)
 {
-    fprintf(output, "\t%u:%s\n", n, tag->name);
+    fprintf(output, "\t%u:%s\n", n, EXT_name(tag));
 #ifdef USE_JUSTIFY_ELTS
     fprintf(output, "\t\t%s\n", tag->can_justify ? "justify" : "nojustify");
 #endif
@@ -1086,6 +1161,7 @@ static int load_flat_TagClass(FILE *input, const char *name, TagClass * theClass
 		LOAD(BODYlike);
 		LOAD(HEADstuff);
 		LOAD(same);
+		LOAD(DELlike);
 
 		fprintf(stderr, "Unexpected TagClass '%s'\n", data);
 		result = 0;
@@ -1186,7 +1262,7 @@ static int load_flat_AttrList(FILE *input, AttrList * attrs, int *length)
     return result;
 }
 
-static int load_flat_HTTag(FILE *input, unsigned nref, HTTag * tag, AttrType * allTypes)
+static int load_flat_HTTag(FILE *input, HTTag * tag, AttrType * allTypes)
 {
     int result = 0;
     unsigned ncmp = 0;
@@ -1195,8 +1271,23 @@ static int load_flat_HTTag(FILE *input, unsigned nref, HTTag * tag, AttrType * a
     int j;
 
     code = fscanf(input, "%d:%s\n", &ncmp, name);
-    if (code == 2 && (nref == ncmp)) {
+    if (code == 2) {
 	result = 1;
+	tag->alias = 0;
+	tag->aliases = 0;
+	for (j = 0; name[j] != '\0'; ++j) {
+	    int ch = UCH(name[j]);
+
+	    if (!isalnum(ch)) {
+		if (strchr(alias_codes, ch) != NULL) {
+		    tag->alias = (ch - '!') + 1;
+		    name[j] = '\0';
+		} else {
+		    result = 0;
+		}
+		break;
+	    }
+	}
 	tag->name = strdup(name);
 #ifdef USE_COLOR_STYLE
 	tag->name_len = strlen(tag->name);
@@ -1297,6 +1388,18 @@ static int load_flat_AttrType(FILE *input, AttrType * types, size_t ncmp)
     return result;
 }
 
+static int compare_tags(const void *a, const void *b)
+{
+    const HTTag *p = (const HTTag *) a;
+    const HTTag *q = (const HTTag *) b;
+    int result = 0;
+
+    if ((result = strcmp(p->name, q->name)) == 0) {
+	result = p->alias - q->alias;
+    }
+    return result;
+}
+
 static SGML_dtd *load_flatfile(FILE *input)
 {
     AttrType *attr_types = 0;
@@ -1323,7 +1426,7 @@ static SGML_dtd *load_flatfile(FILE *input)
 	if ((result = typecalloc(SGML_dtd)) != 0
 	    && (result->tags = typecallocn(HTTag, (number_of_tags + 2))) != 0) {
 	    for (n = 0; n < (size_t) number_of_tags; ++n) {
-		if (load_flat_HTTag(input, n, &(result->tags[n]), attr_types)) {
+		if (load_flat_HTTag(input, &(result->tags[n]), attr_types)) {
 		    result->number_of_tags = (n + 1);
 		} else {
 		    break;
@@ -1343,12 +1446,114 @@ static SGML_dtd *load_flatfile(FILE *input)
 	    if (tag == 0) {
 		fprintf(stderr, "Did not find OBJECT tag\n");
 		result = 0;
+	    } else {
+		qsort(result->tags, number_of_tags, sizeof(HTTag), compare_tags);
 	    }
 	}
     }
     return result;
 }
 
+static void cross_check(FILE *output, const SGML_dtd * the_dtd, int level)
+{
+    int ft;
+
+    fprintf(output, "Cross-check HTML DTD:\n");
+    fprintf(output, "\n");
+    /* make a sorted list of tags */
+    /* for each tag in the list, find the classes it might contain */
+    for (ft = 0; ft < the_dtd->number_of_tags; ++ft) {
+	int xc;
+	HTTag *ftag = &(the_dtd->tags[ft]);
+
+	/* for each contained-class, check if it says it can be contained */
+	fprintf(output, "tag %s\n", EXT_name(ftag));
+	for (xc = 0; class_list[xc].name != 0; ++xc) {
+	    int rt;
+	    int direct;
+	    int passes = 2;
+
+	    /* most of the tags are (should be) symmetric */
+	    if (level <= 1) {
+		BOOL same = TRUE;
+
+		if ((ftag->contains & class_list[xc].tagclass)
+		    != (ftag->icontains & class_list[xc].tagclass)) {
+		    same = FALSE;
+		} else if ((ftag->contains & class_list[xc].tagclass) == 0) {
+		    continue;
+		} else if (0) {
+		    HTTag *rtag;
+
+		    for (rt = 0; rt < the_dtd->number_of_tags; ++rt) {
+			rtag = &(the_dtd->tags[rt]);
+			if (ftag == rtag)
+			    continue;
+			if ((ftag->contains & rtag->tagclass) == 0)
+			    continue;
+			if ((rtag->contained & ftag->tagclass)
+			    != (rtag->icontained & ftag->tagclass)) {
+			    same = FALSE;
+			    break;
+			}
+		    }
+		}
+		if (same)
+		    passes = 1;
+	    }
+
+	    for (direct = 0; direct < passes; ++direct) {
+		TagClass check = (direct ? ftag->contains : ftag->icontains);
+		BOOL first = TRUE;
+
+		if ((check &= class_list[xc].tagclass) == 0)
+		    continue;
+
+		for (rt = 0; rt < the_dtd->number_of_tags; ++rt) {
+		    HTTag *rtag = &(the_dtd->tags[rt]);
+		    TagClass check2 = (direct ? rtag->contained : rtag->icontained);
+
+		    if (rt == ft)
+			continue;
+		    if ((check & rtag->tagclass) == 0)
+			continue;
+		    if ((check2 & ftag->tagclass) == 0)
+			continue;
+		    if (first) {
+			if (passes == 2) {
+			    fprintf(output, "\t%s (%s)\n",
+				    class_list[xc].name,
+				    direct ? "direct" : "indirect");
+			} else {
+			    fprintf(output, "\t%s\n",
+				    class_list[xc].name);
+			}
+		    }
+		    fprintf(output, "%s%s",
+			    first ? "\t\t" : " ",
+			    EXT_name(rtag));
+		    first = FALSE;
+		}
+		if (first) {
+		    if (level > 1) {
+			if (passes == 2) {
+			    fprintf(output, "\t%s (%s)\n",
+				    class_list[xc].name,
+				    direct ? "direct" : "indirect");
+			} else {
+			    fprintf(output, "\t%s\n",
+				    class_list[xc].name);
+			}
+			fprintf(output, "\t\t(missing)\n");
+		    }
+		} else {
+		    fprintf(output, "\n");
+		}
+	    }
+	}
+    }
+}
+
 int main(int argc, char *argv[])
 {
     const SGML_dtd *the_dtd = &HTML_dtd;
@@ -1357,6 +1562,7 @@ int main(int argc, char *argv[])
     int c_option = FALSE;
     int h_option = FALSE;
     int l_option = FALSE;
+    int x_option = 0;
     FILE *input = stdin;
     FILE *output = stdout;
 
@@ -1385,6 +1591,9 @@ int main(int argc, char *argv[])
 	case 's':
 	    dtd_version = 0;
 	    break;
+	case 'x':
+	    ++x_option;
+	    break;
 	default:
 	    usage();
 	}
@@ -1399,7 +1608,9 @@ int main(int argc, char *argv[])
 	    dump_source(output, the_dtd, dtd_version);
 	if (h_option)
 	    dump_header(output, the_dtd);
-	if (!c_option && !h_option)
+	if (x_option)
+	    cross_check(output, the_dtd, x_option);
+	if (!c_option && !h_option && !x_option)
 	    dump_flatfile(output, the_dtd);
     }
 
diff --git a/WWW/Library/Implementation/hdr_HTMLDTD.h b/WWW/Library/Implementation/hdr_HTMLDTD.h
index d00bf37e..662624ad 100644
--- a/WWW/Library/Implementation/hdr_HTMLDTD.h
+++ b/WWW/Library/Implementation/hdr_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: hdr_HTMLDTD.h,v 1.23 2015/12/13 23:08:45 Kihara.Hideto Exp $ */
+/* $LynxId: hdr_HTMLDTD.h,v 1.24 2021/07/16 00:40:16 tom Exp $ */
 #ifndef hdr_HTMLDTD_H
 #define hdr_HTMLDTD_H 1
 
@@ -49,6 +49,7 @@ extern "C" {
 	HTML_CREDIT,
 	HTML_DD,
 	HTML_DEL,
+	HTML_DEL_2,
 	HTML_DFN,
 	HTML_DIR,
 	HTML_DIV,
@@ -82,6 +83,7 @@ extern "C" {
 	HTML_IMG,
 	HTML_INPUT,
 	HTML_INS,
+	HTML_INS_2,
 	HTML_ISINDEX,
 	HTML_KBD,
 	HTML_KEYGEN,
@@ -156,10 +158,10 @@ extern "C" {
  */
 
 /* # of elements generally visible to Lynx code */
-#define HTML_ELEMENTS 126
+#define HTML_ELEMENTS 128
 
 /* # of elements visible to SGML parser */
-#define HTML_ALL_ELEMENTS 127
+#define HTML_ALL_ELEMENTS 129
 
 /*
 
diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in
index 6acd09ea..0b467d72 100644
--- a/WWW/Library/Implementation/makefile.in
+++ b/WWW/Library/Implementation/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.34 2020/08/28 18:44:35 tom Exp $
+# $LynxId: makefile.in,v 1.35 2021/07/16 20:01:00 tom Exp $
 # Make WWW under unix for a.n.other unix system (bsd)
 # Use this as a template
 
@@ -349,6 +349,10 @@ check: dtd_util$x
 	./dtd_util$x -l src0_HTMLDTD.txt >HTMLDTD.log
 	-$(DIFFC) src0_HTMLDTD.txt HTMLDTD.log
 
+	@echo "** comparing reloaded src1_HTMLDTD.txt"
+	./dtd_util$x -t -l src1_HTMLDTD.txt >HTMLDTD.log
+	-$(DIFFC) src1_HTMLDTD.txt HTMLDTD.log
+
 	@echo "** comparing header generated from builtin"
 	./dtd_util$x -s -h -o HTMLDTD.log
 	-$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log
diff --git a/WWW/Library/Implementation/src0_HTMLDTD.h b/WWW/Library/Implementation/src0_HTMLDTD.h
index 635b1c55..b800e183 100644
--- a/WWW/Library/Implementation/src0_HTMLDTD.h
+++ b/WWW/Library/Implementation/src0_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: src0_HTMLDTD.h,v 1.47 2019/12/03 20:52:56 Kihara.Hideto Exp $ */
+/* $LynxId: src0_HTMLDTD.h,v 1.48 2021/07/23 21:36:23 tom Exp $ */
 #ifndef src_HTMLDTD_H0
 #define src_HTMLDTD_H0 1
 
@@ -8,62 +8,63 @@
 #define T_A             0x00008,0x0B007,0x0FF17,0x37787,0x77BA7,0x8604F,0x00014
 #define T_ABBR          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
 #define T_ACRONYM       0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
-#define T_ADDRESS       0x00200,0x0F14F,0x8FFFF,0x36680,0xB6FAF,0x80317,0x00000
+#define T_ADDRESS       0x00200,0x0F14F,0x8FFFF,0x136680,0x1B6FAF,0x80317,0x00000
 #define T_APPLET        0x02000,0x0B0CF,0x8FFFF,0x37F9F,0xB7FBF,0x8300F,0x00000
 #define T_AREA          0x08000,0x00000,0x00000,0x08000,0x3FFFF,0x00F1F,0x00001
-#define T_ARTICLE       0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
-#define T_ASIDE         0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_ARTICLE       0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
+#define T_ASIDE         0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_AU            0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
 #define T_AUTHOR        0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
 #define T_B             0x00001,0x8B04F,0xAFFFF,0xA778F,0xF7FBF,0x00001,0x00014
-#define T_BANNER        0x00200,0x0FB8F,0x0FFFF,0x30000,0x30000,0x8031F,0x00000
+#define T_BANNER        0x00200,0x0FB8F,0x0FFFF,0x130000,0x130000,0x8031F,0x00000
 #define T_BASE          0x40000,0x00000,0x00000,0x50000,0x50000,0x8000F,0x00001
 #define T_BASEFONT      0x01000,0x00000,0x00000,0x377AF,0x37FAF,0x8F000,0x00001
-#define T_BDO           0x00100,0x0B04F,0x8FFFF,0x36680,0xB6FAF,0x0033F,0x00000
+#define T_BDO           0x00100,0x0B04F,0x8FFFF,0x136680,0x1B6FAF,0x0033F,0x00000
 #define T_BGSOUND       0x01000,0x00000,0x00000,0x777AF,0x77FAF,0x8730F,0x00001
 #define T_BIG           0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
 #define T_BLINK         0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00001,0x00014
-#define T_BLOCKQUOTE    0x00200,0xAFBCF,0xAFFFF,0xB6680,0xB6FAF,0x8031F,0x00000
-#define T_BODY          0x20000,0x2FB8F,0x2FFFF,0x30000,0x30000,0xDFF7F,0x00003
-#define T_BODYTEXT      0x20000,0x0FB8F,0xAFFFF,0x30200,0xB7FAF,0x8F17F,0x00003
-#define T_BQ            0x00200,0xAFBCF,0xAFFFF,0xB6680,0xB6FAF,0x8031F,0x00000
+#define T_BLOCKQUOTE    0x00200,0xAFBCF,0xAFFFF,0x1B6680,0x1B6FAF,0x8031F,0x00000
+#define T_BODY          0x20000,0x12FB8F,0x12FFFF,0x30000,0x30000,0xDFF7F,0x00003
+#define T_BODYTEXT      0x20000,0x10FB8F,0x1AFFFF,0x30200,0xB7FAF,0x8F17F,0x00003
+#define T_BQ            0x00200,0xAFBCF,0xAFFFF,0x1B6680,0x1B6FAF,0x8031F,0x00000
 #define T_BR            0x01000,0x00000,0x00000,0x377BF,0x77FBF,0x8101F,0x00001
 #define T_BUTTON        0x02000,0x0BB07,0x0FF37,0x0378F,0x37FBF,0x8115F,0x00000
-#define T_CAPTION       0x00100,0x0B04F,0x8FFFF,0x06A00,0xB6FA7,0x8035F,0x00000
-#define T_CENTER        0x00200,0x8FBCF,0x8FFFF,0xB6680,0xB6FA7,0x8071F,0x00000
+#define T_CAPTION       0x00100,0x0B04F,0x8FFFF,0x106A00,0x1B6FA7,0x8035F,0x00000
+#define T_CENTER        0x00200,0x8FBCF,0x8FFFF,0x1B6680,0x1B6FA7,0x8071F,0x00000
 #define T_CITE          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
 #define T_CODE          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00000
 #define T_COL           0x04000,0x00000,0x00000,0x00820,0x36FA7,0x88F5F,0x00001
 #define T_COLGROUP      0x00020,0x04000,0x04000,0x00800,0x36FA7,0x8875F,0x00001
 #define T_COMMENT       0x00004,0x00000,0x00000,0xA77AF,0x7FFFF,0x00003,0x00000
-#define T_CREDIT        0x00100,0x0B04F,0x8FFFF,0x06A00,0xB7FBF,0x8030F,0x00000
+#define T_CREDIT        0x00100,0x0B04F,0x8FFFF,0x106A00,0x1B7FBF,0x8030F,0x00000
 #define T_DD            0x00400,0x0FBCF,0x8FFFF,0x00800,0xB6FFF,0x8071F,0x00001
-#define T_DEL           0x00002,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x00003,0x00000
+#define T_DEL           0x00002,0x8B04F,0x8FEFF,0x87F8F,0xF7FBF,0x100003,0x00000
+#define T_DEL_2         0x100000,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x100003,0x00000
 #define T_DFN           0x00002,0x8B0CF,0x8FFFF,0x8778F,0xF7FBF,0x00003,0x00000
-#define T_DIR           0x00800,0x0B400,0x0F75F,0x37680,0x36FB7,0x84F7F,0x00000
-#define T_DIV           0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x80317,0x00004
-#define T_DL            0x00800,0x0C480,0x8FFFF,0x36680,0xB7FB7,0x00757,0x00000
-#define T_DLC           0x00800,0x0C480,0x8FFFF,0x36680,0xB7FB7,0x0075F,0x00000
+#define T_DIR           0x00800,0x0B400,0x0F75F,0x137680,0x136FB7,0x84F7F,0x00000
+#define T_DIV           0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x80317,0x00004
+#define T_DL            0x00800,0x0C480,0x8FFFF,0x136680,0x1B7FB7,0x00757,0x00000
+#define T_DLC           0x00800,0x0C480,0x8FFFF,0x136680,0x1B7FB7,0x0075F,0x00000
 #define T_DT            0x00400,0x0B04F,0x0B1FF,0x00800,0x17FFF,0x8071F,0x00001
 #define T_EM            0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00010
 #define T_EMBED         0x02000,0x8F107,0x8FFF7,0xB6FBF,0xB7FBF,0x1FF7F,0x00001
-#define T_FIELDSET      0x00200,0x8FB4F,0x8FF7F,0x86787,0xB7FF7,0x8805F,0x00000
-#define T_FIG           0x00200,0x0FB00,0x8FFFF,0x36680,0xB6FBF,0x8834F,0x00000
-#define T_FIGURE        0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
-#define T_FN            0x00200,0x8FBCF,0x8FFFF,0xB6680,0xB7EBF,0x8114F,0x00000
+#define T_FIELDSET      0x00200,0x8FB4F,0x8FF7F,0x186787,0x1B7FF7,0x8805F,0x00000
+#define T_FIG           0x00200,0x0FB00,0x8FFFF,0x136680,0x1B6FBF,0x8834F,0x00000
+#define T_FIGURE        0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
+#define T_FN            0x00200,0x8FBCF,0x8FFFF,0x1B6680,0x1B7EBF,0x8114F,0x00000
 #define T_FONT          0x00001,0x8B04F,0x8FFFF,0xB778F,0xF7FBF,0x00001,0x00014
-#define T_FOOTER        0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
-#define T_FORM          0x00080,0x0FF6F,0x0FF7F,0x36E07,0x32F07,0x88DFF,0x00000
+#define T_FOOTER        0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
+#define T_FORM          0x00080,0x0FF6F,0x0FF7F,0x136E07,0x132F07,0x88DFF,0x00000
 #define T_FRAME         0x10000,0x00000,0x00000,0x10000,0x10000,0x9FFFF,0x00001
 #define T_FRAMESET      0x10000,0x90000,0x90000,0x90000,0x93000,0x9FFFF,0x00000
-#define T_H1            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H2            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H3            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H4            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H5            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H6            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
+#define T_H1            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H2            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H3            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H4            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H5            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H6            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
 #define T_HEAD          0x40000,0x4F000,0x47000,0x10000,0x10000,0x9FF7F,0x00007
-#define T_HEADER        0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_HEADER        0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_HR            0x04000,0x00000,0x00000,0x3FE80,0x3FFBF,0x87F37,0x00001
 #define T_HTML          0x10000,0x7FB8F,0x7FFFF,0x00000,0x00000,0x1FFFF,0x00003
 #define T_HY            0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
@@ -71,7 +72,8 @@
 #define T_IFRAME        0x02000,0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0xD315F,0x00000
 #define T_IMG           0x01000,0x00000,0x00000,0x3779F,0x37FBF,0x80000,0x00001
 #define T_INPUT         0x00040,0x00000,0x00000,0x03F87,0x37F87,0x8904F,0x00001
-#define T_INS           0x00002,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x00003,0x00000
+#define T_INS           0x00002,0x8B04F,0x8FEFF,0x87F8F,0xF7FBF,0x100003,0x00000
+#define T_INS_2         0x100000,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x100003,0x00000
 #define T_ISINDEX       0x08000,0x00000,0x00000,0x7778F,0x7FFAF,0x80007,0x00001
 #define T_KBD           0x00002,0x00000,0x00000,0x2778F,0x77FBF,0x00003,0x00000
 #define T_KEYGEN        0x00040,0x00000,0x00000,0x07FB7,0x37FB7,0x80070,0x00001
@@ -80,30 +82,30 @@
 #define T_LH            0x00400,0x0BB7F,0x8FFFF,0x00800,0x97FFF,0x8071F,0x00001
 #define T_LI            0x00400,0x0BBFF,0x8FFFF,0x00800,0x97FFF,0x8071F,0x00001
 #define T_LINK          0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
-#define T_LISTING       0x00800,0x00000,0x00000,0x36600,0x36F00,0x80F1F,0x00000
-#define T_MAIN          0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_LISTING       0x00800,0x00000,0x00000,0x136600,0x136F00,0x80F1F,0x00000
+#define T_MAIN          0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_MAP           0x08000,0x08000,0x08000,0x37FCF,0x37FBF,0x0051F,0x00000
 #define T_MARQUEE       0x04000,0x0000F,0x8F01F,0x37787,0xB7FA7,0x8301C,0x00000
 #define T_MATH          0x00004,0x0B05F,0x8FFFF,0x2778F,0xF7FBF,0x0001F,0x00000
-#define T_MENU          0x00800,0x0B400,0x0F75F,0x17680,0x36FB7,0x88F7F,0x00000
+#define T_MENU          0x00800,0x0B400,0x0F75F,0x117680,0x136FB7,0x88F7F,0x00000
 #define T_META          0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
-#define T_NAV           0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_NAV           0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_NEXTID        0x01000,0x00000,0x00000,0x50000,0x1FFF7,0x00001,0x00001
-#define T_NOFRAMES      0x20000,0x2FB8F,0x0FFFF,0x17000,0x17000,0x0CF5F,0x00000
-#define T_NOTE          0x00200,0x0BBAF,0x8FFFF,0x376B0,0xB7FFF,0x8031F,0x00000
+#define T_NOFRAMES      0x20000,0x12FB8F,0x10FFFF,0x17000,0x17000,0x0CF5F,0x00000
+#define T_NOTE          0x00200,0x0BBAF,0x8FFFF,0x1376B0,0x1B7FFF,0x8031F,0x00000
 #define T_OBJECT        0x02000,0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0x83D5F,0x00020
-#define T_OL            0x00800,0x0C400,0x8FFFF,0x37680,0xB7FB7,0x88F7F,0x00000
+#define T_OL            0x00800,0x0C400,0x8FFFF,0x137680,0x1B7FB7,0x88F7F,0x00000
 #define T_OPTION        0x08000,0x00000,0x00000,0x00040,0x37FFF,0x8031F,0x00001
 #define T_OVERLAY       0x04000,0x00000,0x00000,0x00200,0x37FBF,0x83F7F,0x00001
-#define T_P             0x00100,0x0B04F,0x8FFFF,0x36680,0xB6FA7,0x80117,0x00001
+#define T_P             0x00100,0x0B04F,0x8FFFF,0x136680,0x1B6FA7,0x80117,0x00001
 #define T_PARAM         0x01000,0x00000,0x00000,0x33500,0x37FFF,0x81560,0x00001
 #define T_PLAINTEXT     0x10000,0xFFFFF,0xFFFFF,0x90000,0x90000,0x3FFFF,0x00001
-#define T_PRE           0x00200,0x0F04F,0x0F05E,0x36680,0x36FF0,0x8071E,0x00000
+#define T_PRE           0x00200,0x0F04F,0x0F05E,0x136680,0x136FF0,0x8071E,0x00000
 #define T_Q             0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00000
 #define T_S             0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
 #define T_SAMP          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
 #define T_SCRIPT        0x02000,0x00000,0x00000,0x77F9F,0x77FFF,0x87D5F,0x00000
-#define T_SECTION       0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_SECTION       0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_SELECT        0x00040,0x08000,0x08000,0x03FAF,0x33FBF,0x80D5F,0x00008
 #define T_SHY           0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
 #define T_SMALL         0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
@@ -115,11 +117,11 @@
 #define T_SUB           0x00004,0x8B05F,0x8FFFF,0x8779F,0xF7FBF,0x00007,0x00000
 #define T_SUP           0x00004,0x8B05F,0x8FFFF,0x8779F,0xF7FBF,0x00007,0x00000
 #define T_TAB           0x01000,0x00000,0x00000,0x3778F,0x57FAF,0x00001,0x00001
-#define T_TABLE         0x00800,0x0F1E0,0x8FFFF,0x36680,0xB6FA7,0x8C57F,0x00000
+#define T_TABLE         0x00800,0x0F1E0,0x8FFFF,0x136680,0x1B6FA7,0x8C57F,0x00000
 #define T_TBODY         0x00020,0x00020,0x8FFFF,0x00880,0xB7FB7,0x8C75F,0x00003
 #define T_TD            0x00400,0x0FBCF,0x8FFFF,0x00020,0xB7FB7,0x8C75F,0x00001
 #define T_TEXTAREA      0x00040,0x00000,0x00000,0x07F8F,0x33FBF,0x80D5F,0x00040
-#define T_TEXTFLOW      0x20000,0x8FBFF,0x9FFFF,0x977B0,0xB7FB7,0x9B00F,0x00003
+#define T_TEXTFLOW      0x20000,0x18FBFF,0x19FFFF,0x977B0,0xB7FB7,0x9B00F,0x00003
 #define T_TFOOT         0x00020,0x00020,0x8FFFF,0x00800,0xB7FB7,0x8CF5F,0x00001
 #define T_TH            0x00400,0x0FBCF,0x0FFFF,0x00020,0xB7FB7,0x8CF5F,0x00001
 #define T_THEAD         0x00020,0x00020,0x8FFFF,0x00800,0xB7FB7,0x8CF5F,0x00001
@@ -127,10 +129,10 @@
 #define T_TR            0x00020,0x00400,0x8FFFF,0x00820,0xB7FB7,0x8C75F,0x00001
 #define T_TT            0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00010
 #define T_U             0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
-#define T_UL            0x00800,0x0C480,0x8FFFF,0x36680,0xB7FFF,0x8075F,0x00000
+#define T_UL            0x00800,0x0C480,0x8FFFF,0x136680,0x1B7FFF,0x8075F,0x00000
 #define T_VAR           0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
 #define T_WBR           0x00001,0x00000,0x00000,0x3778F,0x77FBF,0x8101F,0x00001
-#define T_XMP           0x00800,0x00000,0x00000,0x367E0,0x36FFF,0x0875F,0x00001
+#define T_XMP           0x00800,0x00000,0x00000,0x1367E0,0x136FFF,0x0875F,0x00001
 #define T_OBJECT_PCDATA 0x02000,0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0x83D5F,0x00008
 #define T__UNREC_	0x00000,0x00000,0x00000,0x00000,0x00000,0x00000,0x00000
 #ifdef USE_PRETTYSRC
@@ -2214,6 +2216,7 @@ static const attr UL_attr[] = {         /* DIR attributes */
 #undef CREDIT
 #undef DD
 #undef DEL
+#undef DEL
 #undef DFN
 #undef DIR
 #undef DIV
@@ -2247,6 +2250,7 @@ static const attr UL_attr[] = {         /* DIR attributes */
 #undef IMG
 #undef INPUT
 #undef INS
+#undef INS
 #undef ISINDEX
 #undef KBD
 #undef KEYGEN
@@ -2334,136 +2338,138 @@ static const attr UL_attr[] = {         /* DIR attributes */
 #endif /* once_HTMLDTD */
 /* *INDENT-OFF* */
 static const HTTag tags_table0[HTML_ALL_ELEMENTS] = {
- { P(A),           ATTR_DATA(A),           SGML_EMPTY,   T_A},
- { P(ABBR),        ATTR_DATA(GEN),         SGML_MIXED,   T_ABBR},
- { P(ACRONYM),     ATTR_DATA(GEN),         SGML_MIXED,   T_ACRONYM},
- { P(ADDRESS),     ATTR_DATA(ADDRESS),     SGML_MIXED,   T_ADDRESS},
- { P(APPLET),      ATTR_DATA(APPLET),      SGML_MIXED,   T_APPLET},
- { P(AREA),        ATTR_DATA(AREA),        SGML_EMPTY,   T_AREA},
- { P(ARTICLE),     ATTR_DATA(GEN5),        SGML_MIXED,   T_ARTICLE},
- { P(ASIDE),       ATTR_DATA(GEN5),        SGML_MIXED,   T_ASIDE},
- { P(AU),          ATTR_DATA(GEN),         SGML_MIXED,   T_AU},
- { P(AUTHOR),      ATTR_DATA(GEN),         SGML_MIXED,   T_AUTHOR},
- { P(B),           ATTR_DATA(GEN),         SGML_EMPTY,   T_B},
- { P0(BANNER),     ATTR_DATA(GEN),         SGML_MIXED,   T_BANNER},
- { P(BASE),        ATTR_DATA(BASE),        SGML_EMPTY,   T_BASE},
- { P(BASEFONT),    ATTR_DATA(FONT),        SGML_EMPTY,   T_BASEFONT},
- { P(BDO),         ATTR_DATA(GEN),         SGML_MIXED,   T_BDO},
- { P(BGSOUND),     ATTR_DATA(BGSOUND),     SGML_EMPTY,   T_BGSOUND},
- { P(BIG),         ATTR_DATA(GEN),         SGML_MIXED,   T_BIG},
- { P(BLINK),       ATTR_DATA(GEN),         SGML_EMPTY,   T_BLINK},
- { P(BLOCKQUOTE),  ATTR_DATA(BQ),          SGML_MIXED,   T_BLOCKQUOTE},
- { P(BODY),        ATTR_DATA(BODY),        SGML_MIXED,   T_BODY},
- { P(BODYTEXT),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_BODYTEXT},
- { P(BQ),          ATTR_DATA(BQ),          SGML_MIXED,   T_BQ},
- { P(BR),          ATTR_DATA(GEN),         SGML_EMPTY,   T_BR},
- { P(BUTTON),      ATTR_DATA(BUTTON),      SGML_MIXED,   T_BUTTON},
- { P(CAPTION),     ATTR_DATA(CAPTION),     SGML_MIXED,   T_CAPTION},
- { P(CENTER),      ATTR_DATA(DIV),         SGML_MIXED,   T_CENTER},
- { P(CITE),        ATTR_DATA(GEN),         SGML_EMPTY,   T_CITE},
- { P(CODE),        ATTR_DATA(GEN),         SGML_MIXED,   T_CODE},
- { P(COL),         ATTR_DATA(COL),         SGML_EMPTY,   T_COL},
- { P(COLGROUP),    ATTR_DATA(COL),         SGML_EMPTY,   T_COLGROUP},
- { P(COMMENT),     ATTR_DATA(GEN),         SGML_MIXED,   T_COMMENT},
- { P(CREDIT),      ATTR_DATA(GEN),         SGML_MIXED,   T_CREDIT},
- { P(DD),          ATTR_DATA(GEN),         SGML_EMPTY,   T_DD},
- { P(DEL),         ATTR_DATA(DEL),         SGML_MIXED,   T_DEL},
- { P(DFN),         ATTR_DATA(GEN),         SGML_MIXED,   T_DFN},
- { P(DIR),         ATTR_DATA(UL),          SGML_MIXED,   T_DIR},
- { P(DIV),         ATTR_DATA(DIV),         SGML_MIXED,   T_DIV},
- { P(DL),          ATTR_DATA(DL),          SGML_MIXED,   T_DL},
- { P(DLC),         ATTR_DATA(DL),          SGML_MIXED,   T_DLC},
- { P(DT),          ATTR_DATA(GEN),         SGML_EMPTY,   T_DT},
- { P(EM),          ATTR_DATA(GEN),         SGML_EMPTY,   T_EM},
- { P(EMBED),       ATTR_DATA(EMBED),       SGML_EMPTY,   T_EMBED},
- { P(FIELDSET),    ATTR_DATA(GEN),         SGML_MIXED,   T_FIELDSET},
- { P(FIG),         ATTR_DATA(FIG),         SGML_MIXED,   T_FIG},
- { P(FIGURE),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FIGURE},
- { P(FN),          ATTR_DATA(GEN),         SGML_MIXED,   T_FN},
- { P(FONT),        ATTR_DATA(FONT),        SGML_EMPTY,   T_FONT},
- { P(FOOTER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FOOTER},
- { P(FORM),        ATTR_DATA(FORM),        SGML_EMPTY,   T_FORM},
- { P(FRAME),       ATTR_DATA(FRAME),       SGML_EMPTY,   T_FRAME},
- { P(FRAMESET),    ATTR_DATA(FRAMESET),    SGML_MIXED,   T_FRAMESET},
- { P0(H1),         ATTR_DATA(H),           SGML_MIXED,   T_H1},
- { P0(H2),         ATTR_DATA(H),           SGML_MIXED,   T_H2},
- { P0(H3),         ATTR_DATA(H),           SGML_MIXED,   T_H3},
- { P0(H4),         ATTR_DATA(H),           SGML_MIXED,   T_H4},
- { P0(H5),         ATTR_DATA(H),           SGML_MIXED,   T_H5},
- { P0(H6),         ATTR_DATA(H),           SGML_MIXED,   T_H6},
- { P(HEAD),        ATTR_DATA(GEN),         SGML_MIXED,   T_HEAD},
- { P(HEADER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_HEADER},
- { P(HR),          ATTR_DATA(HR),          SGML_EMPTY,   T_HR},
- { P(HTML),        ATTR_DATA(GEN),         SGML_MIXED,   T_HTML},
- { P(HY),          ATTR_DATA(GEN),         SGML_EMPTY,   T_HY},
- { P(I),           ATTR_DATA(GEN),         SGML_EMPTY,   T_I},
- { P(IFRAME),      ATTR_DATA(IFRAME),      SGML_MIXED,   T_IFRAME},
- { P(IMG),         ATTR_DATA(IMG),         SGML_EMPTY,   T_IMG},
- { P(INPUT),       ATTR_DATA(INPUT),       SGML_EMPTY,   T_INPUT},
- { P(INS),         ATTR_DATA(DEL),         SGML_MIXED,   T_INS},
- { P(ISINDEX),     ATTR_DATA(ISINDEX),     SGML_EMPTY,   T_ISINDEX},
- { P(KBD),         ATTR_DATA(GEN),         SGML_MIXED,   T_KBD},
- { P(KEYGEN),      ATTR_DATA(KEYGEN),      SGML_EMPTY,   T_KEYGEN},
- { P(LABEL),       ATTR_DATA(LABEL),       SGML_MIXED,   T_LABEL},
- { P(LEGEND),      ATTR_DATA(CAPTION),     SGML_MIXED,   T_LEGEND},
- { P(LH),          ATTR_DATA(GEN),         SGML_EMPTY,   T_LH},
- { P(LI),          ATTR_DATA(LI),          SGML_EMPTY,   T_LI},
- { P(LINK),        ATTR_DATA(LINK),        SGML_EMPTY,   T_LINK},
- { P(LISTING),     ATTR_DATA(GEN),         SGML_LITTERAL,T_LISTING},
- { P(MAIN),        ATTR_DATA(GEN5),        SGML_MIXED,   T_MAIN},
- { P(MAP),         ATTR_DATA(MAP),         SGML_MIXED,   T_MAP},
- { P(MARQUEE),     ATTR_DATA(GEN),         SGML_MIXED,   T_MARQUEE},
- { P(MATH),        ATTR_DATA(MATH),        SGML_LITTERAL,T_MATH},
- { P(MENU),        ATTR_DATA(UL),          SGML_MIXED,   T_MENU},
- { P(META),        ATTR_DATA(META),        SGML_EMPTY,   T_META},
- { P(NAV),         ATTR_DATA(GEN5),        SGML_MIXED,   T_NAV},
- { P(NEXTID),      ATTR_DATA(NEXTID),      SGML_EMPTY,   T_NEXTID},
- { P(NOFRAMES),    ATTR_DATA(GEN),         SGML_MIXED,   T_NOFRAMES},
- { P(NOTE),        ATTR_DATA(NOTE),        SGML_MIXED,   T_NOTE},
- { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_LITTERAL,T_OBJECT},
- { P(OL),          ATTR_DATA(OL),          SGML_MIXED,   T_OL},
- { P(OPTION),      ATTR_DATA(OPTION),      SGML_EMPTY,   T_OPTION},
- { P(OVERLAY),     ATTR_DATA(OVERLAY),     SGML_EMPTY,   T_OVERLAY},
- { P(P),           ATTR_DATA(P),           SGML_EMPTY,   T_P},
- { P(PARAM),       ATTR_DATA(PARAM),       SGML_EMPTY,   T_PARAM},
- { P(PLAINTEXT),   ATTR_DATA(GEN),         SGML_LITTERAL,T_PLAINTEXT},
- { P0(PRE),        ATTR_DATA(GEN),         SGML_MIXED,   T_PRE},
- { P(Q),           ATTR_DATA(Q),           SGML_MIXED,   T_Q},
- { P(S),           ATTR_DATA(GEN),         SGML_MIXED,   T_S},
- { P(SAMP),        ATTR_DATA(GEN),         SGML_MIXED,   T_SAMP},
- { P(SCRIPT),      ATTR_DATA(SCRIPT),      SGML_LITTERAL,T_SCRIPT},
- { P(SECTION),     ATTR_DATA(GEN5),        SGML_MIXED,   T_SECTION},
- { P(SELECT),      ATTR_DATA(SELECT),      SGML_MIXED,   T_SELECT},
- { P(SHY),         ATTR_DATA(GEN),         SGML_EMPTY,   T_SHY},
- { P(SMALL),       ATTR_DATA(GEN),         SGML_MIXED,   T_SMALL},
- { P(SPAN),        ATTR_DATA(GEN),         SGML_MIXED,   T_SPAN},
- { P(SPOT),        ATTR_DATA(GEN),         SGML_EMPTY,   T_SPOT},
- { P(STRIKE),      ATTR_DATA(GEN),         SGML_MIXED,   T_STRIKE},
- { P(STRONG),      ATTR_DATA(GEN),         SGML_EMPTY,   T_STRONG},
- { P(STYLE),       ATTR_DATA(STYLE),       SGML_LITTERAL,T_STYLE},
- { P(SUB),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUB},
- { P(SUP),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUP},
- { P(TAB),         ATTR_DATA(TAB),         SGML_EMPTY,   T_TAB},
- { P(TABLE),       ATTR_DATA(TABLE),       SGML_MIXED,   T_TABLE},
- { P(TBODY),       ATTR_DATA(TR),          SGML_EMPTY,   T_TBODY},
- { P(TD),          ATTR_DATA(TD),          SGML_EMPTY,   T_TD},
- { P(TEXTAREA),    ATTR_DATA(TEXTAREA),    SGML_LITTERAL,T_TEXTAREA},
- { P(TEXTFLOW),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_TEXTFLOW},
- { P(TFOOT),       ATTR_DATA(TR),          SGML_EMPTY,   T_TFOOT},
- { P(TH),          ATTR_DATA(TD),          SGML_EMPTY,   T_TH},
- { P(THEAD),       ATTR_DATA(TR),          SGML_EMPTY,   T_THEAD},
- { P(TITLE),       ATTR_DATA(GEN),         SGML_RCDATA,  T_TITLE},
- { P(TR),          ATTR_DATA(TR),          SGML_EMPTY,   T_TR},
- { P(TT),          ATTR_DATA(GEN),         SGML_EMPTY,   T_TT},
- { P(U),           ATTR_DATA(GEN),         SGML_EMPTY,   T_U},
- { P(UL),          ATTR_DATA(UL),          SGML_MIXED,   T_UL},
- { P(VAR),         ATTR_DATA(GEN),         SGML_MIXED,   T_VAR},
- { P(WBR),         ATTR_DATA(GEN),         SGML_EMPTY,   T_WBR},
- { P0(XMP),        ATTR_DATA(GEN),         SGML_LITTERAL,T_XMP},
+ { P(A),           ATTR_DATA(A),           SGML_EMPTY,   T_A, 0, 0},
+ { P(ABBR),        ATTR_DATA(GEN),         SGML_MIXED,   T_ABBR, 0, 0},
+ { P(ACRONYM),     ATTR_DATA(GEN),         SGML_MIXED,   T_ACRONYM, 0, 0},
+ { P(ADDRESS),     ATTR_DATA(ADDRESS),     SGML_MIXED,   T_ADDRESS, 0, 0},
+ { P(APPLET),      ATTR_DATA(APPLET),      SGML_MIXED,   T_APPLET, 0, 0},
+ { P(AREA),        ATTR_DATA(AREA),        SGML_EMPTY,   T_AREA, 0, 0},
+ { P(ARTICLE),     ATTR_DATA(GEN5),        SGML_MIXED,   T_ARTICLE, 0, 0},
+ { P(ASIDE),       ATTR_DATA(GEN5),        SGML_MIXED,   T_ASIDE, 0, 0},
+ { P(AU),          ATTR_DATA(GEN),         SGML_MIXED,   T_AU, 0, 0},
+ { P(AUTHOR),      ATTR_DATA(GEN),         SGML_MIXED,   T_AUTHOR, 0, 0},
+ { P(B),           ATTR_DATA(GEN),         SGML_EMPTY,   T_B, 0, 0},
+ { P0(BANNER),     ATTR_DATA(GEN),         SGML_MIXED,   T_BANNER, 0, 0},
+ { P(BASE),        ATTR_DATA(BASE),        SGML_EMPTY,   T_BASE, 0, 0},
+ { P(BASEFONT),    ATTR_DATA(FONT),        SGML_EMPTY,   T_BASEFONT, 0, 0},
+ { P(BDO),         ATTR_DATA(GEN),         SGML_MIXED,   T_BDO, 0, 0},
+ { P(BGSOUND),     ATTR_DATA(BGSOUND),     SGML_EMPTY,   T_BGSOUND, 0, 0},
+ { P(BIG),         ATTR_DATA(GEN),         SGML_MIXED,   T_BIG, 0, 0},
+ { P(BLINK),       ATTR_DATA(GEN),         SGML_EMPTY,   T_BLINK, 0, 0},
+ { P(BLOCKQUOTE),  ATTR_DATA(BQ),          SGML_MIXED,   T_BLOCKQUOTE, 0, 0},
+ { P(BODY),        ATTR_DATA(BODY),        SGML_MIXED,   T_BODY, 0, 0},
+ { P(BODYTEXT),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_BODYTEXT, 0, 0},
+ { P(BQ),          ATTR_DATA(BQ),          SGML_MIXED,   T_BQ, 0, 0},
+ { P(BR),          ATTR_DATA(GEN),         SGML_EMPTY,   T_BR, 0, 0},
+ { P(BUTTON),      ATTR_DATA(BUTTON),      SGML_MIXED,   T_BUTTON, 0, 0},
+ { P(CAPTION),     ATTR_DATA(CAPTION),     SGML_MIXED,   T_CAPTION, 0, 0},
+ { P(CENTER),      ATTR_DATA(DIV),         SGML_MIXED,   T_CENTER, 0, 0},
+ { P(CITE),        ATTR_DATA(GEN),         SGML_EMPTY,   T_CITE, 0, 0},
+ { P(CODE),        ATTR_DATA(GEN),         SGML_MIXED,   T_CODE, 0, 0},
+ { P(COL),         ATTR_DATA(COL),         SGML_EMPTY,   T_COL, 0, 0},
+ { P(COLGROUP),    ATTR_DATA(COL),         SGML_EMPTY,   T_COLGROUP, 0, 0},
+ { P(COMMENT),     ATTR_DATA(GEN),         SGML_MIXED,   T_COMMENT, 0, 0},
+ { P(CREDIT),      ATTR_DATA(GEN),         SGML_MIXED,   T_CREDIT, 0, 0},
+ { P(DD),          ATTR_DATA(GEN),         SGML_EMPTY,   T_DD, 0, 0},
+ { P(DEL),         ATTR_DATA(DEL),         SGML_MIXED,   T_DEL, 0, 1},
+ { P(DEL),         ATTR_DATA(DEL),         SGML_MIXED,   T_DEL_2, 1, 1},
+ { P(DFN),         ATTR_DATA(GEN),         SGML_MIXED,   T_DFN, 0, 0},
+ { P(DIR),         ATTR_DATA(UL),          SGML_MIXED,   T_DIR, 0, 0},
+ { P(DIV),         ATTR_DATA(DIV),         SGML_MIXED,   T_DIV, 0, 0},
+ { P(DL),          ATTR_DATA(DL),          SGML_MIXED,   T_DL, 0, 0},
+ { P(DLC),         ATTR_DATA(DL),          SGML_MIXED,   T_DLC, 0, 0},
+ { P(DT),          ATTR_DATA(GEN),         SGML_EMPTY,   T_DT, 0, 0},
+ { P(EM),          ATTR_DATA(GEN),         SGML_EMPTY,   T_EM, 0, 0},
+ { P(EMBED),       ATTR_DATA(EMBED),       SGML_EMPTY,   T_EMBED, 0, 0},
+ { P(FIELDSET),    ATTR_DATA(GEN),         SGML_MIXED,   T_FIELDSET, 0, 0},
+ { P(FIG),         ATTR_DATA(FIG),         SGML_MIXED,   T_FIG, 0, 0},
+ { P(FIGURE),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FIGURE, 0, 0},
+ { P(FN),          ATTR_DATA(GEN),         SGML_MIXED,   T_FN, 0, 0},
+ { P(FONT),        ATTR_DATA(FONT),        SGML_EMPTY,   T_FONT, 0, 0},
+ { P(FOOTER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FOOTER, 0, 0},
+ { P(FORM),        ATTR_DATA(FORM),        SGML_EMPTY,   T_FORM, 0, 0},
+ { P(FRAME),       ATTR_DATA(FRAME),       SGML_EMPTY,   T_FRAME, 0, 0},
+ { P(FRAMESET),    ATTR_DATA(FRAMESET),    SGML_MIXED,   T_FRAMESET, 0, 0},
+ { P0(H1),         ATTR_DATA(H),           SGML_MIXED,   T_H1, 0, 0},
+ { P0(H2),         ATTR_DATA(H),           SGML_MIXED,   T_H2, 0, 0},
+ { P0(H3),         ATTR_DATA(H),           SGML_MIXED,   T_H3, 0, 0},
+ { P0(H4),         ATTR_DATA(H),           SGML_MIXED,   T_H4, 0, 0},
+ { P0(H5),         ATTR_DATA(H),           SGML_MIXED,   T_H5, 0, 0},
+ { P0(H6),         ATTR_DATA(H),           SGML_MIXED,   T_H6, 0, 0},
+ { P(HEAD),        ATTR_DATA(GEN),         SGML_MIXED,   T_HEAD, 0, 0},
+ { P(HEADER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_HEADER, 0, 0},
+ { P(HR),          ATTR_DATA(HR),          SGML_EMPTY,   T_HR, 0, 0},
+ { P(HTML),        ATTR_DATA(GEN),         SGML_MIXED,   T_HTML, 0, 0},
+ { P(HY),          ATTR_DATA(GEN),         SGML_EMPTY,   T_HY, 0, 0},
+ { P(I),           ATTR_DATA(GEN),         SGML_EMPTY,   T_I, 0, 0},
+ { P(IFRAME),      ATTR_DATA(IFRAME),      SGML_MIXED,   T_IFRAME, 0, 0},
+ { P(IMG),         ATTR_DATA(IMG),         SGML_EMPTY,   T_IMG, 0, 0},
+ { P(INPUT),       ATTR_DATA(INPUT),       SGML_EMPTY,   T_INPUT, 0, 0},
+ { P(INS),         ATTR_DATA(DEL),         SGML_MIXED,   T_INS, 0, 1},
+ { P(INS),         ATTR_DATA(DEL),         SGML_MIXED,   T_INS_2, 1, 1},
+ { P(ISINDEX),     ATTR_DATA(ISINDEX),     SGML_EMPTY,   T_ISINDEX, 0, 0},
+ { P(KBD),         ATTR_DATA(GEN),         SGML_MIXED,   T_KBD, 0, 0},
+ { P(KEYGEN),      ATTR_DATA(KEYGEN),      SGML_EMPTY,   T_KEYGEN, 0, 0},
+ { P(LABEL),       ATTR_DATA(LABEL),       SGML_MIXED,   T_LABEL, 0, 0},
+ { P(LEGEND),      ATTR_DATA(CAPTION),     SGML_MIXED,   T_LEGEND, 0, 0},
+ { P(LH),          ATTR_DATA(GEN),         SGML_EMPTY,   T_LH, 0, 0},
+ { P(LI),          ATTR_DATA(LI),          SGML_EMPTY,   T_LI, 0, 0},
+ { P(LINK),        ATTR_DATA(LINK),        SGML_EMPTY,   T_LINK, 0, 0},
+ { P(LISTING),     ATTR_DATA(GEN),         SGML_LITTERAL,T_LISTING, 0, 0},
+ { P(MAIN),        ATTR_DATA(GEN5),        SGML_MIXED,   T_MAIN, 0, 0},
+ { P(MAP),         ATTR_DATA(MAP),         SGML_MIXED,   T_MAP, 0, 0},
+ { P(MARQUEE),     ATTR_DATA(GEN),         SGML_MIXED,   T_MARQUEE, 0, 0},
+ { P(MATH),        ATTR_DATA(MATH),        SGML_LITTERAL,T_MATH, 0, 0},
+ { P(MENU),        ATTR_DATA(UL),          SGML_MIXED,   T_MENU, 0, 0},
+ { P(META),        ATTR_DATA(META),        SGML_EMPTY,   T_META, 0, 0},
+ { P(NAV),         ATTR_DATA(GEN5),        SGML_MIXED,   T_NAV, 0, 0},
+ { P(NEXTID),      ATTR_DATA(NEXTID),      SGML_EMPTY,   T_NEXTID, 0, 0},
+ { P(NOFRAMES),    ATTR_DATA(GEN),         SGML_MIXED,   T_NOFRAMES, 0, 0},
+ { P(NOTE),        ATTR_DATA(NOTE),        SGML_MIXED,   T_NOTE, 0, 0},
+ { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_LITTERAL,T_OBJECT, 0, 0},
+ { P(OL),          ATTR_DATA(OL),          SGML_MIXED,   T_OL, 0, 0},
+ { P(OPTION),      ATTR_DATA(OPTION),      SGML_EMPTY,   T_OPTION, 0, 0},
+ { P(OVERLAY),     ATTR_DATA(OVERLAY),     SGML_EMPTY,   T_OVERLAY, 0, 0},
+ { P(P),           ATTR_DATA(P),           SGML_EMPTY,   T_P, 0, 0},
+ { P(PARAM),       ATTR_DATA(PARAM),       SGML_EMPTY,   T_PARAM, 0, 0},
+ { P(PLAINTEXT),   ATTR_DATA(GEN),         SGML_LITTERAL,T_PLAINTEXT, 0, 0},
+ { P0(PRE),        ATTR_DATA(GEN),         SGML_MIXED,   T_PRE, 0, 0},
+ { P(Q),           ATTR_DATA(Q),           SGML_MIXED,   T_Q, 0, 0},
+ { P(S),           ATTR_DATA(GEN),         SGML_MIXED,   T_S, 0, 0},
+ { P(SAMP),        ATTR_DATA(GEN),         SGML_MIXED,   T_SAMP, 0, 0},
+ { P(SCRIPT),      ATTR_DATA(SCRIPT),      SGML_LITTERAL,T_SCRIPT, 0, 0},
+ { P(SECTION),     ATTR_DATA(GEN5),        SGML_MIXED,   T_SECTION, 0, 0},
+ { P(SELECT),      ATTR_DATA(SELECT),      SGML_MIXED,   T_SELECT, 0, 0},
+ { P(SHY),         ATTR_DATA(GEN),         SGML_EMPTY,   T_SHY, 0, 0},
+ { P(SMALL),       ATTR_DATA(GEN),         SGML_MIXED,   T_SMALL, 0, 0},
+ { P(SPAN),        ATTR_DATA(GEN),         SGML_MIXED,   T_SPAN, 0, 0},
+ { P(SPOT),        ATTR_DATA(GEN),         SGML_EMPTY,   T_SPOT, 0, 0},
+ { P(STRIKE),      ATTR_DATA(GEN),         SGML_MIXED,   T_STRIKE, 0, 0},
+ { P(STRONG),      ATTR_DATA(GEN),         SGML_EMPTY,   T_STRONG, 0, 0},
+ { P(STYLE),       ATTR_DATA(STYLE),       SGML_LITTERAL,T_STYLE, 0, 0},
+ { P(SUB),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUB, 0, 0},
+ { P(SUP),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUP, 0, 0},
+ { P(TAB),         ATTR_DATA(TAB),         SGML_EMPTY,   T_TAB, 0, 0},
+ { P(TABLE),       ATTR_DATA(TABLE),       SGML_MIXED,   T_TABLE, 0, 0},
+ { P(TBODY),       ATTR_DATA(TR),          SGML_EMPTY,   T_TBODY, 0, 0},
+ { P(TD),          ATTR_DATA(TD),          SGML_EMPTY,   T_TD, 0, 0},
+ { P(TEXTAREA),    ATTR_DATA(TEXTAREA),    SGML_LITTERAL,T_TEXTAREA, 0, 0},
+ { P(TEXTFLOW),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_TEXTFLOW, 0, 0},
+ { P(TFOOT),       ATTR_DATA(TR),          SGML_EMPTY,   T_TFOOT, 0, 0},
+ { P(TH),          ATTR_DATA(TD),          SGML_EMPTY,   T_TH, 0, 0},
+ { P(THEAD),       ATTR_DATA(TR),          SGML_EMPTY,   T_THEAD, 0, 0},
+ { P(TITLE),       ATTR_DATA(GEN),         SGML_RCDATA,  T_TITLE, 0, 0},
+ { P(TR),          ATTR_DATA(TR),          SGML_EMPTY,   T_TR, 0, 0},
+ { P(TT),          ATTR_DATA(GEN),         SGML_EMPTY,   T_TT, 0, 0},
+ { P(U),           ATTR_DATA(GEN),         SGML_EMPTY,   T_U, 0, 0},
+ { P(UL),          ATTR_DATA(UL),          SGML_MIXED,   T_UL, 0, 0},
+ { P(VAR),         ATTR_DATA(GEN),         SGML_MIXED,   T_VAR, 0, 0},
+ { P(WBR),         ATTR_DATA(GEN),         SGML_EMPTY,   T_WBR, 0, 0},
+ { P0(XMP),        ATTR_DATA(GEN),         SGML_LITTERAL,T_XMP, 0, 0},
 /* additional (alternative variants), not counted in HTML_ELEMENTS: */
 /* This one will be used as a temporary substitute within the parser when
    it has been signalled to parse OBJECT content as MIXED. - kw */
- { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_MIXED,   T_OBJECT_PCDATA},
+ { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_MIXED,   T_OBJECT_PCDATA, 0, 0},
 };
 /* *INDENT-ON* */
 
diff --git a/WWW/Library/Implementation/src0_HTMLDTD.txt b/WWW/Library/Implementation/src0_HTMLDTD.txt
index acabdd87..1350da2a 100644
--- a/WWW/Library/Implementation/src0_HTMLDTD.txt
+++ b/WWW/Library/Implementation/src0_HTMLDTD.txt
@@ -528,7 +528,7 @@
 			5:2:SRC
 			6:0:TYPE
 			7:0:WRAP
-126 tags
+128 tags
 	0:A
 		justify
 		25 attributes:
@@ -635,8 +635,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike DIVlike same
 		flags:
 	4:APPLET
@@ -725,8 +725,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
 	7:ASIDE
@@ -748,8 +748,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
 	8:AU
@@ -840,8 +840,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
-		contained: outer BODYlike
-		icontained: outer BODYlike
+		contained: outer BODYlike DELlike
+		icontained: outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
 	12:BASE
@@ -909,8 +909,8 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike Plike DIVlike
 		flags:
 	15:BGSOUND
@@ -1003,8 +1003,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
 	19:BODY
@@ -1032,8 +1032,8 @@
 			BODY
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike
+		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike DELlike
 		contained: outer BODYlike
 		icontained: outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer HEADstuff same
@@ -1061,8 +1061,8 @@
 			BODYTEXT
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
+		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same DELlike
 		contained: DIVlike outer BODYlike
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike BRlike APPLETlike HRlike MAPlike same
@@ -1087,8 +1087,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
 	22:BR
@@ -1168,8 +1168,8 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: DIVlike ULlike APPLETlike HRlike
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: DIVlike ULlike APPLETlike HRlike DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike same
 		flags:
 	25:CENTER
@@ -1192,8 +1192,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags:
 	26:CITE
@@ -1344,8 +1344,8 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: DIVlike ULlike APPLETlike HRlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: DIVlike ULlike APPLETlike HRlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike Plike DIVlike same
 		flags:
 	32:DD
@@ -1389,13 +1389,37 @@
 			DEL
 		contents: SGML_MIXED
 		tagclass: EMlike
+		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike same
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
+		canclose: FONTlike EMlike DELlike
+		flags:
+	34:DEL!
+		justify
+		8 attributes:
+			0:0:CITE
+			1:4:CLASS
+			2:0:DATETIME
+			3:0:DIR
+			4:1:ID
+			5:0:LANG
+			6:0:STYLE
+			7:0:TITLE
+		4 attr_types
+			core
+			events
+			i18n
+			DEL
+		contents: SGML_MIXED
+		tagclass: DELlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
 		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike BODYlike same
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
-		canclose: FONTlike EMlike
+		canclose: FONTlike EMlike DELlike
 		flags:
-	34:DFN
+	35:DFN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1418,7 +1442,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags:
-	35:DIR
+	36:DIR
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -1443,11 +1467,11 @@
 		tagclass: ULlike
 		contains: LIlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike BRlike APPLETlike HRlike MAPlike
-		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike HRlike same
 		flags:
-	36:DIV
+	37:DIV
 		justify
 		8 attributes:
 			0:0:ALIGN
@@ -1467,11 +1491,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike DIVlike same
 		flags: mafse
-	37:DL
+	38:DL
 		justify
 		8 attributes:
 			0:4:CLASS
@@ -1490,11 +1514,11 @@
 		tagclass: ULlike
 		contains: FORMlike LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula SELECTlike Plike DIVlike LIlike
 		flags:
-	38:DLC
+	39:DLC
 		justify
 		8 attributes:
 			0:4:CLASS
@@ -1513,11 +1537,11 @@
 		tagclass: ULlike
 		contains: FORMlike LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike
 		flags:
-	39:DT
+	40:DT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1540,7 +1564,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags: endO
-	40:EM
+	41:EM
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1563,7 +1587,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags: nreie
-	41:EMBED
+	42:EMBED
 		justify
 		21 attributes:
 			0:0:ALIGN
@@ -1600,7 +1624,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
 		flags: endO
-	42:FIELDSET
+	43:FIELDSET
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1619,11 +1643,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike APPLETlike HRlike same
-		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike APPLETlike HRlike same DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike MAPlike same
 		flags:
-	43:FIG
+	44:FIG
 		justify
 		17 attributes:
 			0:0:ALIGN
@@ -1652,11 +1676,11 @@
 		tagclass: DIVlike
 		contains: Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike MAPlike same
 		flags:
-	44:FIGURE
+	45:FIGURE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1675,11 +1699,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	45:FN
+	46:FN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1698,11 +1722,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike same
 		flags:
-	46:FONT
+	47:FONT
 		justify
 		11 attributes:
 			0:4:CLASS
@@ -1728,7 +1752,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	47:FOOTER
+	48:FOOTER
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1747,11 +1771,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	48:FORM
+	49:FORM
 		justify
 		17 attributes:
 			0:0:ACCEPT
@@ -1779,11 +1803,11 @@
 		tagclass: FORMlike
 		contains: FONTlike EMlike MATHlike Alike TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
-		contained: FONTlike EMlike MATHlike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike
+		contained: FONTlike EMlike MATHlike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike LIlike ULlike MAPlike same
 		flags:
-	49:FRAME
+	50:FRAME
 		justify
 		12 attributes:
 			0:4:CLASS
@@ -1809,7 +1833,7 @@
 		icontained: outer
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
 		flags: endO
-	50:FRAMESET
+	51:FRAMESET
 		justify
 		4 attributes:
 			0:0:COLS
@@ -1826,7 +1850,7 @@
 		icontained: BRlike APPLETlike outer same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
 		flags:
-	51:H1
+	52:H1
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1853,11 +1877,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	52:H2
+	53:H2
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1884,11 +1908,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	53:H3
+	54:H3
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1915,11 +1939,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	54:H4
+	55:H4
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1946,11 +1970,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	55:H5
+	56:H5
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1977,11 +2001,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	56:H6
+	57:H6
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -2008,11 +2032,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	57:HEAD
+	58:HEAD
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2035,7 +2059,7 @@
 		icontained: outer
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
 		flags: endO startO mafse
-	58:HEADER
+	59:HEADER
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2054,11 +2078,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	59:HR
+	60:HR
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -2087,7 +2111,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike formula TRlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
 		flags: endO
-	60:HTML
+	61:HTML
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2110,7 +2134,7 @@
 		icontained:
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
 		flags: endO startO
-	61:HY
+	62:HY
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2133,7 +2157,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula BRlike same
 		flags: endO
-	62:I
+	63:I
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2156,7 +2180,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	63:IFRAME
+	64:IFRAME
 		justify
 		14 attributes:
 			0:0:ALIGN
@@ -2185,7 +2209,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike APPLETlike outer HEADstuff same
 		flags:
-	64:IMG
+	65:IMG
 		justify
 		22 attributes:
 			0:0:ALIGN
@@ -2224,7 +2248,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: same
 		flags: endO
-	65:INPUT
+	66:INPUT
 		justify
 		35 attributes:
 			0:0:ACCEPT
@@ -2276,7 +2300,7 @@
 		icontained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike SELECTlike BRlike MAPlike same
 		flags: endO
-	66:INS
+	67:INS
 		justify
 		8 attributes:
 			0:0:CITE
@@ -2294,13 +2318,37 @@
 			DEL
 		contents: SGML_MIXED
 		tagclass: EMlike
+		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike same
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
+		canclose: FONTlike EMlike DELlike
+		flags:
+	68:INS!
+		justify
+		8 attributes:
+			0:0:CITE
+			1:4:CLASS
+			2:0:DATETIME
+			3:0:DIR
+			4:1:ID
+			5:0:LANG
+			6:0:STYLE
+			7:0:TITLE
+		4 attr_types
+			core
+			events
+			i18n
+			DEL
+		contents: SGML_MIXED
+		tagclass: DELlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
 		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike BODYlike same
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
-		canclose: FONTlike EMlike
+		canclose: FONTlike EMlike DELlike
 		flags:
-	67:ISINDEX
+	69:ISINDEX
 		justify
 		9 attributes:
 			0:2:ACTION
@@ -2324,7 +2372,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike same
 		flags: endO
-	68:KBD
+	70:KBD
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2347,7 +2395,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike
 		flags:
-	69:KEYGEN
+	71:KEYGEN
 		justify
 		8 attributes:
 			0:0:CHALLENGE
@@ -2370,7 +2418,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: formula TRlike SELECTlike same
 		flags: endO
-	70:LABEL
+	72:LABEL
 		justify
 		11 attributes:
 			0:0:ACCESSKEY
@@ -2397,7 +2445,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike
 		flags:
-	71:LEGEND
+	73:LEGEND
 		justify
 		9 attributes:
 			0:0:ACCESSKEY
@@ -2423,7 +2471,7 @@
 		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike
 		flags:
-	72:LH
+	74:LH
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2446,7 +2494,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags: endO
-	73:LI
+	75:LI
 		justify
 		13 attributes:
 			0:4:CLASS
@@ -2475,7 +2523,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags: endO
-	74:LINK
+	76:LINK
 		justify
 		14 attributes:
 			0:0:CHARSET
@@ -2505,7 +2553,7 @@
 		icontained: outer HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
 		flags: endO
-	75:LISTING
+	77:LISTING
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2524,11 +2572,11 @@
 		tagclass: ULlike
 		contains:
 		icontains:
-		contained: DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike same
 		flags:
-	76:MAIN
+	78:MAIN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2547,11 +2595,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	77:MAP
+	79:MAP
 		justify
 		8 attributes:
 			0:4:CLASS
@@ -2574,7 +2622,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike LIlike
 		flags:
-	78:MARQUEE
+	80:MARQUEE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2597,7 +2645,7 @@
 		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: MATHlike Alike formula BRlike APPLETlike same
 		flags:
-	79:MATH
+	81:MATH
 		justify
 		8 attributes:
 			0:0:BOX
@@ -2620,7 +2668,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike MATHlike Alike formula
 		flags:
-	80:MENU
+	82:MENU
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -2645,11 +2693,11 @@
 		tagclass: ULlike
 		contains: LIlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike BRlike APPLETlike HRlike MAPlike
-		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
 		flags:
-	81:META
+	83:META
 		justify
 		5 attributes:
 			0:0:CHARSET
@@ -2667,7 +2715,7 @@
 		icontained: outer HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
 		flags: endO
-	82:NAV
+	84:NAV
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2686,11 +2734,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	83:NEXTID
+	85:NEXTID
 		justify
 		1 attributes:
 			0:0:N
@@ -2704,7 +2752,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
 		canclose: FONTlike
 		flags: endO
-	84:NOFRAMES
+	86:NOFRAMES
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2721,13 +2769,13 @@
 			GEN
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
+		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike DELlike
 		contained: BRlike APPLETlike HRlike outer
 		icontained: BRlike APPLETlike HRlike outer
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike
 		flags:
-	85:NOTE
+	87:NOTE
 		justify
 		10 attributes:
 			0:4:CLASS
@@ -2748,11 +2796,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike ULlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: formula TRlike FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: formula TRlike FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
-	86:OBJECT
+	88:OBJECT
 		justify
 		26 attributes:
 			0:0:ALIGN
@@ -2795,7 +2843,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike same
 		flags: frecyc
-	87:OL
+	89:OL
 		justify
 		12 attributes:
 			0:4:CLASS
@@ -2818,11 +2866,11 @@
 		tagclass: ULlike
 		contains: LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
 		flags:
-	88:OPTION
+	90:OPTION
 		justify
 		13 attributes:
 			0:4:CLASS
@@ -2851,7 +2899,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: endO
-	89:OVERLAY
+	91:OVERLAY
 		justify
 		12 attributes:
 			0:4:CLASS
@@ -2877,7 +2925,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike same
 		flags: endO
-	90:P
+	92:P
 		justify
 		9 attributes:
 			0:0:ALIGN
@@ -2898,11 +2946,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags: endO
-	91:PARAM
+	93:PARAM
 		justify
 		18 attributes:
 			0:0:ACCEPT
@@ -2935,7 +2983,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: TRlike SELECTlike Plike LIlike BRlike same
 		flags: endO
-	92:PLAINTEXT
+	94:PLAINTEXT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2958,7 +3006,7 @@
 		icontained: outer same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
 		flags: endO
-	93:PRE
+	95:PRE
 		nojustify
 		7 attributes:
 			0:4:CLASS
@@ -2977,11 +3025,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike HRlike MAPlike
 		icontains: EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike HRlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags:
-	94:Q
+	96:Q
 		justify
 		8 attributes:
 			0:2:CITE
@@ -3004,7 +3052,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags:
-	95:S
+	97:S
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3027,7 +3075,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags:
-	96:SAMP
+	98:SAMP
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3050,7 +3098,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: EMlike
 		flags: nreie
-	97:SCRIPT
+	99:SCRIPT
 		justify
 		16 attributes:
 			0:0:CHARSET
@@ -3081,7 +3129,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike HRlike same
 		flags:
-	98:SECTION
+	100:SECTION
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3100,11 +3148,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	99:SELECT
+	101:SELECT
 		justify
 		22 attributes:
 			0:0:ALIGN
@@ -3142,7 +3190,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
 		flags: strict
-	100:SHY
+	102:SHY
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3165,7 +3213,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula BRlike same
 		flags: endO
-	101:SMALL
+	103:SMALL
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3188,7 +3236,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	102:SPAN
+	104:SPAN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3211,7 +3259,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike same
 		flags:
-	103:SPOT
+	105:SPOT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3234,7 +3282,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
 		canclose: Alike
 		flags: endO
-	104:STRIKE
+	106:STRIKE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3257,7 +3305,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags:
-	105:STRONG
+	107:STRONG
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3280,7 +3328,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags: nreie
-	106:STYLE
+	108:STYLE
 		justify
 		9 attributes:
 			0:4:CLASS
@@ -3304,7 +3352,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula same
 		flags:
-	107:SUB
+	109:SUB
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3327,7 +3375,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike MATHlike
 		flags:
-	108:SUP
+	110:SUP
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3350,7 +3398,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike MATHlike
 		flags:
-	109:TAB
+	111:TAB
 		justify
 		11 attributes:
 			0:0:ALIGN
@@ -3377,7 +3425,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer HEADstuff
 		canclose: FONTlike
 		flags: endO
-	110:TABLE
+	112:TABLE
 		justify
 		22 attributes:
 			0:0:ALIGN
@@ -3412,11 +3460,11 @@
 		tagclass: ULlike
 		contains: TRlike SELECTlike FORMlike Plike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike LIlike HRlike MAPlike same
 		flags:
-	111:TBODY
+	113:TBODY
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3446,7 +3494,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
 		flags: endO startO
-	112:TD
+	114:TD
 		justify
 		23 attributes:
 			0:0:ABBR
@@ -3485,7 +3533,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
 		flags: endO
-	113:TEXTAREA
+	115:TEXTAREA
 		justify
 		22 attributes:
 			0:0:ACCEPT-CHARSET
@@ -3524,7 +3572,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
 		flags: nolyspcl
-	114:TEXTFLOW
+	116:TEXTFLOW
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -3547,13 +3595,13 @@
 			BODYTEXT
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
+		contains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same DELlike
 		contained: formula TRlike FORMlike Plike DIVlike LIlike BRlike APPLETlike HRlike outer same
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike BRlike APPLETlike MAPlike outer same
 		flags: endO startO
-	115:TFOOT
+	117:TFOOT
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3583,7 +3631,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
 		flags: endO
-	116:TH
+	118:TH
 		justify
 		23 attributes:
 			0:0:ABBR
@@ -3622,7 +3670,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
 		flags: endO
-	117:THEAD
+	119:THEAD
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3652,7 +3700,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
 		flags: endO
-	118:TITLE
+	120:TITLE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3675,7 +3723,7 @@
 		icontained: outer HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike
 		flags: mafse strict
-	119:TR
+	121:TR
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3705,7 +3753,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
 		flags: endO
-	120:TT
+	122:TT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3728,7 +3776,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: nreie
-	121:U
+	123:U
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3751,7 +3799,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	122:UL
+	124:UL
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -3776,11 +3824,11 @@
 		tagclass: ULlike
 		contains: FORMlike LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike same
 		flags:
-	123:VAR
+	125:VAR
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3803,7 +3851,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags:
-	124:WBR
+	126:WBR
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3826,7 +3874,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula BRlike same
 		flags: endO
-	125:XMP
+	127:XMP
 		nojustify
 		7 attributes:
 			0:4:CLASS
@@ -3845,7 +3893,7 @@
 		tagclass: ULlike
 		contains:
 		icontains:
-		contained: TRlike SELECTlike FORMlike Plike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: TRlike SELECTlike FORMlike Plike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike MAPlike
 		flags: endO
diff --git a/WWW/Library/Implementation/src1_HTMLDTD.h b/WWW/Library/Implementation/src1_HTMLDTD.h
index 0224a365..38af2d5a 100644
--- a/WWW/Library/Implementation/src1_HTMLDTD.h
+++ b/WWW/Library/Implementation/src1_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: src1_HTMLDTD.h,v 1.47 2019/12/03 20:52:56 Kihara.Hideto Exp $ */
+/* $LynxId: src1_HTMLDTD.h,v 1.48 2021/07/23 21:36:23 tom Exp $ */
 #ifndef src_HTMLDTD_H1
 #define src_HTMLDTD_H1 1
 
@@ -8,62 +8,63 @@
 #define T_A             0x00008,0x0B007,0x0FF17,0x37787,0x77BA7,0x8604F,0x00014
 #define T_ABBR          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
 #define T_ACRONYM       0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
-#define T_ADDRESS       0x00200,0x0F14F,0x8FFFF,0x36680,0xB6FAF,0x80317,0x00000
+#define T_ADDRESS       0x00200,0x0F14F,0x8FFFF,0x136680,0x1B6FAF,0x80317,0x00000
 #define T_APPLET        0x02000,0x0B0CF,0x8FFFF,0x37F9F,0xB7FBF,0x8300F,0x00000
 #define T_AREA          0x08000,0x00000,0x00000,0x08000,0x3FFFF,0x00F1F,0x00001
-#define T_ARTICLE       0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
-#define T_ASIDE         0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_ARTICLE       0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
+#define T_ASIDE         0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_AU            0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
 #define T_AUTHOR        0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
 #define T_B             0x00001,0x8B04F,0xAFFFF,0xA778F,0xF7FBF,0x00001,0x00014
-#define T_BANNER        0x00200,0x0FB8F,0x0FFFF,0x30000,0x30000,0x8031F,0x00000
+#define T_BANNER        0x00200,0x0FB8F,0x0FFFF,0x130000,0x130000,0x8031F,0x00000
 #define T_BASE          0x40000,0x00000,0x00000,0x50000,0x50000,0x8000F,0x00001
 #define T_BASEFONT      0x01000,0x00000,0x00000,0x377AF,0x37FAF,0x8F000,0x00001
-#define T_BDO           0x00100,0x0B04F,0x8FFFF,0x36680,0xB6FAF,0x0033F,0x00000
+#define T_BDO           0x00100,0x0B04F,0x8FFFF,0x136680,0x1B6FAF,0x0033F,0x00000
 #define T_BGSOUND       0x01000,0x00000,0x00000,0x777AF,0x77FAF,0x8730F,0x00001
 #define T_BIG           0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
 #define T_BLINK         0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00001,0x00014
-#define T_BLOCKQUOTE    0x00200,0xAFBCF,0xAFFFF,0xB6680,0xB6FAF,0x8031F,0x00000
-#define T_BODY          0x20000,0x2FB8F,0x2FFFF,0x30000,0x30000,0xDFF7F,0x00003
-#define T_BODYTEXT      0x20000,0x0FB8F,0xAFFFF,0x30200,0xB7FAF,0x8F17F,0x00003
-#define T_BQ            0x00200,0xAFBCF,0xAFFFF,0xB6680,0xB6FAF,0x8031F,0x00000
+#define T_BLOCKQUOTE    0x00200,0xAFBCF,0xAFFFF,0x1B6680,0x1B6FAF,0x8031F,0x00000
+#define T_BODY          0x20000,0x12FB8F,0x12FFFF,0x30000,0x30000,0xDFF7F,0x00003
+#define T_BODYTEXT      0x20000,0x10FB8F,0x1AFFFF,0x30200,0xB7FAF,0x8F17F,0x00003
+#define T_BQ            0x00200,0xAFBCF,0xAFFFF,0x1B6680,0x1B6FAF,0x8031F,0x00000
 #define T_BR            0x01000,0x00000,0x00000,0x377BF,0x77FBF,0x8101F,0x00001
 #define T_BUTTON        0x02000,0x0BB07,0x0FF37,0x0378F,0x37FBF,0x8115F,0x00000
-#define T_CAPTION       0x00100,0x0B04F,0x8FFFF,0x06A00,0xB6FA7,0x8035F,0x00000
-#define T_CENTER        0x00200,0x8FBCF,0x8FFFF,0xB6680,0xB6FA7,0x8071F,0x00000
+#define T_CAPTION       0x00100,0x0B04F,0x8FFFF,0x106A00,0x1B6FA7,0x8035F,0x00000
+#define T_CENTER        0x00200,0x8FBCF,0x8FFFF,0x1B6680,0x1B6FA7,0x8071F,0x00000
 #define T_CITE          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
 #define T_CODE          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00000
 #define T_COL           0x04000,0x00000,0x00000,0x00820,0x36FA7,0x88F5F,0x00001
 #define T_COLGROUP      0x00020,0x04000,0x04000,0x00800,0x36FA7,0x8875F,0x00001
 #define T_COMMENT       0x00004,0x00000,0x00000,0xA77AF,0x7FFFF,0x00003,0x00000
-#define T_CREDIT        0x00100,0x0B04F,0x8FFFF,0x06A00,0xB7FBF,0x8030F,0x00000
+#define T_CREDIT        0x00100,0x0B04F,0x8FFFF,0x106A00,0x1B7FBF,0x8030F,0x00000
 #define T_DD            0x00400,0x0FBCF,0x8FFFF,0x00800,0xB6FFF,0x8071F,0x00001
-#define T_DEL           0x00002,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x00003,0x00000
+#define T_DEL           0x00002,0x8B04F,0x8FEFF,0x87F8F,0xF7FBF,0x100003,0x00000
+#define T_DEL_2         0x100000,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x100003,0x00000
 #define T_DFN           0x00002,0x8B0CF,0x8FFFF,0x8778F,0xF7FBF,0x00003,0x00000
-#define T_DIR           0x00800,0x0B400,0x0F75F,0x37680,0x36FB7,0x84F7F,0x00000
-#define T_DIV           0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x80317,0x00004
-#define T_DL            0x00800,0x0C480,0x8FFFF,0x36680,0xB7FB7,0x00757,0x00000
-#define T_DLC           0x00800,0x0C480,0x8FFFF,0x36680,0xB7FB7,0x0075F,0x00000
+#define T_DIR           0x00800,0x0B400,0x0F75F,0x137680,0x136FB7,0x84F7F,0x00000
+#define T_DIV           0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x80317,0x00004
+#define T_DL            0x00800,0x0C480,0x8FFFF,0x136680,0x1B7FB7,0x00757,0x00000
+#define T_DLC           0x00800,0x0C480,0x8FFFF,0x136680,0x1B7FB7,0x0075F,0x00000
 #define T_DT            0x00400,0x0B04F,0x0B1FF,0x00800,0x17FFF,0x8071F,0x00001
 #define T_EM            0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00010
 #define T_EMBED         0x02000,0x8F107,0x8FFF7,0xB6FBF,0xB7FBF,0x1FF7F,0x00001
-#define T_FIELDSET      0x00200,0x8FB4F,0x8FF7F,0x86787,0xB7FF7,0x8805F,0x00000
-#define T_FIG           0x00200,0x0FB00,0x8FFFF,0x36680,0xB6FBF,0x8834F,0x00000
-#define T_FIGURE        0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
-#define T_FN            0x00200,0x8FBCF,0x8FFFF,0xB6680,0xB7EBF,0x8114F,0x00000
+#define T_FIELDSET      0x00200,0x8FB4F,0x8FF7F,0x186787,0x1B7FF7,0x8805F,0x00000
+#define T_FIG           0x00200,0x0FB00,0x8FFFF,0x136680,0x1B6FBF,0x8834F,0x00000
+#define T_FIGURE        0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
+#define T_FN            0x00200,0x8FBCF,0x8FFFF,0x1B6680,0x1B7EBF,0x8114F,0x00000
 #define T_FONT          0x00001,0x8B04F,0x8FFFF,0xB778F,0xF7FBF,0x00001,0x00014
-#define T_FOOTER        0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
-#define T_FORM          0x00080,0x0FF6F,0x0FF7F,0x36E07,0x32F07,0x88DFF,0x00000
+#define T_FOOTER        0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
+#define T_FORM          0x00080,0x0FF6F,0x0FF7F,0x136E07,0x132F07,0x88DFF,0x00000
 #define T_FRAME         0x10000,0x00000,0x00000,0x10000,0x10000,0x9FFFF,0x00001
 #define T_FRAMESET      0x10000,0x90000,0x90000,0x90000,0x93000,0x9FFFF,0x00000
-#define T_H1            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H2            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H3            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H4            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H5            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
-#define T_H6            0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
+#define T_H1            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H2            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H3            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H4            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H5            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
+#define T_H6            0x00100,0x0B04F,0x0B05F,0x136680,0x137FAF,0x80117,0x00000
 #define T_HEAD          0x40000,0x4F000,0x47000,0x10000,0x10000,0x9FF7F,0x00007
-#define T_HEADER        0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_HEADER        0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_HR            0x04000,0x00000,0x00000,0x3FE80,0x3FFBF,0x87F37,0x00001
 #define T_HTML          0x10000,0x7FB8F,0x7FFFF,0x00000,0x00000,0x1FFFF,0x00003
 #define T_HY            0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
@@ -71,7 +72,8 @@
 #define T_IFRAME        0x02000,0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0xD315F,0x00000
 #define T_IMG           0x01000,0x00000,0x00000,0x3779F,0x37FBF,0x80000,0x00001
 #define T_INPUT         0x00040,0x00000,0x00000,0x03F87,0x37F87,0x8904F,0x00001
-#define T_INS           0x00002,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x00003,0x00000
+#define T_INS           0x00002,0x8B04F,0x8FEFF,0x87F8F,0xF7FBF,0x100003,0x00000
+#define T_INS_2         0x100000,0x8BBCF,0x8FFFF,0xA7F8F,0xF7FBF,0x100003,0x00000
 #define T_ISINDEX       0x08000,0x00000,0x00000,0x7778F,0x7FFAF,0x80007,0x00001
 #define T_KBD           0x00002,0x00000,0x00000,0x2778F,0x77FBF,0x00003,0x00000
 #define T_KEYGEN        0x00040,0x00000,0x00000,0x07FB7,0x37FB7,0x80070,0x00001
@@ -80,30 +82,30 @@
 #define T_LH            0x00400,0x0BB7F,0x8FFFF,0x00800,0x97FFF,0x8071F,0x00001
 #define T_LI            0x00400,0x0BBFF,0x8FFFF,0x00800,0x97FFF,0x8071F,0x00001
 #define T_LINK          0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
-#define T_LISTING       0x00800,0x00000,0x00000,0x36600,0x36F00,0x80F1F,0x00000
-#define T_MAIN          0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_LISTING       0x00800,0x00000,0x00000,0x136600,0x136F00,0x80F1F,0x00000
+#define T_MAIN          0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_MAP           0x08000,0x08000,0x08000,0x37FCF,0x37FBF,0x0051F,0x00000
 #define T_MARQUEE       0x04000,0x0000F,0x8F01F,0x37787,0xB7FA7,0x8301C,0x00000
 #define T_MATH          0x00004,0x0B05F,0x8FFFF,0x2778F,0xF7FBF,0x0001F,0x00000
-#define T_MENU          0x00800,0x0B400,0x0F75F,0x17680,0x36FB7,0x88F7F,0x00000
+#define T_MENU          0x00800,0x0B400,0x0F75F,0x117680,0x136FB7,0x88F7F,0x00000
 #define T_META          0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
-#define T_NAV           0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_NAV           0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_NEXTID        0x01000,0x00000,0x00000,0x50000,0x1FFF7,0x00001,0x00001
-#define T_NOFRAMES      0x20000,0x2FB8F,0x0FFFF,0x17000,0x17000,0x0CF5F,0x00000
-#define T_NOTE          0x00200,0x0BBAF,0x8FFFF,0x376B0,0xB7FFF,0x8031F,0x00000
+#define T_NOFRAMES      0x20000,0x12FB8F,0x10FFFF,0x17000,0x17000,0x0CF5F,0x00000
+#define T_NOTE          0x00200,0x0BBAF,0x8FFFF,0x1376B0,0x1B7FFF,0x8031F,0x00000
 #define T_OBJECT        0x02000,0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0x83D5F,0x00020
-#define T_OL            0x00800,0x0C400,0x8FFFF,0x37680,0xB7FB7,0x88F7F,0x00000
+#define T_OL            0x00800,0x0C400,0x8FFFF,0x137680,0x1B7FB7,0x88F7F,0x00000
 #define T_OPTION        0x08000,0x00000,0x00000,0x00040,0x37FFF,0x8031F,0x00001
 #define T_OVERLAY       0x04000,0x00000,0x00000,0x00200,0x37FBF,0x83F7F,0x00001
-#define T_P             0x00100,0x0B04F,0x8FFFF,0x36680,0xB6FA7,0x80117,0x00001
+#define T_P             0x00100,0x0B04F,0x8FFFF,0x136680,0x1B6FA7,0x80117,0x00001
 #define T_PARAM         0x01000,0x00000,0x00000,0x33500,0x37FFF,0x81560,0x00001
 #define T_PLAINTEXT     0x10000,0xFFFFF,0xFFFFF,0x90000,0x90000,0x3FFFF,0x00001
-#define T_PRE           0x00200,0x0F04F,0x0F05E,0x36680,0x36FF0,0x8071E,0x00000
+#define T_PRE           0x00200,0x0F04F,0x0F05E,0x136680,0x136FF0,0x8071E,0x00000
 #define T_Q             0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FAF,0x00003,0x00000
 #define T_S             0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
 #define T_SAMP          0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
 #define T_SCRIPT        0x02000,0x00000,0x00000,0x77F9F,0x77FFF,0x87D5F,0x00000
-#define T_SECTION       0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_SECTION       0x00200,0x8FBCF,0x8FFFF,0x1B66A0,0x1B7FFF,0x8031F,0x00004
 #define T_SELECT        0x00040,0x08000,0x08000,0x03FAF,0x33FBF,0x80D5F,0x00008
 #define T_SHY           0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
 #define T_SMALL         0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
@@ -115,11 +117,11 @@
 #define T_SUB           0x00004,0x8B05F,0x8FFFF,0x8779F,0xF7FBF,0x00007,0x00000
 #define T_SUP           0x00004,0x8B05F,0x8FFFF,0x8779F,0xF7FBF,0x00007,0x00000
 #define T_TAB           0x01000,0x00000,0x00000,0x3778F,0x57FAF,0x00001,0x00001
-#define T_TABLE         0x00800,0x0F1E0,0x8FFFF,0x36680,0xB6FA7,0x8C57F,0x00000
+#define T_TABLE         0x00800,0x0F1E0,0x8FFFF,0x136680,0x1B6FA7,0x8C57F,0x00000
 #define T_TBODY         0x00020,0x00020,0x8FFFF,0x00880,0xB7FB7,0x8C75F,0x00003
 #define T_TD            0x00400,0x0FBCF,0x8FFFF,0x00020,0xB7FB7,0x8C75F,0x00001
 #define T_TEXTAREA      0x00040,0x00000,0x00000,0x07F8F,0x33FBF,0x80D5F,0x00040
-#define T_TEXTFLOW      0x20000,0x8FBFF,0x9FFFF,0x977B0,0xB7FB7,0x9B00F,0x00003
+#define T_TEXTFLOW      0x20000,0x18FBFF,0x19FFFF,0x977B0,0xB7FB7,0x9B00F,0x00003
 #define T_TFOOT         0x00020,0x00020,0x8FFFF,0x00800,0xB7FB7,0x8CF5F,0x00001
 #define T_TH            0x00400,0x0FBCF,0x0FFFF,0x00020,0xB7FB7,0x8CF5F,0x00001
 #define T_THEAD         0x00020,0x00020,0x8FFFF,0x00800,0xB7FB7,0x8CF5F,0x00001
@@ -127,10 +129,10 @@
 #define T_TR            0x00020,0x00400,0x8FFFF,0x00820,0xB7FB7,0x8C75F,0x00001
 #define T_TT            0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00010
 #define T_U             0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
-#define T_UL            0x00800,0x0C480,0x8FFFF,0x36680,0xB7FFF,0x8075F,0x00000
+#define T_UL            0x00800,0x0C480,0x8FFFF,0x136680,0x1B7FFF,0x8075F,0x00000
 #define T_VAR           0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
 #define T_WBR           0x00001,0x00000,0x00000,0x3778F,0x77FBF,0x8101F,0x00001
-#define T_XMP           0x00800,0x00000,0x00000,0x367E0,0x36FFF,0x0875F,0x00001
+#define T_XMP           0x00800,0x00000,0x00000,0x1367E0,0x136FFF,0x0875F,0x00001
 #define T_OBJECT_PCDATA 0x02000,0x8FBCF,0x8FFFF,0xB679F,0xB6FBF,0x83D5F,0x00008
 #define T__UNREC_	0x00000,0x00000,0x00000,0x00000,0x00000,0x00000,0x00000
 #ifdef USE_PRETTYSRC
@@ -2214,6 +2216,7 @@ static const attr UL_attr[] = {         /* DIR attributes */
 #undef CREDIT
 #undef DD
 #undef DEL
+#undef DEL
 #undef DFN
 #undef DIR
 #undef DIV
@@ -2247,6 +2250,7 @@ static const attr UL_attr[] = {         /* DIR attributes */
 #undef IMG
 #undef INPUT
 #undef INS
+#undef INS
 #undef ISINDEX
 #undef KBD
 #undef KEYGEN
@@ -2334,136 +2338,138 @@ static const attr UL_attr[] = {         /* DIR attributes */
 #endif /* once_HTMLDTD */
 /* *INDENT-OFF* */
 static const HTTag tags_table1[HTML_ALL_ELEMENTS] = {
- { P(A),           ATTR_DATA(A),           SGML_MIXED,   T_A},
- { P(ABBR),        ATTR_DATA(GEN),         SGML_MIXED,   T_ABBR},
- { P(ACRONYM),     ATTR_DATA(GEN),         SGML_MIXED,   T_ACRONYM},
- { P(ADDRESS),     ATTR_DATA(ADDRESS),     SGML_MIXED,   T_ADDRESS},
- { P(APPLET),      ATTR_DATA(APPLET),      SGML_MIXED,   T_APPLET},
- { P(AREA),        ATTR_DATA(AREA),        SGML_EMPTY,   T_AREA},
- { P(ARTICLE),     ATTR_DATA(GEN5),        SGML_MIXED,   T_ARTICLE},
- { P(ASIDE),       ATTR_DATA(GEN5),        SGML_MIXED,   T_ASIDE},
- { P(AU),          ATTR_DATA(GEN),         SGML_MIXED,   T_AU},
- { P(AUTHOR),      ATTR_DATA(GEN),         SGML_MIXED,   T_AUTHOR},
- { P(B),           ATTR_DATA(GEN),         SGML_MIXED,   T_B},
- { P0(BANNER),     ATTR_DATA(GEN),         SGML_MIXED,   T_BANNER},
- { P(BASE),        ATTR_DATA(BASE),        SGML_EMPTY,   T_BASE},
- { P(BASEFONT),    ATTR_DATA(FONT),        SGML_EMPTY,   T_BASEFONT},
- { P(BDO),         ATTR_DATA(GEN),         SGML_MIXED,   T_BDO},
- { P(BGSOUND),     ATTR_DATA(BGSOUND),     SGML_EMPTY,   T_BGSOUND},
- { P(BIG),         ATTR_DATA(GEN),         SGML_MIXED,   T_BIG},
- { P(BLINK),       ATTR_DATA(GEN),         SGML_MIXED,   T_BLINK},
- { P(BLOCKQUOTE),  ATTR_DATA(BQ),          SGML_MIXED,   T_BLOCKQUOTE},
- { P(BODY),        ATTR_DATA(BODY),        SGML_MIXED,   T_BODY},
- { P(BODYTEXT),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_BODYTEXT},
- { P(BQ),          ATTR_DATA(BQ),          SGML_MIXED,   T_BQ},
- { P(BR),          ATTR_DATA(GEN),         SGML_EMPTY,   T_BR},
- { P(BUTTON),      ATTR_DATA(BUTTON),      SGML_MIXED,   T_BUTTON},
- { P(CAPTION),     ATTR_DATA(CAPTION),     SGML_MIXED,   T_CAPTION},
- { P(CENTER),      ATTR_DATA(DIV),         SGML_MIXED,   T_CENTER},
- { P(CITE),        ATTR_DATA(GEN),         SGML_MIXED,   T_CITE},
- { P(CODE),        ATTR_DATA(GEN),         SGML_MIXED,   T_CODE},
- { P(COL),         ATTR_DATA(COL),         SGML_EMPTY,   T_COL},
- { P(COLGROUP),    ATTR_DATA(COL),         SGML_ELEMENT, T_COLGROUP},
- { P(COMMENT),     ATTR_DATA(GEN),         SGML_PCDATA,  T_COMMENT},
- { P(CREDIT),      ATTR_DATA(GEN),         SGML_MIXED,   T_CREDIT},
- { P(DD),          ATTR_DATA(GEN),         SGML_MIXED,   T_DD},
- { P(DEL),         ATTR_DATA(DEL),         SGML_MIXED,   T_DEL},
- { P(DFN),         ATTR_DATA(GEN),         SGML_MIXED,   T_DFN},
- { P(DIR),         ATTR_DATA(UL),          SGML_MIXED,   T_DIR},
- { P(DIV),         ATTR_DATA(DIV),         SGML_MIXED,   T_DIV},
- { P(DL),          ATTR_DATA(DL),          SGML_MIXED,   T_DL},
- { P(DLC),         ATTR_DATA(DL),          SGML_MIXED,   T_DLC},
- { P(DT),          ATTR_DATA(GEN),         SGML_MIXED,   T_DT},
- { P(EM),          ATTR_DATA(GEN),         SGML_MIXED,   T_EM},
- { P(EMBED),       ATTR_DATA(EMBED),       SGML_EMPTY,   T_EMBED},
- { P(FIELDSET),    ATTR_DATA(GEN),         SGML_MIXED,   T_FIELDSET},
- { P(FIG),         ATTR_DATA(FIG),         SGML_MIXED,   T_FIG},
- { P(FIGURE),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FIGURE},
- { P(FN),          ATTR_DATA(GEN),         SGML_MIXED,   T_FN},
- { P(FONT),        ATTR_DATA(FONT),        SGML_MIXED,   T_FONT},
- { P(FOOTER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FOOTER},
- { P(FORM),        ATTR_DATA(FORM),        SGML_MIXED,   T_FORM},
- { P(FRAME),       ATTR_DATA(FRAME),       SGML_EMPTY,   T_FRAME},
- { P(FRAMESET),    ATTR_DATA(FRAMESET),    SGML_ELEMENT, T_FRAMESET},
- { P0(H1),         ATTR_DATA(H),           SGML_MIXED,   T_H1},
- { P0(H2),         ATTR_DATA(H),           SGML_MIXED,   T_H2},
- { P0(H3),         ATTR_DATA(H),           SGML_MIXED,   T_H3},
- { P0(H4),         ATTR_DATA(H),           SGML_MIXED,   T_H4},
- { P0(H5),         ATTR_DATA(H),           SGML_MIXED,   T_H5},
- { P0(H6),         ATTR_DATA(H),           SGML_MIXED,   T_H6},
- { P(HEAD),        ATTR_DATA(GEN),         SGML_ELEMENT, T_HEAD},
- { P(HEADER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_HEADER},
- { P(HR),          ATTR_DATA(HR),          SGML_EMPTY,   T_HR},
- { P(HTML),        ATTR_DATA(GEN),         SGML_MIXED,   T_HTML},
- { P(HY),          ATTR_DATA(GEN),         SGML_EMPTY,   T_HY},
- { P(I),           ATTR_DATA(GEN),         SGML_MIXED,   T_I},
- { P(IFRAME),      ATTR_DATA(IFRAME),      SGML_MIXED,   T_IFRAME},
- { P(IMG),         ATTR_DATA(IMG),         SGML_EMPTY,   T_IMG},
- { P(INPUT),       ATTR_DATA(INPUT),       SGML_EMPTY,   T_INPUT},
- { P(INS),         ATTR_DATA(DEL),         SGML_MIXED,   T_INS},
- { P(ISINDEX),     ATTR_DATA(ISINDEX),     SGML_EMPTY,   T_ISINDEX},
- { P(KBD),         ATTR_DATA(GEN),         SGML_MIXED,   T_KBD},
- { P(KEYGEN),      ATTR_DATA(KEYGEN),      SGML_EMPTY,   T_KEYGEN},
- { P(LABEL),       ATTR_DATA(LABEL),       SGML_MIXED,   T_LABEL},
- { P(LEGEND),      ATTR_DATA(CAPTION),     SGML_MIXED,   T_LEGEND},
- { P(LH),          ATTR_DATA(GEN),         SGML_MIXED,   T_LH},
- { P(LI),          ATTR_DATA(LI),          SGML_MIXED,   T_LI},
- { P(LINK),        ATTR_DATA(LINK),        SGML_EMPTY,   T_LINK},
- { P(LISTING),     ATTR_DATA(GEN),         SGML_LITTERAL,T_LISTING},
- { P(MAIN),        ATTR_DATA(GEN5),        SGML_MIXED,   T_MAIN},
- { P(MAP),         ATTR_DATA(MAP),         SGML_ELEMENT, T_MAP},
- { P(MARQUEE),     ATTR_DATA(GEN),         SGML_MIXED,   T_MARQUEE},
- { P(MATH),        ATTR_DATA(MATH),        SGML_PCDATA,  T_MATH},
- { P(MENU),        ATTR_DATA(UL),          SGML_MIXED,   T_MENU},
- { P(META),        ATTR_DATA(META),        SGML_EMPTY,   T_META},
- { P(NAV),         ATTR_DATA(GEN5),        SGML_MIXED,   T_NAV},
- { P(NEXTID),      ATTR_DATA(NEXTID),      SGML_EMPTY,   T_NEXTID},
- { P(NOFRAMES),    ATTR_DATA(GEN),         SGML_MIXED,   T_NOFRAMES},
- { P(NOTE),        ATTR_DATA(NOTE),        SGML_MIXED,   T_NOTE},
- { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_LITTERAL,T_OBJECT},
- { P(OL),          ATTR_DATA(OL),          SGML_MIXED,   T_OL},
- { P(OPTION),      ATTR_DATA(OPTION),      SGML_PCDATA,  T_OPTION},
- { P(OVERLAY),     ATTR_DATA(OVERLAY),     SGML_PCDATA,  T_OVERLAY},
- { P(P),           ATTR_DATA(P),           SGML_MIXED,   T_P},
- { P(PARAM),       ATTR_DATA(PARAM),       SGML_EMPTY,   T_PARAM},
- { P(PLAINTEXT),   ATTR_DATA(GEN),         SGML_LITTERAL,T_PLAINTEXT},
- { P0(PRE),        ATTR_DATA(GEN),         SGML_MIXED,   T_PRE},
- { P(Q),           ATTR_DATA(Q),           SGML_MIXED,   T_Q},
- { P(S),           ATTR_DATA(GEN),         SGML_MIXED,   T_S},
- { P(SAMP),        ATTR_DATA(GEN),         SGML_MIXED,   T_SAMP},
- { P(SCRIPT),      ATTR_DATA(SCRIPT),      SGML_SCRIPT,  T_SCRIPT},
- { P(SECTION),     ATTR_DATA(GEN5),        SGML_MIXED,   T_SECTION},
- { P(SELECT),      ATTR_DATA(SELECT),      SGML_ELEMENT, T_SELECT},
- { P(SHY),         ATTR_DATA(GEN),         SGML_EMPTY,   T_SHY},
- { P(SMALL),       ATTR_DATA(GEN),         SGML_MIXED,   T_SMALL},
- { P(SPAN),        ATTR_DATA(GEN),         SGML_MIXED,   T_SPAN},
- { P(SPOT),        ATTR_DATA(GEN),         SGML_EMPTY,   T_SPOT},
- { P(STRIKE),      ATTR_DATA(GEN),         SGML_MIXED,   T_STRIKE},
- { P(STRONG),      ATTR_DATA(GEN),         SGML_MIXED,   T_STRONG},
- { P(STYLE),       ATTR_DATA(STYLE),       SGML_CDATA,   T_STYLE},
- { P(SUB),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUB},
- { P(SUP),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUP},
- { P(TAB),         ATTR_DATA(TAB),         SGML_EMPTY,   T_TAB},
- { P(TABLE),       ATTR_DATA(TABLE),       SGML_ELEMENT, T_TABLE},
- { P(TBODY),       ATTR_DATA(TR),          SGML_ELEMENT, T_TBODY},
- { P(TD),          ATTR_DATA(TD),          SGML_MIXED,   T_TD},
- { P(TEXTAREA),    ATTR_DATA(TEXTAREA),    SGML_PCDATA,  T_TEXTAREA},
- { P(TEXTFLOW),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_TEXTFLOW},
- { P(TFOOT),       ATTR_DATA(TR),          SGML_ELEMENT, T_TFOOT},
- { P(TH),          ATTR_DATA(TD),          SGML_MIXED,   T_TH},
- { P(THEAD),       ATTR_DATA(TR),          SGML_ELEMENT, T_THEAD},
- { P(TITLE),       ATTR_DATA(GEN),         SGML_PCDATA,  T_TITLE},
- { P(TR),          ATTR_DATA(TR),          SGML_MIXED,   T_TR},
- { P(TT),          ATTR_DATA(GEN),         SGML_MIXED,   T_TT},
- { P(U),           ATTR_DATA(GEN),         SGML_MIXED,   T_U},
- { P(UL),          ATTR_DATA(UL),          SGML_MIXED,   T_UL},
- { P(VAR),         ATTR_DATA(GEN),         SGML_MIXED,   T_VAR},
- { P(WBR),         ATTR_DATA(GEN),         SGML_EMPTY,   T_WBR},
- { P0(XMP),        ATTR_DATA(GEN),         SGML_LITTERAL,T_XMP},
+ { P(A),           ATTR_DATA(A),           SGML_MIXED,   T_A, 0, 0},
+ { P(ABBR),        ATTR_DATA(GEN),         SGML_MIXED,   T_ABBR, 0, 0},
+ { P(ACRONYM),     ATTR_DATA(GEN),         SGML_MIXED,   T_ACRONYM, 0, 0},
+ { P(ADDRESS),     ATTR_DATA(ADDRESS),     SGML_MIXED,   T_ADDRESS, 0, 0},
+ { P(APPLET),      ATTR_DATA(APPLET),      SGML_MIXED,   T_APPLET, 0, 0},
+ { P(AREA),        ATTR_DATA(AREA),        SGML_EMPTY,   T_AREA, 0, 0},
+ { P(ARTICLE),     ATTR_DATA(GEN5),        SGML_MIXED,   T_ARTICLE, 0, 0},
+ { P(ASIDE),       ATTR_DATA(GEN5),        SGML_MIXED,   T_ASIDE, 0, 0},
+ { P(AU),          ATTR_DATA(GEN),         SGML_MIXED,   T_AU, 0, 0},
+ { P(AUTHOR),      ATTR_DATA(GEN),         SGML_MIXED,   T_AUTHOR, 0, 0},
+ { P(B),           ATTR_DATA(GEN),         SGML_MIXED,   T_B, 0, 0},
+ { P0(BANNER),     ATTR_DATA(GEN),         SGML_MIXED,   T_BANNER, 0, 0},
+ { P(BASE),        ATTR_DATA(BASE),        SGML_EMPTY,   T_BASE, 0, 0},
+ { P(BASEFONT),    ATTR_DATA(FONT),        SGML_EMPTY,   T_BASEFONT, 0, 0},
+ { P(BDO),         ATTR_DATA(GEN),         SGML_MIXED,   T_BDO, 0, 0},
+ { P(BGSOUND),     ATTR_DATA(BGSOUND),     SGML_EMPTY,   T_BGSOUND, 0, 0},
+ { P(BIG),         ATTR_DATA(GEN),         SGML_MIXED,   T_BIG, 0, 0},
+ { P(BLINK),       ATTR_DATA(GEN),         SGML_MIXED,   T_BLINK, 0, 0},
+ { P(BLOCKQUOTE),  ATTR_DATA(BQ),          SGML_MIXED,   T_BLOCKQUOTE, 0, 0},
+ { P(BODY),        ATTR_DATA(BODY),        SGML_MIXED,   T_BODY, 0, 0},
+ { P(BODYTEXT),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_BODYTEXT, 0, 0},
+ { P(BQ),          ATTR_DATA(BQ),          SGML_MIXED,   T_BQ, 0, 0},
+ { P(BR),          ATTR_DATA(GEN),         SGML_EMPTY,   T_BR, 0, 0},
+ { P(BUTTON),      ATTR_DATA(BUTTON),      SGML_MIXED,   T_BUTTON, 0, 0},
+ { P(CAPTION),     ATTR_DATA(CAPTION),     SGML_MIXED,   T_CAPTION, 0, 0},
+ { P(CENTER),      ATTR_DATA(DIV),         SGML_MIXED,   T_CENTER, 0, 0},
+ { P(CITE),        ATTR_DATA(GEN),         SGML_MIXED,   T_CITE, 0, 0},
+ { P(CODE),        ATTR_DATA(GEN),         SGML_MIXED,   T_CODE, 0, 0},
+ { P(COL),         ATTR_DATA(COL),         SGML_EMPTY,   T_COL, 0, 0},
+ { P(COLGROUP),    ATTR_DATA(COL),         SGML_ELEMENT, T_COLGROUP, 0, 0},
+ { P(COMMENT),     ATTR_DATA(GEN),         SGML_PCDATA,  T_COMMENT, 0, 0},
+ { P(CREDIT),      ATTR_DATA(GEN),         SGML_MIXED,   T_CREDIT, 0, 0},
+ { P(DD),          ATTR_DATA(GEN),         SGML_MIXED,   T_DD, 0, 0},
+ { P(DEL),         ATTR_DATA(DEL),         SGML_MIXED,   T_DEL, 0, 1},
+ { P(DEL),         ATTR_DATA(DEL),         SGML_MIXED,   T_DEL_2, 1, 1},
+ { P(DFN),         ATTR_DATA(GEN),         SGML_MIXED,   T_DFN, 0, 0},
+ { P(DIR),         ATTR_DATA(UL),          SGML_MIXED,   T_DIR, 0, 0},
+ { P(DIV),         ATTR_DATA(DIV),         SGML_MIXED,   T_DIV, 0, 0},
+ { P(DL),          ATTR_DATA(DL),          SGML_MIXED,   T_DL, 0, 0},
+ { P(DLC),         ATTR_DATA(DL),          SGML_MIXED,   T_DLC, 0, 0},
+ { P(DT),          ATTR_DATA(GEN),         SGML_MIXED,   T_DT, 0, 0},
+ { P(EM),          ATTR_DATA(GEN),         SGML_MIXED,   T_EM, 0, 0},
+ { P(EMBED),       ATTR_DATA(EMBED),       SGML_EMPTY,   T_EMBED, 0, 0},
+ { P(FIELDSET),    ATTR_DATA(GEN),         SGML_MIXED,   T_FIELDSET, 0, 0},
+ { P(FIG),         ATTR_DATA(FIG),         SGML_MIXED,   T_FIG, 0, 0},
+ { P(FIGURE),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FIGURE, 0, 0},
+ { P(FN),          ATTR_DATA(GEN),         SGML_MIXED,   T_FN, 0, 0},
+ { P(FONT),        ATTR_DATA(FONT),        SGML_MIXED,   T_FONT, 0, 0},
+ { P(FOOTER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_FOOTER, 0, 0},
+ { P(FORM),        ATTR_DATA(FORM),        SGML_MIXED,   T_FORM, 0, 0},
+ { P(FRAME),       ATTR_DATA(FRAME),       SGML_EMPTY,   T_FRAME, 0, 0},
+ { P(FRAMESET),    ATTR_DATA(FRAMESET),    SGML_ELEMENT, T_FRAMESET, 0, 0},
+ { P0(H1),         ATTR_DATA(H),           SGML_MIXED,   T_H1, 0, 0},
+ { P0(H2),         ATTR_DATA(H),           SGML_MIXED,   T_H2, 0, 0},
+ { P0(H3),         ATTR_DATA(H),           SGML_MIXED,   T_H3, 0, 0},
+ { P0(H4),         ATTR_DATA(H),           SGML_MIXED,   T_H4, 0, 0},
+ { P0(H5),         ATTR_DATA(H),           SGML_MIXED,   T_H5, 0, 0},
+ { P0(H6),         ATTR_DATA(H),           SGML_MIXED,   T_H6, 0, 0},
+ { P(HEAD),        ATTR_DATA(GEN),         SGML_ELEMENT, T_HEAD, 0, 0},
+ { P(HEADER),      ATTR_DATA(GEN5),        SGML_MIXED,   T_HEADER, 0, 0},
+ { P(HR),          ATTR_DATA(HR),          SGML_EMPTY,   T_HR, 0, 0},
+ { P(HTML),        ATTR_DATA(GEN),         SGML_MIXED,   T_HTML, 0, 0},
+ { P(HY),          ATTR_DATA(GEN),         SGML_EMPTY,   T_HY, 0, 0},
+ { P(I),           ATTR_DATA(GEN),         SGML_MIXED,   T_I, 0, 0},
+ { P(IFRAME),      ATTR_DATA(IFRAME),      SGML_MIXED,   T_IFRAME, 0, 0},
+ { P(IMG),         ATTR_DATA(IMG),         SGML_EMPTY,   T_IMG, 0, 0},
+ { P(INPUT),       ATTR_DATA(INPUT),       SGML_EMPTY,   T_INPUT, 0, 0},
+ { P(INS),         ATTR_DATA(DEL),         SGML_MIXED,   T_INS, 0, 1},
+ { P(INS),         ATTR_DATA(DEL),         SGML_MIXED,   T_INS_2, 1, 1},
+ { P(ISINDEX),     ATTR_DATA(ISINDEX),     SGML_EMPTY,   T_ISINDEX, 0, 0},
+ { P(KBD),         ATTR_DATA(GEN),         SGML_MIXED,   T_KBD, 0, 0},
+ { P(KEYGEN),      ATTR_DATA(KEYGEN),      SGML_EMPTY,   T_KEYGEN, 0, 0},
+ { P(LABEL),       ATTR_DATA(LABEL),       SGML_MIXED,   T_LABEL, 0, 0},
+ { P(LEGEND),      ATTR_DATA(CAPTION),     SGML_MIXED,   T_LEGEND, 0, 0},
+ { P(LH),          ATTR_DATA(GEN),         SGML_MIXED,   T_LH, 0, 0},
+ { P(LI),          ATTR_DATA(LI),          SGML_MIXED,   T_LI, 0, 0},
+ { P(LINK),        ATTR_DATA(LINK),        SGML_EMPTY,   T_LINK, 0, 0},
+ { P(LISTING),     ATTR_DATA(GEN),         SGML_LITTERAL,T_LISTING, 0, 0},
+ { P(MAIN),        ATTR_DATA(GEN5),        SGML_MIXED,   T_MAIN, 0, 0},
+ { P(MAP),         ATTR_DATA(MAP),         SGML_ELEMENT, T_MAP, 0, 0},
+ { P(MARQUEE),     ATTR_DATA(GEN),         SGML_MIXED,   T_MARQUEE, 0, 0},
+ { P(MATH),        ATTR_DATA(MATH),        SGML_PCDATA,  T_MATH, 0, 0},
+ { P(MENU),        ATTR_DATA(UL),          SGML_MIXED,   T_MENU, 0, 0},
+ { P(META),        ATTR_DATA(META),        SGML_EMPTY,   T_META, 0, 0},
+ { P(NAV),         ATTR_DATA(GEN5),        SGML_MIXED,   T_NAV, 0, 0},
+ { P(NEXTID),      ATTR_DATA(NEXTID),      SGML_EMPTY,   T_NEXTID, 0, 0},
+ { P(NOFRAMES),    ATTR_DATA(GEN),         SGML_MIXED,   T_NOFRAMES, 0, 0},
+ { P(NOTE),        ATTR_DATA(NOTE),        SGML_MIXED,   T_NOTE, 0, 0},
+ { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_LITTERAL,T_OBJECT, 0, 0},
+ { P(OL),          ATTR_DATA(OL),          SGML_MIXED,   T_OL, 0, 0},
+ { P(OPTION),      ATTR_DATA(OPTION),      SGML_PCDATA,  T_OPTION, 0, 0},
+ { P(OVERLAY),     ATTR_DATA(OVERLAY),     SGML_PCDATA,  T_OVERLAY, 0, 0},
+ { P(P),           ATTR_DATA(P),           SGML_MIXED,   T_P, 0, 0},
+ { P(PARAM),       ATTR_DATA(PARAM),       SGML_EMPTY,   T_PARAM, 0, 0},
+ { P(PLAINTEXT),   ATTR_DATA(GEN),         SGML_LITTERAL,T_PLAINTEXT, 0, 0},
+ { P0(PRE),        ATTR_DATA(GEN),         SGML_MIXED,   T_PRE, 0, 0},
+ { P(Q),           ATTR_DATA(Q),           SGML_MIXED,   T_Q, 0, 0},
+ { P(S),           ATTR_DATA(GEN),         SGML_MIXED,   T_S, 0, 0},
+ { P(SAMP),        ATTR_DATA(GEN),         SGML_MIXED,   T_SAMP, 0, 0},
+ { P(SCRIPT),      ATTR_DATA(SCRIPT),      SGML_SCRIPT,  T_SCRIPT, 0, 0},
+ { P(SECTION),     ATTR_DATA(GEN5),        SGML_MIXED,   T_SECTION, 0, 0},
+ { P(SELECT),      ATTR_DATA(SELECT),      SGML_ELEMENT, T_SELECT, 0, 0},
+ { P(SHY),         ATTR_DATA(GEN),         SGML_EMPTY,   T_SHY, 0, 0},
+ { P(SMALL),       ATTR_DATA(GEN),         SGML_MIXED,   T_SMALL, 0, 0},
+ { P(SPAN),        ATTR_DATA(GEN),         SGML_MIXED,   T_SPAN, 0, 0},
+ { P(SPOT),        ATTR_DATA(GEN),         SGML_EMPTY,   T_SPOT, 0, 0},
+ { P(STRIKE),      ATTR_DATA(GEN),         SGML_MIXED,   T_STRIKE, 0, 0},
+ { P(STRONG),      ATTR_DATA(GEN),         SGML_MIXED,   T_STRONG, 0, 0},
+ { P(STYLE),       ATTR_DATA(STYLE),       SGML_CDATA,   T_STYLE, 0, 0},
+ { P(SUB),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUB, 0, 0},
+ { P(SUP),         ATTR_DATA(GEN),         SGML_MIXED,   T_SUP, 0, 0},
+ { P(TAB),         ATTR_DATA(TAB),         SGML_EMPTY,   T_TAB, 0, 0},
+ { P(TABLE),       ATTR_DATA(TABLE),       SGML_ELEMENT, T_TABLE, 0, 0},
+ { P(TBODY),       ATTR_DATA(TR),          SGML_ELEMENT, T_TBODY, 0, 0},
+ { P(TD),          ATTR_DATA(TD),          SGML_MIXED,   T_TD, 0, 0},
+ { P(TEXTAREA),    ATTR_DATA(TEXTAREA),    SGML_PCDATA,  T_TEXTAREA, 0, 0},
+ { P(TEXTFLOW),    ATTR_DATA(BODYTEXT),    SGML_MIXED,   T_TEXTFLOW, 0, 0},
+ { P(TFOOT),       ATTR_DATA(TR),          SGML_ELEMENT, T_TFOOT, 0, 0},
+ { P(TH),          ATTR_DATA(TD),          SGML_MIXED,   T_TH, 0, 0},
+ { P(THEAD),       ATTR_DATA(TR),          SGML_ELEMENT, T_THEAD, 0, 0},
+ { P(TITLE),       ATTR_DATA(GEN),         SGML_PCDATA,  T_TITLE, 0, 0},
+ { P(TR),          ATTR_DATA(TR),          SGML_MIXED,   T_TR, 0, 0},
+ { P(TT),          ATTR_DATA(GEN),         SGML_MIXED,   T_TT, 0, 0},
+ { P(U),           ATTR_DATA(GEN),         SGML_MIXED,   T_U, 0, 0},
+ { P(UL),          ATTR_DATA(UL),          SGML_MIXED,   T_UL, 0, 0},
+ { P(VAR),         ATTR_DATA(GEN),         SGML_MIXED,   T_VAR, 0, 0},
+ { P(WBR),         ATTR_DATA(GEN),         SGML_EMPTY,   T_WBR, 0, 0},
+ { P0(XMP),        ATTR_DATA(GEN),         SGML_LITTERAL,T_XMP, 0, 0},
 /* additional (alternative variants), not counted in HTML_ELEMENTS: */
 /* This one will be used as a temporary substitute within the parser when
    it has been signalled to parse OBJECT content as MIXED. - kw */
- { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_MIXED,   T_OBJECT_PCDATA},
+ { P(OBJECT),      ATTR_DATA(OBJECT),      SGML_MIXED,   T_OBJECT_PCDATA, 0, 0},
 };
 /* *INDENT-ON* */
 
diff --git a/WWW/Library/Implementation/src1_HTMLDTD.txt b/WWW/Library/Implementation/src1_HTMLDTD.txt
index 8a067058..839d3e5f 100644
--- a/WWW/Library/Implementation/src1_HTMLDTD.txt
+++ b/WWW/Library/Implementation/src1_HTMLDTD.txt
@@ -124,9 +124,9 @@
 			1:0:CLEAR
 			2:0:DISABLED
 			3:0:NAME
-			4:0:READONLY
-			5:0:ONBLUR
-			6:0:ONFOCUS
+			4:0:ONBLUR
+			5:0:ONFOCUS
+			6:0:READONLY
 			7:0:TABINDEX
 			8:0:TYPE
 			9:0:VALUE
@@ -528,7 +528,7 @@
 			5:2:SRC
 			6:0:TYPE
 			7:0:WRAP
-126 tags
+128 tags
 	0:A
 		justify
 		25 attributes:
@@ -635,8 +635,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike DIVlike same
 		flags:
 	4:APPLET
@@ -725,8 +725,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
 	7:ASIDE
@@ -748,8 +748,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
 	8:AU
@@ -840,8 +840,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
-		contained: outer BODYlike
-		icontained: outer BODYlike
+		contained: outer BODYlike DELlike
+		icontained: outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
 	12:BASE
@@ -909,8 +909,8 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike Plike DIVlike
 		flags:
 	15:BGSOUND
@@ -1003,8 +1003,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
 	19:BODY
@@ -1032,8 +1032,8 @@
 			BODY
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike
+		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike DELlike
 		contained: outer BODYlike
 		icontained: outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer HEADstuff same
@@ -1061,8 +1061,8 @@
 			BODYTEXT
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
+		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same DELlike
 		contained: DIVlike outer BODYlike
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike BRlike APPLETlike HRlike MAPlike same
@@ -1087,8 +1087,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
 	22:BR
@@ -1168,8 +1168,8 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: DIVlike ULlike APPLETlike HRlike
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: DIVlike ULlike APPLETlike HRlike DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike same
 		flags:
 	25:CENTER
@@ -1192,8 +1192,8 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags:
 	26:CITE
@@ -1344,8 +1344,8 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: DIVlike ULlike APPLETlike HRlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: DIVlike ULlike APPLETlike HRlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike Plike DIVlike same
 		flags:
 	32:DD
@@ -1389,13 +1389,37 @@
 			DEL
 		contents: SGML_MIXED
 		tagclass: EMlike
+		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike same
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
+		canclose: FONTlike EMlike DELlike
+		flags:
+	34:DEL!
+		justify
+		8 attributes:
+			0:0:CITE
+			1:4:CLASS
+			2:0:DATETIME
+			3:0:DIR
+			4:1:ID
+			5:0:LANG
+			6:0:STYLE
+			7:0:TITLE
+		4 attr_types
+			core
+			events
+			i18n
+			DEL
+		contents: SGML_MIXED
+		tagclass: DELlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
 		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike BODYlike same
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
-		canclose: FONTlike EMlike
+		canclose: FONTlike EMlike DELlike
 		flags:
-	34:DFN
+	35:DFN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1418,7 +1442,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags:
-	35:DIR
+	36:DIR
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -1443,11 +1467,11 @@
 		tagclass: ULlike
 		contains: LIlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike BRlike APPLETlike HRlike MAPlike
-		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike HRlike same
 		flags:
-	36:DIV
+	37:DIV
 		justify
 		8 attributes:
 			0:0:ALIGN
@@ -1467,11 +1491,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike DIVlike same
 		flags: mafse
-	37:DL
+	38:DL
 		justify
 		8 attributes:
 			0:4:CLASS
@@ -1490,11 +1514,11 @@
 		tagclass: ULlike
 		contains: FORMlike LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula SELECTlike Plike DIVlike LIlike
 		flags:
-	38:DLC
+	39:DLC
 		justify
 		8 attributes:
 			0:4:CLASS
@@ -1513,11 +1537,11 @@
 		tagclass: ULlike
 		contains: FORMlike LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike
 		flags:
-	39:DT
+	40:DT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1540,7 +1564,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags: endO
-	40:EM
+	41:EM
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1563,7 +1587,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags: nreie
-	41:EMBED
+	42:EMBED
 		justify
 		21 attributes:
 			0:0:ALIGN
@@ -1600,7 +1624,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
 		flags: endO
-	42:FIELDSET
+	43:FIELDSET
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1619,11 +1643,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike APPLETlike HRlike same
-		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike APPLETlike HRlike same DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike MAPlike same
 		flags:
-	43:FIG
+	44:FIG
 		justify
 		17 attributes:
 			0:0:ALIGN
@@ -1652,11 +1676,11 @@
 		tagclass: DIVlike
 		contains: Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike MAPlike same
 		flags:
-	44:FIGURE
+	45:FIGURE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1675,11 +1699,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	45:FN
+	46:FN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1698,11 +1722,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike same
 		flags:
-	46:FONT
+	47:FONT
 		justify
 		11 attributes:
 			0:4:CLASS
@@ -1728,7 +1752,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	47:FOOTER
+	48:FOOTER
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -1747,11 +1771,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	48:FORM
+	49:FORM
 		justify
 		17 attributes:
 			0:0:ACCEPT
@@ -1779,11 +1803,11 @@
 		tagclass: FORMlike
 		contains: FONTlike EMlike MATHlike Alike TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
-		contained: FONTlike EMlike MATHlike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike
+		contained: FONTlike EMlike MATHlike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike LIlike ULlike MAPlike same
 		flags:
-	49:FRAME
+	50:FRAME
 		justify
 		12 attributes:
 			0:4:CLASS
@@ -1809,7 +1833,7 @@
 		icontained: outer
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
 		flags: endO
-	50:FRAMESET
+	51:FRAMESET
 		justify
 		4 attributes:
 			0:0:COLS
@@ -1826,7 +1850,7 @@
 		icontained: BRlike APPLETlike outer same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
 		flags:
-	51:H1
+	52:H1
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1853,11 +1877,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	52:H2
+	53:H2
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1884,11 +1908,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	53:H3
+	54:H3
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1915,11 +1939,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	54:H4
+	55:H4
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1946,11 +1970,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	55:H5
+	56:H5
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -1977,11 +2001,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	56:H6
+	57:H6
 		nojustify
 		14 attributes:
 			0:0:ALIGN
@@ -2008,11 +2032,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags:
-	57:HEAD
+	58:HEAD
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2035,7 +2059,7 @@
 		icontained: outer
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
 		flags: endO startO mafse
-	58:HEADER
+	59:HEADER
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2054,11 +2078,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	59:HR
+	60:HR
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -2087,7 +2111,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike formula TRlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
 		flags: endO
-	60:HTML
+	61:HTML
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2110,7 +2134,7 @@
 		icontained:
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
 		flags: endO startO
-	61:HY
+	62:HY
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2133,7 +2157,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula BRlike same
 		flags: endO
-	62:I
+	63:I
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2156,7 +2180,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	63:IFRAME
+	64:IFRAME
 		justify
 		14 attributes:
 			0:0:ALIGN
@@ -2185,7 +2209,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike APPLETlike outer HEADstuff same
 		flags:
-	64:IMG
+	65:IMG
 		justify
 		22 attributes:
 			0:0:ALIGN
@@ -2224,7 +2248,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: same
 		flags: endO
-	65:INPUT
+	66:INPUT
 		justify
 		35 attributes:
 			0:0:ACCEPT
@@ -2276,7 +2300,7 @@
 		icontained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike SELECTlike BRlike MAPlike same
 		flags: endO
-	66:INS
+	67:INS
 		justify
 		8 attributes:
 			0:0:CITE
@@ -2294,13 +2318,37 @@
 			DEL
 		contents: SGML_MIXED
 		tagclass: EMlike
+		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike same
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
+		canclose: FONTlike EMlike DELlike
+		flags:
+	68:INS!
+		justify
+		8 attributes:
+			0:0:CITE
+			1:4:CLASS
+			2:0:DATETIME
+			3:0:DIR
+			4:1:ID
+			5:0:LANG
+			6:0:STYLE
+			7:0:TITLE
+		4 attr_types
+			core
+			events
+			i18n
+			DEL
+		contents: SGML_MIXED
+		tagclass: DELlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
 		contained: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike BODYlike same
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
-		canclose: FONTlike EMlike
+		canclose: FONTlike EMlike DELlike
 		flags:
-	67:ISINDEX
+	69:ISINDEX
 		justify
 		9 attributes:
 			0:2:ACTION
@@ -2324,7 +2372,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike same
 		flags: endO
-	68:KBD
+	70:KBD
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2347,7 +2395,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike
 		flags:
-	69:KEYGEN
+	71:KEYGEN
 		justify
 		8 attributes:
 			0:0:CHALLENGE
@@ -2370,7 +2418,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: formula TRlike SELECTlike same
 		flags: endO
-	70:LABEL
+	72:LABEL
 		justify
 		11 attributes:
 			0:0:ACCESSKEY
@@ -2397,7 +2445,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike
 		flags:
-	71:LEGEND
+	73:LEGEND
 		justify
 		9 attributes:
 			0:0:ACCESSKEY
@@ -2423,7 +2471,7 @@
 		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike
 		flags:
-	72:LH
+	74:LH
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2446,7 +2494,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags: endO
-	73:LI
+	75:LI
 		justify
 		13 attributes:
 			0:4:CLASS
@@ -2475,7 +2523,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags: endO
-	74:LINK
+	76:LINK
 		justify
 		14 attributes:
 			0:0:CHARSET
@@ -2505,7 +2553,7 @@
 		icontained: outer HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
 		flags: endO
-	75:LISTING
+	77:LISTING
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2524,11 +2572,11 @@
 		tagclass: ULlike
 		contains:
 		icontains:
-		contained: DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike same
 		flags:
-	76:MAIN
+	78:MAIN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2547,11 +2595,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	77:MAP
+	79:MAP
 		justify
 		8 attributes:
 			0:4:CLASS
@@ -2574,7 +2622,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike LIlike
 		flags:
-	78:MARQUEE
+	80:MARQUEE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2597,7 +2645,7 @@
 		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: MATHlike Alike formula BRlike APPLETlike same
 		flags:
-	79:MATH
+	81:MATH
 		justify
 		8 attributes:
 			0:0:BOX
@@ -2620,7 +2668,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike MATHlike Alike formula
 		flags:
-	80:MENU
+	82:MENU
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -2645,11 +2693,11 @@
 		tagclass: ULlike
 		contains: LIlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike BRlike APPLETlike HRlike MAPlike
-		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
 		flags:
-	81:META
+	83:META
 		justify
 		5 attributes:
 			0:0:CHARSET
@@ -2667,7 +2715,7 @@
 		icontained: outer HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
 		flags: endO
-	82:NAV
+	84:NAV
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2686,11 +2734,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	83:NEXTID
+	85:NEXTID
 		justify
 		1 attributes:
 			0:0:N
@@ -2704,7 +2752,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
 		canclose: FONTlike
 		flags: endO
-	84:NOFRAMES
+	86:NOFRAMES
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2721,13 +2769,13 @@
 			GEN
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
+		contains: FONTlike EMlike MATHlike Alike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike BODYlike DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike DELlike
 		contained: BRlike APPLETlike HRlike outer
 		icontained: BRlike APPLETlike HRlike outer
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike
 		flags:
-	85:NOTE
+	87:NOTE
 		justify
 		10 attributes:
 			0:4:CLASS
@@ -2748,11 +2796,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike ULlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: formula TRlike FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: formula TRlike FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags:
-	86:OBJECT
+	88:OBJECT
 		justify
 		26 attributes:
 			0:0:ALIGN
@@ -2795,7 +2843,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike same
 		flags: frecyc
-	87:OL
+	89:OL
 		justify
 		12 attributes:
 			0:4:CLASS
@@ -2818,11 +2866,11 @@
 		tagclass: ULlike
 		contains: LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike BRlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
 		flags:
-	88:OPTION
+	90:OPTION
 		justify
 		13 attributes:
 			0:4:CLASS
@@ -2851,7 +2899,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: endO
-	89:OVERLAY
+	91:OVERLAY
 		justify
 		12 attributes:
 			0:4:CLASS
@@ -2877,7 +2925,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike same
 		flags: endO
-	90:P
+	92:P
 		justify
 		9 attributes:
 			0:0:ALIGN
@@ -2898,11 +2946,11 @@
 		tagclass: Plike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike formula Plike same
 		flags: endO
-	91:PARAM
+	93:PARAM
 		justify
 		18 attributes:
 			0:0:ACCEPT
@@ -2935,7 +2983,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
 		canclose: TRlike SELECTlike Plike LIlike BRlike same
 		flags: endO
-	92:PLAINTEXT
+	94:PLAINTEXT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -2958,7 +3006,7 @@
 		icontained: outer same
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
 		flags: endO
-	93:PRE
+	95:PRE
 		nojustify
 		7 attributes:
 			0:4:CLASS
@@ -2977,11 +3025,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike BRlike APPLETlike HRlike MAPlike
 		icontains: EMlike MATHlike Alike formula SELECTlike BRlike APPLETlike HRlike MAPlike
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: EMlike MATHlike Alike formula Plike DIVlike LIlike same
 		flags:
-	94:Q
+	96:Q
 		justify
 		8 attributes:
 			0:2:CITE
@@ -3004,7 +3052,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags:
-	95:S
+	97:S
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3027,7 +3075,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags:
-	96:SAMP
+	98:SAMP
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3050,7 +3098,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: EMlike
 		flags: nreie
-	97:SCRIPT
+	99:SCRIPT
 		justify
 		16 attributes:
 			0:0:CHARSET
@@ -3081,7 +3129,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike HRlike same
 		flags:
-	98:SECTION
+	100:SECTION
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3100,11 +3148,11 @@
 		tagclass: DIVlike
 		contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
 		flags: mafse
-	99:SELECT
+	101:SELECT
 		justify
 		22 attributes:
 			0:0:ALIGN
@@ -3142,7 +3190,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
 		flags: strict
-	100:SHY
+	102:SHY
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3165,7 +3213,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula BRlike same
 		flags: endO
-	101:SMALL
+	103:SMALL
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3188,7 +3236,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	102:SPAN
+	104:SPAN
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3211,7 +3259,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike same
 		flags:
-	103:SPOT
+	105:SPOT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3234,7 +3282,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
 		canclose: Alike
 		flags: endO
-	104:STRIKE
+	106:STRIKE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3257,7 +3305,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags:
-	105:STRONG
+	107:STRONG
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3280,7 +3328,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike
 		flags: nreie
-	106:STYLE
+	108:STYLE
 		justify
 		9 attributes:
 			0:4:CLASS
@@ -3304,7 +3352,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula same
 		flags:
-	107:SUB
+	109:SUB
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3327,7 +3375,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike MATHlike
 		flags:
-	108:SUP
+	110:SUP
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3350,7 +3398,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike EMlike MATHlike
 		flags:
-	109:TAB
+	111:TAB
 		justify
 		11 attributes:
 			0:0:ALIGN
@@ -3377,7 +3425,7 @@
 		icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer HEADstuff
 		canclose: FONTlike
 		flags: endO
-	110:TABLE
+	112:TABLE
 		justify
 		22 attributes:
 			0:0:ALIGN
@@ -3412,11 +3460,11 @@
 		tagclass: ULlike
 		contains: TRlike SELECTlike FORMlike Plike BRlike APPLETlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike LIlike HRlike MAPlike same
 		flags:
-	111:TBODY
+	113:TBODY
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3446,7 +3494,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
 		flags: endO startO
-	112:TD
+	114:TD
 		justify
 		23 attributes:
 			0:0:ABBR
@@ -3485,7 +3533,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
 		flags: endO
-	113:TEXTAREA
+	115:TEXTAREA
 		justify
 		22 attributes:
 			0:0:ACCEPT-CHARSET
@@ -3524,7 +3572,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
 		flags: nolyspcl
-	114:TEXTFLOW
+	116:TEXTFLOW
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -3547,13 +3595,13 @@
 			BODYTEXT
 		contents: SGML_MIXED
 		tagclass: BODYlike
-		contains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
-		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
+		contains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same DELlike
+		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same DELlike
 		contained: formula TRlike FORMlike Plike DIVlike LIlike BRlike APPLETlike HRlike outer same
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike BRlike APPLETlike MAPlike outer same
 		flags: endO startO
-	115:TFOOT
+	117:TFOOT
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3583,7 +3631,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
 		flags: endO
-	116:TH
+	118:TH
 		justify
 		23 attributes:
 			0:0:ABBR
@@ -3622,7 +3670,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
 		flags: endO
-	117:THEAD
+	119:THEAD
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3652,7 +3700,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
 		flags: endO
-	118:TITLE
+	120:TITLE
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3675,7 +3723,7 @@
 		icontained: outer HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike
 		flags: mafse strict
-	119:TR
+	121:TR
 		justify
 		13 attributes:
 			0:0:ALIGN
@@ -3705,7 +3753,7 @@
 		icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
 		flags: endO
-	120:TT
+	122:TT
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3728,7 +3776,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: nreie
-	121:U
+	123:U
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3751,7 +3799,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags: mafse nreie
-	122:UL
+	124:UL
 		justify
 		14 attributes:
 			0:4:CLASS
@@ -3776,11 +3824,11 @@
 		tagclass: ULlike
 		contains: FORMlike LIlike HRlike MAPlike
 		icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
-		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+		contained: FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike same
 		flags:
-	123:VAR
+	125:VAR
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3803,7 +3851,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
 		canclose: FONTlike
 		flags:
-	124:WBR
+	126:WBR
 		justify
 		7 attributes:
 			0:4:CLASS
@@ -3826,7 +3874,7 @@
 		icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
 		canclose: FONTlike EMlike MATHlike Alike formula BRlike same
 		flags: endO
-	125:XMP
+	127:XMP
 		nojustify
 		7 attributes:
 			0:4:CLASS
@@ -3845,7 +3893,7 @@
 		tagclass: ULlike
 		contains:
 		icontains:
-		contained: TRlike SELECTlike FORMlike Plike DIVlike LIlike APPLETlike HRlike outer BODYlike
-		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
+		contained: TRlike SELECTlike FORMlike Plike DIVlike LIlike APPLETlike HRlike outer BODYlike DELlike
+		icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike DELlike
 		canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike MAPlike
 		flags: endO