Sync with latest HTML5lib

2007-06-22 03:12:08 -05:00 · 2007-06-22 03:12:08 -05:00 · 8e92e4a3ab
commit 8e92e4a3ab
parent bf572e295f
41 changed files with 1334 additions and 564 deletions
--- a/vendor/plugins/HTML5lib/testdata/encoding/test-yahoo-jp.dat
+++ b/vendor/plugins/HTML5lib/testdata/encoding/test-yahoo-jp.dat
@ -7,4 +7,4 @@
 <meta name="description" content="日本最大級のポータルサイト。検索、オークション、ニュース、メール、コミュニティ、ショッピング、など80以上のサービスを展開。あなたの生活をより豊かにする「ライフ・エンジン」を目指していきます。">
 <style type="text/css" media="all">
 #encoding
-euc-jp
+euc-jp
--- a/vendor/plugins/HTML5lib/testdata/encoding/tests1.dat
+++ b/vendor/plugins/HTML5lib/testdata/encoding/tests1.dat
@ -322,12 +322,14 @@ Windows-1252
 #encoding
 Windows-1252

-#data <!-- 4096 characters xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-->
+#data
+<!-- 4096 characters xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-->
 <meta charset="ISO-8859-9">
 #encoding
 Windows-1252

-#data <!-- 4097 characters xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz-->
+#data
+<!-- 4097 characters xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz-->
 <meta charset="ISO-8859-9">
 #encoding
 Windows-1252
--- a/vendor/plugins/HTML5lib/testdata/sanitizer/tests1.dat
+++ b/vendor/plugins/HTML5lib/testdata/sanitizer/tests1.dat
@ -35,7 +35,7 @@

  {
    "name": "div_background_image_unicode_encoded",
-    "input": "<div style=\"background-image:\a5\a2\006C\0028'\006a\0061\a6\0061\a3\0063\a2\0069\a0\a4\003a\0061\006c\0065\a2\a4\0028.1027\0058.1053\0053\0027\0029'\0029\">foo</div>",
+    "input": "<div style=\"background-image:\u00a5\u00a2\u006C\u0028'\u006a\u0061\u00a6\u0061\u00a3\u0063\u00a2\u0069\u00a0\u00a4\u003a\u0061\u006c\u0065\u00a2\u00a4\u0028.1027\u0058.1053\u0053\u0027\u0029'\u0029\">foo</div>",
    "output": "<div style=''>foo</div>"
  },

@ -48,14 +48,14 @@
  {
    "name": "double_open_angle_brackets",
    "input": "<img src=http://ha.ckers.org/scriptlet.html <",
-    "output": "<img src='http://ha.ckers.org/scriptlet.html'/>&lt;",
+    "output": "<img src='http://ha.ckers.org/scriptlet.html'/>",
    "rexml": "Ill-formed XHTML!"
  },

  {
    "name": "double_open_angle_brackets_2",
    "input": "<script src=http://ha.ckers.org/scriptlet.html <",
-    "output": "&lt;script src=\"http://ha.ckers.org/scriptlet.html\"&gt;&lt;",
+    "output": "&lt;script src=\"http://ha.ckers.org/scriptlet.html\" &lt;=\"\"&gt;",
    "rexml": "Ill-formed XHTML!"
  },

@ -110,7 +110,7 @@
  {
    "name": "no_closing_script_tags",
    "input": "<script src=http://ha.ckers.org/xss.js?<b>",
-    "output": "&lt;script src=\"http://ha.ckers.org/xss.js?\"&gt;<b/>",
+    "output": "&lt;script src=\"http://ha.ckers.org/xss.js?&amp;lt;b\"&gt;",
    "rexml": "Ill-formed XHTML!"
  },

@ -123,7 +123,7 @@

  {
    "name": "non_alpha_non_digit_2",
-    "input": "<a onclick!\#$%&()*~+-_.,:;?@[/|\\]^`=alert(\"XSS\")>foo</a>",
+    "input": "<a onclick!\\#$%&()*~+-_.,:;?@[/|\\]^`=alert(\"XSS\")>foo</a>",
    "output": "<a>foo</a>",
    "rexml": "Ill-formed XHTML!"
  },
@ -137,7 +137,7 @@

  {
    "name": "non_alpha_non_digit_II",
-    "input": "<a href!\#$%&()*~+-_.,:;?@[/|]^`=alert('XSS')>foo</a>",
+    "input": "<a href!\\#$%&()*~+-_.,:;?@[/|]^`=alert('XSS')>foo</a>",
    "output": "<a>foo</a>",
    "rexml": "Ill-formed XHTML!"
  },
@ -351,7 +351,7 @@
  {
    "name": "should_sanitize_script_tag_with_multiple_open_brackets_2",
    "input": "<iframe src=http://ha.ckers.org/scriptlet.html\n<",
-    "output": "&lt;iframe src=\"http://ha.ckers.org/scriptlet.html\"&gt;&lt;",
+    "output": "&lt;iframe src=\"http://ha.ckers.org/scriptlet.html\" &lt;=\"\"&gt;",
    "rexml": "Ill-formed XHTML!"
  },

@ -365,7 +365,7 @@
  {
    "name": "should_sanitize_unclosed_script",
    "input": "<script src=http://ha.ckers.org/xss.js?<b>",
-    "output": "&lt;script src=\"http://ha.ckers.org/xss.js?\"&gt;<b/>",
+    "output": "&lt;script src=\"http://ha.ckers.org/xss.js?&amp;lt;b\"&gt;",
    "rexml": "Ill-formed XHTML!"
  },

