netsurf-commits June 2014

netsurf-commits@netsurf-browser.org

1 participants
98 discussions

libhubbub: branch rupindersingh/libhubbub updated. release/0.3.0-7-gcc2330f

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libhubbub.git/shortlog/cc2330f8d52b921836f... ...commit http://git.netsurf-browser.org/libhubbub.git/commit/cc2330f8d52b921836f9d... ...tree http://git.netsurf-browser.org/libhubbub.git/tree/cc2330f8d52b921836f9d30... The branch, rupindersingh/libhubbub has been updated discards e61c714744a2346dd8399125c02a7983878f7bdd (commit) via cc2330f8d52b921836f9d30147f9280b3ecf1733 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (e61c714744a2346dd8399125c02a7983878f7bdd) \ N -- N -- N (cc2330f8d52b921836f9d30147f9280b3ecf1733) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libhubbub.git/commit/?id=cc2330f8d52b92183... commit cc2330f8d52b921836f9d30147f9280b3ecf1733 Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Adding PLAINTEXT State & fixing the tester at places diff --git a/include/hubbub/types.h b/include/hubbub/types.h index e5c208b..6e2b1a9 100644 --- a/include/hubbub/types.h +++ b/include/hubbub/types.h @@ -33,7 +33,8 @@ typedef enum hubbub_content_model { HUBBUB_CONTENT_MODEL_PCDATA, HUBBUB_CONTENT_MODEL_RCDATA, HUBBUB_CONTENT_MODEL_CDATA, - HUBBUB_CONTENT_MODEL_PLAINTEXT + HUBBUB_CONTENT_MODEL_PLAINTEXT, + HUBBUB_CONTENT_MODEL_RAWTEXT } hubbub_content_model; /** diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index 22fa862..9ec05ce 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -759,12 +759,16 @@ hubbub_error hubbub_tokeniser_handle_data(hubbub_tokeniser *tokeniser) emit_current_chars(tokeniser); } - /* Emit a null character */ - emit_character_token(tokeniser, &u_null_str); + /* Emit a null or a replacement character */ + if(tokeniser->content_model == HUBBUB_CONTENT_MODEL_PLAINTEXT) { + emit_character_token(tokeniser, &u_fffd_str); + } else { + emit_character_token(tokeniser, &u_null_str); + } /* Advance past NUL */ parserutils_inputstream_advance(tokeniser->input, 1); - } else if (c == '\r') { + } else if (c == '\r' && tokeniser->content_model != HUBBUB_CONTENT_MODEL_PLAINTEXT) { error = parserutils_inputstream_peek( tokeniser->input, tokeniser->context.pending + len, diff --git a/test/tokeniser2.c b/test/tokeniser2.c index 07f355a..a0264c9 100644 --- a/test/tokeniser2.c +++ b/test/tokeniser2.c @@ -86,7 +86,7 @@ int main(int argc, char **argv) } else if (strcmp(key, "lastStartTag") == 0) { ctx.last_start_tag = (const char *) json_object_get_string(val); - } else if (strcmp(key, "contentModelFlags") == 0) { + } else if (strcmp(key, "initialStates") == 0) { ctx.content_model = json_object_get_array(val); } else if (strcmp(key, "processCDATA") == 0) { @@ -169,15 +169,18 @@ void run_test(context *ctx) (struct json_object *) array_list_get_idx(ctx->content_model, i)); - if (strcmp(cm, "PCDATA") == 0) { + if (strcmp(cm, "PCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_PCDATA; - } else if (strcmp(cm, "RCDATA") == 0) { + } else if (strcmp(cm, "RCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_RCDATA; - } else if (strcmp(cm, "CDATA") == 0) { + } else if (strcmp(cm, "CDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_CDATA; + } else if (strcmp(cm, "RAWTEXT state") == 0) { + params.content_model.model = + HUBBUB_CONTENT_MODEL_RAWTEXT; } else { params.content_model.model = HUBBUB_CONTENT_MODEL_PLAINTEXT; diff --git a/test/tokeniser3.c b/test/tokeniser3.c index e68a230..86f079b 100644 --- a/test/tokeniser3.c +++ b/test/tokeniser3.c @@ -85,7 +85,7 @@ int main(int argc, char **argv) } else if (strcmp(key, "lastStartTag") == 0) { ctx.last_start_tag = (const char *) json_object_get_string(val); - } else if (strcmp(key, "contentModelFlags") == 0) { + } else if (strcmp(key, "initialStates") == 0) { ctx.content_model = json_object_get_array(val); } else if (strcmp(key, "processCDATA") == 0) { @@ -167,15 +167,18 @@ void run_test(context *ctx) (struct json_object *) array_list_get_idx(ctx->content_model, i)); - if (strcmp(cm, "PCDATA") == 0) { + if (strcmp(cm, "PCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_PCDATA; - } else if (strcmp(cm, "RCDATA") == 0) { + } else if (strcmp(cm, "RCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_RCDATA; - } else if (strcmp(cm, "CDATA") == 0) { + } else if (strcmp(cm, "CDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_CDATA; + } else if (strcmp(cm, "RAWTEXT state") == 0) { + params.content_model.model = + HUBBUB_CONTENT_MODEL_RAWTEXT; } else { params.content_model.model = HUBBUB_CONTENT_MODEL_PLAINTEXT; ----------------------------------------------------------------------- Summary of changes: src/tokeniser/tokeniser.c | 10 +++++++--- test/tokeniser2.c | 11 +++++++---- test/tokeniser3.c | 11 +++++++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index 22fa862..9ec05ce 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -759,12 +759,16 @@ hubbub_error hubbub_tokeniser_handle_data(hubbub_tokeniser *tokeniser) emit_current_chars(tokeniser); } - /* Emit a null character */ - emit_character_token(tokeniser, &u_null_str); + /* Emit a null or a replacement character */ + if(tokeniser->content_model == HUBBUB_CONTENT_MODEL_PLAINTEXT) { + emit_character_token(tokeniser, &u_fffd_str); + } else { + emit_character_token(tokeniser, &u_null_str); + } /* Advance past NUL */ parserutils_inputstream_advance(tokeniser->input, 1); - } else if (c == '\r') { + } else if (c == '\r' && tokeniser->content_model != HUBBUB_CONTENT_MODEL_PLAINTEXT) { error = parserutils_inputstream_peek( tokeniser->input, tokeniser->context.pending + len, diff --git a/test/tokeniser2.c b/test/tokeniser2.c index 07f355a..a0264c9 100644 --- a/test/tokeniser2.c +++ b/test/tokeniser2.c @@ -86,7 +86,7 @@ int main(int argc, char **argv) } else if (strcmp(key, "lastStartTag") == 0) { ctx.last_start_tag = (const char *) json_object_get_string(val); - } else if (strcmp(key, "contentModelFlags") == 0) { + } else if (strcmp(key, "initialStates") == 0) { ctx.content_model = json_object_get_array(val); } else if (strcmp(key, "processCDATA") == 0) { @@ -169,15 +169,18 @@ void run_test(context *ctx) (struct json_object *) array_list_get_idx(ctx->content_model, i)); - if (strcmp(cm, "PCDATA") == 0) { + if (strcmp(cm, "PCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_PCDATA; - } else if (strcmp(cm, "RCDATA") == 0) { + } else if (strcmp(cm, "RCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_RCDATA; - } else if (strcmp(cm, "CDATA") == 0) { + } else if (strcmp(cm, "CDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_CDATA; + } else if (strcmp(cm, "RAWTEXT state") == 0) { + params.content_model.model = + HUBBUB_CONTENT_MODEL_RAWTEXT; } else { params.content_model.model = HUBBUB_CONTENT_MODEL_PLAINTEXT; diff --git a/test/tokeniser3.c b/test/tokeniser3.c index e68a230..86f079b 100644 --- a/test/tokeniser3.c +++ b/test/tokeniser3.c @@ -85,7 +85,7 @@ int main(int argc, char **argv) } else if (strcmp(key, "lastStartTag") == 0) { ctx.last_start_tag = (const char *) json_object_get_string(val); - } else if (strcmp(key, "contentModelFlags") == 0) { + } else if (strcmp(key, "initialStates") == 0) { ctx.content_model = json_object_get_array(val); } else if (strcmp(key, "processCDATA") == 0) { @@ -167,15 +167,18 @@ void run_test(context *ctx) (struct json_object *) array_list_get_idx(ctx->content_model, i)); - if (strcmp(cm, "PCDATA") == 0) { + if (strcmp(cm, "PCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_PCDATA; - } else if (strcmp(cm, "RCDATA") == 0) { + } else if (strcmp(cm, "RCDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_RCDATA; - } else if (strcmp(cm, "CDATA") == 0) { + } else if (strcmp(cm, "CDATA state") == 0) { params.content_model.model = HUBBUB_CONTENT_MODEL_CDATA; + } else if (strcmp(cm, "RAWTEXT state") == 0) { + params.content_model.model = + HUBBUB_CONTENT_MODEL_RAWTEXT; } else { params.content_model.model = HUBBUB_CONTENT_MODEL_PLAINTEXT; -- HTML5 parser library

8 years, 11 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-281-g904cefd

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/904cefd388aa613126b69... ...commit http://git.netsurf-browser.org/netsurf.git/commit/904cefd388aa613126b69c8... ...tree http://git.netsurf-browser.org/netsurf.git/tree/904cefd388aa613126b69c858... The branch, master has been updated via 904cefd388aa613126b69c858e489c5867163a87 (commit) via 3de529d81590ab0ad01119521f8561c7e79897e9 (commit) from d552865da1203aeae7a7dd7b3edd789051e66580 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=904cefd388aa613126b... commit 904cefd388aa613126b69c858e489c5867163a87 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Enable temporary change of search provider from the main browser window diff --git a/amiga/gui.c b/amiga/gui.c index 7c4946a..756ed63 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1786,6 +1786,11 @@ void ami_handle_msg(void) search_web_select_provider(-1); break; + case GID_SEARCH_ICON: + GetAttr(CHOOSER_Selected, gwin->objects[GID_SEARCH_ICON], (ULONG *)&storage); + search_web_select_provider(storage); + break; + case GID_SEARCHSTRING: { nserror ret; @@ -3534,6 +3539,7 @@ gui_window_create(struct browser_window *bw, LAYOUT_VertAlignment, LALIGN_CENTER, LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObject, GA_ID, GID_SEARCH_ICON, + GA_RelVerify, TRUE, CHOOSER_DropDown, TRUE, CHOOSER_Labels, g->shared->web_search_list, CHOOSER_MaxLabels, 40, /* Same as options GUI */ @@ -4682,8 +4688,7 @@ static nserror gui_search_web_provider_update(const char *provider_name, DisposeObject(gwin->search_bm); gwin->search_bm = BitMapObject, - BITMAP_Masking, TRUE, - BITMAP_HasAlpha, TRUE, + BITMAP_Screen, scrn, BITMAP_Width, 16, BITMAP_Height, 16, BITMAP_BitMap, bm, commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3de529d81590ab0ad01... commit 3de529d81590ab0ad01119521f8561c7e79897e9 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Change the search ico to be a chooser gadget with the icon as the display diff --git a/amiga/gui.c b/amiga/gui.c index 1501a5f..7c4946a 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -113,6 +113,7 @@ #include <proto/bevel.h> #include <proto/bitmap.h> #include <proto/button.h> +#include <proto/chooser.h> #include <proto/clicktab.h> #include <proto/layout.h> #include <proto/space.h> @@ -122,6 +123,7 @@ #include <classes/window.h> #include <gadgets/button.h> +#include <gadgets/chooser.h> #include <gadgets/clicktab.h> #include <gadgets/layout.h> #include <gadgets/scroller.h> @@ -197,8 +199,6 @@ void ami_try_quit(void); void ami_quit_netsurf_delayed(void); Object *ami_gui_splash_open(void); void ami_gui_splash_close(Object *win_obj); -static uint32 ami_set_search_ico_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg); static uint32 ami_set_favicon_render_hook(struct Hook *hook, APTR space, struct gpRender *msg); static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, @@ -3241,9 +3241,6 @@ gui_window_create(struct browser_window *bw, g->shared->scrollerhook.h_Entry = (void *)ami_scroller_hook; g->shared->scrollerhook.h_Data = g->shared; - g->shared->search_ico_hook.h_Entry = (void *)ami_set_search_ico_render_hook; - g->shared->search_ico_hook.h_Data = g->shared; - g->shared->favicon_hook.h_Entry = (void *)ami_set_favicon_render_hook; g->shared->favicon_hook.h_Data = g->shared; @@ -3278,6 +3275,9 @@ gui_window_create(struct browser_window *bw, TAG_DONE); AddTail(&g->shared->tab_list,g->tab_node); + g->shared->web_search_list = ami_gui_opts_websearch(); + g->shared->search_bm = NULL; + g->shared->tabs=1; g->shared->next_tab=1; @@ -3387,12 +3387,12 @@ gui_window_create(struct browser_window *bw, } g->shared->objects[OID_MAIN] = WindowObject, - WA_ScreenTitle,nsscreentitle, - WA_Activate, TRUE, - WA_DepthGadget, TRUE, - WA_DragBar, TRUE, - WA_CloseGadget, TRUE, - WA_SizeGadget, TRUE, + WA_ScreenTitle,nsscreentitle, + WA_Activate, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_CloseGadget, TRUE, + WA_SizeGadget, TRUE, WA_Top,cury, WA_Left,curx, WA_Width,curw, @@ -3401,12 +3401,12 @@ gui_window_create(struct browser_window *bw, WA_ReportMouse,TRUE, refresh_mode, TRUE, WA_SizeBBottom, TRUE, - WA_IDCMP, IDCMP_MENUPICK | IDCMP_MOUSEMOVE | - IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | - IDCMP_RAWKEY | idcmp_sizeverify | - IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | - IDCMP_REFRESHWINDOW | - IDCMP_ACTIVEWINDOW | IDCMP_EXTENDEDMOUSE, + WA_IDCMP, IDCMP_MENUPICK | IDCMP_MOUSEMOVE | + IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | + IDCMP_RAWKEY | idcmp_sizeverify | + IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | + IDCMP_REFRESHWINDOW | + IDCMP_ACTIVEWINDOW | IDCMP_EXTENDEDMOUSE, WINDOW_IconifyGadget, iconifygadget, WINDOW_NewMenu, g->shared->menu, WINDOW_MenuUserData, WGUD_HOOK, @@ -3419,8 +3419,8 @@ gui_window_create(struct browser_window *bw, WINDOW_BuiltInScroll, TRUE, WINDOW_GadgetHelp, TRUE, WINDOW_UserData, g->shared, - WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = VGroupObject, - LAYOUT_SpaceOuter, TRUE, + WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = VGroupObject, + LAYOUT_SpaceOuter, TRUE, LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = HGroupObject, LAYOUT_VertAlignment, LALIGN_CENTER, LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObject, @@ -3532,13 +3532,12 @@ gui_window_create(struct browser_window *bw, LAYOUT_WeightBar, TRUE, LAYOUT_AddChild, HGroupObject, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = SpaceObject, + LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObject, GA_ID, GID_SEARCH_ICON, - SPACE_MinWidth, 16, - SPACE_MinHeight, 16, - SPACE_Transparent, FALSE, - SPACE_RenderHook, &g->shared->search_ico_hook, - SpaceEnd, + CHOOSER_DropDown, TRUE, + CHOOSER_Labels, g->shared->web_search_list, + CHOOSER_MaxLabels, 40, /* Same as options GUI */ + ChooserEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] =StringObject, @@ -3746,8 +3745,6 @@ gui_window_create(struct browser_window *bw, if(locked_screen) UnlockPubScreen(NULL,scrn); - /* set web search provider */ - search_web_select_provider(nsoption_int(search_provider)); refresh_search_ico = TRUE; ScreenToFront(scrn); @@ -3912,6 +3909,9 @@ static void gui_window_destroy(struct gui_window *g) DisposeObject(g->shared->objects[GID_FAVE_ADD]); DisposeObject(g->shared->objects[GID_FAVE_RMV]); + ami_gui_opts_websearch_free(g->shared->web_search_list); + if(g->shared->search_bm) DisposeObject(g->shared->search_bm); + ami_free_menulabs(g->shared); free(g->shared->wintitle); ami_utf8_free(g->shared->status); @@ -4678,57 +4678,28 @@ static nserror gui_search_web_provider_update(const char *provider_name, if(node->Type == AMINS_WINDOW) { - GetAttr(SPACE_AreaBox, gwin->objects[GID_SEARCH_ICON], (ULONG *)&bbox); + if(gwin->search_bm != NULL) + DisposeObject(gwin->search_bm); + + gwin->search_bm = BitMapObject, + BITMAP_Masking, TRUE, + BITMAP_HasAlpha, TRUE, + BITMAP_Width, 16, + BITMAP_Height, 16, + BITMAP_BitMap, bm, + BitMapEnd; RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON], gwin->win, NULL, GA_HintInfo, provider_name, + GA_Image, gwin->search_bm, TAG_DONE); - - EraseRect(gwin->win->RPort, bbox->Left, bbox->Top, - bbox->Left+16, bbox->Top+16); - - if(bm) - { - ULONG tag, tag_data, minterm; - - if(ami_plot_screen_is_palettemapped() == false) { - tag = BLITA_UseSrcAlpha; - tag_data = !ico_bitmap->opaque; - minterm = 0xc0; - } else { - tag = BLITA_MaskPlane; - tag_data = (ULONG)ami_bitmap_get_mask(ico_bitmap, 16, 16, bm); - minterm = (ABC|ABNC|ANBC); - } - - BltBitMapTags(BLITA_SrcX, 0, - BLITA_SrcY, 0, - BLITA_DestX, bbox->Left, - BLITA_DestY, bbox->Top, - BLITA_Width, 16, - BLITA_Height, 16, - BLITA_Source, bm, - BLITA_Dest, gwin->win->RPort, - BLITA_SrcType, BLITT_BITMAP, - BLITA_DestType, BLITT_RASTPORT, - BLITA_Minterm, minterm, - tag, tag_data, - TAG_DONE); - } } } while(node = nnode); return NSERROR_OK; } -static uint32 ami_set_search_ico_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg) -{ - refresh_search_ico = TRUE; - return 0; -} - static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, struct gpRender *msg) { diff --git a/amiga/gui.h b/amiga/gui.h index ad18750..f5a9030 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -111,6 +111,8 @@ struct gui_window_2 { ULONG hotlist_items; char *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX]; struct List hotlist_toolbar_list; + struct List *web_search_list; + Object *search_bm; char *svbuffer; char *status; char *wintitle; @@ -120,7 +122,6 @@ struct gui_window_2 { BOOL rmbtrapped; struct AppIcon *appicon; /* iconify appicon */ struct DiskObject *dobj; /* iconify appicon */ - struct Hook search_ico_hook; struct Hook favicon_hook; struct Hook throbber_hook; gui_drag_type drag_op; diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 141de2f..50f7b7c 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -218,9 +218,6 @@ CONST_STRPTR fontopts[6]; CONST_STRPTR gadlab[OPTS_LAST]; struct List *websearch_list; -struct List *ami_gui_opts_websearch(void); -void ami_gui_opts_websearch_free(struct List *websearchlist); - void ami_gui_opts_setup(void) { tabs[0] = (char *)ami_utf8_easy((char *)messages_get("con_general")); @@ -2155,3 +2152,4 @@ void ami_gui_opts_websearch_free(struct List *websearchlist) FreeVec(websearchlist); } + diff --git a/amiga/gui_options.h b/amiga/gui_options.h index 2b57769..04c1be5 100755 --- a/amiga/gui_options.h +++ b/amiga/gui_options.h @@ -18,9 +18,15 @@ #ifndef AMIGA_GUI_OPTIONS_H #define AMIGA_GUI_OPTIONS_H +/* Prefs GUI control */ void ami_gui_opts_open(void); BOOL ami_gui_opts_event(void); void ami_gui_opts_close(void); +/* Web search list */ +struct List *ami_gui_opts_websearch(void); +void ami_gui_opts_websearch_free(struct List *websearchlist); + char *current_user_options; #endif + ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 110 ++++++++++++++++++++------------------------------- amiga/gui.h | 3 +- amiga/gui_options.c | 4 +- amiga/gui_options.h | 6 +++ 4 files changed, 52 insertions(+), 71 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index 1501a5f..756ed63 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -113,6 +113,7 @@ #include <proto/bevel.h> #include <proto/bitmap.h> #include <proto/button.h> +#include <proto/chooser.h> #include <proto/clicktab.h> #include <proto/layout.h> #include <proto/space.h> @@ -122,6 +123,7 @@ #include <classes/window.h> #include <gadgets/button.h> +#include <gadgets/chooser.h> #include <gadgets/clicktab.h> #include <gadgets/layout.h> #include <gadgets/scroller.h> @@ -197,8 +199,6 @@ void ami_try_quit(void); void ami_quit_netsurf_delayed(void); Object *ami_gui_splash_open(void); void ami_gui_splash_close(Object *win_obj); -static uint32 ami_set_search_ico_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg); static uint32 ami_set_favicon_render_hook(struct Hook *hook, APTR space, struct gpRender *msg); static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, @@ -1786,6 +1786,11 @@ void ami_handle_msg(void) search_web_select_provider(-1); break; + case GID_SEARCH_ICON: + GetAttr(CHOOSER_Selected, gwin->objects[GID_SEARCH_ICON], (ULONG *)&storage); + search_web_select_provider(storage); + break; + case GID_SEARCHSTRING: { nserror ret; @@ -3241,9 +3246,6 @@ gui_window_create(struct browser_window *bw, g->shared->scrollerhook.h_Entry = (void *)ami_scroller_hook; g->shared->scrollerhook.h_Data = g->shared; - g->shared->search_ico_hook.h_Entry = (void *)ami_set_search_ico_render_hook; - g->shared->search_ico_hook.h_Data = g->shared; - g->shared->favicon_hook.h_Entry = (void *)ami_set_favicon_render_hook; g->shared->favicon_hook.h_Data = g->shared; @@ -3278,6 +3280,9 @@ gui_window_create(struct browser_window *bw, TAG_DONE); AddTail(&g->shared->tab_list,g->tab_node); + g->shared->web_search_list = ami_gui_opts_websearch(); + g->shared->search_bm = NULL; + g->shared->tabs=1; g->shared->next_tab=1; @@ -3387,12 +3392,12 @@ gui_window_create(struct browser_window *bw, } g->shared->objects[OID_MAIN] = WindowObject, - WA_ScreenTitle,nsscreentitle, - WA_Activate, TRUE, - WA_DepthGadget, TRUE, - WA_DragBar, TRUE, - WA_CloseGadget, TRUE, - WA_SizeGadget, TRUE, + WA_ScreenTitle,nsscreentitle, + WA_Activate, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_CloseGadget, TRUE, + WA_SizeGadget, TRUE, WA_Top,cury, WA_Left,curx, WA_Width,curw, @@ -3401,12 +3406,12 @@ gui_window_create(struct browser_window *bw, WA_ReportMouse,TRUE, refresh_mode, TRUE, WA_SizeBBottom, TRUE, - WA_IDCMP, IDCMP_MENUPICK | IDCMP_MOUSEMOVE | - IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | - IDCMP_RAWKEY | idcmp_sizeverify | - IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | - IDCMP_REFRESHWINDOW | - IDCMP_ACTIVEWINDOW | IDCMP_EXTENDEDMOUSE, + WA_IDCMP, IDCMP_MENUPICK | IDCMP_MOUSEMOVE | + IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | + IDCMP_RAWKEY | idcmp_sizeverify | + IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | + IDCMP_REFRESHWINDOW | + IDCMP_ACTIVEWINDOW | IDCMP_EXTENDEDMOUSE, WINDOW_IconifyGadget, iconifygadget, WINDOW_NewMenu, g->shared->menu, WINDOW_MenuUserData, WGUD_HOOK, @@ -3419,8 +3424,8 @@ gui_window_create(struct browser_window *bw, WINDOW_BuiltInScroll, TRUE, WINDOW_GadgetHelp, TRUE, WINDOW_UserData, g->shared, - WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = VGroupObject, - LAYOUT_SpaceOuter, TRUE, + WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = VGroupObject, + LAYOUT_SpaceOuter, TRUE, LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = HGroupObject, LAYOUT_VertAlignment, LALIGN_CENTER, LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObject, @@ -3532,13 +3537,13 @@ gui_window_create(struct browser_window *bw, LAYOUT_WeightBar, TRUE, LAYOUT_AddChild, HGroupObject, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = SpaceObject, + LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObject, GA_ID, GID_SEARCH_ICON, - SPACE_MinWidth, 16, - SPACE_MinHeight, 16, - SPACE_Transparent, FALSE, - SPACE_RenderHook, &g->shared->search_ico_hook, - SpaceEnd, + GA_RelVerify, TRUE, + CHOOSER_DropDown, TRUE, + CHOOSER_Labels, g->shared->web_search_list, + CHOOSER_MaxLabels, 40, /* Same as options GUI */ + ChooserEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] =StringObject, @@ -3746,8 +3751,6 @@ gui_window_create(struct browser_window *bw, if(locked_screen) UnlockPubScreen(NULL,scrn); - /* set web search provider */ - search_web_select_provider(nsoption_int(search_provider)); refresh_search_ico = TRUE; ScreenToFront(scrn); @@ -3912,6 +3915,9 @@ static void gui_window_destroy(struct gui_window *g) DisposeObject(g->shared->objects[GID_FAVE_ADD]); DisposeObject(g->shared->objects[GID_FAVE_RMV]); + ami_gui_opts_websearch_free(g->shared->web_search_list); + if(g->shared->search_bm) DisposeObject(g->shared->search_bm); + ami_free_menulabs(g->shared); free(g->shared->wintitle); ami_utf8_free(g->shared->status); @@ -4678,57 +4684,27 @@ static nserror gui_search_web_provider_update(const char *provider_name, if(node->Type == AMINS_WINDOW) { - GetAttr(SPACE_AreaBox, gwin->objects[GID_SEARCH_ICON], (ULONG *)&bbox); + if(gwin->search_bm != NULL) + DisposeObject(gwin->search_bm); + + gwin->search_bm = BitMapObject, + BITMAP_Screen, scrn, + BITMAP_Width, 16, + BITMAP_Height, 16, + BITMAP_BitMap, bm, + BitMapEnd; RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON], gwin->win, NULL, GA_HintInfo, provider_name, + GA_Image, gwin->search_bm, TAG_DONE); - - EraseRect(gwin->win->RPort, bbox->Left, bbox->Top, - bbox->Left+16, bbox->Top+16); - - if(bm) - { - ULONG tag, tag_data, minterm; - - if(ami_plot_screen_is_palettemapped() == false) { - tag = BLITA_UseSrcAlpha; - tag_data = !ico_bitmap->opaque; - minterm = 0xc0; - } else { - tag = BLITA_MaskPlane; - tag_data = (ULONG)ami_bitmap_get_mask(ico_bitmap, 16, 16, bm); - minterm = (ABC|ABNC|ANBC); - } - - BltBitMapTags(BLITA_SrcX, 0, - BLITA_SrcY, 0, - BLITA_DestX, bbox->Left, - BLITA_DestY, bbox->Top, - BLITA_Width, 16, - BLITA_Height, 16, - BLITA_Source, bm, - BLITA_Dest, gwin->win->RPort, - BLITA_SrcType, BLITT_BITMAP, - BLITA_DestType, BLITT_RASTPORT, - BLITA_Minterm, minterm, - tag, tag_data, - TAG_DONE); - } } } while(node = nnode); return NSERROR_OK; } -static uint32 ami_set_search_ico_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg) -{ - refresh_search_ico = TRUE; - return 0; -} - static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, struct gpRender *msg) { diff --git a/amiga/gui.h b/amiga/gui.h index ad18750..f5a9030 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -111,6 +111,8 @@ struct gui_window_2 { ULONG hotlist_items; char *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX]; struct List hotlist_toolbar_list; + struct List *web_search_list; + Object *search_bm; char *svbuffer; char *status; char *wintitle; @@ -120,7 +122,6 @@ struct gui_window_2 { BOOL rmbtrapped; struct AppIcon *appicon; /* iconify appicon */ struct DiskObject *dobj; /* iconify appicon */ - struct Hook search_ico_hook; struct Hook favicon_hook; struct Hook throbber_hook; gui_drag_type drag_op; diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 141de2f..50f7b7c 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -218,9 +218,6 @@ CONST_STRPTR fontopts[6]; CONST_STRPTR gadlab[OPTS_LAST]; struct List *websearch_list; -struct List *ami_gui_opts_websearch(void); -void ami_gui_opts_websearch_free(struct List *websearchlist); - void ami_gui_opts_setup(void) { tabs[0] = (char *)ami_utf8_easy((char *)messages_get("con_general")); @@ -2155,3 +2152,4 @@ void ami_gui_opts_websearch_free(struct List *websearchlist) FreeVec(websearchlist); } + diff --git a/amiga/gui_options.h b/amiga/gui_options.h index 2b57769..04c1be5 100755 --- a/amiga/gui_options.h +++ b/amiga/gui_options.h @@ -18,9 +18,15 @@ #ifndef AMIGA_GUI_OPTIONS_H #define AMIGA_GUI_OPTIONS_H +/* Prefs GUI control */ void ami_gui_opts_open(void); BOOL ami_gui_opts_event(void); void ami_gui_opts_close(void); +/* Web search list */ +struct List *ami_gui_opts_websearch(void); +void ami_gui_opts_websearch_free(struct List *websearchlist); + char *current_user_options; #endif + -- NetSurf Browser

8 years, 11 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-279-gd552865

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/d552865da1203aeae7a7d... ...commit http://git.netsurf-browser.org/netsurf.git/commit/d552865da1203aeae7a7dd7... ...tree http://git.netsurf-browser.org/netsurf.git/tree/d552865da1203aeae7a7dd7b3... The branch, master has been updated via d552865da1203aeae7a7dd7b3edd789051e66580 (commit) from 16dea2e2bd5a1e30725c88294f5844630dd724bc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d552865da1203aeae7a... commit d552865da1203aeae7a7dd7b3edd789051e66580 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Use search provider iterator. Use a List instead of an array as it is more flexible diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 3a6451b..141de2f 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -216,10 +216,10 @@ CONST_STRPTR nativebmopts[OPTS_MAX_NATIVEBM]; CONST_STRPTR ditheropts[OPTS_MAX_DITHER]; CONST_STRPTR fontopts[6]; CONST_STRPTR gadlab[OPTS_LAST]; -STRPTR *websearch_list; +struct List *websearch_list; -STRPTR *ami_gui_opts_websearch(void); -void ami_gui_opts_websearch_free(STRPTR *websearchlist); +struct List *ami_gui_opts_websearch(void); +void ami_gui_opts_websearch_free(struct List *websearchlist); void ami_gui_opts_setup(void) { @@ -1312,7 +1312,7 @@ void ami_gui_opts_open(void) GA_ID, GID_OPTS_SEARCH_PROV, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, - CHOOSER_LabelArray, websearch_list, + CHOOSER_Labels, websearch_list, CHOOSER_Selected, nsoption_int(search_provider), CHOOSER_MaxLabels, 40, ChooserEnd, @@ -2118,39 +2118,40 @@ BOOL ami_gui_opts_event(void) return FALSE; } -STRPTR *ami_gui_opts_websearch(void) +struct List *ami_gui_opts_websearch(void) { - char buf[300]; - ULONG ref = 0; - STRPTR *websearchlist; + struct List *list; + struct Node *node; + const char *name; + int iter; - websearchlist = AllocVecTagList(200, NULL); /* NB: Was not MEMF_PRIVATE */ + list = AllocVecTagList(sizeof(struct List), NULL); + NewList(list); - if (nsoption_charp(search_engines_file) == NULL) return websearchlist; + if (nsoption_charp(search_engines_file) == NULL) return list; - FILE *f = fopen(nsoption_charp(search_engines_file), "r"); - if (f == NULL) return websearchlist; - - while (fgets(buf, sizeof(buf), f) != NULL) { - if (buf[0] == '\0') continue; - buf[strlen(buf)-1] = '\0'; - websearchlist[ref] = strdup(strtok(buf, "|")); - ref++; + for (iter = search_web_iterate_providers(0, &name); + iter != -1; + iter = search_web_iterate_providers(iter, &name)) { + node = AllocChooserNode(CNA_Text, name, TAG_DONE); + AddTail(list, node); } - fclose(f); - websearchlist[ref] = NULL; - return websearchlist; + return list; } -void ami_gui_opts_websearch_free(STRPTR *websearchlist) +void ami_gui_opts_websearch_free(struct List *websearchlist) { - ULONG ref = 0; + struct Node *node; + struct Node *nnode; - while (websearchlist[ref] != NULL) { - free(websearchlist[ref]); - ref++; - } + if(IsListEmpty(websearchlist)) return; + node = GetHead(websearchlist); + + do { + nnode = GetSucc(node); + Remove(node); + } while(node = nnode); FreeVec(websearchlist); } ----------------------------------------------------------------------- Summary of changes: amiga/gui_options.c | 55 ++++++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 3a6451b..141de2f 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -216,10 +216,10 @@ CONST_STRPTR nativebmopts[OPTS_MAX_NATIVEBM]; CONST_STRPTR ditheropts[OPTS_MAX_DITHER]; CONST_STRPTR fontopts[6]; CONST_STRPTR gadlab[OPTS_LAST]; -STRPTR *websearch_list; +struct List *websearch_list; -STRPTR *ami_gui_opts_websearch(void); -void ami_gui_opts_websearch_free(STRPTR *websearchlist); +struct List *ami_gui_opts_websearch(void); +void ami_gui_opts_websearch_free(struct List *websearchlist); void ami_gui_opts_setup(void) { @@ -1312,7 +1312,7 @@ void ami_gui_opts_open(void) GA_ID, GID_OPTS_SEARCH_PROV, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, - CHOOSER_LabelArray, websearch_list, + CHOOSER_Labels, websearch_list, CHOOSER_Selected, nsoption_int(search_provider), CHOOSER_MaxLabels, 40, ChooserEnd, @@ -2118,39 +2118,40 @@ BOOL ami_gui_opts_event(void) return FALSE; } -STRPTR *ami_gui_opts_websearch(void) +struct List *ami_gui_opts_websearch(void) { - char buf[300]; - ULONG ref = 0; - STRPTR *websearchlist; + struct List *list; + struct Node *node; + const char *name; + int iter; - websearchlist = AllocVecTagList(200, NULL); /* NB: Was not MEMF_PRIVATE */ + list = AllocVecTagList(sizeof(struct List), NULL); + NewList(list); - if (nsoption_charp(search_engines_file) == NULL) return websearchlist; + if (nsoption_charp(search_engines_file) == NULL) return list; - FILE *f = fopen(nsoption_charp(search_engines_file), "r"); - if (f == NULL) return websearchlist; - - while (fgets(buf, sizeof(buf), f) != NULL) { - if (buf[0] == '\0') continue; - buf[strlen(buf)-1] = '\0'; - websearchlist[ref] = strdup(strtok(buf, "|")); - ref++; + for (iter = search_web_iterate_providers(0, &name); + iter != -1; + iter = search_web_iterate_providers(iter, &name)) { + node = AllocChooserNode(CNA_Text, name, TAG_DONE); + AddTail(list, node); } - fclose(f); - websearchlist[ref] = NULL; - return websearchlist; + return list; } -void ami_gui_opts_websearch_free(STRPTR *websearchlist) +void ami_gui_opts_websearch_free(struct List *websearchlist) { - ULONG ref = 0; + struct Node *node; + struct Node *nnode; - while (websearchlist[ref] != NULL) { - free(websearchlist[ref]); - ref++; - } + if(IsListEmpty(websearchlist)) return; + node = GetHead(websearchlist); + + do { + nnode = GetSucc(node); + Remove(node); + } while(node = nnode); FreeVec(websearchlist); } -- NetSurf Browser

8 years, 11 months

1
0
0 / 0

libhubbub: branch rupindersingh/libhubbub updated. release/0.3.0-7-ge61c714

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libhubbub.git/shortlog/e61c714744a2346dd83... ...commit http://git.netsurf-browser.org/libhubbub.git/commit/e61c714744a2346dd8399... ...tree http://git.netsurf-browser.org/libhubbub.git/tree/e61c714744a2346dd839912... The branch, rupindersingh/libhubbub has been updated via e61c714744a2346dd8399125c02a7983878f7bdd (commit) from ec23019dc078155dc2b0cd86f94691266a61d7b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libhubbub.git/commit/?id=e61c714744a2346dd... commit e61c714744a2346dd8399125c02a7983878f7bdd Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> unclean commit diff --git a/include/hubbub/types.h b/include/hubbub/types.h index e5c208b..6e2b1a9 100644 --- a/include/hubbub/types.h +++ b/include/hubbub/types.h @@ -33,7 +33,8 @@ typedef enum hubbub_content_model { HUBBUB_CONTENT_MODEL_PCDATA, HUBBUB_CONTENT_MODEL_RCDATA, HUBBUB_CONTENT_MODEL_CDATA, - HUBBUB_CONTENT_MODEL_PLAINTEXT + HUBBUB_CONTENT_MODEL_PLAINTEXT, + HUBBUB_CONTENT_MODEL_RAWTEXT } hubbub_content_model; /** ----------------------------------------------------------------------- Summary of changes: include/hubbub/types.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/hubbub/types.h b/include/hubbub/types.h index e5c208b..6e2b1a9 100644 --- a/include/hubbub/types.h +++ b/include/hubbub/types.h @@ -33,7 +33,8 @@ typedef enum hubbub_content_model { HUBBUB_CONTENT_MODEL_PCDATA, HUBBUB_CONTENT_MODEL_RCDATA, HUBBUB_CONTENT_MODEL_CDATA, - HUBBUB_CONTENT_MODEL_PLAINTEXT + HUBBUB_CONTENT_MODEL_PLAINTEXT, + HUBBUB_CONTENT_MODEL_RAWTEXT } hubbub_content_model; /** -- HTML5 parser library

8 years, 12 months

1
0
0 / 0

libhubbub: branch rupindersingh/libhubbub updated. release/0.3.0-6-gec23019

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libhubbub.git/shortlog/ec23019dc078155dc2b... ...commit http://git.netsurf-browser.org/libhubbub.git/commit/ec23019dc078155dc2b0c... ...tree http://git.netsurf-browser.org/libhubbub.git/tree/ec23019dc078155dc2b0cd8... The branch, rupindersingh/libhubbub has been updated via ec23019dc078155dc2b0cd86f94691266a61d7b5 (commit) from 5726ffa43f30ea20d06ac3334e86269c3164333a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libhubbub.git/commit/?id=ec23019dc078155dc... commit ec23019dc078155dc2b0cd86f94691266a61d7b5 Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Enabling some tests. The regresssion.test file had some tests that I found to be wrong and therefore changed them. A confirmation from the mentors is needed to verify its validity. diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 25dc3ac..33b9060 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -7,14 +7,14 @@ test2.test html5lib tests (part 2) test3.test html5lib tests (part 3) test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests -#entities.test html5lib entity tests +entities.test html5lib entity tests #escapeFlag.test html5lib escape flag tests -#numericEntities.test html5lib numeric entities tests +numericEntities.test html5lib numeric entities tests #unicodeChars.test html5lib unicode character tests cdata.test CDATA section tests -#regression.test Regression tests +regression.test Regression tests #domjs.test NA namedEntities.test html5lib named entities tests -#pendingSpecChanges.test NA +pendingSpecChanges.test NA #unicodeCharsProblematic.test NA #xmlViolation.test NA diff --git a/test/data/tokeniser2/regression.test b/test/data/tokeniser2/regression.test index ae3e66a..59fda3f 100644 --- a/test/data/tokeniser2/regression.test +++ b/test/data/tokeniser2/regression.test @@ -1,11 +1,11 @@ {"tests": [ -{"description":"CR in double-quoted attribute value", -"input":"<foo bar=\"\r\u2022xyz\"", +{"description":"CR in double-quoted attribute value. This test has been changes manually from <foo bar=\"\r\u2022xyz\" to <foo bar=\"\r\u2022xyz\">", +"input":"<foo bar=\"\r\u2022xyz\">", "output":[["StartTag", "foo", {"bar":"\n\u2022xyz"}]]}, -{"description":"CR in single-quoted attribute value", -"input":"<foo bar='\r\u2022xyz'", +{"description":"CR in single-quoted attribute value. The input has manually been changed from <foo bar='\r\u2022xyz'> <foo bar='\r\u2022xyz'>", +"input":"<foo bar='\r\u2022xyz'>", "output":[["StartTag", "foo", {"bar":"\n\u2022xyz"}]]}, {"description":"CR in comment", ----------------------------------------------------------------------- Summary of changes: test/data/tokeniser2/INDEX | 8 ++++---- test/data/tokeniser2/regression.test | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 25dc3ac..33b9060 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -7,14 +7,14 @@ test2.test html5lib tests (part 2) test3.test html5lib tests (part 3) test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests -#entities.test html5lib entity tests +entities.test html5lib entity tests #escapeFlag.test html5lib escape flag tests -#numericEntities.test html5lib numeric entities tests +numericEntities.test html5lib numeric entities tests #unicodeChars.test html5lib unicode character tests cdata.test CDATA section tests -#regression.test Regression tests +regression.test Regression tests #domjs.test NA namedEntities.test html5lib named entities tests -#pendingSpecChanges.test NA +pendingSpecChanges.test NA #unicodeCharsProblematic.test NA #xmlViolation.test NA diff --git a/test/data/tokeniser2/regression.test b/test/data/tokeniser2/regression.test index ae3e66a..59fda3f 100644 --- a/test/data/tokeniser2/regression.test +++ b/test/data/tokeniser2/regression.test @@ -1,11 +1,11 @@ {"tests": [ -{"description":"CR in double-quoted attribute value", -"input":"<foo bar=\"\r\u2022xyz\"", +{"description":"CR in double-quoted attribute value. This test has been changes manually from <foo bar=\"\r\u2022xyz\" to <foo bar=\"\r\u2022xyz\">", +"input":"<foo bar=\"\r\u2022xyz\">", "output":[["StartTag", "foo", {"bar":"\n\u2022xyz"}]]}, -{"description":"CR in single-quoted attribute value", -"input":"<foo bar='\r\u2022xyz'", +{"description":"CR in single-quoted attribute value. The input has manually been changed from <foo bar='\r\u2022xyz'> <foo bar='\r\u2022xyz'>", +"input":"<foo bar='\r\u2022xyz'>", "output":[["StartTag", "foo", {"bar":"\n\u2022xyz"}]]}, {"description":"CR in comment", -- HTML5 parser library

8 years, 12 months

1
0
0 / 0

libhubbub: branch rupindersingh/libhubbub updated. release/0.3.0-5-g5726ffa

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libhubbub.git/shortlog/5726ffa43f30ea20d06... ...commit http://git.netsurf-browser.org/libhubbub.git/commit/5726ffa43f30ea20d06ac... ...tree http://git.netsurf-browser.org/libhubbub.git/tree/5726ffa43f30ea20d06ac33... The branch, rupindersingh/libhubbub has been updated via 5726ffa43f30ea20d06ac3334e86269c3164333a (commit) from 96033c6b5e97a9fd51f32115d873c38d37f55a71 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libhubbub.git/commit/?id=5726ffa43f30ea20d... commit 5726ffa43f30ea20d06ac3334e86269c3164333a Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> There could have been a better way to handle EOFs in b/w tag-names and attribute values. [Fix] Numeric overflow check algo. [fix] cp1252 tables. diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index e86b991..22fa862 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -25,10 +25,10 @@ * Table of mappings between Windows-1252 codepoints 128-159 and UCS4 */ static const uint32_t cp1252Table[32] = { - 0x20AC, 0xFFFD, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0xFFFD, 0x017D, 0xFFFD, - 0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0xFFFD, 0x017E, 0x0178 + 0x20AC, 0x0081, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008D, 0x017D, 0x008F, + 0x0090, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x009D, 0x017E, 0x0178 }; /** @@ -1127,7 +1127,9 @@ hubbub_error hubbub_tokeniser_handle_tag_name(hubbub_tokeniser *tokeniser) if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1176,7 +1178,9 @@ hubbub_error hubbub_tokeniser_handle_before_attribute_name( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1249,7 +1253,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_name(hubbub_tokeniser *tokeniser) if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1304,7 +1310,9 @@ hubbub_error hubbub_tokeniser_handle_after_attribute_name( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1381,7 +1389,9 @@ hubbub_error hubbub_tokeniser_handle_before_attribute_value( if (error == PARSERUTILS_EOF) { /** \todo parse error */ tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1442,7 +1452,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_value_dq( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1504,7 +1516,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_value_sq( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1566,7 +1580,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_value_uq( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1670,7 +1686,9 @@ hubbub_error hubbub_tokeniser_handle_after_attribute_value_q( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1712,7 +1730,9 @@ hubbub_error hubbub_tokeniser_handle_self_closing_start_tag( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -3025,7 +3045,7 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( break; } - if (ctx->match_entity.numeric_state.ucs4 >= 0x10FFFF) { + if (ctx->match_entity.numeric_state.ucs4 > 0x10FFFF) { ctx->match_entity.overflow = true; } } @@ -3046,18 +3066,20 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( if (0x80 <= cp && cp <= 0x9F) { cp = cp1252Table[cp - 0x80]; - } else if (cp == 0x0D) { - cp = 0x000A; - } else if (ctx->match_entity.overflow || - cp <= 0x0008 || cp == 0x000B || - (0x000E <= cp && cp <= 0x001F) || - (0x007F <= cp && cp <= 0x009F) || + } else if (ctx->match_entity.overflow || (0xD800 <= cp && cp <= 0xDFFF) || + (cp == 0x00)) { + cp = 0xFFFD; + } else if ((cp >= 0x0001 && cp <= 0x0008 ) || + (0x000D <= cp && cp <= 0x001F) || + (0x007F <= cp && cp <= 0x009F) || (0xFDD0 <= cp && cp <= 0xFDEF) || + (cp == 0x000B) || + (cp & 0xFFFF) == 0xFFFF || (cp & 0xFFFE) == 0xFFFE) { /* the check for cp > 0x10FFFF per spec is performed * in the loop above to avoid overflow */ - cp = 0xFFFD; + //cp = 0xFFFD; } ctx->match_entity.numeric_state.ucs4 = cp; diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 96daa2a..25dc3ac 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -5,7 +5,7 @@ test1.test html5lib tests (part 1) test2.test html5lib tests (part 2) test3.test html5lib tests (part 3) -#test4.test html5lib tests (part 4) +test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests #entities.test html5lib entity tests #escapeFlag.test html5lib escape flag tests ----------------------------------------------------------------------- Summary of changes: src/tokeniser/tokeniser.c | 66 +++++++++++++++++++++++++++++-------------- test/data/tokeniser2/INDEX | 2 +- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index e86b991..22fa862 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -25,10 +25,10 @@ * Table of mappings between Windows-1252 codepoints 128-159 and UCS4 */ static const uint32_t cp1252Table[32] = { - 0x20AC, 0xFFFD, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0xFFFD, 0x017D, 0xFFFD, - 0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0xFFFD, 0x017E, 0x0178 + 0x20AC, 0x0081, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008D, 0x017D, 0x008F, + 0x0090, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x009D, 0x017E, 0x0178 }; /** @@ -1127,7 +1127,9 @@ hubbub_error hubbub_tokeniser_handle_tag_name(hubbub_tokeniser *tokeniser) if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1176,7 +1178,9 @@ hubbub_error hubbub_tokeniser_handle_before_attribute_name( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1249,7 +1253,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_name(hubbub_tokeniser *tokeniser) if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1304,7 +1310,9 @@ hubbub_error hubbub_tokeniser_handle_after_attribute_name( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1381,7 +1389,9 @@ hubbub_error hubbub_tokeniser_handle_before_attribute_value( if (error == PARSERUTILS_EOF) { /** \todo parse error */ tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1442,7 +1452,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_value_dq( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1504,7 +1516,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_value_sq( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1566,7 +1580,9 @@ hubbub_error hubbub_tokeniser_handle_attribute_value_uq( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1670,7 +1686,9 @@ hubbub_error hubbub_tokeniser_handle_after_attribute_value_q( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -1712,7 +1730,9 @@ hubbub_error hubbub_tokeniser_handle_self_closing_start_tag( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->state = STATE_DATA; - return emit_current_tag(tokeniser); + parserutils_inputstream_advance(tokeniser->input, + tokeniser->context.pending); + return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); } @@ -3025,7 +3045,7 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( break; } - if (ctx->match_entity.numeric_state.ucs4 >= 0x10FFFF) { + if (ctx->match_entity.numeric_state.ucs4 > 0x10FFFF) { ctx->match_entity.overflow = true; } } @@ -3046,18 +3066,20 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( if (0x80 <= cp && cp <= 0x9F) { cp = cp1252Table[cp - 0x80]; - } else if (cp == 0x0D) { - cp = 0x000A; - } else if (ctx->match_entity.overflow || - cp <= 0x0008 || cp == 0x000B || - (0x000E <= cp && cp <= 0x001F) || - (0x007F <= cp && cp <= 0x009F) || + } else if (ctx->match_entity.overflow || (0xD800 <= cp && cp <= 0xDFFF) || + (cp == 0x00)) { + cp = 0xFFFD; + } else if ((cp >= 0x0001 && cp <= 0x0008 ) || + (0x000D <= cp && cp <= 0x001F) || + (0x007F <= cp && cp <= 0x009F) || (0xFDD0 <= cp && cp <= 0xFDEF) || + (cp == 0x000B) || + (cp & 0xFFFF) == 0xFFFF || (cp & 0xFFFE) == 0xFFFE) { /* the check for cp > 0x10FFFF per spec is performed * in the loop above to avoid overflow */ - cp = 0xFFFD; + //cp = 0xFFFD; } ctx->match_entity.numeric_state.ucs4 = cp; diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 96daa2a..25dc3ac 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -5,7 +5,7 @@ test1.test html5lib tests (part 1) test2.test html5lib tests (part 2) test3.test html5lib tests (part 3) -#test4.test html5lib tests (part 4) +test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests #entities.test html5lib entity tests #escapeFlag.test html5lib escape flag tests -- HTML5 parser library

8 years, 12 months

1
0
0 / 0

libhubbub: branch rupindersingh/libhubbub updated. release/0.3.0-4-g96033c6

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libhubbub.git/shortlog/96033c6b5e97a9fd51f... ...commit http://git.netsurf-browser.org/libhubbub.git/commit/96033c6b5e97a9fd51f32... ...tree http://git.netsurf-browser.org/libhubbub.git/tree/96033c6b5e97a9fd51f3211... The branch, rupindersingh/libhubbub has been updated via 96033c6b5e97a9fd51f32115d873c38d37f55a71 (commit) from f980cf4374c2f750525baba57eb96bfabbe8b935 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libhubbub.git/commit/?id=96033c6b5e97a9fd5... commit 96033c6b5e97a9fd51f32115d873c38d37f55a71 Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Adding the COMMENT_END_BANG state for test3.dat diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index 86c5f31..e86b991 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -78,6 +78,7 @@ typedef enum hubbub_tokeniser_state { STATE_COMMENT, STATE_COMMENT_END_DASH, STATE_COMMENT_END, + STATE_COMMENT_END_BANG, STATE_MATCH_DOCTYPE, STATE_DOCTYPE, STATE_BEFORE_DOCTYPE_NAME, @@ -539,6 +540,7 @@ hubbub_error hubbub_tokeniser_run(hubbub_tokeniser *tokeniser) case STATE_COMMENT_START: case STATE_COMMENT_START_DASH: case STATE_COMMENT: + case STATE_COMMENT_END_BANG: case STATE_COMMENT_END_DASH: case STATE_COMMENT_END: cont = hubbub_tokeniser_handle_comment(tokeniser); @@ -1894,7 +1896,8 @@ hubbub_error hubbub_tokeniser_handle_comment(hubbub_tokeniser *tokeniser) if (c == '>' && (tokeniser->state == STATE_COMMENT_START_DASH || tokeniser->state == STATE_COMMENT_START || - tokeniser->state == STATE_COMMENT_END)) { + tokeniser->state == STATE_COMMENT_END || + tokeniser->state == STATE_COMMENT_END_BANG)) { tokeniser->context.pending += len; /** \todo parse error if state != COMMENT_END */ @@ -1916,9 +1919,21 @@ hubbub_error hubbub_tokeniser_handle_comment(hubbub_tokeniser *tokeniser) return hubbub_error_from_parserutils_error( error); } + } else if (tokeniser->state == STATE_COMMENT_END_BANG) { + error = parserutils_buffer_append(tokeniser->buffer, + (uint8_t *) "--!", SLEN("--!")); + if (error != PARSERUTILS_OK) { + return hubbub_error_from_parserutils_error( + error); + } + tokeniser->state = STATE_COMMENT_END_DASH; } tokeniser->context.pending += len; + } else if (c == '!' && tokeniser->state == STATE_COMMENT_END) { + tokeniser->state = STATE_COMMENT_END_BANG; + tokeniser->context.pending += len; + return HUBBUB_OK; } else { if (tokeniser->state == STATE_COMMENT_START_DASH || tokeniser->state == STATE_COMMENT_END_DASH) { @@ -1935,8 +1950,16 @@ hubbub_error hubbub_tokeniser_handle_comment(hubbub_tokeniser *tokeniser) return hubbub_error_from_parserutils_error( error); } + } else if (tokeniser->state == STATE_COMMENT_END_BANG) { + error = parserutils_buffer_append(tokeniser->buffer, + (uint8_t *) "--!", SLEN("--!")); + if (error != PARSERUTILS_OK) { + return hubbub_error_from_parserutils_error( + error); + } } + if (c == '\0') { error = parserutils_buffer_append(tokeniser->buffer, u_fffd, sizeof(u_fffd)); diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 1f6ea93..96daa2a 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -4,7 +4,7 @@ test1.test html5lib tests (part 1) test2.test html5lib tests (part 2) -#test3.test html5lib tests (part 3) +test3.test html5lib tests (part 3) #test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests #entities.test html5lib entity tests ----------------------------------------------------------------------- Summary of changes: src/tokeniser/tokeniser.c | 25 ++++++++++++++++++++++++- test/data/tokeniser2/INDEX | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index 86c5f31..e86b991 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -78,6 +78,7 @@ typedef enum hubbub_tokeniser_state { STATE_COMMENT, STATE_COMMENT_END_DASH, STATE_COMMENT_END, + STATE_COMMENT_END_BANG, STATE_MATCH_DOCTYPE, STATE_DOCTYPE, STATE_BEFORE_DOCTYPE_NAME, @@ -539,6 +540,7 @@ hubbub_error hubbub_tokeniser_run(hubbub_tokeniser *tokeniser) case STATE_COMMENT_START: case STATE_COMMENT_START_DASH: case STATE_COMMENT: + case STATE_COMMENT_END_BANG: case STATE_COMMENT_END_DASH: case STATE_COMMENT_END: cont = hubbub_tokeniser_handle_comment(tokeniser); @@ -1894,7 +1896,8 @@ hubbub_error hubbub_tokeniser_handle_comment(hubbub_tokeniser *tokeniser) if (c == '>' && (tokeniser->state == STATE_COMMENT_START_DASH || tokeniser->state == STATE_COMMENT_START || - tokeniser->state == STATE_COMMENT_END)) { + tokeniser->state == STATE_COMMENT_END || + tokeniser->state == STATE_COMMENT_END_BANG)) { tokeniser->context.pending += len; /** \todo parse error if state != COMMENT_END */ @@ -1916,9 +1919,21 @@ hubbub_error hubbub_tokeniser_handle_comment(hubbub_tokeniser *tokeniser) return hubbub_error_from_parserutils_error( error); } + } else if (tokeniser->state == STATE_COMMENT_END_BANG) { + error = parserutils_buffer_append(tokeniser->buffer, + (uint8_t *) "--!", SLEN("--!")); + if (error != PARSERUTILS_OK) { + return hubbub_error_from_parserutils_error( + error); + } + tokeniser->state = STATE_COMMENT_END_DASH; } tokeniser->context.pending += len; + } else if (c == '!' && tokeniser->state == STATE_COMMENT_END) { + tokeniser->state = STATE_COMMENT_END_BANG; + tokeniser->context.pending += len; + return HUBBUB_OK; } else { if (tokeniser->state == STATE_COMMENT_START_DASH || tokeniser->state == STATE_COMMENT_END_DASH) { @@ -1935,8 +1950,16 @@ hubbub_error hubbub_tokeniser_handle_comment(hubbub_tokeniser *tokeniser) return hubbub_error_from_parserutils_error( error); } + } else if (tokeniser->state == STATE_COMMENT_END_BANG) { + error = parserutils_buffer_append(tokeniser->buffer, + (uint8_t *) "--!", SLEN("--!")); + if (error != PARSERUTILS_OK) { + return hubbub_error_from_parserutils_error( + error); + } } + if (c == '\0') { error = parserutils_buffer_append(tokeniser->buffer, u_fffd, sizeof(u_fffd)); diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 1f6ea93..96daa2a 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -4,7 +4,7 @@ test1.test html5lib tests (part 1) test2.test html5lib tests (part 2) -#test3.test html5lib tests (part 3) +test3.test html5lib tests (part 3) #test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests #entities.test html5lib entity tests -- HTML5 parser library

8 years, 12 months

1
0
0 / 0

libhubbub: branch rupindersingh/libhubbub updated. release/0.3.0-3-gf980cf4

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libhubbub.git/shortlog/f980cf4374c2f750525... ...commit http://git.netsurf-browser.org/libhubbub.git/commit/f980cf4374c2f750525ba... ...tree http://git.netsurf-browser.org/libhubbub.git/tree/f980cf4374c2f750525baba... The branch, rupindersingh/libhubbub has been updated via f980cf4374c2f750525baba57eb96bfabbe8b935 (commit) from 354151d0e9ea754c69169b8703e6da06a84a6caf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libhubbub.git/commit/?id=f980cf4374c2f7505... commit f980cf4374c2f750525baba57eb96bfabbe8b935 Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> [Fix] tokeniser wrongly emitted a replacement character instead of utf8 NULL. Also, the tester used strlen to calculate string lengths--this seg faults if a null is passed-- this is also fixed. diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index 563dd48..86c5f31 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -44,6 +44,12 @@ static const hubbub_string u_fffd_str = { u_fffd, sizeof(u_fffd) }; static const uint8_t lf = '\n'; static const hubbub_string lf_str = { &lf, 1 }; +/** + * UTF-8 encoding of U+0000 NULL CHARACTER + */ +static const uint8_t u_null[1] = { '\x00'}; +static const hubbub_string u_null_str = { u_null, sizeof(u_null) }; + /** * Tokeniser states @@ -751,8 +757,8 @@ hubbub_error hubbub_tokeniser_handle_data(hubbub_tokeniser *tokeniser) emit_current_chars(tokeniser); } - /* Emit a replacement character */ - emit_character_token(tokeniser, &u_fffd_str); + /* Emit a null character */ + emit_character_token(tokeniser, &u_null_str); /* Advance past NUL */ parserutils_inputstream_advance(tokeniser->input, 1); diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 57c0cad..1f6ea93 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -3,7 +3,7 @@ # Test Description test1.test html5lib tests (part 1) -#test2.test html5lib tests (part 2) +test2.test html5lib tests (part 2) #test3.test html5lib tests (part 3) #test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests diff --git a/test/testutils.h b/test/testutils.h index 45870f9..7a8eda5 100644 --- a/test/testutils.h +++ b/test/testutils.h @@ -10,6 +10,18 @@ #define UNUSED(x) ((x) = (x)) #endif +#ifndef LEN +uint32_t string_length(const char *str); +uint32_t string_length(const char *str) +{ + if(str == NULL) + return 0; + return strlen(str); +} +#define LEN(x) string_length(x) +#endif + + /* Redefine assert, so we can simply use the standard assert mechanism * within testcases and exit with the right output for the testrunner * to do the right thing. */ diff --git a/test/tokeniser2.c b/test/tokeniser2.c index c8ab9c0..07f355a 100644 --- a/test/tokeniser2.c +++ b/test/tokeniser2.c @@ -134,7 +134,7 @@ void run_test(context *ctx) if (ctx->last_start_tag != NULL) { /* Fake up a start tag, in PCDATA state */ - size_t len = strlen(ctx->last_start_tag) + 3; + size_t len = LEN(ctx->last_start_tag) + 3; uint8_t *buf = malloc(len); snprintf((char *) buf, len, "<%s>", @@ -302,21 +302,21 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) token->data.doctype.system_id.len); } - assert(token->data.doctype.name.len == strlen(expname)); - assert(strncmp(gotname, expname, strlen(expname)) == 0); + assert(token->data.doctype.name.len == LEN(expname)); + assert(strncmp(gotname, expname, LEN(expname)) == 0); assert((exppub == NULL) == (token->data.doctype.public_missing == true)); if (exppub) { - assert(token->data.doctype.public_id.len == strlen(exppub)); - assert(strncmp(gotpub, exppub, strlen(exppub)) == 0); + assert(token->data.doctype.public_id.len == LEN(exppub)); + assert(strncmp(gotpub, exppub, LEN(exppub)) == 0); } assert((expsys == NULL) == (token->data.doctype.system_missing == true)); if (gotsys) { - assert(token->data.doctype.system_id.len == strlen(expsys)); - assert(strncmp(gotsys, expsys, strlen(expsys)) == 0); + assert(token->data.doctype.system_id.len == LEN(expsys)); + assert(strncmp(gotsys, expsys, LEN(expsys)) == 0); } assert(expquirks == token->data.doctype.force_quirks); @@ -348,8 +348,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf("attributes:\n"); } - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); assert((token->data.tag.n_attributes == 0) == (expattrs == NULL)); @@ -373,11 +373,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) namelen, gotname, (int) vallen, gotval); - assert(namelen == strlen(expname)); + assert(namelen == LEN(expname)); assert(strncmp(gotname, expname, strlen(expname)) == 0); - assert(vallen == strlen(expval)); - assert(strncmp(gotval, expval, strlen(expval)) == 0); + assert(vallen == LEN(expval)); + assert(strncmp(gotval, expval, LEN(expval)) == 0); expattrs = expattrs->next; } @@ -398,8 +398,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (token->data.tag.n_attributes > 0) ? "attributes:" : ""); - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); } break; case HUBBUB_TOKEN_COMMENT: @@ -413,8 +413,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf(" got: '%.*s'\n", (int) token->data.comment.len, gotstr); - assert(token->data.comment.len == strlen(expstr)); - assert(strncmp(gotstr, expstr, strlen(expstr)) == 0); + assert(token->data.comment.len == LEN(expstr)); + assert(strncmp(gotstr, expstr, LEN(expstr)) == 0); } break; case HUBBUB_TOKEN_CHARACTER: diff --git a/test/tokeniser3.c b/test/tokeniser3.c index 949ddd0..e68a230 100644 --- a/test/tokeniser3.c +++ b/test/tokeniser3.c @@ -132,7 +132,7 @@ void run_test(context *ctx) if (ctx->last_start_tag != NULL) { /* Fake up a start tag, in PCDATA state */ - size_t len = strlen(ctx->last_start_tag) + 3; + size_t len = LEN(ctx->last_start_tag) + 3; uint8_t *buf = malloc(len); snprintf((char *) buf, len, "<%s>", @@ -308,21 +308,21 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) token->data.doctype.system_id.len); } - assert(token->data.doctype.name.len == strlen(expname)); - assert(strncmp(gotname, expname, strlen(expname)) == 0); + assert(token->data.doctype.name.len == LEN(expname)); + assert(strncmp(gotname, expname, LEN(expname)) == 0); assert((exppub == NULL) == (token->data.doctype.public_missing == true)); if (exppub) { - assert(token->data.doctype.public_id.len == strlen(exppub)); - assert(strncmp(gotpub, exppub, strlen(exppub)) == 0); + assert(token->data.doctype.public_id.len == LEN(exppub)); + assert(strncmp(gotpub, exppub, LEN(exppub)) == 0); } assert((expsys == NULL) == (token->data.doctype.system_missing == true)); if (gotsys) { - assert(token->data.doctype.system_id.len == strlen(expsys)); - assert(strncmp(gotsys, expsys, strlen(expsys)) == 0); + assert(token->data.doctype.system_id.len == LEN(expsys)); + assert(strncmp(gotsys, expsys, LEN(expsys)) == 0); } assert(expquirks == token->data.doctype.force_quirks); @@ -354,8 +354,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf("attributes:\n"); } - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); assert((token->data.tag.n_attributes == 0) == (expattrs == NULL)); @@ -379,11 +379,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) namelen, gotname, (int) vallen, gotval); - assert(namelen == strlen(expname)); + assert(namelen == LEN(expname)); assert(strncmp(gotname, expname, strlen(expname)) == 0); - assert(vallen == strlen(expval)); - assert(strncmp(gotval, expval, strlen(expval)) == 0); + assert(vallen == LEN(expval)); + assert(strncmp(gotval, expval, LEN(expval)) == 0); expattrs = expattrs->next; } @@ -404,8 +404,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (token->data.tag.n_attributes > 0) ? "attributes:" : ""); - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); } break; case HUBBUB_TOKEN_COMMENT: @@ -419,8 +419,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf(" got: '%.*s'\n", (int) token->data.comment.len, gotstr); - assert(token->data.comment.len == strlen(expstr)); - assert(strncmp(gotstr, expstr, strlen(expstr)) == 0); + assert(token->data.comment.len == LEN(expstr)); + assert(strncmp(gotstr, expstr, LEN(expstr)) == 0); } break; case HUBBUB_TOKEN_CHARACTER: ----------------------------------------------------------------------- Summary of changes: src/tokeniser/tokeniser.c | 10 ++++++++-- test/data/tokeniser2/INDEX | 2 +- test/testutils.h | 12 ++++++++++++ test/tokeniser2.c | 32 ++++++++++++++++---------------- test/tokeniser3.c | 32 ++++++++++++++++---------------- 5 files changed, 53 insertions(+), 35 deletions(-) diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index 563dd48..86c5f31 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -44,6 +44,12 @@ static const hubbub_string u_fffd_str = { u_fffd, sizeof(u_fffd) }; static const uint8_t lf = '\n'; static const hubbub_string lf_str = { &lf, 1 }; +/** + * UTF-8 encoding of U+0000 NULL CHARACTER + */ +static const uint8_t u_null[1] = { '\x00'}; +static const hubbub_string u_null_str = { u_null, sizeof(u_null) }; + /** * Tokeniser states @@ -751,8 +757,8 @@ hubbub_error hubbub_tokeniser_handle_data(hubbub_tokeniser *tokeniser) emit_current_chars(tokeniser); } - /* Emit a replacement character */ - emit_character_token(tokeniser, &u_fffd_str); + /* Emit a null character */ + emit_character_token(tokeniser, &u_null_str); /* Advance past NUL */ parserutils_inputstream_advance(tokeniser->input, 1); diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 57c0cad..1f6ea93 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -3,7 +3,7 @@ # Test Description test1.test html5lib tests (part 1) -#test2.test html5lib tests (part 2) +test2.test html5lib tests (part 2) #test3.test html5lib tests (part 3) #test4.test html5lib tests (part 4) #contentModelFlags.test html5lib content model tests diff --git a/test/testutils.h b/test/testutils.h index 45870f9..7a8eda5 100644 --- a/test/testutils.h +++ b/test/testutils.h @@ -10,6 +10,18 @@ #define UNUSED(x) ((x) = (x)) #endif +#ifndef LEN +uint32_t string_length(const char *str); +uint32_t string_length(const char *str) +{ + if(str == NULL) + return 0; + return strlen(str); +} +#define LEN(x) string_length(x) +#endif + + /* Redefine assert, so we can simply use the standard assert mechanism * within testcases and exit with the right output for the testrunner * to do the right thing. */ diff --git a/test/tokeniser2.c b/test/tokeniser2.c index c8ab9c0..07f355a 100644 --- a/test/tokeniser2.c +++ b/test/tokeniser2.c @@ -134,7 +134,7 @@ void run_test(context *ctx) if (ctx->last_start_tag != NULL) { /* Fake up a start tag, in PCDATA state */ - size_t len = strlen(ctx->last_start_tag) + 3; + size_t len = LEN(ctx->last_start_tag) + 3; uint8_t *buf = malloc(len); snprintf((char *) buf, len, "<%s>", @@ -302,21 +302,21 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) token->data.doctype.system_id.len); } - assert(token->data.doctype.name.len == strlen(expname)); - assert(strncmp(gotname, expname, strlen(expname)) == 0); + assert(token->data.doctype.name.len == LEN(expname)); + assert(strncmp(gotname, expname, LEN(expname)) == 0); assert((exppub == NULL) == (token->data.doctype.public_missing == true)); if (exppub) { - assert(token->data.doctype.public_id.len == strlen(exppub)); - assert(strncmp(gotpub, exppub, strlen(exppub)) == 0); + assert(token->data.doctype.public_id.len == LEN(exppub)); + assert(strncmp(gotpub, exppub, LEN(exppub)) == 0); } assert((expsys == NULL) == (token->data.doctype.system_missing == true)); if (gotsys) { - assert(token->data.doctype.system_id.len == strlen(expsys)); - assert(strncmp(gotsys, expsys, strlen(expsys)) == 0); + assert(token->data.doctype.system_id.len == LEN(expsys)); + assert(strncmp(gotsys, expsys, LEN(expsys)) == 0); } assert(expquirks == token->data.doctype.force_quirks); @@ -348,8 +348,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf("attributes:\n"); } - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); assert((token->data.tag.n_attributes == 0) == (expattrs == NULL)); @@ -373,11 +373,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) namelen, gotname, (int) vallen, gotval); - assert(namelen == strlen(expname)); + assert(namelen == LEN(expname)); assert(strncmp(gotname, expname, strlen(expname)) == 0); - assert(vallen == strlen(expval)); - assert(strncmp(gotval, expval, strlen(expval)) == 0); + assert(vallen == LEN(expval)); + assert(strncmp(gotval, expval, LEN(expval)) == 0); expattrs = expattrs->next; } @@ -398,8 +398,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (token->data.tag.n_attributes > 0) ? "attributes:" : ""); - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); } break; case HUBBUB_TOKEN_COMMENT: @@ -413,8 +413,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf(" got: '%.*s'\n", (int) token->data.comment.len, gotstr); - assert(token->data.comment.len == strlen(expstr)); - assert(strncmp(gotstr, expstr, strlen(expstr)) == 0); + assert(token->data.comment.len == LEN(expstr)); + assert(strncmp(gotstr, expstr, LEN(expstr)) == 0); } break; case HUBBUB_TOKEN_CHARACTER: diff --git a/test/tokeniser3.c b/test/tokeniser3.c index 949ddd0..e68a230 100644 --- a/test/tokeniser3.c +++ b/test/tokeniser3.c @@ -132,7 +132,7 @@ void run_test(context *ctx) if (ctx->last_start_tag != NULL) { /* Fake up a start tag, in PCDATA state */ - size_t len = strlen(ctx->last_start_tag) + 3; + size_t len = LEN(ctx->last_start_tag) + 3; uint8_t *buf = malloc(len); snprintf((char *) buf, len, "<%s>", @@ -308,21 +308,21 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) token->data.doctype.system_id.len); } - assert(token->data.doctype.name.len == strlen(expname)); - assert(strncmp(gotname, expname, strlen(expname)) == 0); + assert(token->data.doctype.name.len == LEN(expname)); + assert(strncmp(gotname, expname, LEN(expname)) == 0); assert((exppub == NULL) == (token->data.doctype.public_missing == true)); if (exppub) { - assert(token->data.doctype.public_id.len == strlen(exppub)); - assert(strncmp(gotpub, exppub, strlen(exppub)) == 0); + assert(token->data.doctype.public_id.len == LEN(exppub)); + assert(strncmp(gotpub, exppub, LEN(exppub)) == 0); } assert((expsys == NULL) == (token->data.doctype.system_missing == true)); if (gotsys) { - assert(token->data.doctype.system_id.len == strlen(expsys)); - assert(strncmp(gotsys, expsys, strlen(expsys)) == 0); + assert(token->data.doctype.system_id.len == LEN(expsys)); + assert(strncmp(gotsys, expsys, LEN(expsys)) == 0); } assert(expquirks == token->data.doctype.force_quirks); @@ -354,8 +354,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf("attributes:\n"); } - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); assert((token->data.tag.n_attributes == 0) == (expattrs == NULL)); @@ -379,11 +379,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (int) namelen, gotname, (int) vallen, gotval); - assert(namelen == strlen(expname)); + assert(namelen == LEN(expname)); assert(strncmp(gotname, expname, strlen(expname)) == 0); - assert(vallen == strlen(expval)); - assert(strncmp(gotval, expval, strlen(expval)) == 0); + assert(vallen == LEN(expval)); + assert(strncmp(gotval, expval, LEN(expval)) == 0); expattrs = expattrs->next; } @@ -404,8 +404,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) (token->data.tag.n_attributes > 0) ? "attributes:" : ""); - assert(token->data.tag.name.len == strlen(expname)); - assert(strncmp(tagname, expname, strlen(expname)) == 0); + assert(token->data.tag.name.len == LEN(expname)); + assert(strncmp(tagname, expname, LEN(expname)) == 0); } break; case HUBBUB_TOKEN_COMMENT: @@ -419,8 +419,8 @@ hubbub_error token_handler(const hubbub_token *token, void *pw) printf(" got: '%.*s'\n", (int) token->data.comment.len, gotstr); - assert(token->data.comment.len == strlen(expstr)); - assert(strncmp(gotstr, expstr, strlen(expstr)) == 0); + assert(token->data.comment.len == LEN(expstr)); + assert(strncmp(gotstr, expstr, LEN(expstr)) == 0); } break; case HUBBUB_TOKEN_CHARACTER: -- HTML5 parser library

8 years, 12 months

1
0
0 / 0

libhubbub: branch rupindersingh/libhubbub updated. release/0.3.0-2-g354151d

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libhubbub.git/shortlog/354151d0e9ea754c691... ...commit http://git.netsurf-browser.org/libhubbub.git/commit/354151d0e9ea754c69169... ...tree http://git.netsurf-browser.org/libhubbub.git/tree/354151d0e9ea754c69169b8... The branch, rupindersingh/libhubbub has been updated via 354151d0e9ea754c69169b8703e6da06a84a6caf (commit) from 42543b07806ca9b9bec73eda91afa657f57c64bc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libhubbub.git/commit/?id=354151d0e9ea754c6... commit 354151d0e9ea754c69169b8703e6da06a84a6caf Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Updating Named Entities API in tokeniser diff --git a/build/Entities b/build/Entities index f067008..2c64826 100644 --- a/build/Entities +++ b/build/Entities @@ -2,2141 +2,2235 @@ # Note, some entities are allowed to omit their trailing semicolon, which is # why most entities here have semicolons after them. -# Entity Code -Aacute; 0x000C1 -Aacute 0x000C1 -aacute; 0x000E1 -aacute 0x000E1 -Abreve; 0x00102 -abreve; 0x00103 -ac; 0x0223E -acd; 0x0223F -Acirc; 0x000C2 -Acirc 0x000C2 -acirc; 0x000E2 -acirc 0x000E2 -acute; 0x000B4 -acute 0x000B4 -Acy; 0x00410 -acy; 0x00430 -AElig; 0x000C6 -AElig 0x000C6 -aelig; 0x000E6 -aelig 0x000E6 -af; 0x02061 -Afr; 0x1D504 -afr; 0x1D51E -Agrave; 0x000C0 -Agrave 0x000C0 -agrave; 0x000E0 -agrave 0x000E0 -alefsym; 0x02135 -aleph; 0x02135 -Alpha; 0x00391 -alpha; 0x003B1 -Amacr; 0x00100 -amacr; 0x00101 -amalg; 0x02A3F -amp; 0x00026 -amp 0x00026 -AMP; 0x00026 -AMP 0x00026 -and; 0x02227 -And; 0x02A53 -andand; 0x02A55 -andd; 0x02A5C -andslope; 0x02A58 -andv; 0x02A5A -ang; 0x02220 -ange; 0x029A4 -angle; 0x02220 -angmsd; 0x02221 -angmsdaa; 0x029A8 -angmsdab; 0x029A9 -angmsdac; 0x029AA -angmsdad; 0x029AB -angmsdae; 0x029AC -angmsdaf; 0x029AD -angmsdag; 0x029AE -angmsdah; 0x029AF -angrt; 0x0221F -angrtvb; 0x022BE -angrtvbd; 0x0299D -angsph; 0x02222 -angst; 0x0212B -angzarr; 0x0237C -Aogon; 0x00104 -aogon; 0x00105 -Aopf; 0x1D538 -aopf; 0x1D552 -ap; 0x02248 -apacir; 0x02A6F -ape; 0x0224A -apE; 0x02A70 -apid; 0x0224B -apos; 0x00027 -ApplyFunction; 0x02061 -approx; 0x02248 -approxeq; 0x0224A -Aring; 0x000C5 -Aring 0x000C5 -aring; 0x000E5 -aring 0x000E5 -Ascr; 0x1D49C -ascr; 0x1D4B6 -Assign; 0x02254 -ast; 0x0002A -asymp; 0x02248 -asympeq; 0x0224D -Atilde; 0x000C3 -Atilde 0x000C3 -atilde; 0x000E3 -atilde 0x000E3 -Auml; 0x000C4 -Auml 0x000C4 -auml; 0x000E4 -auml 0x000E4 -awconint; 0x02233 -awint; 0x02A11 -backcong; 0x0224C -backepsilon; 0x003F6 -backprime; 0x02035 -backsim; 0x0223D -backsimeq; 0x022CD -Backslash; 0x02216 -Barv; 0x02AE7 -barvee; 0x022BD -barwed; 0x02305 -Barwed; 0x02306 -barwedge; 0x02305 -bbrk; 0x023B5 -bbrktbrk; 0x023B6 -bcong; 0x0224C -Bcy; 0x00411 -bcy; 0x00431 -bdquo; 0x0201E -becaus; 0x02235 -because; 0x02235 -Because; 0x02235 -bemptyv; 0x029B0 -bepsi; 0x003F6 -bernou; 0x0212C -Bernoullis; 0x0212C -Beta; 0x00392 -beta; 0x003B2 -beth; 0x02136 -between; 0x0226C -Bfr; 0x1D505 -bfr; 0x1D51F -bigcap; 0x022C2 -bigcirc; 0x025EF -bigcup; 0x022C3 -bigodot; 0x02A00 -bigoplus; 0x02A01 -bigotimes; 0x02A02 -bigsqcup; 0x02A06 -bigstar; 0x02605 -bigtriangledown; 0x025BD -bigtriangleup; 0x025B3 -biguplus; 0x02A04 -bigvee; 0x022C1 -bigwedge; 0x022C0 -bkarow; 0x0290D -blacklozenge; 0x029EB -blacksquare; 0x025AA -blacktriangle; 0x025B4 -blacktriangledown; 0x025BE -blacktriangleleft; 0x025C2 -blacktriangleright; 0x025B8 -blank; 0x02423 -blk12; 0x02592 -blk14; 0x02591 -blk34; 0x02593 -block; 0x02588 -bnot; 0x02310 -bNot; 0x02AED -Bopf; 0x1D539 -bopf; 0x1D553 -bot; 0x022A5 -bottom; 0x022A5 -bowtie; 0x022C8 -boxbox; 0x029C9 -boxdl; 0x02510 -boxdL; 0x02555 -boxDl; 0x02556 -boxDL; 0x02557 -boxdr; 0x0250C -boxdR; 0x02552 -boxDr; 0x02553 -boxDR; 0x02554 -boxh; 0x02500 -boxH; 0x02550 -boxhd; 0x0252C -boxHd; 0x02564 -boxhD; 0x02565 -boxHD; 0x02566 -boxhu; 0x02534 -boxHu; 0x02567 -boxhU; 0x02568 -boxHU; 0x02569 -boxminus; 0x0229F -boxplus; 0x0229E -boxtimes; 0x022A0 -boxul; 0x02518 -boxuL; 0x0255B -boxUl; 0x0255C -boxUL; 0x0255D -boxur; 0x02514 -boxuR; 0x02558 -boxUr; 0x02559 -boxUR; 0x0255A -boxv; 0x02502 -boxV; 0x02551 -boxvh; 0x0253C -boxvH; 0x0256A -boxVh; 0x0256B -boxVH; 0x0256C -boxvl; 0x02524 -boxvL; 0x02561 -boxVl; 0x02562 -boxVL; 0x02563 -boxvr; 0x0251C -boxvR; 0x0255E -boxVr; 0x0255F -boxVR; 0x02560 -bprime; 0x02035 -breve; 0x002D8 -Breve; 0x002D8 -brvbar; 0x000A6 -brvbar 0x000A6 -Bscr; 0x0212C -bscr; 0x1D4B7 -bsemi; 0x0204F -bsim; 0x0223D -bsime; 0x022CD -bsol; 0x0005C -bsolb; 0x029C5 -bull; 0x02022 -bullet; 0x02022 -bump; 0x0224E -bumpe; 0x0224F -bumpE; 0x02AAE -Bumpeq; 0x0224E -bumpeq; 0x0224F -Cacute; 0x00106 -cacute; 0x00107 -cap; 0x02229 -Cap; 0x022D2 -capand; 0x02A44 -capbrcup; 0x02A49 -capcap; 0x02A4B -capcup; 0x02A47 -capdot; 0x02A40 -CapitalDifferentialD; 0x02145 -caret; 0x02041 -caron; 0x002C7 -Cayleys; 0x0212D -ccaps; 0x02A4D -Ccaron; 0x0010C -ccaron; 0x0010D -Ccedil; 0x000C7 -Ccedil 0x000C7 -ccedil; 0x000E7 -ccedil 0x000E7 -Ccirc; 0x00108 -ccirc; 0x00109 -Cconint; 0x02230 -ccups; 0x02A4C -ccupssm; 0x02A50 -Cdot; 0x0010A -cdot; 0x0010B -cedil; 0x000B8 -cedil 0x000B8 -Cedilla; 0x000B8 -cemptyv; 0x029B2 -cent; 0x000A2 -cent 0x000A2 -centerdot; 0x000B7 -CenterDot; 0x000B7 -Cfr; 0x0212D -cfr; 0x1D520 -CHcy; 0x00427 -chcy; 0x00447 -check; 0x02713 -checkmark; 0x02713 -Chi; 0x003A7 -chi; 0x003C7 -cir; 0x025CB -circ; 0x002C6 -circeq; 0x02257 -circlearrowleft; 0x021BA -circlearrowright; 0x021BB -circledast; 0x0229B -circledcirc; 0x0229A -circleddash; 0x0229D -CircleDot; 0x02299 -circledR; 0x000AE -circledS; 0x024C8 -CircleMinus; 0x02296 -CirclePlus; 0x02295 -CircleTimes; 0x02297 -cire; 0x02257 -cirE; 0x029C3 -cirfnint; 0x02A10 -cirmid; 0x02AEF -cirscir; 0x029C2 -ClockwiseContourIntegral; 0x02232 -CloseCurlyDoubleQuote; 0x0201D -CloseCurlyQuote; 0x02019 -clubs; 0x02663 -clubsuit; 0x02663 -colon; 0x0003A -Colon; 0x02237 -colone; 0x02254 -Colone; 0x02A74 -coloneq; 0x02254 -comma; 0x0002C -commat; 0x00040 -comp; 0x02201 -compfn; 0x02218 -complement; 0x02201 -complexes; 0x02102 -cong; 0x02245 -congdot; 0x02A6D -Congruent; 0x02261 -conint; 0x0222E -Conint; 0x0222F -ContourIntegral; 0x0222E -Copf; 0x02102 -copf; 0x1D554 -coprod; 0x02210 -Coproduct; 0x02210 -copy; 0x000A9 -copy 0x000A9 -COPY; 0x000A9 -COPY 0x000A9 -copysr; 0x02117 -CounterClockwiseContourIntegral; 0x02233 -crarr; 0x021B5 -cross; 0x02717 -Cross; 0x02A2F -Cscr; 0x1D49E -cscr; 0x1D4B8 -csub; 0x02ACF -csube; 0x02AD1 -csup; 0x02AD0 -csupe; 0x02AD2 -ctdot; 0x022EF -cudarrl; 0x02938 -cudarrr; 0x02935 -cuepr; 0x022DE -cuesc; 0x022DF -cularr; 0x021B6 -cularrp; 0x0293D -cup; 0x0222A -Cup; 0x022D3 -cupbrcap; 0x02A48 -CupCap; 0x0224D -cupcap; 0x02A46 -cupcup; 0x02A4A -cupdot; 0x0228D -cupor; 0x02A45 -curarr; 0x021B7 -curarrm; 0x0293C -curlyeqprec; 0x022DE -curlyeqsucc; 0x022DF -curlyvee; 0x022CE -curlywedge; 0x022CF -curren; 0x000A4 -curren 0x000A4 -curvearrowleft; 0x021B6 -curvearrowright; 0x021B7 -cuvee; 0x022CE -cuwed; 0x022CF -cwconint; 0x02232 -cwint; 0x02231 -cylcty; 0x0232D -dagger; 0x02020 -Dagger; 0x02021 -daleth; 0x02138 -darr; 0x02193 -Darr; 0x021A1 -dArr; 0x021D3 -dash; 0x02010 -dashv; 0x022A3 -Dashv; 0x02AE4 -dbkarow; 0x0290F -dblac; 0x002DD -Dcaron; 0x0010E -dcaron; 0x0010F -Dcy; 0x00414 -dcy; 0x00434 -DD; 0x02145 -dd; 0x02146 -ddagger; 0x02021 -ddarr; 0x021CA -DDotrahd; 0x02911 -ddotseq; 0x02A77 -deg; 0x000B0 -deg 0x000B0 -Del; 0x02207 -Delta; 0x00394 -delta; 0x003B4 -demptyv; 0x029B1 -dfisht; 0x0297F -Dfr; 0x1D507 -dfr; 0x1D521 -dHar; 0x02965 -dharl; 0x021C3 -dharr; 0x021C2 -DiacriticalAcute; 0x000B4 -DiacriticalDot; 0x002D9 -DiacriticalDoubleAcute; 0x002DD -DiacriticalGrave; 0x00060 -DiacriticalTilde; 0x002DC -diam; 0x022C4 -diamond; 0x022C4 -Diamond; 0x022C4 -diamondsuit; 0x02666 -diams; 0x02666 -die; 0x000A8 -DifferentialD; 0x02146 -digamma; 0x003DD -disin; 0x022F2 -div; 0x000F7 -divide; 0x000F7 -divide 0x000F7 -divideontimes; 0x022C7 -divonx; 0x022C7 -DJcy; 0x00402 -djcy; 0x00452 -dlcorn; 0x0231E -dlcrop; 0x0230D -dollar; 0x00024 -Dopf; 0x1D53B -dopf; 0x1D555 -Dot; 0x000A8 -dot; 0x002D9 -DotDot; 0x020DC -doteq; 0x02250 -doteqdot; 0x02251 -DotEqual; 0x02250 -dotminus; 0x02238 -dotplus; 0x02214 -dotsquare; 0x022A1 -doublebarwedge; 0x02306 -DoubleContourIntegral; 0x0222F -DoubleDot; 0x000A8 -DoubleDownArrow; 0x021D3 -DoubleLeftArrow; 0x021D0 -DoubleLeftRightArrow; 0x021D4 -DoubleLeftTee; 0x02AE4 -DoubleLongLeftArrow; 0x027F8 -DoubleLongLeftRightArrow; 0x027FA -DoubleLongRightArrow; 0x027F9 -DoubleRightArrow; 0x021D2 -DoubleRightTee; 0x022A8 -DoubleUpArrow; 0x021D1 -DoubleUpDownArrow; 0x021D5 -DoubleVerticalBar; 0x02225 -downarrow; 0x02193 -DownArrow; 0x02193 -Downarrow; 0x021D3 -DownArrowBar; 0x02913 -DownArrowUpArrow; 0x021F5 -DownBreve; 0x00311 -downdownarrows; 0x021CA -downharpoonleft; 0x021C3 -downharpoonright; 0x021C2 -DownLeftRightVector; 0x02950 -DownLeftTeeVector; 0x0295E -DownLeftVector; 0x021BD -DownLeftVectorBar; 0x02956 -DownRightTeeVector; 0x0295F -DownRightVector; 0x021C1 -DownRightVectorBar; 0x02957 -DownTee; 0x022A4 -DownTeeArrow; 0x021A7 -drbkarow; 0x02910 -drcorn; 0x0231F -drcrop; 0x0230C -Dscr; 0x1D49F -dscr; 0x1D4B9 -DScy; 0x00405 -dscy; 0x00455 -dsol; 0x029F6 -Dstrok; 0x00110 -dstrok; 0x00111 -dtdot; 0x022F1 -dtri; 0x025BF -dtrif; 0x025BE -duarr; 0x021F5 -duhar; 0x0296F -dwangle; 0x029A6 -DZcy; 0x0040F -dzcy; 0x0045F -dzigrarr; 0x027FF -Eacute; 0x000C9 -Eacute 0x000C9 -eacute; 0x000E9 -eacute 0x000E9 -easter; 0x02A6E -Ecaron; 0x0011A -ecaron; 0x0011B -ecir; 0x02256 -Ecirc; 0x000CA -Ecirc 0x000CA -ecirc; 0x000EA -ecirc 0x000EA -ecolon; 0x02255 -Ecy; 0x0042D -ecy; 0x0044D -eDDot; 0x02A77 -Edot; 0x00116 -edot; 0x00117 -eDot; 0x02251 -ee; 0x02147 -efDot; 0x02252 -Efr; 0x1D508 -efr; 0x1D522 -eg; 0x02A9A -Egrave; 0x000C8 -Egrave 0x000C8 -egrave; 0x000E8 -egrave 0x000E8 -egs; 0x02A96 -egsdot; 0x02A98 -el; 0x02A99 -Element; 0x02208 -elinters; 0x023E7 -ell; 0x02113 -els; 0x02A95 -elsdot; 0x02A97 -Emacr; 0x00112 -emacr; 0x00113 -empty; 0x02205 -emptyset; 0x02205 -EmptySmallSquare; 0x025FB -emptyv; 0x02205 -EmptyVerySmallSquare; 0x025AB -emsp; 0x02003 -emsp13; 0x02004 -emsp14; 0x02005 -ENG; 0x0014A -eng; 0x0014B -ensp; 0x02002 -Eogon; 0x00118 -eogon; 0x00119 -Eopf; 0x1D53C -eopf; 0x1D556 -epar; 0x022D5 -eparsl; 0x029E3 -eplus; 0x02A71 -epsi; 0x003F5 -Epsilon; 0x00395 -epsilon; 0x003B5 -epsiv; 0x003B5 -eqcirc; 0x02256 -eqcolon; 0x02255 -eqsim; 0x02242 -eqslantgtr; 0x02A96 -eqslantless; 0x02A95 -Equal; 0x02A75 -equals; 0x0003D -EqualTilde; 0x02242 -equest; 0x0225F -Equilibrium; 0x021CC -equiv; 0x02261 -equivDD; 0x02A78 -eqvparsl; 0x029E5 -erarr; 0x02971 -erDot; 0x02253 -escr; 0x0212F -Escr; 0x02130 -esdot; 0x02250 -esim; 0x02242 -Esim; 0x02A73 -Eta; 0x00397 -eta; 0x003B7 -ETH; 0x000D0 -ETH 0x000D0 -eth; 0x000F0 -eth 0x000F0 -Euml; 0x000CB -Euml 0x000CB -euml; 0x000EB -euml 0x000EB -euro; 0x020AC -excl; 0x00021 -exist; 0x02203 -Exists; 0x02203 -expectation; 0x02130 -exponentiale; 0x02147 -ExponentialE; 0x02147 -fallingdotseq; 0x02252 -Fcy; 0x00424 -fcy; 0x00444 -female; 0x02640 -ffilig; 0x0FB03 -fflig; 0x0FB00 -ffllig; 0x0FB04 -Ffr; 0x1D509 -ffr; 0x1D523 -filig; 0x0FB01 -FilledSmallSquare; 0x025FC -FilledVerySmallSquare; 0x025AA -flat; 0x0266D -fllig; 0x0FB02 -fltns; 0x025B1 -fnof; 0x00192 -Fopf; 0x1D53D -fopf; 0x1D557 -forall; 0x02200 -ForAll; 0x02200 -fork; 0x022D4 -forkv; 0x02AD9 -Fouriertrf; 0x02131 -fpartint; 0x02A0D -frac12; 0x000BD -frac12 0x000BD -frac13; 0x02153 -frac14; 0x000BC -frac14 0x000BC -frac15; 0x02155 -frac16; 0x02159 -frac18; 0x0215B -frac23; 0x02154 -frac25; 0x02156 -frac34; 0x000BE -frac34 0x000BE -frac35; 0x02157 -frac38; 0x0215C -frac45; 0x02158 -frac56; 0x0215A -frac58; 0x0215D -frac78; 0x0215E -frasl; 0x02044 -frown; 0x02322 -Fscr; 0x02131 -fscr; 0x1D4BB -gacute; 0x001F5 -Gamma; 0x00393 -gamma; 0x003B3 -Gammad; 0x003DC -gammad; 0x003DD -gap; 0x02A86 -Gbreve; 0x0011E -gbreve; 0x0011F -Gcedil; 0x00122 -Gcirc; 0x0011C -gcirc; 0x0011D -Gcy; 0x00413 -gcy; 0x00433 -Gdot; 0x00120 -gdot; 0x00121 -ge; 0x02265 -gE; 0x02267 -gel; 0x022DB -gEl; 0x02A8C -geq; 0x02265 -geqq; 0x02267 -geqslant; 0x02A7E -ges; 0x02A7E -gescc; 0x02AA9 -gesdot; 0x02A80 -gesdoto; 0x02A82 -gesdotol; 0x02A84 -gesles; 0x02A94 -Gfr; 0x1D50A -gfr; 0x1D524 -gg; 0x0226B -Gg; 0x022D9 -ggg; 0x022D9 -gimel; 0x02137 -GJcy; 0x00403 -gjcy; 0x00453 -gl; 0x02277 -gla; 0x02AA5 -glE; 0x02A92 -glj; 0x02AA4 -gnap; 0x02A8A -gnapprox; 0x02A8A -gnE; 0x02269 -gne; 0x02A88 -gneq; 0x02A88 -gneqq; 0x02269 -gnsim; 0x022E7 -Gopf; 0x1D53E -gopf; 0x1D558 -grave; 0x00060 -GreaterEqual; 0x02265 -GreaterEqualLess; 0x022DB -GreaterFullEqual; 0x02267 -GreaterGreater; 0x02AA2 -GreaterLess; 0x02277 -GreaterSlantEqual; 0x02A7E -GreaterTilde; 0x02273 -gscr; 0x0210A -Gscr; 0x1D4A2 -gsim; 0x02273 -gsime; 0x02A8E -gsiml; 0x02A90 -gt; 0x0003E -gt 0x0003E -GT; 0x0003E -GT 0x0003E -Gt; 0x0226B -gtcc; 0x02AA7 -gtcir; 0x02A7A -gtdot; 0x022D7 -gtlPar; 0x02995 -gtquest; 0x02A7C -gtrapprox; 0x02A86 -gtrarr; 0x02978 -gtrdot; 0x022D7 -gtreqless; 0x022DB -gtreqqless; 0x02A8C -gtrless; 0x02277 -gtrsim; 0x02273 -Hacek; 0x002C7 -hairsp; 0x0200A -half; 0x000BD -hamilt; 0x0210B -HARDcy; 0x0042A -hardcy; 0x0044A -harr; 0x02194 -hArr; 0x021D4 -harrcir; 0x02948 -harrw; 0x021AD -Hat; 0x0005E -hbar; 0x0210F -Hcirc; 0x00124 -hcirc; 0x00125 -hearts; 0x02665 -heartsuit; 0x02665 -hellip; 0x02026 -hercon; 0x022B9 -Hfr; 0x0210C -hfr; 0x1D525 -HilbertSpace; 0x0210B -hksearow; 0x02925 -hkswarow; 0x02926 -hoarr; 0x021FF -homtht; 0x0223B -hookleftarrow; 0x021A9 -hookrightarrow; 0x021AA -Hopf; 0x0210D -hopf; 0x1D559 -horbar; 0x02015 -HorizontalLine; 0x02500 -Hscr; 0x0210B -hscr; 0x1D4BD -hslash; 0x0210F -Hstrok; 0x00126 -hstrok; 0x00127 -HumpDownHump; 0x0224E -HumpEqual; 0x0224F -hybull; 0x02043 -hyphen; 0x02010 -Iacute; 0x000CD -Iacute 0x000CD -iacute; 0x000ED -iacute 0x000ED -ic; 0x02063 -Icirc; 0x000CE -Icirc 0x000CE -icirc; 0x000EE -icirc 0x000EE -Icy; 0x00418 -icy; 0x00438 -Idot; 0x00130 -IEcy; 0x00415 -iecy; 0x00435 -iexcl; 0x000A1 -iexcl 0x000A1 -iff; 0x021D4 -Ifr; 0x02111 -ifr; 0x1D526 -Igrave; 0x000CC -Igrave 0x000CC -igrave; 0x000EC -igrave 0x000EC -ii; 0x02148 -iiiint; 0x02A0C -iiint; 0x0222D -iinfin; 0x029DC -iiota; 0x02129 -IJlig; 0x00132 -ijlig; 0x00133 -Im; 0x02111 -Imacr; 0x0012A -imacr; 0x0012B -image; 0x02111 -ImaginaryI; 0x02148 -imagline; 0x02110 -imagpart; 0x02111 -imath; 0x00131 -imof; 0x022B7 -imped; 0x001B5 -Implies; 0x021D2 -in; 0x02208 -incare; 0x02105 -infin; 0x0221E -infintie; 0x029DD -inodot; 0x00131 -int; 0x0222B -Int; 0x0222C -intcal; 0x022BA -integers; 0x02124 -Integral; 0x0222B -intercal; 0x022BA -Intersection; 0x022C2 -intlarhk; 0x02A17 -intprod; 0x02A3C -InvisibleComma; 0x02063 -InvisibleTimes; 0x02062 -IOcy; 0x00401 -iocy; 0x00451 -Iogon; 0x0012E -iogon; 0x0012F -Iopf; 0x1D540 -iopf; 0x1D55A -Iota; 0x00399 -iota; 0x003B9 -iprod; 0x02A3C -iquest; 0x000BF -iquest 0x000BF -Iscr; 0x02110 -iscr; 0x1D4BE -isin; 0x02208 -isindot; 0x022F5 -isinE; 0x022F9 -isins; 0x022F4 -isinsv; 0x022F3 -isinv; 0x02208 -it; 0x02062 -Itilde; 0x00128 -itilde; 0x00129 -Iukcy; 0x00406 -iukcy; 0x00456 -Iuml; 0x000CF -Iuml 0x000CF -iuml; 0x000EF -iuml 0x000EF -Jcirc; 0x00134 -jcirc; 0x00135 -Jcy; 0x00419 -jcy; 0x00439 -Jfr; 0x1D50D -jfr; 0x1D527 -jmath; 0x00237 -Jopf; 0x1D541 -jopf; 0x1D55B -Jscr; 0x1D4A5 -jscr; 0x1D4BF -Jsercy; 0x00408 -jsercy; 0x00458 -Jukcy; 0x00404 -jukcy; 0x00454 -Kappa; 0x0039A -kappa; 0x003BA -kappav; 0x003F0 -Kcedil; 0x00136 -kcedil; 0x00137 -Kcy; 0x0041A -kcy; 0x0043A -Kfr; 0x1D50E -kfr; 0x1D528 -kgreen; 0x00138 -KHcy; 0x00425 -khcy; 0x00445 -KJcy; 0x0040C -kjcy; 0x0045C -Kopf; 0x1D542 -kopf; 0x1D55C -Kscr; 0x1D4A6 -kscr; 0x1D4C0 -lAarr; 0x021DA -Lacute; 0x00139 -lacute; 0x0013A -laemptyv; 0x029B4 -lagran; 0x02112 -Lambda; 0x0039B -lambda; 0x003BB -lang; 0x027E8 -Lang; 0x027EA -langd; 0x02991 -langle; 0x027E8 -lap; 0x02A85 -Laplacetrf; 0x02112 -laquo; 0x000AB -laquo 0x000AB -larr; 0x02190 -Larr; 0x0219E -lArr; 0x021D0 -larrb; 0x021E4 -larrbfs; 0x0291F -larrfs; 0x0291D -larrhk; 0x021A9 -larrlp; 0x021AB -larrpl; 0x02939 -larrsim; 0x02973 -larrtl; 0x021A2 -lat; 0x02AAB -latail; 0x02919 -lAtail; 0x0291B -late; 0x02AAD -lbarr; 0x0290C -lBarr; 0x0290E -lbbrk; 0x02772 -lbrace; 0x0007B -lbrack; 0x0005B -lbrke; 0x0298B -lbrksld; 0x0298F -lbrkslu; 0x0298D -Lcaron; 0x0013D -lcaron; 0x0013E -Lcedil; 0x0013B -lcedil; 0x0013C -lceil; 0x02308 -lcub; 0x0007B -Lcy; 0x0041B -lcy; 0x0043B -ldca; 0x02936 -ldquo; 0x0201C -ldquor; 0x0201E -ldrdhar; 0x02967 -ldrushar; 0x0294B -ldsh; 0x021B2 -le; 0x02264 -lE; 0x02266 -LeftAngleBracket; 0x027E8 -leftarrow; 0x02190 -LeftArrow; 0x02190 -Leftarrow; 0x021D0 -LeftArrowBar; 0x021E4 -LeftArrowRightArrow; 0x021C6 -leftarrowtail; 0x021A2 -LeftCeiling; 0x02308 -LeftDoubleBracket; 0x027E6 -LeftDownTeeVector; 0x02961 -LeftDownVector; 0x021C3 -LeftDownVectorBar; 0x02959 -LeftFloor; 0x0230A -leftharpoondown; 0x021BD -leftharpoonup; 0x021BC -leftleftarrows; 0x021C7 -leftrightarrow; 0x02194 -LeftRightArrow; 0x02194 -Leftrightarrow; 0x021D4 -leftrightarrows; 0x021C6 -leftrightharpoons; 0x021CB -leftrightsquigarrow; 0x021AD -LeftRightVector; 0x0294E -LeftTee; 0x022A3 -LeftTeeArrow; 0x021A4 -LeftTeeVector; 0x0295A -leftthreetimes; 0x022CB -LeftTriangle; 0x022B2 -LeftTriangleBar; 0x029CF -LeftTriangleEqual; 0x022B4 -LeftUpDownVector; 0x02951 -LeftUpTeeVector; 0x02960 -LeftUpVector; 0x021BF -LeftUpVectorBar; 0x02958 -LeftVector; 0x021BC -LeftVectorBar; 0x02952 -leg; 0x022DA -lEg; 0x02A8B -leq; 0x02264 -leqq; 0x02266 -leqslant; 0x02A7D -les; 0x02A7D -lescc; 0x02AA8 -lesdot; 0x02A7F -lesdoto; 0x02A81 -lesdotor; 0x02A83 -lesges; 0x02A93 -lessapprox; 0x02A85 -lessdot; 0x022D6 -lesseqgtr; 0x022DA -lesseqqgtr; 0x02A8B -LessEqualGreater; 0x022DA -LessFullEqual; 0x02266 -LessGreater; 0x02276 -lessgtr; 0x02276 -LessLess; 0x02AA1 -lesssim; 0x02272 -LessSlantEqual; 0x02A7D -LessTilde; 0x02272 -lfisht; 0x0297C -lfloor; 0x0230A -Lfr; 0x1D50F -lfr; 0x1D529 -lg; 0x02276 -lgE; 0x02A91 -lHar; 0x02962 -lhard; 0x021BD -lharu; 0x021BC -lharul; 0x0296A -lhblk; 0x02584 -LJcy; 0x00409 -ljcy; 0x00459 -ll; 0x0226A -Ll; 0x022D8 -llarr; 0x021C7 -llcorner; 0x0231E -Lleftarrow; 0x021DA -llhard; 0x0296B -lltri; 0x025FA -Lmidot; 0x0013F -lmidot; 0x00140 -lmoust; 0x023B0 -lmoustache; 0x023B0 -lnap; 0x02A89 -lnapprox; 0x02A89 -lnE; 0x02268 -lne; 0x02A87 -lneq; 0x02A87 -lneqq; 0x02268 -lnsim; 0x022E6 -loang; 0x027EC -loarr; 0x021FD -lobrk; 0x027E6 -longleftarrow; 0x027F5 -LongLeftArrow; 0x027F5 -Longleftarrow; 0x027F8 -longleftrightarrow; 0x027F7 -LongLeftRightArrow; 0x027F7 -Longleftrightarrow; 0x027FA -longmapsto; 0x027FC -longrightarrow; 0x027F6 -LongRightArrow; 0x027F6 -Longrightarrow; 0x027F9 -looparrowleft; 0x021AB -looparrowright; 0x021AC -lopar; 0x02985 -Lopf; 0x1D543 -lopf; 0x1D55D -loplus; 0x02A2D -lotimes; 0x02A34 -lowast; 0x02217 -lowbar; 0x0005F -LowerLeftArrow; 0x02199 -LowerRightArrow; 0x02198 -loz; 0x025CA -lozenge; 0x025CA -lozf; 0x029EB -lpar; 0x00028 -lparlt; 0x02993 -lrarr; 0x021C6 -lrcorner; 0x0231F -lrhar; 0x021CB -lrhard; 0x0296D -lrm; 0x0200E -lrtri; 0x022BF -lsaquo; 0x02039 -Lscr; 0x02112 -lscr; 0x1D4C1 -lsh; 0x021B0 -Lsh; 0x021B0 -lsim; 0x02272 -lsime; 0x02A8D -lsimg; 0x02A8F -lsqb; 0x0005B -lsquo; 0x02018 -lsquor; 0x0201A -Lstrok; 0x00141 -lstrok; 0x00142 -lt; 0x0003C -lt 0x0003C -LT; 0x0003C -LT 0x0003C -Lt; 0x0226A -ltcc; 0x02AA6 -ltcir; 0x02A79 -ltdot; 0x022D6 -lthree; 0x022CB -ltimes; 0x022C9 -ltlarr; 0x02976 -ltquest; 0x02A7B -ltri; 0x025C3 -ltrie; 0x022B4 -ltrif; 0x025C2 -ltrPar; 0x02996 -lurdshar; 0x0294A -luruhar; 0x02966 -macr; 0x000AF -macr 0x000AF -male; 0x02642 -malt; 0x02720 -maltese; 0x02720 -map; 0x021A6 -Map; 0x02905 -mapsto; 0x021A6 -mapstodown; 0x021A7 -mapstoleft; 0x021A4 -mapstoup; 0x021A5 -marker; 0x025AE -mcomma; 0x02A29 -Mcy; 0x0041C -mcy; 0x0043C -mdash; 0x02014 -mDDot; 0x0223A -measuredangle; 0x02221 -MediumSpace; 0x0205F -Mellintrf; 0x02133 -Mfr; 0x1D510 -mfr; 0x1D52A -mho; 0x02127 -micro; 0x000B5 -micro 0x000B5 -mid; 0x02223 -midast; 0x0002A -midcir; 0x02AF0 -middot; 0x000B7 -middot 0x000B7 -minus; 0x02212 -minusb; 0x0229F -minusd; 0x02238 -minusdu; 0x02A2A -MinusPlus; 0x02213 -mlcp; 0x02ADB -mldr; 0x02026 -mnplus; 0x02213 -models; 0x022A7 -Mopf; 0x1D544 -mopf; 0x1D55E -mp; 0x02213 -Mscr; 0x02133 -mscr; 0x1D4C2 -mstpos; 0x0223E -Mu; 0x0039C -mu; 0x003BC -multimap; 0x022B8 -mumap; 0x022B8 -nabla; 0x02207 -Nacute; 0x00143 -nacute; 0x00144 -nap; 0x02249 -napos; 0x00149 -napprox; 0x02249 -natur; 0x0266E -natural; 0x0266E -naturals; 0x02115 -nbsp; 0x000A0 -nbsp 0x000A0 -ncap; 0x02A43 -Ncaron; 0x00147 -ncaron; 0x00148 -Ncedil; 0x00145 -ncedil; 0x00146 -ncong; 0x02247 -ncup; 0x02A42 -Ncy; 0x0041D -ncy; 0x0043D -ndash; 0x02013 -ne; 0x02260 -nearhk; 0x02924 -nearr; 0x02197 -neArr; 0x021D7 -nearrow; 0x02197 -NegativeMediumSpace; 0x0200B -NegativeThickSpace; 0x0200B -NegativeThinSpace; 0x0200B -NegativeVeryThinSpace; 0x0200B -nequiv; 0x02262 -nesear; 0x02928 -NestedGreaterGreater; 0x0226B -NestedLessLess; 0x0226A -NewLine; 0x0000A -nexist; 0x02204 -nexists; 0x02204 -Nfr; 0x1D511 -nfr; 0x1D52B -nge; 0x02271 -ngeq; 0x02271 -ngsim; 0x02275 -ngt; 0x0226F -ngtr; 0x0226F -nharr; 0x021AE -nhArr; 0x021CE -nhpar; 0x02AF2 -ni; 0x0220B -nis; 0x022FC -nisd; 0x022FA -niv; 0x0220B -NJcy; 0x0040A -njcy; 0x0045A -nlarr; 0x0219A -nlArr; 0x021CD -nldr; 0x02025 -nle; 0x02270 -nleftarrow; 0x0219A -nLeftarrow; 0x021CD -nleftrightarrow; 0x021AE -nLeftrightarrow; 0x021CE -nleq; 0x02270 -nless; 0x0226E -nlsim; 0x02274 -nlt; 0x0226E -nltri; 0x022EA -nltrie; 0x022EC -nmid; 0x02224 -NoBreak; 0x02060 -NonBreakingSpace; 0x000A0 -Nopf; 0x02115 -nopf; 0x1D55F -not; 0x000AC -not 0x000AC -Not; 0x02AEC -NotCongruent; 0x02262 -NotCupCap; 0x0226D -NotDoubleVerticalBar; 0x02226 -NotElement; 0x02209 -NotEqual; 0x02260 -NotExists; 0x02204 -NotGreater; 0x0226F -NotGreaterEqual; 0x02271 -NotGreaterLess; 0x02279 -NotGreaterTilde; 0x02275 -notin; 0x02209 -notinva; 0x02209 -notinvb; 0x022F7 -notinvc; 0x022F6 -NotLeftTriangle; 0x022EA -NotLeftTriangleEqual; 0x022EC -NotLess; 0x0226E -NotLessEqual; 0x02270 -NotLessGreater; 0x02278 -NotLessTilde; 0x02274 -notni; 0x0220C -notniva; 0x0220C -notnivb; 0x022FE -notnivc; 0x022FD -NotPrecedes; 0x02280 -NotPrecedesSlantEqual; 0x022E0 -NotReverseElement; 0x0220C -NotRightTriangle; 0x022EB -NotRightTriangleEqual; 0x022ED -NotSquareSubsetEqual; 0x022E2 -NotSquareSupersetEqual; 0x022E3 -NotSubsetEqual; 0x02288 -NotSucceeds; 0x02281 -NotSucceedsSlantEqual; 0x022E1 -NotSupersetEqual; 0x02289 -NotTilde; 0x02241 -NotTildeEqual; 0x02244 -NotTildeFullEqual; 0x02247 -NotTildeTilde; 0x02249 -NotVerticalBar; 0x02224 -npar; 0x02226 -nparallel; 0x02226 -npolint; 0x02A14 -npr; 0x02280 -nprcue; 0x022E0 -nprec; 0x02280 -nrarr; 0x0219B -nrArr; 0x021CF -nrightarrow; 0x0219B -nRightarrow; 0x021CF -nrtri; 0x022EB -nrtrie; 0x022ED -nsc; 0x02281 -nsccue; 0x022E1 -Nscr; 0x1D4A9 -nscr; 0x1D4C3 -nshortmid; 0x02224 -nshortparallel; 0x02226 -nsim; 0x02241 -nsime; 0x02244 -nsimeq; 0x02244 -nsmid; 0x02224 -nspar; 0x02226 -nsqsube; 0x022E2 -nsqsupe; 0x022E3 -nsub; 0x02284 -nsube; 0x02288 -nsubseteq; 0x02288 -nsucc; 0x02281 -nsup; 0x02285 -nsupe; 0x02289 -nsupseteq; 0x02289 -ntgl; 0x02279 -Ntilde; 0x000D1 -Ntilde 0x000D1 -ntilde; 0x000F1 -ntilde 0x000F1 -ntlg; 0x02278 -ntriangleleft; 0x022EA -ntrianglelefteq; 0x022EC -ntriangleright; 0x022EB -ntrianglerighteq; 0x022ED -Nu; 0x0039D -nu; 0x003BD -num; 0x00023 -numero; 0x02116 -numsp; 0x02007 -nvdash; 0x022AC -nvDash; 0x022AD -nVdash; 0x022AE -nVDash; 0x022AF -nvHarr; 0x02904 -nvinfin; 0x029DE -nvlArr; 0x02902 -nvrArr; 0x02903 -nwarhk; 0x02923 -nwarr; 0x02196 -nwArr; 0x021D6 -nwarrow; 0x02196 -nwnear; 0x02927 -Oacute; 0x000D3 -Oacute 0x000D3 -oacute; 0x000F3 -oacute 0x000F3 -oast; 0x0229B -ocir; 0x0229A -Ocirc; 0x000D4 -Ocirc 0x000D4 -ocirc; 0x000F4 -ocirc 0x000F4 -Ocy; 0x0041E -ocy; 0x0043E -odash; 0x0229D -Odblac; 0x00150 -odblac; 0x00151 -odiv; 0x02A38 -odot; 0x02299 -odsold; 0x029BC -OElig; 0x00152 -oelig; 0x00153 -ofcir; 0x029BF -Ofr; 0x1D512 -ofr; 0x1D52C -ogon; 0x002DB -Ograve; 0x000D2 -Ograve 0x000D2 -ograve; 0x000F2 -ograve 0x000F2 -ogt; 0x029C1 -ohbar; 0x029B5 -ohm; 0x02126 -oint; 0x0222E -olarr; 0x021BA -olcir; 0x029BE -olcross; 0x029BB -oline; 0x0203E -olt; 0x029C0 -Omacr; 0x0014C -omacr; 0x0014D -Omega; 0x003A9 -omega; 0x003C9 -Omicron; 0x0039F -omicron; 0x003BF -omid; 0x029B6 -ominus; 0x02296 -Oopf; 0x1D546 -oopf; 0x1D560 -opar; 0x029B7 -OpenCurlyDoubleQuote; 0x0201C -OpenCurlyQuote; 0x02018 -operp; 0x029B9 -oplus; 0x02295 -or; 0x02228 -Or; 0x02A54 -orarr; 0x021BB -ord; 0x02A5D -order; 0x02134 -orderof; 0x02134 -ordf; 0x000AA -ordf 0x000AA -ordm; 0x000BA -ordm 0x000BA -origof; 0x022B6 -oror; 0x02A56 -orslope; 0x02A57 -orv; 0x02A5B -oS; 0x024C8 -oscr; 0x02134 -Oscr; 0x1D4AA -Oslash; 0x000D8 -Oslash 0x000D8 -oslash; 0x000F8 -oslash 0x000F8 -osol; 0x02298 -Otilde; 0x000D5 -Otilde 0x000D5 -otilde; 0x000F5 -otilde 0x000F5 -otimes; 0x02297 -Otimes; 0x02A37 -otimesas; 0x02A36 -Ouml; 0x000D6 -Ouml 0x000D6 -ouml; 0x000F6 -ouml 0x000F6 -ovbar; 0x0233D -OverBar; 0x000AF -OverBrace; 0x023DE -OverBracket; 0x023B4 -OverParenthesis; 0x023DC -par; 0x02225 -para; 0x000B6 -para 0x000B6 -parallel; 0x02225 -parsim; 0x02AF3 -parsl; 0x02AFD -part; 0x02202 -PartialD; 0x02202 -Pcy; 0x0041F -pcy; 0x0043F -percnt; 0x00025 -period; 0x0002E -permil; 0x02030 -perp; 0x022A5 -pertenk; 0x02031 -Pfr; 0x1D513 -pfr; 0x1D52D -Phi; 0x003A6 -phi; 0x003C6 -phiv; 0x003C6 -phmmat; 0x02133 -phone; 0x0260E -Pi; 0x003A0 -pi; 0x003C0 -pitchfork; 0x022D4 -piv; 0x003D6 -planck; 0x0210F -planckh; 0x0210E -plankv; 0x0210F -plus; 0x0002B -plusacir; 0x02A23 -plusb; 0x0229E -pluscir; 0x02A22 -plusdo; 0x02214 -plusdu; 0x02A25 -pluse; 0x02A72 -PlusMinus; 0x000B1 -plusmn; 0x000B1 -plusmn 0x000B1 -plussim; 0x02A26 -plustwo; 0x02A27 -pm; 0x000B1 -Poincareplane; 0x0210C -pointint; 0x02A15 -Popf; 0x02119 -popf; 0x1D561 -pound; 0x000A3 -pound 0x000A3 -pr; 0x0227A -Pr; 0x02ABB -prap; 0x02AB7 -prcue; 0x0227C -pre; 0x02AAF -prE; 0x02AB3 -prec; 0x0227A -precapprox; 0x02AB7 -preccurlyeq; 0x0227C -Precedes; 0x0227A -PrecedesEqual; 0x02AAF -PrecedesSlantEqual; 0x0227C -PrecedesTilde; 0x0227E -preceq; 0x02AAF -precnapprox; 0x02AB9 -precneqq; 0x02AB5 -precnsim; 0x022E8 -precsim; 0x0227E -prime; 0x02032 -Prime; 0x02033 -primes; 0x02119 -prnap; 0x02AB9 -prnE; 0x02AB5 -prnsim; 0x022E8 -prod; 0x0220F -Product; 0x0220F -profalar; 0x0232E -profline; 0x02312 -profsurf; 0x02313 -prop; 0x0221D -Proportion; 0x02237 -Proportional; 0x0221D -propto; 0x0221D -prsim; 0x0227E -prurel; 0x022B0 -Pscr; 0x1D4AB -pscr; 0x1D4C5 -Psi; 0x003A8 -psi; 0x003C8 -puncsp; 0x02008 -Qfr; 0x1D514 -qfr; 0x1D52E -qint; 0x02A0C -Qopf; 0x0211A -qopf; 0x1D562 -qprime; 0x02057 -Qscr; 0x1D4AC -qscr; 0x1D4C6 -quaternions; 0x0210D -quatint; 0x02A16 -quest; 0x0003F -questeq; 0x0225F -quot; 0x00022 -quot 0x00022 -QUOT; 0x00022 -QUOT 0x00022 -rAarr; 0x021DB -race; 0x029DA -Racute; 0x00154 -racute; 0x00155 -radic; 0x0221A -raemptyv; 0x029B3 -rang; 0x027E9 -Rang; 0x027EB -rangd; 0x02992 -range; 0x029A5 -rangle; 0x027E9 -raquo; 0x000BB -raquo 0x000BB -rarr; 0x02192 -Rarr; 0x021A0 -rArr; 0x021D2 -rarrap; 0x02975 -rarrb; 0x021E5 -rarrbfs; 0x02920 -rarrc; 0x02933 -rarrfs; 0x0291E -rarrhk; 0x021AA -rarrlp; 0x021AC -rarrpl; 0x02945 -rarrsim; 0x02974 -rarrtl; 0x021A3 -Rarrtl; 0x02916 -rarrw; 0x0219D -ratail; 0x0291A -rAtail; 0x0291C -ratio; 0x02236 -rationals; 0x0211A -rbarr; 0x0290D -rBarr; 0x0290F -RBarr; 0x02910 -rbbrk; 0x02773 -rbrace; 0x0007D -rbrack; 0x0005D -rbrke; 0x0298C -rbrksld; 0x0298E -rbrkslu; 0x02990 -Rcaron; 0x00158 -rcaron; 0x00159 -Rcedil; 0x00156 -rcedil; 0x00157 -rceil; 0x02309 -rcub; 0x0007D -Rcy; 0x00420 -rcy; 0x00440 -rdca; 0x02937 -rdldhar; 0x02969 -rdquo; 0x0201D -rdquor; 0x0201D -rdsh; 0x021B3 -Re; 0x0211C -real; 0x0211C -realine; 0x0211B -realpart; 0x0211C -reals; 0x0211D -rect; 0x025AD -reg; 0x000AE -reg 0x000AE -REG; 0x000AE -REG 0x000AE -ReverseElement; 0x0220B -ReverseEquilibrium; 0x021CB -ReverseUpEquilibrium; 0x0296F -rfisht; 0x0297D -rfloor; 0x0230B -Rfr; 0x0211C -rfr; 0x1D52F -rHar; 0x02964 -rhard; 0x021C1 -rharu; 0x021C0 -rharul; 0x0296C -Rho; 0x003A1 -rho; 0x003C1 -rhov; 0x003F1 -RightAngleBracket; 0x027E9 -rightarrow; 0x02192 -RightArrow; 0x02192 -Rightarrow; 0x021D2 -RightArrowBar; 0x021E5 -RightArrowLeftArrow; 0x021C4 -rightarrowtail; 0x021A3 -RightCeiling; 0x02309 -RightDoubleBracket; 0x027E7 -RightDownTeeVector; 0x0295D -RightDownVector; 0x021C2 -RightDownVectorBar; 0x02955 -RightFloor; 0x0230B -rightharpoondown; 0x021C1 -rightharpoonup; 0x021C0 -rightleftarrows; 0x021C4 -rightleftharpoons; 0x021CC -rightrightarrows; 0x021C9 -rightsquigarrow; 0x0219D -RightTee; 0x022A2 -RightTeeArrow; 0x021A6 -RightTeeVector; 0x0295B -rightthreetimes; 0x022CC -RightTriangle; 0x022B3 -RightTriangleBar; 0x029D0 -RightTriangleEqual; 0x022B5 -RightUpDownVector; 0x0294F -RightUpTeeVector; 0x0295C -RightUpVector; 0x021BE -RightUpVectorBar; 0x02954 -RightVector; 0x021C0 -RightVectorBar; 0x02953 -ring; 0x002DA -risingdotseq; 0x02253 -rlarr; 0x021C4 -rlhar; 0x021CC -rlm; 0x0200F -rmoust; 0x023B1 -rmoustache; 0x023B1 -rnmid; 0x02AEE -roang; 0x027ED -roarr; 0x021FE -robrk; 0x027E7 -ropar; 0x02986 -Ropf; 0x0211D -ropf; 0x1D563 -roplus; 0x02A2E -rotimes; 0x02A35 -RoundImplies; 0x02970 -rpar; 0x00029 -rpargt; 0x02994 -rppolint; 0x02A12 -rrarr; 0x021C9 -Rrightarrow; 0x021DB -rsaquo; 0x0203A -Rscr; 0x0211B -rscr; 0x1D4C7 -rsh; 0x021B1 -Rsh; 0x021B1 -rsqb; 0x0005D -rsquo; 0x02019 -rsquor; 0x02019 -rthree; 0x022CC -rtimes; 0x022CA -rtri; 0x025B9 -rtrie; 0x022B5 -rtrif; 0x025B8 -rtriltri; 0x029CE -RuleDelayed; 0x029F4 -ruluhar; 0x02968 -rx; 0x0211E -Sacute; 0x0015A -sacute; 0x0015B -sbquo; 0x0201A -sc; 0x0227B -Sc; 0x02ABC -scap; 0x02AB8 -Scaron; 0x00160 -scaron; 0x00161 -sccue; 0x0227D -sce; 0x02AB0 -scE; 0x02AB4 -Scedil; 0x0015E -scedil; 0x0015F -Scirc; 0x0015C -scirc; 0x0015D -scnap; 0x02ABA -scnE; 0x02AB6 -scnsim; 0x022E9 -scpolint; 0x02A13 -scsim; 0x0227F -Scy; 0x00421 -scy; 0x00441 -sdot; 0x022C5 -sdotb; 0x022A1 -sdote; 0x02A66 -searhk; 0x02925 -searr; 0x02198 -seArr; 0x021D8 -searrow; 0x02198 -sect; 0x000A7 -sect 0x000A7 -semi; 0x0003B -seswar; 0x02929 -setminus; 0x02216 -setmn; 0x02216 -sext; 0x02736 -Sfr; 0x1D516 -sfr; 0x1D530 -sfrown; 0x02322 -sharp; 0x0266F -SHCHcy; 0x00429 -shchcy; 0x00449 -SHcy; 0x00428 -shcy; 0x00448 -ShortDownArrow; 0x02193 -ShortLeftArrow; 0x02190 -shortmid; 0x02223 -shortparallel; 0x02225 -ShortRightArrow; 0x02192 -ShortUpArrow; 0x02191 -shy; 0x000AD -shy 0x000AD -Sigma; 0x003A3 -sigma; 0x003C3 -sigmaf; 0x003C2 -sigmav; 0x003C2 -sim; 0x0223C -simdot; 0x02A6A -sime; 0x02243 -simeq; 0x02243 -simg; 0x02A9E -simgE; 0x02AA0 -siml; 0x02A9D -simlE; 0x02A9F -simne; 0x02246 -simplus; 0x02A24 -simrarr; 0x02972 -slarr; 0x02190 -SmallCircle; 0x02218 -smallsetminus; 0x02216 -smashp; 0x02A33 -smeparsl; 0x029E4 -smid; 0x02223 -smile; 0x02323 -smt; 0x02AAA -smte; 0x02AAC -SOFTcy; 0x0042C -softcy; 0x0044C -sol; 0x0002F -solb; 0x029C4 -solbar; 0x0233F -Sopf; 0x1D54A -sopf; 0x1D564 -spades; 0x02660 -spadesuit; 0x02660 -spar; 0x02225 -sqcap; 0x02293 -sqcup; 0x02294 -Sqrt; 0x0221A -sqsub; 0x0228F -sqsube; 0x02291 -sqsubset; 0x0228F -sqsubseteq; 0x02291 -sqsup; 0x02290 -sqsupe; 0x02292 -sqsupset; 0x02290 -sqsupseteq; 0x02292 -squ; 0x025A1 -square; 0x025A1 -Square; 0x025A1 -SquareIntersection; 0x02293 -SquareSubset; 0x0228F -SquareSubsetEqual; 0x02291 -SquareSuperset; 0x02290 -SquareSupersetEqual; 0x02292 -SquareUnion; 0x02294 -squarf; 0x025AA -squf; 0x025AA -srarr; 0x02192 -Sscr; 0x1D4AE -sscr; 0x1D4C8 -ssetmn; 0x02216 -ssmile; 0x02323 -sstarf; 0x022C6 -Star; 0x022C6 -star; 0x02606 -starf; 0x02605 -straightepsilon; 0x003F5 -straightphi; 0x003D5 -strns; 0x000AF -sub; 0x02282 -Sub; 0x022D0 -subdot; 0x02ABD -sube; 0x02286 -subE; 0x02AC5 -subedot; 0x02AC3 -submult; 0x02AC1 -subne; 0x0228A -subnE; 0x02ACB -subplus; 0x02ABF -subrarr; 0x02979 -subset; 0x02282 -Subset; 0x022D0 -subseteq; 0x02286 -subseteqq; 0x02AC5 -SubsetEqual; 0x02286 -subsetneq; 0x0228A -subsetneqq; 0x02ACB -subsim; 0x02AC7 -subsub; 0x02AD5 -subsup; 0x02AD3 -succ; 0x0227B -succapprox; 0x02AB8 -succcurlyeq; 0x0227D -Succeeds; 0x0227B -SucceedsEqual; 0x02AB0 -SucceedsSlantEqual; 0x0227D -SucceedsTilde; 0x0227F -succeq; 0x02AB0 -succnapprox; 0x02ABA -succneqq; 0x02AB6 -succnsim; 0x022E9 -succsim; 0x0227F -SuchThat; 0x0220B -sum; 0x02211 -Sum; 0x02211 -sung; 0x0266A -sup; 0x02283 -Sup; 0x022D1 -sup1; 0x000B9 -sup1 0x000B9 -sup2; 0x000B2 -sup2 0x000B2 -sup3; 0x000B3 -sup3 0x000B3 -supdot; 0x02ABE -supdsub; 0x02AD8 -supe; 0x02287 -supE; 0x02AC6 -supedot; 0x02AC4 -Superset; 0x02283 -SupersetEqual; 0x02287 -suphsub; 0x02AD7 -suplarr; 0x0297B -supmult; 0x02AC2 -supne; 0x0228B -supnE; 0x02ACC -supplus; 0x02AC0 -supset; 0x02283 -Supset; 0x022D1 -supseteq; 0x02287 -supseteqq; 0x02AC6 -supsetneq; 0x0228B -supsetneqq; 0x02ACC -supsim; 0x02AC8 -supsub; 0x02AD4 -supsup; 0x02AD6 -swarhk; 0x02926 -swarr; 0x02199 -swArr; 0x021D9 -swarrow; 0x02199 -swnwar; 0x0292A -szlig; 0x000DF -szlig 0x000DF -Tab; 0x00009 -target; 0x02316 -Tau; 0x003A4 -tau; 0x003C4 -tbrk; 0x023B4 -Tcaron; 0x00164 -tcaron; 0x00165 -Tcedil; 0x00162 -tcedil; 0x00163 -Tcy; 0x00422 -tcy; 0x00442 -tdot; 0x020DB -telrec; 0x02315 -Tfr; 0x1D517 -tfr; 0x1D531 -there4; 0x02234 -therefore; 0x02234 -Therefore; 0x02234 -Theta; 0x00398 -theta; 0x003B8 -thetasym; 0x003D1 -thetav; 0x003D1 -thickapprox; 0x02248 -thicksim; 0x0223C -thinsp; 0x02009 -ThinSpace; 0x02009 -thkap; 0x02248 -thksim; 0x0223C -THORN; 0x000DE -THORN 0x000DE -thorn; 0x000FE -thorn 0x000FE -tilde; 0x002DC -Tilde; 0x0223C -TildeEqual; 0x02243 -TildeFullEqual; 0x02245 -TildeTilde; 0x02248 -times; 0x000D7 -times 0x000D7 -timesb; 0x022A0 -timesbar; 0x02A31 -timesd; 0x02A30 -tint; 0x0222D -toea; 0x02928 -top; 0x022A4 -topbot; 0x02336 -topcir; 0x02AF1 -Topf; 0x1D54B -topf; 0x1D565 -topfork; 0x02ADA -tosa; 0x02929 -tprime; 0x02034 -trade; 0x02122 -TRADE; 0x02122 -triangle; 0x025B5 -triangledown; 0x025BF -triangleleft; 0x025C3 -trianglelefteq; 0x022B4 -triangleq; 0x0225C -triangleright; 0x025B9 -trianglerighteq; 0x022B5 -tridot; 0x025EC -trie; 0x0225C -triminus; 0x02A3A -TripleDot; 0x020DB -triplus; 0x02A39 -trisb; 0x029CD -tritime; 0x02A3B -trpezium; 0x023E2 -Tscr; 0x1D4AF -tscr; 0x1D4C9 -TScy; 0x00426 -tscy; 0x00446 -TSHcy; 0x0040B -tshcy; 0x0045B -Tstrok; 0x00166 -tstrok; 0x00167 -twixt; 0x0226C -twoheadleftarrow; 0x0219E -twoheadrightarrow; 0x021A0 -Uacute; 0x000DA -Uacute 0x000DA -uacute; 0x000FA -uacute 0x000FA -uarr; 0x02191 -Uarr; 0x0219F -uArr; 0x021D1 -Uarrocir; 0x02949 -Ubrcy; 0x0040E -ubrcy; 0x0045E -Ubreve; 0x0016C -ubreve; 0x0016D -Ucirc; 0x000DB -Ucirc 0x000DB -ucirc; 0x000FB -ucirc 0x000FB -Ucy; 0x00423 -ucy; 0x00443 -udarr; 0x021C5 -Udblac; 0x00170 -udblac; 0x00171 -udhar; 0x0296E -ufisht; 0x0297E -Ufr; 0x1D518 -ufr; 0x1D532 -Ugrave; 0x000D9 -Ugrave 0x000D9 -ugrave; 0x000F9 -ugrave 0x000F9 -uHar; 0x02963 -uharl; 0x021BF -uharr; 0x021BE -uhblk; 0x02580 -ulcorn; 0x0231C -ulcorner; 0x0231C -ulcrop; 0x0230F -ultri; 0x025F8 -Umacr; 0x0016A -umacr; 0x0016B -uml; 0x000A8 -uml 0x000A8 -UnderBar; 0x00332 -UnderBrace; 0x023DF -UnderBracket; 0x023B5 -UnderParenthesis; 0x023DD -Union; 0x022C3 -UnionPlus; 0x0228E -Uogon; 0x00172 -uogon; 0x00173 -Uopf; 0x1D54C -uopf; 0x1D566 -uparrow; 0x02191 -UpArrow; 0x02191 -Uparrow; 0x021D1 -UpArrowBar; 0x02912 -UpArrowDownArrow; 0x021C5 -updownarrow; 0x02195 -UpDownArrow; 0x02195 -Updownarrow; 0x021D5 -UpEquilibrium; 0x0296E -upharpoonleft; 0x021BF -upharpoonright; 0x021BE -uplus; 0x0228E -UpperLeftArrow; 0x02196 -UpperRightArrow; 0x02197 -upsi; 0x003C5 -Upsi; 0x003D2 -upsih; 0x003D2 -Upsilon; 0x003A5 -upsilon; 0x003C5 -UpTee; 0x022A5 -UpTeeArrow; 0x021A5 -upuparrows; 0x021C8 -urcorn; 0x0231D -urcorner; 0x0231D -urcrop; 0x0230E -Uring; 0x0016E -uring; 0x0016F -urtri; 0x025F9 -Uscr; 0x1D4B0 -uscr; 0x1D4CA -utdot; 0x022F0 -Utilde; 0x00168 -utilde; 0x00169 -utri; 0x025B5 -utrif; 0x025B4 -uuarr; 0x021C8 -Uuml; 0x000DC -Uuml 0x000DC -uuml; 0x000FC -uuml 0x000FC -uwangle; 0x029A7 -vangrt; 0x0299C -varepsilon; 0x003B5 -varkappa; 0x003F0 -varnothing; 0x02205 -varphi; 0x003C6 -varpi; 0x003D6 -varpropto; 0x0221D -varr; 0x02195 -vArr; 0x021D5 -varrho; 0x003F1 -varsigma; 0x003C2 -vartheta; 0x003D1 -vartriangleleft; 0x022B2 -vartriangleright; 0x022B3 -vBar; 0x02AE8 -Vbar; 0x02AEB -vBarv; 0x02AE9 -Vcy; 0x00412 -vcy; 0x00432 -vdash; 0x022A2 -vDash; 0x022A8 -Vdash; 0x022A9 -VDash; 0x022AB -Vdashl; 0x02AE6 -vee; 0x02228 -Vee; 0x022C1 -veebar; 0x022BB -veeeq; 0x0225A -vellip; 0x022EE -verbar; 0x0007C -Verbar; 0x02016 -vert; 0x0007C -Vert; 0x02016 -VerticalBar; 0x02223 -VerticalLine; 0x0007C -VerticalSeparator; 0x02758 -VerticalTilde; 0x02240 -VeryThinSpace; 0x0200A -Vfr; 0x1D519 -vfr; 0x1D533 -vltri; 0x022B2 -Vopf; 0x1D54D -vopf; 0x1D567 -vprop; 0x0221D -vrtri; 0x022B3 -Vscr; 0x1D4B1 -vscr; 0x1D4CB -Vvdash; 0x022AA -vzigzag; 0x0299A -Wcirc; 0x00174 -wcirc; 0x00175 -wedbar; 0x02A5F -wedge; 0x02227 -Wedge; 0x022C0 -wedgeq; 0x02259 -weierp; 0x02118 -Wfr; 0x1D51A -wfr; 0x1D534 -Wopf; 0x1D54E -wopf; 0x1D568 -wp; 0x02118 -wr; 0x02240 -wreath; 0x02240 -Wscr; 0x1D4B2 -wscr; 0x1D4CC -xcap; 0x022C2 -xcirc; 0x025EF -xcup; 0x022C3 -xdtri; 0x025BD -Xfr; 0x1D51B -xfr; 0x1D535 -xharr; 0x027F7 -xhArr; 0x027FA -Xi; 0x0039E -xi; 0x003BE -xlarr; 0x027F5 -xlArr; 0x027F8 -xmap; 0x027FC -xnis; 0x022FB -xodot; 0x02A00 -Xopf; 0x1D54F -xopf; 0x1D569 -xoplus; 0x02A01 -xotime; 0x02A02 -xrarr; 0x027F6 -xrArr; 0x027F9 -Xscr; 0x1D4B3 -xscr; 0x1D4CD -xsqcup; 0x02A06 -xuplus; 0x02A04 -xutri; 0x025B3 -xvee; 0x022C1 -xwedge; 0x022C0 -Yacute; 0x000DD -Yacute 0x000DD -yacute; 0x000FD -yacute 0x000FD -YAcy; 0x0042F -yacy; 0x0044F -Ycirc; 0x00176 -ycirc; 0x00177 -Ycy; 0x0042B -ycy; 0x0044B -yen; 0x000A5 -yen 0x000A5 -Yfr; 0x1D51C -yfr; 0x1D536 -YIcy; 0x00407 -yicy; 0x00457 -Yopf; 0x1D550 -yopf; 0x1D56A -Yscr; 0x1D4B4 -yscr; 0x1D4CE -YUcy; 0x0042E -yucy; 0x0044E -yuml; 0x000FF -yuml 0x000FF -Yuml; 0x00178 -Zacute; 0x00179 -zacute; 0x0017A -Zcaron; 0x0017D -zcaron; 0x0017E -Zcy; 0x00417 -zcy; 0x00437 -Zdot; 0x0017B -zdot; 0x0017C -zeetrf; 0x02128 -ZeroWidthSpace; 0x0200B -Zeta; 0x00396 -zeta; 0x003B6 -Zfr; 0x02128 -zfr; 0x1D537 -ZHcy; 0x00416 -zhcy; 0x00436 -zigrarr; 0x021DD -Zopf; 0x02124 -zopf; 0x1D56B -Zscr; 0x1D4B5 -zscr; 0x1D4CF -zwj; 0x0200D -zwnj; 0x0200C +# Entity Code +Aacute; 0x000C1 +Aacute 0x000C1 +aacute; 0x000E1 +aacute 0x000E1 +Abreve; 0x00102 +abreve; 0x00103 +ac; 0x0223E +acd; 0x0223F +acE; 0x0223E 0x00333 +Acirc; 0x000C2 +Acirc 0x000C2 +acirc; 0x000E2 +acirc 0x000E2 +acute; 0x000B4 +acute 0x000B4 +Acy; 0x00410 +acy; 0x00430 +AElig; 0x000C6 +AElig 0x000C6 +aelig; 0x000E6 +aelig 0x000E6 +af; 0x02061 +Afr; 0x1D504 +afr; 0x1D51E +Agrave; 0x000C0 +Agrave 0x000C0 +agrave; 0x000E0 +agrave 0x000E0 +alefsym; 0x02135 +aleph; 0x02135 +Alpha; 0x00391 +alpha; 0x003B1 +Amacr; 0x00100 +amacr; 0x00101 +amalg; 0x02A3F +amp; 0x00026 +amp 0x00026 +AMP; 0x00026 +AMP 0x00026 +and; 0x02227 +And; 0x02A53 +andand; 0x02A55 +andd; 0x02A5C +andslope; 0x02A58 +andv; 0x02A5A +ang; 0x02220 +ange; 0x029A4 +angle; 0x02220 +angmsd; 0x02221 +angmsdaa; 0x029A8 +angmsdab; 0x029A9 +angmsdac; 0x029AA +angmsdad; 0x029AB +angmsdae; 0x029AC +angmsdaf; 0x029AD +angmsdag; 0x029AE +angmsdah; 0x029AF +angrt; 0x0221F +angrtvb; 0x022BE +angrtvbd; 0x0299D +angsph; 0x02222 +angst; 0x000C5 +angzarr; 0x0237C +Aogon; 0x00104 +aogon; 0x00105 +Aopf; 0x1D538 +aopf; 0x1D552 +ap; 0x02248 +apacir; 0x02A6F +ape; 0x0224A +apE; 0x02A70 +apid; 0x0224B +apos; 0x00027 +ApplyFunction; 0x02061 +approx; 0x02248 +approxeq; 0x0224A +Aring; 0x000C5 +Aring 0x000C5 +aring; 0x000E5 +aring 0x000E5 +Ascr; 0x1D49C +ascr; 0x1D4B6 +Assign; 0x02254 +ast; 0x0002A +asymp; 0x02248 +asympeq; 0x0224D +Atilde; 0x000C3 +Atilde 0x000C3 +atilde; 0x000E3 +atilde 0x000E3 +Auml; 0x000C4 +Auml 0x000C4 +auml; 0x000E4 +auml 0x000E4 +awconint; 0x02233 +awint; 0x02A11 +backcong; 0x0224C +backepsilon; 0x003F6 +backprime; 0x02035 +backsim; 0x0223D +backsimeq; 0x022CD +Backslash; 0x02216 +Barv; 0x02AE7 +barvee; 0x022BD +barwed; 0x02305 +Barwed; 0x02306 +barwedge; 0x02305 +bbrk; 0x023B5 +bbrktbrk; 0x023B6 +bcong; 0x0224C +Bcy; 0x00411 +bcy; 0x00431 +bdquo; 0x0201E +becaus; 0x02235 +because; 0x02235 +Because; 0x02235 +bemptyv; 0x029B0 +bepsi; 0x003F6 +bernou; 0x0212C +Bernoullis; 0x0212C +Beta; 0x00392 +beta; 0x003B2 +beth; 0x02136 +between; 0x0226C +Bfr; 0x1D505 +bfr; 0x1D51F +bigcap; 0x022C2 +bigcirc; 0x025EF +bigcup; 0x022C3 +bigodot; 0x02A00 +bigoplus; 0x02A01 +bigotimes; 0x02A02 +bigsqcup; 0x02A06 +bigstar; 0x02605 +bigtriangledown; 0x025BD +bigtriangleup; 0x025B3 +biguplus; 0x02A04 +bigvee; 0x022C1 +bigwedge; 0x022C0 +bkarow; 0x0290D +blacklozenge; 0x029EB +blacksquare; 0x025AA +blacktriangle; 0x025B4 +blacktriangledown; 0x025BE +blacktriangleleft; 0x025C2 +blacktriangleright; 0x025B8 +blank; 0x02423 +blk12; 0x02592 +blk14; 0x02591 +blk34; 0x02593 +block; 0x02588 +bne; 0x0003D 0x020E5 +bnequiv; 0x02261 0x020E5 +bnot; 0x02310 +bNot; 0x02AED +Bopf; 0x1D539 +bopf; 0x1D553 +bot; 0x022A5 +bottom; 0x022A5 +bowtie; 0x022C8 +boxbox; 0x029C9 +boxdl; 0x02510 +boxdL; 0x02555 +boxDl; 0x02556 +boxDL; 0x02557 +boxdr; 0x0250C +boxdR; 0x02552 +boxDr; 0x02553 +boxDR; 0x02554 +boxh; 0x02500 +boxH; 0x02550 +boxhd; 0x0252C +boxHd; 0x02564 +boxhD; 0x02565 +boxHD; 0x02566 +boxhu; 0x02534 +boxHu; 0x02567 +boxhU; 0x02568 +boxHU; 0x02569 +boxminus; 0x0229F +boxplus; 0x0229E +boxtimes; 0x022A0 +boxul; 0x02518 +boxuL; 0x0255B +boxUl; 0x0255C +boxUL; 0x0255D +boxur; 0x02514 +boxuR; 0x02558 +boxUr; 0x02559 +boxUR; 0x0255A +boxv; 0x02502 +boxV; 0x02551 +boxvh; 0x0253C +boxvH; 0x0256A +boxVh; 0x0256B +boxVH; 0x0256C +boxvl; 0x02524 +boxvL; 0x02561 +boxVl; 0x02562 +boxVL; 0x02563 +boxvr; 0x0251C +boxvR; 0x0255E +boxVr; 0x0255F +boxVR; 0x02560 +bprime; 0x02035 +breve; 0x002D8 +Breve; 0x002D8 +brvbar; 0x000A6 +brvbar 0x000A6 +Bscr; 0x0212C +bscr; 0x1D4B7 +bsemi; 0x0204F +bsim; 0x0223D +bsime; 0x022CD +bsol; 0x0005C +bsolb; 0x029C5 +bsolhsub; 0x027C8 +bull; 0x02022 +bullet; 0x02022 +bump; 0x0224E +bumpe; 0x0224F +bumpE; 0x02AAE +Bumpeq; 0x0224E +bumpeq; 0x0224F +Cacute; 0x00106 +cacute; 0x00107 +cap; 0x02229 +Cap; 0x022D2 +capand; 0x02A44 +capbrcup; 0x02A49 +capcap; 0x02A4B +capcup; 0x02A47 +capdot; 0x02A40 +CapitalDifferentialD; 0x02145 +caps; 0x02229 0x0FE00 +caret; 0x02041 +caron; 0x002C7 +Cayleys; 0x0212D +ccaps; 0x02A4D +Ccaron; 0x0010C +ccaron; 0x0010D +Ccedil; 0x000C7 +Ccedil 0x000C7 +ccedil; 0x000E7 +ccedil 0x000E7 +Ccirc; 0x00108 +ccirc; 0x00109 +Cconint; 0x02230 +ccups; 0x02A4C +ccupssm; 0x02A50 +Cdot; 0x0010A +cdot; 0x0010B +cedil; 0x000B8 +cedil 0x000B8 +Cedilla; 0x000B8 +cemptyv; 0x029B2 +cent; 0x000A2 +cent 0x000A2 +centerdot; 0x000B7 +CenterDot; 0x000B7 +Cfr; 0x0212D +cfr; 0x1D520 +CHcy; 0x00427 +chcy; 0x00447 +check; 0x02713 +checkmark; 0x02713 +Chi; 0x003A7 +chi; 0x003C7 +cir; 0x025CB +circ; 0x002C6 +circeq; 0x02257 +circlearrowleft; 0x021BA +circlearrowright; 0x021BB +circledast; 0x0229B +circledcirc; 0x0229A +circleddash; 0x0229D +CircleDot; 0x02299 +circledR; 0x000AE +circledS; 0x024C8 +CircleMinus; 0x02296 +CirclePlus; 0x02295 +CircleTimes; 0x02297 +cire; 0x02257 +cirE; 0x029C3 +cirfnint; 0x02A10 +cirmid; 0x02AEF +cirscir; 0x029C2 +ClockwiseContourIntegral; 0x02232 +CloseCurlyDoubleQuote; 0x0201D +CloseCurlyQuote; 0x02019 +clubs; 0x02663 +clubsuit; 0x02663 +colon; 0x0003A +Colon; 0x02237 +colone; 0x02254 +Colone; 0x02A74 +coloneq; 0x02254 +comma; 0x0002C +commat; 0x00040 +comp; 0x02201 +compfn; 0x02218 +complement; 0x02201 +complexes; 0x02102 +cong; 0x02245 +congdot; 0x02A6D +Congruent; 0x02261 +conint; 0x0222E +Conint; 0x0222F +ContourIntegral; 0x0222E +Copf; 0x02102 +copf; 0x1D554 +coprod; 0x02210 +Coproduct; 0x02210 +copy; 0x000A9 +copy 0x000A9 +COPY; 0x000A9 +COPY 0x000A9 +copysr; 0x02117 +CounterClockwiseContourIntegral; 0x02233 +crarr; 0x021B5 +cross; 0x02717 +Cross; 0x02A2F +Cscr; 0x1D49E +cscr; 0x1D4B8 +csub; 0x02ACF +csube; 0x02AD1 +csup; 0x02AD0 +csupe; 0x02AD2 +ctdot; 0x022EF +cudarrl; 0x02938 +cudarrr; 0x02935 +cuepr; 0x022DE +cuesc; 0x022DF +cularr; 0x021B6 +cularrp; 0x0293D +cup; 0x0222A +Cup; 0x022D3 +cupbrcap; 0x02A48 +CupCap; 0x0224D +cupcap; 0x02A46 +cupcup; 0x02A4A +cupdot; 0x0228D +cupor; 0x02A45 +cups; 0x0222A 0x0FE00 +curarr; 0x021B7 +curarrm; 0x0293C +curlyeqprec; 0x022DE +curlyeqsucc; 0x022DF +curlyvee; 0x022CE +curlywedge; 0x022CF +curren; 0x000A4 +curren 0x000A4 +curvearrowleft; 0x021B6 +curvearrowright; 0x021B7 +cuvee; 0x022CE +cuwed; 0x022CF +cwconint; 0x02232 +cwint; 0x02231 +cylcty; 0x0232D +dagger; 0x02020 +Dagger; 0x02021 +daleth; 0x02138 +darr; 0x02193 +Darr; 0x021A1 +dArr; 0x021D3 +dash; 0x02010 +dashv; 0x022A3 +Dashv; 0x02AE4 +dbkarow; 0x0290F +dblac; 0x002DD +Dcaron; 0x0010E +dcaron; 0x0010F +Dcy; 0x00414 +dcy; 0x00434 +DD; 0x02145 +dd; 0x02146 +ddagger; 0x02021 +ddarr; 0x021CA +DDotrahd; 0x02911 +ddotseq; 0x02A77 +deg; 0x000B0 +deg 0x000B0 +Del; 0x02207 +Delta; 0x00394 +delta; 0x003B4 +demptyv; 0x029B1 +dfisht; 0x0297F +Dfr; 0x1D507 +dfr; 0x1D521 +dHar; 0x02965 +dharl; 0x021C3 +dharr; 0x021C2 +DiacriticalAcute; 0x000B4 +DiacriticalDot; 0x002D9 +DiacriticalDoubleAcute; 0x002DD +DiacriticalGrave; 0x00060 +DiacriticalTilde; 0x002DC +diam; 0x022C4 +diamond; 0x022C4 +Diamond; 0x022C4 +diamondsuit; 0x02666 +diams; 0x02666 +die; 0x000A8 +DifferentialD; 0x02146 +digamma; 0x003DD +disin; 0x022F2 +div; 0x000F7 +divide; 0x000F7 +divide 0x000F7 +divideontimes; 0x022C7 +divonx; 0x022C7 +DJcy; 0x00402 +djcy; 0x00452 +dlcorn; 0x0231E +dlcrop; 0x0230D +dollar; 0x00024 +Dopf; 0x1D53B +dopf; 0x1D555 +Dot; 0x000A8 +dot; 0x002D9 +DotDot; 0x020DC +doteq; 0x02250 +doteqdot; 0x02251 +DotEqual; 0x02250 +dotminus; 0x02238 +dotplus; 0x02214 +dotsquare; 0x022A1 +doublebarwedge; 0x02306 +DoubleContourIntegral; 0x0222F +DoubleDot; 0x000A8 +DoubleDownArrow; 0x021D3 +DoubleLeftArrow; 0x021D0 +DoubleLeftRightArrow; 0x021D4 +DoubleLeftTee; 0x02AE4 +DoubleLongLeftArrow; 0x027F8 +DoubleLongLeftRightArrow; 0x027FA +DoubleLongRightArrow; 0x027F9 +DoubleRightArrow; 0x021D2 +DoubleRightTee; 0x022A8 +DoubleUpArrow; 0x021D1 +DoubleUpDownArrow; 0x021D5 +DoubleVerticalBar; 0x02225 +downarrow; 0x02193 +DownArrow; 0x02193 +Downarrow; 0x021D3 +DownArrowBar; 0x02913 +DownArrowUpArrow; 0x021F5 +DownBreve; 0x00311 +downdownarrows; 0x021CA +downharpoonleft; 0x021C3 +downharpoonright; 0x021C2 +DownLeftRightVector; 0x02950 +DownLeftTeeVector; 0x0295E +DownLeftVector; 0x021BD +DownLeftVectorBar; 0x02956 +DownRightTeeVector; 0x0295F +DownRightVector; 0x021C1 +DownRightVectorBar; 0x02957 +DownTee; 0x022A4 +DownTeeArrow; 0x021A7 +drbkarow; 0x02910 +drcorn; 0x0231F +drcrop; 0x0230C +Dscr; 0x1D49F +dscr; 0x1D4B9 +DScy; 0x00405 +dscy; 0x00455 +dsol; 0x029F6 +Dstrok; 0x00110 +dstrok; 0x00111 +dtdot; 0x022F1 +dtri; 0x025BF +dtrif; 0x025BE +duarr; 0x021F5 +duhar; 0x0296F +dwangle; 0x029A6 +DZcy; 0x0040F +dzcy; 0x0045F +dzigrarr; 0x027FF +Eacute; 0x000C9 +Eacute 0x000C9 +eacute; 0x000E9 +eacute 0x000E9 +easter; 0x02A6E +Ecaron; 0x0011A +ecaron; 0x0011B +ecir; 0x02256 +Ecirc; 0x000CA +Ecirc 0x000CA +ecirc; 0x000EA +ecirc 0x000EA +ecolon; 0x02255 +Ecy; 0x0042D +ecy; 0x0044D +eDDot; 0x02A77 +Edot; 0x00116 +edot; 0x00117 +eDot; 0x02251 +ee; 0x02147 +efDot; 0x02252 +Efr; 0x1D508 +efr; 0x1D522 +eg; 0x02A9A +Egrave; 0x000C8 +Egrave 0x000C8 +egrave; 0x000E8 +egrave 0x000E8 +egs; 0x02A96 +egsdot; 0x02A98 +el; 0x02A99 +Element; 0x02208 +elinters; 0x023E7 +ell; 0x02113 +els; 0x02A95 +elsdot; 0x02A97 +Emacr; 0x00112 +emacr; 0x00113 +empty; 0x02205 +emptyset; 0x02205 +EmptySmallSquare; 0x025FB +emptyv; 0x02205 +EmptyVerySmallSquare; 0x025AB +emsp; 0x02003 +emsp13; 0x02004 +emsp14; 0x02005 +ENG; 0x0014A +eng; 0x0014B +ensp; 0x02002 +Eogon; 0x00118 +eogon; 0x00119 +Eopf; 0x1D53C +eopf; 0x1D556 +epar; 0x022D5 +eparsl; 0x029E3 +eplus; 0x02A71 +epsi; 0x003B5 +Epsilon; 0x00395 +epsilon; 0x003B5 +epsiv; 0x003F5 +eqcirc; 0x02256 +eqcolon; 0x02255 +eqsim; 0x02242 +eqslantgtr; 0x02A96 +eqslantless; 0x02A95 +Equal; 0x02A75 +equals; 0x0003D +EqualTilde; 0x02242 +equest; 0x0225F +Equilibrium; 0x021CC +equiv; 0x02261 +equivDD; 0x02A78 +eqvparsl; 0x029E5 +erarr; 0x02971 +erDot; 0x02253 +escr; 0x0212F +Escr; 0x02130 +esdot; 0x02250 +esim; 0x02242 +Esim; 0x02A73 +Eta; 0x00397 +eta; 0x003B7 +ETH; 0x000D0 +ETH 0x000D0 +eth; 0x000F0 +eth 0x000F0 +Euml; 0x000CB +Euml 0x000CB +euml; 0x000EB +euml 0x000EB +euro; 0x020AC +excl; 0x00021 +exist; 0x02203 +Exists; 0x02203 +expectation; 0x02130 +exponentiale; 0x02147 +ExponentialE; 0x02147 +fallingdotseq; 0x02252 +Fcy; 0x00424 +fcy; 0x00444 +female; 0x02640 +ffilig; 0x0FB03 +fflig; 0x0FB00 +ffllig; 0x0FB04 +Ffr; 0x1D509 +ffr; 0x1D523 +filig; 0x0FB01 +FilledSmallSquare; 0x025FC +FilledVerySmallSquare; 0x025AA +fjlig; 0x00066 0x0006A +flat; 0x0266D +fllig; 0x0FB02 +fltns; 0x025B1 +fnof; 0x00192 +Fopf; 0x1D53D +fopf; 0x1D557 +forall; 0x02200 +ForAll; 0x02200 +fork; 0x022D4 +forkv; 0x02AD9 +Fouriertrf; 0x02131 +fpartint; 0x02A0D +frac12; 0x000BD +frac12 0x000BD +frac13; 0x02153 +frac14; 0x000BC +frac14 0x000BC +frac15; 0x02155 +frac16; 0x02159 +frac18; 0x0215B +frac23; 0x02154 +frac25; 0x02156 +frac34; 0x000BE +frac34 0x000BE +frac35; 0x02157 +frac38; 0x0215C +frac45; 0x02158 +frac56; 0x0215A +frac58; 0x0215D +frac78; 0x0215E +frasl; 0x02044 +frown; 0x02322 +Fscr; 0x02131 +fscr; 0x1D4BB +gacute; 0x001F5 +Gamma; 0x00393 +gamma; 0x003B3 +Gammad; 0x003DC +gammad; 0x003DD +gap; 0x02A86 +Gbreve; 0x0011E +gbreve; 0x0011F +Gcedil; 0x00122 +Gcirc; 0x0011C +gcirc; 0x0011D +Gcy; 0x00413 +gcy; 0x00433 +Gdot; 0x00120 +gdot; 0x00121 +ge; 0x02265 +gE; 0x02267 +gel; 0x022DB +gEl; 0x02A8C +geq; 0x02265 +geqq; 0x02267 +geqslant; 0x02A7E +ges; 0x02A7E +gescc; 0x02AA9 +gesdot; 0x02A80 +gesdoto; 0x02A82 +gesdotol; 0x02A84 +gesl; 0x022DB 0x0FE00 +gesles; 0x02A94 +Gfr; 0x1D50A +gfr; 0x1D524 +gg; 0x0226B +Gg; 0x022D9 +ggg; 0x022D9 +gimel; 0x02137 +GJcy; 0x00403 +gjcy; 0x00453 +gl; 0x02277 +gla; 0x02AA5 +glE; 0x02A92 +glj; 0x02AA4 +gnap; 0x02A8A +gnapprox; 0x02A8A +gnE; 0x02269 +gne; 0x02A88 +gneq; 0x02A88 +gneqq; 0x02269 +gnsim; 0x022E7 +Gopf; 0x1D53E +gopf; 0x1D558 +grave; 0x00060 +GreaterEqual; 0x02265 +GreaterEqualLess; 0x022DB +GreaterFullEqual; 0x02267 +GreaterGreater; 0x02AA2 +GreaterLess; 0x02277 +GreaterSlantEqual; 0x02A7E +GreaterTilde; 0x02273 +gscr; 0x0210A +Gscr; 0x1D4A2 +gsim; 0x02273 +gsime; 0x02A8E +gsiml; 0x02A90 +gt; 0x0003E +gt 0x0003E +GT; 0x0003E +GT 0x0003E +Gt; 0x0226B +gtcc; 0x02AA7 +gtcir; 0x02A7A +gtdot; 0x022D7 +gtlPar; 0x02995 +gtquest; 0x02A7C +gtrapprox; 0x02A86 +gtrarr; 0x02978 +gtrdot; 0x022D7 +gtreqless; 0x022DB +gtreqqless; 0x02A8C +gtrless; 0x02277 +gtrsim; 0x02273 +gvertneqq; 0x02269 0x0FE00 +gvnE; 0x02269 0x0FE00 +Hacek; 0x002C7 +hairsp; 0x0200A +half; 0x000BD +hamilt; 0x0210B +HARDcy; 0x0042A +hardcy; 0x0044A +harr; 0x02194 +hArr; 0x021D4 +harrcir; 0x02948 +harrw; 0x021AD +Hat; 0x0005E +hbar; 0x0210F +Hcirc; 0x00124 +hcirc; 0x00125 +hearts; 0x02665 +heartsuit; 0x02665 +hellip; 0x02026 +hercon; 0x022B9 +Hfr; 0x0210C +hfr; 0x1D525 +HilbertSpace; 0x0210B +hksearow; 0x02925 +hkswarow; 0x02926 +hoarr; 0x021FF +homtht; 0x0223B +hookleftarrow; 0x021A9 +hookrightarrow; 0x021AA +Hopf; 0x0210D +hopf; 0x1D559 +horbar; 0x02015 +HorizontalLine; 0x02500 +Hscr; 0x0210B +hscr; 0x1D4BD +hslash; 0x0210F +Hstrok; 0x00126 +hstrok; 0x00127 +HumpDownHump; 0x0224E +HumpEqual; 0x0224F +hybull; 0x02043 +hyphen; 0x02010 +Iacute; 0x000CD +Iacute 0x000CD +iacute; 0x000ED +iacute 0x000ED +ic; 0x02063 +Icirc; 0x000CE +Icirc 0x000CE +icirc; 0x000EE +icirc 0x000EE +Icy; 0x00418 +icy; 0x00438 +Idot; 0x00130 +IEcy; 0x00415 +iecy; 0x00435 +iexcl; 0x000A1 +iexcl 0x000A1 +iff; 0x021D4 +Ifr; 0x02111 +ifr; 0x1D526 +Igrave; 0x000CC +Igrave 0x000CC +igrave; 0x000EC +igrave 0x000EC +ii; 0x02148 +iiiint; 0x02A0C +iiint; 0x0222D +iinfin; 0x029DC +iiota; 0x02129 +IJlig; 0x00132 +ijlig; 0x00133 +Im; 0x02111 +Imacr; 0x0012A +imacr; 0x0012B +image; 0x02111 +ImaginaryI; 0x02148 +imagline; 0x02110 +imagpart; 0x02111 +imath; 0x00131 +imof; 0x022B7 +imped; 0x001B5 +Implies; 0x021D2 +in; 0x02208 +incare; 0x02105 +infin; 0x0221E +infintie; 0x029DD +inodot; 0x00131 +int; 0x0222B +Int; 0x0222C +intcal; 0x022BA +integers; 0x02124 +Integral; 0x0222B +intercal; 0x022BA +Intersection; 0x022C2 +intlarhk; 0x02A17 +intprod; 0x02A3C +InvisibleComma; 0x02063 +InvisibleTimes; 0x02062 +IOcy; 0x00401 +iocy; 0x00451 +Iogon; 0x0012E +iogon; 0x0012F +Iopf; 0x1D540 +iopf; 0x1D55A +Iota; 0x00399 +iota; 0x003B9 +iprod; 0x02A3C +iquest; 0x000BF +iquest 0x000BF +Iscr; 0x02110 +iscr; 0x1D4BE +isin; 0x02208 +isindot; 0x022F5 +isinE; 0x022F9 +isins; 0x022F4 +isinsv; 0x022F3 +isinv; 0x02208 +it; 0x02062 +Itilde; 0x00128 +itilde; 0x00129 +Iukcy; 0x00406 +iukcy; 0x00456 +Iuml; 0x000CF +Iuml 0x000CF +iuml; 0x000EF +iuml 0x000EF +Jcirc; 0x00134 +jcirc; 0x00135 +Jcy; 0x00419 +jcy; 0x00439 +Jfr; 0x1D50D +jfr; 0x1D527 +jmath; 0x00237 +Jopf; 0x1D541 +jopf; 0x1D55B +Jscr; 0x1D4A5 +jscr; 0x1D4BF +Jsercy; 0x00408 +jsercy; 0x00458 +Jukcy; 0x00404 +jukcy; 0x00454 +Kappa; 0x0039A +kappa; 0x003BA +kappav; 0x003F0 +Kcedil; 0x00136 +kcedil; 0x00137 +Kcy; 0x0041A +kcy; 0x0043A +Kfr; 0x1D50E +kfr; 0x1D528 +kgreen; 0x00138 +KHcy; 0x00425 +khcy; 0x00445 +KJcy; 0x0040C +kjcy; 0x0045C +Kopf; 0x1D542 +kopf; 0x1D55C +Kscr; 0x1D4A6 +kscr; 0x1D4C0 +lAarr; 0x021DA +Lacute; 0x00139 +lacute; 0x0013A +laemptyv; 0x029B4 +lagran; 0x02112 +Lambda; 0x0039B +lambda; 0x003BB +lang; 0x027E8 +Lang; 0x027EA +langd; 0x02991 +langle; 0x027E8 +lap; 0x02A85 +Laplacetrf; 0x02112 +laquo; 0x000AB +laquo 0x000AB +larr; 0x02190 +Larr; 0x0219E +lArr; 0x021D0 +larrb; 0x021E4 +larrbfs; 0x0291F +larrfs; 0x0291D +larrhk; 0x021A9 +larrlp; 0x021AB +larrpl; 0x02939 +larrsim; 0x02973 +larrtl; 0x021A2 +lat; 0x02AAB +latail; 0x02919 +lAtail; 0x0291B +late; 0x02AAD +lates; 0x02AAD 0x0FE00 +lbarr; 0x0290C +lBarr; 0x0290E +lbbrk; 0x02772 +lbrace; 0x0007B +lbrack; 0x0005B +lbrke; 0x0298B +lbrksld; 0x0298F +lbrkslu; 0x0298D +Lcaron; 0x0013D +lcaron; 0x0013E +Lcedil; 0x0013B +lcedil; 0x0013C +lceil; 0x02308 +lcub; 0x0007B +Lcy; 0x0041B +lcy; 0x0043B +ldca; 0x02936 +ldquo; 0x0201C +ldquor; 0x0201E +ldrdhar; 0x02967 +ldrushar; 0x0294B +ldsh; 0x021B2 +le; 0x02264 +lE; 0x02266 +LeftAngleBracket; 0x027E8 +leftarrow; 0x02190 +LeftArrow; 0x02190 +Leftarrow; 0x021D0 +LeftArrowBar; 0x021E4 +LeftArrowRightArrow; 0x021C6 +leftarrowtail; 0x021A2 +LeftCeiling; 0x02308 +LeftDoubleBracket; 0x027E6 +LeftDownTeeVector; 0x02961 +LeftDownVector; 0x021C3 +LeftDownVectorBar; 0x02959 +LeftFloor; 0x0230A +leftharpoondown; 0x021BD +leftharpoonup; 0x021BC +leftleftarrows; 0x021C7 +leftrightarrow; 0x02194 +LeftRightArrow; 0x02194 +Leftrightarrow; 0x021D4 +leftrightarrows; 0x021C6 +leftrightharpoons; 0x021CB +leftrightsquigarrow; 0x021AD +LeftRightVector; 0x0294E +LeftTee; 0x022A3 +LeftTeeArrow; 0x021A4 +LeftTeeVector; 0x0295A +leftthreetimes; 0x022CB +LeftTriangle; 0x022B2 +LeftTriangleBar; 0x029CF +LeftTriangleEqual; 0x022B4 +LeftUpDownVector; 0x02951 +LeftUpTeeVector; 0x02960 +LeftUpVector; 0x021BF +LeftUpVectorBar; 0x02958 +LeftVector; 0x021BC +LeftVectorBar; 0x02952 +leg; 0x022DA +lEg; 0x02A8B +leq; 0x02264 +leqq; 0x02266 +leqslant; 0x02A7D +les; 0x02A7D +lescc; 0x02AA8 +lesdot; 0x02A7F +lesdoto; 0x02A81 +lesdotor; 0x02A83 +lesg; 0x022DA 0x0FE00 +lesges; 0x02A93 +lessapprox; 0x02A85 +lessdot; 0x022D6 +lesseqgtr; 0x022DA +lesseqqgtr; 0x02A8B +LessEqualGreater; 0x022DA +LessFullEqual; 0x02266 +LessGreater; 0x02276 +lessgtr; 0x02276 +LessLess; 0x02AA1 +lesssim; 0x02272 +LessSlantEqual; 0x02A7D +LessTilde; 0x02272 +lfisht; 0x0297C +lfloor; 0x0230A +Lfr; 0x1D50F +lfr; 0x1D529 +lg; 0x02276 +lgE; 0x02A91 +lHar; 0x02962 +lhard; 0x021BD +lharu; 0x021BC +lharul; 0x0296A +lhblk; 0x02584 +LJcy; 0x00409 +ljcy; 0x00459 +ll; 0x0226A +Ll; 0x022D8 +llarr; 0x021C7 +llcorner; 0x0231E +Lleftarrow; 0x021DA +llhard; 0x0296B +lltri; 0x025FA +Lmidot; 0x0013F +lmidot; 0x00140 +lmoust; 0x023B0 +lmoustache; 0x023B0 +lnap; 0x02A89 +lnapprox; 0x02A89 +lnE; 0x02268 +lne; 0x02A87 +lneq; 0x02A87 +lneqq; 0x02268 +lnsim; 0x022E6 +loang; 0x027EC +loarr; 0x021FD +lobrk; 0x027E6 +longleftarrow; 0x027F5 +LongLeftArrow; 0x027F5 +Longleftarrow; 0x027F8 +longleftrightarrow; 0x027F7 +LongLeftRightArrow; 0x027F7 +Longleftrightarrow; 0x027FA +longmapsto; 0x027FC +longrightarrow; 0x027F6 +LongRightArrow; 0x027F6 +Longrightarrow; 0x027F9 +looparrowleft; 0x021AB +looparrowright; 0x021AC +lopar; 0x02985 +Lopf; 0x1D543 +lopf; 0x1D55D +loplus; 0x02A2D +lotimes; 0x02A34 +lowast; 0x02217 +lowbar; 0x0005F +LowerLeftArrow; 0x02199 +LowerRightArrow; 0x02198 +loz; 0x025CA +lozenge; 0x025CA +lozf; 0x029EB +lpar; 0x00028 +lparlt; 0x02993 +lrarr; 0x021C6 +lrcorner; 0x0231F +lrhar; 0x021CB +lrhard; 0x0296D +lrm; 0x0200E +lrtri; 0x022BF +lsaquo; 0x02039 +Lscr; 0x02112 +lscr; 0x1D4C1 +lsh; 0x021B0 +Lsh; 0x021B0 +lsim; 0x02272 +lsime; 0x02A8D +lsimg; 0x02A8F +lsqb; 0x0005B +lsquo; 0x02018 +lsquor; 0x0201A +Lstrok; 0x00141 +lstrok; 0x00142 +lt; 0x0003C +lt 0x0003C +LT; 0x0003C +LT 0x0003C +Lt; 0x0226A +ltcc; 0x02AA6 +ltcir; 0x02A79 +ltdot; 0x022D6 +lthree; 0x022CB +ltimes; 0x022C9 +ltlarr; 0x02976 +ltquest; 0x02A7B +ltri; 0x025C3 +ltrie; 0x022B4 +ltrif; 0x025C2 +ltrPar; 0x02996 +lurdshar; 0x0294A +luruhar; 0x02966 +lvertneqq; 0x02268 0x0FE00 +lvnE; 0x02268 0x0FE00 +macr; 0x000AF +macr 0x000AF +male; 0x02642 +malt; 0x02720 +maltese; 0x02720 +map; 0x021A6 +Map; 0x02905 +mapsto; 0x021A6 +mapstodown; 0x021A7 +mapstoleft; 0x021A4 +mapstoup; 0x021A5 +marker; 0x025AE +mcomma; 0x02A29 +Mcy; 0x0041C +mcy; 0x0043C +mdash; 0x02014 +mDDot; 0x0223A +measuredangle; 0x02221 +MediumSpace; 0x0205F +Mellintrf; 0x02133 +Mfr; 0x1D510 +mfr; 0x1D52A +mho; 0x02127 +micro; 0x000B5 +micro 0x000B5 +mid; 0x02223 +midast; 0x0002A +midcir; 0x02AF0 +middot; 0x000B7 +middot 0x000B7 +minus; 0x02212 +minusb; 0x0229F +minusd; 0x02238 +minusdu; 0x02A2A +MinusPlus; 0x02213 +mlcp; 0x02ADB +mldr; 0x02026 +mnplus; 0x02213 +models; 0x022A7 +Mopf; 0x1D544 +mopf; 0x1D55E +mp; 0x02213 +Mscr; 0x02133 +mscr; 0x1D4C2 +mstpos; 0x0223E +Mu; 0x0039C +mu; 0x003BC +multimap; 0x022B8 +mumap; 0x022B8 +nabla; 0x02207 +Nacute; 0x00143 +nacute; 0x00144 +nang; 0x02220 0x020D2 +nap; 0x02249 +napE; 0x02A70 0x00338 +napid; 0x0224B 0x00338 +napos; 0x00149 +napprox; 0x02249 +natur; 0x0266E +natural; 0x0266E +naturals; 0x02115 +nbsp; 0x000A0 +nbsp 0x000A0 +nbump; 0x0224E 0x00338 +nbumpe; 0x0224F 0x00338 +ncap; 0x02A43 +Ncaron; 0x00147 +ncaron; 0x00148 +Ncedil; 0x00145 +ncedil; 0x00146 +ncong; 0x02247 +ncongdot; 0x02A6D 0x00338 +ncup; 0x02A42 +Ncy; 0x0041D +ncy; 0x0043D +ndash; 0x02013 +ne; 0x02260 +nearhk; 0x02924 +nearr; 0x02197 +neArr; 0x021D7 +nearrow; 0x02197 +nedot; 0x02250 0x00338 +NegativeMediumSpace; 0x0200B +NegativeThickSpace; 0x0200B +NegativeThinSpace; 0x0200B +NegativeVeryThinSpace; 0x0200B +nequiv; 0x02262 +nesear; 0x02928 +nesim; 0x02242 0x00338 +NestedGreaterGreater; 0x0226B +NestedLessLess; 0x0226A +NewLine; 0x0000A +nexist; 0x02204 +nexists; 0x02204 +Nfr; 0x1D511 +nfr; 0x1D52B +ngE; 0x02267 0x00338 +nge; 0x02271 +ngeq; 0x02271 +ngeqq; 0x02267 0x00338 +ngeqslant; 0x02A7E 0x00338 +nges; 0x02A7E 0x00338 +nGg; 0x022D9 0x00338 +ngsim; 0x02275 +nGt; 0x0226B 0x020D2 +ngt; 0x0226F +ngtr; 0x0226F +nGtv; 0x0226B 0x00338 +nharr; 0x021AE +nhArr; 0x021CE +nhpar; 0x02AF2 +ni; 0x0220B +nis; 0x022FC +nisd; 0x022FA +niv; 0x0220B +NJcy; 0x0040A +njcy; 0x0045A +nlarr; 0x0219A +nlArr; 0x021CD +nldr; 0x02025 +nlE; 0x02266 0x00338 +nle; 0x02270 +nleftarrow; 0x0219A +nLeftarrow; 0x021CD +nleftrightarrow; 0x021AE +nLeftrightarrow; 0x021CE +nleq; 0x02270 +nleqq; 0x02266 0x00338 +nleqslant; 0x02A7D 0x00338 +nles; 0x02A7D 0x00338 +nless; 0x0226E +nLl; 0x022D8 0x00338 +nlsim; 0x02274 +nLt; 0x0226A 0x020D2 +nlt; 0x0226E +nltri; 0x022EA +nltrie; 0x022EC +nLtv; 0x0226A 0x00338 +nmid; 0x02224 +NoBreak; 0x02060 +NonBreakingSpace; 0x000A0 +Nopf; 0x02115 +nopf; 0x1D55F +not; 0x000AC +not 0x000AC +Not; 0x02AEC +NotCongruent; 0x02262 +NotCupCap; 0x0226D +NotDoubleVerticalBar; 0x02226 +NotElement; 0x02209 +NotEqual; 0x02260 +NotEqualTilde; 0x02242 0x00338 +NotExists; 0x02204 +NotGreater; 0x0226F +NotGreaterEqual; 0x02271 +NotGreaterFullEqual; 0x02267 0x00338 +NotGreaterGreater; 0x0226B 0x00338 +NotGreaterLess; 0x02279 +NotGreaterSlantEqual; 0x02A7E 0x00338 +NotGreaterTilde; 0x02275 +NotHumpDownHump; 0x0224E 0x00338 +NotHumpEqual; 0x0224F 0x00338 +notin; 0x02209 +notindot; 0x022F5 0x00338 +notinE; 0x022F9 0x00338 +notinva; 0x02209 +notinvb; 0x022F7 +notinvc; 0x022F6 +NotLeftTriangle; 0x022EA +NotLeftTriangleBar; 0x029CF 0x00338 +NotLeftTriangleEqual; 0x022EC +NotLess; 0x0226E +NotLessEqual; 0x02270 +NotLessGreater; 0x02278 +NotLessLess; 0x0226A 0x00338 +NotLessSlantEqual; 0x02A7D 0x00338 +NotLessTilde; 0x02274 +NotNestedGreaterGreater; 0x02AA2 0x00338 +NotNestedLessLess; 0x02AA1 0x00338 +notni; 0x0220C +notniva; 0x0220C +notnivb; 0x022FE +notnivc; 0x022FD +NotPrecedes; 0x02280 +NotPrecedesEqual; 0x02AAF 0x00338 +NotPrecedesSlantEqual; 0x022E0 +NotReverseElement; 0x0220C +NotRightTriangle; 0x022EB +NotRightTriangleBar; 0x029D0 0x00338 +NotRightTriangleEqual; 0x022ED +NotSquareSubset; 0x0228F 0x00338 +NotSquareSubsetEqual; 0x022E2 +NotSquareSuperset; 0x02290 0x00338 +NotSquareSupersetEqual; 0x022E3 +NotSubset; 0x02282 0x020D2 +NotSubsetEqual; 0x02288 +NotSucceeds; 0x02281 +NotSucceedsEqual; 0x02AB0 0x00338 +NotSucceedsSlantEqual; 0x022E1 +NotSucceedsTilde; 0x0227F 0x00338 +NotSuperset; 0x02283 0x020D2 +NotSupersetEqual; 0x02289 +NotTilde; 0x02241 +NotTildeEqual; 0x02244 +NotTildeFullEqual; 0x02247 +NotTildeTilde; 0x02249 +NotVerticalBar; 0x02224 +npar; 0x02226 +nparallel; 0x02226 +nparsl; 0x02AFD 0x020E5 +npart; 0x02202 0x00338 +npolint; 0x02A14 +npr; 0x02280 +nprcue; 0x022E0 +npre; 0x02AAF 0x00338 +nprec; 0x02280 +npreceq; 0x02AAF 0x00338 +nrarr; 0x0219B +nrArr; 0x021CF +nrarrc; 0x02933 0x00338 +nrarrw; 0x0219D 0x00338 +nrightarrow; 0x0219B +nRightarrow; 0x021CF +nrtri; 0x022EB +nrtrie; 0x022ED +nsc; 0x02281 +nsccue; 0x022E1 +nsce; 0x02AB0 0x00338 +Nscr; 0x1D4A9 +nscr; 0x1D4C3 +nshortmid; 0x02224 +nshortparallel; 0x02226 +nsim; 0x02241 +nsime; 0x02244 +nsimeq; 0x02244 +nsmid; 0x02224 +nspar; 0x02226 +nsqsube; 0x022E2 +nsqsupe; 0x022E3 +nsub; 0x02284 +nsube; 0x02288 +nsubE; 0x02AC5 0x00338 +nsubset; 0x02282 0x020D2 +nsubseteq; 0x02288 +nsubseteqq; 0x02AC5 0x00338 +nsucc; 0x02281 +nsucceq; 0x02AB0 0x00338 +nsup; 0x02285 +nsupe; 0x02289 +nsupE; 0x02AC6 0x00338 +nsupset; 0x02283 0x020D2 +nsupseteq; 0x02289 +nsupseteqq; 0x02AC6 0x00338 +ntgl; 0x02279 +Ntilde; 0x000D1 +Ntilde 0x000D1 +ntilde; 0x000F1 +ntilde 0x000F1 +ntlg; 0x02278 +ntriangleleft; 0x022EA +ntrianglelefteq; 0x022EC +ntriangleright; 0x022EB +ntrianglerighteq; 0x022ED +Nu; 0x0039D +nu; 0x003BD +num; 0x00023 +numero; 0x02116 +numsp; 0x02007 +nvap; 0x0224D 0x020D2 +nvdash; 0x022AC +nvDash; 0x022AD +nVdash; 0x022AE +nVDash; 0x022AF +nvge; 0x02265 0x020D2 +nvgt; 0x0003E 0x020D2 +nvHarr; 0x02904 +nvinfin; 0x029DE +nvlArr; 0x02902 +nvle; 0x02264 0x020D2 +nvlt; 0x0003C 0x020D2 +nvltrie; 0x022B4 0x020D2 +nvrArr; 0x02903 +nvrtrie; 0x022B5 0x020D2 +nvsim; 0x0223C 0x020D2 +nwarhk; 0x02923 +nwarr; 0x02196 +nwArr; 0x021D6 +nwarrow; 0x02196 +nwnear; 0x02927 +Oacute; 0x000D3 +Oacute 0x000D3 +oacute; 0x000F3 +oacute 0x000F3 +oast; 0x0229B +ocir; 0x0229A +Ocirc; 0x000D4 +Ocirc 0x000D4 +ocirc; 0x000F4 +ocirc 0x000F4 +Ocy; 0x0041E +ocy; 0x0043E +odash; 0x0229D +Odblac; 0x00150 +odblac; 0x00151 +odiv; 0x02A38 +odot; 0x02299 +odsold; 0x029BC +OElig; 0x00152 +oelig; 0x00153 +ofcir; 0x029BF +Ofr; 0x1D512 +ofr; 0x1D52C +ogon; 0x002DB +Ograve; 0x000D2 +Ograve 0x000D2 +ograve; 0x000F2 +ograve 0x000F2 +ogt; 0x029C1 +ohbar; 0x029B5 +ohm; 0x003A9 +oint; 0x0222E +olarr; 0x021BA +olcir; 0x029BE +olcross; 0x029BB +oline; 0x0203E +olt; 0x029C0 +Omacr; 0x0014C +omacr; 0x0014D +Omega; 0x003A9 +omega; 0x003C9 +Omicron; 0x0039F +omicron; 0x003BF +omid; 0x029B6 +ominus; 0x02296 +Oopf; 0x1D546 +oopf; 0x1D560 +opar; 0x029B7 +OpenCurlyDoubleQuote; 0x0201C +OpenCurlyQuote; 0x02018 +operp; 0x029B9 +oplus; 0x02295 +or; 0x02228 +Or; 0x02A54 +orarr; 0x021BB +ord; 0x02A5D +order; 0x02134 +orderof; 0x02134 +ordf; 0x000AA +ordf 0x000AA +ordm; 0x000BA +ordm 0x000BA +origof; 0x022B6 +oror; 0x02A56 +orslope; 0x02A57 +orv; 0x02A5B +oS; 0x024C8 +oscr; 0x02134 +Oscr; 0x1D4AA +Oslash; 0x000D8 +Oslash 0x000D8 +oslash; 0x000F8 +oslash 0x000F8 +osol; 0x02298 +Otilde; 0x000D5 +Otilde 0x000D5 +otilde; 0x000F5 +otilde 0x000F5 +otimes; 0x02297 +Otimes; 0x02A37 +otimesas; 0x02A36 +Ouml; 0x000D6 +Ouml 0x000D6 +ouml; 0x000F6 +ouml 0x000F6 +ovbar; 0x0233D +OverBar; 0x0203E +OverBrace; 0x023DE +OverBracket; 0x023B4 +OverParenthesis; 0x023DC +par; 0x02225 +para; 0x000B6 +para 0x000B6 +parallel; 0x02225 +parsim; 0x02AF3 +parsl; 0x02AFD +part; 0x02202 +PartialD; 0x02202 +Pcy; 0x0041F +pcy; 0x0043F +percnt; 0x00025 +period; 0x0002E +permil; 0x02030 +perp; 0x022A5 +pertenk; 0x02031 +Pfr; 0x1D513 +pfr; 0x1D52D +Phi; 0x003A6 +phi; 0x003C6 +phiv; 0x003D5 +phmmat; 0x02133 +phone; 0x0260E +Pi; 0x003A0 +pi; 0x003C0 +pitchfork; 0x022D4 +piv; 0x003D6 +planck; 0x0210F +planckh; 0x0210E +plankv; 0x0210F +plus; 0x0002B +plusacir; 0x02A23 +plusb; 0x0229E +pluscir; 0x02A22 +plusdo; 0x02214 +plusdu; 0x02A25 +pluse; 0x02A72 +PlusMinus; 0x000B1 +plusmn; 0x000B1 +plusmn 0x000B1 +plussim; 0x02A26 +plustwo; 0x02A27 +pm; 0x000B1 +Poincareplane; 0x0210C +pointint; 0x02A15 +Popf; 0x02119 +popf; 0x1D561 +pound; 0x000A3 +pound 0x000A3 +pr; 0x0227A +Pr; 0x02ABB +prap; 0x02AB7 +prcue; 0x0227C +pre; 0x02AAF +prE; 0x02AB3 +prec; 0x0227A +precapprox; 0x02AB7 +preccurlyeq; 0x0227C +Precedes; 0x0227A +PrecedesEqual; 0x02AAF +PrecedesSlantEqual; 0x0227C +PrecedesTilde; 0x0227E +preceq; 0x02AAF +precnapprox; 0x02AB9 +precneqq; 0x02AB5 +precnsim; 0x022E8 +precsim; 0x0227E +prime; 0x02032 +Prime; 0x02033 +primes; 0x02119 +prnap; 0x02AB9 +prnE; 0x02AB5 +prnsim; 0x022E8 +prod; 0x0220F +Product; 0x0220F +profalar; 0x0232E +profline; 0x02312 +profsurf; 0x02313 +prop; 0x0221D +Proportion; 0x02237 +Proportional; 0x0221D +propto; 0x0221D +prsim; 0x0227E +prurel; 0x022B0 +Pscr; 0x1D4AB +pscr; 0x1D4C5 +Psi; 0x003A8 +psi; 0x003C8 +puncsp; 0x02008 +Qfr; 0x1D514 +qfr; 0x1D52E +qint; 0x02A0C +Qopf; 0x0211A +qopf; 0x1D562 +qprime; 0x02057 +Qscr; 0x1D4AC +qscr; 0x1D4C6 +quaternions; 0x0210D +quatint; 0x02A16 +quest; 0x0003F +questeq; 0x0225F +quot; 0x00022 +quot 0x00022 +QUOT; 0x00022 +QUOT 0x00022 +rAarr; 0x021DB +race; 0x0223D 0x00331 +Racute; 0x00154 +racute; 0x00155 +radic; 0x0221A +raemptyv; 0x029B3 +rang; 0x027E9 +Rang; 0x027EB +rangd; 0x02992 +range; 0x029A5 +rangle; 0x027E9 +raquo; 0x000BB +raquo 0x000BB +rarr; 0x02192 +Rarr; 0x021A0 +rArr; 0x021D2 +rarrap; 0x02975 +rarrb; 0x021E5 +rarrbfs; 0x02920 +rarrc; 0x02933 +rarrfs; 0x0291E +rarrhk; 0x021AA +rarrlp; 0x021AC +rarrpl; 0x02945 +rarrsim; 0x02974 +rarrtl; 0x021A3 +Rarrtl; 0x02916 +rarrw; 0x0219D +ratail; 0x0291A +rAtail; 0x0291C +ratio; 0x02236 +rationals; 0x0211A +rbarr; 0x0290D +rBarr; 0x0290F +RBarr; 0x02910 +rbbrk; 0x02773 +rbrace; 0x0007D +rbrack; 0x0005D +rbrke; 0x0298C +rbrksld; 0x0298E +rbrkslu; 0x02990 +Rcaron; 0x00158 +rcaron; 0x00159 +Rcedil; 0x00156 +rcedil; 0x00157 +rceil; 0x02309 +rcub; 0x0007D +Rcy; 0x00420 +rcy; 0x00440 +rdca; 0x02937 +rdldhar; 0x02969 +rdquo; 0x0201D +rdquor; 0x0201D +rdsh; 0x021B3 +Re; 0x0211C +real; 0x0211C +realine; 0x0211B +realpart; 0x0211C +reals; 0x0211D +rect; 0x025AD +reg; 0x000AE +reg 0x000AE +REG; 0x000AE +REG 0x000AE +ReverseElement; 0x0220B +ReverseEquilibrium; 0x021CB +ReverseUpEquilibrium; 0x0296F +rfisht; 0x0297D +rfloor; 0x0230B +Rfr; 0x0211C +rfr; 0x1D52F +rHar; 0x02964 +rhard; 0x021C1 +rharu; 0x021C0 +rharul; 0x0296C +Rho; 0x003A1 +rho; 0x003C1 +rhov; 0x003F1 +RightAngleBracket; 0x027E9 +rightarrow; 0x02192 +RightArrow; 0x02192 +Rightarrow; 0x021D2 +RightArrowBar; 0x021E5 +RightArrowLeftArrow; 0x021C4 +rightarrowtail; 0x021A3 +RightCeiling; 0x02309 +RightDoubleBracket; 0x027E7 +RightDownTeeVector; 0x0295D +RightDownVector; 0x021C2 +RightDownVectorBar; 0x02955 +RightFloor; 0x0230B +rightharpoondown; 0x021C1 +rightharpoonup; 0x021C0 +rightleftarrows; 0x021C4 +rightleftharpoons; 0x021CC +rightrightarrows; 0x021C9 +rightsquigarrow; 0x0219D +RightTee; 0x022A2 +RightTeeArrow; 0x021A6 +RightTeeVector; 0x0295B +rightthreetimes; 0x022CC +RightTriangle; 0x022B3 +RightTriangleBar; 0x029D0 +RightTriangleEqual; 0x022B5 +RightUpDownVector; 0x0294F +RightUpTeeVector; 0x0295C +RightUpVector; 0x021BE +RightUpVectorBar; 0x02954 +RightVector; 0x021C0 +RightVectorBar; 0x02953 +ring; 0x002DA +risingdotseq; 0x02253 +rlarr; 0x021C4 +rlhar; 0x021CC +rlm; 0x0200F +rmoust; 0x023B1 +rmoustache; 0x023B1 +rnmid; 0x02AEE +roang; 0x027ED +roarr; 0x021FE +robrk; 0x027E7 +ropar; 0x02986 +Ropf; 0x0211D +ropf; 0x1D563 +roplus; 0x02A2E +rotimes; 0x02A35 +RoundImplies; 0x02970 +rpar; 0x00029 +rpargt; 0x02994 +rppolint; 0x02A12 +rrarr; 0x021C9 +Rrightarrow; 0x021DB +rsaquo; 0x0203A +Rscr; 0x0211B +rscr; 0x1D4C7 +rsh; 0x021B1 +Rsh; 0x021B1 +rsqb; 0x0005D +rsquo; 0x02019 +rsquor; 0x02019 +rthree; 0x022CC +rtimes; 0x022CA +rtri; 0x025B9 +rtrie; 0x022B5 +rtrif; 0x025B8 +rtriltri; 0x029CE +RuleDelayed; 0x029F4 +ruluhar; 0x02968 +rx; 0x0211E +Sacute; 0x0015A +sacute; 0x0015B +sbquo; 0x0201A +sc; 0x0227B +Sc; 0x02ABC +scap; 0x02AB8 +Scaron; 0x00160 +scaron; 0x00161 +sccue; 0x0227D +sce; 0x02AB0 +scE; 0x02AB4 +Scedil; 0x0015E +scedil; 0x0015F +Scirc; 0x0015C +scirc; 0x0015D +scnap; 0x02ABA +scnE; 0x02AB6 +scnsim; 0x022E9 +scpolint; 0x02A13 +scsim; 0x0227F +Scy; 0x00421 +scy; 0x00441 +sdot; 0x022C5 +sdotb; 0x022A1 +sdote; 0x02A66 +searhk; 0x02925 +searr; 0x02198 +seArr; 0x021D8 +searrow; 0x02198 +sect; 0x000A7 +sect 0x000A7 +semi; 0x0003B +seswar; 0x02929 +setminus; 0x02216 +setmn; 0x02216 +sext; 0x02736 +Sfr; 0x1D516 +sfr; 0x1D530 +sfrown; 0x02322 +sharp; 0x0266F +SHCHcy; 0x00429 +shchcy; 0x00449 +SHcy; 0x00428 +shcy; 0x00448 +ShortDownArrow; 0x02193 +ShortLeftArrow; 0x02190 +shortmid; 0x02223 +shortparallel; 0x02225 +ShortRightArrow; 0x02192 +ShortUpArrow; 0x02191 +shy; 0x000AD +shy 0x000AD +Sigma; 0x003A3 +sigma; 0x003C3 +sigmaf; 0x003C2 +sigmav; 0x003C2 +sim; 0x0223C +simdot; 0x02A6A +sime; 0x02243 +simeq; 0x02243 +simg; 0x02A9E +simgE; 0x02AA0 +siml; 0x02A9D +simlE; 0x02A9F +simne; 0x02246 +simplus; 0x02A24 +simrarr; 0x02972 +slarr; 0x02190 +SmallCircle; 0x02218 +smallsetminus; 0x02216 +smashp; 0x02A33 +smeparsl; 0x029E4 +smid; 0x02223 +smile; 0x02323 +smt; 0x02AAA +smte; 0x02AAC +smtes; 0x02AAC 0x0FE00 +SOFTcy; 0x0042C +softcy; 0x0044C +sol; 0x0002F +solb; 0x029C4 +solbar; 0x0233F +Sopf; 0x1D54A +sopf; 0x1D564 +spades; 0x02660 +spadesuit; 0x02660 +spar; 0x02225 +sqcap; 0x02293 +sqcaps; 0x02293 0x0FE00 +sqcup; 0x02294 +sqcups; 0x02294 0x0FE00 +Sqrt; 0x0221A +sqsub; 0x0228F +sqsube; 0x02291 +sqsubset; 0x0228F +sqsubseteq; 0x02291 +sqsup; 0x02290 +sqsupe; 0x02292 +sqsupset; 0x02290 +sqsupseteq; 0x02292 +squ; 0x025A1 +square; 0x025A1 +Square; 0x025A1 +SquareIntersection; 0x02293 +SquareSubset; 0x0228F +SquareSubsetEqual; 0x02291 +SquareSuperset; 0x02290 +SquareSupersetEqual; 0x02292 +SquareUnion; 0x02294 +squarf; 0x025AA +squf; 0x025AA +srarr; 0x02192 +Sscr; 0x1D4AE +sscr; 0x1D4C8 +ssetmn; 0x02216 +ssmile; 0x02323 +sstarf; 0x022C6 +Star; 0x022C6 +star; 0x02606 +starf; 0x02605 +straightepsilon; 0x003F5 +straightphi; 0x003D5 +strns; 0x000AF +sub; 0x02282 +Sub; 0x022D0 +subdot; 0x02ABD +sube; 0x02286 +subE; 0x02AC5 +subedot; 0x02AC3 +submult; 0x02AC1 +subne; 0x0228A +subnE; 0x02ACB +subplus; 0x02ABF +subrarr; 0x02979 +subset; 0x02282 +Subset; 0x022D0 +subseteq; 0x02286 +subseteqq; 0x02AC5 +SubsetEqual; 0x02286 +subsetneq; 0x0228A +subsetneqq; 0x02ACB +subsim; 0x02AC7 +subsub; 0x02AD5 +subsup; 0x02AD3 +succ; 0x0227B +succapprox; 0x02AB8 +succcurlyeq; 0x0227D +Succeeds; 0x0227B +SucceedsEqual; 0x02AB0 +SucceedsSlantEqual; 0x0227D +SucceedsTilde; 0x0227F +succeq; 0x02AB0 +succnapprox; 0x02ABA +succneqq; 0x02AB6 +succnsim; 0x022E9 +succsim; 0x0227F +SuchThat; 0x0220B +sum; 0x02211 +Sum; 0x02211 +sung; 0x0266A +sup; 0x02283 +Sup; 0x022D1 +sup1; 0x000B9 +sup1 0x000B9 +sup2; 0x000B2 +sup2 0x000B2 +sup3; 0x000B3 +sup3 0x000B3 +supdot; 0x02ABE +supdsub; 0x02AD8 +supe; 0x02287 +supE; 0x02AC6 +supedot; 0x02AC4 +Superset; 0x02283 +SupersetEqual; 0x02287 +suphsol; 0x027C9 +suphsub; 0x02AD7 +suplarr; 0x0297B +supmult; 0x02AC2 +supne; 0x0228B +supnE; 0x02ACC +supplus; 0x02AC0 +supset; 0x02283 +Supset; 0x022D1 +supseteq; 0x02287 +supseteqq; 0x02AC6 +supsetneq; 0x0228B +supsetneqq; 0x02ACC +supsim; 0x02AC8 +supsub; 0x02AD4 +supsup; 0x02AD6 +swarhk; 0x02926 +swarr; 0x02199 +swArr; 0x021D9 +swarrow; 0x02199 +swnwar; 0x0292A +szlig; 0x000DF +szlig 0x000DF +Tab; 0x00009 +target; 0x02316 +Tau; 0x003A4 +tau; 0x003C4 +tbrk; 0x023B4 +Tcaron; 0x00164 +tcaron; 0x00165 +Tcedil; 0x00162 +tcedil; 0x00163 +Tcy; 0x00422 +tcy; 0x00442 +tdot; 0x020DB +telrec; 0x02315 +Tfr; 0x1D517 +tfr; 0x1D531 +there4; 0x02234 +therefore; 0x02234 +Therefore; 0x02234 +Theta; 0x00398 +theta; 0x003B8 +thetasym; 0x003D1 +thetav; 0x003D1 +thickapprox; 0x02248 +thicksim; 0x0223C +ThickSpace; 0x0205F 0x0200A +thinsp; 0x02009 +ThinSpace; 0x02009 +thkap; 0x02248 +thksim; 0x0223C +THORN; 0x000DE +THORN 0x000DE +thorn; 0x000FE +thorn 0x000FE +tilde; 0x002DC +Tilde; 0x0223C +TildeEqual; 0x02243 +TildeFullEqual; 0x02245 +TildeTilde; 0x02248 +times; 0x000D7 +times 0x000D7 +timesb; 0x022A0 +timesbar; 0x02A31 +timesd; 0x02A30 +tint; 0x0222D +toea; 0x02928 +top; 0x022A4 +topbot; 0x02336 +topcir; 0x02AF1 +Topf; 0x1D54B +topf; 0x1D565 +topfork; 0x02ADA +tosa; 0x02929 +tprime; 0x02034 +trade; 0x02122 +TRADE; 0x02122 +triangle; 0x025B5 +triangledown; 0x025BF +triangleleft; 0x025C3 +trianglelefteq; 0x022B4 +triangleq; 0x0225C +triangleright; 0x025B9 +trianglerighteq; 0x022B5 +tridot; 0x025EC +trie; 0x0225C +triminus; 0x02A3A +TripleDot; 0x020DB +triplus; 0x02A39 +trisb; 0x029CD +tritime; 0x02A3B +trpezium; 0x023E2 +Tscr; 0x1D4AF +tscr; 0x1D4C9 +TScy; 0x00426 +tscy; 0x00446 +TSHcy; 0x0040B +tshcy; 0x0045B +Tstrok; 0x00166 +tstrok; 0x00167 +twixt; 0x0226C +twoheadleftarrow; 0x0219E +twoheadrightarrow; 0x021A0 +Uacute; 0x000DA +Uacute 0x000DA +uacute; 0x000FA +uacute 0x000FA +uarr; 0x02191 +Uarr; 0x0219F +uArr; 0x021D1 +Uarrocir; 0x02949 +Ubrcy; 0x0040E +ubrcy; 0x0045E +Ubreve; 0x0016C +ubreve; 0x0016D +Ucirc; 0x000DB +Ucirc 0x000DB +ucirc; 0x000FB +ucirc 0x000FB +Ucy; 0x00423 +ucy; 0x00443 +udarr; 0x021C5 +Udblac; 0x00170 +udblac; 0x00171 +udhar; 0x0296E +ufisht; 0x0297E +Ufr; 0x1D518 +ufr; 0x1D532 +Ugrave; 0x000D9 +Ugrave 0x000D9 +ugrave; 0x000F9 +ugrave 0x000F9 +uHar; 0x02963 +uharl; 0x021BF +uharr; 0x021BE +uhblk; 0x02580 +ulcorn; 0x0231C +ulcorner; 0x0231C +ulcrop; 0x0230F +ultri; 0x025F8 +Umacr; 0x0016A +umacr; 0x0016B +uml; 0x000A8 +uml 0x000A8 +UnderBar; 0x0005F +UnderBrace; 0x023DF +UnderBracket; 0x023B5 +UnderParenthesis; 0x023DD +Union; 0x022C3 +UnionPlus; 0x0228E +Uogon; 0x00172 +uogon; 0x00173 +Uopf; 0x1D54C +uopf; 0x1D566 +uparrow; 0x02191 +UpArrow; 0x02191 +Uparrow; 0x021D1 +UpArrowBar; 0x02912 +UpArrowDownArrow; 0x021C5 +updownarrow; 0x02195 +UpDownArrow; 0x02195 +Updownarrow; 0x021D5 +UpEquilibrium; 0x0296E +upharpoonleft; 0x021BF +upharpoonright; 0x021BE +uplus; 0x0228E +UpperLeftArrow; 0x02196 +UpperRightArrow; 0x02197 +upsi; 0x003C5 +Upsi; 0x003D2 +upsih; 0x003D2 +Upsilon; 0x003A5 +upsilon; 0x003C5 +UpTee; 0x022A5 +UpTeeArrow; 0x021A5 +upuparrows; 0x021C8 +urcorn; 0x0231D +urcorner; 0x0231D +urcrop; 0x0230E +Uring; 0x0016E +uring; 0x0016F +urtri; 0x025F9 +Uscr; 0x1D4B0 +uscr; 0x1D4CA +utdot; 0x022F0 +Utilde; 0x00168 +utilde; 0x00169 +utri; 0x025B5 +utrif; 0x025B4 +uuarr; 0x021C8 +Uuml; 0x000DC +Uuml 0x000DC +uuml; 0x000FC +uuml 0x000FC +uwangle; 0x029A7 +vangrt; 0x0299C +varepsilon; 0x003F5 +varkappa; 0x003F0 +varnothing; 0x02205 +varphi; 0x003D5 +varpi; 0x003D6 +varpropto; 0x0221D +varr; 0x02195 +vArr; 0x021D5 +varrho; 0x003F1 +varsigma; 0x003C2 +varsubsetneq; 0x0228A 0x0FE00 +varsubsetneqq; 0x02ACB 0x0FE00 +varsupsetneq; 0x0228B 0x0FE00 +varsupsetneqq; 0x02ACC 0x0FE00 +vartheta; 0x003D1 +vartriangleleft; 0x022B2 +vartriangleright; 0x022B3 +vBar; 0x02AE8 +Vbar; 0x02AEB +vBarv; 0x02AE9 +Vcy; 0x00412 +vcy; 0x00432 +vdash; 0x022A2 +vDash; 0x022A8 +Vdash; 0x022A9 +VDash; 0x022AB +Vdashl; 0x02AE6 +vee; 0x02228 +Vee; 0x022C1 +veebar; 0x022BB +veeeq; 0x0225A +vellip; 0x022EE +verbar; 0x0007C +Verbar; 0x02016 +vert; 0x0007C +Vert; 0x02016 +VerticalBar; 0x02223 +VerticalLine; 0x0007C +VerticalSeparator; 0x02758 +VerticalTilde; 0x02240 +VeryThinSpace; 0x0200A +Vfr; 0x1D519 +vfr; 0x1D533 +vltri; 0x022B2 +vnsub; 0x02282 0x020D2 +vnsup; 0x02283 0x020D2 +Vopf; 0x1D54D +vopf; 0x1D567 +vprop; 0x0221D +vrtri; 0x022B3 +Vscr; 0x1D4B1 +vscr; 0x1D4CB +vsubne; 0x0228A 0x0FE00 +vsubnE; 0x02ACB 0x0FE00 +vsupne; 0x0228B 0x0FE00 +vsupnE; 0x02ACC 0x0FE00 +Vvdash; 0x022AA +vzigzag; 0x0299A +Wcirc; 0x00174 +wcirc; 0x00175 +wedbar; 0x02A5F +wedge; 0x02227 +Wedge; 0x022C0 +wedgeq; 0x02259 +weierp; 0x02118 +Wfr; 0x1D51A +wfr; 0x1D534 +Wopf; 0x1D54E +wopf; 0x1D568 +wp; 0x02118 +wr; 0x02240 +wreath; 0x02240 +Wscr; 0x1D4B2 +wscr; 0x1D4CC +xcap; 0x022C2 +xcirc; 0x025EF +xcup; 0x022C3 +xdtri; 0x025BD +Xfr; 0x1D51B +xfr; 0x1D535 +xharr; 0x027F7 +xhArr; 0x027FA +Xi; 0x0039E +xi; 0x003BE +xlarr; 0x027F5 +xlArr; 0x027F8 +xmap; 0x027FC +xnis; 0x022FB +xodot; 0x02A00 +Xopf; 0x1D54F +xopf; 0x1D569 +xoplus; 0x02A01 +xotime; 0x02A02 +xrarr; 0x027F6 +xrArr; 0x027F9 +Xscr; 0x1D4B3 +xscr; 0x1D4CD +xsqcup; 0x02A06 +xuplus; 0x02A04 +xutri; 0x025B3 +xvee; 0x022C1 +xwedge; 0x022C0 +Yacute; 0x000DD +Yacute 0x000DD +yacute; 0x000FD +yacute 0x000FD +YAcy; 0x0042F +yacy; 0x0044F +Ycirc; 0x00176 +ycirc; 0x00177 +Ycy; 0x0042B +ycy; 0x0044B +yen; 0x000A5 +yen 0x000A5 +Yfr; 0x1D51C +yfr; 0x1D536 +YIcy; 0x00407 +yicy; 0x00457 +Yopf; 0x1D550 +yopf; 0x1D56A +Yscr; 0x1D4B4 +yscr; 0x1D4CE +YUcy; 0x0042E +yucy; 0x0044E +yuml; 0x000FF +yuml 0x000FF +Yuml; 0x00178 +Zacute; 0x00179 +zacute; 0x0017A +Zcaron; 0x0017D +zcaron; 0x0017E +Zcy; 0x00417 +zcy; 0x00437 +Zdot; 0x0017B +zdot; 0x0017C +zeetrf; 0x02128 +ZeroWidthSpace; 0x0200B +Zeta; 0x00396 +zeta; 0x003B6 +Zfr; 0x02128 +zfr; 0x1D537 +ZHcy; 0x00416 +zhcy; 0x00436 +zigrarr; 0x021DD +Zopf; 0x02124 +zopf; 0x1D56B +Zscr; 0x1D4B5 +zscr; 0x1D4CF +zwj; 0x0200D +zwnj; 0x0200C diff --git a/build/make-entities.pl b/build/make-entities.pl index 7492052..ff4113f 100644 --- a/build/make-entities.pl +++ b/build/make-entities.pl @@ -4,8 +4,10 @@ # http://www.opensource.org/licenses/mit-license.php # Copyright 2010 Daniel Silverstone <dsilvers(a)netsurf-browser.org> # John-Mark Bell <jmb(a)netsurf-browser.org> +# Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> use strict; +use Encode; use constant ENTITIES_FILE => 'build/Entities'; use constant ENTITIES_INC => 'src/tokeniser/entities.inc'; @@ -21,8 +23,25 @@ while (my $line = <INFILE>) { next if ($line eq ''); my @elements = split /\s+/, $line; my $entity = shift @elements; - my $code = shift @elements; - $entities{$entity} = $code; + my $len = 0; + my $code=""; + while (@elements) { + my $ucs4 = hex(shift(@elements)); + my $utf8 = Encode::encode_utf8(pack('U', $ucs4)); + $len += length($utf8); + if ($ucs4 < 0x20 || $ucs4 == 0x22 || + $ucs4 == 0x27 || $ucs4 == 0x5C || + $ucs4 >= 0x7f) { + # Unsafe, or non-ASCII: emit escaped + for my $octet (unpack('C*', $utf8)) { + $code = $code . sprintf("\\x%02x", $octet); + } + } else { + # Safe: emit value + $code = $code . $utf8; + } + } + $entities{$entity} = "(const uint8_t *)\"$code\",$len"; } close(INFILE); @@ -113,9 +132,9 @@ foreach my $node (@nodelist) { $split = ord($split) if ($split ne ''); $split = 0 if ($split eq ''); - $value = "0" unless defined($value); + $value = "NULL,0" unless defined($value); - $output .= "\t{ $split, $lt, $eq, $gt, $value },\n"; + $output .= "\t{ $split, $lt, $eq, $gt, {$value} },\n"; } $output .= "};\n\n"; diff --git a/src/tokeniser/entities.c b/src/tokeniser/entities.c index ac47d80..298b2cf 100644 --- a/src/tokeniser/entities.c +++ b/src/tokeniser/entities.c @@ -7,15 +7,20 @@ #include "utils/utils.h" #include "tokeniser/entities.h" +/** + * UTF-8 encoding of U+FFFD REPLACEMENT CHARACTER + */ +static const uint8_t u_fffd[3] = { '\xEF', '\xBF', '\xBD' }; +static const hubbub_string u_fffd_str = { u_fffd, sizeof(u_fffd) }; /** Node in our entity tree */ typedef struct hubbub_entity_node { - /* Do not reorder this without fixing make-entities.pl */ + /* Do not reorder this without fixing make-entities.pl */ uint8_t split; /**< Data to split on */ int32_t lt; /**< Subtree for data less than split */ int32_t eq; /**< Subtree for data equal to split */ int32_t gt; /**< Subtree for data greater than split */ - uint32_t value; /**< Data for this node */ + hubbub_string value; /**< Data for this node */ } hubbub_entity_node; #include "entities.inc" @@ -38,7 +43,7 @@ typedef struct hubbub_entity_node { * is found. */ static hubbub_error hubbub_entity_tree_search_step(uint8_t c, - uint32_t *result, int32_t *context) + hubbub_string *result, int32_t *context) { bool match = false; int32_t p; @@ -63,7 +68,7 @@ static hubbub_error hubbub_entity_tree_search_step(uint8_t c, match = true; *result = dict[dict[p].eq].value; p = dict[p].eq; - } else if (dict[p].value != 0) { + } else if (dict[p].value.ptr != NULL) { match = true; *result = dict[p].value; p = dict[p].eq; @@ -100,13 +105,13 @@ static hubbub_error hubbub_entity_tree_search_step(uint8_t c, * The location pointed to by ::result will be set to U+FFFD unless a match * is found. */ -hubbub_error hubbub_entities_search_step(uint8_t c, uint32_t *result, +hubbub_error hubbub_entities_search_step(uint8_t c, hubbub_string *result, int32_t *context) { if (result == NULL) return HUBBUB_BADPARM; - *result = 0xFFFD; - + *result = u_fffd_str; + return hubbub_entity_tree_search_step(c, result, context); } diff --git a/src/tokeniser/entities.h b/src/tokeniser/entities.h index 0703b37..a8b9bbf 100644 --- a/src/tokeniser/entities.h +++ b/src/tokeniser/entities.h @@ -14,7 +14,7 @@ #include <hubbub/functypes.h> /* Step-wise search for an entity in the dictionary */ -hubbub_error hubbub_entities_search_step(uint8_t c, uint32_t *result, +hubbub_error hubbub_entities_search_step(uint8_t c, hubbub_string *result, int32_t *context); #endif diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index a7e67a1..563dd48 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -4,6 +4,7 @@ * http://www.opensource.org/licenses/mit-license.php * Copyright 2007 John-Mark Bell <jmb(a)netsurf-browser.org> * Copyright 2008 Andrew Sidwell <takkaria(a)netsurf-browser.org> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ #include <assert.h> #include <stdbool.h> @@ -128,7 +129,7 @@ typedef struct hubbub_tokeniser_context { struct { size_t offset; /**< Offset in buffer */ uint32_t length; /**< Length of entity */ - uint32_t codepoint; /**< UCS4 codepoint */ + hubbub_string codepoint; /**< UTF-8 codepoint */ bool complete; /**< True if match complete */ uint32_t poss_length; /**< Optimistic length @@ -147,6 +148,12 @@ typedef struct hubbub_tokeniser_context { * numeric entity value */ hubbub_tokeniser_state return_state; /**< State we were * called from */ + union { + uint32_t ucs4; /**<UCS-4 value for numeric + * entity*/ + uint8_t numeric_buf[6]; /**<UTF-8 value for numeric + * entity */ + } numeric_state; } match_entity; /**< Entity matching state */ struct { @@ -810,19 +817,12 @@ hubbub_error hubbub_tokeniser_handle_character_reference_data( } else { hubbub_token token; - uint8_t utf8[6]; - uint8_t *utf8ptr = utf8; - size_t len = sizeof(utf8); - token.type = HUBBUB_TOKEN_CHARACTER; - - if (tokeniser->context.match_entity.codepoint) { - parserutils_charset_utf8_from_ucs4( - tokeniser->context.match_entity.codepoint, - &utf8ptr, &len); - - token.data.character.ptr = utf8; - token.data.character.len = sizeof(utf8) - len; + if (tokeniser->context.match_entity.codepoint.ptr != NULL) { + token.data.character.ptr = + tokeniser->context.match_entity.codepoint.ptr; + token.data.character.len = + tokeniser->context.match_entity.codepoint.len; hubbub_tokeniser_emit_token(tokeniser, &token); @@ -833,6 +833,7 @@ hubbub_error hubbub_tokeniser_handle_character_reference_data( } else { parserutils_error error; const uint8_t *cptr = NULL; + size_t len; error = parserutils_inputstream_peek( tokeniser->input, @@ -1607,23 +1608,17 @@ hubbub_error hubbub_tokeniser_handle_character_reference_in_attribute_value( hubbub_attribute *attr = &ctag->attributes[ ctag->n_attributes - 1]; - uint8_t utf8[6]; - uint8_t *utf8ptr = utf8; - size_t len = sizeof(utf8); - - if (tokeniser->context.match_entity.codepoint) { - parserutils_charset_utf8_from_ucs4( - tokeniser->context.match_entity.codepoint, - &utf8ptr, &len); - - COLLECT_MS(attr->value, utf8, sizeof(utf8) - len); + if (tokeniser->context.match_entity.codepoint.ptr != NULL) { + COLLECT_MS(attr->value, + tokeniser->context.match_entity.codepoint.ptr, + tokeniser->context.match_entity.codepoint.len); /* +1 for the ampersand */ tokeniser->context.pending += tokeniser->context.match_entity.length + 1; } else { - size_t len = 0; + size_t len; const uint8_t *cptr = NULL; parserutils_error error; @@ -2899,7 +2894,9 @@ hubbub_error hubbub_tokeniser_consume_character_reference( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->context.match_entity.complete = true; - tokeniser->context.match_entity.codepoint = 0; + tokeniser->context.match_entity.codepoint.len = 0; + tokeniser->context.match_entity.codepoint.ptr = NULL; + tokeniser->context.match_entity.numeric_state.ucs4 = 0; return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); @@ -2913,13 +2910,15 @@ hubbub_error hubbub_tokeniser_consume_character_reference( tokeniser->context.match_entity.poss_length = 0; tokeniser->context.match_entity.length = 0; tokeniser->context.match_entity.base = 0; - tokeniser->context.match_entity.codepoint = 0; tokeniser->context.match_entity.had_data = false; tokeniser->context.match_entity.return_state = tokeniser->state; tokeniser->context.match_entity.complete = false; tokeniser->context.match_entity.overflow = false; tokeniser->context.match_entity.context = -1; tokeniser->context.match_entity.prev_len = len; + tokeniser->context.match_entity.numeric_state.ucs4 = 0; + tokeniser->context.match_entity.codepoint.ptr = NULL; + tokeniser->context.match_entity.codepoint.len = 0; /* Reset allowed character for future calls */ tokeniser->context.allowed_char = '\0'; @@ -2928,7 +2927,6 @@ hubbub_error hubbub_tokeniser_consume_character_reference( c == '<' || c == '&' || (allowed_char && c == allowed_char)) { tokeniser->context.match_entity.complete = true; - tokeniser->context.match_entity.codepoint = 0; } else if (c == '#') { tokeniser->context.match_entity.length += len; tokeniser->state = STATE_NUMBERED_ENTITY; @@ -2975,22 +2973,22 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( if (ctx->match_entity.base == 10 && ('0' <= c && c <= '9')) { ctx->match_entity.had_data = true; - ctx->match_entity.codepoint = - ctx->match_entity.codepoint * 10 + (c - '0'); - + ctx->match_entity.numeric_state.ucs4 = + ctx->match_entity.numeric_state.ucs4 * 10 + (c - '0'); ctx->match_entity.length += len; } else if (ctx->match_entity.base == 16 && (('0' <= c && c <= '9') || ('A' <= (c & ~0x20) && (c & ~0x20) <= 'F'))) { ctx->match_entity.had_data = true; - ctx->match_entity.codepoint *= 16; + ctx->match_entity.numeric_state.ucs4 *= 16; if ('0' <= c && c <= '9') { - ctx->match_entity.codepoint += (c - '0'); + ctx->match_entity.numeric_state.ucs4 += + (c-'0'); } else { - ctx->match_entity.codepoint += - ((c & ~0x20) - 'A' + 10); + ctx->match_entity.numeric_state.ucs4 += + ((c & ~0x20) - 'A' + 10); } ctx->match_entity.length += len; @@ -2998,7 +2996,7 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( break; } - if (ctx->match_entity.codepoint >= 0x10FFFF) { + if (ctx->match_entity.numeric_state.ucs4 >= 0x10FFFF) { ctx->match_entity.overflow = true; } } @@ -3014,7 +3012,8 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( /* Had data, so calculate final codepoint */ if (ctx->match_entity.had_data) { - uint32_t cp = ctx->match_entity.codepoint; + uint32_t cp = + ctx->match_entity.numeric_state.ucs4; if (0x80 <= cp && cp <= 0x9F) { cp = cp1252Table[cp - 0x80]; @@ -3031,8 +3030,22 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( * in the loop above to avoid overflow */ cp = 0xFFFD; } + ctx->match_entity.numeric_state.ucs4 = cp; + + /*Convert UCS-4 to UTF-8*/ + uint8_t *utf8_ptr= + (ctx->match_entity.numeric_state.numeric_buf); + size_t buf_len= + sizeof(ctx->match_entity.numeric_state.numeric_buf); + parserutils_charset_utf8_from_ucs4( + ctx->match_entity.numeric_state.ucs4, + &utf8_ptr, + &buf_len); + ctx->match_entity.codepoint.ptr= + (ctx->match_entity.numeric_state.numeric_buf); + ctx->match_entity.codepoint.len= + sizeof(ctx->match_entity.numeric_state.numeric_buf)-buf_len; - ctx->match_entity.codepoint = cp; } /* Flag completion */ @@ -3056,11 +3069,10 @@ hubbub_error hubbub_tokeniser_handle_named_entity(hubbub_tokeniser *tokeniser) ctx->match_entity.offset + ctx->match_entity.poss_length, &cptr, &len)) == PARSERUTILS_OK) { - uint32_t cp; + hubbub_string cp; uint8_t c = *cptr; hubbub_error error; - if (c > 0x7F) { /* Entity names are ASCII only */ break; @@ -3119,14 +3131,16 @@ hubbub_error hubbub_tokeniser_handle_named_entity(hubbub_tokeniser *tokeniser) error == PARSERUTILS_EOF); if (error == PARSERUTILS_EOF) { - ctx->match_entity.codepoint = 0; + ctx->match_entity.codepoint.len = 0; + ctx->match_entity.codepoint.ptr = NULL; } c = *cptr; if ((0x0030 <= c && c <= 0x0039) || (0x0041 <= c && c <= 0x005A) || (0x0061 <= c && c <= 0x007A)) { - ctx->match_entity.codepoint = 0; + ctx->match_entity.codepoint.len = 0; + ctx->match_entity.codepoint.ptr = NULL; } } } diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 67475c4..57c0cad 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -14,7 +14,7 @@ test1.test html5lib tests (part 1) cdata.test CDATA section tests #regression.test Regression tests #domjs.test NA -#namedEntities.test html5lib named entities tests +namedEntities.test html5lib named entities tests #pendingSpecChanges.test NA #unicodeCharsProblematic.test NA #xmlViolation.test NA diff --git a/test/entities.c b/test/entities.c index f730f17..51efc95 100644 --- a/test/entities.c +++ b/test/entities.c @@ -4,7 +4,7 @@ int main(int argc, char **argv) { - uint32_t result; + hubbub_string result; int32_t context = -1; UNUSED(argc); ----------------------------------------------------------------------- Summary of changes: build/Entities | 4370 ++++++++++++++++++++++---------------------- build/make-entities.pl | 27 +- src/tokeniser/entities.c | 19 +- src/tokeniser/entities.h | 2 +- src/tokeniser/tokeniser.c | 96 +- test/data/tokeniser2/INDEX | 2 +- test/entities.c | 2 +- 7 files changed, 2325 insertions(+), 2193 deletions(-) diff --git a/build/Entities b/build/Entities index f067008..2c64826 100644 --- a/build/Entities +++ b/build/Entities @@ -2,2141 +2,2235 @@ # Note, some entities are allowed to omit their trailing semicolon, which is # why most entities here have semicolons after them. -# Entity Code -Aacute; 0x000C1 -Aacute 0x000C1 -aacute; 0x000E1 -aacute 0x000E1 -Abreve; 0x00102 -abreve; 0x00103 -ac; 0x0223E -acd; 0x0223F -Acirc; 0x000C2 -Acirc 0x000C2 -acirc; 0x000E2 -acirc 0x000E2 -acute; 0x000B4 -acute 0x000B4 -Acy; 0x00410 -acy; 0x00430 -AElig; 0x000C6 -AElig 0x000C6 -aelig; 0x000E6 -aelig 0x000E6 -af; 0x02061 -Afr; 0x1D504 -afr; 0x1D51E -Agrave; 0x000C0 -Agrave 0x000C0 -agrave; 0x000E0 -agrave 0x000E0 -alefsym; 0x02135 -aleph; 0x02135 -Alpha; 0x00391 -alpha; 0x003B1 -Amacr; 0x00100 -amacr; 0x00101 -amalg; 0x02A3F -amp; 0x00026 -amp 0x00026 -AMP; 0x00026 -AMP 0x00026 -and; 0x02227 -And; 0x02A53 -andand; 0x02A55 -andd; 0x02A5C -andslope; 0x02A58 -andv; 0x02A5A -ang; 0x02220 -ange; 0x029A4 -angle; 0x02220 -angmsd; 0x02221 -angmsdaa; 0x029A8 -angmsdab; 0x029A9 -angmsdac; 0x029AA -angmsdad; 0x029AB -angmsdae; 0x029AC -angmsdaf; 0x029AD -angmsdag; 0x029AE -angmsdah; 0x029AF -angrt; 0x0221F -angrtvb; 0x022BE -angrtvbd; 0x0299D -angsph; 0x02222 -angst; 0x0212B -angzarr; 0x0237C -Aogon; 0x00104 -aogon; 0x00105 -Aopf; 0x1D538 -aopf; 0x1D552 -ap; 0x02248 -apacir; 0x02A6F -ape; 0x0224A -apE; 0x02A70 -apid; 0x0224B -apos; 0x00027 -ApplyFunction; 0x02061 -approx; 0x02248 -approxeq; 0x0224A -Aring; 0x000C5 -Aring 0x000C5 -aring; 0x000E5 -aring 0x000E5 -Ascr; 0x1D49C -ascr; 0x1D4B6 -Assign; 0x02254 -ast; 0x0002A -asymp; 0x02248 -asympeq; 0x0224D -Atilde; 0x000C3 -Atilde 0x000C3 -atilde; 0x000E3 -atilde 0x000E3 -Auml; 0x000C4 -Auml 0x000C4 -auml; 0x000E4 -auml 0x000E4 -awconint; 0x02233 -awint; 0x02A11 -backcong; 0x0224C -backepsilon; 0x003F6 -backprime; 0x02035 -backsim; 0x0223D -backsimeq; 0x022CD -Backslash; 0x02216 -Barv; 0x02AE7 -barvee; 0x022BD -barwed; 0x02305 -Barwed; 0x02306 -barwedge; 0x02305 -bbrk; 0x023B5 -bbrktbrk; 0x023B6 -bcong; 0x0224C -Bcy; 0x00411 -bcy; 0x00431 -bdquo; 0x0201E -becaus; 0x02235 -because; 0x02235 -Because; 0x02235 -bemptyv; 0x029B0 -bepsi; 0x003F6 -bernou; 0x0212C -Bernoullis; 0x0212C -Beta; 0x00392 -beta; 0x003B2 -beth; 0x02136 -between; 0x0226C -Bfr; 0x1D505 -bfr; 0x1D51F -bigcap; 0x022C2 -bigcirc; 0x025EF -bigcup; 0x022C3 -bigodot; 0x02A00 -bigoplus; 0x02A01 -bigotimes; 0x02A02 -bigsqcup; 0x02A06 -bigstar; 0x02605 -bigtriangledown; 0x025BD -bigtriangleup; 0x025B3 -biguplus; 0x02A04 -bigvee; 0x022C1 -bigwedge; 0x022C0 -bkarow; 0x0290D -blacklozenge; 0x029EB -blacksquare; 0x025AA -blacktriangle; 0x025B4 -blacktriangledown; 0x025BE -blacktriangleleft; 0x025C2 -blacktriangleright; 0x025B8 -blank; 0x02423 -blk12; 0x02592 -blk14; 0x02591 -blk34; 0x02593 -block; 0x02588 -bnot; 0x02310 -bNot; 0x02AED -Bopf; 0x1D539 -bopf; 0x1D553 -bot; 0x022A5 -bottom; 0x022A5 -bowtie; 0x022C8 -boxbox; 0x029C9 -boxdl; 0x02510 -boxdL; 0x02555 -boxDl; 0x02556 -boxDL; 0x02557 -boxdr; 0x0250C -boxdR; 0x02552 -boxDr; 0x02553 -boxDR; 0x02554 -boxh; 0x02500 -boxH; 0x02550 -boxhd; 0x0252C -boxHd; 0x02564 -boxhD; 0x02565 -boxHD; 0x02566 -boxhu; 0x02534 -boxHu; 0x02567 -boxhU; 0x02568 -boxHU; 0x02569 -boxminus; 0x0229F -boxplus; 0x0229E -boxtimes; 0x022A0 -boxul; 0x02518 -boxuL; 0x0255B -boxUl; 0x0255C -boxUL; 0x0255D -boxur; 0x02514 -boxuR; 0x02558 -boxUr; 0x02559 -boxUR; 0x0255A -boxv; 0x02502 -boxV; 0x02551 -boxvh; 0x0253C -boxvH; 0x0256A -boxVh; 0x0256B -boxVH; 0x0256C -boxvl; 0x02524 -boxvL; 0x02561 -boxVl; 0x02562 -boxVL; 0x02563 -boxvr; 0x0251C -boxvR; 0x0255E -boxVr; 0x0255F -boxVR; 0x02560 -bprime; 0x02035 -breve; 0x002D8 -Breve; 0x002D8 -brvbar; 0x000A6 -brvbar 0x000A6 -Bscr; 0x0212C -bscr; 0x1D4B7 -bsemi; 0x0204F -bsim; 0x0223D -bsime; 0x022CD -bsol; 0x0005C -bsolb; 0x029C5 -bull; 0x02022 -bullet; 0x02022 -bump; 0x0224E -bumpe; 0x0224F -bumpE; 0x02AAE -Bumpeq; 0x0224E -bumpeq; 0x0224F -Cacute; 0x00106 -cacute; 0x00107 -cap; 0x02229 -Cap; 0x022D2 -capand; 0x02A44 -capbrcup; 0x02A49 -capcap; 0x02A4B -capcup; 0x02A47 -capdot; 0x02A40 -CapitalDifferentialD; 0x02145 -caret; 0x02041 -caron; 0x002C7 -Cayleys; 0x0212D -ccaps; 0x02A4D -Ccaron; 0x0010C -ccaron; 0x0010D -Ccedil; 0x000C7 -Ccedil 0x000C7 -ccedil; 0x000E7 -ccedil 0x000E7 -Ccirc; 0x00108 -ccirc; 0x00109 -Cconint; 0x02230 -ccups; 0x02A4C -ccupssm; 0x02A50 -Cdot; 0x0010A -cdot; 0x0010B -cedil; 0x000B8 -cedil 0x000B8 -Cedilla; 0x000B8 -cemptyv; 0x029B2 -cent; 0x000A2 -cent 0x000A2 -centerdot; 0x000B7 -CenterDot; 0x000B7 -Cfr; 0x0212D -cfr; 0x1D520 -CHcy; 0x00427 -chcy; 0x00447 -check; 0x02713 -checkmark; 0x02713 -Chi; 0x003A7 -chi; 0x003C7 -cir; 0x025CB -circ; 0x002C6 -circeq; 0x02257 -circlearrowleft; 0x021BA -circlearrowright; 0x021BB -circledast; 0x0229B -circledcirc; 0x0229A -circleddash; 0x0229D -CircleDot; 0x02299 -circledR; 0x000AE -circledS; 0x024C8 -CircleMinus; 0x02296 -CirclePlus; 0x02295 -CircleTimes; 0x02297 -cire; 0x02257 -cirE; 0x029C3 -cirfnint; 0x02A10 -cirmid; 0x02AEF -cirscir; 0x029C2 -ClockwiseContourIntegral; 0x02232 -CloseCurlyDoubleQuote; 0x0201D -CloseCurlyQuote; 0x02019 -clubs; 0x02663 -clubsuit; 0x02663 -colon; 0x0003A -Colon; 0x02237 -colone; 0x02254 -Colone; 0x02A74 -coloneq; 0x02254 -comma; 0x0002C -commat; 0x00040 -comp; 0x02201 -compfn; 0x02218 -complement; 0x02201 -complexes; 0x02102 -cong; 0x02245 -congdot; 0x02A6D -Congruent; 0x02261 -conint; 0x0222E -Conint; 0x0222F -ContourIntegral; 0x0222E -Copf; 0x02102 -copf; 0x1D554 -coprod; 0x02210 -Coproduct; 0x02210 -copy; 0x000A9 -copy 0x000A9 -COPY; 0x000A9 -COPY 0x000A9 -copysr; 0x02117 -CounterClockwiseContourIntegral; 0x02233 -crarr; 0x021B5 -cross; 0x02717 -Cross; 0x02A2F -Cscr; 0x1D49E -cscr; 0x1D4B8 -csub; 0x02ACF -csube; 0x02AD1 -csup; 0x02AD0 -csupe; 0x02AD2 -ctdot; 0x022EF -cudarrl; 0x02938 -cudarrr; 0x02935 -cuepr; 0x022DE -cuesc; 0x022DF -cularr; 0x021B6 -cularrp; 0x0293D -cup; 0x0222A -Cup; 0x022D3 -cupbrcap; 0x02A48 -CupCap; 0x0224D -cupcap; 0x02A46 -cupcup; 0x02A4A -cupdot; 0x0228D -cupor; 0x02A45 -curarr; 0x021B7 -curarrm; 0x0293C -curlyeqprec; 0x022DE -curlyeqsucc; 0x022DF -curlyvee; 0x022CE -curlywedge; 0x022CF -curren; 0x000A4 -curren 0x000A4 -curvearrowleft; 0x021B6 -curvearrowright; 0x021B7 -cuvee; 0x022CE -cuwed; 0x022CF -cwconint; 0x02232 -cwint; 0x02231 -cylcty; 0x0232D -dagger; 0x02020 -Dagger; 0x02021 -daleth; 0x02138 -darr; 0x02193 -Darr; 0x021A1 -dArr; 0x021D3 -dash; 0x02010 -dashv; 0x022A3 -Dashv; 0x02AE4 -dbkarow; 0x0290F -dblac; 0x002DD -Dcaron; 0x0010E -dcaron; 0x0010F -Dcy; 0x00414 -dcy; 0x00434 -DD; 0x02145 -dd; 0x02146 -ddagger; 0x02021 -ddarr; 0x021CA -DDotrahd; 0x02911 -ddotseq; 0x02A77 -deg; 0x000B0 -deg 0x000B0 -Del; 0x02207 -Delta; 0x00394 -delta; 0x003B4 -demptyv; 0x029B1 -dfisht; 0x0297F -Dfr; 0x1D507 -dfr; 0x1D521 -dHar; 0x02965 -dharl; 0x021C3 -dharr; 0x021C2 -DiacriticalAcute; 0x000B4 -DiacriticalDot; 0x002D9 -DiacriticalDoubleAcute; 0x002DD -DiacriticalGrave; 0x00060 -DiacriticalTilde; 0x002DC -diam; 0x022C4 -diamond; 0x022C4 -Diamond; 0x022C4 -diamondsuit; 0x02666 -diams; 0x02666 -die; 0x000A8 -DifferentialD; 0x02146 -digamma; 0x003DD -disin; 0x022F2 -div; 0x000F7 -divide; 0x000F7 -divide 0x000F7 -divideontimes; 0x022C7 -divonx; 0x022C7 -DJcy; 0x00402 -djcy; 0x00452 -dlcorn; 0x0231E -dlcrop; 0x0230D -dollar; 0x00024 -Dopf; 0x1D53B -dopf; 0x1D555 -Dot; 0x000A8 -dot; 0x002D9 -DotDot; 0x020DC -doteq; 0x02250 -doteqdot; 0x02251 -DotEqual; 0x02250 -dotminus; 0x02238 -dotplus; 0x02214 -dotsquare; 0x022A1 -doublebarwedge; 0x02306 -DoubleContourIntegral; 0x0222F -DoubleDot; 0x000A8 -DoubleDownArrow; 0x021D3 -DoubleLeftArrow; 0x021D0 -DoubleLeftRightArrow; 0x021D4 -DoubleLeftTee; 0x02AE4 -DoubleLongLeftArrow; 0x027F8 -DoubleLongLeftRightArrow; 0x027FA -DoubleLongRightArrow; 0x027F9 -DoubleRightArrow; 0x021D2 -DoubleRightTee; 0x022A8 -DoubleUpArrow; 0x021D1 -DoubleUpDownArrow; 0x021D5 -DoubleVerticalBar; 0x02225 -downarrow; 0x02193 -DownArrow; 0x02193 -Downarrow; 0x021D3 -DownArrowBar; 0x02913 -DownArrowUpArrow; 0x021F5 -DownBreve; 0x00311 -downdownarrows; 0x021CA -downharpoonleft; 0x021C3 -downharpoonright; 0x021C2 -DownLeftRightVector; 0x02950 -DownLeftTeeVector; 0x0295E -DownLeftVector; 0x021BD -DownLeftVectorBar; 0x02956 -DownRightTeeVector; 0x0295F -DownRightVector; 0x021C1 -DownRightVectorBar; 0x02957 -DownTee; 0x022A4 -DownTeeArrow; 0x021A7 -drbkarow; 0x02910 -drcorn; 0x0231F -drcrop; 0x0230C -Dscr; 0x1D49F -dscr; 0x1D4B9 -DScy; 0x00405 -dscy; 0x00455 -dsol; 0x029F6 -Dstrok; 0x00110 -dstrok; 0x00111 -dtdot; 0x022F1 -dtri; 0x025BF -dtrif; 0x025BE -duarr; 0x021F5 -duhar; 0x0296F -dwangle; 0x029A6 -DZcy; 0x0040F -dzcy; 0x0045F -dzigrarr; 0x027FF -Eacute; 0x000C9 -Eacute 0x000C9 -eacute; 0x000E9 -eacute 0x000E9 -easter; 0x02A6E -Ecaron; 0x0011A -ecaron; 0x0011B -ecir; 0x02256 -Ecirc; 0x000CA -Ecirc 0x000CA -ecirc; 0x000EA -ecirc 0x000EA -ecolon; 0x02255 -Ecy; 0x0042D -ecy; 0x0044D -eDDot; 0x02A77 -Edot; 0x00116 -edot; 0x00117 -eDot; 0x02251 -ee; 0x02147 -efDot; 0x02252 -Efr; 0x1D508 -efr; 0x1D522 -eg; 0x02A9A -Egrave; 0x000C8 -Egrave 0x000C8 -egrave; 0x000E8 -egrave 0x000E8 -egs; 0x02A96 -egsdot; 0x02A98 -el; 0x02A99 -Element; 0x02208 -elinters; 0x023E7 -ell; 0x02113 -els; 0x02A95 -elsdot; 0x02A97 -Emacr; 0x00112 -emacr; 0x00113 -empty; 0x02205 -emptyset; 0x02205 -EmptySmallSquare; 0x025FB -emptyv; 0x02205 -EmptyVerySmallSquare; 0x025AB -emsp; 0x02003 -emsp13; 0x02004 -emsp14; 0x02005 -ENG; 0x0014A -eng; 0x0014B -ensp; 0x02002 -Eogon; 0x00118 -eogon; 0x00119 -Eopf; 0x1D53C -eopf; 0x1D556 -epar; 0x022D5 -eparsl; 0x029E3 -eplus; 0x02A71 -epsi; 0x003F5 -Epsilon; 0x00395 -epsilon; 0x003B5 -epsiv; 0x003B5 -eqcirc; 0x02256 -eqcolon; 0x02255 -eqsim; 0x02242 -eqslantgtr; 0x02A96 -eqslantless; 0x02A95 -Equal; 0x02A75 -equals; 0x0003D -EqualTilde; 0x02242 -equest; 0x0225F -Equilibrium; 0x021CC -equiv; 0x02261 -equivDD; 0x02A78 -eqvparsl; 0x029E5 -erarr; 0x02971 -erDot; 0x02253 -escr; 0x0212F -Escr; 0x02130 -esdot; 0x02250 -esim; 0x02242 -Esim; 0x02A73 -Eta; 0x00397 -eta; 0x003B7 -ETH; 0x000D0 -ETH 0x000D0 -eth; 0x000F0 -eth 0x000F0 -Euml; 0x000CB -Euml 0x000CB -euml; 0x000EB -euml 0x000EB -euro; 0x020AC -excl; 0x00021 -exist; 0x02203 -Exists; 0x02203 -expectation; 0x02130 -exponentiale; 0x02147 -ExponentialE; 0x02147 -fallingdotseq; 0x02252 -Fcy; 0x00424 -fcy; 0x00444 -female; 0x02640 -ffilig; 0x0FB03 -fflig; 0x0FB00 -ffllig; 0x0FB04 -Ffr; 0x1D509 -ffr; 0x1D523 -filig; 0x0FB01 -FilledSmallSquare; 0x025FC -FilledVerySmallSquare; 0x025AA -flat; 0x0266D -fllig; 0x0FB02 -fltns; 0x025B1 -fnof; 0x00192 -Fopf; 0x1D53D -fopf; 0x1D557 -forall; 0x02200 -ForAll; 0x02200 -fork; 0x022D4 -forkv; 0x02AD9 -Fouriertrf; 0x02131 -fpartint; 0x02A0D -frac12; 0x000BD -frac12 0x000BD -frac13; 0x02153 -frac14; 0x000BC -frac14 0x000BC -frac15; 0x02155 -frac16; 0x02159 -frac18; 0x0215B -frac23; 0x02154 -frac25; 0x02156 -frac34; 0x000BE -frac34 0x000BE -frac35; 0x02157 -frac38; 0x0215C -frac45; 0x02158 -frac56; 0x0215A -frac58; 0x0215D -frac78; 0x0215E -frasl; 0x02044 -frown; 0x02322 -Fscr; 0x02131 -fscr; 0x1D4BB -gacute; 0x001F5 -Gamma; 0x00393 -gamma; 0x003B3 -Gammad; 0x003DC -gammad; 0x003DD -gap; 0x02A86 -Gbreve; 0x0011E -gbreve; 0x0011F -Gcedil; 0x00122 -Gcirc; 0x0011C -gcirc; 0x0011D -Gcy; 0x00413 -gcy; 0x00433 -Gdot; 0x00120 -gdot; 0x00121 -ge; 0x02265 -gE; 0x02267 -gel; 0x022DB -gEl; 0x02A8C -geq; 0x02265 -geqq; 0x02267 -geqslant; 0x02A7E -ges; 0x02A7E -gescc; 0x02AA9 -gesdot; 0x02A80 -gesdoto; 0x02A82 -gesdotol; 0x02A84 -gesles; 0x02A94 -Gfr; 0x1D50A -gfr; 0x1D524 -gg; 0x0226B -Gg; 0x022D9 -ggg; 0x022D9 -gimel; 0x02137 -GJcy; 0x00403 -gjcy; 0x00453 -gl; 0x02277 -gla; 0x02AA5 -glE; 0x02A92 -glj; 0x02AA4 -gnap; 0x02A8A -gnapprox; 0x02A8A -gnE; 0x02269 -gne; 0x02A88 -gneq; 0x02A88 -gneqq; 0x02269 -gnsim; 0x022E7 -Gopf; 0x1D53E -gopf; 0x1D558 -grave; 0x00060 -GreaterEqual; 0x02265 -GreaterEqualLess; 0x022DB -GreaterFullEqual; 0x02267 -GreaterGreater; 0x02AA2 -GreaterLess; 0x02277 -GreaterSlantEqual; 0x02A7E -GreaterTilde; 0x02273 -gscr; 0x0210A -Gscr; 0x1D4A2 -gsim; 0x02273 -gsime; 0x02A8E -gsiml; 0x02A90 -gt; 0x0003E -gt 0x0003E -GT; 0x0003E -GT 0x0003E -Gt; 0x0226B -gtcc; 0x02AA7 -gtcir; 0x02A7A -gtdot; 0x022D7 -gtlPar; 0x02995 -gtquest; 0x02A7C -gtrapprox; 0x02A86 -gtrarr; 0x02978 -gtrdot; 0x022D7 -gtreqless; 0x022DB -gtreqqless; 0x02A8C -gtrless; 0x02277 -gtrsim; 0x02273 -Hacek; 0x002C7 -hairsp; 0x0200A -half; 0x000BD -hamilt; 0x0210B -HARDcy; 0x0042A -hardcy; 0x0044A -harr; 0x02194 -hArr; 0x021D4 -harrcir; 0x02948 -harrw; 0x021AD -Hat; 0x0005E -hbar; 0x0210F -Hcirc; 0x00124 -hcirc; 0x00125 -hearts; 0x02665 -heartsuit; 0x02665 -hellip; 0x02026 -hercon; 0x022B9 -Hfr; 0x0210C -hfr; 0x1D525 -HilbertSpace; 0x0210B -hksearow; 0x02925 -hkswarow; 0x02926 -hoarr; 0x021FF -homtht; 0x0223B -hookleftarrow; 0x021A9 -hookrightarrow; 0x021AA -Hopf; 0x0210D -hopf; 0x1D559 -horbar; 0x02015 -HorizontalLine; 0x02500 -Hscr; 0x0210B -hscr; 0x1D4BD -hslash; 0x0210F -Hstrok; 0x00126 -hstrok; 0x00127 -HumpDownHump; 0x0224E -HumpEqual; 0x0224F -hybull; 0x02043 -hyphen; 0x02010 -Iacute; 0x000CD -Iacute 0x000CD -iacute; 0x000ED -iacute 0x000ED -ic; 0x02063 -Icirc; 0x000CE -Icirc 0x000CE -icirc; 0x000EE -icirc 0x000EE -Icy; 0x00418 -icy; 0x00438 -Idot; 0x00130 -IEcy; 0x00415 -iecy; 0x00435 -iexcl; 0x000A1 -iexcl 0x000A1 -iff; 0x021D4 -Ifr; 0x02111 -ifr; 0x1D526 -Igrave; 0x000CC -Igrave 0x000CC -igrave; 0x000EC -igrave 0x000EC -ii; 0x02148 -iiiint; 0x02A0C -iiint; 0x0222D -iinfin; 0x029DC -iiota; 0x02129 -IJlig; 0x00132 -ijlig; 0x00133 -Im; 0x02111 -Imacr; 0x0012A -imacr; 0x0012B -image; 0x02111 -ImaginaryI; 0x02148 -imagline; 0x02110 -imagpart; 0x02111 -imath; 0x00131 -imof; 0x022B7 -imped; 0x001B5 -Implies; 0x021D2 -in; 0x02208 -incare; 0x02105 -infin; 0x0221E -infintie; 0x029DD -inodot; 0x00131 -int; 0x0222B -Int; 0x0222C -intcal; 0x022BA -integers; 0x02124 -Integral; 0x0222B -intercal; 0x022BA -Intersection; 0x022C2 -intlarhk; 0x02A17 -intprod; 0x02A3C -InvisibleComma; 0x02063 -InvisibleTimes; 0x02062 -IOcy; 0x00401 -iocy; 0x00451 -Iogon; 0x0012E -iogon; 0x0012F -Iopf; 0x1D540 -iopf; 0x1D55A -Iota; 0x00399 -iota; 0x003B9 -iprod; 0x02A3C -iquest; 0x000BF -iquest 0x000BF -Iscr; 0x02110 -iscr; 0x1D4BE -isin; 0x02208 -isindot; 0x022F5 -isinE; 0x022F9 -isins; 0x022F4 -isinsv; 0x022F3 -isinv; 0x02208 -it; 0x02062 -Itilde; 0x00128 -itilde; 0x00129 -Iukcy; 0x00406 -iukcy; 0x00456 -Iuml; 0x000CF -Iuml 0x000CF -iuml; 0x000EF -iuml 0x000EF -Jcirc; 0x00134 -jcirc; 0x00135 -Jcy; 0x00419 -jcy; 0x00439 -Jfr; 0x1D50D -jfr; 0x1D527 -jmath; 0x00237 -Jopf; 0x1D541 -jopf; 0x1D55B -Jscr; 0x1D4A5 -jscr; 0x1D4BF -Jsercy; 0x00408 -jsercy; 0x00458 -Jukcy; 0x00404 -jukcy; 0x00454 -Kappa; 0x0039A -kappa; 0x003BA -kappav; 0x003F0 -Kcedil; 0x00136 -kcedil; 0x00137 -Kcy; 0x0041A -kcy; 0x0043A -Kfr; 0x1D50E -kfr; 0x1D528 -kgreen; 0x00138 -KHcy; 0x00425 -khcy; 0x00445 -KJcy; 0x0040C -kjcy; 0x0045C -Kopf; 0x1D542 -kopf; 0x1D55C -Kscr; 0x1D4A6 -kscr; 0x1D4C0 -lAarr; 0x021DA -Lacute; 0x00139 -lacute; 0x0013A -laemptyv; 0x029B4 -lagran; 0x02112 -Lambda; 0x0039B -lambda; 0x003BB -lang; 0x027E8 -Lang; 0x027EA -langd; 0x02991 -langle; 0x027E8 -lap; 0x02A85 -Laplacetrf; 0x02112 -laquo; 0x000AB -laquo 0x000AB -larr; 0x02190 -Larr; 0x0219E -lArr; 0x021D0 -larrb; 0x021E4 -larrbfs; 0x0291F -larrfs; 0x0291D -larrhk; 0x021A9 -larrlp; 0x021AB -larrpl; 0x02939 -larrsim; 0x02973 -larrtl; 0x021A2 -lat; 0x02AAB -latail; 0x02919 -lAtail; 0x0291B -late; 0x02AAD -lbarr; 0x0290C -lBarr; 0x0290E -lbbrk; 0x02772 -lbrace; 0x0007B -lbrack; 0x0005B -lbrke; 0x0298B -lbrksld; 0x0298F -lbrkslu; 0x0298D -Lcaron; 0x0013D -lcaron; 0x0013E -Lcedil; 0x0013B -lcedil; 0x0013C -lceil; 0x02308 -lcub; 0x0007B -Lcy; 0x0041B -lcy; 0x0043B -ldca; 0x02936 -ldquo; 0x0201C -ldquor; 0x0201E -ldrdhar; 0x02967 -ldrushar; 0x0294B -ldsh; 0x021B2 -le; 0x02264 -lE; 0x02266 -LeftAngleBracket; 0x027E8 -leftarrow; 0x02190 -LeftArrow; 0x02190 -Leftarrow; 0x021D0 -LeftArrowBar; 0x021E4 -LeftArrowRightArrow; 0x021C6 -leftarrowtail; 0x021A2 -LeftCeiling; 0x02308 -LeftDoubleBracket; 0x027E6 -LeftDownTeeVector; 0x02961 -LeftDownVector; 0x021C3 -LeftDownVectorBar; 0x02959 -LeftFloor; 0x0230A -leftharpoondown; 0x021BD -leftharpoonup; 0x021BC -leftleftarrows; 0x021C7 -leftrightarrow; 0x02194 -LeftRightArrow; 0x02194 -Leftrightarrow; 0x021D4 -leftrightarrows; 0x021C6 -leftrightharpoons; 0x021CB -leftrightsquigarrow; 0x021AD -LeftRightVector; 0x0294E -LeftTee; 0x022A3 -LeftTeeArrow; 0x021A4 -LeftTeeVector; 0x0295A -leftthreetimes; 0x022CB -LeftTriangle; 0x022B2 -LeftTriangleBar; 0x029CF -LeftTriangleEqual; 0x022B4 -LeftUpDownVector; 0x02951 -LeftUpTeeVector; 0x02960 -LeftUpVector; 0x021BF -LeftUpVectorBar; 0x02958 -LeftVector; 0x021BC -LeftVectorBar; 0x02952 -leg; 0x022DA -lEg; 0x02A8B -leq; 0x02264 -leqq; 0x02266 -leqslant; 0x02A7D -les; 0x02A7D -lescc; 0x02AA8 -lesdot; 0x02A7F -lesdoto; 0x02A81 -lesdotor; 0x02A83 -lesges; 0x02A93 -lessapprox; 0x02A85 -lessdot; 0x022D6 -lesseqgtr; 0x022DA -lesseqqgtr; 0x02A8B -LessEqualGreater; 0x022DA -LessFullEqual; 0x02266 -LessGreater; 0x02276 -lessgtr; 0x02276 -LessLess; 0x02AA1 -lesssim; 0x02272 -LessSlantEqual; 0x02A7D -LessTilde; 0x02272 -lfisht; 0x0297C -lfloor; 0x0230A -Lfr; 0x1D50F -lfr; 0x1D529 -lg; 0x02276 -lgE; 0x02A91 -lHar; 0x02962 -lhard; 0x021BD -lharu; 0x021BC -lharul; 0x0296A -lhblk; 0x02584 -LJcy; 0x00409 -ljcy; 0x00459 -ll; 0x0226A -Ll; 0x022D8 -llarr; 0x021C7 -llcorner; 0x0231E -Lleftarrow; 0x021DA -llhard; 0x0296B -lltri; 0x025FA -Lmidot; 0x0013F -lmidot; 0x00140 -lmoust; 0x023B0 -lmoustache; 0x023B0 -lnap; 0x02A89 -lnapprox; 0x02A89 -lnE; 0x02268 -lne; 0x02A87 -lneq; 0x02A87 -lneqq; 0x02268 -lnsim; 0x022E6 -loang; 0x027EC -loarr; 0x021FD -lobrk; 0x027E6 -longleftarrow; 0x027F5 -LongLeftArrow; 0x027F5 -Longleftarrow; 0x027F8 -longleftrightarrow; 0x027F7 -LongLeftRightArrow; 0x027F7 -Longleftrightarrow; 0x027FA -longmapsto; 0x027FC -longrightarrow; 0x027F6 -LongRightArrow; 0x027F6 -Longrightarrow; 0x027F9 -looparrowleft; 0x021AB -looparrowright; 0x021AC -lopar; 0x02985 -Lopf; 0x1D543 -lopf; 0x1D55D -loplus; 0x02A2D -lotimes; 0x02A34 -lowast; 0x02217 -lowbar; 0x0005F -LowerLeftArrow; 0x02199 -LowerRightArrow; 0x02198 -loz; 0x025CA -lozenge; 0x025CA -lozf; 0x029EB -lpar; 0x00028 -lparlt; 0x02993 -lrarr; 0x021C6 -lrcorner; 0x0231F -lrhar; 0x021CB -lrhard; 0x0296D -lrm; 0x0200E -lrtri; 0x022BF -lsaquo; 0x02039 -Lscr; 0x02112 -lscr; 0x1D4C1 -lsh; 0x021B0 -Lsh; 0x021B0 -lsim; 0x02272 -lsime; 0x02A8D -lsimg; 0x02A8F -lsqb; 0x0005B -lsquo; 0x02018 -lsquor; 0x0201A -Lstrok; 0x00141 -lstrok; 0x00142 -lt; 0x0003C -lt 0x0003C -LT; 0x0003C -LT 0x0003C -Lt; 0x0226A -ltcc; 0x02AA6 -ltcir; 0x02A79 -ltdot; 0x022D6 -lthree; 0x022CB -ltimes; 0x022C9 -ltlarr; 0x02976 -ltquest; 0x02A7B -ltri; 0x025C3 -ltrie; 0x022B4 -ltrif; 0x025C2 -ltrPar; 0x02996 -lurdshar; 0x0294A -luruhar; 0x02966 -macr; 0x000AF -macr 0x000AF -male; 0x02642 -malt; 0x02720 -maltese; 0x02720 -map; 0x021A6 -Map; 0x02905 -mapsto; 0x021A6 -mapstodown; 0x021A7 -mapstoleft; 0x021A4 -mapstoup; 0x021A5 -marker; 0x025AE -mcomma; 0x02A29 -Mcy; 0x0041C -mcy; 0x0043C -mdash; 0x02014 -mDDot; 0x0223A -measuredangle; 0x02221 -MediumSpace; 0x0205F -Mellintrf; 0x02133 -Mfr; 0x1D510 -mfr; 0x1D52A -mho; 0x02127 -micro; 0x000B5 -micro 0x000B5 -mid; 0x02223 -midast; 0x0002A -midcir; 0x02AF0 -middot; 0x000B7 -middot 0x000B7 -minus; 0x02212 -minusb; 0x0229F -minusd; 0x02238 -minusdu; 0x02A2A -MinusPlus; 0x02213 -mlcp; 0x02ADB -mldr; 0x02026 -mnplus; 0x02213 -models; 0x022A7 -Mopf; 0x1D544 -mopf; 0x1D55E -mp; 0x02213 -Mscr; 0x02133 -mscr; 0x1D4C2 -mstpos; 0x0223E -Mu; 0x0039C -mu; 0x003BC -multimap; 0x022B8 -mumap; 0x022B8 -nabla; 0x02207 -Nacute; 0x00143 -nacute; 0x00144 -nap; 0x02249 -napos; 0x00149 -napprox; 0x02249 -natur; 0x0266E -natural; 0x0266E -naturals; 0x02115 -nbsp; 0x000A0 -nbsp 0x000A0 -ncap; 0x02A43 -Ncaron; 0x00147 -ncaron; 0x00148 -Ncedil; 0x00145 -ncedil; 0x00146 -ncong; 0x02247 -ncup; 0x02A42 -Ncy; 0x0041D -ncy; 0x0043D -ndash; 0x02013 -ne; 0x02260 -nearhk; 0x02924 -nearr; 0x02197 -neArr; 0x021D7 -nearrow; 0x02197 -NegativeMediumSpace; 0x0200B -NegativeThickSpace; 0x0200B -NegativeThinSpace; 0x0200B -NegativeVeryThinSpace; 0x0200B -nequiv; 0x02262 -nesear; 0x02928 -NestedGreaterGreater; 0x0226B -NestedLessLess; 0x0226A -NewLine; 0x0000A -nexist; 0x02204 -nexists; 0x02204 -Nfr; 0x1D511 -nfr; 0x1D52B -nge; 0x02271 -ngeq; 0x02271 -ngsim; 0x02275 -ngt; 0x0226F -ngtr; 0x0226F -nharr; 0x021AE -nhArr; 0x021CE -nhpar; 0x02AF2 -ni; 0x0220B -nis; 0x022FC -nisd; 0x022FA -niv; 0x0220B -NJcy; 0x0040A -njcy; 0x0045A -nlarr; 0x0219A -nlArr; 0x021CD -nldr; 0x02025 -nle; 0x02270 -nleftarrow; 0x0219A -nLeftarrow; 0x021CD -nleftrightarrow; 0x021AE -nLeftrightarrow; 0x021CE -nleq; 0x02270 -nless; 0x0226E -nlsim; 0x02274 -nlt; 0x0226E -nltri; 0x022EA -nltrie; 0x022EC -nmid; 0x02224 -NoBreak; 0x02060 -NonBreakingSpace; 0x000A0 -Nopf; 0x02115 -nopf; 0x1D55F -not; 0x000AC -not 0x000AC -Not; 0x02AEC -NotCongruent; 0x02262 -NotCupCap; 0x0226D -NotDoubleVerticalBar; 0x02226 -NotElement; 0x02209 -NotEqual; 0x02260 -NotExists; 0x02204 -NotGreater; 0x0226F -NotGreaterEqual; 0x02271 -NotGreaterLess; 0x02279 -NotGreaterTilde; 0x02275 -notin; 0x02209 -notinva; 0x02209 -notinvb; 0x022F7 -notinvc; 0x022F6 -NotLeftTriangle; 0x022EA -NotLeftTriangleEqual; 0x022EC -NotLess; 0x0226E -NotLessEqual; 0x02270 -NotLessGreater; 0x02278 -NotLessTilde; 0x02274 -notni; 0x0220C -notniva; 0x0220C -notnivb; 0x022FE -notnivc; 0x022FD -NotPrecedes; 0x02280 -NotPrecedesSlantEqual; 0x022E0 -NotReverseElement; 0x0220C -NotRightTriangle; 0x022EB -NotRightTriangleEqual; 0x022ED -NotSquareSubsetEqual; 0x022E2 -NotSquareSupersetEqual; 0x022E3 -NotSubsetEqual; 0x02288 -NotSucceeds; 0x02281 -NotSucceedsSlantEqual; 0x022E1 -NotSupersetEqual; 0x02289 -NotTilde; 0x02241 -NotTildeEqual; 0x02244 -NotTildeFullEqual; 0x02247 -NotTildeTilde; 0x02249 -NotVerticalBar; 0x02224 -npar; 0x02226 -nparallel; 0x02226 -npolint; 0x02A14 -npr; 0x02280 -nprcue; 0x022E0 -nprec; 0x02280 -nrarr; 0x0219B -nrArr; 0x021CF -nrightarrow; 0x0219B -nRightarrow; 0x021CF -nrtri; 0x022EB -nrtrie; 0x022ED -nsc; 0x02281 -nsccue; 0x022E1 -Nscr; 0x1D4A9 -nscr; 0x1D4C3 -nshortmid; 0x02224 -nshortparallel; 0x02226 -nsim; 0x02241 -nsime; 0x02244 -nsimeq; 0x02244 -nsmid; 0x02224 -nspar; 0x02226 -nsqsube; 0x022E2 -nsqsupe; 0x022E3 -nsub; 0x02284 -nsube; 0x02288 -nsubseteq; 0x02288 -nsucc; 0x02281 -nsup; 0x02285 -nsupe; 0x02289 -nsupseteq; 0x02289 -ntgl; 0x02279 -Ntilde; 0x000D1 -Ntilde 0x000D1 -ntilde; 0x000F1 -ntilde 0x000F1 -ntlg; 0x02278 -ntriangleleft; 0x022EA -ntrianglelefteq; 0x022EC -ntriangleright; 0x022EB -ntrianglerighteq; 0x022ED -Nu; 0x0039D -nu; 0x003BD -num; 0x00023 -numero; 0x02116 -numsp; 0x02007 -nvdash; 0x022AC -nvDash; 0x022AD -nVdash; 0x022AE -nVDash; 0x022AF -nvHarr; 0x02904 -nvinfin; 0x029DE -nvlArr; 0x02902 -nvrArr; 0x02903 -nwarhk; 0x02923 -nwarr; 0x02196 -nwArr; 0x021D6 -nwarrow; 0x02196 -nwnear; 0x02927 -Oacute; 0x000D3 -Oacute 0x000D3 -oacute; 0x000F3 -oacute 0x000F3 -oast; 0x0229B -ocir; 0x0229A -Ocirc; 0x000D4 -Ocirc 0x000D4 -ocirc; 0x000F4 -ocirc 0x000F4 -Ocy; 0x0041E -ocy; 0x0043E -odash; 0x0229D -Odblac; 0x00150 -odblac; 0x00151 -odiv; 0x02A38 -odot; 0x02299 -odsold; 0x029BC -OElig; 0x00152 -oelig; 0x00153 -ofcir; 0x029BF -Ofr; 0x1D512 -ofr; 0x1D52C -ogon; 0x002DB -Ograve; 0x000D2 -Ograve 0x000D2 -ograve; 0x000F2 -ograve 0x000F2 -ogt; 0x029C1 -ohbar; 0x029B5 -ohm; 0x02126 -oint; 0x0222E -olarr; 0x021BA -olcir; 0x029BE -olcross; 0x029BB -oline; 0x0203E -olt; 0x029C0 -Omacr; 0x0014C -omacr; 0x0014D -Omega; 0x003A9 -omega; 0x003C9 -Omicron; 0x0039F -omicron; 0x003BF -omid; 0x029B6 -ominus; 0x02296 -Oopf; 0x1D546 -oopf; 0x1D560 -opar; 0x029B7 -OpenCurlyDoubleQuote; 0x0201C -OpenCurlyQuote; 0x02018 -operp; 0x029B9 -oplus; 0x02295 -or; 0x02228 -Or; 0x02A54 -orarr; 0x021BB -ord; 0x02A5D -order; 0x02134 -orderof; 0x02134 -ordf; 0x000AA -ordf 0x000AA -ordm; 0x000BA -ordm 0x000BA -origof; 0x022B6 -oror; 0x02A56 -orslope; 0x02A57 -orv; 0x02A5B -oS; 0x024C8 -oscr; 0x02134 -Oscr; 0x1D4AA -Oslash; 0x000D8 -Oslash 0x000D8 -oslash; 0x000F8 -oslash 0x000F8 -osol; 0x02298 -Otilde; 0x000D5 -Otilde 0x000D5 -otilde; 0x000F5 -otilde 0x000F5 -otimes; 0x02297 -Otimes; 0x02A37 -otimesas; 0x02A36 -Ouml; 0x000D6 -Ouml 0x000D6 -ouml; 0x000F6 -ouml 0x000F6 -ovbar; 0x0233D -OverBar; 0x000AF -OverBrace; 0x023DE -OverBracket; 0x023B4 -OverParenthesis; 0x023DC -par; 0x02225 -para; 0x000B6 -para 0x000B6 -parallel; 0x02225 -parsim; 0x02AF3 -parsl; 0x02AFD -part; 0x02202 -PartialD; 0x02202 -Pcy; 0x0041F -pcy; 0x0043F -percnt; 0x00025 -period; 0x0002E -permil; 0x02030 -perp; 0x022A5 -pertenk; 0x02031 -Pfr; 0x1D513 -pfr; 0x1D52D -Phi; 0x003A6 -phi; 0x003C6 -phiv; 0x003C6 -phmmat; 0x02133 -phone; 0x0260E -Pi; 0x003A0 -pi; 0x003C0 -pitchfork; 0x022D4 -piv; 0x003D6 -planck; 0x0210F -planckh; 0x0210E -plankv; 0x0210F -plus; 0x0002B -plusacir; 0x02A23 -plusb; 0x0229E -pluscir; 0x02A22 -plusdo; 0x02214 -plusdu; 0x02A25 -pluse; 0x02A72 -PlusMinus; 0x000B1 -plusmn; 0x000B1 -plusmn 0x000B1 -plussim; 0x02A26 -plustwo; 0x02A27 -pm; 0x000B1 -Poincareplane; 0x0210C -pointint; 0x02A15 -Popf; 0x02119 -popf; 0x1D561 -pound; 0x000A3 -pound 0x000A3 -pr; 0x0227A -Pr; 0x02ABB -prap; 0x02AB7 -prcue; 0x0227C -pre; 0x02AAF -prE; 0x02AB3 -prec; 0x0227A -precapprox; 0x02AB7 -preccurlyeq; 0x0227C -Precedes; 0x0227A -PrecedesEqual; 0x02AAF -PrecedesSlantEqual; 0x0227C -PrecedesTilde; 0x0227E -preceq; 0x02AAF -precnapprox; 0x02AB9 -precneqq; 0x02AB5 -precnsim; 0x022E8 -precsim; 0x0227E -prime; 0x02032 -Prime; 0x02033 -primes; 0x02119 -prnap; 0x02AB9 -prnE; 0x02AB5 -prnsim; 0x022E8 -prod; 0x0220F -Product; 0x0220F -profalar; 0x0232E -profline; 0x02312 -profsurf; 0x02313 -prop; 0x0221D -Proportion; 0x02237 -Proportional; 0x0221D -propto; 0x0221D -prsim; 0x0227E -prurel; 0x022B0 -Pscr; 0x1D4AB -pscr; 0x1D4C5 -Psi; 0x003A8 -psi; 0x003C8 -puncsp; 0x02008 -Qfr; 0x1D514 -qfr; 0x1D52E -qint; 0x02A0C -Qopf; 0x0211A -qopf; 0x1D562 -qprime; 0x02057 -Qscr; 0x1D4AC -qscr; 0x1D4C6 -quaternions; 0x0210D -quatint; 0x02A16 -quest; 0x0003F -questeq; 0x0225F -quot; 0x00022 -quot 0x00022 -QUOT; 0x00022 -QUOT 0x00022 -rAarr; 0x021DB -race; 0x029DA -Racute; 0x00154 -racute; 0x00155 -radic; 0x0221A -raemptyv; 0x029B3 -rang; 0x027E9 -Rang; 0x027EB -rangd; 0x02992 -range; 0x029A5 -rangle; 0x027E9 -raquo; 0x000BB -raquo 0x000BB -rarr; 0x02192 -Rarr; 0x021A0 -rArr; 0x021D2 -rarrap; 0x02975 -rarrb; 0x021E5 -rarrbfs; 0x02920 -rarrc; 0x02933 -rarrfs; 0x0291E -rarrhk; 0x021AA -rarrlp; 0x021AC -rarrpl; 0x02945 -rarrsim; 0x02974 -rarrtl; 0x021A3 -Rarrtl; 0x02916 -rarrw; 0x0219D -ratail; 0x0291A -rAtail; 0x0291C -ratio; 0x02236 -rationals; 0x0211A -rbarr; 0x0290D -rBarr; 0x0290F -RBarr; 0x02910 -rbbrk; 0x02773 -rbrace; 0x0007D -rbrack; 0x0005D -rbrke; 0x0298C -rbrksld; 0x0298E -rbrkslu; 0x02990 -Rcaron; 0x00158 -rcaron; 0x00159 -Rcedil; 0x00156 -rcedil; 0x00157 -rceil; 0x02309 -rcub; 0x0007D -Rcy; 0x00420 -rcy; 0x00440 -rdca; 0x02937 -rdldhar; 0x02969 -rdquo; 0x0201D -rdquor; 0x0201D -rdsh; 0x021B3 -Re; 0x0211C -real; 0x0211C -realine; 0x0211B -realpart; 0x0211C -reals; 0x0211D -rect; 0x025AD -reg; 0x000AE -reg 0x000AE -REG; 0x000AE -REG 0x000AE -ReverseElement; 0x0220B -ReverseEquilibrium; 0x021CB -ReverseUpEquilibrium; 0x0296F -rfisht; 0x0297D -rfloor; 0x0230B -Rfr; 0x0211C -rfr; 0x1D52F -rHar; 0x02964 -rhard; 0x021C1 -rharu; 0x021C0 -rharul; 0x0296C -Rho; 0x003A1 -rho; 0x003C1 -rhov; 0x003F1 -RightAngleBracket; 0x027E9 -rightarrow; 0x02192 -RightArrow; 0x02192 -Rightarrow; 0x021D2 -RightArrowBar; 0x021E5 -RightArrowLeftArrow; 0x021C4 -rightarrowtail; 0x021A3 -RightCeiling; 0x02309 -RightDoubleBracket; 0x027E7 -RightDownTeeVector; 0x0295D -RightDownVector; 0x021C2 -RightDownVectorBar; 0x02955 -RightFloor; 0x0230B -rightharpoondown; 0x021C1 -rightharpoonup; 0x021C0 -rightleftarrows; 0x021C4 -rightleftharpoons; 0x021CC -rightrightarrows; 0x021C9 -rightsquigarrow; 0x0219D -RightTee; 0x022A2 -RightTeeArrow; 0x021A6 -RightTeeVector; 0x0295B -rightthreetimes; 0x022CC -RightTriangle; 0x022B3 -RightTriangleBar; 0x029D0 -RightTriangleEqual; 0x022B5 -RightUpDownVector; 0x0294F -RightUpTeeVector; 0x0295C -RightUpVector; 0x021BE -RightUpVectorBar; 0x02954 -RightVector; 0x021C0 -RightVectorBar; 0x02953 -ring; 0x002DA -risingdotseq; 0x02253 -rlarr; 0x021C4 -rlhar; 0x021CC -rlm; 0x0200F -rmoust; 0x023B1 -rmoustache; 0x023B1 -rnmid; 0x02AEE -roang; 0x027ED -roarr; 0x021FE -robrk; 0x027E7 -ropar; 0x02986 -Ropf; 0x0211D -ropf; 0x1D563 -roplus; 0x02A2E -rotimes; 0x02A35 -RoundImplies; 0x02970 -rpar; 0x00029 -rpargt; 0x02994 -rppolint; 0x02A12 -rrarr; 0x021C9 -Rrightarrow; 0x021DB -rsaquo; 0x0203A -Rscr; 0x0211B -rscr; 0x1D4C7 -rsh; 0x021B1 -Rsh; 0x021B1 -rsqb; 0x0005D -rsquo; 0x02019 -rsquor; 0x02019 -rthree; 0x022CC -rtimes; 0x022CA -rtri; 0x025B9 -rtrie; 0x022B5 -rtrif; 0x025B8 -rtriltri; 0x029CE -RuleDelayed; 0x029F4 -ruluhar; 0x02968 -rx; 0x0211E -Sacute; 0x0015A -sacute; 0x0015B -sbquo; 0x0201A -sc; 0x0227B -Sc; 0x02ABC -scap; 0x02AB8 -Scaron; 0x00160 -scaron; 0x00161 -sccue; 0x0227D -sce; 0x02AB0 -scE; 0x02AB4 -Scedil; 0x0015E -scedil; 0x0015F -Scirc; 0x0015C -scirc; 0x0015D -scnap; 0x02ABA -scnE; 0x02AB6 -scnsim; 0x022E9 -scpolint; 0x02A13 -scsim; 0x0227F -Scy; 0x00421 -scy; 0x00441 -sdot; 0x022C5 -sdotb; 0x022A1 -sdote; 0x02A66 -searhk; 0x02925 -searr; 0x02198 -seArr; 0x021D8 -searrow; 0x02198 -sect; 0x000A7 -sect 0x000A7 -semi; 0x0003B -seswar; 0x02929 -setminus; 0x02216 -setmn; 0x02216 -sext; 0x02736 -Sfr; 0x1D516 -sfr; 0x1D530 -sfrown; 0x02322 -sharp; 0x0266F -SHCHcy; 0x00429 -shchcy; 0x00449 -SHcy; 0x00428 -shcy; 0x00448 -ShortDownArrow; 0x02193 -ShortLeftArrow; 0x02190 -shortmid; 0x02223 -shortparallel; 0x02225 -ShortRightArrow; 0x02192 -ShortUpArrow; 0x02191 -shy; 0x000AD -shy 0x000AD -Sigma; 0x003A3 -sigma; 0x003C3 -sigmaf; 0x003C2 -sigmav; 0x003C2 -sim; 0x0223C -simdot; 0x02A6A -sime; 0x02243 -simeq; 0x02243 -simg; 0x02A9E -simgE; 0x02AA0 -siml; 0x02A9D -simlE; 0x02A9F -simne; 0x02246 -simplus; 0x02A24 -simrarr; 0x02972 -slarr; 0x02190 -SmallCircle; 0x02218 -smallsetminus; 0x02216 -smashp; 0x02A33 -smeparsl; 0x029E4 -smid; 0x02223 -smile; 0x02323 -smt; 0x02AAA -smte; 0x02AAC -SOFTcy; 0x0042C -softcy; 0x0044C -sol; 0x0002F -solb; 0x029C4 -solbar; 0x0233F -Sopf; 0x1D54A -sopf; 0x1D564 -spades; 0x02660 -spadesuit; 0x02660 -spar; 0x02225 -sqcap; 0x02293 -sqcup; 0x02294 -Sqrt; 0x0221A -sqsub; 0x0228F -sqsube; 0x02291 -sqsubset; 0x0228F -sqsubseteq; 0x02291 -sqsup; 0x02290 -sqsupe; 0x02292 -sqsupset; 0x02290 -sqsupseteq; 0x02292 -squ; 0x025A1 -square; 0x025A1 -Square; 0x025A1 -SquareIntersection; 0x02293 -SquareSubset; 0x0228F -SquareSubsetEqual; 0x02291 -SquareSuperset; 0x02290 -SquareSupersetEqual; 0x02292 -SquareUnion; 0x02294 -squarf; 0x025AA -squf; 0x025AA -srarr; 0x02192 -Sscr; 0x1D4AE -sscr; 0x1D4C8 -ssetmn; 0x02216 -ssmile; 0x02323 -sstarf; 0x022C6 -Star; 0x022C6 -star; 0x02606 -starf; 0x02605 -straightepsilon; 0x003F5 -straightphi; 0x003D5 -strns; 0x000AF -sub; 0x02282 -Sub; 0x022D0 -subdot; 0x02ABD -sube; 0x02286 -subE; 0x02AC5 -subedot; 0x02AC3 -submult; 0x02AC1 -subne; 0x0228A -subnE; 0x02ACB -subplus; 0x02ABF -subrarr; 0x02979 -subset; 0x02282 -Subset; 0x022D0 -subseteq; 0x02286 -subseteqq; 0x02AC5 -SubsetEqual; 0x02286 -subsetneq; 0x0228A -subsetneqq; 0x02ACB -subsim; 0x02AC7 -subsub; 0x02AD5 -subsup; 0x02AD3 -succ; 0x0227B -succapprox; 0x02AB8 -succcurlyeq; 0x0227D -Succeeds; 0x0227B -SucceedsEqual; 0x02AB0 -SucceedsSlantEqual; 0x0227D -SucceedsTilde; 0x0227F -succeq; 0x02AB0 -succnapprox; 0x02ABA -succneqq; 0x02AB6 -succnsim; 0x022E9 -succsim; 0x0227F -SuchThat; 0x0220B -sum; 0x02211 -Sum; 0x02211 -sung; 0x0266A -sup; 0x02283 -Sup; 0x022D1 -sup1; 0x000B9 -sup1 0x000B9 -sup2; 0x000B2 -sup2 0x000B2 -sup3; 0x000B3 -sup3 0x000B3 -supdot; 0x02ABE -supdsub; 0x02AD8 -supe; 0x02287 -supE; 0x02AC6 -supedot; 0x02AC4 -Superset; 0x02283 -SupersetEqual; 0x02287 -suphsub; 0x02AD7 -suplarr; 0x0297B -supmult; 0x02AC2 -supne; 0x0228B -supnE; 0x02ACC -supplus; 0x02AC0 -supset; 0x02283 -Supset; 0x022D1 -supseteq; 0x02287 -supseteqq; 0x02AC6 -supsetneq; 0x0228B -supsetneqq; 0x02ACC -supsim; 0x02AC8 -supsub; 0x02AD4 -supsup; 0x02AD6 -swarhk; 0x02926 -swarr; 0x02199 -swArr; 0x021D9 -swarrow; 0x02199 -swnwar; 0x0292A -szlig; 0x000DF -szlig 0x000DF -Tab; 0x00009 -target; 0x02316 -Tau; 0x003A4 -tau; 0x003C4 -tbrk; 0x023B4 -Tcaron; 0x00164 -tcaron; 0x00165 -Tcedil; 0x00162 -tcedil; 0x00163 -Tcy; 0x00422 -tcy; 0x00442 -tdot; 0x020DB -telrec; 0x02315 -Tfr; 0x1D517 -tfr; 0x1D531 -there4; 0x02234 -therefore; 0x02234 -Therefore; 0x02234 -Theta; 0x00398 -theta; 0x003B8 -thetasym; 0x003D1 -thetav; 0x003D1 -thickapprox; 0x02248 -thicksim; 0x0223C -thinsp; 0x02009 -ThinSpace; 0x02009 -thkap; 0x02248 -thksim; 0x0223C -THORN; 0x000DE -THORN 0x000DE -thorn; 0x000FE -thorn 0x000FE -tilde; 0x002DC -Tilde; 0x0223C -TildeEqual; 0x02243 -TildeFullEqual; 0x02245 -TildeTilde; 0x02248 -times; 0x000D7 -times 0x000D7 -timesb; 0x022A0 -timesbar; 0x02A31 -timesd; 0x02A30 -tint; 0x0222D -toea; 0x02928 -top; 0x022A4 -topbot; 0x02336 -topcir; 0x02AF1 -Topf; 0x1D54B -topf; 0x1D565 -topfork; 0x02ADA -tosa; 0x02929 -tprime; 0x02034 -trade; 0x02122 -TRADE; 0x02122 -triangle; 0x025B5 -triangledown; 0x025BF -triangleleft; 0x025C3 -trianglelefteq; 0x022B4 -triangleq; 0x0225C -triangleright; 0x025B9 -trianglerighteq; 0x022B5 -tridot; 0x025EC -trie; 0x0225C -triminus; 0x02A3A -TripleDot; 0x020DB -triplus; 0x02A39 -trisb; 0x029CD -tritime; 0x02A3B -trpezium; 0x023E2 -Tscr; 0x1D4AF -tscr; 0x1D4C9 -TScy; 0x00426 -tscy; 0x00446 -TSHcy; 0x0040B -tshcy; 0x0045B -Tstrok; 0x00166 -tstrok; 0x00167 -twixt; 0x0226C -twoheadleftarrow; 0x0219E -twoheadrightarrow; 0x021A0 -Uacute; 0x000DA -Uacute 0x000DA -uacute; 0x000FA -uacute 0x000FA -uarr; 0x02191 -Uarr; 0x0219F -uArr; 0x021D1 -Uarrocir; 0x02949 -Ubrcy; 0x0040E -ubrcy; 0x0045E -Ubreve; 0x0016C -ubreve; 0x0016D -Ucirc; 0x000DB -Ucirc 0x000DB -ucirc; 0x000FB -ucirc 0x000FB -Ucy; 0x00423 -ucy; 0x00443 -udarr; 0x021C5 -Udblac; 0x00170 -udblac; 0x00171 -udhar; 0x0296E -ufisht; 0x0297E -Ufr; 0x1D518 -ufr; 0x1D532 -Ugrave; 0x000D9 -Ugrave 0x000D9 -ugrave; 0x000F9 -ugrave 0x000F9 -uHar; 0x02963 -uharl; 0x021BF -uharr; 0x021BE -uhblk; 0x02580 -ulcorn; 0x0231C -ulcorner; 0x0231C -ulcrop; 0x0230F -ultri; 0x025F8 -Umacr; 0x0016A -umacr; 0x0016B -uml; 0x000A8 -uml 0x000A8 -UnderBar; 0x00332 -UnderBrace; 0x023DF -UnderBracket; 0x023B5 -UnderParenthesis; 0x023DD -Union; 0x022C3 -UnionPlus; 0x0228E -Uogon; 0x00172 -uogon; 0x00173 -Uopf; 0x1D54C -uopf; 0x1D566 -uparrow; 0x02191 -UpArrow; 0x02191 -Uparrow; 0x021D1 -UpArrowBar; 0x02912 -UpArrowDownArrow; 0x021C5 -updownarrow; 0x02195 -UpDownArrow; 0x02195 -Updownarrow; 0x021D5 -UpEquilibrium; 0x0296E -upharpoonleft; 0x021BF -upharpoonright; 0x021BE -uplus; 0x0228E -UpperLeftArrow; 0x02196 -UpperRightArrow; 0x02197 -upsi; 0x003C5 -Upsi; 0x003D2 -upsih; 0x003D2 -Upsilon; 0x003A5 -upsilon; 0x003C5 -UpTee; 0x022A5 -UpTeeArrow; 0x021A5 -upuparrows; 0x021C8 -urcorn; 0x0231D -urcorner; 0x0231D -urcrop; 0x0230E -Uring; 0x0016E -uring; 0x0016F -urtri; 0x025F9 -Uscr; 0x1D4B0 -uscr; 0x1D4CA -utdot; 0x022F0 -Utilde; 0x00168 -utilde; 0x00169 -utri; 0x025B5 -utrif; 0x025B4 -uuarr; 0x021C8 -Uuml; 0x000DC -Uuml 0x000DC -uuml; 0x000FC -uuml 0x000FC -uwangle; 0x029A7 -vangrt; 0x0299C -varepsilon; 0x003B5 -varkappa; 0x003F0 -varnothing; 0x02205 -varphi; 0x003C6 -varpi; 0x003D6 -varpropto; 0x0221D -varr; 0x02195 -vArr; 0x021D5 -varrho; 0x003F1 -varsigma; 0x003C2 -vartheta; 0x003D1 -vartriangleleft; 0x022B2 -vartriangleright; 0x022B3 -vBar; 0x02AE8 -Vbar; 0x02AEB -vBarv; 0x02AE9 -Vcy; 0x00412 -vcy; 0x00432 -vdash; 0x022A2 -vDash; 0x022A8 -Vdash; 0x022A9 -VDash; 0x022AB -Vdashl; 0x02AE6 -vee; 0x02228 -Vee; 0x022C1 -veebar; 0x022BB -veeeq; 0x0225A -vellip; 0x022EE -verbar; 0x0007C -Verbar; 0x02016 -vert; 0x0007C -Vert; 0x02016 -VerticalBar; 0x02223 -VerticalLine; 0x0007C -VerticalSeparator; 0x02758 -VerticalTilde; 0x02240 -VeryThinSpace; 0x0200A -Vfr; 0x1D519 -vfr; 0x1D533 -vltri; 0x022B2 -Vopf; 0x1D54D -vopf; 0x1D567 -vprop; 0x0221D -vrtri; 0x022B3 -Vscr; 0x1D4B1 -vscr; 0x1D4CB -Vvdash; 0x022AA -vzigzag; 0x0299A -Wcirc; 0x00174 -wcirc; 0x00175 -wedbar; 0x02A5F -wedge; 0x02227 -Wedge; 0x022C0 -wedgeq; 0x02259 -weierp; 0x02118 -Wfr; 0x1D51A -wfr; 0x1D534 -Wopf; 0x1D54E -wopf; 0x1D568 -wp; 0x02118 -wr; 0x02240 -wreath; 0x02240 -Wscr; 0x1D4B2 -wscr; 0x1D4CC -xcap; 0x022C2 -xcirc; 0x025EF -xcup; 0x022C3 -xdtri; 0x025BD -Xfr; 0x1D51B -xfr; 0x1D535 -xharr; 0x027F7 -xhArr; 0x027FA -Xi; 0x0039E -xi; 0x003BE -xlarr; 0x027F5 -xlArr; 0x027F8 -xmap; 0x027FC -xnis; 0x022FB -xodot; 0x02A00 -Xopf; 0x1D54F -xopf; 0x1D569 -xoplus; 0x02A01 -xotime; 0x02A02 -xrarr; 0x027F6 -xrArr; 0x027F9 -Xscr; 0x1D4B3 -xscr; 0x1D4CD -xsqcup; 0x02A06 -xuplus; 0x02A04 -xutri; 0x025B3 -xvee; 0x022C1 -xwedge; 0x022C0 -Yacute; 0x000DD -Yacute 0x000DD -yacute; 0x000FD -yacute 0x000FD -YAcy; 0x0042F -yacy; 0x0044F -Ycirc; 0x00176 -ycirc; 0x00177 -Ycy; 0x0042B -ycy; 0x0044B -yen; 0x000A5 -yen 0x000A5 -Yfr; 0x1D51C -yfr; 0x1D536 -YIcy; 0x00407 -yicy; 0x00457 -Yopf; 0x1D550 -yopf; 0x1D56A -Yscr; 0x1D4B4 -yscr; 0x1D4CE -YUcy; 0x0042E -yucy; 0x0044E -yuml; 0x000FF -yuml 0x000FF -Yuml; 0x00178 -Zacute; 0x00179 -zacute; 0x0017A -Zcaron; 0x0017D -zcaron; 0x0017E -Zcy; 0x00417 -zcy; 0x00437 -Zdot; 0x0017B -zdot; 0x0017C -zeetrf; 0x02128 -ZeroWidthSpace; 0x0200B -Zeta; 0x00396 -zeta; 0x003B6 -Zfr; 0x02128 -zfr; 0x1D537 -ZHcy; 0x00416 -zhcy; 0x00436 -zigrarr; 0x021DD -Zopf; 0x02124 -zopf; 0x1D56B -Zscr; 0x1D4B5 -zscr; 0x1D4CF -zwj; 0x0200D -zwnj; 0x0200C +# Entity Code +Aacute; 0x000C1 +Aacute 0x000C1 +aacute; 0x000E1 +aacute 0x000E1 +Abreve; 0x00102 +abreve; 0x00103 +ac; 0x0223E +acd; 0x0223F +acE; 0x0223E 0x00333 +Acirc; 0x000C2 +Acirc 0x000C2 +acirc; 0x000E2 +acirc 0x000E2 +acute; 0x000B4 +acute 0x000B4 +Acy; 0x00410 +acy; 0x00430 +AElig; 0x000C6 +AElig 0x000C6 +aelig; 0x000E6 +aelig 0x000E6 +af; 0x02061 +Afr; 0x1D504 +afr; 0x1D51E +Agrave; 0x000C0 +Agrave 0x000C0 +agrave; 0x000E0 +agrave 0x000E0 +alefsym; 0x02135 +aleph; 0x02135 +Alpha; 0x00391 +alpha; 0x003B1 +Amacr; 0x00100 +amacr; 0x00101 +amalg; 0x02A3F +amp; 0x00026 +amp 0x00026 +AMP; 0x00026 +AMP 0x00026 +and; 0x02227 +And; 0x02A53 +andand; 0x02A55 +andd; 0x02A5C +andslope; 0x02A58 +andv; 0x02A5A +ang; 0x02220 +ange; 0x029A4 +angle; 0x02220 +angmsd; 0x02221 +angmsdaa; 0x029A8 +angmsdab; 0x029A9 +angmsdac; 0x029AA +angmsdad; 0x029AB +angmsdae; 0x029AC +angmsdaf; 0x029AD +angmsdag; 0x029AE +angmsdah; 0x029AF +angrt; 0x0221F +angrtvb; 0x022BE +angrtvbd; 0x0299D +angsph; 0x02222 +angst; 0x000C5 +angzarr; 0x0237C +Aogon; 0x00104 +aogon; 0x00105 +Aopf; 0x1D538 +aopf; 0x1D552 +ap; 0x02248 +apacir; 0x02A6F +ape; 0x0224A +apE; 0x02A70 +apid; 0x0224B +apos; 0x00027 +ApplyFunction; 0x02061 +approx; 0x02248 +approxeq; 0x0224A +Aring; 0x000C5 +Aring 0x000C5 +aring; 0x000E5 +aring 0x000E5 +Ascr; 0x1D49C +ascr; 0x1D4B6 +Assign; 0x02254 +ast; 0x0002A +asymp; 0x02248 +asympeq; 0x0224D +Atilde; 0x000C3 +Atilde 0x000C3 +atilde; 0x000E3 +atilde 0x000E3 +Auml; 0x000C4 +Auml 0x000C4 +auml; 0x000E4 +auml 0x000E4 +awconint; 0x02233 +awint; 0x02A11 +backcong; 0x0224C +backepsilon; 0x003F6 +backprime; 0x02035 +backsim; 0x0223D +backsimeq; 0x022CD +Backslash; 0x02216 +Barv; 0x02AE7 +barvee; 0x022BD +barwed; 0x02305 +Barwed; 0x02306 +barwedge; 0x02305 +bbrk; 0x023B5 +bbrktbrk; 0x023B6 +bcong; 0x0224C +Bcy; 0x00411 +bcy; 0x00431 +bdquo; 0x0201E +becaus; 0x02235 +because; 0x02235 +Because; 0x02235 +bemptyv; 0x029B0 +bepsi; 0x003F6 +bernou; 0x0212C +Bernoullis; 0x0212C +Beta; 0x00392 +beta; 0x003B2 +beth; 0x02136 +between; 0x0226C +Bfr; 0x1D505 +bfr; 0x1D51F +bigcap; 0x022C2 +bigcirc; 0x025EF +bigcup; 0x022C3 +bigodot; 0x02A00 +bigoplus; 0x02A01 +bigotimes; 0x02A02 +bigsqcup; 0x02A06 +bigstar; 0x02605 +bigtriangledown; 0x025BD +bigtriangleup; 0x025B3 +biguplus; 0x02A04 +bigvee; 0x022C1 +bigwedge; 0x022C0 +bkarow; 0x0290D +blacklozenge; 0x029EB +blacksquare; 0x025AA +blacktriangle; 0x025B4 +blacktriangledown; 0x025BE +blacktriangleleft; 0x025C2 +blacktriangleright; 0x025B8 +blank; 0x02423 +blk12; 0x02592 +blk14; 0x02591 +blk34; 0x02593 +block; 0x02588 +bne; 0x0003D 0x020E5 +bnequiv; 0x02261 0x020E5 +bnot; 0x02310 +bNot; 0x02AED +Bopf; 0x1D539 +bopf; 0x1D553 +bot; 0x022A5 +bottom; 0x022A5 +bowtie; 0x022C8 +boxbox; 0x029C9 +boxdl; 0x02510 +boxdL; 0x02555 +boxDl; 0x02556 +boxDL; 0x02557 +boxdr; 0x0250C +boxdR; 0x02552 +boxDr; 0x02553 +boxDR; 0x02554 +boxh; 0x02500 +boxH; 0x02550 +boxhd; 0x0252C +boxHd; 0x02564 +boxhD; 0x02565 +boxHD; 0x02566 +boxhu; 0x02534 +boxHu; 0x02567 +boxhU; 0x02568 +boxHU; 0x02569 +boxminus; 0x0229F +boxplus; 0x0229E +boxtimes; 0x022A0 +boxul; 0x02518 +boxuL; 0x0255B +boxUl; 0x0255C +boxUL; 0x0255D +boxur; 0x02514 +boxuR; 0x02558 +boxUr; 0x02559 +boxUR; 0x0255A +boxv; 0x02502 +boxV; 0x02551 +boxvh; 0x0253C +boxvH; 0x0256A +boxVh; 0x0256B +boxVH; 0x0256C +boxvl; 0x02524 +boxvL; 0x02561 +boxVl; 0x02562 +boxVL; 0x02563 +boxvr; 0x0251C +boxvR; 0x0255E +boxVr; 0x0255F +boxVR; 0x02560 +bprime; 0x02035 +breve; 0x002D8 +Breve; 0x002D8 +brvbar; 0x000A6 +brvbar 0x000A6 +Bscr; 0x0212C +bscr; 0x1D4B7 +bsemi; 0x0204F +bsim; 0x0223D +bsime; 0x022CD +bsol; 0x0005C +bsolb; 0x029C5 +bsolhsub; 0x027C8 +bull; 0x02022 +bullet; 0x02022 +bump; 0x0224E +bumpe; 0x0224F +bumpE; 0x02AAE +Bumpeq; 0x0224E +bumpeq; 0x0224F +Cacute; 0x00106 +cacute; 0x00107 +cap; 0x02229 +Cap; 0x022D2 +capand; 0x02A44 +capbrcup; 0x02A49 +capcap; 0x02A4B +capcup; 0x02A47 +capdot; 0x02A40 +CapitalDifferentialD; 0x02145 +caps; 0x02229 0x0FE00 +caret; 0x02041 +caron; 0x002C7 +Cayleys; 0x0212D +ccaps; 0x02A4D +Ccaron; 0x0010C +ccaron; 0x0010D +Ccedil; 0x000C7 +Ccedil 0x000C7 +ccedil; 0x000E7 +ccedil 0x000E7 +Ccirc; 0x00108 +ccirc; 0x00109 +Cconint; 0x02230 +ccups; 0x02A4C +ccupssm; 0x02A50 +Cdot; 0x0010A +cdot; 0x0010B +cedil; 0x000B8 +cedil 0x000B8 +Cedilla; 0x000B8 +cemptyv; 0x029B2 +cent; 0x000A2 +cent 0x000A2 +centerdot; 0x000B7 +CenterDot; 0x000B7 +Cfr; 0x0212D +cfr; 0x1D520 +CHcy; 0x00427 +chcy; 0x00447 +check; 0x02713 +checkmark; 0x02713 +Chi; 0x003A7 +chi; 0x003C7 +cir; 0x025CB +circ; 0x002C6 +circeq; 0x02257 +circlearrowleft; 0x021BA +circlearrowright; 0x021BB +circledast; 0x0229B +circledcirc; 0x0229A +circleddash; 0x0229D +CircleDot; 0x02299 +circledR; 0x000AE +circledS; 0x024C8 +CircleMinus; 0x02296 +CirclePlus; 0x02295 +CircleTimes; 0x02297 +cire; 0x02257 +cirE; 0x029C3 +cirfnint; 0x02A10 +cirmid; 0x02AEF +cirscir; 0x029C2 +ClockwiseContourIntegral; 0x02232 +CloseCurlyDoubleQuote; 0x0201D +CloseCurlyQuote; 0x02019 +clubs; 0x02663 +clubsuit; 0x02663 +colon; 0x0003A +Colon; 0x02237 +colone; 0x02254 +Colone; 0x02A74 +coloneq; 0x02254 +comma; 0x0002C +commat; 0x00040 +comp; 0x02201 +compfn; 0x02218 +complement; 0x02201 +complexes; 0x02102 +cong; 0x02245 +congdot; 0x02A6D +Congruent; 0x02261 +conint; 0x0222E +Conint; 0x0222F +ContourIntegral; 0x0222E +Copf; 0x02102 +copf; 0x1D554 +coprod; 0x02210 +Coproduct; 0x02210 +copy; 0x000A9 +copy 0x000A9 +COPY; 0x000A9 +COPY 0x000A9 +copysr; 0x02117 +CounterClockwiseContourIntegral; 0x02233 +crarr; 0x021B5 +cross; 0x02717 +Cross; 0x02A2F +Cscr; 0x1D49E +cscr; 0x1D4B8 +csub; 0x02ACF +csube; 0x02AD1 +csup; 0x02AD0 +csupe; 0x02AD2 +ctdot; 0x022EF +cudarrl; 0x02938 +cudarrr; 0x02935 +cuepr; 0x022DE +cuesc; 0x022DF +cularr; 0x021B6 +cularrp; 0x0293D +cup; 0x0222A +Cup; 0x022D3 +cupbrcap; 0x02A48 +CupCap; 0x0224D +cupcap; 0x02A46 +cupcup; 0x02A4A +cupdot; 0x0228D +cupor; 0x02A45 +cups; 0x0222A 0x0FE00 +curarr; 0x021B7 +curarrm; 0x0293C +curlyeqprec; 0x022DE +curlyeqsucc; 0x022DF +curlyvee; 0x022CE +curlywedge; 0x022CF +curren; 0x000A4 +curren 0x000A4 +curvearrowleft; 0x021B6 +curvearrowright; 0x021B7 +cuvee; 0x022CE +cuwed; 0x022CF +cwconint; 0x02232 +cwint; 0x02231 +cylcty; 0x0232D +dagger; 0x02020 +Dagger; 0x02021 +daleth; 0x02138 +darr; 0x02193 +Darr; 0x021A1 +dArr; 0x021D3 +dash; 0x02010 +dashv; 0x022A3 +Dashv; 0x02AE4 +dbkarow; 0x0290F +dblac; 0x002DD +Dcaron; 0x0010E +dcaron; 0x0010F +Dcy; 0x00414 +dcy; 0x00434 +DD; 0x02145 +dd; 0x02146 +ddagger; 0x02021 +ddarr; 0x021CA +DDotrahd; 0x02911 +ddotseq; 0x02A77 +deg; 0x000B0 +deg 0x000B0 +Del; 0x02207 +Delta; 0x00394 +delta; 0x003B4 +demptyv; 0x029B1 +dfisht; 0x0297F +Dfr; 0x1D507 +dfr; 0x1D521 +dHar; 0x02965 +dharl; 0x021C3 +dharr; 0x021C2 +DiacriticalAcute; 0x000B4 +DiacriticalDot; 0x002D9 +DiacriticalDoubleAcute; 0x002DD +DiacriticalGrave; 0x00060 +DiacriticalTilde; 0x002DC +diam; 0x022C4 +diamond; 0x022C4 +Diamond; 0x022C4 +diamondsuit; 0x02666 +diams; 0x02666 +die; 0x000A8 +DifferentialD; 0x02146 +digamma; 0x003DD +disin; 0x022F2 +div; 0x000F7 +divide; 0x000F7 +divide 0x000F7 +divideontimes; 0x022C7 +divonx; 0x022C7 +DJcy; 0x00402 +djcy; 0x00452 +dlcorn; 0x0231E +dlcrop; 0x0230D +dollar; 0x00024 +Dopf; 0x1D53B +dopf; 0x1D555 +Dot; 0x000A8 +dot; 0x002D9 +DotDot; 0x020DC +doteq; 0x02250 +doteqdot; 0x02251 +DotEqual; 0x02250 +dotminus; 0x02238 +dotplus; 0x02214 +dotsquare; 0x022A1 +doublebarwedge; 0x02306 +DoubleContourIntegral; 0x0222F +DoubleDot; 0x000A8 +DoubleDownArrow; 0x021D3 +DoubleLeftArrow; 0x021D0 +DoubleLeftRightArrow; 0x021D4 +DoubleLeftTee; 0x02AE4 +DoubleLongLeftArrow; 0x027F8 +DoubleLongLeftRightArrow; 0x027FA +DoubleLongRightArrow; 0x027F9 +DoubleRightArrow; 0x021D2 +DoubleRightTee; 0x022A8 +DoubleUpArrow; 0x021D1 +DoubleUpDownArrow; 0x021D5 +DoubleVerticalBar; 0x02225 +downarrow; 0x02193 +DownArrow; 0x02193 +Downarrow; 0x021D3 +DownArrowBar; 0x02913 +DownArrowUpArrow; 0x021F5 +DownBreve; 0x00311 +downdownarrows; 0x021CA +downharpoonleft; 0x021C3 +downharpoonright; 0x021C2 +DownLeftRightVector; 0x02950 +DownLeftTeeVector; 0x0295E +DownLeftVector; 0x021BD +DownLeftVectorBar; 0x02956 +DownRightTeeVector; 0x0295F +DownRightVector; 0x021C1 +DownRightVectorBar; 0x02957 +DownTee; 0x022A4 +DownTeeArrow; 0x021A7 +drbkarow; 0x02910 +drcorn; 0x0231F +drcrop; 0x0230C +Dscr; 0x1D49F +dscr; 0x1D4B9 +DScy; 0x00405 +dscy; 0x00455 +dsol; 0x029F6 +Dstrok; 0x00110 +dstrok; 0x00111 +dtdot; 0x022F1 +dtri; 0x025BF +dtrif; 0x025BE +duarr; 0x021F5 +duhar; 0x0296F +dwangle; 0x029A6 +DZcy; 0x0040F +dzcy; 0x0045F +dzigrarr; 0x027FF +Eacute; 0x000C9 +Eacute 0x000C9 +eacute; 0x000E9 +eacute 0x000E9 +easter; 0x02A6E +Ecaron; 0x0011A +ecaron; 0x0011B +ecir; 0x02256 +Ecirc; 0x000CA +Ecirc 0x000CA +ecirc; 0x000EA +ecirc 0x000EA +ecolon; 0x02255 +Ecy; 0x0042D +ecy; 0x0044D +eDDot; 0x02A77 +Edot; 0x00116 +edot; 0x00117 +eDot; 0x02251 +ee; 0x02147 +efDot; 0x02252 +Efr; 0x1D508 +efr; 0x1D522 +eg; 0x02A9A +Egrave; 0x000C8 +Egrave 0x000C8 +egrave; 0x000E8 +egrave 0x000E8 +egs; 0x02A96 +egsdot; 0x02A98 +el; 0x02A99 +Element; 0x02208 +elinters; 0x023E7 +ell; 0x02113 +els; 0x02A95 +elsdot; 0x02A97 +Emacr; 0x00112 +emacr; 0x00113 +empty; 0x02205 +emptyset; 0x02205 +EmptySmallSquare; 0x025FB +emptyv; 0x02205 +EmptyVerySmallSquare; 0x025AB +emsp; 0x02003 +emsp13; 0x02004 +emsp14; 0x02005 +ENG; 0x0014A +eng; 0x0014B +ensp; 0x02002 +Eogon; 0x00118 +eogon; 0x00119 +Eopf; 0x1D53C +eopf; 0x1D556 +epar; 0x022D5 +eparsl; 0x029E3 +eplus; 0x02A71 +epsi; 0x003B5 +Epsilon; 0x00395 +epsilon; 0x003B5 +epsiv; 0x003F5 +eqcirc; 0x02256 +eqcolon; 0x02255 +eqsim; 0x02242 +eqslantgtr; 0x02A96 +eqslantless; 0x02A95 +Equal; 0x02A75 +equals; 0x0003D +EqualTilde; 0x02242 +equest; 0x0225F +Equilibrium; 0x021CC +equiv; 0x02261 +equivDD; 0x02A78 +eqvparsl; 0x029E5 +erarr; 0x02971 +erDot; 0x02253 +escr; 0x0212F +Escr; 0x02130 +esdot; 0x02250 +esim; 0x02242 +Esim; 0x02A73 +Eta; 0x00397 +eta; 0x003B7 +ETH; 0x000D0 +ETH 0x000D0 +eth; 0x000F0 +eth 0x000F0 +Euml; 0x000CB +Euml 0x000CB +euml; 0x000EB +euml 0x000EB +euro; 0x020AC +excl; 0x00021 +exist; 0x02203 +Exists; 0x02203 +expectation; 0x02130 +exponentiale; 0x02147 +ExponentialE; 0x02147 +fallingdotseq; 0x02252 +Fcy; 0x00424 +fcy; 0x00444 +female; 0x02640 +ffilig; 0x0FB03 +fflig; 0x0FB00 +ffllig; 0x0FB04 +Ffr; 0x1D509 +ffr; 0x1D523 +filig; 0x0FB01 +FilledSmallSquare; 0x025FC +FilledVerySmallSquare; 0x025AA +fjlig; 0x00066 0x0006A +flat; 0x0266D +fllig; 0x0FB02 +fltns; 0x025B1 +fnof; 0x00192 +Fopf; 0x1D53D +fopf; 0x1D557 +forall; 0x02200 +ForAll; 0x02200 +fork; 0x022D4 +forkv; 0x02AD9 +Fouriertrf; 0x02131 +fpartint; 0x02A0D +frac12; 0x000BD +frac12 0x000BD +frac13; 0x02153 +frac14; 0x000BC +frac14 0x000BC +frac15; 0x02155 +frac16; 0x02159 +frac18; 0x0215B +frac23; 0x02154 +frac25; 0x02156 +frac34; 0x000BE +frac34 0x000BE +frac35; 0x02157 +frac38; 0x0215C +frac45; 0x02158 +frac56; 0x0215A +frac58; 0x0215D +frac78; 0x0215E +frasl; 0x02044 +frown; 0x02322 +Fscr; 0x02131 +fscr; 0x1D4BB +gacute; 0x001F5 +Gamma; 0x00393 +gamma; 0x003B3 +Gammad; 0x003DC +gammad; 0x003DD +gap; 0x02A86 +Gbreve; 0x0011E +gbreve; 0x0011F +Gcedil; 0x00122 +Gcirc; 0x0011C +gcirc; 0x0011D +Gcy; 0x00413 +gcy; 0x00433 +Gdot; 0x00120 +gdot; 0x00121 +ge; 0x02265 +gE; 0x02267 +gel; 0x022DB +gEl; 0x02A8C +geq; 0x02265 +geqq; 0x02267 +geqslant; 0x02A7E +ges; 0x02A7E +gescc; 0x02AA9 +gesdot; 0x02A80 +gesdoto; 0x02A82 +gesdotol; 0x02A84 +gesl; 0x022DB 0x0FE00 +gesles; 0x02A94 +Gfr; 0x1D50A +gfr; 0x1D524 +gg; 0x0226B +Gg; 0x022D9 +ggg; 0x022D9 +gimel; 0x02137 +GJcy; 0x00403 +gjcy; 0x00453 +gl; 0x02277 +gla; 0x02AA5 +glE; 0x02A92 +glj; 0x02AA4 +gnap; 0x02A8A +gnapprox; 0x02A8A +gnE; 0x02269 +gne; 0x02A88 +gneq; 0x02A88 +gneqq; 0x02269 +gnsim; 0x022E7 +Gopf; 0x1D53E +gopf; 0x1D558 +grave; 0x00060 +GreaterEqual; 0x02265 +GreaterEqualLess; 0x022DB +GreaterFullEqual; 0x02267 +GreaterGreater; 0x02AA2 +GreaterLess; 0x02277 +GreaterSlantEqual; 0x02A7E +GreaterTilde; 0x02273 +gscr; 0x0210A +Gscr; 0x1D4A2 +gsim; 0x02273 +gsime; 0x02A8E +gsiml; 0x02A90 +gt; 0x0003E +gt 0x0003E +GT; 0x0003E +GT 0x0003E +Gt; 0x0226B +gtcc; 0x02AA7 +gtcir; 0x02A7A +gtdot; 0x022D7 +gtlPar; 0x02995 +gtquest; 0x02A7C +gtrapprox; 0x02A86 +gtrarr; 0x02978 +gtrdot; 0x022D7 +gtreqless; 0x022DB +gtreqqless; 0x02A8C +gtrless; 0x02277 +gtrsim; 0x02273 +gvertneqq; 0x02269 0x0FE00 +gvnE; 0x02269 0x0FE00 +Hacek; 0x002C7 +hairsp; 0x0200A +half; 0x000BD +hamilt; 0x0210B +HARDcy; 0x0042A +hardcy; 0x0044A +harr; 0x02194 +hArr; 0x021D4 +harrcir; 0x02948 +harrw; 0x021AD +Hat; 0x0005E +hbar; 0x0210F +Hcirc; 0x00124 +hcirc; 0x00125 +hearts; 0x02665 +heartsuit; 0x02665 +hellip; 0x02026 +hercon; 0x022B9 +Hfr; 0x0210C +hfr; 0x1D525 +HilbertSpace; 0x0210B +hksearow; 0x02925 +hkswarow; 0x02926 +hoarr; 0x021FF +homtht; 0x0223B +hookleftarrow; 0x021A9 +hookrightarrow; 0x021AA +Hopf; 0x0210D +hopf; 0x1D559 +horbar; 0x02015 +HorizontalLine; 0x02500 +Hscr; 0x0210B +hscr; 0x1D4BD +hslash; 0x0210F +Hstrok; 0x00126 +hstrok; 0x00127 +HumpDownHump; 0x0224E +HumpEqual; 0x0224F +hybull; 0x02043 +hyphen; 0x02010 +Iacute; 0x000CD +Iacute 0x000CD +iacute; 0x000ED +iacute 0x000ED +ic; 0x02063 +Icirc; 0x000CE +Icirc 0x000CE +icirc; 0x000EE +icirc 0x000EE +Icy; 0x00418 +icy; 0x00438 +Idot; 0x00130 +IEcy; 0x00415 +iecy; 0x00435 +iexcl; 0x000A1 +iexcl 0x000A1 +iff; 0x021D4 +Ifr; 0x02111 +ifr; 0x1D526 +Igrave; 0x000CC +Igrave 0x000CC +igrave; 0x000EC +igrave 0x000EC +ii; 0x02148 +iiiint; 0x02A0C +iiint; 0x0222D +iinfin; 0x029DC +iiota; 0x02129 +IJlig; 0x00132 +ijlig; 0x00133 +Im; 0x02111 +Imacr; 0x0012A +imacr; 0x0012B +image; 0x02111 +ImaginaryI; 0x02148 +imagline; 0x02110 +imagpart; 0x02111 +imath; 0x00131 +imof; 0x022B7 +imped; 0x001B5 +Implies; 0x021D2 +in; 0x02208 +incare; 0x02105 +infin; 0x0221E +infintie; 0x029DD +inodot; 0x00131 +int; 0x0222B +Int; 0x0222C +intcal; 0x022BA +integers; 0x02124 +Integral; 0x0222B +intercal; 0x022BA +Intersection; 0x022C2 +intlarhk; 0x02A17 +intprod; 0x02A3C +InvisibleComma; 0x02063 +InvisibleTimes; 0x02062 +IOcy; 0x00401 +iocy; 0x00451 +Iogon; 0x0012E +iogon; 0x0012F +Iopf; 0x1D540 +iopf; 0x1D55A +Iota; 0x00399 +iota; 0x003B9 +iprod; 0x02A3C +iquest; 0x000BF +iquest 0x000BF +Iscr; 0x02110 +iscr; 0x1D4BE +isin; 0x02208 +isindot; 0x022F5 +isinE; 0x022F9 +isins; 0x022F4 +isinsv; 0x022F3 +isinv; 0x02208 +it; 0x02062 +Itilde; 0x00128 +itilde; 0x00129 +Iukcy; 0x00406 +iukcy; 0x00456 +Iuml; 0x000CF +Iuml 0x000CF +iuml; 0x000EF +iuml 0x000EF +Jcirc; 0x00134 +jcirc; 0x00135 +Jcy; 0x00419 +jcy; 0x00439 +Jfr; 0x1D50D +jfr; 0x1D527 +jmath; 0x00237 +Jopf; 0x1D541 +jopf; 0x1D55B +Jscr; 0x1D4A5 +jscr; 0x1D4BF +Jsercy; 0x00408 +jsercy; 0x00458 +Jukcy; 0x00404 +jukcy; 0x00454 +Kappa; 0x0039A +kappa; 0x003BA +kappav; 0x003F0 +Kcedil; 0x00136 +kcedil; 0x00137 +Kcy; 0x0041A +kcy; 0x0043A +Kfr; 0x1D50E +kfr; 0x1D528 +kgreen; 0x00138 +KHcy; 0x00425 +khcy; 0x00445 +KJcy; 0x0040C +kjcy; 0x0045C +Kopf; 0x1D542 +kopf; 0x1D55C +Kscr; 0x1D4A6 +kscr; 0x1D4C0 +lAarr; 0x021DA +Lacute; 0x00139 +lacute; 0x0013A +laemptyv; 0x029B4 +lagran; 0x02112 +Lambda; 0x0039B +lambda; 0x003BB +lang; 0x027E8 +Lang; 0x027EA +langd; 0x02991 +langle; 0x027E8 +lap; 0x02A85 +Laplacetrf; 0x02112 +laquo; 0x000AB +laquo 0x000AB +larr; 0x02190 +Larr; 0x0219E +lArr; 0x021D0 +larrb; 0x021E4 +larrbfs; 0x0291F +larrfs; 0x0291D +larrhk; 0x021A9 +larrlp; 0x021AB +larrpl; 0x02939 +larrsim; 0x02973 +larrtl; 0x021A2 +lat; 0x02AAB +latail; 0x02919 +lAtail; 0x0291B +late; 0x02AAD +lates; 0x02AAD 0x0FE00 +lbarr; 0x0290C +lBarr; 0x0290E +lbbrk; 0x02772 +lbrace; 0x0007B +lbrack; 0x0005B +lbrke; 0x0298B +lbrksld; 0x0298F +lbrkslu; 0x0298D +Lcaron; 0x0013D +lcaron; 0x0013E +Lcedil; 0x0013B +lcedil; 0x0013C +lceil; 0x02308 +lcub; 0x0007B +Lcy; 0x0041B +lcy; 0x0043B +ldca; 0x02936 +ldquo; 0x0201C +ldquor; 0x0201E +ldrdhar; 0x02967 +ldrushar; 0x0294B +ldsh; 0x021B2 +le; 0x02264 +lE; 0x02266 +LeftAngleBracket; 0x027E8 +leftarrow; 0x02190 +LeftArrow; 0x02190 +Leftarrow; 0x021D0 +LeftArrowBar; 0x021E4 +LeftArrowRightArrow; 0x021C6 +leftarrowtail; 0x021A2 +LeftCeiling; 0x02308 +LeftDoubleBracket; 0x027E6 +LeftDownTeeVector; 0x02961 +LeftDownVector; 0x021C3 +LeftDownVectorBar; 0x02959 +LeftFloor; 0x0230A +leftharpoondown; 0x021BD +leftharpoonup; 0x021BC +leftleftarrows; 0x021C7 +leftrightarrow; 0x02194 +LeftRightArrow; 0x02194 +Leftrightarrow; 0x021D4 +leftrightarrows; 0x021C6 +leftrightharpoons; 0x021CB +leftrightsquigarrow; 0x021AD +LeftRightVector; 0x0294E +LeftTee; 0x022A3 +LeftTeeArrow; 0x021A4 +LeftTeeVector; 0x0295A +leftthreetimes; 0x022CB +LeftTriangle; 0x022B2 +LeftTriangleBar; 0x029CF +LeftTriangleEqual; 0x022B4 +LeftUpDownVector; 0x02951 +LeftUpTeeVector; 0x02960 +LeftUpVector; 0x021BF +LeftUpVectorBar; 0x02958 +LeftVector; 0x021BC +LeftVectorBar; 0x02952 +leg; 0x022DA +lEg; 0x02A8B +leq; 0x02264 +leqq; 0x02266 +leqslant; 0x02A7D +les; 0x02A7D +lescc; 0x02AA8 +lesdot; 0x02A7F +lesdoto; 0x02A81 +lesdotor; 0x02A83 +lesg; 0x022DA 0x0FE00 +lesges; 0x02A93 +lessapprox; 0x02A85 +lessdot; 0x022D6 +lesseqgtr; 0x022DA +lesseqqgtr; 0x02A8B +LessEqualGreater; 0x022DA +LessFullEqual; 0x02266 +LessGreater; 0x02276 +lessgtr; 0x02276 +LessLess; 0x02AA1 +lesssim; 0x02272 +LessSlantEqual; 0x02A7D +LessTilde; 0x02272 +lfisht; 0x0297C +lfloor; 0x0230A +Lfr; 0x1D50F +lfr; 0x1D529 +lg; 0x02276 +lgE; 0x02A91 +lHar; 0x02962 +lhard; 0x021BD +lharu; 0x021BC +lharul; 0x0296A +lhblk; 0x02584 +LJcy; 0x00409 +ljcy; 0x00459 +ll; 0x0226A +Ll; 0x022D8 +llarr; 0x021C7 +llcorner; 0x0231E +Lleftarrow; 0x021DA +llhard; 0x0296B +lltri; 0x025FA +Lmidot; 0x0013F +lmidot; 0x00140 +lmoust; 0x023B0 +lmoustache; 0x023B0 +lnap; 0x02A89 +lnapprox; 0x02A89 +lnE; 0x02268 +lne; 0x02A87 +lneq; 0x02A87 +lneqq; 0x02268 +lnsim; 0x022E6 +loang; 0x027EC +loarr; 0x021FD +lobrk; 0x027E6 +longleftarrow; 0x027F5 +LongLeftArrow; 0x027F5 +Longleftarrow; 0x027F8 +longleftrightarrow; 0x027F7 +LongLeftRightArrow; 0x027F7 +Longleftrightarrow; 0x027FA +longmapsto; 0x027FC +longrightarrow; 0x027F6 +LongRightArrow; 0x027F6 +Longrightarrow; 0x027F9 +looparrowleft; 0x021AB +looparrowright; 0x021AC +lopar; 0x02985 +Lopf; 0x1D543 +lopf; 0x1D55D +loplus; 0x02A2D +lotimes; 0x02A34 +lowast; 0x02217 +lowbar; 0x0005F +LowerLeftArrow; 0x02199 +LowerRightArrow; 0x02198 +loz; 0x025CA +lozenge; 0x025CA +lozf; 0x029EB +lpar; 0x00028 +lparlt; 0x02993 +lrarr; 0x021C6 +lrcorner; 0x0231F +lrhar; 0x021CB +lrhard; 0x0296D +lrm; 0x0200E +lrtri; 0x022BF +lsaquo; 0x02039 +Lscr; 0x02112 +lscr; 0x1D4C1 +lsh; 0x021B0 +Lsh; 0x021B0 +lsim; 0x02272 +lsime; 0x02A8D +lsimg; 0x02A8F +lsqb; 0x0005B +lsquo; 0x02018 +lsquor; 0x0201A +Lstrok; 0x00141 +lstrok; 0x00142 +lt; 0x0003C +lt 0x0003C +LT; 0x0003C +LT 0x0003C +Lt; 0x0226A +ltcc; 0x02AA6 +ltcir; 0x02A79 +ltdot; 0x022D6 +lthree; 0x022CB +ltimes; 0x022C9 +ltlarr; 0x02976 +ltquest; 0x02A7B +ltri; 0x025C3 +ltrie; 0x022B4 +ltrif; 0x025C2 +ltrPar; 0x02996 +lurdshar; 0x0294A +luruhar; 0x02966 +lvertneqq; 0x02268 0x0FE00 +lvnE; 0x02268 0x0FE00 +macr; 0x000AF +macr 0x000AF +male; 0x02642 +malt; 0x02720 +maltese; 0x02720 +map; 0x021A6 +Map; 0x02905 +mapsto; 0x021A6 +mapstodown; 0x021A7 +mapstoleft; 0x021A4 +mapstoup; 0x021A5 +marker; 0x025AE +mcomma; 0x02A29 +Mcy; 0x0041C +mcy; 0x0043C +mdash; 0x02014 +mDDot; 0x0223A +measuredangle; 0x02221 +MediumSpace; 0x0205F +Mellintrf; 0x02133 +Mfr; 0x1D510 +mfr; 0x1D52A +mho; 0x02127 +micro; 0x000B5 +micro 0x000B5 +mid; 0x02223 +midast; 0x0002A +midcir; 0x02AF0 +middot; 0x000B7 +middot 0x000B7 +minus; 0x02212 +minusb; 0x0229F +minusd; 0x02238 +minusdu; 0x02A2A +MinusPlus; 0x02213 +mlcp; 0x02ADB +mldr; 0x02026 +mnplus; 0x02213 +models; 0x022A7 +Mopf; 0x1D544 +mopf; 0x1D55E +mp; 0x02213 +Mscr; 0x02133 +mscr; 0x1D4C2 +mstpos; 0x0223E +Mu; 0x0039C +mu; 0x003BC +multimap; 0x022B8 +mumap; 0x022B8 +nabla; 0x02207 +Nacute; 0x00143 +nacute; 0x00144 +nang; 0x02220 0x020D2 +nap; 0x02249 +napE; 0x02A70 0x00338 +napid; 0x0224B 0x00338 +napos; 0x00149 +napprox; 0x02249 +natur; 0x0266E +natural; 0x0266E +naturals; 0x02115 +nbsp; 0x000A0 +nbsp 0x000A0 +nbump; 0x0224E 0x00338 +nbumpe; 0x0224F 0x00338 +ncap; 0x02A43 +Ncaron; 0x00147 +ncaron; 0x00148 +Ncedil; 0x00145 +ncedil; 0x00146 +ncong; 0x02247 +ncongdot; 0x02A6D 0x00338 +ncup; 0x02A42 +Ncy; 0x0041D +ncy; 0x0043D +ndash; 0x02013 +ne; 0x02260 +nearhk; 0x02924 +nearr; 0x02197 +neArr; 0x021D7 +nearrow; 0x02197 +nedot; 0x02250 0x00338 +NegativeMediumSpace; 0x0200B +NegativeThickSpace; 0x0200B +NegativeThinSpace; 0x0200B +NegativeVeryThinSpace; 0x0200B +nequiv; 0x02262 +nesear; 0x02928 +nesim; 0x02242 0x00338 +NestedGreaterGreater; 0x0226B +NestedLessLess; 0x0226A +NewLine; 0x0000A +nexist; 0x02204 +nexists; 0x02204 +Nfr; 0x1D511 +nfr; 0x1D52B +ngE; 0x02267 0x00338 +nge; 0x02271 +ngeq; 0x02271 +ngeqq; 0x02267 0x00338 +ngeqslant; 0x02A7E 0x00338 +nges; 0x02A7E 0x00338 +nGg; 0x022D9 0x00338 +ngsim; 0x02275 +nGt; 0x0226B 0x020D2 +ngt; 0x0226F +ngtr; 0x0226F +nGtv; 0x0226B 0x00338 +nharr; 0x021AE +nhArr; 0x021CE +nhpar; 0x02AF2 +ni; 0x0220B +nis; 0x022FC +nisd; 0x022FA +niv; 0x0220B +NJcy; 0x0040A +njcy; 0x0045A +nlarr; 0x0219A +nlArr; 0x021CD +nldr; 0x02025 +nlE; 0x02266 0x00338 +nle; 0x02270 +nleftarrow; 0x0219A +nLeftarrow; 0x021CD +nleftrightarrow; 0x021AE +nLeftrightarrow; 0x021CE +nleq; 0x02270 +nleqq; 0x02266 0x00338 +nleqslant; 0x02A7D 0x00338 +nles; 0x02A7D 0x00338 +nless; 0x0226E +nLl; 0x022D8 0x00338 +nlsim; 0x02274 +nLt; 0x0226A 0x020D2 +nlt; 0x0226E +nltri; 0x022EA +nltrie; 0x022EC +nLtv; 0x0226A 0x00338 +nmid; 0x02224 +NoBreak; 0x02060 +NonBreakingSpace; 0x000A0 +Nopf; 0x02115 +nopf; 0x1D55F +not; 0x000AC +not 0x000AC +Not; 0x02AEC +NotCongruent; 0x02262 +NotCupCap; 0x0226D +NotDoubleVerticalBar; 0x02226 +NotElement; 0x02209 +NotEqual; 0x02260 +NotEqualTilde; 0x02242 0x00338 +NotExists; 0x02204 +NotGreater; 0x0226F +NotGreaterEqual; 0x02271 +NotGreaterFullEqual; 0x02267 0x00338 +NotGreaterGreater; 0x0226B 0x00338 +NotGreaterLess; 0x02279 +NotGreaterSlantEqual; 0x02A7E 0x00338 +NotGreaterTilde; 0x02275 +NotHumpDownHump; 0x0224E 0x00338 +NotHumpEqual; 0x0224F 0x00338 +notin; 0x02209 +notindot; 0x022F5 0x00338 +notinE; 0x022F9 0x00338 +notinva; 0x02209 +notinvb; 0x022F7 +notinvc; 0x022F6 +NotLeftTriangle; 0x022EA +NotLeftTriangleBar; 0x029CF 0x00338 +NotLeftTriangleEqual; 0x022EC +NotLess; 0x0226E +NotLessEqual; 0x02270 +NotLessGreater; 0x02278 +NotLessLess; 0x0226A 0x00338 +NotLessSlantEqual; 0x02A7D 0x00338 +NotLessTilde; 0x02274 +NotNestedGreaterGreater; 0x02AA2 0x00338 +NotNestedLessLess; 0x02AA1 0x00338 +notni; 0x0220C +notniva; 0x0220C +notnivb; 0x022FE +notnivc; 0x022FD +NotPrecedes; 0x02280 +NotPrecedesEqual; 0x02AAF 0x00338 +NotPrecedesSlantEqual; 0x022E0 +NotReverseElement; 0x0220C +NotRightTriangle; 0x022EB +NotRightTriangleBar; 0x029D0 0x00338 +NotRightTriangleEqual; 0x022ED +NotSquareSubset; 0x0228F 0x00338 +NotSquareSubsetEqual; 0x022E2 +NotSquareSuperset; 0x02290 0x00338 +NotSquareSupersetEqual; 0x022E3 +NotSubset; 0x02282 0x020D2 +NotSubsetEqual; 0x02288 +NotSucceeds; 0x02281 +NotSucceedsEqual; 0x02AB0 0x00338 +NotSucceedsSlantEqual; 0x022E1 +NotSucceedsTilde; 0x0227F 0x00338 +NotSuperset; 0x02283 0x020D2 +NotSupersetEqual; 0x02289 +NotTilde; 0x02241 +NotTildeEqual; 0x02244 +NotTildeFullEqual; 0x02247 +NotTildeTilde; 0x02249 +NotVerticalBar; 0x02224 +npar; 0x02226 +nparallel; 0x02226 +nparsl; 0x02AFD 0x020E5 +npart; 0x02202 0x00338 +npolint; 0x02A14 +npr; 0x02280 +nprcue; 0x022E0 +npre; 0x02AAF 0x00338 +nprec; 0x02280 +npreceq; 0x02AAF 0x00338 +nrarr; 0x0219B +nrArr; 0x021CF +nrarrc; 0x02933 0x00338 +nrarrw; 0x0219D 0x00338 +nrightarrow; 0x0219B +nRightarrow; 0x021CF +nrtri; 0x022EB +nrtrie; 0x022ED +nsc; 0x02281 +nsccue; 0x022E1 +nsce; 0x02AB0 0x00338 +Nscr; 0x1D4A9 +nscr; 0x1D4C3 +nshortmid; 0x02224 +nshortparallel; 0x02226 +nsim; 0x02241 +nsime; 0x02244 +nsimeq; 0x02244 +nsmid; 0x02224 +nspar; 0x02226 +nsqsube; 0x022E2 +nsqsupe; 0x022E3 +nsub; 0x02284 +nsube; 0x02288 +nsubE; 0x02AC5 0x00338 +nsubset; 0x02282 0x020D2 +nsubseteq; 0x02288 +nsubseteqq; 0x02AC5 0x00338 +nsucc; 0x02281 +nsucceq; 0x02AB0 0x00338 +nsup; 0x02285 +nsupe; 0x02289 +nsupE; 0x02AC6 0x00338 +nsupset; 0x02283 0x020D2 +nsupseteq; 0x02289 +nsupseteqq; 0x02AC6 0x00338 +ntgl; 0x02279 +Ntilde; 0x000D1 +Ntilde 0x000D1 +ntilde; 0x000F1 +ntilde 0x000F1 +ntlg; 0x02278 +ntriangleleft; 0x022EA +ntrianglelefteq; 0x022EC +ntriangleright; 0x022EB +ntrianglerighteq; 0x022ED +Nu; 0x0039D +nu; 0x003BD +num; 0x00023 +numero; 0x02116 +numsp; 0x02007 +nvap; 0x0224D 0x020D2 +nvdash; 0x022AC +nvDash; 0x022AD +nVdash; 0x022AE +nVDash; 0x022AF +nvge; 0x02265 0x020D2 +nvgt; 0x0003E 0x020D2 +nvHarr; 0x02904 +nvinfin; 0x029DE +nvlArr; 0x02902 +nvle; 0x02264 0x020D2 +nvlt; 0x0003C 0x020D2 +nvltrie; 0x022B4 0x020D2 +nvrArr; 0x02903 +nvrtrie; 0x022B5 0x020D2 +nvsim; 0x0223C 0x020D2 +nwarhk; 0x02923 +nwarr; 0x02196 +nwArr; 0x021D6 +nwarrow; 0x02196 +nwnear; 0x02927 +Oacute; 0x000D3 +Oacute 0x000D3 +oacute; 0x000F3 +oacute 0x000F3 +oast; 0x0229B +ocir; 0x0229A +Ocirc; 0x000D4 +Ocirc 0x000D4 +ocirc; 0x000F4 +ocirc 0x000F4 +Ocy; 0x0041E +ocy; 0x0043E +odash; 0x0229D +Odblac; 0x00150 +odblac; 0x00151 +odiv; 0x02A38 +odot; 0x02299 +odsold; 0x029BC +OElig; 0x00152 +oelig; 0x00153 +ofcir; 0x029BF +Ofr; 0x1D512 +ofr; 0x1D52C +ogon; 0x002DB +Ograve; 0x000D2 +Ograve 0x000D2 +ograve; 0x000F2 +ograve 0x000F2 +ogt; 0x029C1 +ohbar; 0x029B5 +ohm; 0x003A9 +oint; 0x0222E +olarr; 0x021BA +olcir; 0x029BE +olcross; 0x029BB +oline; 0x0203E +olt; 0x029C0 +Omacr; 0x0014C +omacr; 0x0014D +Omega; 0x003A9 +omega; 0x003C9 +Omicron; 0x0039F +omicron; 0x003BF +omid; 0x029B6 +ominus; 0x02296 +Oopf; 0x1D546 +oopf; 0x1D560 +opar; 0x029B7 +OpenCurlyDoubleQuote; 0x0201C +OpenCurlyQuote; 0x02018 +operp; 0x029B9 +oplus; 0x02295 +or; 0x02228 +Or; 0x02A54 +orarr; 0x021BB +ord; 0x02A5D +order; 0x02134 +orderof; 0x02134 +ordf; 0x000AA +ordf 0x000AA +ordm; 0x000BA +ordm 0x000BA +origof; 0x022B6 +oror; 0x02A56 +orslope; 0x02A57 +orv; 0x02A5B +oS; 0x024C8 +oscr; 0x02134 +Oscr; 0x1D4AA +Oslash; 0x000D8 +Oslash 0x000D8 +oslash; 0x000F8 +oslash 0x000F8 +osol; 0x02298 +Otilde; 0x000D5 +Otilde 0x000D5 +otilde; 0x000F5 +otilde 0x000F5 +otimes; 0x02297 +Otimes; 0x02A37 +otimesas; 0x02A36 +Ouml; 0x000D6 +Ouml 0x000D6 +ouml; 0x000F6 +ouml 0x000F6 +ovbar; 0x0233D +OverBar; 0x0203E +OverBrace; 0x023DE +OverBracket; 0x023B4 +OverParenthesis; 0x023DC +par; 0x02225 +para; 0x000B6 +para 0x000B6 +parallel; 0x02225 +parsim; 0x02AF3 +parsl; 0x02AFD +part; 0x02202 +PartialD; 0x02202 +Pcy; 0x0041F +pcy; 0x0043F +percnt; 0x00025 +period; 0x0002E +permil; 0x02030 +perp; 0x022A5 +pertenk; 0x02031 +Pfr; 0x1D513 +pfr; 0x1D52D +Phi; 0x003A6 +phi; 0x003C6 +phiv; 0x003D5 +phmmat; 0x02133 +phone; 0x0260E +Pi; 0x003A0 +pi; 0x003C0 +pitchfork; 0x022D4 +piv; 0x003D6 +planck; 0x0210F +planckh; 0x0210E +plankv; 0x0210F +plus; 0x0002B +plusacir; 0x02A23 +plusb; 0x0229E +pluscir; 0x02A22 +plusdo; 0x02214 +plusdu; 0x02A25 +pluse; 0x02A72 +PlusMinus; 0x000B1 +plusmn; 0x000B1 +plusmn 0x000B1 +plussim; 0x02A26 +plustwo; 0x02A27 +pm; 0x000B1 +Poincareplane; 0x0210C +pointint; 0x02A15 +Popf; 0x02119 +popf; 0x1D561 +pound; 0x000A3 +pound 0x000A3 +pr; 0x0227A +Pr; 0x02ABB +prap; 0x02AB7 +prcue; 0x0227C +pre; 0x02AAF +prE; 0x02AB3 +prec; 0x0227A +precapprox; 0x02AB7 +preccurlyeq; 0x0227C +Precedes; 0x0227A +PrecedesEqual; 0x02AAF +PrecedesSlantEqual; 0x0227C +PrecedesTilde; 0x0227E +preceq; 0x02AAF +precnapprox; 0x02AB9 +precneqq; 0x02AB5 +precnsim; 0x022E8 +precsim; 0x0227E +prime; 0x02032 +Prime; 0x02033 +primes; 0x02119 +prnap; 0x02AB9 +prnE; 0x02AB5 +prnsim; 0x022E8 +prod; 0x0220F +Product; 0x0220F +profalar; 0x0232E +profline; 0x02312 +profsurf; 0x02313 +prop; 0x0221D +Proportion; 0x02237 +Proportional; 0x0221D +propto; 0x0221D +prsim; 0x0227E +prurel; 0x022B0 +Pscr; 0x1D4AB +pscr; 0x1D4C5 +Psi; 0x003A8 +psi; 0x003C8 +puncsp; 0x02008 +Qfr; 0x1D514 +qfr; 0x1D52E +qint; 0x02A0C +Qopf; 0x0211A +qopf; 0x1D562 +qprime; 0x02057 +Qscr; 0x1D4AC +qscr; 0x1D4C6 +quaternions; 0x0210D +quatint; 0x02A16 +quest; 0x0003F +questeq; 0x0225F +quot; 0x00022 +quot 0x00022 +QUOT; 0x00022 +QUOT 0x00022 +rAarr; 0x021DB +race; 0x0223D 0x00331 +Racute; 0x00154 +racute; 0x00155 +radic; 0x0221A +raemptyv; 0x029B3 +rang; 0x027E9 +Rang; 0x027EB +rangd; 0x02992 +range; 0x029A5 +rangle; 0x027E9 +raquo; 0x000BB +raquo 0x000BB +rarr; 0x02192 +Rarr; 0x021A0 +rArr; 0x021D2 +rarrap; 0x02975 +rarrb; 0x021E5 +rarrbfs; 0x02920 +rarrc; 0x02933 +rarrfs; 0x0291E +rarrhk; 0x021AA +rarrlp; 0x021AC +rarrpl; 0x02945 +rarrsim; 0x02974 +rarrtl; 0x021A3 +Rarrtl; 0x02916 +rarrw; 0x0219D +ratail; 0x0291A +rAtail; 0x0291C +ratio; 0x02236 +rationals; 0x0211A +rbarr; 0x0290D +rBarr; 0x0290F +RBarr; 0x02910 +rbbrk; 0x02773 +rbrace; 0x0007D +rbrack; 0x0005D +rbrke; 0x0298C +rbrksld; 0x0298E +rbrkslu; 0x02990 +Rcaron; 0x00158 +rcaron; 0x00159 +Rcedil; 0x00156 +rcedil; 0x00157 +rceil; 0x02309 +rcub; 0x0007D +Rcy; 0x00420 +rcy; 0x00440 +rdca; 0x02937 +rdldhar; 0x02969 +rdquo; 0x0201D +rdquor; 0x0201D +rdsh; 0x021B3 +Re; 0x0211C +real; 0x0211C +realine; 0x0211B +realpart; 0x0211C +reals; 0x0211D +rect; 0x025AD +reg; 0x000AE +reg 0x000AE +REG; 0x000AE +REG 0x000AE +ReverseElement; 0x0220B +ReverseEquilibrium; 0x021CB +ReverseUpEquilibrium; 0x0296F +rfisht; 0x0297D +rfloor; 0x0230B +Rfr; 0x0211C +rfr; 0x1D52F +rHar; 0x02964 +rhard; 0x021C1 +rharu; 0x021C0 +rharul; 0x0296C +Rho; 0x003A1 +rho; 0x003C1 +rhov; 0x003F1 +RightAngleBracket; 0x027E9 +rightarrow; 0x02192 +RightArrow; 0x02192 +Rightarrow; 0x021D2 +RightArrowBar; 0x021E5 +RightArrowLeftArrow; 0x021C4 +rightarrowtail; 0x021A3 +RightCeiling; 0x02309 +RightDoubleBracket; 0x027E7 +RightDownTeeVector; 0x0295D +RightDownVector; 0x021C2 +RightDownVectorBar; 0x02955 +RightFloor; 0x0230B +rightharpoondown; 0x021C1 +rightharpoonup; 0x021C0 +rightleftarrows; 0x021C4 +rightleftharpoons; 0x021CC +rightrightarrows; 0x021C9 +rightsquigarrow; 0x0219D +RightTee; 0x022A2 +RightTeeArrow; 0x021A6 +RightTeeVector; 0x0295B +rightthreetimes; 0x022CC +RightTriangle; 0x022B3 +RightTriangleBar; 0x029D0 +RightTriangleEqual; 0x022B5 +RightUpDownVector; 0x0294F +RightUpTeeVector; 0x0295C +RightUpVector; 0x021BE +RightUpVectorBar; 0x02954 +RightVector; 0x021C0 +RightVectorBar; 0x02953 +ring; 0x002DA +risingdotseq; 0x02253 +rlarr; 0x021C4 +rlhar; 0x021CC +rlm; 0x0200F +rmoust; 0x023B1 +rmoustache; 0x023B1 +rnmid; 0x02AEE +roang; 0x027ED +roarr; 0x021FE +robrk; 0x027E7 +ropar; 0x02986 +Ropf; 0x0211D +ropf; 0x1D563 +roplus; 0x02A2E +rotimes; 0x02A35 +RoundImplies; 0x02970 +rpar; 0x00029 +rpargt; 0x02994 +rppolint; 0x02A12 +rrarr; 0x021C9 +Rrightarrow; 0x021DB +rsaquo; 0x0203A +Rscr; 0x0211B +rscr; 0x1D4C7 +rsh; 0x021B1 +Rsh; 0x021B1 +rsqb; 0x0005D +rsquo; 0x02019 +rsquor; 0x02019 +rthree; 0x022CC +rtimes; 0x022CA +rtri; 0x025B9 +rtrie; 0x022B5 +rtrif; 0x025B8 +rtriltri; 0x029CE +RuleDelayed; 0x029F4 +ruluhar; 0x02968 +rx; 0x0211E +Sacute; 0x0015A +sacute; 0x0015B +sbquo; 0x0201A +sc; 0x0227B +Sc; 0x02ABC +scap; 0x02AB8 +Scaron; 0x00160 +scaron; 0x00161 +sccue; 0x0227D +sce; 0x02AB0 +scE; 0x02AB4 +Scedil; 0x0015E +scedil; 0x0015F +Scirc; 0x0015C +scirc; 0x0015D +scnap; 0x02ABA +scnE; 0x02AB6 +scnsim; 0x022E9 +scpolint; 0x02A13 +scsim; 0x0227F +Scy; 0x00421 +scy; 0x00441 +sdot; 0x022C5 +sdotb; 0x022A1 +sdote; 0x02A66 +searhk; 0x02925 +searr; 0x02198 +seArr; 0x021D8 +searrow; 0x02198 +sect; 0x000A7 +sect 0x000A7 +semi; 0x0003B +seswar; 0x02929 +setminus; 0x02216 +setmn; 0x02216 +sext; 0x02736 +Sfr; 0x1D516 +sfr; 0x1D530 +sfrown; 0x02322 +sharp; 0x0266F +SHCHcy; 0x00429 +shchcy; 0x00449 +SHcy; 0x00428 +shcy; 0x00448 +ShortDownArrow; 0x02193 +ShortLeftArrow; 0x02190 +shortmid; 0x02223 +shortparallel; 0x02225 +ShortRightArrow; 0x02192 +ShortUpArrow; 0x02191 +shy; 0x000AD +shy 0x000AD +Sigma; 0x003A3 +sigma; 0x003C3 +sigmaf; 0x003C2 +sigmav; 0x003C2 +sim; 0x0223C +simdot; 0x02A6A +sime; 0x02243 +simeq; 0x02243 +simg; 0x02A9E +simgE; 0x02AA0 +siml; 0x02A9D +simlE; 0x02A9F +simne; 0x02246 +simplus; 0x02A24 +simrarr; 0x02972 +slarr; 0x02190 +SmallCircle; 0x02218 +smallsetminus; 0x02216 +smashp; 0x02A33 +smeparsl; 0x029E4 +smid; 0x02223 +smile; 0x02323 +smt; 0x02AAA +smte; 0x02AAC +smtes; 0x02AAC 0x0FE00 +SOFTcy; 0x0042C +softcy; 0x0044C +sol; 0x0002F +solb; 0x029C4 +solbar; 0x0233F +Sopf; 0x1D54A +sopf; 0x1D564 +spades; 0x02660 +spadesuit; 0x02660 +spar; 0x02225 +sqcap; 0x02293 +sqcaps; 0x02293 0x0FE00 +sqcup; 0x02294 +sqcups; 0x02294 0x0FE00 +Sqrt; 0x0221A +sqsub; 0x0228F +sqsube; 0x02291 +sqsubset; 0x0228F +sqsubseteq; 0x02291 +sqsup; 0x02290 +sqsupe; 0x02292 +sqsupset; 0x02290 +sqsupseteq; 0x02292 +squ; 0x025A1 +square; 0x025A1 +Square; 0x025A1 +SquareIntersection; 0x02293 +SquareSubset; 0x0228F +SquareSubsetEqual; 0x02291 +SquareSuperset; 0x02290 +SquareSupersetEqual; 0x02292 +SquareUnion; 0x02294 +squarf; 0x025AA +squf; 0x025AA +srarr; 0x02192 +Sscr; 0x1D4AE +sscr; 0x1D4C8 +ssetmn; 0x02216 +ssmile; 0x02323 +sstarf; 0x022C6 +Star; 0x022C6 +star; 0x02606 +starf; 0x02605 +straightepsilon; 0x003F5 +straightphi; 0x003D5 +strns; 0x000AF +sub; 0x02282 +Sub; 0x022D0 +subdot; 0x02ABD +sube; 0x02286 +subE; 0x02AC5 +subedot; 0x02AC3 +submult; 0x02AC1 +subne; 0x0228A +subnE; 0x02ACB +subplus; 0x02ABF +subrarr; 0x02979 +subset; 0x02282 +Subset; 0x022D0 +subseteq; 0x02286 +subseteqq; 0x02AC5 +SubsetEqual; 0x02286 +subsetneq; 0x0228A +subsetneqq; 0x02ACB +subsim; 0x02AC7 +subsub; 0x02AD5 +subsup; 0x02AD3 +succ; 0x0227B +succapprox; 0x02AB8 +succcurlyeq; 0x0227D +Succeeds; 0x0227B +SucceedsEqual; 0x02AB0 +SucceedsSlantEqual; 0x0227D +SucceedsTilde; 0x0227F +succeq; 0x02AB0 +succnapprox; 0x02ABA +succneqq; 0x02AB6 +succnsim; 0x022E9 +succsim; 0x0227F +SuchThat; 0x0220B +sum; 0x02211 +Sum; 0x02211 +sung; 0x0266A +sup; 0x02283 +Sup; 0x022D1 +sup1; 0x000B9 +sup1 0x000B9 +sup2; 0x000B2 +sup2 0x000B2 +sup3; 0x000B3 +sup3 0x000B3 +supdot; 0x02ABE +supdsub; 0x02AD8 +supe; 0x02287 +supE; 0x02AC6 +supedot; 0x02AC4 +Superset; 0x02283 +SupersetEqual; 0x02287 +suphsol; 0x027C9 +suphsub; 0x02AD7 +suplarr; 0x0297B +supmult; 0x02AC2 +supne; 0x0228B +supnE; 0x02ACC +supplus; 0x02AC0 +supset; 0x02283 +Supset; 0x022D1 +supseteq; 0x02287 +supseteqq; 0x02AC6 +supsetneq; 0x0228B +supsetneqq; 0x02ACC +supsim; 0x02AC8 +supsub; 0x02AD4 +supsup; 0x02AD6 +swarhk; 0x02926 +swarr; 0x02199 +swArr; 0x021D9 +swarrow; 0x02199 +swnwar; 0x0292A +szlig; 0x000DF +szlig 0x000DF +Tab; 0x00009 +target; 0x02316 +Tau; 0x003A4 +tau; 0x003C4 +tbrk; 0x023B4 +Tcaron; 0x00164 +tcaron; 0x00165 +Tcedil; 0x00162 +tcedil; 0x00163 +Tcy; 0x00422 +tcy; 0x00442 +tdot; 0x020DB +telrec; 0x02315 +Tfr; 0x1D517 +tfr; 0x1D531 +there4; 0x02234 +therefore; 0x02234 +Therefore; 0x02234 +Theta; 0x00398 +theta; 0x003B8 +thetasym; 0x003D1 +thetav; 0x003D1 +thickapprox; 0x02248 +thicksim; 0x0223C +ThickSpace; 0x0205F 0x0200A +thinsp; 0x02009 +ThinSpace; 0x02009 +thkap; 0x02248 +thksim; 0x0223C +THORN; 0x000DE +THORN 0x000DE +thorn; 0x000FE +thorn 0x000FE +tilde; 0x002DC +Tilde; 0x0223C +TildeEqual; 0x02243 +TildeFullEqual; 0x02245 +TildeTilde; 0x02248 +times; 0x000D7 +times 0x000D7 +timesb; 0x022A0 +timesbar; 0x02A31 +timesd; 0x02A30 +tint; 0x0222D +toea; 0x02928 +top; 0x022A4 +topbot; 0x02336 +topcir; 0x02AF1 +Topf; 0x1D54B +topf; 0x1D565 +topfork; 0x02ADA +tosa; 0x02929 +tprime; 0x02034 +trade; 0x02122 +TRADE; 0x02122 +triangle; 0x025B5 +triangledown; 0x025BF +triangleleft; 0x025C3 +trianglelefteq; 0x022B4 +triangleq; 0x0225C +triangleright; 0x025B9 +trianglerighteq; 0x022B5 +tridot; 0x025EC +trie; 0x0225C +triminus; 0x02A3A +TripleDot; 0x020DB +triplus; 0x02A39 +trisb; 0x029CD +tritime; 0x02A3B +trpezium; 0x023E2 +Tscr; 0x1D4AF +tscr; 0x1D4C9 +TScy; 0x00426 +tscy; 0x00446 +TSHcy; 0x0040B +tshcy; 0x0045B +Tstrok; 0x00166 +tstrok; 0x00167 +twixt; 0x0226C +twoheadleftarrow; 0x0219E +twoheadrightarrow; 0x021A0 +Uacute; 0x000DA +Uacute 0x000DA +uacute; 0x000FA +uacute 0x000FA +uarr; 0x02191 +Uarr; 0x0219F +uArr; 0x021D1 +Uarrocir; 0x02949 +Ubrcy; 0x0040E +ubrcy; 0x0045E +Ubreve; 0x0016C +ubreve; 0x0016D +Ucirc; 0x000DB +Ucirc 0x000DB +ucirc; 0x000FB +ucirc 0x000FB +Ucy; 0x00423 +ucy; 0x00443 +udarr; 0x021C5 +Udblac; 0x00170 +udblac; 0x00171 +udhar; 0x0296E +ufisht; 0x0297E +Ufr; 0x1D518 +ufr; 0x1D532 +Ugrave; 0x000D9 +Ugrave 0x000D9 +ugrave; 0x000F9 +ugrave 0x000F9 +uHar; 0x02963 +uharl; 0x021BF +uharr; 0x021BE +uhblk; 0x02580 +ulcorn; 0x0231C +ulcorner; 0x0231C +ulcrop; 0x0230F +ultri; 0x025F8 +Umacr; 0x0016A +umacr; 0x0016B +uml; 0x000A8 +uml 0x000A8 +UnderBar; 0x0005F +UnderBrace; 0x023DF +UnderBracket; 0x023B5 +UnderParenthesis; 0x023DD +Union; 0x022C3 +UnionPlus; 0x0228E +Uogon; 0x00172 +uogon; 0x00173 +Uopf; 0x1D54C +uopf; 0x1D566 +uparrow; 0x02191 +UpArrow; 0x02191 +Uparrow; 0x021D1 +UpArrowBar; 0x02912 +UpArrowDownArrow; 0x021C5 +updownarrow; 0x02195 +UpDownArrow; 0x02195 +Updownarrow; 0x021D5 +UpEquilibrium; 0x0296E +upharpoonleft; 0x021BF +upharpoonright; 0x021BE +uplus; 0x0228E +UpperLeftArrow; 0x02196 +UpperRightArrow; 0x02197 +upsi; 0x003C5 +Upsi; 0x003D2 +upsih; 0x003D2 +Upsilon; 0x003A5 +upsilon; 0x003C5 +UpTee; 0x022A5 +UpTeeArrow; 0x021A5 +upuparrows; 0x021C8 +urcorn; 0x0231D +urcorner; 0x0231D +urcrop; 0x0230E +Uring; 0x0016E +uring; 0x0016F +urtri; 0x025F9 +Uscr; 0x1D4B0 +uscr; 0x1D4CA +utdot; 0x022F0 +Utilde; 0x00168 +utilde; 0x00169 +utri; 0x025B5 +utrif; 0x025B4 +uuarr; 0x021C8 +Uuml; 0x000DC +Uuml 0x000DC +uuml; 0x000FC +uuml 0x000FC +uwangle; 0x029A7 +vangrt; 0x0299C +varepsilon; 0x003F5 +varkappa; 0x003F0 +varnothing; 0x02205 +varphi; 0x003D5 +varpi; 0x003D6 +varpropto; 0x0221D +varr; 0x02195 +vArr; 0x021D5 +varrho; 0x003F1 +varsigma; 0x003C2 +varsubsetneq; 0x0228A 0x0FE00 +varsubsetneqq; 0x02ACB 0x0FE00 +varsupsetneq; 0x0228B 0x0FE00 +varsupsetneqq; 0x02ACC 0x0FE00 +vartheta; 0x003D1 +vartriangleleft; 0x022B2 +vartriangleright; 0x022B3 +vBar; 0x02AE8 +Vbar; 0x02AEB +vBarv; 0x02AE9 +Vcy; 0x00412 +vcy; 0x00432 +vdash; 0x022A2 +vDash; 0x022A8 +Vdash; 0x022A9 +VDash; 0x022AB +Vdashl; 0x02AE6 +vee; 0x02228 +Vee; 0x022C1 +veebar; 0x022BB +veeeq; 0x0225A +vellip; 0x022EE +verbar; 0x0007C +Verbar; 0x02016 +vert; 0x0007C +Vert; 0x02016 +VerticalBar; 0x02223 +VerticalLine; 0x0007C +VerticalSeparator; 0x02758 +VerticalTilde; 0x02240 +VeryThinSpace; 0x0200A +Vfr; 0x1D519 +vfr; 0x1D533 +vltri; 0x022B2 +vnsub; 0x02282 0x020D2 +vnsup; 0x02283 0x020D2 +Vopf; 0x1D54D +vopf; 0x1D567 +vprop; 0x0221D +vrtri; 0x022B3 +Vscr; 0x1D4B1 +vscr; 0x1D4CB +vsubne; 0x0228A 0x0FE00 +vsubnE; 0x02ACB 0x0FE00 +vsupne; 0x0228B 0x0FE00 +vsupnE; 0x02ACC 0x0FE00 +Vvdash; 0x022AA +vzigzag; 0x0299A +Wcirc; 0x00174 +wcirc; 0x00175 +wedbar; 0x02A5F +wedge; 0x02227 +Wedge; 0x022C0 +wedgeq; 0x02259 +weierp; 0x02118 +Wfr; 0x1D51A +wfr; 0x1D534 +Wopf; 0x1D54E +wopf; 0x1D568 +wp; 0x02118 +wr; 0x02240 +wreath; 0x02240 +Wscr; 0x1D4B2 +wscr; 0x1D4CC +xcap; 0x022C2 +xcirc; 0x025EF +xcup; 0x022C3 +xdtri; 0x025BD +Xfr; 0x1D51B +xfr; 0x1D535 +xharr; 0x027F7 +xhArr; 0x027FA +Xi; 0x0039E +xi; 0x003BE +xlarr; 0x027F5 +xlArr; 0x027F8 +xmap; 0x027FC +xnis; 0x022FB +xodot; 0x02A00 +Xopf; 0x1D54F +xopf; 0x1D569 +xoplus; 0x02A01 +xotime; 0x02A02 +xrarr; 0x027F6 +xrArr; 0x027F9 +Xscr; 0x1D4B3 +xscr; 0x1D4CD +xsqcup; 0x02A06 +xuplus; 0x02A04 +xutri; 0x025B3 +xvee; 0x022C1 +xwedge; 0x022C0 +Yacute; 0x000DD +Yacute 0x000DD +yacute; 0x000FD +yacute 0x000FD +YAcy; 0x0042F +yacy; 0x0044F +Ycirc; 0x00176 +ycirc; 0x00177 +Ycy; 0x0042B +ycy; 0x0044B +yen; 0x000A5 +yen 0x000A5 +Yfr; 0x1D51C +yfr; 0x1D536 +YIcy; 0x00407 +yicy; 0x00457 +Yopf; 0x1D550 +yopf; 0x1D56A +Yscr; 0x1D4B4 +yscr; 0x1D4CE +YUcy; 0x0042E +yucy; 0x0044E +yuml; 0x000FF +yuml 0x000FF +Yuml; 0x00178 +Zacute; 0x00179 +zacute; 0x0017A +Zcaron; 0x0017D +zcaron; 0x0017E +Zcy; 0x00417 +zcy; 0x00437 +Zdot; 0x0017B +zdot; 0x0017C +zeetrf; 0x02128 +ZeroWidthSpace; 0x0200B +Zeta; 0x00396 +zeta; 0x003B6 +Zfr; 0x02128 +zfr; 0x1D537 +ZHcy; 0x00416 +zhcy; 0x00436 +zigrarr; 0x021DD +Zopf; 0x02124 +zopf; 0x1D56B +Zscr; 0x1D4B5 +zscr; 0x1D4CF +zwj; 0x0200D +zwnj; 0x0200C diff --git a/build/make-entities.pl b/build/make-entities.pl index 7492052..ff4113f 100644 --- a/build/make-entities.pl +++ b/build/make-entities.pl @@ -4,8 +4,10 @@ # http://www.opensource.org/licenses/mit-license.php # Copyright 2010 Daniel Silverstone <dsilvers(a)netsurf-browser.org> # John-Mark Bell <jmb(a)netsurf-browser.org> +# Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> use strict; +use Encode; use constant ENTITIES_FILE => 'build/Entities'; use constant ENTITIES_INC => 'src/tokeniser/entities.inc'; @@ -21,8 +23,25 @@ while (my $line = <INFILE>) { next if ($line eq ''); my @elements = split /\s+/, $line; my $entity = shift @elements; - my $code = shift @elements; - $entities{$entity} = $code; + my $len = 0; + my $code=""; + while (@elements) { + my $ucs4 = hex(shift(@elements)); + my $utf8 = Encode::encode_utf8(pack('U', $ucs4)); + $len += length($utf8); + if ($ucs4 < 0x20 || $ucs4 == 0x22 || + $ucs4 == 0x27 || $ucs4 == 0x5C || + $ucs4 >= 0x7f) { + # Unsafe, or non-ASCII: emit escaped + for my $octet (unpack('C*', $utf8)) { + $code = $code . sprintf("\\x%02x", $octet); + } + } else { + # Safe: emit value + $code = $code . $utf8; + } + } + $entities{$entity} = "(const uint8_t *)\"$code\",$len"; } close(INFILE); @@ -113,9 +132,9 @@ foreach my $node (@nodelist) { $split = ord($split) if ($split ne ''); $split = 0 if ($split eq ''); - $value = "0" unless defined($value); + $value = "NULL,0" unless defined($value); - $output .= "\t{ $split, $lt, $eq, $gt, $value },\n"; + $output .= "\t{ $split, $lt, $eq, $gt, {$value} },\n"; } $output .= "};\n\n"; diff --git a/src/tokeniser/entities.c b/src/tokeniser/entities.c index ac47d80..298b2cf 100644 --- a/src/tokeniser/entities.c +++ b/src/tokeniser/entities.c @@ -7,15 +7,20 @@ #include "utils/utils.h" #include "tokeniser/entities.h" +/** + * UTF-8 encoding of U+FFFD REPLACEMENT CHARACTER + */ +static const uint8_t u_fffd[3] = { '\xEF', '\xBF', '\xBD' }; +static const hubbub_string u_fffd_str = { u_fffd, sizeof(u_fffd) }; /** Node in our entity tree */ typedef struct hubbub_entity_node { - /* Do not reorder this without fixing make-entities.pl */ + /* Do not reorder this without fixing make-entities.pl */ uint8_t split; /**< Data to split on */ int32_t lt; /**< Subtree for data less than split */ int32_t eq; /**< Subtree for data equal to split */ int32_t gt; /**< Subtree for data greater than split */ - uint32_t value; /**< Data for this node */ + hubbub_string value; /**< Data for this node */ } hubbub_entity_node; #include "entities.inc" @@ -38,7 +43,7 @@ typedef struct hubbub_entity_node { * is found. */ static hubbub_error hubbub_entity_tree_search_step(uint8_t c, - uint32_t *result, int32_t *context) + hubbub_string *result, int32_t *context) { bool match = false; int32_t p; @@ -63,7 +68,7 @@ static hubbub_error hubbub_entity_tree_search_step(uint8_t c, match = true; *result = dict[dict[p].eq].value; p = dict[p].eq; - } else if (dict[p].value != 0) { + } else if (dict[p].value.ptr != NULL) { match = true; *result = dict[p].value; p = dict[p].eq; @@ -100,13 +105,13 @@ static hubbub_error hubbub_entity_tree_search_step(uint8_t c, * The location pointed to by ::result will be set to U+FFFD unless a match * is found. */ -hubbub_error hubbub_entities_search_step(uint8_t c, uint32_t *result, +hubbub_error hubbub_entities_search_step(uint8_t c, hubbub_string *result, int32_t *context) { if (result == NULL) return HUBBUB_BADPARM; - *result = 0xFFFD; - + *result = u_fffd_str; + return hubbub_entity_tree_search_step(c, result, context); } diff --git a/src/tokeniser/entities.h b/src/tokeniser/entities.h index 0703b37..a8b9bbf 100644 --- a/src/tokeniser/entities.h +++ b/src/tokeniser/entities.h @@ -14,7 +14,7 @@ #include <hubbub/functypes.h> /* Step-wise search for an entity in the dictionary */ -hubbub_error hubbub_entities_search_step(uint8_t c, uint32_t *result, +hubbub_error hubbub_entities_search_step(uint8_t c, hubbub_string *result, int32_t *context); #endif diff --git a/src/tokeniser/tokeniser.c b/src/tokeniser/tokeniser.c index a7e67a1..563dd48 100644 --- a/src/tokeniser/tokeniser.c +++ b/src/tokeniser/tokeniser.c @@ -4,6 +4,7 @@ * http://www.opensource.org/licenses/mit-license.php * Copyright 2007 John-Mark Bell <jmb(a)netsurf-browser.org> * Copyright 2008 Andrew Sidwell <takkaria(a)netsurf-browser.org> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ #include <assert.h> #include <stdbool.h> @@ -128,7 +129,7 @@ typedef struct hubbub_tokeniser_context { struct { size_t offset; /**< Offset in buffer */ uint32_t length; /**< Length of entity */ - uint32_t codepoint; /**< UCS4 codepoint */ + hubbub_string codepoint; /**< UTF-8 codepoint */ bool complete; /**< True if match complete */ uint32_t poss_length; /**< Optimistic length @@ -147,6 +148,12 @@ typedef struct hubbub_tokeniser_context { * numeric entity value */ hubbub_tokeniser_state return_state; /**< State we were * called from */ + union { + uint32_t ucs4; /**<UCS-4 value for numeric + * entity*/ + uint8_t numeric_buf[6]; /**<UTF-8 value for numeric + * entity */ + } numeric_state; } match_entity; /**< Entity matching state */ struct { @@ -810,19 +817,12 @@ hubbub_error hubbub_tokeniser_handle_character_reference_data( } else { hubbub_token token; - uint8_t utf8[6]; - uint8_t *utf8ptr = utf8; - size_t len = sizeof(utf8); - token.type = HUBBUB_TOKEN_CHARACTER; - - if (tokeniser->context.match_entity.codepoint) { - parserutils_charset_utf8_from_ucs4( - tokeniser->context.match_entity.codepoint, - &utf8ptr, &len); - - token.data.character.ptr = utf8; - token.data.character.len = sizeof(utf8) - len; + if (tokeniser->context.match_entity.codepoint.ptr != NULL) { + token.data.character.ptr = + tokeniser->context.match_entity.codepoint.ptr; + token.data.character.len = + tokeniser->context.match_entity.codepoint.len; hubbub_tokeniser_emit_token(tokeniser, &token); @@ -833,6 +833,7 @@ hubbub_error hubbub_tokeniser_handle_character_reference_data( } else { parserutils_error error; const uint8_t *cptr = NULL; + size_t len; error = parserutils_inputstream_peek( tokeniser->input, @@ -1607,23 +1608,17 @@ hubbub_error hubbub_tokeniser_handle_character_reference_in_attribute_value( hubbub_attribute *attr = &ctag->attributes[ ctag->n_attributes - 1]; - uint8_t utf8[6]; - uint8_t *utf8ptr = utf8; - size_t len = sizeof(utf8); - - if (tokeniser->context.match_entity.codepoint) { - parserutils_charset_utf8_from_ucs4( - tokeniser->context.match_entity.codepoint, - &utf8ptr, &len); - - COLLECT_MS(attr->value, utf8, sizeof(utf8) - len); + if (tokeniser->context.match_entity.codepoint.ptr != NULL) { + COLLECT_MS(attr->value, + tokeniser->context.match_entity.codepoint.ptr, + tokeniser->context.match_entity.codepoint.len); /* +1 for the ampersand */ tokeniser->context.pending += tokeniser->context.match_entity.length + 1; } else { - size_t len = 0; + size_t len; const uint8_t *cptr = NULL; parserutils_error error; @@ -2899,7 +2894,9 @@ hubbub_error hubbub_tokeniser_consume_character_reference( if (error != PARSERUTILS_OK) { if (error == PARSERUTILS_EOF) { tokeniser->context.match_entity.complete = true; - tokeniser->context.match_entity.codepoint = 0; + tokeniser->context.match_entity.codepoint.len = 0; + tokeniser->context.match_entity.codepoint.ptr = NULL; + tokeniser->context.match_entity.numeric_state.ucs4 = 0; return HUBBUB_OK; } else { return hubbub_error_from_parserutils_error(error); @@ -2913,13 +2910,15 @@ hubbub_error hubbub_tokeniser_consume_character_reference( tokeniser->context.match_entity.poss_length = 0; tokeniser->context.match_entity.length = 0; tokeniser->context.match_entity.base = 0; - tokeniser->context.match_entity.codepoint = 0; tokeniser->context.match_entity.had_data = false; tokeniser->context.match_entity.return_state = tokeniser->state; tokeniser->context.match_entity.complete = false; tokeniser->context.match_entity.overflow = false; tokeniser->context.match_entity.context = -1; tokeniser->context.match_entity.prev_len = len; + tokeniser->context.match_entity.numeric_state.ucs4 = 0; + tokeniser->context.match_entity.codepoint.ptr = NULL; + tokeniser->context.match_entity.codepoint.len = 0; /* Reset allowed character for future calls */ tokeniser->context.allowed_char = '\0'; @@ -2928,7 +2927,6 @@ hubbub_error hubbub_tokeniser_consume_character_reference( c == '<' || c == '&' || (allowed_char && c == allowed_char)) { tokeniser->context.match_entity.complete = true; - tokeniser->context.match_entity.codepoint = 0; } else if (c == '#') { tokeniser->context.match_entity.length += len; tokeniser->state = STATE_NUMBERED_ENTITY; @@ -2975,22 +2973,22 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( if (ctx->match_entity.base == 10 && ('0' <= c && c <= '9')) { ctx->match_entity.had_data = true; - ctx->match_entity.codepoint = - ctx->match_entity.codepoint * 10 + (c - '0'); - + ctx->match_entity.numeric_state.ucs4 = + ctx->match_entity.numeric_state.ucs4 * 10 + (c - '0'); ctx->match_entity.length += len; } else if (ctx->match_entity.base == 16 && (('0' <= c && c <= '9') || ('A' <= (c & ~0x20) && (c & ~0x20) <= 'F'))) { ctx->match_entity.had_data = true; - ctx->match_entity.codepoint *= 16; + ctx->match_entity.numeric_state.ucs4 *= 16; if ('0' <= c && c <= '9') { - ctx->match_entity.codepoint += (c - '0'); + ctx->match_entity.numeric_state.ucs4 += + (c-'0'); } else { - ctx->match_entity.codepoint += - ((c & ~0x20) - 'A' + 10); + ctx->match_entity.numeric_state.ucs4 += + ((c & ~0x20) - 'A' + 10); } ctx->match_entity.length += len; @@ -2998,7 +2996,7 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( break; } - if (ctx->match_entity.codepoint >= 0x10FFFF) { + if (ctx->match_entity.numeric_state.ucs4 >= 0x10FFFF) { ctx->match_entity.overflow = true; } } @@ -3014,7 +3012,8 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( /* Had data, so calculate final codepoint */ if (ctx->match_entity.had_data) { - uint32_t cp = ctx->match_entity.codepoint; + uint32_t cp = + ctx->match_entity.numeric_state.ucs4; if (0x80 <= cp && cp <= 0x9F) { cp = cp1252Table[cp - 0x80]; @@ -3031,8 +3030,22 @@ hubbub_error hubbub_tokeniser_handle_numbered_entity( * in the loop above to avoid overflow */ cp = 0xFFFD; } + ctx->match_entity.numeric_state.ucs4 = cp; + + /*Convert UCS-4 to UTF-8*/ + uint8_t *utf8_ptr= + (ctx->match_entity.numeric_state.numeric_buf); + size_t buf_len= + sizeof(ctx->match_entity.numeric_state.numeric_buf); + parserutils_charset_utf8_from_ucs4( + ctx->match_entity.numeric_state.ucs4, + &utf8_ptr, + &buf_len); + ctx->match_entity.codepoint.ptr= + (ctx->match_entity.numeric_state.numeric_buf); + ctx->match_entity.codepoint.len= + sizeof(ctx->match_entity.numeric_state.numeric_buf)-buf_len; - ctx->match_entity.codepoint = cp; } /* Flag completion */ @@ -3056,11 +3069,10 @@ hubbub_error hubbub_tokeniser_handle_named_entity(hubbub_tokeniser *tokeniser) ctx->match_entity.offset + ctx->match_entity.poss_length, &cptr, &len)) == PARSERUTILS_OK) { - uint32_t cp; + hubbub_string cp; uint8_t c = *cptr; hubbub_error error; - if (c > 0x7F) { /* Entity names are ASCII only */ break; @@ -3119,14 +3131,16 @@ hubbub_error hubbub_tokeniser_handle_named_entity(hubbub_tokeniser *tokeniser) error == PARSERUTILS_EOF); if (error == PARSERUTILS_EOF) { - ctx->match_entity.codepoint = 0; + ctx->match_entity.codepoint.len = 0; + ctx->match_entity.codepoint.ptr = NULL; } c = *cptr; if ((0x0030 <= c && c <= 0x0039) || (0x0041 <= c && c <= 0x005A) || (0x0061 <= c && c <= 0x007A)) { - ctx->match_entity.codepoint = 0; + ctx->match_entity.codepoint.len = 0; + ctx->match_entity.codepoint.ptr = NULL; } } } diff --git a/test/data/tokeniser2/INDEX b/test/data/tokeniser2/INDEX index 67475c4..57c0cad 100644 --- a/test/data/tokeniser2/INDEX +++ b/test/data/tokeniser2/INDEX @@ -14,7 +14,7 @@ test1.test html5lib tests (part 1) cdata.test CDATA section tests #regression.test Regression tests #domjs.test NA -#namedEntities.test html5lib named entities tests +namedEntities.test html5lib named entities tests #pendingSpecChanges.test NA #unicodeCharsProblematic.test NA #xmlViolation.test NA diff --git a/test/entities.c b/test/entities.c index f730f17..51efc95 100644 --- a/test/entities.c +++ b/test/entities.c @@ -4,7 +4,7 @@ int main(int argc, char **argv) { - uint32_t result; + hubbub_string result; int32_t context = -1; UNUSED(argc); -- HTML5 parser library

8 years, 12 months

1
0
0 / 0

libdom: branch rupindersingh/libdom updated. release/0.1.0-51-gf3afb73

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/f3afb7359334b2e188c029... ...commit http://git.netsurf-browser.org/libdom.git/commit/f3afb7359334b2e188c029e4... ...tree http://git.netsurf-browser.org/libdom.git/tree/f3afb7359334b2e188c029e4d0... The branch, rupindersingh/libdom has been updated discards 36ad8c8d82d066c52ca38bcd1325470f9c824b3c (commit) discards 4a373b5330d9111dec851fa4c72e6bc1f779168f (commit) discards 5b7066201cc3b1150b1f8ae2772e6f38b3762492 (commit) discards d1ca3ce434f91036c56cb4d4e7a2875e8d6ecd7b (commit) discards 2c08402e7bfaf19cbeab15ee09090337b0b33a82 (commit) discards f7cf179f19eb8efb8712102bdf89934b26483662 (commit) discards ba04867b2d6170ae3811ef688e905daf14916e56 (commit) discards aa2d6fa27e96a42a3f8acf354001fa447fd1aa8e (commit) discards e8b4ffd6c593e776b48b572be60f523d30c660e4 (commit) discards fb1f749d5e4b8afd458ae22880794450337eedef (commit) discards 5adac2463a6abdc27b269188e195260b11e91296 (commit) discards bcba417a4149fe2fe573864415d3c7b51e530fef (commit) discards 808ef503295febc5b8df12b2a13aff86ecb3050f (commit) discards 76b1188d36e590bda3b46f3234f9fa2b461127a3 (commit) discards d8ba24aa14c30a81b2d20a2e16a81bbfb444d5a0 (commit) discards 32b2afc7ee43fcd98b17f67df42c942463e74d01 (commit) discards a7f4973861ff6dd59abb22e0579f3c1a7fc25f6e (commit) discards 3b11c9acbc443ed2dc76c8b83b4f280679dabe37 (commit) discards 4c89f6beea5c3cc2d4becc6b5e0bcb52f69b5d19 (commit) discards 3bf73efac44e57324d2d806576e0f17b9ee9ad45 (commit) discards 6a190359867769b9364ef65124ae47816ce6d2c9 (commit) discards 03fb7e42bb023447d10c27ed0080cd14a5ea56d2 (commit) discards be1f8ead442d1fb04bb8ffe27a76fd9eede625fd (commit) discards 8bc8634021da36343e3649ba8ff30c58d35601e4 (commit) discards 5e87c9774bea4b4bb1eaba0cc1e590186c1dfdc4 (commit) discards f4befc0e5d97b9967c5de654c590f4541f611bf6 (commit) discards 8e51d87bff765e41358240f86245515099bc53aa (commit) discards 95397f650dd2b781171aa7e87e3fff33956824c6 (commit) discards e13c9e82fdbed1efd11d4d63c93ece8b0304ac0a (commit) discards 6b1a6aebc0bd79e1538ccb0819d5aef30acc97ac (commit) discards 86b5007204ed6b4f22fb96856b927fc52b70e37b (commit) discards b8ef2f4e63539a91d1f3b99585263e732f305f66 (commit) discards 6af080d5a96b50d09b9c3cbb835d3bd102ad4da5 (commit) discards 9f204b8b2c0e9006111679d0f16655d4b79ef85f (commit) discards 26503f60bfffbd78821db09c7d4e027a3612a2a2 (commit) discards a18d2849ff0b214ee84b17ab1df1a2a224c604c8 (commit) discards f360fd62777cc585427fde6ab0b07e63e7aaafbc (commit) discards aae8dd42d91dedeb1677d5555d6125d43f24faf2 (commit) discards c0422cf4236bbe3647d4fbaee1f3a6c06fbb1bb3 (commit) discards ac0690084cf6bc7edbbd5216bff075c82282e796 (commit) discards 9c7b507db72008460e115907711248f3894f9fd2 (commit) discards d0a0b0ccd1795051b6990dc265d10ab0650ce1a6 (commit) discards 5ed8e8b4dcb1eb77b9b799e0e95c261997320f83 (commit) discards b3b25286e1dadd89147cc8098eb88e5a8bb51891 (commit) discards 1e9f7ceac5fa6ebada38f9d5668f351f2e61cbfa (commit) discards dc8f63be5a4b03b2d7c0d23b6425676ba11bbf76 (commit) discards 9189149b1655dbd9061cafdaf822c25fb95f73a2 (commit) via f3afb7359334b2e188c029e4d0d0616c6cda2c57 (commit) via 8c2ec664f8f69a9be52441652f88440379058acc (commit) via d9460145f23f3879c04374d8bf11594ed33fd42c (commit) via 79e858c21e54e30fa4702bb297a4972a681be85c (commit) via e31da066b0376247d08e5899f233a94eb09291af (commit) via c093880b3fcc5d7488fafe78f1e5f8f486fa1313 (commit) via 35cde09375f39a1bad05728fc97f206733113633 (commit) via c7f3d0def9dc71deb135b5afedcddac1c92b9c3e (commit) via eb735d3cd022b9fc8284b2e86570a8db5854d56a (commit) via 26610a3b631ecf53356c95fa72ba822b0cb12d86 (commit) via bf6aa2739d4b65c43986b29a2b2c4bbbab061cf5 (commit) via 939ec2c2cd709a5ee9cbb4237e77553450543a57 (commit) via 862b8be1defce10068f3876aaaa8de8edf65b4ed (commit) via ac0a6be4a62b2fa9830184def0652a499df1398b (commit) via 5c0d74591877de6bcced0a6ba5836b4a2df1c5a7 (commit) via 47847ac9ba3d26771e8007761e5da50e61daf734 (commit) via cd055419fb5e2c046046d8e132105909c9f7c874 (commit) via f0a3c95cfc4a5595f930cd5dd14d6cbbf1f85312 (commit) via ca30ba7de4c3b0b17a61e1f07032575a01f2cd25 (commit) via 16ceb174a3eca4e93f9ecc72296332b1d6ceba60 (commit) via bb1f7872c8dd7721b2bde9f0924b8284b5f7c3f0 (commit) via 913ca00c2745f342146fd62494ad85baacf2b008 (commit) via 1dd1c7617aae1a4bd285d83a3c73d5d2f53761d7 (commit) via 3c9d9494222d81c207cc09a7686cca50db109c0b (commit) via 2c4fcd2e416c51dc95af1e9054df1dc1fa28ff25 (commit) via efec9dd5e88f563242a645e0a1f1904f5c262093 (commit) via f1107bdb33dd760151d1b7311b09fb099c05d8c9 (commit) via 644e93ff924466c41e55bad14fb7a42c468a4f7c (commit) via adea85fad0882b49e70087c03c173fae6bf8d121 (commit) via 5a31bfe0233d501ca162848631a1e6ff5c87a275 (commit) via 559ca5e250bc1b902bd2764e05dd8767d1d7ffe6 (commit) via 501852e21d843601d2501cfe9cb31a13f259cf50 (commit) via 72de0d1c1b36201c72ac4881faa0b57b920aac63 (commit) via 7bf86def02f275eac1c1f0c634461e9aed545a14 (commit) via 8e45e8ddbec0eb239f780254d5658160ecb0387c (commit) via 76fa6b3589c3ee19db20201ab072d6907e84390b (commit) via f43e09e669a5e52a75219c94d835dafb3a286516 (commit) via 82c8ae1c92a31e2395334b58bc2f6a3702cf06b7 (commit) via 4c706c539f2ae7f390c3463013e4e41428993c6c (commit) via 2a64fa6be386afa4944361a593dd535529c129ce (commit) via ce28e10c6c8018380b0609b715f59f8fd1550a21 (commit) via ba80007cad36fa89c490d2cbdb4321d7e11a8236 (commit) via 271efd52662ef01f2514a948d44b1cf2af1949f8 (commit) via 6e95420b74d8e9da135c7ba6f2c80a1f7bdc6dba (commit) via dfedb7c691be7ae1c44eaa5e83590697b3ba3385 (commit) via 753e0130c0b53f1322af6e2ba46ff080b63f3ed1 (commit) via 1eebcb51641843ea6acf773c02a0e8ea53b0b066 (commit) via 1e595d6e27a62568241afd4db558d2947f92bf43 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (36ad8c8d82d066c52ca38bcd1325470f9c824b3c) \ N -- N -- N (f3afb7359334b2e188c029e4d0d0616c6cda2c57) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=f3afb7359334b2e188c0... commit f3afb7359334b2e188c029e4d0d0616c6cda2c57 Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> This tag gave me a headache for a day or two :P. The problem is that the parser isnt handling the isindex element properly. Most probably diff --git a/Makefile b/Makefile index 569e554..bcbc27b 100644 --- a/Makefile +++ b/Makefile @@ -134,6 +134,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frame_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_iframe_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_isindex_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 1392ee0..0dba25d 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -93,6 +93,7 @@ #include <dom/html/html_frameset_element.h> #include <dom/html/html_frame_element.h> #include <dom/html/html_iframe_element.h> +#include <dom/html/html_isindex_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_isindex_element.h b/include/dom/html/html_isindex_element.h index 966b2d2..d41a149 100644 --- a/include/dom/html/html_isindex_element.h +++ b/include/dom/html/html_isindex_element.h @@ -9,6 +9,7 @@ #define dom_html_isindex_element_h_ #include <dom/core/exceptions.h> +#include <dom/core/string.h> struct dom_html_form_element; diff --git a/src/html/Makefile b/src/html/Makefile index 95550ab..c98ce9a 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -18,9 +18,8 @@ DIR_SOURCES := \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ html_table_element.c html_tablerow_element.c html_frameset_element.c \ - html_frame_element.c html_iframe_element.c + html_frame_element.c html_iframe_element.c html_isindex_element.c \ UNINMPLEMENTED_SOURCES := \ - html_isindex_element.c \ include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document.c b/src/html/html_document.c index 0eca66d..62433d5 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -60,6 +60,7 @@ #include "html/html_frameset_element.h" #include "html/html_frame_element.h" #include "html/html_iframe_element.h" +#include "html/html_isindex_element.h" #include "core/attr.h" #include "core/string.h" @@ -378,6 +379,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_IFRAME])) { exc = _dom_html_iframe_element_create(html, namespace, prefix, (dom_html_iframe_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_ISINDEX])) { + exc = _dom_html_isindex_element_create(html, namespace, prefix, + (dom_html_isindex_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_isindex_element.c b/src/html/html_isindex_element.c index 6dc96b9..dd5ab3b 100644 --- a/src/html/html_isindex_element.c +++ b/src/html/html_isindex_element.c @@ -7,9 +7,13 @@ #include <stdlib.h> +#include <dom/html/html_isindex_element.h> + +#include "html/html_document.h" #include "html/html_isindex_element.h" #include "core/node.h" +#include "core/attr.h" #include "utils/utils.h" static struct dom_element_protected_vtable _protect_vtable = { @@ -22,55 +26,43 @@ static struct dom_element_protected_vtable _protect_vtable = { /** * Create a dom_html_isindex_element object * - * \param doc The document object - * \param form The form element which contains this element - * \param ele The returned element object + * \param doc The document object + * \param ele The returned element object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ +#include<stdio.h> dom_exception _dom_html_isindex_element_create(struct dom_html_document *doc, - struct dom_html_form_element *form, + dom_string *namespace, dom_string *prefix, struct dom_html_isindex_element **ele) { struct dom_node_internal *node; - + fprintf(stderr,"isindex created\n"); *ele = malloc(sizeof(dom_html_isindex_element)); if (*ele == NULL) return DOM_NO_MEM_ERR; - + /* Set up vtables */ node = (struct dom_node_internal *) *ele; node->base.vtable = &_dom_html_element_vtable; node->vtable = &_protect_vtable; - return _dom_html_isindex_element_initialise(doc, form, *ele); + return _dom_html_isindex_element_initialise(doc, namespace, prefix, *ele); } /** * Initialise a dom_html_isindex_element object * - * \param doc The document object - * \param form The form element which contains this element - * \param ele The dom_html_isindex_element object + * \param doc The document object + * \param ele The dom_html_isindex_element object * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception _dom_html_isindex_element_initialise(struct dom_html_document *doc, - struct dom_html_form_element *form, + dom_string *namespace, dom_string *prefix, struct dom_html_isindex_element *ele) { - dom_string *name = NULL; - dom_exception err; - - UNUSED(form); - - err = dom_string_create((const uint8_t *) "ISINDEX", SLEN("ISINDEX"), - &name); - if (err != DOM_NO_ERR) - return err; - - err = _dom_html_element_initialise(doc, &ele->base, name, NULL, NULL); - dom_string_unref(name); - - return err; + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_ISINDEX], + namespace, prefix); } /** @@ -125,7 +117,46 @@ dom_exception _dom_html_isindex_element_copy(dom_node_internal *old, return _dom_html_element_copy(old, copy); } - +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_isindex_element_get_##attr( \ + dom_html_isindex_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_isindex_element_set_##attr( \ + dom_html_isindex_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) +SIMPLE_GET_SET(prompt); /*-----------------------------------------------------------------------*/ /* Public APIs */ diff --git a/src/html/html_isindex_element.h b/src/html/html_isindex_element.h index 12ad26e..a39170b 100644 --- a/src/html/html_isindex_element.h +++ b/src/html/html_isindex_element.h @@ -19,12 +19,12 @@ struct dom_html_isindex_element { /* Create a dom_html_isindex_element object */ dom_exception _dom_html_isindex_element_create(struct dom_html_document *doc, - struct dom_html_form_element *form, + dom_string *namespace, dom_string *prefix, struct dom_html_isindex_element **ele); /* Initialise a dom_html_isindex_element object */ dom_exception _dom_html_isindex_element_initialise(struct dom_html_document *doc, - struct dom_html_form_element *form, + dom_string *namespace, dom_string *prefix, struct dom_html_isindex_element *ele); /* Finalise a dom_html_isindex_element object */ commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=8c2ec664f8f69a9be524... commit 8c2ec664f8f69a9be52441652f88440379058acc Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Input Element checked on clicking fix and also fixed bubbling and cancelability diff --git a/src/html/TODO b/src/html/TODO index 83ff515..b55a6d7 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -15,9 +15,9 @@ HTMLFormElement html_form_element DONE HTMLSelectElement html_select_element DONE HTMLOptGroupElement html_optgroup_element DONE HTMLOptionElement html_option_element DONE -HTMLInputElement html_input_element MISSING +HTMLInputElement html_input_element DONE HTMLTextAreaElement html_textarea_element DONE -HTMLButtonElement html_button_element MISSING +HTMLButtonElement html_button_element DONE HTMLLabelElement html_label_element DONE HTMLFieldSetElement html_fieldset_element DONE HTMLLegendElement html_legend_element DONE diff --git a/src/html/html_input_element.c b/src/html/html_input_element.c index c4cfc05..84079f7 100644 --- a/src/html/html_input_element.c +++ b/src/html/html_input_element.c @@ -65,6 +65,8 @@ dom_exception _dom_html_input_element_initialise(struct dom_html_document *doc, ele->default_checked_set = false; ele->default_value = NULL; ele->default_value_set = false; + ele->checked = false; + ele->checked_set = false; return _dom_html_element_initialise(doc, &ele->base, doc->memoised[hds_INPUT], @@ -166,6 +168,11 @@ dom_exception dom_html_input_element_set_read_only(dom_html_input_element *ele, dom_exception dom_html_input_element_get_checked(dom_html_input_element *ele, bool *checked) { + if(ele->checked_set) { + *checked = ele->checked; + return DOM_NO_ERR; + } + return dom_html_element_get_bool_property(&ele->base, "checked", SLEN("checked"), checked); } @@ -447,11 +454,11 @@ dom_exception dom_html_input_element_focus(dom_html_input_element *ele) bool success = false; assert(doc != NULL); - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + /** \this event doesnt bubble and is non-cancelable src:wikipedia*/ return _dom_dispatch_generic_event((dom_document *)doc, (dom_event_target *) ele, - doc->memoised[hds_focus], true, - true, &success); + doc->memoised[hds_focus], false, + false, &success); } /** @@ -467,11 +474,11 @@ dom_exception dom_html_input_element_select(dom_html_input_element *ele) bool success = false; assert(doc != NULL); - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + /** \this event bubbles and non-cancelable src:wikipedia*/ return _dom_dispatch_generic_event((dom_document *)doc, (dom_event_target *) ele, doc->memoised[hds_select], true, - true, &success); + false, &success); } /** @@ -485,13 +492,21 @@ dom_exception dom_html_input_element_click(dom_html_input_element *ele) struct dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); bool success = false; + dom_exception err; assert(doc != NULL); - /** \todo Is this is meant to check/uncheck boxes, radios etc */ - /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ - return _dom_dispatch_generic_event((dom_document *)doc, + + /** \This event bubbles & is cancelable src:Wikipedia*/ + err = _dom_dispatch_generic_event((dom_document *)doc, (dom_event_target *) ele, doc->memoised[hds_click], true, true, &success); + if(err != DOM_NO_ERR) + return err; + + ele->checked = true; + ele->checked_set = true; + + return DOM_NO_ERR; } diff --git a/src/html/html_input_element.h b/src/html/html_input_element.h index 72c7d51..b818b2e 100644 --- a/src/html/html_input_element.h +++ b/src/html/html_input_element.h @@ -21,6 +21,8 @@ struct dom_html_input_element { bool default_checked_set; /**< Whether default_checked has been set */ dom_string *default_value; /**< Initial value */ bool default_value_set; /**< Whether default_value has been set */ + bool checked; /**< Whether the element has been checked by a click */ + bool checked_set; }; /* Create a dom_html_input_element object */ diff --git a/test/testcases/tests/level1/html/HTMLInputElement21.xml b/test/testcases/tests/level1/html/HTMLInputElement21.xml new file mode 100644 index 0000000..57fbc76 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLInputElement21.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLInputElement21"> +<metadata> +<title>HTMLInputElement21</title> +<creator>Curt Arnold</creator> +<description> +HTMLInputElement.click should change the state of checked on a radio button. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2651361"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="checked" type="boolean"/> +<load var="doc" href="input" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"input"'/> +<assertSize collection="nodeList" size="9" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<checked var="checked" obj="testNode"/> +<assertFalse actual="checked" id="notCheckedBeforeClick"/> +<click interface="HTMLInputElement" obj="testNode"/> +<checked var="checked" obj="testNode"/> +<assertTrue actual="checked" id="checkedAfterClick"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLInputElement21.xml.kfail b/test/testcases/tests/level1/html/HTMLInputElement21.xml.kfail deleted file mode 100644 index 57fbc76..0000000 --- a/test/testcases/tests/level1/html/HTMLInputElement21.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLInputElement21"> -<metadata> -<title>HTMLInputElement21</title> -<creator>Curt Arnold</creator> -<description> -HTMLInputElement.click should change the state of checked on a radio button. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2651361"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="checked" type="boolean"/> -<load var="doc" href="input" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"input"'/> -<assertSize collection="nodeList" size="9" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<checked var="checked" obj="testNode"/> -<assertFalse actual="checked" id="notCheckedBeforeClick"/> -<click interface="HTMLInputElement" obj="testNode"/> -<checked var="checked" obj="testNode"/> -<assertTrue actual="checked" id="checkedAfterClick"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=d9460145f23f3879c043... commit d9460145f23f3879c04374d8bf11594ed33fd42c Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Slight change in interface file & copying a few test files diff --git a/src/html/TODO b/src/html/TODO index 183f10d..83ff515 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -10,7 +10,7 @@ HTMLMetaElement html_meta_element DONE HTMLBaseElement html_base_element DONE HTMLIsIndexElement html_isindex_element MISSING HTMLStyleElement html_style_element DONE -HTMLBodyElement html_body_element MISSING +HTMLBodyElement html_body_element DONE HTMLFormElement html_form_element DONE HTMLSelectElement html_select_element DONE HTMLOptGroupElement html_optgroup_element DONE diff --git a/test/dom1-interfaces.xml b/test/dom1-interfaces.xml index 240f2b9..a0d11c7 100644 --- a/test/dom1-interfaces.xml +++ b/test/dom1-interfaces.xml @@ -720,7 +720,31 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. </returns> <raises/> </method> +<method name="isSupported" id="notknown"> +<descr> +<p/> +</descr> +<parameters> +<param name="feature" type="DOMString" attr="in"> +<descr> +<p/> +</descr> +</param> +<param name="version" type="DOMString" attr="in"> +<descr> +<p/> +</descr> +</param> +</parameters> +<returns type="bool"> +<descr> +<p/> +</descr> +</returns> +<raises/> +</method> </interface> + <interface name="NodeList" id="ID-536297177"> <descr> <p>The<code>NodeList</code>interface provides the abstraction of an ordered collection of nodes, without defining or constraining how this collection is implemented.</p> diff --git a/test/testcases/tests/level2/html/files/document.html b/test/testcases/tests/level2/html/files/document.html new file mode 100644 index 0000000..9cd9c8a --- /dev/null +++ b/test/testcases/tests/level2/html/files/document.html @@ -0,0 +1,36 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<HTML> +<HEAD> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8"> +<TITLE>NIST DOM HTML Test - DOCUMENT</TITLE> +</HEAD> +<BODY onload="parent.loadComplete()" ID="TEST-BODY"> +<FORM ID="form1" ACCEPT-CHARSET="US-ASCII" ACTION="./files/getData.pl" ENCTYPE="application/x-www-form-urlencoded" METHOD="post"> +<P> +<TEXTAREA NAME="text1" COLS="20" ROWS="7"></TEXTAREA> +<INPUT TYPE="submit" NAME="submit" VALUE="Submit" /> +<INPUT TYPE="reset" NAME="reset" VALUE="Reset" /> +</P> +</FORM> +<P> +<MAP NAME="mapid" ID="mapid"> +<AREA TABINDEX="10" ACCESSKEY="a" SHAPE="rect" ALT="Domain" COORDS="0,2,45,45" HREF="./files/dletter.html" TITLE="Domain1"> +<AREA TABINDEX="10" ACCESSKEY="a" SHAPE="rect" ALT="Domain" COORDS="0,2,45,45" HREF="./files/dletter.html" TITLE="Domain2"> +</MAP> +</P> +<P> +<IMG ID="IMAGE-1" NAME="IMAGE-1" SRC="./pix/dts.gif" ALT="DTS IMAGE LOGO" LONGDESC="./files/desc.html" USEMAP="#DTS-MAP" WIDTH="115"/> +</P> +<P> +<OBJECT DATA="./pix/line.gif" CODETYPE="image/gif" HEIGHT="10"> +<APPLET ALT="Applet Number 1" CODE="applet1.class"></APPLET> +</OBJECT> +<OBJECT DATA="./pix/logo.gif" type="image/gif"> +<APPLET ALT="Applet Number 2" CODE="applet2.class"></APPLET> +</OBJECT> +</P> +<P> +<A ID="Anchor" DIR="LTR" HREF="./pix/submit.gif" ACCESSKEY="g" TYPE="image/gif" COORDS="0,0,100,100" SHAPE="rect" REL="GLOSSARY" REV="STYLESHEET" HREFLANG="en" CHARSET="US-ASCII" TABINDEX="22" NAME="Anchor">View Submit Button</A> +</P> +</BODY> +</HTML> diff --git a/test/testcases/tests/level2/html/files/document.xhtml b/test/testcases/tests/level2/html/files/document.xhtml new file mode 100644 index 0000000..3cc6ccf --- /dev/null +++ b/test/testcases/tests/level2/html/files/document.xhtml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - DOCUMENT</title> +</head> +<body onload="parent.loadComplete()" id="TEST-BODY"> +<form id="form1" accept-charset="US-ASCII" action="./files/getData.pl" enctype="application/x-www-form-urlencoded" method="post"> +<p> +<textarea name="text1" cols="20" rows="7"></textarea> +<input type="submit" name="submit1" value="Submit" /> +<input type="reset" name="submit2" value="Reset" /> +</p> +</form> +<p> +<map name="mapid" id="mapid"> +<area tabindex="10" accesskey="a" shape="rect" alt="Domain" coords="0,2,45,45" href="./files/dletter.html" title="Domain1" /> +<area tabindex="10" accesskey="a" shape="rect" alt="Domain" coords="0,2,45,45" href="./files/dletter.html" title="Domain2" /> +</map> +</p> +<p> +<img id="IMAGE-1" src="./pix/dts.gif" alt="DTS IMAGE LOGO" longdesc="./files/desc.html" usemap="#DTS-MAP" width="115"/> +</p> +<p> +<object data="./pix/line.gif" codetype="image/gif" height="10"> +<applet alt="Applet Number 1" code="applet1.class" width="10" height="10"></applet> +</object> +<object data="./pix/logo.gif" type="image/gif"> +<applet alt="Applet Number 2" code="applet2.class" width="10" height="10"></applet> +</object> +</p> +<p> +<a id="Anchor" dir="ltr" href="./pix/submit.gif" accesskey="g" type="image/gif" coords="0,0,100,100" shape="rect" rel="GLOSSARY" rev="STYLESHEET" hreflang="en" charset="US-ASCII" tabindex="22" name="Anchor">View Submit Button</a> +</p> +</body> +</html> + diff --git a/test/testcases/tests/level2/html/files/document.xml b/test/testcases/tests/level2/html/files/document.xml new file mode 100644 index 0000000..3cc6ccf --- /dev/null +++ b/test/testcases/tests/level2/html/files/document.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<title>NIST DOM HTML Test - DOCUMENT</title> +</head> +<body onload="parent.loadComplete()" id="TEST-BODY"> +<form id="form1" accept-charset="US-ASCII" action="./files/getData.pl" enctype="application/x-www-form-urlencoded" method="post"> +<p> +<textarea name="text1" cols="20" rows="7"></textarea> +<input type="submit" name="submit1" value="Submit" /> +<input type="reset" name="submit2" value="Reset" /> +</p> +</form> +<p> +<map name="mapid" id="mapid"> +<area tabindex="10" accesskey="a" shape="rect" alt="Domain" coords="0,2,45,45" href="./files/dletter.html" title="Domain1" /> +<area tabindex="10" accesskey="a" shape="rect" alt="Domain" coords="0,2,45,45" href="./files/dletter.html" title="Domain2" /> +</map> +</p> +<p> +<img id="IMAGE-1" src="./pix/dts.gif" alt="DTS IMAGE LOGO" longdesc="./files/desc.html" usemap="#DTS-MAP" width="115"/> +</p> +<p> +<object data="./pix/line.gif" codetype="image/gif" height="10"> +<applet alt="Applet Number 1" code="applet1.class" width="10" height="10"></applet> +</object> +<object data="./pix/logo.gif" type="image/gif"> +<applet alt="Applet Number 2" code="applet2.class" width="10" height="10"></applet> +</object> +</p> +<p> +<a id="Anchor" dir="ltr" href="./pix/submit.gif" accesskey="g" type="image/gif" coords="0,0,100,100" shape="rect" rel="GLOSSARY" rev="STYLESHEET" hreflang="en" charset="US-ASCII" tabindex="22" name="Anchor">View Submit Button</a> +</p> +</body> +</html> + commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=79e858c21e54e30fa470... commit 79e858c21e54e30fa4702bb297a4972a681be85c Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> [HTMLCollection && DOMTSHandler && dtd interface] fixes diff --git a/src/html/html_options_collection.c b/src/html/html_options_collection.c index 85001ad..3e06915 100644 --- a/src/html/html_options_collection.c +++ b/src/html/html_options_collection.c @@ -190,13 +190,13 @@ dom_exception dom_html_options_collection_named_item(dom_html_options_collection /* No children and siblings */ struct dom_node_internal *parent = n->parent; - while (parent != col->base.root && + while (n != col->base.root && n == parent->last_child) { n = parent; parent = parent->parent; } - if (parent == col->base.root) + if (n == col->base.root) n = NULL; else n = n->next; diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index fa71365..fec9bcb 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -48,6 +48,7 @@ our %special_type = ( HTMLTableSectionElement => "dom_html_table_section_element *", HTMLTableElement => "dom_html_table_element *", HTMLTableRowElement => "dom_html_table_row_element *", + HTMLOptionsCollection => "dom_html_options_collection *", ); our %special_prefix = ( DOMString => "dom_string", @@ -1491,7 +1492,7 @@ sub to_get_attribute_cast { sub get_get_attribute_prefix { my $type = shift; my $interface = shift; - if ((($interface eq "HTMLCollection") or ($interface eq "HTMLSelectElement")) and ($type eq "length")) { + if ($type eq "length") { $prefix = "uint32_t "; } elsif (exists $special_prefix{$type}) { $prefix = $special_prefix{$type}; diff --git a/test/dom1-interfaces.xml b/test/dom1-interfaces.xml index fc88b80..240f2b9 100644 --- a/test/dom1-interfaces.xml +++ b/test/dom1-interfaces.xml @@ -3674,4 +3674,51 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. </attribute> </interface> +<interface name="HTMLOptionsCollection" id="ID-75708506"> +<descr> +<p>An<code>HTMLOptionsCollection</code>is a list of nodes. An individual node may be accessed by either ordinal index or the node's<code>name</code>or<code>id</code>attributes.<emph>Note:</emph>Collections in the HTML DOM are assumed to be<emph>live</emph>meaning that they are automatically updated when the underlying document is changed.</p> +</descr> +<attribute readonly="yes" type="unsigned long" name="length" id="ID-40057551"> +<descr> +<p>This attribute specifies the length or<emph>size</emph>of the list.</p> +</descr> +</attribute> +<method name="item" id="ID-33262535"> +<descr> +<p>This method retrieves a node specified by ordinal index. Nodes are numbered in tree order (depth-first traversal order).</p> +</descr> +<parameters> +<param id="ID-3496656" name="index" type="unsigned long" attr="in"> +<descr> +<p>The index of the node to be fetched. The index origin is 0.</p> +</descr> +</param> +</parameters> +<returns type="Node"> +<descr> +<p>The<code>Node</code>at the corresponding position upon success. A value of<code>null</code>is returned if the index is out of range.</p> +</descr> +</returns> +<raises/> +</method> +<method name="namedItem" id="ID-21069976"> +<descr> +<p>This method retrieves a<code>Node</code>using a name. It first searches for a<code>Node</code>with a matching<code>id</code>attribute. If it doesn't find one, it then searches for a<code>Node</code>with a matching<code>name</code>attribute, but only on those elements that are allowed a name attribute.</p> +</descr> +<parameters> +<param id="ID-76682631" name="name" type="DOMString" attr="in"> +<descr> +<p>The name of the<code>Node</code>to be fetched.</p> +</descr> +</param> +</parameters> +<returns type="Node"> +<descr> +<p>The<code>Node</code>with a<code>name</code>or<code>id</code>attribute whose value corresponds to the specified string. Upon failure (e.g., no node with this name exists), returns<code>null</code>.</p> +</descr> +</returns> +<raises/> +</method> +</interface> + </library> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml b/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml new file mode 100644 index 0000000..80df1a3 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection01"> +<metadata> +<title>HTMLOptionsCollection01</title> +<creator>NIST</creator> +<description> + An HTMLOptionsCollection is a list of nodes representing HTML option + element. + The length attribute specifies the length or size of the list. + + Retrieve the first SELECT element and create a HTMLOptionsCollection + of the OPTION elements. Check the size of the length of OPTION elements. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-08-01</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-length"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="optionsList" type="HTMLOptionsCollection"/> +<var name="vlength" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="optionscollection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> +<length interface="HTMLOptionsCollection" obj="optionsList" var="vlength"/> +<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml.kfail b/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml.kfail deleted file mode 100644 index 80df1a3..0000000 --- a/test/testcases/tests/level2/html/HTMLOptionsCollection01.xml.kfail +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection01"> -<metadata> -<title>HTMLOptionsCollection01</title> -<creator>NIST</creator> -<description> - An HTMLOptionsCollection is a list of nodes representing HTML option - element. - The length attribute specifies the length or size of the list. - - Retrieve the first SELECT element and create a HTMLOptionsCollection - of the OPTION elements. Check the size of the length of OPTION elements. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-08-01</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-length"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="optionsList" type="HTMLOptionsCollection"/> -<var name="vlength" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="optionscollection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> -<length interface="HTMLOptionsCollection" obj="optionsList" var="vlength"/> -<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml b/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml new file mode 100644 index 0000000..44b5431 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection02"> +<metadata> +<title>HTMLOptionsCollection02</title> +<creator>NIST</creator> +<description> + An HTMLOptionsCollection is a list of nodes representing HTML option + element. + An individual node may be accessed by either ordinal index, the node's + name or id attributes. (Test ordinal index=3). + The item() method retrieves a node specified by ordinal index. + Nodes are numbered in tree order. The index origin is 0. + + Retrieve the first SELECT element. Create a HTMLOptionsCollection. + Retrieve the fourth item in the list and examine its firstChild's + nodeValue. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-08-01</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-item"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="optionsNode" type="Node"/> +<var name="optionsValueNode" type="Node"/> +<var name="optionsList" type="HTMLOptionsCollection"/> +<var name="vvalue" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="optionscollection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> +<item interface="HTMLOptionsCollection" obj="optionsList" var="optionsNode" index="3"/> +<firstChild interface="Node" obj="optionsNode" var="optionsValueNode"/> +<nodeValue obj="optionsValueNode" var="vvalue"/> +<assertEquals actual="vvalue" expected='"EMP10004"' id="valueIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml.kfail b/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml.kfail deleted file mode 100644 index 44b5431..0000000 --- a/test/testcases/tests/level2/html/HTMLOptionsCollection02.xml.kfail +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection02"> -<metadata> -<title>HTMLOptionsCollection02</title> -<creator>NIST</creator> -<description> - An HTMLOptionsCollection is a list of nodes representing HTML option - element. - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test ordinal index=3). - The item() method retrieves a node specified by ordinal index. - Nodes are numbered in tree order. The index origin is 0. - - Retrieve the first SELECT element. Create a HTMLOptionsCollection. - Retrieve the fourth item in the list and examine its firstChild's - nodeValue. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-08-01</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-item"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="optionsNode" type="Node"/> -<var name="optionsValueNode" type="Node"/> -<var name="optionsList" type="HTMLOptionsCollection"/> -<var name="vvalue" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="optionscollection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> -<item interface="HTMLOptionsCollection" obj="optionsList" var="optionsNode" index="3"/> -<firstChild interface="Node" obj="optionsNode" var="optionsValueNode"/> -<nodeValue obj="optionsValueNode" var="vvalue"/> -<assertEquals actual="vvalue" expected='"EMP10004"' id="valueIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml b/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml new file mode 100644 index 0000000..280b2bf --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection03"> +<metadata> +<title>HTMLOptionsCollection03</title> +<creator>NIST</creator> +<description> + An HTMLOptionsCollection is a list of nodes representing HTML option + element. + An individual node may be accessed by either ordinal index, the node's + name or id attributes. (Test node name). + The namedItem method retrieves a Node using a name. It first searches + for a node with a matching id attribute. If it doesn't find one, it + then searches for a Node with a matching name attribute, but only + those elements that are allowed a name attribute. + + Retrieve the first FORM element. Create a HTMLCollection of the elements. + Search for an element that has select1 as the value for the name attribute. + Get the nodeName of that element. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-08-01</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-namedItem"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="optionsNode" type="Node"/> +<var name="formsnodeList" type="HTMLCollection"/> +<var name="vname" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="optionscollection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> +<namedItem interface="HTMLOptionsCollection" obj="formsnodeList" var="optionsNode" name='"select1"'/> +<nodeName obj="optionsNode" var="vname"/> +<assertEquals actual="vname" expected='"select"' id="nameIndexLink" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml.kfail b/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml.kfail deleted file mode 100644 index 280b2bf..0000000 --- a/test/testcases/tests/level2/html/HTMLOptionsCollection03.xml.kfail +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection03"> -<metadata> -<title>HTMLOptionsCollection03</title> -<creator>NIST</creator> -<description> - An HTMLOptionsCollection is a list of nodes representing HTML option - element. - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test node name). - The namedItem method retrieves a Node using a name. It first searches - for a node with a matching id attribute. If it doesn't find one, it - then searches for a Node with a matching name attribute, but only - those elements that are allowed a name attribute. - - Retrieve the first FORM element. Create a HTMLCollection of the elements. - Search for an element that has select1 as the value for the name attribute. - Get the nodeName of that element. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-08-01</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-namedItem"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="optionsNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="vname" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="optionscollection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem interface="HTMLOptionsCollection" obj="formsnodeList" var="optionsNode" name='"select1"'/> -<nodeName obj="optionsNode" var="vname"/> -<assertEquals actual="vname" expected='"select"' id="nameIndexLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml b/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml new file mode 100644 index 0000000..83e59d3 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection04"> +<metadata> +<title>HTMLOptionsCollection04</title> +<creator>NIST</creator> +<description> + An HTMLOptionsCollection is a list of nodes representing HTML option + element. + An individual node may be accessed by either ordinal index, the node's + name or id attributes. (Test node name). + The namedItem method retrieves a Node using a name. It first searches + for a node with a matching id attribute. If it doesn't find one, it + then searches for a Node with a matching name attribute, but only + those elements that are allowed a name attribute. + + Retrieve the first FORM element. Create a HTMLCollection of the elements. + Search for an element that has selectId as the value for the id attribute. + Get the nodeName of that element. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-08-01</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-namedItem"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="optionsNode" type="Node"/> +<var name="formsnodeList" type="HTMLCollection"/> +<var name="vname" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="optionscollection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> +<namedItem interface="HTMLOptionsCollection" obj="formsnodeList" var="optionsNode" name='"selectId"'/> +<nodeName obj="optionsNode" var="vname"/> +<assertEquals actual="vname" expected='"select"' id="nameIndexLink" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml.kfail b/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml.kfail deleted file mode 100644 index 83e59d3..0000000 --- a/test/testcases/tests/level2/html/HTMLOptionsCollection04.xml.kfail +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection04"> -<metadata> -<title>HTMLOptionsCollection04</title> -<creator>NIST</creator> -<description> - An HTMLOptionsCollection is a list of nodes representing HTML option - element. - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test node name). - The namedItem method retrieves a Node using a name. It first searches - for a node with a matching id attribute. If it doesn't find one, it - then searches for a Node with a matching name attribute, but only - those elements that are allowed a name attribute. - - Retrieve the first FORM element. Create a HTMLCollection of the elements. - Search for an element that has selectId as the value for the id attribute. - Get the nodeName of that element. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-08-01</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-namedItem"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="optionsNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="vname" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="optionscollection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem interface="HTMLOptionsCollection" obj="formsnodeList" var="optionsNode" name='"selectId"'/> -<nodeName obj="optionsNode" var="vname"/> -<assertEquals actual="vname" expected='"select"' id="nameIndexLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml b/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml new file mode 100644 index 0000000..d2f44d7 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection05"> +<metadata> +<title>HTMLOptionsCollection05</title> +<creator>NIST</creator> +<description> + An HTMLOptionsCollection is a list of nodes representing HTML option + element. + An individual node may be accessed by either ordinal index, the node's + name or id attributes. (Test node name). + The namedItem method retrieves a Node using a name. It first searches + for a node with a matching id attribute. If it doesn't find one, it + then searches for a Node with a matching name attribute, but only + those elements that are allowed a name attribute. Upon failure(e.q., no + node with this name exists), returns null. + + Retrieve the first FORM element. Create a HTMLCollection of the elements. + Search for an element that has select9 as the value for the name attribute. + Null should be returned since there is not any name or id attribute with + select9 as a value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-08-01</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-namedItem"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="optionsNode" type="Node"/> +<var name="formsnodeList" type="HTMLCollection"/> +<var name="vname" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="optionscollection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> +<namedItem interface="HTMLOptionsCollection" obj="formsnodeList" var="optionsNode" name='"select9"'/> +<assertNull actual="optionsNode" id="nameIndexLink"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml.kfail b/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml.kfail deleted file mode 100644 index d2f44d7..0000000 --- a/test/testcases/tests/level2/html/HTMLOptionsCollection05.xml.kfail +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection05"> -<metadata> -<title>HTMLOptionsCollection05</title> -<creator>NIST</creator> -<description> - An HTMLOptionsCollection is a list of nodes representing HTML option - element. - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test node name). - The namedItem method retrieves a Node using a name. It first searches - for a node with a matching id attribute. If it doesn't find one, it - then searches for a Node with a matching name attribute, but only - those elements that are allowed a name attribute. Upon failure(e.q., no - node with this name exists), returns null. - - Retrieve the first FORM element. Create a HTMLCollection of the elements. - Search for an element that has select9 as the value for the name attribute. - Null should be returned since there is not any name or id attribute with - select9 as a value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-08-01</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-namedItem"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="optionsNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="vname" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="optionscollection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem interface="HTMLOptionsCollection" obj="formsnodeList" var="optionsNode" name='"select9"'/> -<assertNull actual="optionsNode" id="nameIndexLink"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml b/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml new file mode 100644 index 0000000..fbde429 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection06"> +<metadata> +<title>HTMLOptionsCollection06</title> +<creator>NIST</creator> +<description> + An HTMLOptionsCollection is a list of nodes representing HTML option + element. + An individual node may be accessed by either ordinal index, the node's + name or id attributes. (Test ordinal index). + The item() method retrieves a node specified by ordinal index. + A value of null is returned if the index is out of range. + + Retrieve the first SELECT element. Create a HTMLOptionsCollection. + Retrieve the tenth item in the list - null should be returned since + there are not 10 items in the list. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-08-01</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-item"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="optionsNode" type="Node"/> +<var name="optionsValueNode" type="Node"/> +<var name="optionsList" type="HTMLOptionsCollection"/> +<var name="vvalue" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="optionscollection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> +<item interface="HTMLOptionsCollection" obj="optionsList" var="optionsNode" index="10"/> +<assertNull actual="optionsNode" id="optionsIndexLink"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml.kfail b/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml.kfail deleted file mode 100644 index fbde429..0000000 --- a/test/testcases/tests/level2/html/HTMLOptionsCollection06.xml.kfail +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection06"> -<metadata> -<title>HTMLOptionsCollection06</title> -<creator>NIST</creator> -<description> - An HTMLOptionsCollection is a list of nodes representing HTML option - element. - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test ordinal index). - The item() method retrieves a node specified by ordinal index. - A value of null is returned if the index is out of range. - - Retrieve the first SELECT element. Create a HTMLOptionsCollection. - Retrieve the tenth item in the list - null should be returned since - there are not 10 items in the list. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-08-01</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-item"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="optionsNode" type="Node"/> -<var name="optionsValueNode" type="Node"/> -<var name="optionsList" type="HTMLOptionsCollection"/> -<var name="vvalue" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="optionscollection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> -<item interface="HTMLOptionsCollection" obj="optionsList" var="optionsNode" index="10"/> -<assertNull actual="optionsNode" id="optionsIndexLink"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml b/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml new file mode 100644 index 0000000..a2731e5 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection07"> +<metadata> +<title>HTMLOptionsCollection07</title> +<creator>NIST</creator> +<description> + An HTMLOptionsCollection is a list of nodes representing HTML option + element. + An individual node may be accessed by either ordinal index, the node's + name or id attributes. (Test ordinal index=0). + The item() method retrieves a node specified by ordinal index. Nodes + are numbered in tree order. The index origin is 0. + + Retrieve the first SELECT element. Create a HTMLOptionsCollection. + Retrieve the first item in the list and examine its firstChild's + nodeValue. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-08-01</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-item"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="optionsNode" type="Node"/> +<var name="optionsValueNode" type="Node"/> +<var name="optionsList" type="HTMLOptionsCollection"/> +<var name="vvalue" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="optionscollection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> +<item interface="HTMLOptionsCollection" obj="optionsList" var="optionsNode" index="0"/> +<firstChild interface="Node" obj="optionsNode" var="optionsValueNode"/> +<nodeValue obj="optionsValueNode" var="vvalue"/> +<assertEquals actual="vvalue" expected='"EMP10001"' id="valueIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml.kfail b/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml.kfail deleted file mode 100644 index a2731e5..0000000 --- a/test/testcases/tests/level2/html/HTMLOptionsCollection07.xml.kfail +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLOptionsCollection07"> -<metadata> -<title>HTMLOptionsCollection07</title> -<creator>NIST</creator> -<description> - An HTMLOptionsCollection is a list of nodes representing HTML option - element. - An individual node may be accessed by either ordinal index, the node's - name or id attributes. (Test ordinal index=0). - The item() method retrieves a node specified by ordinal index. Nodes - are numbered in tree order. The index origin is 0. - - Retrieve the first SELECT element. Create a HTMLOptionsCollection. - Retrieve the first item in the list and examine its firstChild's - nodeValue. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-08-01</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#HTMLOptionsCollection-item"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="optionsNode" type="Node"/> -<var name="optionsValueNode" type="Node"/> -<var name="optionsList" type="HTMLOptionsCollection"/> -<var name="vvalue" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="optionscollection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<options interface="HTMLSelectElement" obj="testNode" var="optionsList"/> -<item interface="HTMLOptionsCollection" obj="optionsList" var="optionsNode" index="0"/> -<firstChild interface="Node" obj="optionsNode" var="optionsValueNode"/> -<nodeValue obj="optionsValueNode" var="vvalue"/> -<assertEquals actual="vvalue" expected='"EMP10001"' id="valueIndexLink" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=e31da066b0376247d08e... commit e31da066b0376247d08e5899f233a94eb09291af Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> HTMLCollection diff --git a/src/html/html_collection.c b/src/html/html_collection.c index 2b4d8aa..43a26c5 100644 --- a/src/html/html_collection.c +++ b/src/html/html_collection.c @@ -11,6 +11,7 @@ #include <libwapcaplet/libwapcaplet.h> #include "html/html_collection.h" +#include "html/html_document.h" #include "core/node.h" #include "core/element.h" @@ -182,7 +183,7 @@ dom_exception dom_html_collection_item(dom_html_collection *col, /* No children and siblings */ struct dom_node_internal *parent = n->parent; - while (parent != col->root && + while (n != col->root && n == parent->last_child) { n = parent; parent = parent->parent; @@ -212,8 +213,8 @@ dom_exception dom_html_collection_named_item(dom_html_collection *col, dom_string *name, struct dom_node **node) { struct dom_node_internal *n = col->root; + dom_html_document *doc = (dom_html_document *)dom_node_get_owner(n); dom_exception err; - while (n != NULL) { if (n->type == DOM_ELEMENT_NODE && col->ic(n, col->ctx) == true) { @@ -235,6 +236,22 @@ dom_exception dom_html_collection_named_item(dom_html_collection *col, if (id != NULL) dom_string_unref(id); + + /* Check for Name attr if id not matched/found */ + dom_string *id_name = NULL; + err = _dom_element_get_attribute((dom_element *)n, + doc->memoised[hds_name], &id_name); + if(err != DOM_NO_ERR) { + return err; + } + if (id_name != NULL && dom_string_isequal(name, id_name)) { + *node = (struct dom_node *) n; + dom_node_ref(n); + dom_string_unref(id_name); + + return DOM_NO_ERR; + } + } /* Depth first iterating */ @@ -246,13 +263,13 @@ dom_exception dom_html_collection_named_item(dom_html_collection *col, /* No children and siblings */ struct dom_node_internal *parent = n->parent; - while (parent != col->root && + while (n != col->root && n == parent->last_child) { n = parent; parent = parent->parent; } - if (parent == col->root) + if (n == col->root) n = NULL; else n = n->next; diff --git a/src/html/html_document.c b/src/html/html_document.c index ee16ac4..0eca66d 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -907,6 +907,7 @@ dom_exception _dom_html_document_set_cookie(dom_html_document *doc, { UNUSED(doc); UNUSED(cookie); + /*todo implement this after updating client interface */ return DOM_NOT_SUPPORTED_ERR; } diff --git a/test/testcases/tests/level1/html/HTMLCollection04.xml b/test/testcases/tests/level1/html/HTMLCollection04.xml new file mode 100644 index 0000000..5d78405 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection04.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection04"> +<metadata> +<title>HTMLCollection04</title> +<creator>NIST</creator> +<description> + HTMLCollections are live, they are automatically updated when the + underlying document is changed. + + Create a HTMLCollection object by invoking the rows attribute of the + first TABLE element and examine its length, then add a new row and + re-examine the length. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowLength1" type="int"/> +<var name="rowLength2" type="int"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="newRow" type="HTMLElement"/> +<var name="vrowindex" type="int" /> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>5</member> +</var> +<load var="doc" href="collection" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength1"/> +<append collection="result" item="rowLength1"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength2"/> +<append collection="result" item="rowLength2"/> +<assertEquals actual="result" expected="expectedResult" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection04.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection04.xml.kfail deleted file mode 100644 index 5d78405..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection04.xml.kfail +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection04"> -<metadata> -<title>HTMLCollection04</title> -<creator>NIST</creator> -<description> - HTMLCollections are live, they are automatically updated when the - underlying document is changed. - - Create a HTMLCollection object by invoking the rows attribute of the - first TABLE element and examine its length, then add a new row and - re-examine the length. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowLength1" type="int"/> -<var name="rowLength2" type="int"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="newRow" type="HTMLElement"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>5</member> -</var> -<load var="doc" href="collection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength1"/> -<append collection="result" item="rowLength1"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength2"/> -<append collection="result" item="rowLength2"/> -<assertEquals actual="result" expected="expectedResult" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection04.xml.notimpl b/test/testcases/tests/level1/html/HTMLCollection04.xml.notimpl deleted file mode 100644 index 5d78405..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection04.xml.notimpl +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection04"> -<metadata> -<title>HTMLCollection04</title> -<creator>NIST</creator> -<description> - HTMLCollections are live, they are automatically updated when the - underlying document is changed. - - Create a HTMLCollection object by invoking the rows attribute of the - first TABLE element and examine its length, then add a new row and - re-examine the length. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowLength1" type="int"/> -<var name="rowLength2" type="int"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="newRow" type="HTMLElement"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>5</member> -</var> -<load var="doc" href="collection" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength1"/> -<append collection="result" item="rowLength1"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength2"/> -<append collection="result" item="rowLength2"/> -<assertEquals actual="result" expected="expectedResult" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection05.xml b/test/testcases/tests/level1/html/HTMLCollection05.xml new file mode 100644 index 0000000..ffb7d13 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection05.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection05"> +<metadata> +<title>HTMLCollection05</title> +<creator>NIST</creator> +<description> + The length attribute specifies the length or size of the list. + + Retrieve the first TABLE element and create a HTMLCollection by invoking + the "rows" attribute. Retrieve the length attribute of the HTMLCollection + object. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="rowLength" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength"/> +<assertEquals actual="rowLength" expected="4" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection05.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection05.xml.kfail deleted file mode 100644 index ffb7d13..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection05.xml.kfail +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection05"> -<metadata> -<title>HTMLCollection05</title> -<creator>NIST</creator> -<description> - The length attribute specifies the length or size of the list. - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. Retrieve the length attribute of the HTMLCollection - object. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="rowLength" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength"/> -<assertEquals actual="rowLength" expected="4" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection05.xml.notimpl b/test/testcases/tests/level1/html/HTMLCollection05.xml.notimpl deleted file mode 100644 index ffb7d13..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection05.xml.notimpl +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection05"> -<metadata> -<title>HTMLCollection05</title> -<creator>NIST</creator> -<description> - The length attribute specifies the length or size of the list. - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. Retrieve the length attribute of the HTMLCollection - object. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4005..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="rowLength" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="rowLength"/> -<assertEquals actual="rowLength" expected="4" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection06.xml b/test/testcases/tests/level1/html/HTMLCollection06.xml new file mode 100644 index 0000000..1026310 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection06.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection06"> +<metadata> +<title>HTMLCollection06</title> +<creator>NIST</creator> +<description> + An item(index) method retrieves an item specified by ordinal index + (Test for index=0). + + Retrieve the first TABLE element and create a HTMLCollection by invoking + the "rows" attribute. The item located at ordinal index 0 is further + retrieved and its "rowIndex" attribute is examined. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6156016"/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrowindex" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="0"/> +<rowIndex interface="HTMLTableRowElement" obj="rowNode" var="vrowindex"/> +<assertEquals actual="vrowindex" expected="0" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection06.xml.notimpl b/test/testcases/tests/level1/html/HTMLCollection06.xml.notimpl deleted file mode 100644 index 1026310..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection06.xml.notimpl +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection06"> -<metadata> -<title>HTMLCollection06</title> -<creator>NIST</creator> -<description> - An item(index) method retrieves an item specified by ordinal index - (Test for index=0). - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. The item located at ordinal index 0 is further - retrieved and its "rowIndex" attribute is examined. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6156016"/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="0"/> -<rowIndex interface="HTMLTableRowElement" obj="rowNode" var="vrowindex"/> -<assertEquals actual="vrowindex" expected="0" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection07.xml b/test/testcases/tests/level1/html/HTMLCollection07.xml new file mode 100644 index 0000000..55e392f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection07.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection07"> +<metadata> +<title>HTMLCollection07</title> +<creator>NIST</creator> +<description> + An item(index) method retrieves an item specified by ordinal index + (Test for index=3). + + Retrieve the first TABLE element and create a HTMLCollection by invoking + the "rows" attribute. The item located at ordinal index 3 is further + retrieved and its "rowIndex" attribute is examined. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrowindex" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="3"/> +<rowIndex interface="HTMLTableRowElement" obj="rowNode" var="vrowindex"/> +<assertEquals actual="vrowindex" expected="2" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection07.xml.notimpl b/test/testcases/tests/level1/html/HTMLCollection07.xml.notimpl deleted file mode 100644 index e0a21a2..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection07.xml.notimpl +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection07"> -<metadata> -<title>HTMLCollection07</title> -<creator>NIST</creator> -<description> - An item(index) method retrieves an item specified by ordinal index - (Test for index=3). - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. The item located at ordinal index 3 is further - retrieved and its "rowIndex" attribute is examined. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="3"/> -<rowIndex interface="HTMLTableRowElement" obj="rowNode" var="vrowindex"/> -<assertEquals actual="vrowindex" expected="3" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection08.xml b/test/testcases/tests/level1/html/HTMLCollection08.xml new file mode 100644 index 0000000..8f7f138 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection08.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection08"> +<metadata> +<title>HTMLCollection08</title> +<creator>NIST</creator> +<description> + Nodes in a HTMLCollection object are numbered in tree order. + (Depth-first traversal order). + + Retrieve the first TABLE element and create a HTMLCollection by invoking + the "rows" attribute. Access the item in the third ordinal index. The + resulting rowIndex attribute is examined and should be two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrowindex" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="3"/> +<rowIndex interface="HTMLTableRowElement" obj="rowNode" var="vrowindex"/> +<assertEquals actual="vrowindex" expected="2" id="rowIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection08.xml.notimpl b/test/testcases/tests/level1/html/HTMLCollection08.xml.notimpl deleted file mode 100644 index dfc2e10..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection08.xml.notimpl +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection08"> -<metadata> -<title>HTMLCollection08</title> -<creator>NIST</creator> -<description> - Nodes in a HTMLCollection object are numbered in tree order. - (Depth-first traversal order). - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. Access the item in the third ordinal index. The - resulting rowIndex attribute is examined and should be two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="2"/> -<rowIndex interface="HTMLTableRowElement" obj="rowNode" var="vrowindex"/> -<assertEquals actual="vrowindex" expected="2" id="rowIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection09.xml b/test/testcases/tests/level1/html/HTMLCollection09.xml new file mode 100644 index 0000000..f81e7af --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection09.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection09"> +<metadata> +<title>HTMLCollection09</title> +<creator>NIST</creator> +<description> + The item(index) method returns null if the index is out of range. + + Retrieve the first TABLE element and create a HTMLCollection by invoking + the "rows" attribute. Invoke the item(index) method with an index + of 5. This index is out of range and should return null. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrowindex" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="5"/> +<assertNull actual="rowNode" id="rowIndexLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection09.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection09.xml.kfail deleted file mode 100644 index f81e7af..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection09.xml.kfail +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection09"> -<metadata> -<title>HTMLCollection09</title> -<creator>NIST</creator> -<description> - The item(index) method returns null if the index is out of range. - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. Invoke the item(index) method with an index - of 5. This index is out of range and should return null. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="5"/> -<assertNull actual="rowNode" id="rowIndexLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection09.xml.notimpl b/test/testcases/tests/level1/html/HTMLCollection09.xml.notimpl deleted file mode 100644 index f81e7af..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection09.xml.notimpl +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection09"> -<metadata> -<title>HTMLCollection09</title> -<creator>NIST</creator> -<description> - The item(index) method returns null if the index is out of range. - - Retrieve the first TABLE element and create a HTMLCollection by invoking - the "rows" attribute. Invoke the item(index) method with an index - of 5. This index is out of range and should return null. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3326..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrowindex" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<item interface="HTMLCollection" obj="rowsnodeList" var="rowNode" index="5"/> -<assertNull actual="rowNode" id="rowIndexLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection10.xml b/test/testcases/tests/level1/html/HTMLCollection10.xml new file mode 100644 index 0000000..78f4c9a --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection10.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection10"> +<metadata> +<title>HTMLCollection10</title> +<creator>NIST</creator> +<description> + The namedItem(name) method retrieves a node using a name. It first + searches for a node with a matching id attribute. If it doesn't find + one, it then searches for a Node with a matching name attribute, but only + on those elements that are allowed a name attribute. + + Retrieve the first FORM element and create a HTMLCollection by invoking + the elements attribute. The first SELECT element is further retrieved + using the elements name attribute since the id attribute doesn't match. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2106..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="formNode" type="Node"/> +<var name="formsnodeList" type="HTMLCollection"/> +<var name="vname" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> +<namedItem obj="formsnodeList" var="formNode" name='"select1"'/> +<nodeName obj="formNode" var="vname"/> +<assertEquals actual="vname" expected='"SELECT"' id="nameIndexLink" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection10.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection10.xml.kfail deleted file mode 100644 index 78f4c9a..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection10.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection10"> -<metadata> -<title>HTMLCollection10</title> -<creator>NIST</creator> -<description> - The namedItem(name) method retrieves a node using a name. It first - searches for a node with a matching id attribute. If it doesn't find - one, it then searches for a Node with a matching name attribute, but only - on those elements that are allowed a name attribute. - - Retrieve the first FORM element and create a HTMLCollection by invoking - the elements attribute. The first SELECT element is further retrieved - using the elements name attribute since the id attribute doesn't match. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2106..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="vname" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem obj="formsnodeList" var="formNode" name='"select1"'/> -<nodeName obj="formNode" var="vname"/> -<assertEquals actual="vname" expected='"SELECT"' id="nameIndexLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection11.xml b/test/testcases/tests/level1/html/HTMLCollection11.xml new file mode 100644 index 0000000..ebf217f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLCollection11.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection11"> +<metadata> +<title>HTMLCollection11</title> +<creator>NIST</creator> +<description> + The namedItem(name) method retrieves a node using a name. It first + searches for a node with a matching id attribute. If it doesn't find + one, it then searches for a Node with a matching name attribute, but only + on those elements that are allowed a name attribute. + + Retrieve the first FORM element and create a HTMLCollection by invoking + the elements attribute. The first SELECT element is further retrieved + using the elements id attribute. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-01</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7672..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="formNode" type="Node"/> +<var name="formsnodeList" type="HTMLCollection"/> +<var name="vname" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="collection" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> +<namedItem obj="formsnodeList" var="formNode" name='"selectId"'/> +<nodeName obj="formNode" var="vname"/> +<assertEquals actual="vname" expected='"select"' id="nameIndexLink" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection11.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection11.xml.kfail deleted file mode 100644 index ebf217f..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection11.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection11"> -<metadata> -<title>HTMLCollection11</title> -<creator>NIST</creator> -<description> - The namedItem(name) method retrieves a node using a name. It first - searches for a node with a matching id attribute. If it doesn't find - one, it then searches for a Node with a matching name attribute, but only - on those elements that are allowed a name attribute. - - Retrieve the first FORM element and create a HTMLCollection by invoking - the elements attribute. The first SELECT element is further retrieved - using the elements id attribute. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7672..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="vname" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem obj="formsnodeList" var="formNode" name='"selectId"'/> -<nodeName obj="formNode" var="vname"/> -<assertEquals actual="vname" expected='"select"' id="nameIndexLink" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLCollection12.xml.kfail b/test/testcases/tests/level1/html/HTMLCollection12.xml.kfail deleted file mode 100644 index d7feb3d..0000000 --- a/test/testcases/tests/level1/html/HTMLCollection12.xml.kfail +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLCollection12"> -<metadata> -<title>HTMLCollection12</title> -<creator>NIST</creator> -<description> - The namedItem(name) method retrieves a node using a name. It first - searches for a node with a matching id attribute. If it doesn't find - one, it then searches for a Node with a matching name attribute, but only - on those elements that are allowed a name attribute. If there isn't - a matching node the method returns null. - - Retrieve the first FORM element and create a HTMLCollection by invoking - the elements attribute. The method returns null since there is not a - match of the name or id attribute. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-01</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2106..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="formNode" type="Node"/> -<var name="formsnodeList" type="HTMLCollection"/> -<var name="doc" type="Document"/> -<load var="doc" href="collection" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"form"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<elements interface="HTMLFormElement" obj="testNode" var="formsnodeList"/> -<namedItem obj="formsnodeList" var="formNode" name='"select9"'/> -<assertNull actual="formNode" id="nameIndexLink" /> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=c093880b3fcc5d7488fa... commit c093880b3fcc5d7488fafe78f1e5f8f486fa1313 Author: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> HTMLDocument Element incomplete & test generator minor fix diff --git a/include/dom/html/html_document.h b/include/dom/html/html_document.h index 1f868a5..936ea69 100644 --- a/include/dom/html/html_document.h +++ b/include/dom/html/html_document.h @@ -114,7 +114,7 @@ static inline dom_exception dom_html_document_get_body(dom_html_document *doc, get_body(doc, body); } #define dom_html_document_get_body(d, b) \ - dom_html_document_get_title((dom_html_document *) (d), \ + dom_html_document_get_body((dom_html_document *) (d), \ (struct dom_html_element **) (b)) static inline dom_exception dom_html_document_set_body(dom_html_document *doc, @@ -174,7 +174,7 @@ static inline dom_exception dom_html_document_get_anchors(dom_html_document *doc get_anchors(doc, col); } #define dom_html_document_get_anchors(d, c) \ - dom_html_document_get_title((dom_html_document *) (d), \ + dom_html_document_get_anchors((dom_html_document *) (d), \ (struct dom_html_collection **) (c)) static inline dom_exception dom_html_document_get_cookie(dom_html_document *doc, @@ -184,7 +184,7 @@ static inline dom_exception dom_html_document_get_cookie(dom_html_document *doc, get_cookie(doc, cookie); } #define dom_html_document_get_cookie(d, c) \ - dom_html_document_get_title((dom_html_document *) (d), (c)) + dom_html_document_get_cookie((dom_html_document *) (d), (c)) static inline dom_exception dom_html_document_set_cookie(dom_html_document *doc, dom_string *cookie) @@ -237,8 +237,8 @@ static inline dom_exception dom_html_document_get_elements_by_name(dom_html_docu return ((dom_html_document_vtable *) ((dom_node *) doc)->vtable)-> get_elements_by_name(doc, name, list); } -#define dom_html_document_get_elements_by_name(d, n, l) \ - dom_html_document_get_element_by_name((dom_html_document *) (d), \ +#define dom_html_document_get_element_by_name(d, n, l) \ + dom_html_document_get_elements_by_name((dom_html_document *) (d), \ (n), (struct dom_nodelist **) (l)) #endif diff --git a/src/html/html_document.c b/src/html/html_document.c index 5d68d51..ee16ac4 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -126,16 +126,17 @@ dom_exception _dom_html_document_initialise(dom_html_document *doc, doc->domain = NULL; doc->url = NULL; doc->cookie = NULL; - + doc->body = NULL; + doc->memoised = calloc(sizeof(dom_string *), hds_COUNT); if (doc->memoised == NULL) { error = DOM_NO_MEM_ERR; goto out; } - + #define HTML_DOCUMENT_STRINGS_ACTION(attr,str) \ error = dom_string_create_interned((const uint8_t *) #str, \ - SLEN(#str), &doc->memoised[hds_##attr]); \ + SLEN(#str), &doc->memoised[hds_##attr]); \ if (error != DOM_NO_ERR) { \ goto out; \ } @@ -639,57 +640,193 @@ dom_exception _dom_html_document_get_url(dom_html_document *doc, dom_exception _dom_html_document_get_body(dom_html_document *doc, struct dom_html_element **body) { - UNUSED(doc); - UNUSED(body); + dom_exception exc = DOM_NO_ERR; - return DOM_NOT_SUPPORTED_ERR; + if (doc->body != NULL) { + *body = doc->body; + } else { + dom_element *node; + dom_nodelist *nodes; + uint32_t len; + + exc = dom_document_get_elements_by_tag_name(doc, + doc->memoised[hds_BODY], + &nodes); + if (exc != DOM_NO_ERR) { + return exc; + } + + exc = dom_nodelist_get_length(nodes, &len); + if (exc != DOM_NO_ERR) { + dom_nodelist_unref(nodes); + return exc; + } + + if (len == 0) { + exc = dom_document_get_elements_by_tag_name(doc, + doc->memoised[hds_FRAMESET], + &nodes); + if (exc != DOM_NO_ERR) { + return exc; + } + exc = dom_nodelist_get_length(nodes, &len); + if (exc != DOM_NO_ERR) { + dom_nodelist_unref(nodes); + return exc; + } + if(len == 0) { + dom_nodelist_unref(nodes); + return DOM_NO_ERR; + } + } + + exc = dom_nodelist_item(nodes, 0, (void *) &node); + dom_nodelist_unref(nodes); + if (exc != DOM_NO_ERR) { + return exc; + } + + *body = (dom_html_element *)node; + dom_node_unref(node); + } + + return exc; } dom_exception _dom_html_document_set_body(dom_html_document *doc, struct dom_html_element *body) { - UNUSED(doc); - UNUSED(body); + doc->body = body; + return DOM_NO_ERR; +} - return DOM_NOT_SUPPORTED_ERR; +/** + * Callback for creating the images collection + * + * \param node The dom_node_internal object + * \param ctx The dom_html_document object (void *) + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +bool images_callback(struct dom_node_internal *node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_IMG])) { + return true; + } + return false; } dom_exception _dom_html_document_get_images(dom_html_document *doc, struct dom_html_collection **col) { - UNUSED(doc); - UNUSED(col); + dom_html_document *root; + dom_exception err; + err = dom_document_get_document_element(doc, &root); + if (err != DOM_NO_ERR) + return err; - return DOM_NOT_SUPPORTED_ERR; + return _dom_html_collection_create(doc, (dom_node_internal *) root, + images_callback, doc, col); +} + +bool applet_callback(struct dom_node_internal * node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_APPLET])) { + return true; + } + return false; +} +/** + * Callback for creating the applets collection + * + * \param node The dom_node_internal object + * \param ctx The dom_html_document object (void *) + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +bool applets_callback(struct dom_node_internal *node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_OBJECT])) { + uint32_t len = 0; + dom_html_collection *applets; + _dom_html_collection_create(ctx, node, + applet_callback, ctx, &applets); + + dom_html_collection_get_length(applets, &len); + if(len != 0) + return true; + } + return false; } dom_exception _dom_html_document_get_applets(dom_html_document *doc, struct dom_html_collection **col) { - UNUSED(doc); - UNUSED(col); + dom_html_document *root; + dom_exception err; + err = dom_document_get_document_element(doc, &root); + if (err != DOM_NO_ERR) + return err; - return DOM_NOT_SUPPORTED_ERR; + return _dom_html_collection_create(doc, (dom_node_internal *) root, + applets_callback, doc, col); +} + +/** + * Callback for creating the links collection + * + * \param node The dom_node_internal object + * \param ctx The dom_html_document object (void *) + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +bool links_callback(struct dom_node_internal *node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + (dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_A]) || + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_AREA])) + ) { + bool has_value = false; + dom_exception err; + + err = dom_element_has_attribute(node, + ((dom_html_document *)ctx)->memoised[hds_href], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) + return true; + } + return false; } dom_exception _dom_html_document_get_links(dom_html_document *doc, struct dom_html_collection **col) { - UNUSED(doc); - UNUSED(col); + dom_html_document *root; + dom_exception err; + err = dom_document_get_document_element(doc, &root); + if (err != DOM_NO_ERR) + return err; - return DOM_NOT_SUPPORTED_ERR; + return _dom_html_collection_create(doc, (dom_node_internal *) root, + links_callback, doc, col); } static bool __dom_html_document_node_is_form(dom_node_internal *node, - void *ctx) + void *ctx) { dom_html_document *doc = (dom_html_document *)node->owner; - + UNUSED(ctx); - + return dom_string_caseless_isequal(node->name, - doc->memoised[hds_FORM]); + doc->memoised[hds_FORM]); } dom_exception _dom_html_document_get_forms(dom_html_document *doc, @@ -717,13 +854,43 @@ dom_exception _dom_html_document_get_forms(dom_html_document *doc, return DOM_NO_ERR; } +/** + * Callback for creating the anchors collection + * + * \param node The dom_node_internal object + * \param ctx The dom_html_document object (void *) + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +bool anchors_callback(struct dom_node_internal *node, void *ctx) +{ + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_A])) { + bool has_value = false; + dom_exception err; + + err = dom_element_has_attribute(node, + ((dom_html_document *)ctx)->memoised[hds_name], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) + return true; + } + return false; +} + dom_exception _dom_html_document_get_anchors(dom_html_document *doc, struct dom_html_collection **col) { - UNUSED(doc); - UNUSED(col); + dom_html_document *root; + dom_exception err; + err = dom_document_get_document_element(doc, &root); + if (err != DOM_NO_ERR) + return err; - return DOM_NOT_SUPPORTED_ERR; + return _dom_html_collection_create(doc, (dom_node_internal *) root, + anchors_callback, doc, col); } dom_exception _dom_html_document_get_cookie(dom_html_document *doc, @@ -731,7 +898,7 @@ dom_exception _dom_html_document_get_cookie(dom_html_document *doc, { UNUSED(doc); UNUSED(cookie); - + /*todo implement this after updating client interface */ return DOM_NOT_SUPPORTED_ERR; } @@ -740,7 +907,7 @@ dom_exception _dom_html_document_set_cookie(dom_html_document *doc, { UNUSED(doc); UNUSED(cookie); - + /*todo implement this after updating client interface */ return DOM_NOT_SUPPORTED_ERR; } @@ -748,13 +915,14 @@ dom_exception _dom_html_document_open(dom_html_document *doc) { UNUSED(doc); + /*todo implement this after updating client interface */ return DOM_NOT_SUPPORTED_ERR; } dom_exception _dom_html_document_close(dom_html_document *doc) { UNUSED(doc); - + /*todo implement this after updating client interface */ return DOM_NOT_SUPPORTED_ERR; } @@ -782,7 +950,7 @@ dom_exception _dom_html_document_get_elements_by_name(dom_html_document *doc, UNUSED(doc); UNUSED(name); UNUSED(list); - + /*todo implement after updating core nodelist interface */ return DOM_NOT_SUPPORTED_ERR; } diff --git a/src/html/html_document.h b/src/html/html_document.h index 67250f5..c00529b 100644 --- a/src/html/html_document.h +++ b/src/html/html_document.h @@ -9,6 +9,7 @@ #define dom_internal_html_document_h_ #include <dom/html/html_document.h> +#include <dom/html/html_element.h> #include "core/document.h" @@ -23,6 +24,7 @@ struct dom_html_document { dom_string *domain; /**< HTML document domain */ dom_string *url; /**< HTML document URL */ dom_string *cookie; /**< HTML document cookie */ + dom_html_element *body; /**< HTML BodyElement */ /** Cached strings for html objects to use */ dom_string **memoised; @@ -126,6 +128,11 @@ dom_exception _dom_html_document_create_attribute(dom_document *doc, dom_exception _dom_html_document_create_attribute_ns(dom_document *doc, dom_string *namespace, dom_string *qname, dom_attr **result); +bool images_callback(struct dom_node_internal *node, void *ctx); +bool applets_callback(struct dom_node_internal *node, void *ctx); +bool applet_callback(struct dom_node_internal *node, void *ctx); +bool links_callback(struct dom_node_internal *node, void *ctx); +bool anchors_callback(struct dom_node_internal *node, void *ctx); #define DOM_DOCUMENT_VTABLE_HTML \ _dom_document_get_doctype, \ diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 304ac29..fa71365 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -91,6 +91,7 @@ our %special_method = ( our %special_attribute = ( namespaceURI => "namespace", + URL => "url", ); our %no_unref = ( @@ -1210,7 +1211,7 @@ sub generate_assertion { $fragment = $ats->{fragment}; } if (exists $ats->{isAbsolute}) { - $isAbsolute = $ats->{isAbsolute}; + $isAbsolute = "\"$ats->{isAbsolute}\""; } print "is_uri_equals($scheme, $path, $host, $file, $name, $query, $fragment, $isAbsolute, $actual)" diff --git a/test/testcases/tests/level1/html/HTMLDocument02.xml b/test/testcases/tests/level1/html/HTMLDocument02.xml deleted file mode 100644 index 24bd58f..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument02.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument02"> -<metadata> -<title>HTMLDocument02</title> -<creator>NIST</creator> -<description> - The referrer attribute returns the URI of the page that linked to this - page. - - Retrieve the referrer attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-01-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9522..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vreferrer" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<referrer interface="HTMLDocument" obj="doc" var="vreferrer"/> -<assertEquals actual="vreferrer" expected='""' id="referrerLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument02.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument02.xml.kfail new file mode 100644 index 0000000..24bd58f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument02.xml.kfail @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument02"> +<metadata> +<title>HTMLDocument02</title> +<creator>NIST</creator> +<description> + The referrer attribute returns the URI of the page that linked to this + page. + + Retrieve the referrer attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-01-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9522..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vreferrer" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<referrer interface="HTMLDocument" obj="doc" var="vreferrer"/> +<assertEquals actual="vreferrer" expected='""' id="referrerLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument03.xml b/test/testcases/tests/level1/html/HTMLDocument03.xml deleted file mode 100644 index 97e291d..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument03.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument03"> -<metadata> -<title>HTMLDocument03</title> -<creator>NIST</creator> -<description> - The domain attribute specifies the domain name of the server that served - the document, or null if the server cannot be identified by a domain name. - - Retrieve the domain attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-01-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2250147"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vdomain" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<domain interface="HTMLDocument" obj="doc" var="vdomain"/> -<assertEquals actual="vdomain" expected='""' id="domainLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument03.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument03.xml.kfail new file mode 100644 index 0000000..97e291d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument03.xml.kfail @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument03"> +<metadata> +<title>HTMLDocument03</title> +<creator>NIST</creator> +<description> + The domain attribute specifies the domain name of the server that served + the document, or null if the server cannot be identified by a domain name. + + Retrieve the domain attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-01-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2250147"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vdomain" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<domain interface="HTMLDocument" obj="doc" var="vdomain"/> +<assertEquals actual="vdomain" expected='""' id="domainLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument04.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument04.xml.kfail new file mode 100644 index 0000000..223d426 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument04.xml.kfail @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument04"> +<metadata> +<title>HTMLDocument04</title> +<creator>NIST</creator> +<description> + The URL attribute specifies the absolute URI of the document. + + Retrieve the URL attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-01-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4618..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vurl" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<URL interface="HTMLDocument" obj="doc" var="vurl"/> +<assertURIEquals actual="vurl" name='"document"' id="URLLink" isAbsolute="true"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument04.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument04.xml.notimpl deleted file mode 100644 index 223d426..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument04.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument04"> -<metadata> -<title>HTMLDocument04</title> -<creator>NIST</creator> -<description> - The URL attribute specifies the absolute URI of the document. - - Retrieve the URL attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-01-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4618..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vurl" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<URL interface="HTMLDocument" obj="doc" var="vurl"/> -<assertURIEquals actual="vurl" name='"document"' id="URLLink" isAbsolute="true"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument05.xml b/test/testcases/tests/level1/html/HTMLDocument05.xml new file mode 100644 index 0000000..a764b35 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument05.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument05"> +<metadata> +<title>HTMLDocument05</title> +<creator>NIST</creator> +<description> + The body attribute is the element that contains the content for the + document. + + Retrieve the body attribute and examine its value for the id attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-01-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5636..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vbody" type="HTMLElement" /> +<var name="vid" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<body interface="HTMLDocument" obj="doc" var="vbody"/> +<id interface="HTMLElement" obj="vbody" var="vid"/> +<assertEquals actual="vid" expected='"TEST-BODY"' id="idLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument05.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument05.xml.notimpl deleted file mode 100644 index a764b35..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument05.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument05"> -<metadata> -<title>HTMLDocument05</title> -<creator>NIST</creator> -<description> - The body attribute is the element that contains the content for the - document. - - Retrieve the body attribute and examine its value for the id attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-01-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5636..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vbody" type="HTMLElement" /> -<var name="vid" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<body interface="HTMLDocument" obj="doc" var="vbody"/> -<id interface="HTMLElement" obj="vbody" var="vid"/> -<assertEquals actual="vid" expected='"TEST-BODY"' id="idLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument07.xml b/test/testcases/tests/level1/html/HTMLDocument07.xml new file mode 100644 index 0000000..a08972f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument07.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument07"> +<metadata> +<title>HTMLDocument07</title> +<creator>NIST</creator> +<description> + The images attribute returns a collection of all IMG elements in a document. + + Retrieve the images attribute from the document and examine its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-04-30</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9037..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vimages" type="HTMLCollection" /> +<var name="vlength" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<images interface="HTMLDocument" obj="doc" var="vimages" /> +<length interface="HTMLCollection" obj="vimages" var="vlength" /> +<assertEquals actual="vlength" expected='1' id="lengthLink" ignoreCase="false" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument07.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument07.xml.notimpl deleted file mode 100644 index a08972f..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument07.xml.notimpl +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument07"> -<metadata> -<title>HTMLDocument07</title> -<creator>NIST</creator> -<description> - The images attribute returns a collection of all IMG elements in a document. - - Retrieve the images attribute from the document and examine its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-04-30</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9037..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vimages" type="HTMLCollection" /> -<var name="vlength" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<images interface="HTMLDocument" obj="doc" var="vimages" /> -<length interface="HTMLCollection" obj="vimages" var="vlength" /> -<assertEquals actual="vlength" expected='1' id="lengthLink" ignoreCase="false" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument08.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument08.xml.kfail new file mode 100644 index 0000000..f4b3e3d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument08.xml.kfail @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument08"> +<metadata> +<title>HTMLDocument08</title> +<creator>NIST</creator> +<description> + The applets attribute returns a collection of all OBJECT elements that + include applets abd APPLET elements in a document. + + Retrieve the applets attribute from the document and examine its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-04-30</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8511..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vapplets" type="HTMLCollection" /> +<var name="vlength" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<applets interface="HTMLDocument" obj="doc" var="vapplets" /> +<length interface="HTMLCollection" obj="vapplets" var="vlength" /> + -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument08"> -<metadata> -<title>HTMLDocument08</title> -<creator>NIST</creator> -<description> - The applets attribute returns a collection of all OBJECT elements that - include applets abd APPLET elements in a document. - - Retrieve the applets attribute from the document and examine its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-04-30</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8511..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vapplets" type="HTMLCollection" /> -<var name="vlength" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<applets interface="HTMLDocument" obj="doc" var="vapplets" /> -<length interface="HTMLCollection" obj="vapplets" var="vlength" /> -<assertEquals actual="vlength" expected='4' id="length" ignoreCase="false" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument09.xml b/test/testcases/tests/level1/html/HTMLDocument09.xml new file mode 100644 index 0000000..037811f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument09.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument09"> +<metadata> +<title>HTMLDocument09</title> +<creator>NIST</creator> +<description> + The links attribute returns a collection of all AREA and A elements + in a document with a value for the href attribute. + + Retrieve the links attribute from the document and examine its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-04-30</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7068919"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlinks" type="HTMLCollection"/> +<var name="vlength" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<links interface="HTMLDocument" obj="doc" var="vlinks" /> +<length interface="HTMLCollection" obj="vlinks" var="vlength" /> +<assertEquals actual="vlength" expected='3' id="lengthLink" ignoreCase="false" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument09.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument09.xml.notimpl deleted file mode 100644 index 037811f..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument09.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument09"> -<metadata> -<title>HTMLDocument09</title> -<creator>NIST</creator> -<description> - The links attribute returns a collection of all AREA and A elements - in a document with a value for the href attribute. - - Retrieve the links attribute from the document and examine its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-04-30</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7068919"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlinks" type="HTMLCollection"/> -<var name="vlength" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<links interface="HTMLDocument" obj="doc" var="vlinks" /> -<length interface="HTMLCollection" obj="vlinks" var="vlength" /> -<assertEquals actual="vlength" expected='3' id="lengthLink" ignoreCase="false" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument10.xml b/test/testcases/tests/level1/html/HTMLDocument10.xml new file mode 100644 index 0000000..700cebd --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument10.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument10"> +<metadata> +<title>HTMLDocument10</title> +<creator>NIST</creator> +<description> + The forms attribute returns a collection of all the forms in a document. + + Retrieve the forms attribute from the document and examine its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-04-30</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1689064"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vforms" type="HTMLCollection"/> +<var name="vlength" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<forms interface="HTMLDocument" obj="doc" var="vforms" /> +<length interface="HTMLCollection" obj="vforms" var="vlength" /> +<assertEquals actual="vlength" expected='1' id="lengthLink" ignoreCase="false" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument10.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument10.xml.notimpl deleted file mode 100644 index 700cebd..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument10.xml.notimpl +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument10"> -<metadata> -<title>HTMLDocument10</title> -<creator>NIST</creator> -<description> - The forms attribute returns a collection of all the forms in a document. - - Retrieve the forms attribute from the document and examine its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-04-30</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1689064"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vforms" type="HTMLCollection"/> -<var name="vlength" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<forms interface="HTMLDocument" obj="doc" var="vforms" /> -<length interface="HTMLCollection" obj="vforms" var="vlength" /> -<assertEquals actual="vlength" expected='1' id="lengthLink" ignoreCase="false" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument11.xml b/test/testcases/tests/level1/html/HTMLDocument11.xml new file mode 100644 index 0000000..308131f --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument11.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument11"> +<metadata> +<title>HTMLDocument11</title> +<creator>NIST</creator> +<description> + The anchors attribute returns a collection of all A elements with values + for the name attribute. + + Retrieve the anchors attribute from the document and examine its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-04-30</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7577272"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vanchors" type="HTMLCollection"/> +<var name="vlength" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<anchors interface="HTMLDocument" obj="doc" var="vanchors" /> +<length interface="HTMLCollection" obj="vanchors" var="vlength" /> +<assertEquals actual="vlength" expected='1' id="lengthLink" ignoreCase="false" /> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument11.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument11.xml.notimpl deleted file mode 100644 index 308131f..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument11.xml.notimpl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument11"> -<metadata> -<title>HTMLDocument11</title> -<creator>NIST</creator> -<description> - The anchors attribute returns a collection of all A elements with values - for the name attribute. - - Retrieve the anchors attribute from the document and examine its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-04-30</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7577272"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vanchors" type="HTMLCollection"/> -<var name="vlength" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<anchors interface="HTMLDocument" obj="doc" var="vanchors" /> -<length interface="HTMLCollection" obj="vanchors" var="vlength" /> -<assertEquals actual="vlength" expected='1' id="lengthLink" ignoreCase="false" /> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument12.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument12.xml.kfail new file mode 100644 index 0000000..964e70c --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument12.xml.kfail @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument12"> +<metadata> +<title>HTMLDocument02</title> +<creator>NIST</creator> +<description> + The cookie attribute returns the cookies associated with this document. + + Retrieve the cookie attribute and examine its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-04-30</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8747038"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="vcookie" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<cookie interface="HTMLDocument" obj="doc" var="vcookie"/> +<assertEquals actual="vcookie" expected='""' id="cookieLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument12.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument12.xml.notimpl deleted file mode 100644 index 964e70c..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument12.xml.notimpl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument12"> -<metadata> -<title>HTMLDocument02</title> -<creator>NIST</creator> -<description> - The cookie attribute returns the cookies associated with this document. - - Retrieve the cookie attribute and examine its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-04-30</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8747038"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="vcookie" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<cookie interface="HTMLDocument" obj="doc" var="vcookie"/> -<assertEquals actual="vcookie" expected='""' id="cookieLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument13.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument13.xml.kfail new file mode 100644 index 0000000..fc7244b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument13.xml.kfail @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument13"> +<metadata> +<title>HTMLDocument13</title> +<creator>NIST</creator> +<description> + The getElementsByName method returns the (possibly empty) collection + of elements whose name value is given by the elementName. + + Retrieve all the elements whose name attribute is "mapid". + Check the length of the nodelist. It should be 1. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-07-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7155..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<getElementsByName interface="HTMLDocument" var="nodeList" obj="doc" elementName='"mapid"' id="getElementsNameId"/> +<assertSize collection="nodeList" size="1" id="Asize"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument13.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument13.xml.notimpl deleted file mode 100644 index fc7244b..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument13.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument13"> -<metadata> -<title>HTMLDocument13</title> -<creator>NIST</creator> -<description> - The getElementsByName method returns the (possibly empty) collection - of elements whose name value is given by the elementName. - - Retrieve all the elements whose name attribute is "mapid". - Check the length of the nodelist. It should be 1. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-07-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7155..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<getElementsByName interface="HTMLDocument" var="nodeList" obj="doc" elementName='"mapid"' id="getElementsNameId"/> -<assertSize collection="nodeList" size="1" id="Asize"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument14.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument14.xml.kfail new file mode 100644 index 0000000..c41fe14 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument14.xml.kfail @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument14"> +<metadata> +<title>HTMLDocument14</title> +<creator>NIST</creator> +<description> + The getElementsByName method returns the (possibly empty) collection + of elements whose name value is given by the elementName. + + Retrieve all the elements whose name attribute is "noid". + Check the length of the nodelist. It should be 0 since + the id "noid" does not exist. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-07-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7155..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<getElementsByName interface="HTMLDocument" var="nodeList" obj="doc" elementName='"noid"' id="getElementsNameId"/> +<assertSize collection="nodeList" size="0" id="Asize"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument14.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument14.xml.notimpl deleted file mode 100644 index c41fe14..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument14.xml.notimpl +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument14"> -<metadata> -<title>HTMLDocument14</title> -<creator>NIST</creator> -<description> - The getElementsByName method returns the (possibly empty) collection - of elements whose name value is given by the elementName. - - Retrieve all the elements whose name attribute is "noid". - Check the length of the nodelist. It should be 0 since - the id "noid" does not exist. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-07-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7155..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<getElementsByName interface="HTMLDocument" var="nodeList" obj="doc" elementName='"noid"' id="getElementsNameId"/> -<assertSize collection="nodeList" size="0" id="Asize"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument15.xml b/test/testcases/tests/level1/html/HTMLDocument15.xml new file mode 100644 index 0000000..e01d4ca --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument15.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument15"> +<metadata> +<title>HTMLDocument15</title> +<creator>NIST</creator> +<description> + The getElementById method returns the Element whose id is given by + elementId. If no such element exists, returns null. + + Retrieve the element whose id is "mapid". + Check the value of the element. + +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-07-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3611..."/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-26809268"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId"/> +</metadata> +<var name="elementNode" type="Element"/> +<var name="elementValue" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<getElementById var="elementNode" obj="doc" elementId='"mapid"' id="getElementsId"/> +<nodeName obj="elementNode" var="elementValue"/> +<assertEquals actual="elementValue" expected='"map"' id="elementId" ignoreCase="auto"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument15.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument15.xml.notimpl deleted file mode 100644 index e01d4ca..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument15.xml.notimpl +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument15"> -<metadata> -<title>HTMLDocument15</title> -<creator>NIST</creator> -<description> - The getElementById method returns the Element whose id is given by - elementId. If no such element exists, returns null. - - Retrieve the element whose id is "mapid". - Check the value of the element. - -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-07-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3611..."/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-26809268"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId"/> -</metadata> -<var name="elementNode" type="Element"/> -<var name="elementValue" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<getElementById var="elementNode" obj="doc" elementId='"mapid"' id="getElementsId"/> -<nodeName obj="elementNode" var="elementValue"/> -<assertEquals actual="elementValue" expected='"map"' id="elementId" ignoreCase="auto"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument16.xml b/test/testcases/tests/level1/html/HTMLDocument16.xml new file mode 100644 index 0000000..1bb1fa7 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument16.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument16"> +<metadata> +<title>HTMLDocument16</title> +<creator>NIST</creator> +<description> + The getElementById method returns the Element whose id is given by + elementId. If no such element exists, returns null. + + Retrieve the element whose id is "noid". + The value returned should be null since there are not any elements with + an id of "noid". + +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-07-15</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3611..."/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-26809268"/> +<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId"/> +</metadata> +<var name="elementNode" type="Element"/> +<var name="elementValue" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="false"/> +<getElementById var="elementNode" obj="doc" elementId='"noid"' id="getElementsId"/> +<assertNull actual="elementNode" id="elementId"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument16.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument16.xml.notimpl deleted file mode 100644 index 1bb1fa7..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument16.xml.notimpl +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument16"> -<metadata> -<title>HTMLDocument16</title> -<creator>NIST</creator> -<description> - The getElementById method returns the Element whose id is given by - elementId. If no such element exists, returns null. - - Retrieve the element whose id is "noid". - The value returned should be null since there are not any elements with - an id of "noid". - -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-07-15</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3611..."/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-26809268"/> -<subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId"/> -</metadata> -<var name="elementNode" type="Element"/> -<var name="elementValue" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="false"/> -<getElementById var="elementNode" obj="doc" elementId='"noid"' id="getElementsId"/> -<assertNull actual="elementNode" id="elementId"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument17.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument17.xml.kfail new file mode 100644 index 0000000..6c89504 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument17.xml.kfail @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument17"> +<metadata> +<title>HTMLDocument17</title> +<creator>Curt Arnold</creator> +<description> +Clears the current document using HTMLDocument.open immediately followed by close. +</description> +<date qualifier="created">2002-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="bodyElem" type="Element"/> +<var name="bodyChild" type="Node"/> +<load var="doc" href="document" willBeModified="true"/> +<open obj="doc"/> +<close obj="doc"/> +<body var="bodyElem" obj="doc"/> +<if><notNull obj="bodyElem"/> + <firstChild interface="Node" var="bodyChild" obj="bodyElem"/> + <assertNull actual="bodyChild" id="bodyContainsChildren"/> +</if> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument17.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument17.xml.notimpl deleted file mode 100644 index 6c89504..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument17.xml.notimpl +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument17"> -<metadata> -<title>HTMLDocument17</title> -<creator>Curt Arnold</creator> -<description> -Clears the current document using HTMLDocument.open immediately followed by close. -</description> -<date qualifier="created">2002-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="bodyElem" type="Element"/> -<var name="bodyChild" type="Node"/> -<load var="doc" href="document" willBeModified="true"/> -<open obj="doc"/> -<close obj="doc"/> -<body var="bodyElem" obj="doc"/> -<if><notNull obj="bodyElem"/> - <firstChild interface="Node" var="bodyChild" obj="bodyElem"/> - <assertNull actual="bodyChild" id="bodyContainsChildren"/> -</if> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument18.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument18.xml.kfail new file mode 100644 index 0000000..7454a15 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument18.xml.kfail @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument18"> +<metadata> +<title>HTMLDocument18</title> +<creator>Curt Arnold</creator> +<description> +Calls HTMLDocument.close on a document that has not been opened for modification. +</description> +<date qualifier="created">2002-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> +</metadata> +<var name="doc" type="Document"/> +<load var="doc" href="document" willBeModified="true"/> +<close obj="doc"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument18.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument18.xml.notimpl deleted file mode 100644 index 7454a15..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument18.xml.notimpl +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument18"> -<metadata> -<title>HTMLDocument18</title> -<creator>Curt Arnold</creator> -<description> -Calls HTMLDocument.close on a document that has not been opened for modification. -</description> -<date qualifier="created">2002-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> -</metadata> -<var name="doc" type="Document"/> -<load var="doc" href="document" willBeModified="true"/> -<close obj="doc"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument19.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument19.xml.kfail new file mode 100644 index 0000000..3fa1a81 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument19.xml.kfail @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument19"> +<metadata> +<title>HTMLDocument19</title> +<creator>Curt Arnold</creator> +<description> +Replaces the current document with a valid HTML document using HTMLDocument.open, write and close. +</description> +<date qualifier="created">2002-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7523..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="docElem" type="Element"/> +<var name="title" type="DOMString"/> +<load var="doc" href="document" willBeModified="true"/> +<open obj="doc"/> +<if><contentType type="text/html"/> + <write obj="doc" text='"<html>"'/> + <else> + <write obj="doc" text='"<html xmlns='http://www.w3.org/1999/xhtml'>"'/> + </else> +</if> +<write obj="doc" text='"<body>"'/> +<write obj="doc" text='"<title>Replacement</title>"'/> +<write obj="doc" text='"</body>"'/> +<write obj="doc" text='"<p>"'/> +<write obj="doc" text='"Hello, World."'/> +<write obj="doc" text='"</p>"'/> +<write obj="doc" text='"</body>"'/> +<write obj="doc" text='"</html>"'/> +<close obj="doc"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument19.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument19.xml.notimpl deleted file mode 100644 index 3fa1a81..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument19.xml.notimpl +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument19"> -<metadata> -<title>HTMLDocument19</title> -<creator>Curt Arnold</creator> -<description> -Replaces the current document with a valid HTML document using HTMLDocument.open, write and close. -</description> -<date qualifier="created">2002-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7523..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="docElem" type="Element"/> -<var name="title" type="DOMString"/> -<load var="doc" href="document" willBeModified="true"/> -<open obj="doc"/> -<if><contentType type="text/html"/> - <write obj="doc" text='"<html>"'/> - <else> - <write obj="doc" text='"<html xmlns='http://www.w3.org/1999/xhtml'>"'/> - </else> -</if> -<write obj="doc" text='"<body>"'/> -<write obj="doc" text='"<title>Replacement</title>"'/> -<write obj="doc" text='"</body>"'/> -<write obj="doc" text='"<p>"'/> -<write obj="doc" text='"Hello, World."'/> -<write obj="doc" text='"</p>"'/> -<write obj="doc" text='"</body>"'/> -<write obj="doc" text='"</html>"'/> -<close obj="doc"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument20.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument20.xml.kfail new file mode 100644 index 0000000..0b03356 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument20.xml.kfail @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument20"> +<metadata> +<title>HTMLDocument20</title> +<creator>Curt Arnold</creator> +<description> +Replaces the current document with a valid HTML document using HTMLDocument.open, writeln and close. +</description> +<date qualifier="created">2002-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3531..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="docElem" type="Element"/> +<var name="title" type="DOMString"/> +<load var="doc" href="document" willBeModified="true"/> +<open obj="doc"/> +<if><contentType type="text/html"/> + <writeln obj="doc" text='"<html>"'/> + <else> + <writeln obj="doc" text='"<html xmlns='http://www.w3.org/1999/xhtml'>"'/> + </else> +</if> +<writeln obj="doc" text='"<body>"'/> +<writeln obj="doc" text='"<title>Replacement</title>"'/> +<writeln obj="doc" text='"</body>"'/> +<writeln obj="doc" text='"<p>"'/> +<writeln obj="doc" text='"Hello, World."'/> +<writeln obj="doc" text='"</p>"'/> +<writeln obj="doc" text='"</body>"'/> +<writeln obj="doc" text='"</html>"'/> +<close obj="doc"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument20.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument20.xml.notimpl deleted file mode 100644 index 0b03356..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument20.xml.notimpl +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument20"> -<metadata> -<title>HTMLDocument20</title> -<creator>Curt Arnold</creator> -<description> -Replaces the current document with a valid HTML document using HTMLDocument.open, writeln and close. -</description> -<date qualifier="created">2002-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3531..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="docElem" type="Element"/> -<var name="title" type="DOMString"/> -<load var="doc" href="document" willBeModified="true"/> -<open obj="doc"/> -<if><contentType type="text/html"/> - <writeln obj="doc" text='"<html>"'/> - <else> - <writeln obj="doc" text='"<html xmlns='http://www.w3.org/1999/xhtml'>"'/> - </else> -</if> -<writeln obj="doc" text='"<body>"'/> -<writeln obj="doc" text='"<title>Replacement</title>"'/> -<writeln obj="doc" text='"</body>"'/> -<writeln obj="doc" text='"<p>"'/> -<writeln obj="doc" text='"Hello, World."'/> -<writeln obj="doc" text='"</p>"'/> -<writeln obj="doc" text='"</body>"'/> -<writeln obj="doc" text='"</html>"'/> -<close obj="doc"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument21.xml.kfail b/test/testcases/tests/level1/html/HTMLDocument21.xml.kfail new file mode 100644 index 0000000..4942f45 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDocument21.xml.kfail @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument21"> +<metadata> +<title>HTMLDocument21</title> +<creator>Curt Arnold</creator> +<description> +Replaces the current document checks that writeln adds a new line. +</description> +<date qualifier="created">2002-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7523..."/> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3531..."/> +</metadata> +<var name="doc" type="Document"/> +<var name="docElem" type="Element"/> +<var name="preElems" type="NodeList"/> +<var name="preElem" type="Element"/> +<var name="preText" type="Text"/> +<var name="preValue" type="DOMString"/> +<load var="doc" href="document" willBeModified="true"/> +<open obj="doc"/> +<if><contentType type="text/html"/> + <writeln obj="doc" text='"<html>"'/> + <else> + <writeln obj="doc" text='"<html xmlns='http://www.w3.org/1999/xhtml'>"'/> + </else> +</if> +<writeln obj="doc" text='"<body>"'/> +<writeln obj="doc" text='"<title>Replacement</title>"'/> +<writeln obj="doc" text='"</body>"'/> +<write obj="doc" text='"<pre>"'/> +<writeln obj="doc" text='"Hello, World."'/> +<writeln obj="doc" text='"Hello, World."'/> +<writeln obj="doc" text='"</pre>"'/> +<write obj="doc" text='"<pre>"'/> +<write obj="doc" text='"Hello, World."'/> +<write obj="doc" text='"Hello, World."'/> +<writeln obj="doc" text='"</pre>"'/> +<writeln obj="doc" text='"</body>"'/> +<writeln obj="doc" text='"</html>"'/> +<close obj="doc"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDocument21.xml.notimpl b/test/testcases/tests/level1/html/HTMLDocument21.xml.notimpl deleted file mode 100644 index 4942f45..0000000 --- a/test/testcases/tests/level1/html/HTMLDocument21.xml.notimpl +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDocument21"> -<metadata> -<title>HTMLDocument21</title> -<creator>Curt Arnold</creator> -<description> -Replaces the current document checks that writeln adds a new line. -</description> -<date qualifier="created">2002-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7216..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9894..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7523..."/> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3531..."/> -</metadata> -<var name="doc" type="Document"/> -<var name="docElem" type="Element"/> -<var name="preElems" type="NodeList"/> -<var name="preElem" type="Element"/> -<var name="preText" type="Text"/> -<var name="preValue" type="DOMString"/> -<load var="doc" href="document" willBeModified="true"/> -<open obj="doc"/> -<if><contentType type="text/html"/> - <writeln obj="doc" text='"<html>"'/> - <else> - <writeln obj="doc" text='"<html xmlns='http://www.w3.org/1999/xhtml'>"'/> - </else> -</if> -<writeln obj="doc" text='"<body>"'/> -<writeln obj="doc" text='"<title>Replacement</title>"'/> -<writeln obj="doc" text='"</body>"'/> -<write obj="doc" text='"<pre>"'/> -<writeln obj="doc" text='"Hello, World."'/> -<writeln obj="doc" text='"Hello, World."'/> -<writeln obj="doc" text='"</pre>"'/> -<write obj="doc" text='"<pre>"'/> -<write obj="doc" text='"Hello, World."'/> -<write obj="doc" text='"Hello, World."'/> -<writeln obj="doc" text='"</pre>"'/> -<writeln obj="doc" text='"</body>"'/> -<writeln obj="doc" text='"</html>"'/> -<close obj="doc"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=35cde09375f39a1bad05... commit 35cde09375f39a1bad05728fc97f206733113633 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Enabling some missed tests. How come were they missed ?! :o diff --git a/test/testcases/tests/level1/html/HTMLTableElement28.xml b/test/testcases/tests/level1/html/HTMLTableElement28.xml new file mode 100644 index 0000000..95f300c --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement28.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement28"> +<metadata> +<title>HTMLTableElement28</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the second TABLE element and invoke the insertRow() method + with an index of 0. Currently the zero indexed row is in the THEAD + section of the TABLE. The number of rows in the THEAD section before + insertion of the new row is one. After the new row is inserted the number + of rows in the THEAD section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vsection1" type="HTMLTableSectionElement"/> +<var name="vsection2" type="HTMLTableSectionElement"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="0"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableSectionElement" obj="vsection2" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail deleted file mode 100644 index 95f300c..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement28.xml.kfail +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement28"> -<metadata> -<title>HTMLTableElement28</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the second TABLE element and invoke the insertRow() method - with an index of 0. Currently the zero indexed row is in the THEAD - section of the TABLE. The number of rows in the THEAD section before - insertion of the new row is one. After the new row is inserted the number - of rows in the THEAD section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vsection1" type="HTMLTableSectionElement"/> -<var name="vsection2" type="HTMLTableSectionElement"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="0"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableSectionElement" obj="vsection2" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement29.xml b/test/testcases/tests/level1/html/HTMLTableElement29.xml new file mode 100644 index 0000000..ba62848 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement29.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement29"> +<metadata> +<title>HTMLTableElement29</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the second TABLE element and invoke the insertRow() method + with an index of two. Currently the 2nd indexed row is in the TBODY + section of the TABLE. The number of rows in the TBODY section before + insertion of the new row is two. After the new row is inserted the number + of rows in the TBODY section is three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="bodyNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vsection1" type="HTMLTableSectionElement"/> +<var name="vsection2" type="HTMLTableSectionElement"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> +<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="bodyNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="2"/> +<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> +<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="bodyNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail deleted file mode 100644 index ba62848..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement29.xml.kfail +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement29"> -<metadata> -<title>HTMLTableElement29</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the second TABLE element and invoke the insertRow() method - with an index of two. Currently the 2nd indexed row is in the TBODY - section of the TABLE. The number of rows in the TBODY section before - insertion of the new row is two. After the new row is inserted the number - of rows in the TBODY section is three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="bodyNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vsection1" type="HTMLTableSectionElement"/> -<var name="vsection2" type="HTMLTableSectionElement"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> -<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="bodyNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink1" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="2"/> -<tBodies interface="HTMLTableElement" obj="testNode" var="tbodiesnodeList"/> -<item interface="HTMLCollection" obj="tbodiesnodeList" var="bodyNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="bodyNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement30.xml b/test/testcases/tests/level1/html/HTMLTableElement30.xml new file mode 100644 index 0000000..e45cf68 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement30.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement30"> +<metadata> +<title>HTMLTableElement30</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. + + Retrieve the second TABLE element and invoke the insertRow() method + with an index of four. After the new row is inserted the number of rows + in the table should be five. + Also the number of rows in the TFOOT section before + insertion of the new row is one. After the new row is inserted the number + of rows in the TFOOT section is two. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="newRow" type="HTMLElement"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vsection1" type="HTMLTableSectionElement"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="5" id="rowsLink2" ignoreCase="false"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="2" id="rowsLink3" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail deleted file mode 100644 index e45cf68..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement30.xml.kfail +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement30"> -<metadata> -<title>HTMLTableElement30</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. - - Retrieve the second TABLE element and invoke the insertRow() method - with an index of four. After the new row is inserted the number of rows - in the table should be five. - Also the number of rows in the TFOOT section before - insertion of the new row is one. After the new row is inserted the number - of rows in the TFOOT section is two. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="newRow" type="HTMLElement"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vsection1" type="HTMLTableSectionElement"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="1" id="rowsLink" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="testNode" var="newRow" index="4"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="5" id="rowsLink2" ignoreCase="false"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<rows interface="HTMLTableSectionElement" obj="vsection1" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="2" id="rowsLink3" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement31.xml b/test/testcases/tests/level1/html/HTMLTableElement31.xml new file mode 100644 index 0000000..e5eb32d --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement31.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement31"> +<metadata> +<title>HTMLTableElement31</title> +<creator>NIST</creator> +<description> + The insertRow() method inserts a new empty table row. In addition, when + the table is empty the row is inserted into a TBODY which is created + and inserted into the table. + + Load the table1 file which has a non-empty table element. + Create an empty TABLE element and append to the document. + Check to make sure that the empty TABLE element doesn't + have a TBODY element. Insert a new row into the empty + TABLE element. Check for existence of the a TBODY element + in the table. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> + +<subject resource="http://lists.w3.org/Archives/Public/www-dom-ts/2002Aug/0019.html"/> +<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=502"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="tableNode" type="Node"/> +<var name="tbodiesnodeList" type="HTMLCollection"/> +<var name="newRow" type="HTMLElement"/> +<var name="doc" type="Document"/> +<var name="table" type="Element"/> +<var name="tbodiesLength" type="int"/> +<load var="doc" href="table1" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"body"'/> +<assertSize collection="nodeList" size="1" id="tableSize1"/> +<item interface="NodeList" obj="nodeList" index="0" var="testNode"/> +<createElement obj="doc" var="table" tagName='"table"'/> +<appendChild obj="testNode" newChild="table" var="tableNode"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="2" id="tableSize2"/> +<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> +<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> +<assertEquals actual="tbodiesLength" expected="0" id="Asize3" ignoreCase="false"/> +<insertRow interface="HTMLTableElement" obj="tableNode" var="newRow" index="0"/> +<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> +<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> +<assertEquals actual="tbodiesLength" expected="1" id="Asize4" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail deleted file mode 100644 index e5eb32d..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement31.xml.kfail +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement31"> -<metadata> -<title>HTMLTableElement31</title> -<creator>NIST</creator> -<description> - The insertRow() method inserts a new empty table row. In addition, when - the table is empty the row is inserted into a TBODY which is created - and inserted into the table. - - Load the table1 file which has a non-empty table element. - Create an empty TABLE element and append to the document. - Check to make sure that the empty TABLE element doesn't - have a TBODY element. Insert a new row into the empty - TABLE element. Check for existence of the a TBODY element - in the table. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3987..."/> - -<subject resource="http://lists.w3.org/Archives/Public/www-dom-ts/2002Aug/0019.html"/> -<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=502"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="tableNode" type="Node"/> -<var name="tbodiesnodeList" type="HTMLCollection"/> -<var name="newRow" type="HTMLElement"/> -<var name="doc" type="Document"/> -<var name="table" type="Element"/> -<var name="tbodiesLength" type="int"/> -<load var="doc" href="table1" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"body"'/> -<assertSize collection="nodeList" size="1" id="tableSize1"/> -<item interface="NodeList" obj="nodeList" index="0" var="testNode"/> -<createElement obj="doc" var="table" tagName='"table"'/> -<appendChild obj="testNode" newChild="table" var="tableNode"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="2" id="tableSize2"/> -<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> -<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> -<assertEquals actual="tbodiesLength" expected="0" id="Asize3" ignoreCase="false"/> -<insertRow interface="HTMLTableElement" obj="tableNode" var="newRow" index="0"/> -<tBodies interface="HTMLTableElement" obj="tableNode" var="tbodiesnodeList"/> -<length var="tbodiesLength" obj="tbodiesnodeList" interface="HTMLCollection"/> -<assertEquals actual="tbodiesLength" expected="1" id="Asize4" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement32.xml b/test/testcases/tests/level1/html/HTMLTableElement32.xml new file mode 100644 index 0000000..a6529b0 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement32.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement32"> +<metadata> +<title>HTMLTableElement32</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a table row. + + Retrieve the second TABLE element and invoke the deleteRow() method + with an index of 0(first row). Currently there are four rows in the + table. After the deleteRow() method is called there should be + three rows in the table. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1311..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableElement" obj="testNode" index="0"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail deleted file mode 100644 index a6529b0..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement32.xml.kfail +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement32"> -<metadata> -<title>HTMLTableElement32</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a table row. - - Retrieve the second TABLE element and invoke the deleteRow() method - with an index of 0(first row). Currently there are four rows in the - table. After the deleteRow() method is called there should be - three rows in the table. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1311..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableElement" obj="testNode" index="0"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement33.xml b/test/testcases/tests/level1/html/HTMLTableElement33.xml new file mode 100644 index 0000000..1ae507a --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement33.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement33"> +<metadata> +<title>HTMLTableElement33</title> +<creator>NIST</creator> +<description> + The deleteRow() method deletes a table row. + + Retrieve the second TABLE element and invoke the deleteRow() method + with an index of 3(last row). Currently there are four rows in the + table. The deleteRow() method is called and now there should be three. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1311..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="vrows" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> +<deleteRow interface="HTMLTableElement" obj="testNode" index="3"/> +<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail deleted file mode 100644 index 1ae507a..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement33.xml.kfail +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement33"> -<metadata> -<title>HTMLTableElement33</title> -<creator>NIST</creator> -<description> - The deleteRow() method deletes a table row. - - Retrieve the second TABLE element and invoke the deleteRow() method - with an index of 3(last row). Currently there are four rows in the - table. The deleteRow() method is called and now there should be three. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1311..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="vrows" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="4" id="rowsLink1" ignoreCase="false"/> -<deleteRow interface="HTMLTableElement" obj="testNode" index="3"/> -<rows interface="HTMLTableSectionElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<assertEquals actual="vrows" expected="3" id="rowsLink2" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement05.xml b/test/testcases/tests/level1/html/HTMLTableRowElement05.xml new file mode 100644 index 0000000..638126b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement05.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement05"> +<metadata> +<title>HTMLTableRowElement05</title> +<creator>NIST</creator> +<description> + The cells attribute specifies the collection of cells in this row. + + Retrieve the fourth TR element and examine the value of + the cells length attribute. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6734..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail deleted file mode 100644 index 638126b..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement05.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement05"> -<metadata> -<title>HTMLTableRowElement05</title> -<creator>NIST</creator> -<description> - The cells attribute specifies the collection of cells in this row. - - Retrieve the fourth TR element and examine the value of - the cells length attribute. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6734..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/area01.xml b/test/testcases/tests/level1/html/area01.xml new file mode 100644 index 0000000..34ebdb2 --- /dev/null +++ b/test/testcases/tests/level1/html/area01.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area01"> +<metadata> +<title>area01</title> +<creator>Netscape</creator> +<description> + +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6602..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcoords" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="area" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<coords interface="HTMLAreaElement" obj="testNode" var="vcoords"/> +<assertEquals actual="vcoords" expected='"0,2,45,45"' id="coordsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/area01.xml.notimpl b/test/testcases/tests/level1/html/area01.xml.notimpl deleted file mode 100644 index 34ebdb2..0000000 --- a/test/testcases/tests/level1/html/area01.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area01"> -<metadata> -<title>area01</title> -<creator>Netscape</creator> -<description> - -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6602..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcoords" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="area" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<coords interface="HTMLAreaElement" obj="testNode" var="vcoords"/> -<assertEquals actual="vcoords" expected='"0,2,45,45"' id="coordsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/area02.xml b/test/testcases/tests/level1/html/area02.xml new file mode 100644 index 0000000..8f85598 --- /dev/null +++ b/test/testcases/tests/level1/html/area02.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area02"> +<metadata> +<title>area02</title> +<creator>Netscape</creator> +<description> + +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6182..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vnohref" type="boolean" /> +<var name="doc" type="Node"/> +<load var="doc" href="area" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<noHref interface="HTMLAreaElement" obj="testNode" var="vnohref"/> +<assertFalse actual="vnohref" id="noHrefLink"/> +</test> diff --git a/test/testcases/tests/level1/html/area02.xml.notimpl b/test/testcases/tests/level1/html/area02.xml.notimpl deleted file mode 100644 index 8f85598..0000000 --- a/test/testcases/tests/level1/html/area02.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area02"> -<metadata> -<title>area02</title> -<creator>Netscape</creator> -<description> - -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6182..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vnohref" type="boolean" /> -<var name="doc" type="Node"/> -<load var="doc" href="area" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<noHref interface="HTMLAreaElement" obj="testNode" var="vnohref"/> -<assertFalse actual="vnohref" id="noHrefLink"/> -</test> diff --git a/test/testcases/tests/level1/html/area03.xml b/test/testcases/tests/level1/html/area03.xml new file mode 100644 index 0000000..577e711 --- /dev/null +++ b/test/testcases/tests/level1/html/area03.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area03"> +<metadata> +<title>area03</title> +<creator>Netscape</creator> +<description> + +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8722121"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vtabindex" type="int" /> +<var name="doc" type="Node"/> +<load var="doc" href="area" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<tabIndex interface="HTMLAreaElement" obj="testNode" var="vtabindex"/> +<assertEquals actual="vtabindex" expected="10" id="tabIndexLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/area03.xml.notimpl b/test/testcases/tests/level1/html/area03.xml.notimpl deleted file mode 100644 index 577e711..0000000 --- a/test/testcases/tests/level1/html/area03.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area03"> -<metadata> -<title>area03</title> -<creator>Netscape</creator> -<description> - -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8722121"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vtabindex" type="int" /> -<var name="doc" type="Node"/> -<load var="doc" href="area" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<tabIndex interface="HTMLAreaElement" obj="testNode" var="vtabindex"/> -<assertEquals actual="vtabindex" expected="10" id="tabIndexLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/area04.xml b/test/testcases/tests/level1/html/area04.xml new file mode 100644 index 0000000..f964a57 --- /dev/null +++ b/test/testcases/tests/level1/html/area04.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area04"> +<metadata> +<title>area04</title> +<creator>Netscape</creator> +<description> + +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5794..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vaccesskey" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="area" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<accessKey interface="HTMLAreaElement" obj="testNode" var="vaccesskey"/> +<assertEquals actual="vaccesskey" expected='"a"' id="accessKeyLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/area04.xml.notimpl b/test/testcases/tests/level1/html/area04.xml.notimpl deleted file mode 100644 index f964a57..0000000 --- a/test/testcases/tests/level1/html/area04.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="area04"> -<metadata> -<title>area04</title> -<creator>Netscape</creator> -<description> - -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5794..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vaccesskey" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="area" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"area"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<accessKey interface="HTMLAreaElement" obj="testNode" var="vaccesskey"/> -<assertEquals actual="vaccesskey" expected='"a"' id="accessKeyLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/basefont01.xml b/test/testcases/tests/level1/html/basefont01.xml new file mode 100644 index 0000000..eadfca4 --- /dev/null +++ b/test/testcases/tests/level1/html/basefont01.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="basefont01"> +<metadata> +<title>basefont01</title> +<creator>Netscape</creator> +<description> +The value of attribute color of the basefont element is read and checked against the expected value. +</description> +<contributor>Sivakiran Tummala</contributor> +<date qualifier="created">2002-02-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8750..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcolor" type="DOMString" /> +<var name="doc" type="Node"/> +<load var="doc" href="basefont" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"basefont"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<color interface="HTMLBaseFontElement" obj="testNode" var="vcolor"/> +<assertEquals actual="vcolor" expected='"#000000"' id="colorLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/basefont01.xml.notimpl b/test/testcases/tests/level1/html/basefont01.xml.notimpl deleted file mode 100644 index eadfca4..0000000 --- a/test/testcases/tests/level1/html/basefont01.xml.notimpl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="basefont01"> -<metadata> -<title>basefont01</title> -<creator>Netscape</creator> -<description> -The value of attribute color of the basefont element is read and checked against the expected value. -</description> -<contributor>Sivakiran Tummala</contributor> -<date qualifier="created">2002-02-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8750..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcolor" type="DOMString" /> -<var name="doc" type="Node"/> -<load var="doc" href="basefont" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"basefont"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<color interface="HTMLBaseFontElement" obj="testNode" var="vcolor"/> -<assertEquals actual="vcolor" expected='"#000000"' id="colorLink" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=c7f3d0def9dc71deb135... commit c7f3d0def9dc71deb135b5afedcddac1c92b9c3e Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> IFrame Element diff --git a/Makefile b/Makefile index 4dc8af6..569e554 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frame_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_iframe_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index d8245ac..1392ee0 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -92,6 +92,7 @@ #include <dom/html/html_style_element.h> #include <dom/html/html_frameset_element.h> #include <dom/html/html_frame_element.h> +#include <dom/html/html_iframe_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_iframe_element.h b/include/dom/html/html_iframe_element.h index 2e182d5..f064cfe 100644 --- a/include/dom/html/html_iframe_element.h +++ b/include/dom/html/html_iframe_element.h @@ -3,5 +3,80 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_iframe_element_h_ +#define dom_html_iframe_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +#include <dom/html/html_document.h> +typedef struct dom_html_iframe_element dom_html_iframe_element; + +dom_exception dom_html_iframe_element_get_frame_border( + dom_html_iframe_element *element, dom_string **frame_border); + +dom_exception dom_html_iframe_element_set_frame_border( + dom_html_iframe_element *element, dom_string *frame_border); + +dom_exception dom_html_iframe_element_get_align( + dom_html_iframe_element *element, dom_string **align); + +dom_exception dom_html_iframe_element_set_align( + dom_html_iframe_element *element, dom_string *align); + +dom_exception dom_html_iframe_element_set_long_desc( + dom_html_iframe_element *ele, dom_string *long_desc); + +dom_exception dom_html_iframe_element_get_long_desc( + dom_html_iframe_element *ele, dom_string **long_desc); + +dom_exception dom_html_iframe_element_get_margin_height( + dom_html_iframe_element *element, dom_string **margin_height); + +dom_exception dom_html_iframe_element_set_margin_height( + dom_html_iframe_element *element, dom_string *margin_height); + +dom_exception dom_html_iframe_element_get_margin_width( + dom_html_iframe_element *element, dom_string **margin_width); + +dom_exception dom_html_iframe_element_set_margin_width( + dom_html_iframe_element *element, dom_string *margin_width); + +dom_exception dom_html_iframe_element_get_name( + dom_html_iframe_element *element, dom_string **name); + +dom_exception dom_html_iframe_element_set_name( + dom_html_iframe_element *element, dom_string *name); + +dom_exception dom_html_iframe_element_get_scrolling( + dom_html_iframe_element *element, dom_string **scrolling); + +dom_exception dom_html_iframe_element_set_scrolling( + dom_html_iframe_element *element, dom_string *scrolling); + +dom_exception dom_html_iframe_element_get_src( + dom_html_iframe_element *element, dom_string **src); + +dom_exception dom_html_iframe_element_set_src( + dom_html_iframe_element *element, dom_string *src); + +dom_exception dom_html_iframe_element_get_height( + dom_html_iframe_element *element, dom_string **height); + +dom_exception dom_html_iframe_element_set_height( + dom_html_iframe_element *element, dom_string *height); + +dom_exception dom_html_iframe_element_get_width( + dom_html_iframe_element *element, dom_string **width); + +dom_exception dom_html_iframe_element_set_width( + dom_html_iframe_element *element, dom_string *width); + +dom_exception dom_html_iframe_element_get_content_document( + dom_html_iframe_element *ele, + dom_document **content_document); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index fa707d4..95550ab 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -18,10 +18,9 @@ DIR_SOURCES := \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ html_table_element.c html_tablerow_element.c html_frameset_element.c \ - html_frame_element.c + html_frame_element.c html_iframe_element.c UNINMPLEMENTED_SOURCES := \ html_isindex_element.c \ - html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document.c b/src/html/html_document.c index cf8d1aa..5d68d51 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -59,6 +59,7 @@ #include "html/html_style_element.h" #include "html/html_frameset_element.h" #include "html/html_frame_element.h" +#include "html/html_iframe_element.h" #include "core/attr.h" #include "core/string.h" @@ -373,6 +374,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FRAME])) { exc = _dom_html_frame_element_create(html, namespace, prefix, (dom_html_frame_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_IFRAME])) { + exc = _dom_html_iframe_element_create(html, namespace, prefix, + (dom_html_iframe_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_frame_element.h b/src/html/html_frame_element.h index 77a137b..c313cbc 100644 --- a/src/html/html_frame_element.h +++ b/src/html/html_frame_element.h @@ -9,7 +9,7 @@ #ifndef dom_internal_html_frame_element_h_ #define dom_internal_html_frame_element_h_ -#include <dom/html/html_frameset_element.h> +#include <dom/html/html_frame_element.h> #include "html/html_element.h" diff --git a/src/html/html_iframe_element.c b/src/html/html_iframe_element.c index 2e182d5..6f15b3e 100644 --- a/src/html/html_iframe_element.c +++ b/src/html/html_iframe_element.c @@ -3,5 +3,267 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_iframe_element.h> + +#include "html/html_document.h" +#include "html/html_iframe_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_IFRAME_ELEMENT + }, + DOM_HTML_IFRAME_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_iframe_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_iframe_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_iframe_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_iframe_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_iframe_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_iframe_element object + * + * \param doc The document object + * \param ele The dom_html_iframe_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_iframe_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_iframe_element *ele) +{ + dom_string *scrolling_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "auto", SLEN("auto"), &scrolling_default); + if (err != DOM_NO_ERR) + return err; + + + dom_string *frame_border_default = NULL; + err = dom_string_create((const uint8_t *) "1", SLEN("1"), &frame_border_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_IFRAME], + namespace, prefix); + + ele->scrolling_default = scrolling_default; + ele->frame_border_default = frame_border_default; + + return err; +} + +/** + * Finalise a dom_html_iframe_element object + * + * \param ele The dom_html_iframe_element object + */ +void _dom_html_iframe_element_finalise(struct dom_html_iframe_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_iframe_element object + * + * \param ele The dom_html_iframe_element object + */ +void _dom_html_iframe_element_destroy(struct dom_html_iframe_element *ele) +{ + _dom_html_iframe_element_finalise(ele); + free(ele); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_iframe_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_iframe_element_destroy(dom_node_internal *node) +{ + _dom_html_iframe_element_destroy((struct dom_html_iframe_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_iframe_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_iframe_element_get_##attr( \ + dom_html_iframe_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_iframe_element_set_##attr( \ + dom_html_iframe_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(long_desc); +SIMPLE_GET_SET(align); +SIMPLE_GET_SET(name); +SIMPLE_GET_SET(src); +SIMPLE_GET_SET(margin_width); +SIMPLE_GET_SET(margin_height); +SIMPLE_SET(scrolling); +SIMPLE_SET(frame_border); +SIMPLE_GET_SET(width); +SIMPLE_GET_SET(height); + + +/** + * Get the frame_border property + * + * \param ele The dom_html_iframe_element object + * \param iframe_border The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_iframe_element_get_frame_border( + dom_html_iframe_element *ele, + dom_string **frame_border) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_frame_border], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_frame_border], frame_border); + } + + *frame_border = ele->frame_border_default; + if (*frame_border != NULL) + dom_string_ref(*frame_border); + return DOM_NO_ERR; +} + +/** + * Get the frame_border property + * + * \param ele The dom_html_iframe_element object + * \param scrolling The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_iframe_element_get_scrolling( + dom_html_iframe_element *ele, + dom_string **scrolling) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_scrolling], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_scrolling], scrolling); + } + + *scrolling = ele->scrolling_default; + if (*scrolling != NULL) + dom_string_ref(*scrolling); + return DOM_NO_ERR; +} + +/** + * Get the frame_border property + * + * \param ele The dom_html_iframe_element object + * \param content_document The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_iframe_element_get_content_document( + dom_html_iframe_element *ele, + dom_document **content_document) +{ + *content_document = dom_node_get_owner(ele); + return DOM_NO_ERR; +} diff --git a/src/html/html_iframe_element.h b/src/html/html_iframe_element.h index 2e182d5..dafc9e1 100644 --- a/src/html/html_iframe_element.h +++ b/src/html/html_iframe_element.h @@ -3,5 +3,53 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_iframe_element_h_ +#define dom_internal_html_iframe_element_h_ + +#include <dom/html/html_iframe_element.h> +#include "html/html_element.h" + + +struct dom_html_iframe_element { + struct dom_html_element base; + /**< The base class */ + dom_string *scrolling_default; + dom_string *frame_border_default; +}; + +/* Create a dom_html_iframe_element object */ +dom_exception _dom_html_iframe_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_iframe_element **ele); + +/* Initialise a dom_html_iframe_element object */ +dom_exception _dom_html_iframe_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_iframe_element *ele); + +/* Finalise a dom_html_iframe_element object */ +void _dom_html_iframe_element_finalise(struct dom_html_iframe_element *ele); + +/* Destroy a dom_html_iframe_element object */ +void _dom_html_iframe_element_destroy(struct dom_html_iframe_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_iframe_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_iframe_element_destroy(dom_node_internal *node); +dom_exception _dom_html_iframe_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_IFRAME_ELEMENT_PROTECT_VTABLE \ + _dom_html_iframe_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_IFRAME_ELEMENT \ + _dom_virtual_html_iframe_element_destroy, \ + _dom_html_iframe_element_copy + +#endif + diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index ee9298c..304ac29 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -64,6 +64,7 @@ our %special_prefix = ( HTMLTableCaptionElement => "dom_html_table_caption_element", HTMLTableSectionElement => "dom_html_table_section_element", HTMLIsIndexElement => "dom_html_isindex_element", + HTMLIFrameElement => "dom_html_iframe_element", caption => "dom_html_table_caption_element *", section => "dom_html_table_section_element *", createCaption => "dom_html_element *", diff --git a/test/dom1-interfaces.xml b/test/dom1-interfaces.xml index 25d29d8..fc88b80 100644 --- a/test/dom1-interfaces.xml +++ b/test/dom1-interfaces.xml @@ -3667,5 +3667,11 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. <p>Frame width. See the<loc href="http://www.w3.org/TR/REC-html40/present/frames.html#adef-width-IFRAME" form="simple" show="embed" actuate="auto">width attribute definition</loc>in HTML 4.0.</p> </descr> </attribute> +<attribute readonly="yes" type="Document" name="contentDocument" id="contentDoc"> +<descr> +<p/> +</descr> +</attribute> + </interface> </library> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement01.xml b/test/testcases/tests/level1/html/HTMLIFrameElement01.xml new file mode 100644 index 0000000..1280955 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement01.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement01"> +<metadata> +<title>HTMLIFrameElement01</title> +<creator>NIST</creator> +<description> + The align attribute aligns this object(vertically or horizontally with + respect to its surrounding text. + + Retrieve the align attribute of the first IFRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1130..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="valign" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<align interface="HTMLIFrameElement" obj="testNode" var="valign"/> +<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement01.xml.kfail deleted file mode 100644 index 1280955..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement01.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement01"> -<metadata> -<title>HTMLIFrameElement01</title> -<creator>NIST</creator> -<description> - The align attribute aligns this object(vertically or horizontally with - respect to its surrounding text. - - Retrieve the align attribute of the first IFRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1130..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="valign" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<align interface="HTMLIFrameElement" obj="testNode" var="valign"/> -<assertEquals actual="valign" expected='"top"' id="alignLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement02.xml b/test/testcases/tests/level1/html/HTMLIFrameElement02.xml new file mode 100644 index 0000000..c815c67 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement02.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement02"> +<metadata> +<title>HTMLIFrameElement02</title> +<creator>NIST</creator> +<description> + The frameBorder attribute specifies the request for frame borders. + (frameBorder=1 A border is drawn) + (FrameBorder=0 A border is not drawn) + + Retrieve the frameBorder attribute of the first IFRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2246..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vframeborder" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<frameBorder interface="HTMLIFrameElement" obj="testNode" var="vframeborder"/> +<assertEquals actual="vframeborder" expected='"1"' id="frameborderLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement02.xml.kfail deleted file mode 100644 index c815c67..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement02.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement02"> -<metadata> -<title>HTMLIFrameElement02</title> -<creator>NIST</creator> -<description> - The frameBorder attribute specifies the request for frame borders. - (frameBorder=1 A border is drawn) - (FrameBorder=0 A border is not drawn) - - Retrieve the frameBorder attribute of the first IFRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2246..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vframeborder" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<frameBorder interface="HTMLIFrameElement" obj="testNode" var="vframeborder"/> -<assertEquals actual="vframeborder" expected='"1"' id="frameborderLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement03.xml b/test/testcases/tests/level1/html/HTMLIFrameElement03.xml new file mode 100644 index 0000000..3842aa3 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement03.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement03"> +<metadata> +<title>HTMLIFrameElement03</title> +<creator>NIST</creator> +<description> + The height attribute specifies the frame height. + + Retrieve the height attribute of the first IFRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1678118"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vheight" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<height interface="HTMLIFrameElement" obj="testNode" var="vheight"/> +<assertEquals actual="vheight" expected='"50"' id="heightLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement03.xml.kfail deleted file mode 100644 index 3842aa3..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement03.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement03"> -<metadata> -<title>HTMLIFrameElement03</title> -<creator>NIST</creator> -<description> - The height attribute specifies the frame height. - - Retrieve the height attribute of the first IFRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1678118"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vheight" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<height interface="HTMLIFrameElement" obj="testNode" var="vheight"/> -<assertEquals actual="vheight" expected='"50"' id="heightLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement04.xml b/test/testcases/tests/level1/html/HTMLIFrameElement04.xml new file mode 100644 index 0000000..65535fd --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement04.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement04"> +<metadata> +<title>HTMLIFrameElement04</title> +<creator>NIST</creator> +<description> + The longDesc attribute specifies a URI designating a long description + of this image or frame. + + Retrieve the longDesc attribute of the first IFRAME element and examine + its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7047..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlongdesc" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<longDesc interface="HTMLIFrameElement" obj="testNode" var="vlongdesc"/> +<assertEquals actual="vlongdesc" expected='"about:blank"' ignoreCase="false" id="longdescLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement04.xml.kfail deleted file mode 100644 index 65535fd..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement04.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement04"> -<metadata> -<title>HTMLIFrameElement04</title> -<creator>NIST</creator> -<description> - The longDesc attribute specifies a URI designating a long description - of this image or frame. - - Retrieve the longDesc attribute of the first IFRAME element and examine - its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7047..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlongdesc" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<longDesc interface="HTMLIFrameElement" obj="testNode" var="vlongdesc"/> -<assertEquals actual="vlongdesc" expected='"about:blank"' ignoreCase="false" id="longdescLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement05.xml b/test/testcases/tests/level1/html/HTMLIFrameElement05.xml new file mode 100644 index 0000000..5ba9855 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement05.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement05"> +<metadata> +<title>HTMLIFrameElement05</title> +<creator>NIST</creator> +<description> + The marginWidth attribute specifies the frame margin width, in pixels. + + Retrieve the marginWidth attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6648..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vmarginwidth" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<marginWidth interface="HTMLIFrameElement" obj="testNode" var="vmarginwidth"/> +<assertEquals actual="vmarginwidth" expected='"5"' id="marginwidthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement05.xml.kfail deleted file mode 100644 index 5ba9855..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement05.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement05"> -<metadata> -<title>HTMLIFrameElement05</title> -<creator>NIST</creator> -<description> - The marginWidth attribute specifies the frame margin width, in pixels. - - Retrieve the marginWidth attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6648..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vmarginwidth" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<marginWidth interface="HTMLIFrameElement" obj="testNode" var="vmarginwidth"/> -<assertEquals actual="vmarginwidth" expected='"5"' id="marginwidthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement06.xml b/test/testcases/tests/level1/html/HTMLIFrameElement06.xml new file mode 100644 index 0000000..85654d7 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement06.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement06"> +<metadata> +<title>HTMLIFrameElement06</title> +<creator>NIST</creator> +<description> + The marginHeight attribute specifies the frame margin height, in pixels. + + Retrieve the marginHeight attribute of the first IFRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9137..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vmarginheight" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<marginHeight interface="HTMLIFrameElement" obj="testNode" var="vmarginheight"/> +<assertEquals actual="vmarginheight" expected='"10"' id="marginheightLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement06.xml.kfail deleted file mode 100644 index 85654d7..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement06.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement06"> -<metadata> -<title>HTMLIFrameElement06</title> -<creator>NIST</creator> -<description> - The marginHeight attribute specifies the frame margin height, in pixels. - - Retrieve the marginHeight attribute of the first IFRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9137..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vmarginheight" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<marginHeight interface="HTMLIFrameElement" obj="testNode" var="vmarginheight"/> -<assertEquals actual="vmarginheight" expected='"10"' id="marginheightLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement07.xml b/test/testcases/tests/level1/html/HTMLIFrameElement07.xml new file mode 100644 index 0000000..8143aa5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement07.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement07"> +<metadata> +<title>HTMLIFrameElement07</title> +<creator>NIST</creator> +<description> + The name attribute specifies the frame name(object of the target + attribute). + + Retrieve the name attribute of the first IFRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9681..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vname" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<name interface="HTMLIFrameElement" obj="testNode" var="vname"/> +<assertEquals actual="vname" expected='"Iframe1"' id="nameLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement07.xml.kfail deleted file mode 100644 index 8143aa5..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement07.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement07"> -<metadata> -<title>HTMLIFrameElement07</title> -<creator>NIST</creator> -<description> - The name attribute specifies the frame name(object of the target - attribute). - - Retrieve the name attribute of the first IFRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9681..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vname" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<name interface="HTMLIFrameElement" obj="testNode" var="vname"/> -<assertEquals actual="vname" expected='"Iframe1"' id="nameLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement08.xml b/test/testcases/tests/level1/html/HTMLIFrameElement08.xml new file mode 100644 index 0000000..729c1a9 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement08.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement08"> +<metadata> +<title>HTMLIFrameElement08</title> +<creator>NIST</creator> +<description> + The scrolling attribute specifies whether or not the frame should have + scrollbars. + + Retrieve the scrolling attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3636..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vscrolling" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<scrolling interface="HTMLIFrameElement" obj="testNode" var="vscrolling"/> +<assertEquals actual="vscrolling" expected='"yes"' id="scrollingLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement08.xml.kfail deleted file mode 100644 index 729c1a9..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement08.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement08"> -<metadata> -<title>HTMLIFrameElement08</title> -<creator>NIST</creator> -<description> - The scrolling attribute specifies whether or not the frame should have - scrollbars. - - Retrieve the scrolling attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3636..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vscrolling" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<scrolling interface="HTMLIFrameElement" obj="testNode" var="vscrolling"/> -<assertEquals actual="vscrolling" expected='"yes"' id="scrollingLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement09.xml b/test/testcases/tests/level1/html/HTMLIFrameElement09.xml new file mode 100644 index 0000000..e9cc84b --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement09.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement09"> +<metadata> +<title>HTMLIFrameElement09</title> +<creator>NIST</creator> +<description> + The src attribute specifies a URI designating the initial frame contents. + + Retrieve the src attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4393..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsrc" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<src interface="HTMLIFrameElement" obj="testNode" var="vsrc"/> +<assertURIEquals actual="vsrc" name='"right"' id="srcLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement09.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement09.xml.kfail deleted file mode 100644 index e9cc84b..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement09.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement09"> -<metadata> -<title>HTMLIFrameElement09</title> -<creator>NIST</creator> -<description> - The src attribute specifies a URI designating the initial frame contents. - - Retrieve the src attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4393..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsrc" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<src interface="HTMLIFrameElement" obj="testNode" var="vsrc"/> -<assertURIEquals actual="vsrc" name='"right"' id="srcLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement10.xml b/test/testcases/tests/level1/html/HTMLIFrameElement10.xml new file mode 100644 index 0000000..7278bb4 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLIFrameElement10.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement10"> +<metadata> +<title>HTMLIFrameElement10</title> +<creator>NIST</creator> +<description> + The width attribute specifies the frame width. + + Retrieve the width attribute of the first IFRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6713..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vwidth" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="iframe" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<width interface="HTMLIFrameElement" obj="testNode" var="vwidth"/> +<assertEquals actual="vwidth" expected='"60"' id="widthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLIFrameElement10.xml.kfail b/test/testcases/tests/level1/html/HTMLIFrameElement10.xml.kfail deleted file mode 100644 index 7278bb4..0000000 --- a/test/testcases/tests/level1/html/HTMLIFrameElement10.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLIFrameElement10"> -<metadata> -<title>HTMLIFrameElement10</title> -<creator>NIST</creator> -<description> - The width attribute specifies the frame width. - - Retrieve the width attribute of the first IFRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6713..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vwidth" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="iframe" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"iframe"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<width interface="HTMLIFrameElement" obj="testNode" var="vwidth"/> -<assertEquals actual="vwidth" expected='"60"' id="widthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLIFrameElement11.xml b/test/testcases/tests/level2/html/HTMLIFrameElement11.xml new file mode 100644 index 0000000..4220a43 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLIFrameElement11.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLIFrameElement11"> +<metadata> +<title>HTMLIFrameElement11</title> +<creator>NIST</creator> +<description> + Retrieve the contentDocument attribute of the second IFRAME element + and examine its title. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-07-03</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-67133006"/> +</metadata> +<var name="testNode" type="Element"/> +<var name="cd" type="Document" /> +<var name="vtitle" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="iframe2" willBeModified="false"/> +<getElementById interface="Document" obj="doc" var="testNode" elementId='"Iframe2"'/> +<contentDocument interface="HTMLIFrameElement" obj="testNode" var="cd"/> +<title interface="HTMLDocument" obj="cd" var="vtitle"/> +<assertEquals actual="vtitle" expected='"NIST DOM HTML Test - IFRAME2"' id="titleLink" ignoreCase="false" /> +</test> diff --git a/test/testcases/tests/level2/html/HTMLIFrameElement11.xml.kfail b/test/testcases/tests/level2/html/HTMLIFrameElement11.xml.kfail deleted file mode 100644 index c77d2f4..0000000 --- a/test/testcases/tests/level2/html/HTMLIFrameElement11.xml.kfail +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLIFrameElement11"> -<metadata> -<title>HTMLIFrameElement11</title> -<creator>NIST</creator> -<description> - Retrieve the contentDocument attribute of the second IFRAME element - and examine its title. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-07-03</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-67133006"/> -</metadata> -<var name="testNode" type="Element"/> -<var name="cd" type="Document" /> -<var name="vtitle" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="iframe2" willBeModified="false"/> -<getElementById interface="Document" obj="doc" var="testNode" elementId='"Iframe2"'/> -<contentDocument interface="HTMLIFrameElement" obj="testNode" var="cd"/> -<title interface="HTMLDocument" obj="cd" var="vtitle"/> -<assertEquals actual="vtitle" expected='"NIST DOM HTML Test - FRAME"' id="titleLink" ignoreCase="false" /> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=eb735d3cd022b9fc8284... commit eb735d3cd022b9fc8284b2e86570a8db5854d56a Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> Frame Element diff --git a/Makefile b/Makefile index 2de8d0c..4dc8af6 100644 --- a/Makefile +++ b/Makefile @@ -132,6 +132,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frame_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 376ef14..d8245ac 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -91,6 +91,7 @@ #include <dom/html/html_base_element.h> #include <dom/html/html_style_element.h> #include <dom/html/html_frameset_element.h> +#include <dom/html/html_frame_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_frame_element.h b/include/dom/html/html_frame_element.h index 2e182d5..1202f5c 100644 --- a/include/dom/html/html_frame_element.h +++ b/include/dom/html/html_frame_element.h @@ -3,5 +3,68 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_frame_element_h_ +#define dom_html_frame_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +#include <dom/html/html_document.h> +typedef struct dom_html_frame_element dom_html_frame_element; + +dom_exception dom_html_frame_element_get_frame_border( + dom_html_frame_element *element, dom_string **frame_border); + +dom_exception dom_html_frame_element_set_frame_border( + dom_html_frame_element *element, dom_string *frame_border); + +dom_exception dom_html_frame_element_set_long_desc( + dom_html_frame_element *ele, dom_string *long_desc); + +dom_exception dom_html_frame_element_get_long_desc( + dom_html_frame_element *ele, dom_string **long_desc); + +dom_exception dom_html_frame_element_get_margin_height( + dom_html_frame_element *element, dom_string **margin_height); + +dom_exception dom_html_frame_element_set_margin_height( + dom_html_frame_element *element, dom_string *margin_height); + +dom_exception dom_html_frame_element_get_margin_width( + dom_html_frame_element *element, dom_string **margin_width); + +dom_exception dom_html_frame_element_set_margin_width( + dom_html_frame_element *element, dom_string *margin_width); + +dom_exception dom_html_frame_element_get_name( + dom_html_frame_element *element, dom_string **name); + +dom_exception dom_html_frame_element_set_name( + dom_html_frame_element *element, dom_string *name); + +dom_exception dom_html_frame_element_get_scrolling( + dom_html_frame_element *element, dom_string **scrolling); + +dom_exception dom_html_frame_element_set_scrolling( + dom_html_frame_element *element, dom_string *scrolling); + +dom_exception dom_html_frame_element_get_src( + dom_html_frame_element *element, dom_string **src); + +dom_exception dom_html_frame_element_set_src( + dom_html_frame_element *element, dom_string *src); + +dom_exception dom_html_frame_element_set_no_resize(dom_html_frame_element *ele, + bool no_resize); + +dom_exception dom_html_frame_element_get_no_resize(dom_html_frame_element *ele, + bool *no_resize); + +dom_exception dom_html_frame_element_get_content_document( + dom_html_frame_element *ele, + dom_document **content_document); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index a9532cd..fa707d4 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -17,10 +17,11 @@ DIR_SOURCES := \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ - html_table_element.c html_tablerow_element.c html_frameset_element.c + html_table_element.c html_tablerow_element.c html_frameset_element.c \ + html_frame_element.c UNINMPLEMENTED_SOURCES := \ html_isindex_element.c \ - html_frame_element.c html_iframe_element.c + html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document.c b/src/html/html_document.c index a4ba62b..cf8d1aa 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -58,6 +58,7 @@ #include "html/html_tablerow_element.h" #include "html/html_style_element.h" #include "html/html_frameset_element.h" +#include "html/html_frame_element.h" #include "core/attr.h" #include "core/string.h" @@ -369,6 +370,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FRAMESET])) { exc = _dom_html_frame_set_element_create(html, namespace, prefix, (dom_html_frame_set_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FRAME])) { + exc = _dom_html_frame_element_create(html, namespace, prefix, + (dom_html_frame_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 10ec80d..35fca73 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -108,6 +108,7 @@ HTML_DOCUMENT_STRINGS_ACTION1(summary) HTML_DOCUMENT_STRINGS_ACTION1(prompt) HTML_DOCUMENT_STRINGS_ACTION1(rows) HTML_DOCUMENT_STRINGS_ACTION1(cols) +HTML_DOCUMENT_STRINGS_ACTION1(scrolling) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) @@ -120,6 +121,9 @@ HTML_DOCUMENT_STRINGS_ACTION(ch,char) HTML_DOCUMENT_STRINGS_ACTION(ch_off,charoff) HTML_DOCUMENT_STRINGS_ACTION(cell_padding,cellpadding) HTML_DOCUMENT_STRINGS_ACTION(cell_spacing,cellspacing) +HTML_DOCUMENT_STRINGS_ACTION(frame_border,frameborder) +HTML_DOCUMENT_STRINGS_ACTION(margin_height,marginheight) +HTML_DOCUMENT_STRINGS_ACTION(margin_width,marginwidth) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) /* HTML_DOCUMENT_STRINGS_ACTION1(value) */ diff --git a/src/html/html_frame_element.c b/src/html/html_frame_element.c index 2e182d5..16534b5 100644 --- a/src/html/html_frame_element.c +++ b/src/html/html_frame_element.c @@ -3,5 +3,285 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_frame_element.h> + +#include "html/html_document.h" +#include "html/html_frame_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_FRAME_ELEMENT + }, + DOM_HTML_FRAME_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_frame_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_frame_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_frame_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_frame_element object + * + * \param doc The document object + * \param ele The dom_html_frame_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element *ele) +{ + dom_string *scrolling_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "auto", SLEN("auto"), &scrolling_default); + if (err != DOM_NO_ERR) + return err; + + + dom_string *frame_border_default = NULL; + err = dom_string_create((const uint8_t *) "1", SLEN("1"), &frame_border_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_FRAME], + namespace, prefix); + + ele->scrolling_default = scrolling_default; + ele->frame_border_default = frame_border_default; + + return err; +} + +/** + * Finalise a dom_html_frame_element object + * + * \param ele The dom_html_frame_element object + */ +void _dom_html_frame_element_finalise(struct dom_html_frame_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_frame_element object + * + * \param ele The dom_html_frame_element object + */ +void _dom_html_frame_element_destroy(struct dom_html_frame_element *ele) +{ + _dom_html_frame_element_finalise(ele); + free(ele); +} + +/** + * Get the no_resize property + * + * \param ele The dom_html_frame_element object + * \param no_resize The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_no_resize(dom_html_frame_element *ele, + bool *no_resize) +{ + return dom_html_element_get_bool_property(&ele->base, "noresize", + SLEN("noresize"), no_resize); +} + +/** + * Set the no_resize property + * + * \param ele The dom_html_frame_element object + * \param no_resize The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_set_no_resize(dom_html_frame_element *ele, + bool no_resize) +{ + return dom_html_element_set_bool_property(&ele->base, "noresize", + SLEN("noresize"), no_resize); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_frame_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_frame_element_destroy(dom_node_internal *node) +{ + _dom_html_frame_element_destroy((struct dom_html_frame_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_frame_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_frame_element_get_##attr( \ + dom_html_frame_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_frame_element_set_##attr( \ + dom_html_frame_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(long_desc); +SIMPLE_GET_SET(name); +SIMPLE_GET_SET(src); +SIMPLE_SET(frame_border); +SIMPLE_GET_SET(margin_width); +SIMPLE_GET_SET(margin_height); +SIMPLE_SET(scrolling); + + +/** + * Get the frame_border property + * + * \param ele The dom_html_frame_element object + * \param frame_border The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_frame_border( + dom_html_frame_element *ele, + dom_string **frame_border) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_frame_border], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_frame_border], frame_border); + } + + *frame_border = ele->frame_border_default; + if (*frame_border != NULL) + dom_string_ref(*frame_border); + return DOM_NO_ERR; +} + +/** + * Get the frame_border property + * + * \param ele The dom_html_frame_element object + * \param scrolling The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_element_get_scrolling( + dom_html_frame_element *ele, + dom_string **scrolling) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_scrolling], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_scrolling], scrolling); + } + + *scrolling = ele->scrolling_default; + if (*scrolling != NULL) + dom_string_ref(*scrolling); + return DOM_NO_ERR; +} + +dom_exception dom_html_frame_element_get_content_document( + dom_html_frame_element *ele, + dom_document **content_document) +{ + *content_document = dom_node_get_owner(ele); + return DOM_NO_ERR; +} diff --git a/src/html/html_frame_element.h b/src/html/html_frame_element.h index 2e182d5..77a137b 100644 --- a/src/html/html_frame_element.h +++ b/src/html/html_frame_element.h @@ -3,5 +3,52 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_frame_element_h_ +#define dom_internal_html_frame_element_h_ + +#include <dom/html/html_frameset_element.h> +#include "html/html_element.h" + + +struct dom_html_frame_element { + struct dom_html_element base; + /**< The base class */ + dom_string *scrolling_default; + dom_string *frame_border_default; +}; + +/* Create a dom_html_frame_element object */ +dom_exception _dom_html_frame_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element **ele); + +/* Initialise a dom_html_frame_element object */ +dom_exception _dom_html_frame_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_element *ele); + +/* Finalise a dom_html_frame_element object */ +void _dom_html_frame_element_finalise(struct dom_html_frame_element *ele); + +/* Destroy a dom_html_frame_element object */ +void _dom_html_frame_element_destroy(struct dom_html_frame_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_frame_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_frame_element_destroy(dom_node_internal *node); +dom_exception _dom_html_frame_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_FRAME_ELEMENT_PROTECT_VTABLE \ + _dom_html_frame_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_FRAME_ELEMENT \ + _dom_virtual_html_frame_element_destroy, \ + _dom_html_frame_element_copy + +#endif diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 47dcf75..ee9298c 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -82,6 +82,7 @@ our %unref_prefix = ( NamedNodeMap => "dom_namednodemap", NodeList => "dom_nodelist", HTMLCollection => "dom_html_collection", + HTMLDocument => "dom_html_document", ); our %special_method = ( diff --git a/test/dom1-interfaces.xml b/test/dom1-interfaces.xml index 0c2488e..25d29d8 100644 --- a/test/dom1-interfaces.xml +++ b/test/dom1-interfaces.xml @@ -160,6 +160,25 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. </exception> </raises> </method> +<method name="getElementById" id="ID-36113835"> +<descr> +<p>Returns the Element whose<code>id</code>is given by elementId. If no such element exists, returns<code>null</code>. Behavior is not defined if more than one element has this<code>id</code>.</p> +</descr> +<parameters> +<param id="ID-9998411" name="elementId" type="DOMString" attr="in"> +<descr> +<p>The unique<code>id</code>value for an element.</p> +</descr> +</param> +</parameters> +<returns type="Element"> +<descr> +<p>The matching element.</p> +</descr> +</returns> +<raises/> +</method> + <method name="createDocumentFragment" id="ID-35CB04B5"> <descr> <p>Creates an empty<code>DocumentFragment</code>object.</p> @@ -1564,24 +1583,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. </returns> <raises/> </method> -<method name="getElementById" id="ID-36113835"> -<descr> -<p>Returns the Element whose<code>id</code>is given by elementId. If no such element exists, returns<code>null</code>. Behavior is not defined if more than one element has this<code>id</code>.</p> -</descr> -<parameters> -<param id="ID-9998411" name="elementId" type="DOMString" attr="in"> -<descr> -<p>The unique<code>id</code>value for an element.</p> -</descr> -</param> -</parameters> -<returns type="Element"> -<descr> -<p>The matching element.</p> -</descr> -</returns> -<raises/> -</method> <method name="getElementsByName" id="ID-71555259"> <descr> <p>Returns the (possibly empty) collection of elements whose<code>name</code>value is given by<code>elementName</code>.</p> @@ -3606,6 +3607,11 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. <p>A URI designating the initial frame contents. See the<loc href="http://www.w3.org/TR/REC-html40/present/frames.html#adef-src-FRAME" form="simple" show="embed" actuate="auto">src attribute definition</loc>in HTML 4.0.</p> </descr> </attribute> +<attribute readonly="yes" type="Document" name="contentDocument" id="contentDoc"> +<descr> +<p/> +</descr> +</attribute> </interface> <interface name="HTMLIFrameElement" inherits="HTMLElement" id="ID-50708718"> <descr> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement01.xml b/test/testcases/tests/level1/html/HTMLFrameElement01.xml new file mode 100644 index 0000000..e74ef5e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement01.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement01"> +<metadata> +<title>HTMLFrameElement01</title> +<creator>NIST</creator> +<description> + The frameBorder attribute specifies the request for frame borders. + (frameBorder=1 A border is drawn) + (FrameBorder=0 A border is not drawn) + + Retrieve the frameBorder attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1185..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vframeborder" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<frameBorder interface="HTMLFrameElement" obj="testNode" var="vframeborder"/> +<assertEquals actual="vframeborder" expected='"1"' id="frameborderLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail deleted file mode 100644 index e74ef5e..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement01.xml.kfail +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement01"> -<metadata> -<title>HTMLFrameElement01</title> -<creator>NIST</creator> -<description> - The frameBorder attribute specifies the request for frame borders. - (frameBorder=1 A border is drawn) - (FrameBorder=0 A border is not drawn) - - Retrieve the frameBorder attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1185..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vframeborder" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<frameBorder interface="HTMLFrameElement" obj="testNode" var="vframeborder"/> -<assertEquals actual="vframeborder" expected='"1"' id="frameborderLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement02.xml b/test/testcases/tests/level1/html/HTMLFrameElement02.xml new file mode 100644 index 0000000..e6197e7 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement02.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement02"> +<metadata> +<title>HTMLFrameElement02</title> +<creator>NIST</creator> +<description> + The longDesc attribute specifies a URI designating a long description + of this image or frame. + + Retrieve the longDesc attribute of the first FRAME element and examine + its value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836998"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlongdesc" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<longDesc interface="HTMLFrameElement" obj="testNode" var="vlongdesc"/> +<assertEquals actual="vlongdesc" expected='"about:blank"' ignoreCase="false" id="longdescLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail deleted file mode 100644 index e6197e7..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement02.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement02"> -<metadata> -<title>HTMLFrameElement02</title> -<creator>NIST</creator> -<description> - The longDesc attribute specifies a URI designating a long description - of this image or frame. - - Retrieve the longDesc attribute of the first FRAME element and examine - its value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836998"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlongdesc" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<longDesc interface="HTMLFrameElement" obj="testNode" var="vlongdesc"/> -<assertEquals actual="vlongdesc" expected='"about:blank"' ignoreCase="false" id="longdescLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement03.xml b/test/testcases/tests/level1/html/HTMLFrameElement03.xml new file mode 100644 index 0000000..601ad32 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement03.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement03"> +<metadata> +<title>HTMLFrameElement03</title> +<creator>NIST</creator> +<description> + The marginHeight attribute specifies the frame margin height, in pixels. + + Retrieve the marginHeight attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5556..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vmarginheight" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<marginHeight interface="HTMLFrameElement" obj="testNode" var="vmarginheight"/> +<assertEquals actual="vmarginheight" expected='"10"' id="marginheightLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail deleted file mode 100644 index 601ad32..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement03.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement03"> -<metadata> -<title>HTMLFrameElement03</title> -<creator>NIST</creator> -<description> - The marginHeight attribute specifies the frame margin height, in pixels. - - Retrieve the marginHeight attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5556..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vmarginheight" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<marginHeight interface="HTMLFrameElement" obj="testNode" var="vmarginheight"/> -<assertEquals actual="vmarginheight" expected='"10"' id="marginheightLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement04.xml b/test/testcases/tests/level1/html/HTMLFrameElement04.xml new file mode 100644 index 0000000..85a6b3e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement04.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement04"> +<metadata> +<title>HTMLFrameElement04</title> +<creator>NIST</creator> +<description> + The marginWidth attribute specifies the frame margin width, in pixels. + + Retrieve the marginWidth attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8369969"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vmarginwidth" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<marginWidth interface="HTMLFrameElement" obj="testNode" var="vmarginwidth"/> +<assertEquals actual="vmarginwidth" expected='"5"' id="marginwidthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail deleted file mode 100644 index 85a6b3e..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement04.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement04"> -<metadata> -<title>HTMLFrameElement04</title> -<creator>NIST</creator> -<description> - The marginWidth attribute specifies the frame margin width, in pixels. - - Retrieve the marginWidth attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8369969"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vmarginwidth" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<marginWidth interface="HTMLFrameElement" obj="testNode" var="vmarginwidth"/> -<assertEquals actual="vmarginwidth" expected='"5"' id="marginwidthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement05.xml b/test/testcases/tests/level1/html/HTMLFrameElement05.xml new file mode 100644 index 0000000..8df7700 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement05.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement05"> +<metadata> +<title>HTMLFrameElement05</title> +<creator>NIST</creator> +<description> + The name attribute specifies the frame name(object of the target + attribute). + + Retrieve the name attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9112..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vname" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<name interface="HTMLFrameElement" obj="testNode" var="vname"/> +<assertEquals actual="vname" expected='"Frame1"' id="nameLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail deleted file mode 100644 index 8df7700..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement05.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement05"> -<metadata> -<title>HTMLFrameElement05</title> -<creator>NIST</creator> -<description> - The name attribute specifies the frame name(object of the target - attribute). - - Retrieve the name attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9112..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vname" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<name interface="HTMLFrameElement" obj="testNode" var="vname"/> -<assertEquals actual="vname" expected='"Frame1"' id="nameLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement06.xml b/test/testcases/tests/level1/html/HTMLFrameElement06.xml new file mode 100644 index 0000000..43f46e1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement06.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement06"> +<metadata> +<title>HTMLFrameElement06</title> +<creator>NIST</creator> +<description> + The noResize attribute specifies if the user can resize the frame. When + true, forbid user from resizing frame. + + Retrieve the noResize attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8076..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vnoresize" type="boolean" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<noResize interface="HTMLFrameElement" obj="testNode" var="vnoresize"/> +<assertTrue actual="vnoresize" id="noresizeLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail deleted file mode 100644 index 43f46e1..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement06.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement06"> -<metadata> -<title>HTMLFrameElement06</title> -<creator>NIST</creator> -<description> - The noResize attribute specifies if the user can resize the frame. When - true, forbid user from resizing frame. - - Retrieve the noResize attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-8076..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vnoresize" type="boolean" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<noResize interface="HTMLFrameElement" obj="testNode" var="vnoresize"/> -<assertTrue actual="vnoresize" id="noresizeLink"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement07.xml b/test/testcases/tests/level1/html/HTMLFrameElement07.xml new file mode 100644 index 0000000..a7fdea4 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement07.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement07"> +<metadata> +<title>HTMLFrameElement07</title> +<creator>NIST</creator> +<description> + The scrolling attribute specifies whether or not the frame should have + scrollbars. + + Retrieve the scrolling attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4541..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vscrolling" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<scrolling interface="HTMLFrameElement" obj="testNode" var="vscrolling"/> +<assertEquals actual="vscrolling" expected='"yes"' id="scrollingLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail deleted file mode 100644 index a7fdea4..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement07.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement07"> -<metadata> -<title>HTMLFrameElement07</title> -<creator>NIST</creator> -<description> - The scrolling attribute specifies whether or not the frame should have - scrollbars. - - Retrieve the scrolling attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-4541..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vscrolling" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<scrolling interface="HTMLFrameElement" obj="testNode" var="vscrolling"/> -<assertEquals actual="vscrolling" expected='"yes"' id="scrollingLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement08.xml b/test/testcases/tests/level1/html/HTMLFrameElement08.xml new file mode 100644 index 0000000..4b2843a --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameElement08.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement08"> +<metadata> +<title>HTMLFrameElement08</title> +<creator>NIST</creator> +<description> + The src attribute specifies a URI designating the initial frame contents. + + Retrieve the src attribute of the first FRAME element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7879..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vsrc" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frame" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<src interface="HTMLFrameElement" obj="testNode" var="vsrc"/> +<assertURIEquals actual="vsrc" name='"right"' id="srcLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail deleted file mode 100644 index 4b2843a..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameElement08.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameElement08"> -<metadata> -<title>HTMLFrameElement08</title> -<creator>NIST</creator> -<description> - The src attribute specifies a URI designating the initial frame contents. - - Retrieve the src attribute of the first FRAME element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7879..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vsrc" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frame" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frame"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<src interface="HTMLFrameElement" obj="testNode" var="vsrc"/> -<assertURIEquals actual="vsrc" name='"right"' id="srcLink"/> -</test> diff --git a/test/testcases/tests/level2/html/HTMLFrameElement09.xml b/test/testcases/tests/level2/html/HTMLFrameElement09.xml new file mode 100644 index 0000000..9ae0e16 --- /dev/null +++ b/test/testcases/tests/level2/html/HTMLFrameElement09.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE test SYSTEM "dom2.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLFrameElement09"> +<metadata> +<title>HTMLFrameElement09</title> +<creator>NIST</creator> +<description> + The contentDocument attribute specifies the document this frame contains, + if there is any and it is available, or null otherwise. + + Retrieve the contentDocument attribute of the first FRAME element + and examine its TITLE value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-07-03</date> +<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-78799536"/> +</metadata> +<var name="testNode" type="Element"/> +<var name="cd" type="Document" /> +<var name="vtitle" type="DOMString"/> +<var name="doc" type="Document"/> +<load var="doc" href="frame2" willBeModified="false"/> +<getElementById interface="Document" obj="doc" var="testNode" elementId='"Frame1"'/> +<contentDocument interface="HTMLFrameElement" obj="testNode" var="cd"/> +<title interface="HTMLDocument" obj="cd" var="vtitle"/> +<assertEquals actual="vtitle" expected='"NIST DOM HTML Test - FRAME2"' id="titleLink" ignoreCase="false" /> +</test> diff --git a/test/testcases/tests/level2/html/HTMLFrameElement09.xml.kfail b/test/testcases/tests/level2/html/HTMLFrameElement09.xml.kfail deleted file mode 100644 index d6fc5cc..0000000 --- a/test/testcases/tests/level2/html/HTMLFrameElement09.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE test SYSTEM "dom2.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="HTMLFrameElement09"> -<metadata> -<title>HTMLFrameElement09</title> -<creator>NIST</creator> -<description> - The contentDocument attribute specifies the document this frame contains, - if there is any and it is available, or null otherwise. - - Retrieve the contentDocument attribute of the first FRAME element - and examine its TITLE value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-07-03</date> -<subject resource="http://www.w3.org/TR/DOM-Level-2-HTML/html#ID-78799536"/> -</metadata> -<var name="testNode" type="Element"/> -<var name="cd" type="Document" /> -<var name="vtitle" type="DOMString"/> -<var name="doc" type="Document"/> -<load var="doc" href="frame2" willBeModified="false"/> -<getElementById interface="Document" obj="doc" var="testNode" elementId='"Frame1"'/> -<contentDocument interface="HTMLFrameElement" obj="testNode" var="cd"/> -<title interface="HTMLDocument" obj="cd" var="vtitle"/> -<assertEquals actual="vtitle" expected='"NIST DOM HTML Test - FRAMESET"' id="titleLink" ignoreCase="false" /> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=26610a3b631ecf53356c... commit 26610a3b631ecf53356c95fa72ba822b0cb12d86 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> FrameSet Element diff --git a/Makefile b/Makefile index 9b47c36..2de8d0c 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_table_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 68ae227..376ef14 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -90,6 +90,7 @@ #include <dom/html/html_tablerow_element.h> #include <dom/html/html_base_element.h> #include <dom/html/html_style_element.h> +#include <dom/html/html_frameset_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_frameset_element.h b/include/dom/html/html_frameset_element.h index 2e182d5..c0de3b4 100644 --- a/include/dom/html/html_frameset_element.h +++ b/include/dom/html/html_frameset_element.h @@ -3,5 +3,27 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_frame_set_element_h_ +#define dom_html_frame_set_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +typedef struct dom_html_frame_set_element dom_html_frame_set_element; + +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *element, dom_string **rows); + +dom_exception dom_html_frame_set_element_set_rows( + dom_html_frame_set_element *element, dom_string *rows); + +dom_exception dom_html_frame_set_element_set_cols( + dom_html_frame_set_element *ele, dom_string *cols); + +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, dom_string **cols); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 2cb85d9..a9532cd 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -17,10 +17,10 @@ DIR_SOURCES := \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ - html_table_element.c html_tablerow_element.c + html_table_element.c html_tablerow_element.c html_frameset_element.c UNINMPLEMENTED_SOURCES := \ - html_frameset_element.c html_isindex_element.c \ + html_isindex_element.c \ html_frame_element.c html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document.c b/src/html/html_document.c index 0e39f77..a4ba62b 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -57,6 +57,7 @@ #include "html/html_table_element.h" #include "html/html_tablerow_element.h" #include "html/html_style_element.h" +#include "html/html_frameset_element.h" #include "core/attr.h" #include "core/string.h" @@ -365,6 +366,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_STYLE])) { exc = _dom_html_style_element_create(html, (dom_html_style_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FRAMESET])) { + exc = _dom_html_frame_set_element_create(html, namespace, prefix, + (dom_html_frame_set_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 5d5ddaf..10ec80d 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -106,6 +106,8 @@ HTML_DOCUMENT_STRINGS_ACTION1(frame) HTML_DOCUMENT_STRINGS_ACTION1(rules) HTML_DOCUMENT_STRINGS_ACTION1(summary) HTML_DOCUMENT_STRINGS_ACTION1(prompt) +HTML_DOCUMENT_STRINGS_ACTION1(rows) +HTML_DOCUMENT_STRINGS_ACTION1(cols) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) diff --git a/src/html/html_frameset_element.c b/src/html/html_frameset_element.c index 2e182d5..b096156 100644 --- a/src/html/html_frameset_element.c +++ b/src/html/html_frameset_element.c @@ -3,5 +3,234 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> +#include <dom/html/html_frameset_element.h> + +#include "html/html_document.h" +#include "html/html_frameset_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_FRAME_SET_ELEMENT + }, + DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_frame_set_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_frame_set_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_frame_set_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_frame_set_element object + * + * \param doc The document object + * \param ele The dom_html_frame_set_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele) +{ + dom_string *cols_rows_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "100%", SLEN("100%"), &cols_rows_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_FRAMESET], + namespace, prefix); + ele->cols_rows_default = cols_rows_default; + return err; +} + +/** + * Finalise a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele) +{ + _dom_html_frame_set_element_finalise(ele); + free(ele); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_frame_set_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_frame_set_element_destroy(dom_node_internal *node) +{ + _dom_html_frame_set_element_destroy((struct dom_html_frame_set_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_frame_set_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_frame_set_element_get_##attr( \ + dom_html_frame_set_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_frame_set_element_set_##attr( \ + dom_html_frame_set_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_SET(rows); +SIMPLE_SET(cols); + +/** + * Get the rows property + * + * \param ele The dom_html_frame_set_element object + * \param rows The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *ele, + dom_string **rows) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_rows], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_rows], rows); + } + + *rows = ele->cols_rows_default; + if (*rows != NULL) + dom_string_ref(*rows); + + return DOM_NO_ERR; +} + +/** + * Get the cols property + * + * \param ele The dom_html_frame_set_element object + * \param cols The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, + dom_string **cols) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_cols], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_cols], cols); + } + + *cols = ele->cols_rows_default; + if (*cols != NULL) + dom_string_ref(*cols); + return DOM_NO_ERR; +} diff --git a/src/html/html_frameset_element.h b/src/html/html_frameset_element.h index 2e182d5..fd1c255 100644 --- a/src/html/html_frameset_element.h +++ b/src/html/html_frameset_element.h @@ -3,5 +3,51 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_frame_set_element_h_ +#define dom_internal_html_frame_set_element_h_ + +#include <dom/html/html_frameset_element.h> +#include "html/html_element.h" + + +struct dom_html_frame_set_element { + struct dom_html_element base; + /**< The base class */ + dom_string *cols_rows_default; +}; + +/* Create a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele); + +/* Initialise a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele); + +/* Finalise a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele); + +/* Destroy a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_frame_set_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_frame_set_element_destroy(dom_node_internal *node); +dom_exception _dom_html_frame_set_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE \ + _dom_html_frame_set_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_FRAME_SET_ELEMENT \ + _dom_virtual_html_frame_set_element_destroy, \ + _dom_html_frame_set_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml new file mode 100644 index 0000000..18e5ff5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement01"> +<metadata> +<title>HTMLFrameSetElement01</title> +<creator>NIST</creator> +<description> + The cols attribute specifies the number of columns of frames in the + frameset. + + Retrieve the cols attribute of the first FRAMESET element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9886..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcols" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frameset" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<cols interface="HTMLFrameSetElement" obj="testNode" var="vcols"/> +<assertEquals actual="vcols" expected='"20, 80"' id="colsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail deleted file mode 100644 index 18e5ff5..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement01"> -<metadata> -<title>HTMLFrameSetElement01</title> -<creator>NIST</creator> -<description> - The cols attribute specifies the number of columns of frames in the - frameset. - - Retrieve the cols attribute of the first FRAMESET element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-9886..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcols" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frameset" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<cols interface="HTMLFrameSetElement" obj="testNode" var="vcols"/> -<assertEquals actual="vcols" expected='"20, 80"' id="colsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml new file mode 100644 index 0000000..e598cef --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement02"> +<metadata> +<title>HTMLFrameSetElement02</title> +<creator>NIST</creator> +<description> + The rows attribute specifies the number of rows of frames in the + frameset. + + Retrieve the rows attribute of the second FRAMESET element and examine + it's value. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-08</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1973..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vrows" type="DOMString" /> +<var name="doc" type="Document"/> +<load var="doc" href="frameset" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> +<assertSize collection="nodeList" size="2" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<rows interface="HTMLFrameSetElement" obj="testNode" var="vrows"/> +<assertEquals actual="vrows" expected='"100, 200"' id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail deleted file mode 100644 index e598cef..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLFrameSetElement02"> -<metadata> -<title>HTMLFrameSetElement02</title> -<creator>NIST</creator> -<description> - The rows attribute specifies the number of rows of frames in the - frameset. - - Retrieve the rows attribute of the second FRAMESET element and examine - it's value. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-08</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1973..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vrows" type="DOMString" /> -<var name="doc" type="Document"/> -<load var="doc" href="frameset" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"frameset"'/> -<assertSize collection="nodeList" size="2" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<rows interface="HTMLFrameSetElement" obj="testNode" var="vrows"/> -<assertEquals actual="vrows" expected='"100, 200"' id="rowsLink" ignoreCase="false"/> -</test> commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=bf6aa2739d4b65c43986... commit bf6aa2739d4b65c43986b29a2b2c4bbbab061cf5 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> TEST generator bug fix Adding Test Cases & DOMTSHandler fix diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 8953047..47dcf75 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -728,7 +728,7 @@ sub generate_method { $method = to_cmethod($ats{'interface'}, $en); my $cast = to_attribute_cast($ats{'interface'}); my $get_attribute = $node->getAttribute("name"); - my $cast_get_attribute = to_get_attribute_cast($get_attribute); + my $cast_get_attribute = to_get_attribute_cast($get_attribute, $ats{'interface'}); my $ns = $dd->find("parameters/param", $node); my $params = "${cast}$ats{'obj'}"; for ($count = 1; $count <= $ns->size; $count++) { @@ -857,7 +857,7 @@ sub generate_attribute_fetcher { my $fetcher = to_attribute_fetcher($ats{'interface'}, "$en"); my $cast = to_attribute_cast($ats{'interface'}); my $get_attribute = $node->getAttribute("name"); - my $cast_get_attribute = to_get_attribute_cast($get_attribute); + my $cast_get_attribute = to_get_attribute_cast($get_attribute, $ats{'interface'}); my $unref = 0; my $temp_node = 0; # Deal with the situation like @@ -1476,7 +1476,8 @@ sub get_prefix { } sub to_get_attribute_cast { my $type = shift; - my $ret = get_get_attribute_prefix($type); + my $interface = shift; + my $ret = get_get_attribute_prefix($type, $interface); if($ret eq "") { return $ret; } @@ -1486,12 +1487,15 @@ sub to_get_attribute_cast { sub get_get_attribute_prefix { my $type = shift; - - if (exists $special_prefix{$type}) { + my $interface = shift; + if ((($interface eq "HTMLCollection") or ($interface eq "HTMLSelectElement")) and ($type eq "length")) { + $prefix = "uint32_t "; + } elsif (exists $special_prefix{$type}) { $prefix = $special_prefix{$type}; } else { $prefix = ""; } + return $prefix; } # This function remain unsed diff --git a/test/testcases/tests/level1/html/HTMLSelectElement05.xml b/test/testcases/tests/level1/html/HTMLSelectElement05.xml new file mode 100644 index 0000000..16c78e1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement05.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement05"> +<metadata> +<title>HTMLSelectElement05</title> +<creator>NIST</creator> +<description> + The length attribute specifies the number of options in this select. + + Retrieve the length attribute from the first SELECT element and + examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5933486"/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vlength" type="int"/> +<var name="doc" type="Document"/> +<load var="doc" href="select" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<length interface="HTMLSelectElement" obj="testNode" var="vlength"/> +<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken b/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken deleted file mode 100644 index 16c78e1..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement05.xml.int-broken +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement05"> -<metadata> -<title>HTMLSelectElement05</title> -<creator>NIST</creator> -<description> - The length attribute specifies the number of options in this select. - - Retrieve the length attribute from the first SELECT element and - examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-5933486"/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vlength" type="int"/> -<var name="doc" type="Document"/> -<load var="doc" href="select" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<length interface="HTMLSelectElement" obj="testNode" var="vlength"/> -<assertEquals actual="vlength" expected="5" id="lengthLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement16.xml b/test/testcases/tests/level1/html/HTMLSelectElement16.xml new file mode 100644 index 0000000..a5e9422 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement16.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement16"> +<metadata> +<title>HTMLSelectElement16</title> +<creator>Curt Arnold</creator> +<description> +Removes an option using HTMLSelectElement.remove. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<remove interface="HTMLSelectElement" obj="testNode" index="0"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="4" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="-1" id="selected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail deleted file mode 100644 index a5e9422..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement16.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement16"> -<metadata> -<title>HTMLSelectElement16</title> -<creator>Curt Arnold</creator> -<description> -Removes an option using HTMLSelectElement.remove. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<remove interface="HTMLSelectElement" obj="testNode" index="0"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="4" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="-1" id="selected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml b/test/testcases/tests/level1/html/HTMLSelectElement17.xml new file mode 100644 index 0000000..03549ff --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement17.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> +<metadata> +<title>HTMLSelectElement17</title> +<creator>Curt Arnold</creator> +<description> +Removes a non-existant option using HTMLSelectElement.remove. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<remove interface="HTMLSelectElement" obj="testNode" index="6"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail deleted file mode 100644 index 03549ff..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement17.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement17"> -<metadata> -<title>HTMLSelectElement17</title> -<creator>Curt Arnold</creator> -<description> -Removes a non-existant option using HTMLSelectElement.remove. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3340..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<remove interface="HTMLSelectElement" obj="testNode" index="6"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="5" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement18.xml b/test/testcases/tests/level1/html/HTMLSelectElement18.xml new file mode 100644 index 0000000..aff29d9 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement18.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement18"> +<metadata> +<title>HTMLSelectElement18</title> +<creator>Curt Arnold</creator> +<description> +Add a new option at the end of an select using HTMLSelectElement.add. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<var name="newOpt" type="Element"/> +<var name="newOptText" type="Text"/> +<var name="opt" type="Element"/> +<var name="optText" type="Text"/> +<var name="optValue" type="DOMString"/> +<var name="retNode" type="Node"/> +<var name="nullNode" type="Node" isNull="true"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<createElement var="newOpt" obj="doc" tagName='"option"'/> +<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> +<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> +<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="nullNode"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> +<lastChild var="opt" obj="testNode" interface="Node"/> +<firstChild var="optText" obj="opt" interface="Node"/> +<nodeValue var="optValue" obj="optText"/> +<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail deleted file mode 100644 index aff29d9..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement18.xml.kfail +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement18"> -<metadata> -<title>HTMLSelectElement18</title> -<creator>Curt Arnold</creator> -<description> -Add a new option at the end of an select using HTMLSelectElement.add. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<var name="newOpt" type="Element"/> -<var name="newOptText" type="Text"/> -<var name="opt" type="Element"/> -<var name="optText" type="Text"/> -<var name="optValue" type="DOMString"/> -<var name="retNode" type="Node"/> -<var name="nullNode" type="Node" isNull="true"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<createElement var="newOpt" obj="doc" tagName='"option"'/> -<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> -<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> -<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="nullNode"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="0" id="selected" ignoreCase="false"/> -<lastChild var="opt" obj="testNode" interface="Node"/> -<firstChild var="optText" obj="opt" interface="Node"/> -<nodeValue var="optValue" obj="optText"/> -<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement19.xml b/test/testcases/tests/level1/html/HTMLSelectElement19.xml new file mode 100644 index 0000000..5d06fe1 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLSelectElement19.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement19"> +<metadata> +<title>HTMLSelectElement19</title> +<creator>Curt Arnold</creator> +<description> +Add a new option before the selected node using HTMLSelectElement.add. +</description> +<date qualifier="created">2004-03-18</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="doc" type="Document"/> +<var name="optLength" type="int"/> +<var name="selected" type="int"/> +<var name="newOpt" type="Element"/> +<var name="newOptText" type="Text"/> +<var name="opt" type="Node"/> +<var name="optText" type="Text"/> +<var name="optValue" type="DOMString"/> +<var name="retNode" type="Node"/> +<var name="options" type="HTMLCollection"/> +<var name="selectedNode" type="Node"/> +<load var="doc" href="select" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<createElement var="newOpt" obj="doc" tagName='"option"'/> +<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> +<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> +<options var="options" obj="testNode"/> +<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> +<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> +<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> +<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> +<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> +<assertEquals actual="selected" expected="1" id="selected" ignoreCase="false"/> +<options var="options" obj="testNode"/> +<item var="opt" obj="options" index="0" interface="HTMLCollection"/> +<firstChild var="optText" obj="opt" interface="Node"/> +<nodeValue var="optValue" obj="optText"/> +<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail b/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail deleted file mode 100644 index 5d06fe1..0000000 --- a/test/testcases/tests/level1/html/HTMLSelectElement19.xml.kfail +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLSelectElement19"> -<metadata> -<title>HTMLSelectElement19</title> -<creator>Curt Arnold</creator> -<description> -Add a new option before the selected node using HTMLSelectElement.add. -</description> -<date qualifier="created">2004-03-18</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1449..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="doc" type="Document"/> -<var name="optLength" type="int"/> -<var name="selected" type="int"/> -<var name="newOpt" type="Element"/> -<var name="newOptText" type="Text"/> -<var name="opt" type="Node"/> -<var name="optText" type="Text"/> -<var name="optValue" type="DOMString"/> -<var name="retNode" type="Node"/> -<var name="options" type="HTMLCollection"/> -<var name="selectedNode" type="Node"/> -<load var="doc" href="select" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"select"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<createElement var="newOpt" obj="doc" tagName='"option"'/> -<createTextNode var="newOptText" obj="doc" data='"EMP31415"'/> -<appendChild var="retNode" obj="newOpt" newChild="newOptText"/> -<options var="options" obj="testNode"/> -<item var="selectedNode" obj="options" index="0" interface="HTMLCollection"/> -<add interface="HTMLSelectElement" obj="testNode" element="newOpt" before="selectedNode"/> -<length interface="HTMLSelectElement" obj="testNode" var="optLength"/> -<assertEquals actual="optLength" expected="6" id="optLength" ignoreCase="false"/> -<selectedIndex interface="HTMLSelectElement" obj="testNode" var="selected"/> -<assertEquals actual="selected" expected="1" id="selected" ignoreCase="false"/> -<options var="options" obj="testNode"/> -<item var="opt" obj="options" index="0" interface="HTMLCollection"/> -<firstChild var="optText" obj="opt" interface="Node"/> -<nodeValue var="optValue" obj="optText"/> -<assertEquals actual="optValue" expected='"EMP31415"' id="lastValue" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement21.xml b/test/testcases/tests/level1/html/HTMLTableElement21.xml new file mode 100644 index 0000000..b50a007 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement21.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement21"> +<metadata> +<title>HTMLTableElement21</title> +<creator>NIST</creator> +<description> + The deleteTHead() method deletes the header from the table. + + The deleteTHead() method will delete the THEAD Element from the + second TABLE element. First make sure that the THEAD element exists + and then count the number of rows. After the THEAD element is + deleted there should be one less row. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3831..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>3</member> +</var> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<deleteTHead obj="testNode" interface="HTMLTableElement"/> +<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail deleted file mode 100644 index b50a007..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement21.xml.kfail +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement21"> -<metadata> -<title>HTMLTableElement21</title> -<creator>NIST</creator> -<description> - The deleteTHead() method deletes the header from the table. - - The deleteTHead() method will delete the THEAD Element from the - second TABLE element. First make sure that the THEAD element exists - and then count the number of rows. After the THEAD element is - deleted there should be one less row. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-3831..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>3</member> -</var> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<deleteTHead obj="testNode" interface="HTMLTableElement"/> -<tHead interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement24.xml b/test/testcases/tests/level1/html/HTMLTableElement24.xml new file mode 100644 index 0000000..58af66e --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableElement24.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement24"> +<metadata> +<title>HTMLTableElement24</title> +<creator>NIST</creator> +<description> + The deleteTFoot() method deletes the footer from the table. + + The deleteTFoot() method will delete the TFOOT Element from the + second TABLE element. First make sure that the TFOOT element exists + and then count the number of rows. After the TFOOT element is + deleted there should be one less row. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-02</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="rowsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="vsection1" type="HTMLTableSectionElement" /> +<var name="vsection2" type="HTMLTableSectionElement" /> +<var name="vrows" type="int"/> +<var name="doc" type="Document"/> +<var name="result" type="List"/> +<var name="expectedResult" type="List"> +<member>4</member> +<member>3</member> +</var> +<load var="doc" href="table" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> +<assertSize collection="nodeList" size="3" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> +<assertNotNull actual="vsection1" id="vsection1Id"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<deleteTFoot obj="testNode" interface="HTMLTableElement"/> +<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> +<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> +<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> +<append collection="result" item="vrows"/> +<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail b/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail deleted file mode 100644 index 58af66e..0000000 --- a/test/testcases/tests/level1/html/HTMLTableElement24.xml.kfail +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableElement24"> -<metadata> -<title>HTMLTableElement24</title> -<creator>NIST</creator> -<description> - The deleteTFoot() method deletes the footer from the table. - - The deleteTFoot() method will delete the TFOOT Element from the - second TABLE element. First make sure that the TFOOT element exists - and then count the number of rows. After the TFOOT element is - deleted there should be one less row. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-02</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7836..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="rowsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="vsection1" type="HTMLTableSectionElement" /> -<var name="vsection2" type="HTMLTableSectionElement" /> -<var name="vrows" type="int"/> -<var name="doc" type="Document"/> -<var name="result" type="List"/> -<var name="expectedResult" type="List"> -<member>4</member> -<member>3</member> -</var> -<load var="doc" href="table" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"table"'/> -<assertSize collection="nodeList" size="3" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="1"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection1"/> -<assertNotNull actual="vsection1" id="vsection1Id"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<deleteTFoot obj="testNode" interface="HTMLTableElement"/> -<tFoot interface="HTMLTableElement" obj="testNode" var="vsection2"/> -<rows interface="HTMLTableElement" obj="testNode" var="rowsnodeList"/> -<length interface="HTMLCollection" obj="rowsnodeList" var="vrows"/> -<append collection="result" item="vrows"/> -<assertEquals actual="result" expected="expectedResult" id="rowsLink" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml new file mode 100644 index 0000000..f284090 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement11"> +<metadata> +<title>HTMLTableRowElement11</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the first TD element. Invoke the + insertCell() which will create an empty TD cell at the + zero index position. Check the value of the newly created + cell and make sure it is null and also the numbers of cells + should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="0"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail deleted file mode 100644 index f284090..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement11.xml.kfail +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement11"> -<metadata> -<title>HTMLTableRowElement11</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the first TD element. Invoke the - insertCell() which will create an empty TD cell at the - zero index position. Check the value of the newly created - cell and make sure it is null and also the numbers of cells - should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="0"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml new file mode 100644 index 0000000..121954c --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement12"> +<metadata> +<title>HTMLTableRowElement12</title> +<creator>NIST</creator> +<description> + The insertCell() method inserts an empty TD cell into this row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the last TD element. Invoke the + insertCell() which will append the empty cell to the end of the list. + Check the value of the newly created cell and make sure it is null + and also the numbers of cells should now be seven. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="newCell" type="HTMLElement"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"1230 North Ave. Dallas, Texas 98551"' id="value1Link" ignoreCase="false"/> +<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="6"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<assertNull actual="cellNode" id="value2Link"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail deleted file mode 100644 index 121954c..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement12.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement12"> -<metadata> -<title>HTMLTableRowElement12</title> -<creator>NIST</creator> -<description> - The insertCell() method inserts an empty TD cell into this row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the last TD element. Invoke the - insertCell() which will append the empty cell to the end of the list. - Check the value of the newly created cell and make sure it is null - and also the numbers of cells should now be seven. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-6892..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="newCell" type="HTMLElement"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="5"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"1230 North Ave. Dallas, Texas 98551"' id="value1Link" ignoreCase="false"/> -<insertCell interface="HTMLTableRowElement" obj="testNode" var="newCell" index="6"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="7" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="6"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<assertNull actual="cellNode" id="value2Link"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml new file mode 100644 index 0000000..a90f596 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement13"> +<metadata> +<title>HTMLTableRowElement13</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the current row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the first TD element. Invoke the + deleteCell() method which will delete a cell from the current row. + Check the value of the cell at the zero index and also check + the number of cells which should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="0"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Margaret Martin"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail deleted file mode 100644 index a90f596..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement13.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement13"> -<metadata> -<title>HTMLTableRowElement13</title> -<creator>NIST</creator> -<description> - The deleteCell() method deletes a cell from the current row. - - - Retrieve the fourth TR element and examine the value of - the cells length attribute which should be set to six. - Check the value of the first TD element. Invoke the - deleteCell() method which will delete a cell from the current row. - Check the value of the cell at the zero index and also check - the number of cells which should now be five. -</description> -<contributor>Rick Rivello</contributor> -<date qualifier="created">2002-05-06</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="cellsnodeList" type="HTMLCollection"/> -<var name="testNode" type="Node"/> -<var name="trNode" type="Node"/> -<var name="cellNode" type="Node"/> -<var name="value" type="DOMString"/> -<var name="vcells" type="int" /> -<var name="doc" type="Document"/> -<load var="doc" href="tablerow" willBeModified="true"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> -<assertSize collection="nodeList" size="5" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"EMP0001"' id="value1Link" ignoreCase="false"/> -<deleteCell interface="HTMLTableRowElement" obj="testNode" index="0"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> -<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> -<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> -<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> -<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="0"/> -<firstChild interface="Node" obj="trNode" var="cellNode"/> -<nodeValue obj="cellNode" var="value"/> -<assertEquals actual="value" expected='"Margaret Martin"' id="value2Link" ignoreCase="false"/> -</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml new file mode 100644 index 0000000..27af8e2 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLTableRowElement14"> +<metadata> +<title>HTMLTableRowElement14</title> +<creator>NIST</creator> +<description> + The deleteCell() method deletes a cell from the current row. + + + Retrieve the fourth TR element and examine the value of + the cells length attribute which should be set to six. + Check the value of the third(index 2) TD element. Invoke the + deleteCell() method which will delete a cell from the current row. + Check the value of the third cell(index 2) and also check + the number of cells which should now be five. +</description> +<contributor>Rick Rivello</contributor> +<date qualifier="created">2002-05-06</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-1173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="cellsnodeList" type="HTMLCollection"/> +<var name="testNode" type="Node"/> +<var name="trNode" type="Node"/> +<var name="cellNode" type="Node"/> +<var name="value" type="DOMString"/> +<var name="vcells" type="int" /> +<var name="doc" type="Document"/> +<load var="doc" href="tablerow" willBeModified="true"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"tr"'/> +<assertSize collection="nodeList" size="5" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="6" id="cellsLink1" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"Accountant"' id="value1Link" ignoreCase="false"/> +<deleteCell interface="HTMLTableRowElement" obj="testNode" index="2"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="3"/> +<cells interface="HTMLTableRowElement" obj="testNode" var="cellsnodeList"/> +<length interface="HTMLCollection" obj="cellsnodeList" var="vcells"/> +<assertEquals actual="vcells" expected="5" id="cellsLink2" ignoreCase="false"/> +<item interface="HTMLCollection" obj="cellsnodeList" var="trNode" index="2"/> +<firstChild interface="Node" obj="trNode" var="cellNode"/> +<nodeValue obj="cellNode" var="value"/> +<assertEquals actual="value" expected='"56,000"' id="value2Link" ignoreCase="false"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail b/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail deleted file mode 100644 index 27af8e2..0000000 --- a/test/testcases/tests/level1/html/HTMLTableRowElement14.xml.kfail +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xml" type="text/xml"?> - -<!-- - -Copyright (c) 2001 World Wide Web Consortium, -(Massachusetts Institute of Technology, Institut National de -Recherche en Informatique et en Automatique, Keio University). All -Rights Reserved. This program is distributed under the W3C's Software -Intellectual Property License. This program is distributed in the -hope

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits June 2014