From fb0d38d674ccc382ae097c2fe803da7595f02ec7 Mon Sep 17 00:00:00 2001 From: Andrew Sidwell Date: Wed, 25 Jun 2008 14:55:20 +0000 Subject: Implement the "in select in table" insertion mode. svn path=/trunk/hubbub/; revision=4447 --- src/treebuilder/Makefile | 2 +- src/treebuilder/in_select_in_table.c | 60 ++++++++++++++++++++++++++++++++++++ src/treebuilder/modes.h | 4 +++ 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 src/treebuilder/in_select_in_table.c diff --git a/src/treebuilder/Makefile b/src/treebuilder/Makefile index 72c6bab..f2e8e3a 100644 --- a/src/treebuilder/Makefile +++ b/src/treebuilder/Makefile @@ -36,7 +36,7 @@ SRCS_$(d) := treebuilder.c \ initial.c before_html.c before_head.c in_head.c \ in_head_noscript.c after_head.c in_body.c \ in_caption.c in_column_group.c in_table_body.c in_row.c \ - in_cell.c in_select.c \ + in_cell.c in_select.c in_select_in_table.c \ generic_rcdata.c script_collect.c # Append to sources for component diff --git a/src/treebuilder/in_select_in_table.c b/src/treebuilder/in_select_in_table.c new file mode 100644 index 0000000..54b9ab1 --- /dev/null +++ b/src/treebuilder/in_select_in_table.c @@ -0,0 +1,60 @@ +/* + * This file is part of Hubbub. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2008 Andrew Sidwell + */ + +#include +#include + +#include "treebuilder/modes.h" +#include "treebuilder/internal.h" +#include "treebuilder/treebuilder.h" +#include "utils/utils.h" + + +/** + * Handle token in "in select in table" insertion mode + * + * \param treebuilder The treebuilder instance + * \param token The token to handle + * \return True to reprocess token, false otherwise + */ +bool handle_in_select_in_table(hubbub_treebuilder *treebuilder, + const hubbub_token *token) +{ + bool handled = false; + bool reprocess = false; + + if (token->type == HUBBUB_TOKEN_END_TAG || + token->type == HUBBUB_TOKEN_START_TAG) { + element_type type = element_type_from_name(treebuilder, + &token->data.tag.name); + + if (type == CAPTION || type == TABLE || type == TBODY || + type == TFOOT || type == THEAD || type == TR || + type == TD || type == TH) { + /** \todo parse error */ + + handled = true; + + if ((token->type == HUBBUB_TOKEN_END_TAG && + element_in_scope(treebuilder, type, + true)) || + token->type == HUBBUB_TOKEN_START_TAG) { + /** \todo fragment case */ + + element_stack_pop_until(treebuilder, SELECT); + reset_insertion_mode(treebuilder); + reprocess = true; + } + } + } + + if (!handled) { + reprocess = process_in_select(treebuilder, token); + } + + return reprocess; +} diff --git a/src/treebuilder/modes.h b/src/treebuilder/modes.h index 4d53b56..c97e9de 100644 --- a/src/treebuilder/modes.h +++ b/src/treebuilder/modes.h @@ -65,6 +65,8 @@ bool handle_in_cell(hubbub_treebuilder *treebuilder, const hubbub_token *token); bool handle_in_select(hubbub_treebuilder *treebuilder, const hubbub_token *token); +bool handle_in_select_in_table(hubbub_treebuilder *treebuilder, + const hubbub_token *token); bool handle_generic_rcdata(hubbub_treebuilder *treebuilder, const hubbub_token *token); bool handle_script_collect_characters(hubbub_treebuilder *treebuilder, @@ -74,6 +76,8 @@ bool process_in_head(hubbub_treebuilder *treebuilder, const hubbub_token *token); bool process_in_table(hubbub_treebuilder *treebuilder, const hubbub_token *token); +bool process_in_select(hubbub_treebuilder *treebuilder, + const hubbub_token *token); bool process_tag_in_body(hubbub_treebuilder *treebuilder, const hubbub_token *token); -- cgit v1.2.3