--- a/vendor/plugins/HTML5lib/testdata/serializer/core.test
+++ b/vendor/plugins/HTML5lib/testdata/serializer/core.test
@ -7,7 +7,8 @@

 {"description": "proper attribute value non-quoting",
 "input": [["StartTag", "span", {"title": "foo"}]],
- "expected": ["<span title=foo>"]
+ "expected": ["<span title=foo>"],
+ "xhtml":    ["<span title=\"foo\">"]
 },

 {"description": "proper attribute value quoting (with >)",
@ -17,7 +18,8 @@

 {"description": "proper attribute value quoting (with <)",
 "input": [["StartTag", "span", {"title": "foo<bar"}]],
- "expected": ["<span title=\"foo<bar\">"]
+ "expected": ["<span title=\"foo<bar\">"],
+ "xhtml":    ["<span title=\"foo&lt;bar\">"]
 },

 {"description": "proper attribute value quoting (with \")",
@ -67,12 +69,14 @@

 {"description": "void element (as EmptyTag token)",
 "input": [["EmptyTag", "img", {}]],
- "expected": ["<img>"]
+ "expected": ["<img>"],
+ "xhtml":    ["<img />"]
 },

 {"description": "void element (as StartTag token)",
 "input": [["StartTag", "img", {}]],
- "expected": ["<img>"]
+ "expected": ["<img>"],
+ "xhtml":    ["<img />"]
 },

 {"description": "doctype in error",
@ -80,6 +84,17 @@
 "expected": ["<!DOCTYPE foo>"]
 },

+{"description": "character data",
+ "options": {"encoding":"utf-8"},
+ "input": [["Characters", "a<b>c&d"]],
+ "expected": ["a&lt;b&gt;c&amp;d"]
+},
+
+{"description": "rcdata",
+ "input": [["StartTag", "script", {}], ["Characters", "a<b>c&d"]],
+ "expected": ["<script>a<b>c&d"]
+},
+
 {"description": "doctype",
 "input": [["Doctype", "HTML"]],
 "expected": ["<!DOCTYPE HTML>"]
--- a/vendor/plugins/HTML5lib/testdata/serializer/injectmeta.test
+++ b/vendor/plugins/HTML5lib/testdata/serializer/injectmeta.test
@ -9,31 +9,57 @@
 {"description": "empytag head",
 "options": {"inject_meta_charset": true, "encoding":"utf-8"},
 "input": [["EmptyTag", "head", {}]],
- "expected": ["<head><meta charset=utf-8>"]
+ "expected": ["<head><meta charset=utf-8>"],
+ "xhtml":    ["<head><meta charset=\"utf-8\" /></head>"]
 },

 {"description": "head w/title",
 "options": {"inject_meta_charset": true, "encoding":"utf-8"},
 "input": [["StartTag", "head", {}], ["StartTag","title",{}], ["Characters", "foo"],["EndTag", "title"], ["EndTag", "head"]],
- "expected": ["<head><meta charset=utf-8><title>foo</title>"]
+ "expected": ["<head><meta charset=utf-8><title>foo</title>"],
+ "xhtml":    ["<head><meta charset=\"utf-8\" /><title>foo</title></head>"]
 },

 {"description": "head w/meta-charset",
 "options": {"inject_meta_charset": true, "encoding":"utf-8"},
 "input": [["StartTag", "head", {}], ["EmptyTag","meta",{"charset":"ascii"}], ["EndTag", "head"]],
- "expected": ["<head><meta charset=utf-8>"]
+ "expected": ["<head><meta charset=utf-8>"],
+ "xhtml":    ["<head><meta charset=\"utf-8\" /></head>"]
+},
+
+{"description": "head w/ two meta-charset",
+ "options": {"inject_meta_charset": true, "encoding":"utf-8"},
+ "input": [["StartTag", "head", {}], ["EmptyTag","meta",{"charset":"ascii"}], ["EmptyTag","meta",{"charset":"ascii"}], ["EndTag", "head"]],
+ "expected": ["<head><meta charset=utf-8><meta charset=utf-8>", "<head><meta charset=utf-8><meta charset=ascii>"],
+ "xhtml": ["<head><meta charset=\"utf-8\" /><meta charset=\"utf-8\" /></head>", "<head><meta charset=\"utf-8\" /><meta charset=\"ascii\" /></head>"]
 },

 {"description": "head w/robots",
 "options": {"inject_meta_charset": true, "encoding":"utf-8"},
 "input": [["StartTag", "head", {}], ["EmptyTag","meta",{"name":"robots","content":"noindex"}], ["EndTag", "head"]],
- "expected": ["<head><meta charset=utf-8><meta content=noindex name=robots>"]
+ "expected": ["<head><meta charset=utf-8><meta content=noindex name=robots>"],
+ "xhtml":    ["<head><meta charset=\"utf-8\" /><meta content=\"noindex\" name=\"robots\" /></head>"]
 },

 {"description": "head w/robots & charset",
 "options": {"inject_meta_charset": true, "encoding":"utf-8"},
 "input": [["StartTag", "head", {}], ["EmptyTag","meta",{"name":"robots","content":"noindex"}], ["EmptyTag","meta",{"charset":"ascii"}], ["EndTag", "head"]],
- "expected": ["<head><meta content=noindex name=robots><meta charset=utf-8>"]
+ "expected": ["<head><meta content=noindex name=robots><meta charset=utf-8>"],
+ "xhtml":    ["<head><meta content=\"noindex\" name=\"robots\" /><meta charset=\"utf-8\" /></head>"]
+},
+
+{"description": "head w/ charset in http-equiv content-type",
+ "options": {"inject_meta_charset": true, "encoding":"utf-8"},
+ "input": [["StartTag", "head", {}], ["EmptyTag","meta",{"http-equiv":"content-type", "content":"text/html; charset=ascii"}], ["EndTag", "head"]],
+ "expected": ["<head><meta content=\"text/html; charset=utf-8\" http-equiv=content-type>"],
+ "xhtml":    ["<head><meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\" /></head>"]
+},
+
+{"description": "head w/robots & charset in http-equiv content-type",
+ "options": {"inject_meta_charset": true, "encoding":"utf-8"},
+ "input": [["StartTag", "head", {}], ["EmptyTag","meta",{"name":"robots","content":"noindex"}], ["EmptyTag","meta",{"http-equiv":"content-type", "content":"text/html; charset=ascii"}], ["EndTag", "head"]],
+ "expected": ["<head><meta content=noindex name=robots><meta content=\"text/html; charset=utf-8\" http-equiv=content-type>"],
+ "xhtml": ["<head><meta content=\"noindex\" name=\"robots\" /><meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\" /></head>"]
 }

 ]}
--- a/vendor/plugins/HTML5lib/testdata/serializer/options.test
+++ b/vendor/plugins/HTML5lib/testdata/serializer/options.test
@ -9,13 +9,15 @@
 {"description": "quote_attr_values=true",
 "options": {"quote_attr_values": true},
 "input": [["StartTag", "button", {"disabled": "disabled"}]],
- "expected": ["<button disabled>"]
+ "expected": ["<button disabled>"],
+ "xhtml":    ["<button disabled=\"disabled\">"]
 },

 {"description": "quote_attr_values=true with irrelevant",
 "options": {"quote_attr_values": true},
 "input": [["StartTag", "div", {"irrelevant": "irrelevant"}]],
- "expected": ["<div irrelevant>"]
+ "expected": ["<div irrelevant>"],
+ "xhtml":    ["<div irrelevant=\"irrelevant\">"]
 },

 {"description": "use_trailing_solidus=true with void element",
@ -33,13 +35,20 @@
 {"description": "minimize_boolean_attributes=false",
 "options": {"minimize_boolean_attributes": false},
 "input": [["StartTag", "div", {"irrelevant": "irrelevant"}]],
- "expected": ["<div irrelevant=irrelevant>"]
+ "expected": ["<div irrelevant=irrelevant>"],
+ "xhtml":    ["<div irrelevant=\"irrelevant\">"]
 },

 {"description": "minimize_boolean_attributes=false with empty value",
 "options": {"minimize_boolean_attributes": false},
 "input": [["StartTag", "div", {"irrelevant": ""}]],
 "expected": ["<div irrelevant=\"\">"]
+},
+
+{"description": "escape less than signs in attribute values",
+ "options": {"escape_lt_in_attrs": true},
+ "input": [["StartTag", "a", {"title": "a<b>c&d"}]],
+ "expected": ["<a title=\"a&lt;b>c&amp;d\">"]
 }

 ]}
