diff --git a/Cargo.toml b/Cargo.toml index 5edf9211..d57a0b70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "html5ever" -version = "0.14.0" +version = "0.14.1" authors = [ "The html5ever Project Developers" ] license = "MIT / Apache-2.0" repository = "https://github.com/servo/html5ever" diff --git a/html5lib-tests b/html5lib-tests index 27724be8..c75a9f56 160000 --- a/html5lib-tests +++ b/html5lib-tests @@ -1 +1 @@ -Subproject commit 27724be8d27a1232a8809a55f9c37b69706cb03e +Subproject commit c75a9f566fb18aa9746ca45769763cbaf1430ef1 diff --git a/src/serialize/mod.rs b/src/serialize/mod.rs index 88736fce..28b533ee 100644 --- a/src/serialize/mod.rs +++ b/src/serialize/mod.rs @@ -156,7 +156,7 @@ impl<'wr, Wr: Write> Serializer<'wr, Wr> { let ignore_children = name.ns == ns!(html) && match name.local { local_name!("area") | local_name!("base") | local_name!("basefont") | local_name!("bgsound") | local_name!("br") | local_name!("col") | local_name!("embed") | local_name!("frame") | local_name!("hr") | local_name!("img") - | local_name!("input") | local_name!("keygen") | local_name!("link") | local_name!("menuitem") + | local_name!("input") | local_name!("keygen") | local_name!("link") | local_name!("meta") | local_name!("param") | local_name!("source") | local_name!("track") | local_name!("wbr") => true, _ => false, diff --git a/src/tree_builder/rules.rs b/src/tree_builder/rules.rs index ee6cab9a..0a99ea96 100644 --- a/src/tree_builder/rules.rs +++ b/src/tree_builder/rules.rs @@ -358,9 +358,6 @@ impl TreeBuilderStep tag @ => { self.close_p_element_in_button_scope(); - if self.current_node_named(local_name!("menuitem")) { - self.pop(); - } self.insert_element_for(tag); Done } @@ -623,9 +620,6 @@ impl TreeBuilderStep tag @
=> { self.close_p_element_in_button_scope(); - if self.current_node_named(local_name!("menuitem")) { - self.pop(); - } self.insert_and_pop_element_for(tag); self.frameset_ok = false; DoneAckSelfClosing @@ -686,15 +680,6 @@ impl TreeBuilderStep Done } - tag @ => { - if self.current_node_named(local_name!("menuitem")) { - self.pop(); - } - self.reconstruct_formatting(); - self.insert_element_for(tag); - Done - } - tag @ => { if self.in_scope_named(default_scope, local_name!("ruby")) { self.generate_implied_end(cursory_implied_end); diff --git a/src/tree_builder/tag_sets.rs b/src/tree_builder/tag_sets.rs index f994827b..1ec43792 100644 --- a/src/tree_builder/tag_sets.rs +++ b/src/tree_builder/tag_sets.rs @@ -65,7 +65,7 @@ declare_tag_set!(pub table_row_context = "tr" "template" "html"); declare_tag_set!(pub td_th = "td" "th"); declare_tag_set!(pub cursory_implied_end = - "dd" "dt" "li" "menuitem" "option" "optgroup" "p" "rb" "rp" "rt" "rtc"); + "dd" "dt" "li" "option" "optgroup" "p" "rb" "rp" "rt" "rtc"); declare_tag_set!(pub thorough_implied_end = [cursory_implied_end] + "caption" "colgroup" "tbody" "td" "tfoot" "th" "thead" "tr");