diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | WWW/Library/Implementation/dtd_util.c | 14 | ||||
| -rw-r--r-- | WWW/Library/Implementation/hdr_HTMLDTD.h | 23 | ||||
| -rw-r--r-- | WWW/Library/Implementation/makefile.in | 23 | ||||
| -rw-r--r-- | WWW/Library/Implementation/src0_HTMLDTD.h | 50 | ||||
| -rw-r--r-- | WWW/Library/Implementation/src0_HTMLDTD.txt | 477 | ||||
| -rw-r--r-- | WWW/Library/Implementation/src1_HTMLDTD.h | 50 | ||||
| -rw-r--r-- | WWW/Library/Implementation/src1_HTMLDTD.txt | 477 | ||||
| -rw-r--r-- | src/HTML.c | 18 |
9 files changed, 824 insertions, 314 deletions
diff --git a/CHANGES b/CHANGES index 0fb46248..d0be0d1e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,13 @@ --- $LynxId: CHANGES,v 1.822 2015/12/13 22:54:20 tom Exp $ +-- $LynxId: CHANGES,v 1.823 2015/12/13 23:17:38 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== 2015-12-13 (2.8.9dev.7) +* add support for some HTML5 elements -Kihara Hideto + Using this change, you can jump to <section id="speakers">. + (The addition in src{0,1}_HTMLDTD.txt is copied from DIV.) + <section>, <article>, <main>, <aside>, <header>, <footer>, <nav>, <figure> * improve configure check for extended curses functions, needed for compiling with ncursesw on OSX, in particular when configuring with ncurses6 (report by Tom Wyant) -TD diff --git a/WWW/Library/Implementation/dtd_util.c b/WWW/Library/Implementation/dtd_util.c index 4e18fdf7..0badcbd5 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.76 2010/09/25 00:30:23 tom Exp $ + * $LynxId: dtd_util.c,v 1.78 2015/12/13 23:22:17 tom Exp $ * * Given a SGML_dtd structure, write a corresponding flat file, or "C" source. * Given the flat-file, write the "C" source. @@ -267,6 +267,8 @@ static const char *NameOfAttrs(const SGML_dtd * dtd, int which) /* special cases to match existing headers */ if (!strcmp(result, "ABBR")) result = "GEN"; + else if (!strcmp(result, "ARTICLE")) + result = "GEN5"; else if (!strcmp(result, "BLOCKQUOTE")) result = "BQ"; else if (!strcmp(result, "BASEFONT")) @@ -1300,8 +1302,8 @@ static SGML_dtd *load_flatfile(FILE *input) AttrType *attr_types = 0; SGML_dtd *result = 0; size_t n; - size_t number_of_attrs = 0; - size_t number_of_tags = 0; + int number_of_attrs = 0; + int number_of_tags = 0; HTTag *tag; int code; @@ -1309,7 +1311,7 @@ static SGML_dtd *load_flatfile(FILE *input) if (code && number_of_attrs && (attr_types = typecallocn(AttrType, number_of_attrs + 1)) != 0) { - for (n = 0; n < number_of_attrs; ++n) { + for (n = 0; n < (size_t) number_of_attrs; ++n) { if (!load_flat_AttrType(input, attr_types + n, n)) { break; } @@ -1320,7 +1322,7 @@ static SGML_dtd *load_flatfile(FILE *input) if (code == 1) { if ((result = typecalloc(SGML_dtd)) != 0 && (result->tags = typecallocn(HTTag, (number_of_tags + 2))) != 0) { - for (n = 0; n < number_of_tags; ++n) { + for (n = 0; n < (size_t) number_of_tags; ++n) { if (load_flat_HTTag(input, n, &(result->tags[n]), attr_types)) { result->number_of_tags = (n + 1); } else { @@ -1328,7 +1330,7 @@ static SGML_dtd *load_flatfile(FILE *input) } } tag = 0; - for (n = 0; n < number_of_tags; ++n) { + for (n = 0; n < (size_t) number_of_tags; ++n) { if (result->tags[n].name != 0 && !strcmp(result->tags[n].name, "OBJECT")) { tag = result->tags + number_of_tags; diff --git a/WWW/Library/Implementation/hdr_HTMLDTD.h b/WWW/Library/Implementation/hdr_HTMLDTD.h index 9e4d47b0..d00bf37e 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.22 2011/10/07 00:54:36 Kihara.Hideto Exp $ */ +/* $LynxId: hdr_HTMLDTD.h,v 1.23 2015/12/13 23:08:45 Kihara.Hideto Exp $ */ #ifndef hdr_HTMLDTD_H #define hdr_HTMLDTD_H 1 @@ -21,6 +21,8 @@ extern "C" { HTML_ADDRESS, HTML_APPLET, HTML_AREA, + HTML_ARTICLE, + HTML_ASIDE, HTML_AU, HTML_AUTHOR, HTML_B, @@ -57,8 +59,10 @@ extern "C" { HTML_EMBED, HTML_FIELDSET, HTML_FIG, + HTML_FIGURE, HTML_FN, HTML_FONT, + HTML_FOOTER, HTML_FORM, HTML_FRAME, HTML_FRAMESET, @@ -69,6 +73,7 @@ extern "C" { HTML_H5, HTML_H6, HTML_HEAD, + HTML_HEADER, HTML_HR, HTML_HTML, HTML_HY, @@ -86,11 +91,13 @@ extern "C" { HTML_LI, HTML_LINK, HTML_LISTING, + HTML_MAIN, HTML_MAP, HTML_MARQUEE, HTML_MATH, HTML_MENU, HTML_META, + HTML_NAV, HTML_NEXTID, HTML_NOFRAMES, HTML_NOTE, @@ -106,6 +113,7 @@ extern "C" { HTML_S, HTML_SAMP, HTML_SCRIPT, + HTML_SECTION, HTML_SELECT, HTML_SHY, HTML_SMALL, @@ -148,10 +156,10 @@ extern "C" { */ /* # of elements generally visible to Lynx code */ -#define HTML_ELEMENTS 118 +#define HTML_ELEMENTS 126 /* # of elements visible to SGML parser */ -#define HTML_ALL_ELEMENTS 119 +#define HTML_ALL_ELEMENTS 127 /* @@ -477,6 +485,15 @@ extern "C" { #define HTML_GEN_TITLE 6 #define HTML_GEN_ATTRIBUTES 7 +#define HTML_GEN5_CLASS 0 +#define HTML_GEN5_DIR 1 +#define HTML_GEN5_ID 2 +#define HTML_GEN5_LANG 3 +#define HTML_GEN5_ROLE 4 +#define HTML_GEN5_STYLE 5 +#define HTML_GEN5_TITLE 6 +#define HTML_GEN5_ATTRIBUTES 7 + #define HTML_H_ALIGN 0 #define HTML_H_CLASS 1 #define HTML_H_CLEAR 2 diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in index 3559ae9a..50d3389e 100644 --- a/WWW/Library/Implementation/makefile.in +++ b/WWW/Library/Implementation/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.31 2012/08/12 23:55:17 tom Exp $ +# $LynxId: makefile.in,v 1.32 2015/12/13 23:20:11 tom Exp $ # Make WWW under unix for a.n.other unix system (bsd) # Use this as a template @@ -339,41 +339,42 @@ sources: dtd_util$x src0_HTMLDTD.txt src1_HTMLDTD.txt dtd_util$x: $(DTD_UTIL) $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(DTD_UTIL) $(LIBS) +DIFFC = diff -u -I LynxId check: dtd_util$x @echo "** comparing builtin src0_HTMLDTD.txt" ./dtd_util$x >HTMLDTD.log - -diff -u src0_HTMLDTD.txt HTMLDTD.log + -$(DIFFC) src0_HTMLDTD.txt HTMLDTD.log @echo "** comparing reloaded src0_HTMLDTD.txt" ./dtd_util$x -l src0_HTMLDTD.txt >HTMLDTD.log - -diff -u src0_HTMLDTD.txt HTMLDTD.log + -$(DIFFC) src0_HTMLDTD.txt HTMLDTD.log @echo "** comparing header generated from builtin" ./dtd_util$x -s -h -o HTMLDTD.log - -diff -u hdr_HTMLDTD.h HTMLDTD.log + -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log ./dtd_util$x -t -h -o HTMLDTD.log - -diff -u hdr_HTMLDTD.h HTMLDTD.log + -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log @echo "** comparing header generated by load" ./dtd_util$x -s -h -o HTMLDTD.log -l src0_HTMLDTD.txt - -diff -u hdr_HTMLDTD.h HTMLDTD.log + -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log ./dtd_util$x -t -h -o HTMLDTD.log -l src1_HTMLDTD.txt - -diff -u hdr_HTMLDTD.h HTMLDTD.log + -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log @echo "** comparing strict source generated from builtin" ./dtd_util$x -s -c -o HTMLDTD.log - -diff -u src0_HTMLDTD.h HTMLDTD.log + -$(DIFFC) src0_HTMLDTD.h HTMLDTD.log @echo "** comparing strict source generated by load" ./dtd_util$x -s -c -o HTMLDTD.log -l src0_HTMLDTD.txt - -diff -u src0_HTMLDTD.h HTMLDTD.log + -$(DIFFC) src0_HTMLDTD.h HTMLDTD.log @echo "** comparing tagsoup source generated from builtin" ./dtd_util$x -t -c -o HTMLDTD.log - -diff -u src1_HTMLDTD.h HTMLDTD.log + -$(DIFFC) src1_HTMLDTD.h HTMLDTD.log @echo "** comparing tagsoup source generated by load" ./dtd_util$x -t -c -o HTMLDTD.log -l src1_HTMLDTD.txt - -diff -u src1_HTMLDTD.h HTMLDTD.log + -$(DIFFC) src1_HTMLDTD.h HTMLDTD.log # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/WWW/Library/Implementation/src0_HTMLDTD.h b/WWW/Library/Implementation/src0_HTMLDTD.h index 83884709..5ec3adb3 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.45 2011/10/07 00:54:36 Kihara.Hideto Exp $ */ +/* $LynxId: src0_HTMLDTD.h,v 1.46 2015/12/13 23:08:45 Kihara.Hideto Exp $ */ #ifndef src_HTMLDTD_H0 #define src_HTMLDTD_H0 1 @@ -11,6 +11,8 @@ #define T_ADDRESS 0x00200,0x0F14F,0x8FFFF,0x36680,0xB6FAF,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_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 @@ -47,8 +49,10 @@ #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_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_FRAME 0x10000,0x00000,0x00000,0x10000,0x10000,0x9FFFF,0x00001 #define T_FRAMESET 0x10000,0x90000,0x90000,0x90000,0x93000,0x9FFFF,0x00000 @@ -59,6 +63,7 @@ #define T_H5 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000 #define T_H6 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000 #define T_HEAD 0x40000,0x4F000,0x47000,0x10000,0x10000,0x9FF7F,0x00007 +#define T_HEADER 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,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 @@ -76,11 +81,13 @@ #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_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_META 0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001 +#define T_NAV 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,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 @@ -96,6 +103,7 @@ #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_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 @@ -610,6 +618,19 @@ static const AttrType GEN_attr_type[] = { { 0, 0 }, }; +static const attr GEN5_attr_list[] = { + { "ROLE" T(N) }, + { 0 T(N) } /* Terminate list */ +}; + +static const AttrType GEN5_attr_type[] = { + { ATTR_TYPE(core) }, + { ATTR_TYPE(events) }, + { ATTR_TYPE(i18n) }, + { ATTR_TYPE(GEN5) }, + { 0, 0 }, +}; + static const attr H_attr_list[] = { { "CLEAR" T(N) }, { "DINGBAT" T(N) }, @@ -1577,6 +1598,17 @@ static const attr GEN_attr[] = { /* ABBR attributes */ { 0 T(N) } /* Terminate list */ }; +static const attr GEN5_attr[] = { /* ARTICLE attributes */ + { "CLASS" T(c) }, + { "DIR" T(N) }, + { "ID" T(i) }, + { "LANG" T(N) }, + { "ROLE" T(N) }, + { "STYLE" T(N) }, + { "TITLE" T(N) }, + { 0 T(N) } /* Terminate list */ +}; + static const attr H_attr[] = { /* H1 attributes */ { "ALIGN" T(N) }, { "CLASS" T(c) }, @@ -2154,6 +2186,8 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef ADDRESS #undef APPLET #undef AREA +#undef ARTICLE +#undef ASIDE #undef AU #undef AUTHOR #undef B @@ -2190,8 +2224,10 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef EMBED #undef FIELDSET #undef FIG +#undef FIGURE #undef FN #undef FONT +#undef FOOTER #undef FORM #undef FRAME #undef FRAMESET @@ -2202,6 +2238,7 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef H5 #undef H6 #undef HEAD +#undef HEADER #undef HR #undef HTML #undef HY @@ -2219,11 +2256,13 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef LI #undef LINK #undef LISTING +#undef MAIN #undef MAP #undef MARQUEE #undef MATH #undef MENU #undef META +#undef NAV #undef NEXTID #undef NOFRAMES #undef NOTE @@ -2239,6 +2278,7 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef S #undef SAMP #undef SCRIPT +#undef SECTION #undef SELECT #undef SHY #undef SMALL @@ -2300,6 +2340,8 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = { { 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}, @@ -2336,8 +2378,10 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = { { 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}, @@ -2348,6 +2392,7 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = { { 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}, @@ -2365,11 +2410,13 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = { { 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}, @@ -2385,6 +2432,7 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = { { 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}, diff --git a/WWW/Library/Implementation/src0_HTMLDTD.txt b/WWW/Library/Implementation/src0_HTMLDTD.txt index 87bebeea..5c7ec0aa 100644 --- a/WWW/Library/Implementation/src0_HTMLDTD.txt +++ b/WWW/Library/Implementation/src0_HTMLDTD.txt @@ -1,4 +1,4 @@ -59 attr_types +60 attr_types 0:align 1 attributes: 0:0:ALIGN @@ -217,7 +217,10 @@ 27:GEN 1 attributes: 0:0:CLEAR - 28:H + 28:GEN5 + 1 attributes: + 0:0:ROLE + 29:H 7 attributes: 0:0:CLEAR 1:0:DINGBAT @@ -226,7 +229,7 @@ 4:0:SEQNUM 5:0:SKIP 6:2:SRC - 29:HR + 30:HR 6 attributes: 0:0:CLEAR 1:0:MD @@ -234,7 +237,7 @@ 3:0:SIZE 4:2:SRC 5:0:WIDTH - 30:IFRAME + 31:IFRAME 9 attributes: 0:0:FRAMEBORDER 1:0:HEIGHT @@ -245,7 +248,7 @@ 6:0:SCROLLING 7:2:SRC 8:0:WIDTH - 31:IMG + 32:IMG 15 attributes: 0:0:ALT 1:0:BORDER @@ -262,7 +265,7 @@ 12:2:USEMAP 13:0:VSPACE 14:0:WIDTH - 32:INPUT + 33:INPUT 28 attributes: 0:0:ACCEPT 1:0:ACCEPT-CHARSET @@ -292,23 +295,23 @@ 25:0:USEMAP 26:0:VALUE 27:0:WIDTH - 33:ISINDEX + 34:ISINDEX 3 attributes: 0:2:ACTION 1:2:HREF 2:0:PROMPT - 34:KEYGEN + 35:KEYGEN 2 attributes: 0:0:CHALLENGE 1:0:NAME - 35:LABEL + 36:LABEL 5 attributes: 0:0:ACCESSKEY 1:0:CLEAR 2:0:FOR 3:0:ONBLUR 4:0:ONFOCUS - 36:LI + 37:LI 7 attributes: 0:0:CLEAR 1:0:DINGBAT @@ -317,7 +320,7 @@ 4:2:SRC 5:0:TYPE 6:0:VALUE - 37:LINK + 38:LINK 8 attributes: 0:0:CHARSET 1:2:HREF @@ -327,31 +330,31 @@ 5:0:REV 6:0:TARGET 7:0:TYPE - 38:MAP + 39:MAP 2 attributes: 0:0:CLEAR 1:1:NAME - 39:MATH + 40:MATH 2 attributes: 0:0:BOX 1:0:CLEAR - 40:META + 41:META 5 attributes: 0:0:CHARSET 1:0:CONTENT 2:0:HTTP-EQUIV 3:0:NAME 4:0:SCHEME - 41:NEXTID + 42:NEXTID 1 attributes: 0:0:N - 42:NOTE + 43:NOTE 4 attributes: 0:0:CLEAR 1:0:MD 2:8:ROLE 3:2:SRC - 43:OBJECT + 44:OBJECT 19 attributes: 0:0:ARCHIVE 1:0:BORDER @@ -372,7 +375,7 @@ 16:2:USEMAP 17:0:VSPACE 18:0:WIDTH - 44:OL + 45:OL 6 attributes: 0:0:CLEAR 1:0:COMPACT @@ -380,7 +383,7 @@ 3:0:SEQNUM 4:0:START 5:0:TYPE - 45:OPTION + 46:OPTION 7 attributes: 0:0:CLEAR 1:0:DISABLED @@ -389,7 +392,7 @@ 4:0:SELECTED 5:0:SHAPE 6:0:VALUE - 46:OVERLAY + 47:OVERLAY 8 attributes: 0:0:HEIGHT 1:0:IMAGEMAP @@ -399,11 +402,11 @@ 5:0:WIDTH 6:0:X 7:0:Y - 47:P + 48:P 2 attributes: 0:0:CLEAR 1:0:NOWRAP - 48:PARAM + 49:PARAM 12 attributes: 0:0:ACCEPT 1:0:ACCEPT-CHARSET @@ -417,11 +420,11 @@ 9:0:VALUE 10:0:VALUEREF 11:0:VALUETYPE - 49:Q + 50:Q 2 attributes: 0:2:CITE 1:0:CLEAR - 50:SCRIPT + 51:SCRIPT 10 attributes: 0:0:CHARSET 1:0:CLEAR @@ -433,7 +436,7 @@ 7:0:SCRIPTENGINE 8:2:SRC 9:0:TYPE - 51:SELECT + 52:SELECT 15 attributes: 0:0:CLEAR 1:0:DISABLED @@ -450,18 +453,18 @@ 12:0:TABINDEX 13:0:UNITS 14:0:WIDTH - 52:STYLE + 53:STYLE 3 attributes: 0:0:MEDIA 1:0:NOTATION 2:0:TYPE - 53:TAB + 54:TAB 4 attributes: 0:0:CLEAR 1:0:DP 2:0:INDENT 3:0:TO - 54:TABLE + 55:TABLE 15 attributes: 0:2:BACKGROUND 1:0:BORDER @@ -478,7 +481,7 @@ 12:0:SUMMARY 13:0:UNITS 14:0:WIDTH - 55:TD + 56:TD 13 attributes: 0:0:ABBR 1:0:AXES @@ -493,7 +496,7 @@ 10:0:ROWSPAN 11:0:SCOPE 12:0:WIDTH - 56:TEXTAREA + 57:TEXTAREA 15 attributes: 0:0:ACCEPT-CHARSET 1:0:ACCESSKEY @@ -510,12 +513,12 @@ 12:0:READONLY 13:0:ROWS 14:0:TABINDEX - 57:TR + 58:TR 3 attributes: 0:0:CLEAR 1:0:DP 2:0:NOWRAP - 58:UL + 59:UL 8 attributes: 0:0:CLEAR 1:0:COMPACT @@ -525,7 +528,7 @@ 5:2:SRC 6:0:TYPE 7:0:WRAP -118 tags +126 tags 0:A justify 25 attributes: @@ -703,7 +706,53 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike flags: endO - 6:AU + 6:ARTICLE + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 7:ASIDE + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 8:AU justify 7 attributes: 0:4:CLASS @@ -726,7 +775,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 7:AUTHOR + 9:AUTHOR justify 7 attributes: 0:4:CLASS @@ -749,7 +798,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 8:B + 10:B justify 7 attributes: 0:4:CLASS @@ -772,7 +821,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 - 9:BANNER + 11:BANNER nojustify 7 attributes: 0:4:CLASS @@ -795,7 +844,7 @@ icontained: outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 10:BASE + 12:BASE justify 6 attributes: 0:4:CLASS @@ -815,7 +864,7 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike same flags: endO - 11:BASEFONT + 13:BASEFONT justify 11 attributes: 0:4:CLASS @@ -841,7 +890,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: BRlike APPLETlike HRlike MAPlike same flags: endO - 12:BDO + 14:BDO justify 7 attributes: 0:4:CLASS @@ -864,7 +913,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula TRlike Plike DIVlike flags: - 13:BGSOUND + 15:BGSOUND justify 9 attributes: 0:4:CLASS @@ -888,7 +937,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff canclose: FONTlike EMlike MATHlike Alike Plike DIVlike BRlike APPLETlike HRlike same flags: endO - 14:BIG + 16:BIG justify 7 attributes: 0:4:CLASS @@ -911,7 +960,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 - 15:BLINK + 17:BLINK justify 7 attributes: 0:4:CLASS @@ -934,7 +983,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: mafse nreie - 16:BLOCKQUOTE + 18:BLOCKQUOTE justify 9 attributes: 0:2:CITE @@ -958,7 +1007,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 17:BODY + 19:BODY justify 15 attributes: 0:0:ALINK @@ -989,7 +1038,7 @@ icontained: outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer HEADstuff same flags: endO startO - 18:BODYTEXT + 20:BODYTEXT justify 14 attributes: 0:4:CLASS @@ -1018,7 +1067,7 @@ 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 flags: endO startO - 19:BQ + 21:BQ justify 9 attributes: 0:2:CITE @@ -1042,7 +1091,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 20:BR + 22:BR justify 7 attributes: 0:4:CLASS @@ -1065,7 +1114,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 - 21:BUTTON + 23:BUTTON justify 16 attributes: 0:0:ACCESSKEY @@ -1097,7 +1146,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike same flags: - 22:CAPTION + 24:CAPTION justify 9 attributes: 0:0:ACCESSKEY @@ -1123,7 +1172,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike same flags: - 23:CENTER + 25:CENTER justify 8 attributes: 0:0:ALIGN @@ -1147,7 +1196,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same flags: - 24:CITE + 26:CITE justify 7 attributes: 0:4:CLASS @@ -1170,7 +1219,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: EMlike flags: nreie - 25:CODE + 27:CODE justify 7 attributes: 0:4:CLASS @@ -1193,7 +1242,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: EMlike flags: - 26:COL + 28:COL justify 13 attributes: 0:0:ALIGN @@ -1223,7 +1272,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike MAPlike same flags: endO - 27:COLGROUP + 29:COLGROUP justify 13 attributes: 0:0:ALIGN @@ -1253,7 +1302,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike MAPlike same flags: endO - 28:COMMENT + 30:COMMENT justify 7 attributes: 0:4:CLASS @@ -1276,7 +1325,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff canclose: FONTlike EMlike flags: - 29:CREDIT + 31:CREDIT justify 7 attributes: 0:4:CLASS @@ -1299,7 +1348,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike Plike DIVlike same flags: - 30:DD + 32:DD justify 7 attributes: 0:4:CLASS @@ -1322,7 +1371,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same flags: endO - 31:DEL + 33:DEL justify 8 attributes: 0:0:CITE @@ -1346,7 +1395,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 32:DFN + 34:DFN justify 7 attributes: 0:4:CLASS @@ -1369,7 +1418,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 33:DIR + 35:DIR justify 14 attributes: 0:4:CLASS @@ -1398,7 +1447,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike HRlike same flags: - 34:DIV + 36:DIV justify 8 attributes: 0:0:ALIGN @@ -1422,7 +1471,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: mafse - 35:DL + 37:DL justify 8 attributes: 0:4:CLASS @@ -1445,7 +1494,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 flags: - 36:DLC + 38:DLC justify 8 attributes: 0:4:CLASS @@ -1468,7 +1517,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 flags: - 37:DT + 39:DT justify 7 attributes: 0:4:CLASS @@ -1491,7 +1540,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 - 38:EM + 40:EM justify 7 attributes: 0:4:CLASS @@ -1514,7 +1563,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: nreie - 39:EMBED + 41:EMBED justify 21 attributes: 0:0:ALIGN @@ -1551,7 +1600,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 - 40:FIELDSET + 42:FIELDSET justify 7 attributes: 0:4:CLASS @@ -1574,7 +1623,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula SELECTlike MAPlike same flags: - 41:FIG + 43:FIG justify 17 attributes: 0:0:ALIGN @@ -1607,7 +1656,30 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike MAPlike same flags: - 42:FN + 44:FIGURE + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 45:FN justify 7 attributes: 0:4:CLASS @@ -1630,7 +1702,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike same flags: - 43:FONT + 46:FONT justify 11 attributes: 0:4:CLASS @@ -1656,7 +1728,30 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: mafse nreie - 44:FORM + 47:FOOTER + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 48:FORM justify 17 attributes: 0:0:ACCEPT @@ -1688,7 +1783,7 @@ icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike LIlike ULlike MAPlike same flags: - 45:FRAME + 49:FRAME justify 12 attributes: 0:4:CLASS @@ -1714,7 +1809,7 @@ icontained: outer canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same flags: endO - 46:FRAMESET + 50:FRAMESET justify 4 attributes: 0:0:COLS @@ -1731,7 +1826,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: - 47:H1 + 51:H1 nojustify 14 attributes: 0:0:ALIGN @@ -1762,7 +1857,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 48:H2 + 52:H2 nojustify 14 attributes: 0:0:ALIGN @@ -1793,7 +1888,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 49:H3 + 53:H3 nojustify 14 attributes: 0:0:ALIGN @@ -1824,7 +1919,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 50:H4 + 54:H4 nojustify 14 attributes: 0:0:ALIGN @@ -1855,7 +1950,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 51:H5 + 55:H5 nojustify 14 attributes: 0:0:ALIGN @@ -1886,7 +1981,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 52:H6 + 56:H6 nojustify 14 attributes: 0:0:ALIGN @@ -1917,7 +2012,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 53:HEAD + 57:HEAD justify 7 attributes: 0:4:CLASS @@ -1940,7 +2035,30 @@ icontained: outer canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same flags: endO startO mafse - 54:HR + 58:HEADER + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 59:HR justify 13 attributes: 0:0:ALIGN @@ -1969,7 +2087,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 - 55:HTML + 60:HTML justify 7 attributes: 0:4:CLASS @@ -1992,7 +2110,7 @@ icontained: canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer flags: endO startO - 56:HY + 61:HY justify 7 attributes: 0:4:CLASS @@ -2015,7 +2133,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 - 57:I + 62:I justify 7 attributes: 0:4:CLASS @@ -2038,7 +2156,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 - 58:IFRAME + 63:IFRAME justify 14 attributes: 0:0:ALIGN @@ -2067,7 +2185,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: - 59:IMG + 64:IMG justify 22 attributes: 0:0:ALIGN @@ -2106,7 +2224,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: same flags: endO - 60:INPUT + 65:INPUT justify 35 attributes: 0:0:ACCEPT @@ -2158,7 +2276,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 - 61:INS + 66:INS justify 8 attributes: 0:0:CITE @@ -2182,7 +2300,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 62:ISINDEX + 67:ISINDEX justify 9 attributes: 0:2:ACTION @@ -2206,7 +2324,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 - 63:KBD + 68:KBD justify 7 attributes: 0:4:CLASS @@ -2229,7 +2347,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff canclose: FONTlike EMlike flags: - 64:KEYGEN + 69:KEYGEN justify 8 attributes: 0:0:CHALLENGE @@ -2252,7 +2370,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: formula TRlike SELECTlike same flags: endO - 65:LABEL + 70:LABEL justify 11 attributes: 0:0:ACCESSKEY @@ -2279,7 +2397,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike flags: - 66:LEGEND + 71:LEGEND justify 9 attributes: 0:0:ACCESSKEY @@ -2305,7 +2423,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike flags: - 67:LH + 72:LH justify 7 attributes: 0:4:CLASS @@ -2328,7 +2446,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 - 68:LI + 73:LI justify 13 attributes: 0:4:CLASS @@ -2357,7 +2475,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 - 69:LINK + 74:LINK justify 14 attributes: 0:0:CHARSET @@ -2387,7 +2505,7 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike flags: endO - 70:LISTING + 75:LISTING justify 7 attributes: 0:4:CLASS @@ -2410,7 +2528,30 @@ icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike same flags: - 71:MAP + 76:MAIN + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 77:MAP justify 8 attributes: 0:4:CLASS @@ -2433,7 +2574,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: - 72:MARQUEE + 78:MARQUEE justify 7 attributes: 0:4:CLASS @@ -2456,7 +2597,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: - 73:MATH + 79:MATH justify 8 attributes: 0:0:BOX @@ -2479,7 +2620,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: - 74:MENU + 80:MENU justify 14 attributes: 0:4:CLASS @@ -2508,7 +2649,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same flags: - 75:META + 81:META justify 5 attributes: 0:0:CHARSET @@ -2526,7 +2667,30 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike flags: endO - 76:NEXTID + 82:NAV + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 83:NEXTID justify 1 attributes: 0:0:N @@ -2540,7 +2704,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer canclose: FONTlike flags: endO - 77:NOFRAMES + 84:NOFRAMES justify 7 attributes: 0:4:CLASS @@ -2563,7 +2727,7 @@ icontained: BRlike APPLETlike HRlike outer canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike flags: - 78:NOTE + 85:NOTE justify 10 attributes: 0:4:CLASS @@ -2588,7 +2752,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 79:OBJECT + 86:OBJECT justify 26 attributes: 0:0:ALIGN @@ -2631,7 +2795,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 - 80:OL + 87:OL justify 12 attributes: 0:4:CLASS @@ -2658,7 +2822,7 @@ icontained: FONTlike EMlike MATHlike 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 MAPlike same flags: - 81:OPTION + 88:OPTION justify 13 attributes: 0:4:CLASS @@ -2687,7 +2851,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 - 82:OVERLAY + 89:OVERLAY justify 12 attributes: 0:4:CLASS @@ -2713,7 +2877,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 - 83:P + 90:P justify 9 attributes: 0:0:ALIGN @@ -2738,7 +2902,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike formula Plike same flags: endO - 84:PARAM + 91:PARAM justify 18 attributes: 0:0:ACCEPT @@ -2771,7 +2935,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 - 85:PLAINTEXT + 92:PLAINTEXT justify 7 attributes: 0:4:CLASS @@ -2794,7 +2958,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 - 86:PRE + 93:PRE nojustify 7 attributes: 0:4:CLASS @@ -2817,7 +2981,7 @@ icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: EMlike MATHlike Alike formula Plike DIVlike LIlike same flags: - 87:Q + 94:Q justify 8 attributes: 0:2:CITE @@ -2840,7 +3004,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 88:S + 95:S justify 7 attributes: 0:4:CLASS @@ -2863,7 +3027,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: - 89:SAMP + 96:SAMP justify 7 attributes: 0:4:CLASS @@ -2886,7 +3050,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: EMlike flags: nreie - 90:SCRIPT + 97:SCRIPT justify 16 attributes: 0:0:CHARSET @@ -2917,7 +3081,30 @@ 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: - 91:SELECT + 98:SECTION + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 99:SELECT justify 22 attributes: 0:0:ALIGN @@ -2955,7 +3142,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 - 92:SHY + 100:SHY justify 7 attributes: 0:4:CLASS @@ -2978,7 +3165,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 - 93:SMALL + 101:SMALL justify 7 attributes: 0:4:CLASS @@ -3001,7 +3188,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 - 94:SPAN + 102:SPAN justify 7 attributes: 0:4:CLASS @@ -3024,7 +3211,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: - 95:SPOT + 103:SPOT justify 7 attributes: 0:4:CLASS @@ -3047,7 +3234,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike canclose: Alike flags: endO - 96:STRIKE + 104:STRIKE justify 7 attributes: 0:4:CLASS @@ -3070,7 +3257,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: - 97:STRONG + 105:STRONG justify 7 attributes: 0:4:CLASS @@ -3093,7 +3280,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: nreie - 98:STYLE + 106:STYLE justify 9 attributes: 0:4:CLASS @@ -3117,7 +3304,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: - 99:SUB + 107:SUB justify 7 attributes: 0:4:CLASS @@ -3140,7 +3327,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: - 100:SUP + 108:SUP justify 7 attributes: 0:4:CLASS @@ -3163,7 +3350,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: - 101:TAB + 109:TAB justify 11 attributes: 0:0:ALIGN @@ -3190,7 +3377,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer HEADstuff canclose: FONTlike flags: endO - 102:TABLE + 110:TABLE justify 22 attributes: 0:0:ALIGN @@ -3229,7 +3416,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike LIlike HRlike MAPlike same flags: - 103:TBODY + 111:TBODY justify 13 attributes: 0:0:ALIGN @@ -3259,7 +3446,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 - 104:TD + 112:TD justify 23 attributes: 0:0:ABBR @@ -3298,7 +3485,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 - 105:TEXTAREA + 113:TEXTAREA justify 22 attributes: 0:0:ACCEPT-CHARSET @@ -3337,7 +3524,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 - 106:TEXTFLOW + 114:TEXTFLOW justify 14 attributes: 0:4:CLASS @@ -3366,7 +3553,7 @@ 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 - 107:TFOOT + 115:TFOOT justify 13 attributes: 0:0:ALIGN @@ -3396,7 +3583,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 - 108:TH + 116:TH justify 23 attributes: 0:0:ABBR @@ -3435,7 +3622,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 - 109:THEAD + 117:THEAD justify 13 attributes: 0:0:ALIGN @@ -3465,7 +3652,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 - 110:TITLE + 118:TITLE justify 7 attributes: 0:4:CLASS @@ -3488,7 +3675,7 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike flags: mafse strict - 111:TR + 119:TR justify 13 attributes: 0:0:ALIGN @@ -3518,7 +3705,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 - 112:TT + 120:TT justify 7 attributes: 0:4:CLASS @@ -3541,7 +3728,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: nreie - 113:U + 121:U justify 7 attributes: 0:4:CLASS @@ -3564,7 +3751,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 - 114:UL + 122:UL justify 14 attributes: 0:4:CLASS @@ -3593,7 +3780,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike same flags: - 115:VAR + 123:VAR justify 7 attributes: 0:4:CLASS @@ -3616,7 +3803,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: - 116:WBR + 124:WBR justify 7 attributes: 0:4:CLASS @@ -3639,7 +3826,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 - 117:XMP + 125:XMP nojustify 7 attributes: 0:4:CLASS diff --git a/WWW/Library/Implementation/src1_HTMLDTD.h b/WWW/Library/Implementation/src1_HTMLDTD.h index a56e4a09..a7e92a05 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.45 2011/10/07 00:54:36 Kihara.Hideto Exp $ */ +/* $LynxId: src1_HTMLDTD.h,v 1.46 2015/12/13 23:08:45 Kihara.Hideto Exp $ */ #ifndef src_HTMLDTD_H1 #define src_HTMLDTD_H1 1 @@ -11,6 +11,8 @@ #define T_ADDRESS 0x00200,0x0F14F,0x8FFFF,0x36680,0xB6FAF,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_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 @@ -47,8 +49,10 @@ #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_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_FRAME 0x10000,0x00000,0x00000,0x10000,0x10000,0x9FFFF,0x00001 #define T_FRAMESET 0x10000,0x90000,0x90000,0x90000,0x93000,0x9FFFF,0x00000 @@ -59,6 +63,7 @@ #define T_H5 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000 #define T_H6 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000 #define T_HEAD 0x40000,0x4F000,0x47000,0x10000,0x10000,0x9FF7F,0x00007 +#define T_HEADER 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,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 @@ -76,11 +81,13 @@ #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_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_META 0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001 +#define T_NAV 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,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 @@ -96,6 +103,7 @@ #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_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 @@ -610,6 +618,19 @@ static const AttrType GEN_attr_type[] = { { 0, 0 }, }; +static const attr GEN5_attr_list[] = { + { "ROLE" T(N) }, + { 0 T(N) } /* Terminate list */ +}; + +static const AttrType GEN5_attr_type[] = { + { ATTR_TYPE(core) }, + { ATTR_TYPE(events) }, + { ATTR_TYPE(i18n) }, + { ATTR_TYPE(GEN5) }, + { 0, 0 }, +}; + static const attr H_attr_list[] = { { "CLEAR" T(N) }, { "DINGBAT" T(N) }, @@ -1577,6 +1598,17 @@ static const attr GEN_attr[] = { /* ABBR attributes */ { 0 T(N) } /* Terminate list */ }; +static const attr GEN5_attr[] = { /* ARTICLE attributes */ + { "CLASS" T(c) }, + { "DIR" T(N) }, + { "ID" T(i) }, + { "LANG" T(N) }, + { "ROLE" T(N) }, + { "STYLE" T(N) }, + { "TITLE" T(N) }, + { 0 T(N) } /* Terminate list */ +}; + static const attr H_attr[] = { /* H1 attributes */ { "ALIGN" T(N) }, { "CLASS" T(c) }, @@ -2154,6 +2186,8 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef ADDRESS #undef APPLET #undef AREA +#undef ARTICLE +#undef ASIDE #undef AU #undef AUTHOR #undef B @@ -2190,8 +2224,10 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef EMBED #undef FIELDSET #undef FIG +#undef FIGURE #undef FN #undef FONT +#undef FOOTER #undef FORM #undef FRAME #undef FRAMESET @@ -2202,6 +2238,7 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef H5 #undef H6 #undef HEAD +#undef HEADER #undef HR #undef HTML #undef HY @@ -2219,11 +2256,13 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef LI #undef LINK #undef LISTING +#undef MAIN #undef MAP #undef MARQUEE #undef MATH #undef MENU #undef META +#undef NAV #undef NEXTID #undef NOFRAMES #undef NOTE @@ -2239,6 +2278,7 @@ static const attr UL_attr[] = { /* DIR attributes */ #undef S #undef SAMP #undef SCRIPT +#undef SECTION #undef SELECT #undef SHY #undef SMALL @@ -2300,6 +2340,8 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = { { 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}, @@ -2336,8 +2378,10 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = { { 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}, @@ -2348,6 +2392,7 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = { { 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}, @@ -2365,11 +2410,13 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = { { 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}, @@ -2385,6 +2432,7 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = { { 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}, diff --git a/WWW/Library/Implementation/src1_HTMLDTD.txt b/WWW/Library/Implementation/src1_HTMLDTD.txt index 6e7ac733..ef97601c 100644 --- a/WWW/Library/Implementation/src1_HTMLDTD.txt +++ b/WWW/Library/Implementation/src1_HTMLDTD.txt @@ -1,4 +1,4 @@ -59 attr_types +60 attr_types 0:align 1 attributes: 0:0:ALIGN @@ -217,7 +217,10 @@ 27:GEN 1 attributes: 0:0:CLEAR - 28:H + 28:GEN5 + 1 attributes: + 0:0:ROLE + 29:H 7 attributes: 0:0:CLEAR 1:0:DINGBAT @@ -226,7 +229,7 @@ 4:0:SEQNUM 5:0:SKIP 6:2:SRC - 29:HR + 30:HR 6 attributes: 0:0:CLEAR 1:0:MD @@ -234,7 +237,7 @@ 3:0:SIZE 4:2:SRC 5:0:WIDTH - 30:IFRAME + 31:IFRAME 9 attributes: 0:0:FRAMEBORDER 1:0:HEIGHT @@ -245,7 +248,7 @@ 6:0:SCROLLING 7:2:SRC 8:0:WIDTH - 31:IMG + 32:IMG 15 attributes: 0:0:ALT 1:0:BORDER @@ -262,7 +265,7 @@ 12:2:USEMAP 13:0:VSPACE 14:0:WIDTH - 32:INPUT + 33:INPUT 28 attributes: 0:0:ACCEPT 1:0:ACCEPT-CHARSET @@ -292,23 +295,23 @@ 25:0:USEMAP 26:0:VALUE 27:0:WIDTH - 33:ISINDEX + 34:ISINDEX 3 attributes: 0:2:ACTION 1:2:HREF 2:0:PROMPT - 34:KEYGEN + 35:KEYGEN 2 attributes: 0:0:CHALLENGE 1:0:NAME - 35:LABEL + 36:LABEL 5 attributes: 0:0:ACCESSKEY 1:0:CLEAR 2:0:FOR 3:0:ONBLUR 4:0:ONFOCUS - 36:LI + 37:LI 7 attributes: 0:0:CLEAR 1:0:DINGBAT @@ -317,7 +320,7 @@ 4:2:SRC 5:0:TYPE 6:0:VALUE - 37:LINK + 38:LINK 8 attributes: 0:0:CHARSET 1:2:HREF @@ -327,31 +330,31 @@ 5:0:REV 6:0:TARGET 7:0:TYPE - 38:MAP + 39:MAP 2 attributes: 0:0:CLEAR 1:1:NAME - 39:MATH + 40:MATH 2 attributes: 0:0:BOX 1:0:CLEAR - 40:META + 41:META 5 attributes: 0:0:CHARSET 1:0:CONTENT 2:0:HTTP-EQUIV 3:0:NAME 4:0:SCHEME - 41:NEXTID + 42:NEXTID 1 attributes: 0:0:N - 42:NOTE + 43:NOTE 4 attributes: 0:0:CLEAR 1:0:MD 2:8:ROLE 3:2:SRC - 43:OBJECT + 44:OBJECT 19 attributes: 0:0:ARCHIVE 1:0:BORDER @@ -372,7 +375,7 @@ 16:2:USEMAP 17:0:VSPACE 18:0:WIDTH - 44:OL + 45:OL 6 attributes: 0:0:CLEAR 1:0:COMPACT @@ -380,7 +383,7 @@ 3:0:SEQNUM 4:0:START 5:0:TYPE - 45:OPTION + 46:OPTION 7 attributes: 0:0:CLEAR 1:0:DISABLED @@ -389,7 +392,7 @@ 4:0:SELECTED 5:0:SHAPE 6:0:VALUE - 46:OVERLAY + 47:OVERLAY 8 attributes: 0:0:HEIGHT 1:0:IMAGEMAP @@ -399,11 +402,11 @@ 5:0:WIDTH 6:0:X 7:0:Y - 47:P + 48:P 2 attributes: 0:0:CLEAR 1:0:NOWRAP - 48:PARAM + 49:PARAM 12 attributes: 0:0:ACCEPT 1:0:ACCEPT-CHARSET @@ -417,11 +420,11 @@ 9:0:VALUE 10:0:VALUEREF 11:0:VALUETYPE - 49:Q + 50:Q 2 attributes: 0:2:CITE 1:0:CLEAR - 50:SCRIPT + 51:SCRIPT 10 attributes: 0:0:CHARSET 1:0:CLEAR @@ -433,7 +436,7 @@ 7:0:SCRIPTENGINE 8:2:SRC 9:0:TYPE - 51:SELECT + 52:SELECT 15 attributes: 0:0:CLEAR 1:0:DISABLED @@ -450,18 +453,18 @@ 12:0:TABINDEX 13:0:UNITS 14:0:WIDTH - 52:STYLE + 53:STYLE 3 attributes: 0:0:MEDIA 1:0:NOTATION 2:0:TYPE - 53:TAB + 54:TAB 4 attributes: 0:0:CLEAR 1:0:DP 2:0:INDENT 3:0:TO - 54:TABLE + 55:TABLE 15 attributes: 0:2:BACKGROUND 1:0:BORDER @@ -478,7 +481,7 @@ 12:0:SUMMARY 13:0:UNITS 14:0:WIDTH - 55:TD + 56:TD 13 attributes: 0:0:ABBR 1:0:AXES @@ -493,7 +496,7 @@ 10:0:ROWSPAN 11:0:SCOPE 12:0:WIDTH - 56:TEXTAREA + 57:TEXTAREA 15 attributes: 0:0:ACCEPT-CHARSET 1:0:ACCESSKEY @@ -510,12 +513,12 @@ 12:0:READONLY 13:0:ROWS 14:0:TABINDEX - 57:TR + 58:TR 3 attributes: 0:0:CLEAR 1:0:DP 2:0:NOWRAP - 58:UL + 59:UL 8 attributes: 0:0:CLEAR 1:0:COMPACT @@ -525,7 +528,7 @@ 5:2:SRC 6:0:TYPE 7:0:WRAP -118 tags +126 tags 0:A justify 25 attributes: @@ -703,7 +706,53 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike flags: endO - 6:AU + 6:ARTICLE + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 7:ASIDE + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 8:AU justify 7 attributes: 0:4:CLASS @@ -726,7 +775,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 7:AUTHOR + 9:AUTHOR justify 7 attributes: 0:4:CLASS @@ -749,7 +798,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 8:B + 10:B justify 7 attributes: 0:4:CLASS @@ -772,7 +821,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 - 9:BANNER + 11:BANNER nojustify 7 attributes: 0:4:CLASS @@ -795,7 +844,7 @@ icontained: outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 10:BASE + 12:BASE justify 6 attributes: 0:4:CLASS @@ -815,7 +864,7 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike same flags: endO - 11:BASEFONT + 13:BASEFONT justify 11 attributes: 0:4:CLASS @@ -841,7 +890,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: BRlike APPLETlike HRlike MAPlike same flags: endO - 12:BDO + 14:BDO justify 7 attributes: 0:4:CLASS @@ -864,7 +913,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula TRlike Plike DIVlike flags: - 13:BGSOUND + 15:BGSOUND justify 9 attributes: 0:4:CLASS @@ -888,7 +937,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff canclose: FONTlike EMlike MATHlike Alike Plike DIVlike BRlike APPLETlike HRlike same flags: endO - 14:BIG + 16:BIG justify 7 attributes: 0:4:CLASS @@ -911,7 +960,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 - 15:BLINK + 17:BLINK justify 7 attributes: 0:4:CLASS @@ -934,7 +983,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: mafse nreie - 16:BLOCKQUOTE + 18:BLOCKQUOTE justify 9 attributes: 0:2:CITE @@ -958,7 +1007,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 17:BODY + 19:BODY justify 15 attributes: 0:0:ALINK @@ -989,7 +1038,7 @@ icontained: outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer HEADstuff same flags: endO startO - 18:BODYTEXT + 20:BODYTEXT justify 14 attributes: 0:4:CLASS @@ -1018,7 +1067,7 @@ 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 flags: endO startO - 19:BQ + 21:BQ justify 9 attributes: 0:2:CITE @@ -1042,7 +1091,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 20:BR + 22:BR justify 7 attributes: 0:4:CLASS @@ -1065,7 +1114,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 - 21:BUTTON + 23:BUTTON justify 16 attributes: 0:0:ACCESSKEY @@ -1097,7 +1146,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike same flags: - 22:CAPTION + 24:CAPTION justify 9 attributes: 0:0:ACCESSKEY @@ -1123,7 +1172,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike same flags: - 23:CENTER + 25:CENTER justify 8 attributes: 0:0:ALIGN @@ -1147,7 +1196,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same flags: - 24:CITE + 26:CITE justify 7 attributes: 0:4:CLASS @@ -1170,7 +1219,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: EMlike flags: nreie - 25:CODE + 27:CODE justify 7 attributes: 0:4:CLASS @@ -1193,7 +1242,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: EMlike flags: - 26:COL + 28:COL justify 13 attributes: 0:0:ALIGN @@ -1223,7 +1272,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike MAPlike same flags: endO - 27:COLGROUP + 29:COLGROUP justify 13 attributes: 0:0:ALIGN @@ -1253,7 +1302,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike MAPlike same flags: endO - 28:COMMENT + 30:COMMENT justify 7 attributes: 0:4:CLASS @@ -1276,7 +1325,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff canclose: FONTlike EMlike flags: - 29:CREDIT + 31:CREDIT justify 7 attributes: 0:4:CLASS @@ -1299,7 +1348,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike Plike DIVlike same flags: - 30:DD + 32:DD justify 7 attributes: 0:4:CLASS @@ -1322,7 +1371,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same flags: endO - 31:DEL + 33:DEL justify 8 attributes: 0:0:CITE @@ -1346,7 +1395,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 32:DFN + 34:DFN justify 7 attributes: 0:4:CLASS @@ -1369,7 +1418,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 33:DIR + 35:DIR justify 14 attributes: 0:4:CLASS @@ -1398,7 +1447,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike HRlike same flags: - 34:DIV + 36:DIV justify 8 attributes: 0:0:ALIGN @@ -1422,7 +1471,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: mafse - 35:DL + 37:DL justify 8 attributes: 0:4:CLASS @@ -1445,7 +1494,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 flags: - 36:DLC + 38:DLC justify 8 attributes: 0:4:CLASS @@ -1468,7 +1517,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 flags: - 37:DT + 39:DT justify 7 attributes: 0:4:CLASS @@ -1491,7 +1540,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 - 38:EM + 40:EM justify 7 attributes: 0:4:CLASS @@ -1514,7 +1563,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: nreie - 39:EMBED + 41:EMBED justify 21 attributes: 0:0:ALIGN @@ -1551,7 +1600,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 - 40:FIELDSET + 42:FIELDSET justify 7 attributes: 0:4:CLASS @@ -1574,7 +1623,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula SELECTlike MAPlike same flags: - 41:FIG + 43:FIG justify 17 attributes: 0:0:ALIGN @@ -1607,7 +1656,30 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike MAPlike same flags: - 42:FN + 44:FIGURE + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 45:FN justify 7 attributes: 0:4:CLASS @@ -1630,7 +1702,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike same flags: - 43:FONT + 46:FONT justify 11 attributes: 0:4:CLASS @@ -1656,7 +1728,30 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: mafse nreie - 44:FORM + 47:FOOTER + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 48:FORM justify 17 attributes: 0:0:ACCEPT @@ -1688,7 +1783,7 @@ icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike LIlike ULlike MAPlike same flags: - 45:FRAME + 49:FRAME justify 12 attributes: 0:4:CLASS @@ -1714,7 +1809,7 @@ icontained: outer canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same flags: endO - 46:FRAMESET + 50:FRAMESET justify 4 attributes: 0:0:COLS @@ -1731,7 +1826,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: - 47:H1 + 51:H1 nojustify 14 attributes: 0:0:ALIGN @@ -1762,7 +1857,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 48:H2 + 52:H2 nojustify 14 attributes: 0:0:ALIGN @@ -1793,7 +1888,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 49:H3 + 53:H3 nojustify 14 attributes: 0:0:ALIGN @@ -1824,7 +1919,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 50:H4 + 54:H4 nojustify 14 attributes: 0:0:ALIGN @@ -1855,7 +1950,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 51:H5 + 55:H5 nojustify 14 attributes: 0:0:ALIGN @@ -1886,7 +1981,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 52:H6 + 56:H6 nojustify 14 attributes: 0:0:ALIGN @@ -1917,7 +2012,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike formula Plike same flags: - 53:HEAD + 57:HEAD justify 7 attributes: 0:4:CLASS @@ -1940,7 +2035,30 @@ icontained: outer canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same flags: endO startO mafse - 54:HR + 58:HEADER + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 59:HR justify 13 attributes: 0:0:ALIGN @@ -1969,7 +2087,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 - 55:HTML + 60:HTML justify 7 attributes: 0:4:CLASS @@ -1992,7 +2110,7 @@ icontained: canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer flags: endO startO - 56:HY + 61:HY justify 7 attributes: 0:4:CLASS @@ -2015,7 +2133,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 - 57:I + 62:I justify 7 attributes: 0:4:CLASS @@ -2038,7 +2156,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 - 58:IFRAME + 63:IFRAME justify 14 attributes: 0:0:ALIGN @@ -2067,7 +2185,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: - 59:IMG + 64:IMG justify 22 attributes: 0:0:ALIGN @@ -2106,7 +2224,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: same flags: endO - 60:INPUT + 65:INPUT justify 35 attributes: 0:0:ACCEPT @@ -2158,7 +2276,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 - 61:INS + 66:INS justify 8 attributes: 0:0:CITE @@ -2182,7 +2300,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 62:ISINDEX + 67:ISINDEX justify 9 attributes: 0:2:ACTION @@ -2206,7 +2324,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 - 63:KBD + 68:KBD justify 7 attributes: 0:4:CLASS @@ -2229,7 +2347,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff canclose: FONTlike EMlike flags: - 64:KEYGEN + 69:KEYGEN justify 8 attributes: 0:0:CHALLENGE @@ -2252,7 +2370,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike canclose: formula TRlike SELECTlike same flags: endO - 65:LABEL + 70:LABEL justify 11 attributes: 0:0:ACCESSKEY @@ -2279,7 +2397,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike flags: - 66:LEGEND + 71:LEGEND justify 9 attributes: 0:0:ACCESSKEY @@ -2305,7 +2423,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike flags: - 67:LH + 72:LH justify 7 attributes: 0:4:CLASS @@ -2328,7 +2446,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 - 68:LI + 73:LI justify 13 attributes: 0:4:CLASS @@ -2357,7 +2475,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 - 69:LINK + 74:LINK justify 14 attributes: 0:0:CHARSET @@ -2387,7 +2505,7 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike flags: endO - 70:LISTING + 75:LISTING justify 7 attributes: 0:4:CLASS @@ -2410,7 +2528,30 @@ icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike same flags: - 71:MAP + 76:MAIN + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 77:MAP justify 8 attributes: 0:4:CLASS @@ -2433,7 +2574,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: - 72:MARQUEE + 78:MARQUEE justify 7 attributes: 0:4:CLASS @@ -2456,7 +2597,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: - 73:MATH + 79:MATH justify 8 attributes: 0:0:BOX @@ -2479,7 +2620,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: - 74:MENU + 80:MENU justify 14 attributes: 0:4:CLASS @@ -2508,7 +2649,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same flags: - 75:META + 81:META justify 5 attributes: 0:0:CHARSET @@ -2526,7 +2667,30 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike flags: endO - 76:NEXTID + 82:NAV + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 83:NEXTID justify 1 attributes: 0:0:N @@ -2540,7 +2704,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer canclose: FONTlike flags: endO - 77:NOFRAMES + 84:NOFRAMES justify 7 attributes: 0:4:CLASS @@ -2563,7 +2727,7 @@ icontained: BRlike APPLETlike HRlike outer canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike flags: - 78:NOTE + 85:NOTE justify 10 attributes: 0:4:CLASS @@ -2588,7 +2752,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same flags: - 79:OBJECT + 86:OBJECT justify 26 attributes: 0:0:ALIGN @@ -2631,7 +2795,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 - 80:OL + 87:OL justify 12 attributes: 0:4:CLASS @@ -2658,7 +2822,7 @@ icontained: FONTlike EMlike MATHlike 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 MAPlike same flags: - 81:OPTION + 88:OPTION justify 13 attributes: 0:4:CLASS @@ -2687,7 +2851,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 - 82:OVERLAY + 89:OVERLAY justify 12 attributes: 0:4:CLASS @@ -2713,7 +2877,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 - 83:P + 90:P justify 9 attributes: 0:0:ALIGN @@ -2738,7 +2902,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike formula Plike same flags: endO - 84:PARAM + 91:PARAM justify 18 attributes: 0:0:ACCEPT @@ -2771,7 +2935,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 - 85:PLAINTEXT + 92:PLAINTEXT justify 7 attributes: 0:4:CLASS @@ -2794,7 +2958,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 - 86:PRE + 93:PRE nojustify 7 attributes: 0:4:CLASS @@ -2817,7 +2981,7 @@ icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike canclose: EMlike MATHlike Alike formula Plike DIVlike LIlike same flags: - 87:Q + 94:Q justify 8 attributes: 0:2:CITE @@ -2840,7 +3004,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: - 88:S + 95:S justify 7 attributes: 0:4:CLASS @@ -2863,7 +3027,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: - 89:SAMP + 96:SAMP justify 7 attributes: 0:4:CLASS @@ -2886,7 +3050,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: EMlike flags: nreie - 90:SCRIPT + 97:SCRIPT justify 16 attributes: 0:0:CHARSET @@ -2917,7 +3081,30 @@ 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: - 91:SELECT + 98:SECTION + justify + 7 attributes: + 0:4:CLASS + 1:0:DIR + 2:1:ID + 3:0:LANG + 4:0:ROLE + 5:0:STYLE + 6:0:TITLE + 4 attr_types + core + events + i18n + GEN5 + contents: SGML_MIXED + 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 + canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same + flags: mafse + 99:SELECT justify 22 attributes: 0:0:ALIGN @@ -2955,7 +3142,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 - 92:SHY + 100:SHY justify 7 attributes: 0:4:CLASS @@ -2978,7 +3165,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 - 93:SMALL + 101:SMALL justify 7 attributes: 0:4:CLASS @@ -3001,7 +3188,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 - 94:SPAN + 102:SPAN justify 7 attributes: 0:4:CLASS @@ -3024,7 +3211,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: - 95:SPOT + 103:SPOT justify 7 attributes: 0:4:CLASS @@ -3047,7 +3234,7 @@ icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike canclose: Alike flags: endO - 96:STRIKE + 104:STRIKE justify 7 attributes: 0:4:CLASS @@ -3070,7 +3257,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: - 97:STRONG + 105:STRONG justify 7 attributes: 0:4:CLASS @@ -3093,7 +3280,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike EMlike flags: nreie - 98:STYLE + 106:STYLE justify 9 attributes: 0:4:CLASS @@ -3117,7 +3304,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: - 99:SUB + 107:SUB justify 7 attributes: 0:4:CLASS @@ -3140,7 +3327,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: - 100:SUP + 108:SUP justify 7 attributes: 0:4:CLASS @@ -3163,7 +3350,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: - 101:TAB + 109:TAB justify 11 attributes: 0:0:ALIGN @@ -3190,7 +3377,7 @@ icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer HEADstuff canclose: FONTlike flags: endO - 102:TABLE + 110:TABLE justify 22 attributes: 0:0:ALIGN @@ -3229,7 +3416,7 @@ icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike LIlike HRlike MAPlike same flags: - 103:TBODY + 111:TBODY justify 13 attributes: 0:0:ALIGN @@ -3259,7 +3446,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 - 104:TD + 112:TD justify 23 attributes: 0:0:ABBR @@ -3298,7 +3485,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 - 105:TEXTAREA + 113:TEXTAREA justify 22 attributes: 0:0:ACCEPT-CHARSET @@ -3337,7 +3524,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 - 106:TEXTFLOW + 114:TEXTFLOW justify 14 attributes: 0:4:CLASS @@ -3366,7 +3553,7 @@ 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 - 107:TFOOT + 115:TFOOT justify 13 attributes: 0:0:ALIGN @@ -3396,7 +3583,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 - 108:TH + 116:TH justify 23 attributes: 0:0:ABBR @@ -3435,7 +3622,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 - 109:THEAD + 117:THEAD justify 13 attributes: 0:0:ALIGN @@ -3465,7 +3652,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 - 110:TITLE + 118:TITLE justify 7 attributes: 0:4:CLASS @@ -3488,7 +3675,7 @@ icontained: outer HEADstuff canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike flags: mafse strict - 111:TR + 119:TR justify 13 attributes: 0:0:ALIGN @@ -3518,7 +3705,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 - 112:TT + 120:TT justify 7 attributes: 0:4:CLASS @@ -3541,7 +3728,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: nreie - 113:U + 121:U justify 7 attributes: 0:4:CLASS @@ -3564,7 +3751,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 - 114:UL + 122:UL justify 14 attributes: 0:4:CLASS @@ -3593,7 +3780,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike same flags: - 115:VAR + 123:VAR justify 7 attributes: 0:4:CLASS @@ -3616,7 +3803,7 @@ icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same canclose: FONTlike flags: - 116:WBR + 124:WBR justify 7 attributes: 0:4:CLASS @@ -3639,7 +3826,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 - 117:XMP + 125:XMP nojustify 7 attributes: 0:4:CLASS diff --git a/src/HTML.c b/src/HTML.c index 69e21b24..e10efe79 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTML.c,v 1.165 2014/12/16 01:21:32 tom Exp $ + * $LynxId: HTML.c,v 1.166 2015/12/13 23:08:45 Kihara.Hideto Exp $ * * Structured stream to Rich hypertext converter * ============================================ @@ -1681,6 +1681,22 @@ static int HTML_start_element(HTStructured * me, int element_number, HText_appendParagraph(me->text); break; + case HTML_SECTION: + case HTML_ARTICLE: + case HTML_MAIN: + case HTML_ASIDE: + case HTML_HEADER: + case HTML_FOOTER: + case HTML_NAV: + CHECK_ID(HTML_GEN5_ID); + if (HText_hasToolbar(me->text)) + HText_appendParagraph(me->text); + break; + + case HTML_FIGURE: + CHECK_ID(HTML_GEN5_ID); + break; + case HTML_FRAMESET: break; |