--- a/vendor/plugins/HTML5lib/testdata/tokenizer/contentModelFlags.test
+++ b/vendor/plugins/HTML5lib/testdata/tokenizer/contentModelFlags.test
@ -15,7 +15,7 @@
 "contentModelFlags":["RCDATA", "CDATA"],
 "lastStartTag":"baz",
 "input":"</foo>bar</baz>",
-"output":["ParseError", ["Character", "</foo>bar"], ["EndTag", "baz"]]},
+"output":[["Character", "</foo>bar"], ["EndTag", "baz"]]},

 {"description":"End tag closing RCDATA or CDATA, switching back to PCDATA",
 "contentModelFlags":["RCDATA", "CDATA"],
--- a/vendor/plugins/HTML5lib/testdata/tokenizer/escapeFlag.test
+++ b/vendor/plugins/HTML5lib/testdata/tokenizer/escapeFlag.test
@ -0,0 +1,21 @@
+{"tests": [
+
+{"description":"Commented close tag in [R]CDATA",
+"contentModelFlags":["RCDATA", "CDATA"],
+"lastStartTag":"bar",
+"input":"foo<!--</bar>--></bar>",
+"output":[["Character", "foo<!--</bar>-->"], ["EndTag", "bar"]]},
+
+{"description":"Bogus comment in [R]CDATA",
+"contentModelFlags":["RCDATA", "CDATA"],
+"lastStartTag":"bar",
+"input":"foo<!-->baz</bar>",
+"output":[["Character", "foo<!-->baz"], ["EndTag", "bar"]]},
+
+{"description":"End tag surrounded by bogus comment in [R]CDATA",
+"contentModelFlags":["RCDATA", "CDATA"],
+"lastStartTag":"bar",
+"input":"foo<!--></bar><!-->baz</bar>",
+"output":[["Character", "foo<!-->"], ["EndTag", "bar"], "ParseError", ["Comment", ""], ["Character", "baz"], ["EndTag", "bar"]]}
+
+]}
--- a/vendor/plugins/HTML5lib/testdata/tokenizer/test1.test
+++ b/vendor/plugins/HTML5lib/testdata/tokenizer/test1.test
@ -2,15 +2,15 @@

 {"description":"Correct Doctype lowercase",
 "input":"<!DOCTYPE html>",
-"output":[["DOCTYPE", "HTML", false]]},
+"output":[["DOCTYPE", "html", null, null, true]]},

 {"description":"Correct Doctype uppercase",
-"input":"<!DOCTYPE HTML>", 
-"output":[["DOCTYPE", "HTML", false]]},
+"input":"<!DOCTYPE HTML>",
+"output":[["DOCTYPE", "HTML", null, null, true]]},

 {"description":"Correct Doctype mixed case",
 "input":"<!DOCTYPE HtMl>", 
-"output":[["DOCTYPE", "HTML", false]]},
+"output":[["DOCTYPE", "HtMl", null, null, true]]},

 {"description":"Truncated doctype start",
 "input":"<!DOC>", 
@ -18,7 +18,7 @@

 {"description":"Doctype in error",
 "input":"<!DOCTYPE foo>", 
-"output":[["DOCTYPE", "FOO", true]]},
+"output":[["DOCTYPE", "foo", null, null, true]]},

 {"description":"Single Start Tag",
 "input":"<h>",
@ -84,17 +84,38 @@
 "input":"<!-",
 "output":["ParseError", ["Comment", "-"]]},

-{"description":"Ampersand only",
+{"description":"Short comment",
+ "input":"<!-->",
+ "output":["ParseError", ["Comment", ""]]},
+
+{"description":"Short comment two",
+ "input":"<!--->",
+ "output":["ParseError", ["Comment", ""]]},
+
+{"description":"Short comment three",
+ "input":"<!---->",
+ "output":[["Comment", ""]]},
+
+
+{"description":"Ampersand EOF",
 "input":"&",
-"output":["ParseError", ["Character", "&"]]},
+"output":[["Character", "&"]]},
+
+{"description":"Ampersand ampersand EOF",
+"input":"&&",
+"output":[["Character", "&&"]]},
+
+{"description":"Ampersand space EOF",
+"input":"& ",
+"output":[["Character", "& "]]},

 {"description":"Unfinished entity",
 "input":"&f",
-"output":["ParseError", ["Character", "&"], ["Character", "f"]]},
+"output":["ParseError", ["Character", "&f"]]},

 {"description":"Ampersand, number sign",
 "input":"&#",
-"output":["ParseError", ["Character", "&"], ["Character", "#"]]},
+"output":["ParseError", ["Character", "&#"]]},

 {"description":"Unfinished numeric entity",
 "input":"&#x",
@ -110,8 +131,7 @@

 {"description":"Entity without trailing semicolon (1)",
 "input":"I'm &notit",
-"output":[["Character","I'm "], "ParseError", ["Character", "¬"],
-["Character", "it"]]},
+"output":[["Character","I'm "], "ParseError", ["Character", "¬it"]]},

 {"description":"Entity without trailing semicolon (2)",
 "input":"I'm &notin",
--- a/vendor/plugins/HTML5lib/testdata/tokenizer/test2.test
+++ b/vendor/plugins/HTML5lib/testdata/tokenizer/test2.test
@ -1,24 +1,44 @@
 {"tests": [

-{"description":"Doctype without a name",
+{"description":"DOCTYPE without name",
 "input":"<!DOCTYPE>",
-"output":["ParseError", "ParseError", ["DOCTYPE", "", true]]},
+"output":["ParseError", "ParseError", ["DOCTYPE", "", null, null, false]]},

-{"description":"Correct doctype without a space before name",
+{"description":"DOCTYPE without space before name",
 "input":"<!DOCTYPEhtml>",
-"output":["ParseError", ["DOCTYPE", "HTML", false]]},
+"output":["ParseError", ["DOCTYPE", "html", null, null, true]]},

-{"description":"Incorrect doctype without a space before name",
+{"description":"Incorrect DOCTYPE without a space before name",
 "input":"<!DOCTYPEfoo>",
-"output":["ParseError", ["DOCTYPE", "FOO", true]]},
+"output":["ParseError", ["DOCTYPE", "foo", null, null, true]]},

-{"description":"Bogus doctype",
+{"description":"DOCTYPE with publicId",
 "input":"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML Transitional 4.01//EN\">",
-"output":["ParseError", ["DOCTYPE", "HTML", true]]},
+"output":[["DOCTYPE", "html", "-//W3C//DTD HTML Transitional 4.01//EN", null, true]]},
+
+{"description":"DOCTYPE with EOF after PUBLIC",
+"input":"<!DOCTYPE html PUBLIC",
+"output":["ParseError", ["DOCTYPE", "html", null, null, false]]},
+
+{"description":"DOCTYPE with EOF after PUBLIC '",
+"input":"<!DOCTYPE html PUBLIC '",
+"output":["ParseError", ["DOCTYPE", "html", "", null, false]]},
+
+{"description":"DOCTYPE with EOF after PUBLIC 'x",
+"input":"<!DOCTYPE html PUBLIC 'x",
+"output":["ParseError", ["DOCTYPE", "html", "x", null, false]]},
+
+{"description":"DOCTYPE with systemId",
+"input":"<!DOCTYPE html SYSTEM \"-//W3C//DTD HTML Transitional 4.01//EN\">",
+"output":[["DOCTYPE", "html", null, "-//W3C//DTD HTML Transitional 4.01//EN", true]]},
+
+{"description":"DOCTYPE with publicId and systemId",
+"input":"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML Transitional 4.01//EN\" \"-//W3C//DTD HTML Transitional 4.01//EN\">",
+"output":[["DOCTYPE", "html", "-//W3C//DTD HTML Transitional 4.01//EN", "-//W3C//DTD HTML Transitional 4.01//EN", true]]},

 {"description":"Incomplete doctype",
 "input":"<!DOCTYPE html ",
-"output":["ParseError", ["DOCTYPE", "HTML", true]]},
+"output":["ParseError", ["DOCTYPE", "html", null, null, false]]},

 {"description":"Numeric entity representing the NUL character",
 "input":"&#0000;",
@ -30,19 +50,19 @@

 {"description":"Numeric entity representing a codepoint after 1114111 (U+10FFFF)",
 "input":"&#2225222;",
-"output":["ParseError", ["Character", "\uFFFD"]]},
+"output":[["Character", "\uFFFD"]]},

 {"description":"Hexadecimal entity representing a codepoint after 1114111 (U+10FFFF)",
 "input":"&#x1010FFFF;",
-"output":["ParseError", ["Character", "\uFFFD"]]},
+"output":[["Character", "\uFFFD"]]},

 {"description":"Numeric entity representing a Windows-1252 'codepoint'",
 "input":"&#137;",
-"output":[["Character", "\u2030"]]},
+"output":["ParseError", ["Character", "\u2030"]]},

 {"description":"Hexadecimal entity representing a Windows-1252 'codepoint'",
 "input":"&#x89;",
-"output":[["Character", "\u2030"]]},
+"output":["ParseError", ["Character", "\u2030"]]},

 {"description":"Hexadecimal entity with mixed uppercase and lowercase",
 "input":"&#xaBcD;",
@ -58,7 +78,7 @@

 {"description":"StartTag containing <",
 "input":"<a<b>",
-"output":["ParseError", ["StartTag", "a", { }], ["StartTag", "b", { }]]},
+"output":[["StartTag", "a<b", { }]]},

 {"description":"Non-void element containing trailing /",
 "input":"<h/>",
--- a/vendor/plugins/HTML5lib/testdata/tree-construction/tests1.dat
+++ b/vendor/plugins/HTML5lib/testdata/tree-construction/tests1.dat
@ -226,7 +226,6 @@ Line1<br>Line2<br>Line3<br>Line4
 <h1>Hello<h2>World
 #errors
 4: missing document type declaration
-13: h2 element start tag implying h1 element end tag
 19: mismatched body element end tag (premature end of file?)
 #document
 | <html>
@ -234,8 +233,8 @@ Line1<br>Line2<br>Line3<br>Line4
 |   <body>
 |     <h1>
 |       "Hello"
-|     <h2>
-|       "World"
+|       <h2>
+|         "World"

 #data
 <a><p>X<a>Y</a>Z</p></a>
@ -307,13 +306,18 @@ Line1<br>Line2<br>Line3<br>Line4
 #data
 <!--><div>--<!-->
 #errors
-13: unexpected character after two '-' characters while parsing comment
-18: missing document type declaration
+Incorrect comment token
+Missing document type declaration
+Incorrect comment token
+Unexpected end of file
 #document
-| <!-- ><div>--<! -->
+| <!--  -->
 | <html>
 |   <head>
 |   <body>
+|     <div>
+|       "--"
+|       <!--  -->

 #data
 <p><hr></p>
@ -638,10 +642,10 @@ Line1<br>Line2<br>Line3<br>Line4
 | <html>
 |   <head>
 |     <script>
-|       " <!-- "
+|       " <!-- </script> --> "
 |     " "
 |   <body>
-|     "-->  EOF"
+|     "EOF"

 #data
 <b><p></b>TEST
@ -1248,15 +1252,13 @@ Line1<br>Line2<br>Line3<br>Line4
 #data
 <style><!--</style><meta><script>--><link></script>
 #errors
-7: missing document type declaration
+missing document type declaration
+unexpected EOF
 #document
 | <html>
 |   <head>
 |     <style>
-|       "<!--"
-|     <meta>
-|     <script>
-|       "--><link>"
+|       "<!--</style><meta><script>--><link></script>"
 |   <body>

 #data
@ -1305,12 +1307,12 @@ Line1<br>Line2<br>Line3<br>Line4
 #document
 | <html>
 |   <head>
-|     <base>
-|     <link>
-|     <meta>
 |     <title>
 |       "<p>"
 |   <body>
+|     <base>
+|     <link>
+|     <meta>
 |     <p>

 #data
@ -1381,12 +1383,11 @@ Line1<br>Line2<br>Line3<br>Line4
 6: missing document type declaration
 19: unexpected node at end of document
 19: unexpected node after body element end tag
-19: meta element start tag out of place
 #document
 | <html>
 |   <head>
-|     <meta>
 |   <body>
+|     <meta>
 |     <p>

 #data
@ -1430,14 +1431,13 @@ Line1<br>Line2<br>Line3<br>Line4
 <h1><h2>
 #errors
 4: missing document type declaration
-8: h2 element start tag implying h1 element end tag
 9: mismatched body element end tag (premature end of file?)
 #document
 | <html>
 |   <head>
 |   <body>
 |     <h1>
-|     <h2>
+|       <h2>

 #data
 <a><p><a></a></p></a>
@ -1630,8 +1630,7 @@ Line1<br>Line2<br>Line3<br>Line4
 4: missing document type declaration
 15: required tr element start tag implied by unexpected td element start tag
 27: unexpected td element end tag implied other end tags
-31: h3 element start tag implying h1 element end tag
-36: mismatched h1 element end tag
+Unexpected EOF
 #document
 | <html>
 |   <head>
@ -1642,7 +1641,7 @@ Line1<br>Line2<br>Line3<br>Line4
 |           <tr>
 |             <td>
 |               <h3>
-|     <h3>
+|       <h3>

 #data
 <table><colgroup><col><colgroup><col><col><col><colgroup><col><col><thead><tr><td></table>
@ -1807,6 +1806,7 @@ Line1<br>Line2<br>Line3<br>Line4
 | <html>
 |   <head>
 |   <body>
+|     <br>

 #data
 <table><tr></strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
@ -1924,6 +1924,7 @@ Line1<br>Line2<br>Line3<br>Line4
 | <html>
 |   <head>
 |   <body>
+|     <br>
 |     <table>
 |       <tbody>
 |         <tr>
--- a/vendor/plugins/HTML5lib/testdata/tree-construction/tests2.dat
+++ b/vendor/plugins/HTML5lib/testdata/tree-construction/tests2.dat
@ -1,5 +1,5 @@
 #data
-<!doctype html>Test
+<!DOCTYPE HTML>Test
 #errors
 #document
 | <!DOCTYPE HTML>
@ -63,7 +63,7 @@ frame element can't occur here
 |     "test"

 #data
-<!doctype html><frameset>test
+<!DOCTYPE HTML><frameset>test
 #errors
 frameset can't contain text
 Unexpected end of file
@ -74,7 +74,7 @@ Unexpected end of file
 |   <frameset>

 #data
-<!doctype html><frameset><!doctype html>
+<!DOCTYPE HTML><frameset><!DOCTYPE HTML>
 #errors
 document type declaration can only occur at the start of a document
 Expected end tag </frameset>
@ -85,7 +85,7 @@ Expected end tag </frameset>
 |   <frameset>

 #data
-<!doctype html><font><p><b>test</font>
+<!DOCTYPE HTML><font><p><b>test</font>
 #errors
 #document
 | <!DOCTYPE HTML>
@ -99,7 +99,7 @@ Expected end tag </frameset>
 |           "test"

 #data
-<!DOCTYPE htmL><dt><div><dd>
+<!DOCTYPE HTML><dt><div><dd>
 #errors
 #document
 | <!DOCTYPE HTML>
@ -151,7 +151,7 @@ Unexpected end of file.
 |       "</plaintext>"

 #data
-<!doctype html><table><tr>TEST
+<!DOCTYPE HTML><table><tr>TEST
 #errors
 TEST can't occur in <tr>
 Unexpected end of file.
@ -166,7 +166,7 @@ Unexpected end of file.
 |         <tr>

 #data
-<!doctype html><body t1=1><body t2=2><body t3=3 t4=4>
+<!DOCTYPE HTML><body t1=1><body t2=2><body t3=3 t4=4>
 #errors
 Unexpected start tag "body"
 Unexpected start tag "body"
@ -193,21 +193,18 @@ Unexpected end tag.
 |   <body>

 #data
-<!doctype HtML></b test<b &=&amp>X
+<!DOCTYPE HTML></b test<b &=&amp>X
 #errors
 Unexpected < in attribute
 End tag contains attributes.
 Unexpected end tag.
 Named entity didn't end with ;
-Unexpected EOF. Missing closing tag.
 #document
 | <!DOCTYPE HTML>
 | <html>
 |   <head>
 |   <body>
-|     <b>
-|       &="&"
-|       "X"
+|     "X"

 #data
 <!doctypehtml><scrIPt type=text/x-foobar;baz>X</SCRipt
@ -215,7 +212,7 @@ Unexpected EOF. Missing closing tag.
 No space after literal DOCTYPE.
 Unexpected EOF in (end) tag name
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE html>
 | <html>
 |   <head>
 |     <script>
@ -294,7 +291,7 @@ Unfinished named entity.
 #errors
 No space after literal DOCTYPE.
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE html>
 | <html>
 |   <head>
 |   <body>
@ -302,7 +299,7 @@ No space after literal DOCTYPE.
 |     <li>

 #data
-<!doctypehtml><p><dt>
+<!doctypeHTML><p><dt>
 #errors
 No space after literal DOCTYPE.
 #document
@ -314,11 +311,11 @@ No space after literal DOCTYPE.
 |     <dt>

 #data
-<!doctypehtml><p><dd>
+<!doctypehtmL><p><dd>
 #errors
 No space after literal DOCTYPE.
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htmL>
 | <html>
 |   <head>
 |   <body>
@ -331,7 +328,7 @@ No space after literal DOCTYPE.
 No space after literal DOCTYPE.
 Unexpected EOF.
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE html>
 | <html>
 |   <head>
 |   <body>
@ -339,7 +336,7 @@ Unexpected EOF.
 |     <form>

 #data
-<!doctype html><p><b><i><u></p> <p>X
+<!DOCTYPE HTML><p><b><i><u></p> <p>X
 #errors
 Unexpected end tag </p>.
 Unexpected end EOF. Missing closing tags.
@ -360,7 +357,7 @@ Unexpected end EOF. Missing closing tags.
 |             "X"

 #data
-<!doctype html><p></P>X
+<!DOCTYPE HTML><p></P>X
 #errors
 #document
 | <!DOCTYPE HTML>
@ -393,7 +390,7 @@ Invalid entity.
 |     "&AMp;"

 #data
-<!doctype html><html><head></head><body><thisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY>
+<!DOCTYPE HTML><html><head></head><body><thisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY>
 #errors
 Unexpected end of file.
 #document
@ -404,7 +401,7 @@ Unexpected end of file.
 |     <thisisasillytestelementnametomakesurecrazytagnamesareparsedcorrectly>

 #data
-<!doctype html>X</body>X
+<!DOCTYPE HTML>X</body>X
 #errors
 Unexpected non-space characters in the after body phase.
 #document
@ -415,7 +412,7 @@ Unexpected non-space characters in the after body phase.
 |     "XX"

 #data
-<!doctype html><!-- X
+<!DOCTYPE HTML><!-- X
 #errors
 Unexpected end of file in comment.
 #document
@ -426,7 +423,7 @@ Unexpected end of file in comment.
 |   <body>

 #data
-<!doctype html><table><caption>test TEST</caption><td>test
+<!DOCTYPE HTML><table><caption>test TEST</caption><td>test
 #errors
 Unexpected <td> in table body phase.
 Unexpected end of file.
@ -444,7 +441,7 @@ Unexpected end of file.
 |             "test"

 #data
-<!doctype html><select><option><optgroup>
+<!DOCTYPE HTML><select><option><optgroup>
 #errors
 Unexpected end of file. Missing closing tags.
 #document
@ -457,7 +454,7 @@ Unexpected end of file. Missing closing tags.
 |       <optgroup>

 #data
-<!doctype html><select><optgroup><option></optgroup><option><select><option>
+<!DOCTYPE HTML><select><optgroup><option></optgroup><option><select><option>
 #errors
 Unexpected start tag <select> in <select>.
 Unexpected start tag <option>.
@ -472,7 +469,7 @@ Unexpected start tag <option>.
 |       <option>

 #data
-<!doctype html><select><optgroup><option><optgroup>
+<!DOCTYPE HTML><select><optgroup><option><optgroup>
 #errors
 Unexpected end of file. Missing closing tags.
 #document
@ -486,7 +483,7 @@ Unexpected end of file. Missing closing tags.
 |       <optgroup>

 #data
-<!doctype html><font><input><input></font>
+<!DOCTYPE HTML><font><input><input></font>
 #errors
 #document
 | <!DOCTYPE HTML>
@ -498,7 +495,7 @@ Unexpected end of file. Missing closing tags.
 |       <input>

 #data
-<!DoctypE html><!-- XXX - XXX -->
+<!DOCTYPE HTML><!-- XXX - XXX -->
 #errors
 #document
 | <!DOCTYPE HTML>
@ -508,7 +505,7 @@ Unexpected end of file. Missing closing tags.
 |   <body>

 #data
-<!DoctypE html><!-- XXX - XXX
+<!DOCTYPE HTML><!-- XXX - XXX
 #errors
 Unexpected EOF in comment.
 #document
@ -519,7 +516,7 @@ Unexpected EOF in comment.
 |   <body>

 #data
-<!DoctypE html><!-- XXX - XXX - XXX -->
+<!DOCTYPE HTML><!-- XXX - XXX - XXX -->
 #errors
 #document
 | <!DOCTYPE HTML>
@ -583,7 +580,7 @@ Unexpected EOF.
 |             "X"

 #data
-<!doctype html><body><title>test</body></title>
+<!DOCTYPE HTML><body><title>test</body></title>
 #errors
 Unexpected start tag that belongs in the head.
 Expected closing tag after </.
@ -596,7 +593,7 @@ Expected closing tag after </.
 |   <body>

 #data
-<!doctype html><body><title>X</title><meta name=z><link rel=foo><style>
+<!DOCTYPE HTML><body><title>X</title><meta name=z><link rel=foo><style>
 x { content:"</style" } </style>
 #errors
 Unexpected start tag that belongs in head.
@ -609,17 +606,17 @@ Expected closing tag after </.
 |   <head>
 |     <title>
 |       "X"
+|   <body>
 |     <meta>
 |       name="z"
 |     <link>
 |       rel="foo"
-|   <body>
 |     <style>
 |       "
 x { content:"</style" } "

 #data
-<!doctype html><select><optgroup></optgroup></select>
+<!DOCTYPE HTML><select><optgroup></optgroup></select>
 #errors
 #document
 | <!DOCTYPE HTML>
@ -642,7 +639,7 @@ No doctype.
 |   <body>

 #data
-<!doctype html>  <html>
+<!DOCTYPE HTML>  <html>
 #errors
 #document
 | <!DOCTYPE HTML>
@ -652,7 +649,7 @@ No doctype.
 |   <body>

 #data
-<!doctype html><script>
+<!DOCTYPE HTML><script>
 </script>  <title>x</title>  </head>
 #errors
 #document
@ -669,7 +666,7 @@ No doctype.
 |   <body>

 #data
-<!doctype html><html><body><html id=x>
+<!DOCTYPE HTML><html><body><html id=x>
 #errors
 duplicate html start tag
 #document
@ -680,7 +677,7 @@ duplicate html start tag
 |   <body>

 #data
-<!doctype html>X</body><html id="x">
+<!DOCTYPE HTML>X</body><html id="x">
 #errors
 Unexpected html start tag in the after body phase.
 html needs to be the first start tag.
@ -693,7 +690,7 @@ html needs to be the first start tag.
 |     "X"

 #data
-<!doctype html><head><html id=x>
+<!DOCTYPE HTML><head><html id=x>
 #errors
 html start tag too late
 #document
@ -704,7 +701,7 @@ html start tag too late
 |   <body>

 #data
-<!doctype html>X</html>X
+<!DOCTYPE HTML>X</html>X
 #errors
 Unexpected non-space characters. Expected end of file.
 Unexpected non-space characters in after body phase. Expected end of file.
@ -716,7 +713,7 @@ Unexpected non-space characters in after body phase. Expected end of file.
 |     "XX"

 #data
-<!doctype html>X</html> 
+<!DOCTYPE HTML>X</html> 
 #errors
 #document
 | <!DOCTYPE HTML>
@ -726,7 +723,7 @@ Unexpected non-space characters in after body phase. Expected end of file.
 |     "X "

 #data
-<!doctype html>X</html><p>X
+<!DOCTYPE HTML>X</html><p>X
 #errors
 Unexpected start tag <p> in trailing end phase.
 Unexpected start tag <p> in after body phase.
@ -740,7 +737,7 @@ Unexpected start tag <p> in after body phase.
 |       "X"

 #data
-<!doctype html>X<p/x/y/z>
+<!DOCTYPE HTML>X<p/x/y/z>
 #errors
 Solidus (/) incorrectly placed.
 Solidus (/) incorrectly placed.
@ -757,7 +754,7 @@ Solidus (/) incorrectly placed.
 |       z=""

 #data
-<!doctype html><!--x--
+<!DOCTYPE HTML><!--x--
 #errors
 Unexpected end of file in comment.
 #document
@ -768,7 +765,7 @@ Unexpected end of file in comment.
 |   <body>

 #data
-<!doctype html><table><tr><td></p></table>
+<!DOCTYPE HTML><table><tr><td></p></table>
 #errors
 Unexpected </p> end tag.
 #document
--- a/vendor/plugins/HTML5lib/testdata/tree-construction/tests3.dat
+++ b/vendor/plugins/HTML5lib/testdata/tree-construction/tests3.dat
@ -49,23 +49,23 @@ No DOCTYPE
 |     <script>

 #data
-<!DOCTYPE html><html><head></head><body><pre>
+<!DOCTYPE htML><html><head></head><body><pre>
 </pre></body></html>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
 |     <pre>

 #data
-<!DOCTYPE html><html><head></head><body><pre>
+<!DOCTYPE htML><html><head></head><body><pre>

 foo</pre></body></html>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -74,13 +74,13 @@ foo</pre></body></html>


 #data
-<!DOCTYPE html><html><head></head><body><pre>
+<!DOCTYPE htML><html><head></head><body><pre>

 foo
 </pre></body></html>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -89,11 +89,11 @@ foo
 "

 #data
-<!DOCTYPE html><html><head></head><body><pre>x</pre><span>
+<!DOCTYPE htML><html><head></head><body><pre>x</pre><span>
 </span></body></html>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -104,11 +104,11 @@ foo
 "

 #data
-<!DOCTYPE html><html><head></head><body><pre>x
+<!DOCTYPE htML><html><head></head><body><pre>x
 y</pre></body></html>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -117,11 +117,11 @@ y</pre></body></html>
 y"

 #data
-<!DOCTYPE html><html><head></head><body><pre>x<div>
+<!DOCTYPE htML><html><head></head><body><pre>x<div>
 y</pre></body></html>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -132,20 +132,20 @@ y</pre></body></html>
 | y"

 #data
-<!DOCTYPE html><HTML><META><HEAD></HEAD></HTML>
+<!DOCTYPE htML><HTML><META><HEAD></HEAD></HTML>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |     <meta>
 |   <body>

 #data
-<!DOCTYPE html><HTML><HEAD><head></HEAD></HTML>
+<!DOCTYPE htML><HTML><HEAD><head></HEAD></HTML>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -171,23 +171,23 @@ y</pre></body></html>
 |   <body>

 #data
-<!DOCTYPE html><textarea>
+<!DOCTYPE htML><textarea>
 </textarea>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
 |     <textarea>

 #data
-<!DOCTYPE html><textarea>
+<!DOCTYPE htML><textarea>

 foo</textarea>
 #errors
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -195,11 +195,11 @@ foo</textarea>
 |       "foo"

 #data
-<!DOCTYPE html><html><head></head><body><ul><li><div><p><li></ul></body></html>
+<!DOCTYPE htML><html><head></head><body><ul><li><div><p><li></ul></body></html>
 #errors
 Missing end tag (div)
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE htML>
 | <html>
 |   <head>
 |   <body>
@ -208,3 +208,29 @@ Missing end tag (div)
 |         <div>
 |           <p>
 |       <li>
+
+#data
+<!doctype html><nobr><nobr><nobr>
+#errors
+Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <nobr>
+|     <nobr>
+|     <nobr>
+
+#data
+<!doctype html><nobr><nobr></nobr><nobr>
+#errors
+Unexpected end of file.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <nobr>
+|     <nobr>
+|     <nobr>
--- a/vendor/plugins/HTML5lib/testdata/tree-construction/tests5.dat
+++ b/vendor/plugins/HTML5lib/testdata/tree-construction/tests5.dat
@ -0,0 +1,120 @@
+#data
+<style> <!-- </style>x
+#errors
+No DOCTYPE
+Unexpected end of file
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!-- </style>x"
+|   <body>
+
+#data
+<style> <!-- </style> --> </style>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!-- </style> --> "
+|   <body>
+|     "x"
+
+#data
+<style> <!--> </style>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!--> "
+|   <body>
+|     "x"
+
+#data
+<style> <!---> </style>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!---> "
+|   <body>
+|     "x"
+
+#data
+<iframe> <!---> </iframe>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       " <!---> "
+|     "x"
+
+#data
+<iframe> <!--- </iframe>->x</iframe> --> </iframe>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|   <body>
+|     <iframe>
+|       " <!--- </iframe>->x</iframe> --> "
+|     "x"
+
+#data
+<script> <!-- </script> --> </script>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|     <script>
+|       " <!-- </script> --> "
+|   <body>
+|     "x"
+
+#data
+<title> <!-- </title> --> </title>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|     <title>
+|       " <!-- </title> --> "
+|   <body>
+|     "x"
+
+#data
+<textarea> <!--- </textarea>->x</textarea> --> </textarea>x
+#errors
+No DOCTYPE
+#document
+| <html>
+|   <head>
+|   <body>
+|     <textarea>
+|       " <!--- </textarea>->x</textarea> --> "
+|     "x"
+
+#data
+<style> <!</-- </style>x
+#errors
+No DOCTYPE
+Unexpected end of file
+#document
+| <html>
+|   <head>
+|     <style>
+|       " <!</-- "
+|   <body>
+|     "x"
--- a/vendor/plugins/HTML5lib/testdata/tree-construction/tests6.dat
+++ b/vendor/plugins/HTML5lib/testdata/tree-construction/tests6.dat
@ -0,0 +1,29 @@
+#data
+<!doctype html></head> <head>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   " "
+|   <body>
+
+#data
+<!doctype html></html> <head>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     " "
+
+#data
+<!doctype html></body><meta>
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <meta>