From c6bdc743a4305af0f9e88921a03e993b9cbaf45b Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <geoffers@gmail.com>
Date: Sun, 8 May 2016 18:02:40 +0100
Subject: [PATCH 1/7] Move the serializer testdata to html5lib-python as impl
 specific

---
 html5lib/tests/serializer-testdata/core.test  | 125 +++
 .../tests/serializer-testdata/injectmeta.test |  66 ++
 .../serializer-testdata/optionaltags.test     | 965 ++++++++++++++++++
 .../tests/serializer-testdata/options.test    |  60 ++
 .../tests/serializer-testdata/whitespace.test |  51 +
 html5lib/tests/support.py                     |   4 +-
 html5lib/tests/test_serializer.py             |   3 +-
 7 files changed, 1271 insertions(+), 3 deletions(-)
 create mode 100644 html5lib/tests/serializer-testdata/core.test
 create mode 100644 html5lib/tests/serializer-testdata/injectmeta.test
 create mode 100644 html5lib/tests/serializer-testdata/optionaltags.test
 create mode 100644 html5lib/tests/serializer-testdata/options.test
 create mode 100644 html5lib/tests/serializer-testdata/whitespace.test

diff --git a/html5lib/tests/serializer-testdata/core.test b/html5lib/tests/serializer-testdata/core.test
new file mode 100644
index 00000000..c0b4222d
--- /dev/null
+++ b/html5lib/tests/serializer-testdata/core.test
@@ -0,0 +1,125 @@
+{"tests": [
+
+{"description": "proper attribute value escaping",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "test \"with\" &quot;"}]]],
+ "expected": ["<span title='test \"with\" &amp;quot;'>"]
+},
+
+{"description": "proper attribute value non-quoting",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo"}]]],
+ "expected": ["<span title=foo>"],
+ "xhtml":    ["<span title=\"foo\">"]
+},
+
+{"description": "proper attribute value non-quoting (with <)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo<bar"}]]],
+ "expected": ["<span title=foo<bar>"],
+ "xhtml":    ["<span title=\"foo&lt;bar\">"]
+},
+
+{"description": "proper attribute value quoting (with =)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo=bar"}]]],
+ "expected": ["<span title=\"foo=bar\">"]
+},
+
+{"description": "proper attribute value quoting (with >)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo>bar"}]]],
+ "expected": ["<span title=\"foo>bar\">"]
+},
+
+{"description": "proper attribute value quoting (with \")",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\"bar"}]]],
+ "expected": ["<span title='foo\"bar'>"]
+},
+
+{"description": "proper attribute value quoting (with ')",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo'bar"}]]],
+ "expected": ["<span title=\"foo'bar\">"]
+},
+
+{"description": "proper attribute value quoting (with both \" and ')",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo'bar\"baz"}]]],
+ "expected": ["<span title=\"foo'bar&quot;baz\">"]
+},
+
+{"description": "proper attribute value quoting (with space)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo bar"}]]],
+ "expected": ["<span title=\"foo bar\">"]
+},
+
+{"description": "proper attribute value quoting (with tab)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\tbar"}]]],
+ "expected": ["<span title=\"foo\tbar\">"]
+},
+
+{"description": "proper attribute value quoting (with LF)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\nbar"}]]],
+ "expected": ["<span title=\"foo\nbar\">"]
+},
+
+{"description": "proper attribute value quoting (with CR)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\rbar"}]]],
+ "expected": ["<span title=\"foo\rbar\">"]
+},
+
+{"description": "proper attribute value non-quoting (with linetab)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\u000Bbar"}]]],
+ "expected": ["<span title=foo\u000Bbar>"],
+ "xhtml": ["<span title=\"foo\u000Bbar\">"]
+},
+
+{"description": "proper attribute value quoting (with form feed)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\u000Cbar"}]]],
+ "expected": ["<span title=\"foo\u000Cbar\">"]
+},
+
+{"description": "void element (as EmptyTag token)",
+ "input": [["EmptyTag", "img", {}]],
+ "expected": ["<img>"],
+ "xhtml":    ["<img />"]
+},
+
+{"description": "void element (as StartTag token)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "img", {}]],
+ "expected": ["<img>"],
+ "xhtml":    ["<img />"]
+},
+
+{"description": "doctype in error",
+ "input": [["Doctype", "foo"]],
+ "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", "http://www.w3.org/1999/xhtml", "script", {}], ["Characters", "a<b>c&d"]],
+ "expected": ["<script>a<b>c&d"],
+ "xhtml": ["<script>a&lt;b&gt;c&amp;d"]
+},
+
+{"description": "doctype",
+ "input": [["Doctype", "HTML"]],
+ "expected": ["<!DOCTYPE HTML>"]
+},
+
+{"description": "HTML 4.01 DOCTYPE",
+ "input": [["Doctype", "HTML",  "-//W3C//DTD HTML 4.01//EN", "http://www.w3.org/TR/html4/strict.dtd"]],
+ "expected": ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">"]
+},
+
+{"description": "HTML 4.01 DOCTYPE without system identifer",
+ "input": [["Doctype", "HTML",  "-//W3C//DTD HTML 4.01//EN"]],
+ "expected": ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"]
+},
+
+{"description": "IBM DOCTYPE without public identifer",
+ "input": [["Doctype", "html",  "", "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"]],
+ "expected": ["<!DOCTYPE html SYSTEM \"http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd\">"]
+}
+
+]}
diff --git a/html5lib/tests/serializer-testdata/injectmeta.test b/html5lib/tests/serializer-testdata/injectmeta.test
new file mode 100644
index 00000000..feaaa44f
--- /dev/null
+++ b/html5lib/tests/serializer-testdata/injectmeta.test
@@ -0,0 +1,66 @@
+{"tests": [
+
+{"description": "no encoding",
+ "options": {"inject_meta_charset": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": [""],
+ "xhtml": ["<head></head>"]
+},
+
+{"description": "empytag head",
+ "options": {"inject_meta_charset": true, "encoding":"utf-8"},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["StartTag", "http://www.w3.org/1999/xhtml","title",{}], ["Characters", "foo"],["EndTag", "http://www.w3.org/1999/xhtml", "title"], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "name", "value": "robots"},{"namespace": null, "name": "content", "value": "noindex"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "name", "value": "robots"},{"namespace": null, "name": "content", "value": "noindex"}]], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "http-equiv", "value": "content-type"}, {"namespace": null, "name": "content", "value": "text/html; charset=ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "name", "value": "robots"},{"namespace": null, "name": "content", "value": "noindex"}]], ["EmptyTag","meta",[{"namespace": null, "name": "http-equiv", "value": "content-type"}, {"namespace": null, "name": "content", "value": "text/html; charset=ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": ["<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>"]
+}
+
+]}
diff --git a/html5lib/tests/serializer-testdata/optionaltags.test b/html5lib/tests/serializer-testdata/optionaltags.test
new file mode 100644
index 00000000..80a5edf8
--- /dev/null
+++ b/html5lib/tests/serializer-testdata/optionaltags.test
@@ -0,0 +1,965 @@
+{"tests": [
+
+{"description": "html start-tag followed by text, with attributes",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", [{"namespace": null, "name": "lang", "value": "en"}]], ["Characters", "foo"]],
+ "expected": ["<html lang=en>foo"]
+},
+
+
+
+{"description": "html start-tag followed by comment",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["Comment", "foo"]],
+ "expected": ["<html><!--foo-->"]
+},
+
+{"description": "html start-tag followed by space character",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["Characters", " foo"]],
+ "expected": ["<html> foo"]
+},
+
+{"description": "html start-tag followed by text",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["Characters", "foo"]],
+ "expected": ["foo"]
+},
+
+{"description": "html start-tag followed by start-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "html start-tag followed by end-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "html start-tag at EOF (shouldn't ever happen?!)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}]],
+ "expected": [""]
+},
+
+
+
+{"description": "html end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["Comment", "foo"]],
+ "expected": ["</html><!--foo-->"]
+},
+
+{"description": "html end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["Characters", " foo"]],
+ "expected": ["</html> foo"]
+},
+
+{"description": "html end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["Characters", "foo"]],
+ "expected": ["foo"]
+},
+
+{"description": "html end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "html end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "html end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "head start-tag followed by comment",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["Comment", "foo"]],
+ "expected": ["<head><!--foo-->"]
+},
+
+{"description": "head start-tag followed by space character",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["Characters", " foo"]],
+ "expected": ["<head> foo"]
+},
+
+{"description": "head start-tag followed by text",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["Characters", "foo"]],
+ "expected": ["<head>foo"]
+},
+
+{"description": "head start-tag followed by start-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "head start-tag followed by end-tag (shouldn't ever happen?!)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["<head></foo>", "</foo>"]
+},
+
+{"description": "empty head element",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": [""]
+},
+
+{"description": "head start-tag followed by empty-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "head start-tag at EOF (shouldn't ever happen?!)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}]],
+ "expected": ["<head>", ""]
+},
+
+
+
+{"description": "head end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["Comment", "foo"]],
+ "expected": ["</head><!--foo-->"]
+},
+
+{"description": "head end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["Characters", " foo"]],
+ "expected": ["</head> foo"]
+},
+
+{"description": "head end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["Characters", "foo"]],
+ "expected": ["foo"]
+},
+
+{"description": "head end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "head end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "head end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "body start-tag followed by comment",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["Comment", "foo"]],
+ "expected": ["<body><!--foo-->"]
+},
+
+{"description": "body start-tag followed by space character",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["Characters", " foo"]],
+ "expected": ["<body> foo"]
+},
+
+{"description": "body start-tag followed by text",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["Characters", "foo"]],
+ "expected": ["foo"]
+},
+
+{"description": "body start-tag followed by start-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "body start-tag followed by end-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "body start-tag at EOF (shouldn't ever happen?!)",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}]],
+ "expected": [""]
+},
+
+
+
+{"description": "body end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["Comment", "foo"]],
+ "expected": ["</body><!--foo-->"]
+},
+
+{"description": "body end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["Characters", " foo"]],
+ "expected": ["</body> foo"]
+},
+
+{"description": "body end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["Characters", "foo"]],
+ "expected": ["foo"]
+},
+
+{"description": "body end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "body end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "body end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "li end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["Comment", "foo"]],
+ "expected": ["</li><!--foo-->"]
+},
+
+{"description": "li end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["Characters", " foo"]],
+ "expected": ["</li> foo"]
+},
+
+{"description": "li end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["Characters", "foo"]],
+ "expected": ["</li>foo"]
+},
+
+{"description": "li end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</li><foo>"]
+},
+
+{"description": "li end-tag followed by li start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["StartTag", "http://www.w3.org/1999/xhtml", "li", {}]],
+ "expected": ["<li>"]
+},
+
+{"description": "li end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "li end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "dt end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["Comment", "foo"]],
+ "expected": ["</dt><!--foo-->"]
+},
+
+{"description": "dt end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["Characters", " foo"]],
+ "expected": ["</dt> foo"]
+},
+
+{"description": "dt end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["Characters", "foo"]],
+ "expected": ["</dt>foo"]
+},
+
+{"description": "dt end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</dt><foo>"]
+},
+
+{"description": "dt end-tag followed by dt start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["StartTag", "http://www.w3.org/1999/xhtml", "dt", {}]],
+ "expected": ["<dt>"]
+},
+
+{"description": "dt end-tag followed by dd start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["StartTag", "http://www.w3.org/1999/xhtml", "dd", {}]],
+ "expected": ["<dd>"]
+},
+
+{"description": "dt end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</dt></foo>"]
+},
+
+{"description": "dt end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"]],
+ "expected": ["</dt>"]
+},
+
+
+
+
+{"description": "dd end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["Comment", "foo"]],
+ "expected": ["</dd><!--foo-->"]
+},
+
+{"description": "dd end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["Characters", " foo"]],
+ "expected": ["</dd> foo"]
+},
+
+{"description": "dd end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["Characters", "foo"]],
+ "expected": ["</dd>foo"]
+},
+
+{"description": "dd end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</dd><foo>"]
+},
+
+{"description": "dd end-tag followed by dd start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["StartTag", "http://www.w3.org/1999/xhtml", "dd", {}]],
+ "expected": ["<dd>"]
+},
+
+{"description": "dd end-tag followed by dt start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["StartTag", "http://www.w3.org/1999/xhtml", "dt", {}]],
+ "expected": ["<dt>"]
+},
+
+{"description": "dd end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "dd end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "p end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["Comment", "foo"]],
+ "expected": ["</p><!--foo-->"]
+},
+
+{"description": "p end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["Characters", " foo"]],
+ "expected": ["</p> foo"]
+},
+
+{"description": "p end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["Characters", "foo"]],
+ "expected": ["</p>foo"]
+},
+
+{"description": "p end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</p><foo>"]
+},
+
+{"description": "p end-tag followed by address start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "address", {}]],
+ "expected": ["<address>"]
+},
+
+{"description": "p end-tag followed by article start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "article", {}]],
+ "expected": ["<article>"]
+},
+
+{"description": "p end-tag followed by aside start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "aside", {}]],
+ "expected": ["<aside>"]
+},
+
+{"description": "p end-tag followed by blockquote start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "blockquote", {}]],
+ "expected": ["<blockquote>"]
+},
+
+{"description": "p end-tag followed by datagrid start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "datagrid", {}]],
+ "expected": ["<datagrid>"]
+},
+
+{"description": "p end-tag followed by dialog start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "dialog", {}]],
+ "expected": ["<dialog>"]
+},
+
+{"description": "p end-tag followed by dir start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "dir", {}]],
+ "expected": ["<dir>"]
+},
+
+{"description": "p end-tag followed by div start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "div", {}]],
+ "expected": ["<div>"]
+},
+
+{"description": "p end-tag followed by dl start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "dl", {}]],
+ "expected": ["<dl>"]
+},
+
+{"description": "p end-tag followed by fieldset start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "fieldset", {}]],
+ "expected": ["<fieldset>"]
+},
+
+{"description": "p end-tag followed by footer start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "footer", {}]],
+ "expected": ["<footer>"]
+},
+
+{"description": "p end-tag followed by form start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "form", {}]],
+ "expected": ["<form>"]
+},
+
+{"description": "p end-tag followed by h1 start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h1", {}]],
+ "expected": ["<h1>"]
+},
+
+{"description": "p end-tag followed by h2 start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h2", {}]],
+ "expected": ["<h2>"]
+},
+
+{"description": "p end-tag followed by h3 start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h3", {}]],
+ "expected": ["<h3>"]
+},
+
+{"description": "p end-tag followed by h4 start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h4", {}]],
+ "expected": ["<h4>"]
+},
+
+{"description": "p end-tag followed by h5 start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h5", {}]],
+ "expected": ["<h5>"]
+},
+
+{"description": "p end-tag followed by h6 start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h6", {}]],
+ "expected": ["<h6>"]
+},
+
+{"description": "p end-tag followed by header start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "header", {}]],
+ "expected": ["<header>"]
+},
+
+{"description": "p end-tag followed by hr empty-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["EmptyTag", "hr", {}]],
+ "expected": ["<hr>"]
+},
+
+{"description": "p end-tag followed by menu start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "menu", {}]],
+ "expected": ["<menu>"]
+},
+
+{"description": "p end-tag followed by nav start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "nav", {}]],
+ "expected": ["<nav>"]
+},
+
+{"description": "p end-tag followed by ol start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "ol", {}]],
+ "expected": ["<ol>"]
+},
+
+{"description": "p end-tag followed by p start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "p", {}]],
+ "expected": ["<p>"]
+},
+
+{"description": "p end-tag followed by pre start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "pre", {}]],
+ "expected": ["<pre>"]
+},
+
+{"description": "p end-tag followed by section start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "section", {}]],
+ "expected": ["<section>"]
+},
+
+{"description": "p end-tag followed by table start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "table", {}]],
+ "expected": ["<table>"]
+},
+
+{"description": "p end-tag followed by ul start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "ul", {}]],
+ "expected": ["<ul>"]
+},
+
+{"description": "p end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "p end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "optgroup end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["Comment", "foo"]],
+ "expected": ["</optgroup><!--foo-->"]
+},
+
+{"description": "optgroup end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["Characters", " foo"]],
+ "expected": ["</optgroup> foo"]
+},
+
+{"description": "optgroup end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["Characters", "foo"]],
+ "expected": ["</optgroup>foo"]
+},
+
+{"description": "optgroup end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</optgroup><foo>"]
+},
+
+{"description": "optgroup end-tag followed by optgroup start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "optgroup", {}]],
+ "expected": ["<optgroup>"]
+},
+
+{"description": "optgroup end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "optgroup end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "option end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["Comment", "foo"]],
+ "expected": ["</option><!--foo-->"]
+},
+
+{"description": "option end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["Characters", " foo"]],
+ "expected": ["</option> foo"]
+},
+
+{"description": "option end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["Characters", "foo"]],
+ "expected": ["</option>foo"]
+},
+
+{"description": "option end-tag followed by optgroup start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["StartTag", "http://www.w3.org/1999/xhtml", "optgroup", {}]],
+ "expected": ["<optgroup>"]
+},
+
+{"description": "option end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</option><foo>"]
+},
+
+{"description": "option end-tag followed by option start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["StartTag", "http://www.w3.org/1999/xhtml", "option", {}]],
+ "expected": ["<option>"]
+},
+
+{"description": "option end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "option end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "colgroup start-tag followed by comment",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["Comment", "foo"]],
+ "expected": ["<colgroup><!--foo-->"]
+},
+
+{"description": "colgroup start-tag followed by space character",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["Characters", " foo"]],
+ "expected": ["<colgroup> foo"]
+},
+
+{"description": "colgroup start-tag followed by text",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["Characters", "foo"]],
+ "expected": ["<colgroup>foo"]
+},
+
+{"description": "colgroup start-tag followed by start-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<colgroup><foo>"]
+},
+
+{"description": "first colgroup in a table with a col child",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "table", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["EmptyTag", "col", {}]],
+ "expected": ["<table><col>"]
+},
+
+{"description": "colgroup with a col child, following another colgroup",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "col", {}]],
+ "expected": ["</colgroup><col>", "<colgroup><col>"]
+},
+
+{"description": "colgroup start-tag followed by end-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["<colgroup></foo>"]
+},
+
+{"description": "colgroup start-tag at EOF",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}]],
+ "expected": ["<colgroup>"]
+},
+
+
+
+{"description": "colgroup end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["Comment", "foo"]],
+ "expected": ["</colgroup><!--foo-->"]
+},
+
+{"description": "colgroup end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["Characters", " foo"]],
+ "expected": ["</colgroup> foo"]
+},
+
+{"description": "colgroup end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["Characters", "foo"]],
+ "expected": ["foo"]
+},
+
+{"description": "colgroup end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<foo>"]
+},
+
+{"description": "colgroup end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "colgroup end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "thead end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["Comment", "foo"]],
+ "expected": ["</thead><!--foo-->"]
+},
+
+{"description": "thead end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["Characters", " foo"]],
+ "expected": ["</thead> foo"]
+},
+
+{"description": "thead end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["Characters", "foo"]],
+ "expected": ["</thead>foo"]
+},
+
+{"description": "thead end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</thead><foo>"]
+},
+
+{"description": "thead end-tag followed by tbody start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
+ "expected": ["<tbody>"]
+},
+
+{"description": "thead end-tag followed by tfoot start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "tfoot", {}]],
+ "expected": ["<tfoot>"]
+},
+
+{"description": "thead end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</thead></foo>"]
+},
+
+{"description": "thead end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"]],
+ "expected": ["</thead>"]
+},
+
+
+
+
+{"description": "tbody start-tag followed by comment",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["Comment", "foo"]],
+ "expected": ["<tbody><!--foo-->"]
+},
+
+{"description": "tbody start-tag followed by space character",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["Characters", " foo"]],
+ "expected": ["<tbody> foo"]
+},
+
+{"description": "tbody start-tag followed by text",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["Characters", "foo"]],
+ "expected": ["<tbody>foo"]
+},
+
+{"description": "tbody start-tag followed by start-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["<tbody><foo>"]
+},
+
+{"description": "first tbody in a table with a tr child",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "table", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
+ "expected": ["<table><tr>"]
+},
+
+{"description": "tbody with a tr child, following another tbody",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
+ "expected": ["<tbody><tr>", "</tbody><tr>"]
+},
+
+{"description": "tbody with a tr child, following a thead",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
+ "expected": ["<tbody><tr>", "</thead><tr>"]
+},
+
+{"description": "tbody with a tr child, following a tfoot",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
+ "expected": ["<tbody><tr>", "</tfoot><tr>"]
+},
+
+{"description": "tbody start-tag followed by end-tag",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["<tbody></foo>"]
+},
+
+{"description": "tbody start-tag at EOF",
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
+ "expected": ["<tbody>"]
+},
+
+
+
+{"description": "tbody end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["Comment", "foo"]],
+ "expected": ["</tbody><!--foo-->"]
+},
+
+{"description": "tbody end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["Characters", " foo"]],
+ "expected": ["</tbody> foo"]
+},
+
+{"description": "tbody end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["Characters", "foo"]],
+ "expected": ["</tbody>foo"]
+},
+
+{"description": "tbody end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</tbody><foo>"]
+},
+
+{"description": "tbody end-tag followed by tbody start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
+ "expected": ["<tbody>", "</tbody>"]
+},
+
+{"description": "tbody end-tag followed by tfoot start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "tfoot", {}]],
+ "expected": ["<tfoot>"]
+},
+
+{"description": "tbody end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "tbody end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "tfoot end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["Comment", "foo"]],
+ "expected": ["</tfoot><!--foo-->"]
+},
+
+{"description": "tfoot end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["Characters", " foo"]],
+ "expected": ["</tfoot> foo"]
+},
+
+{"description": "tfoot end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["Characters", "foo"]],
+ "expected": ["</tfoot>foo"]
+},
+
+{"description": "tfoot end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</tfoot><foo>"]
+},
+
+{"description": "tfoot end-tag followed by tbody start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
+ "expected": ["<tbody>", "</tfoot>"]
+},
+
+{"description": "tfoot end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "tfoot end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "tr end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["Comment", "foo"]],
+ "expected": ["</tr><!--foo-->"]
+},
+
+{"description": "tr end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["Characters", " foo"]],
+ "expected": ["</tr> foo"]
+},
+
+{"description": "tr end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["Characters", "foo"]],
+ "expected": ["</tr>foo"]
+},
+
+{"description": "tr end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</tr><foo>"]
+},
+
+{"description": "tr end-tag followed by tr start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
+ "expected": ["<tr>", "</tr>"]
+},
+
+{"description": "tr end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "tr end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "td end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["Comment", "foo"]],
+ "expected": ["</td><!--foo-->"]
+},
+
+{"description": "td end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["Characters", " foo"]],
+ "expected": ["</td> foo"]
+},
+
+{"description": "td end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["Characters", "foo"]],
+ "expected": ["</td>foo"]
+},
+
+{"description": "td end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</td><foo>"]
+},
+
+{"description": "td end-tag followed by td start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["StartTag", "http://www.w3.org/1999/xhtml", "td", {}]],
+ "expected": ["<td>", "</td>"]
+},
+
+{"description": "td end-tag followed by th start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["StartTag", "http://www.w3.org/1999/xhtml", "th", {}]],
+ "expected": ["<th>", "</td>"]
+},
+
+{"description": "td end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "td end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"]],
+ "expected": [""]
+},
+
+
+
+
+{"description": "th end-tag followed by comment",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["Comment", "foo"]],
+ "expected": ["</th><!--foo-->"]
+},
+
+{"description": "th end-tag followed by space character",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["Characters", " foo"]],
+ "expected": ["</th> foo"]
+},
+
+{"description": "th end-tag followed by text",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["Characters", "foo"]],
+ "expected": ["</th>foo"]
+},
+
+{"description": "th end-tag followed by start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
+ "expected": ["</th><foo>"]
+},
+
+{"description": "th end-tag followed by th start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["StartTag", "http://www.w3.org/1999/xhtml", "th", {}]],
+ "expected": ["<th>", "</th>"]
+},
+
+{"description": "th end-tag followed by td start-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["StartTag", "http://www.w3.org/1999/xhtml", "td", {}]],
+ "expected": ["<td>", "</th>"]
+},
+
+{"description": "th end-tag followed by end-tag",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
+ "expected": ["</foo>"]
+},
+
+{"description": "th end-tag at EOF",
+ "input": [["EndTag", "http://www.w3.org/1999/xhtml"    , "th"]],
+ "expected": [""]
+}
+
+]}
diff --git a/html5lib/tests/serializer-testdata/options.test b/html5lib/tests/serializer-testdata/options.test
new file mode 100644
index 00000000..6f342dd3
--- /dev/null
+++ b/html5lib/tests/serializer-testdata/options.test
@@ -0,0 +1,60 @@
+{"tests":[
+
+{"description": "quote_char=\"'\"",
+ "options": {"quote_char": "'"},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "test 'with' quote_char"}]]],
+ "expected": ["<span title='test &#39;with&#39; quote_char'>"]
+},
+
+{"description": "quote_attr_values=true",
+ "options": {"quote_attr_values": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "button", [{"namespace": null, "name": "disabled", "value" :"disabled"}]]],
+ "expected": ["<button disabled>"],
+ "xhtml":    ["<button disabled=\"disabled\">"]
+},
+
+{"description": "quote_attr_values=true with irrelevant",
+ "options": {"quote_attr_values": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", [{"namespace": null, "name": "irrelevant", "value" :"irrelevant"}]]],
+ "expected": ["<div irrelevant>"],
+ "xhtml":    ["<div irrelevant=\"irrelevant\">"]
+},
+
+{"description": "use_trailing_solidus=true with void element",
+ "options": {"use_trailing_solidus": true},
+ "input": [["EmptyTag", "img", {}]],
+ "expected": ["<img />"]
+},
+
+{"description": "use_trailing_solidus=true with non-void element",
+ "options": {"use_trailing_solidus": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", {}]],
+ "expected": ["<div>"]
+},
+
+{"description": "minimize_boolean_attributes=false",
+ "options": {"minimize_boolean_attributes": false},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", [{"namespace": null, "name": "irrelevant", "value" :"irrelevant"}]]],
+ "expected": ["<div irrelevant=irrelevant>"],
+ "xhtml":    ["<div irrelevant=\"irrelevant\">"]
+},
+
+{"description": "minimize_boolean_attributes=false with empty value",
+ "options": {"minimize_boolean_attributes": false},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", [{"namespace": null, "name": "irrelevant", "value" :""}]]],
+ "expected": ["<div irrelevant=\"\">"]
+},
+
+{"description": "escape less than signs in attribute values",
+ "options": {"escape_lt_in_attrs": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "a", [{"namespace": null, "name": "title", "value": "a<b>c&d"}]]],
+ "expected": ["<a title=\"a&lt;b>c&amp;d\">"]
+},
+
+{"description": "rcdata",
+ "options": {"escape_rcdata": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "script", {}], ["Characters", "a<b>c&d"]],
+ "expected": ["<script>a&lt;b&gt;c&amp;d"]
+}
+
+]}
diff --git a/html5lib/tests/serializer-testdata/whitespace.test b/html5lib/tests/serializer-testdata/whitespace.test
new file mode 100644
index 00000000..e5d050d3
--- /dev/null
+++ b/html5lib/tests/serializer-testdata/whitespace.test
@@ -0,0 +1,51 @@
+{"tests": [
+
+{"description": "bare text with leading spaces",
+ "options": {"strip_whitespace": true},
+ "input": [["Characters", "\t\r\n\u000C foo"]],
+ "expected": [" foo"]
+},
+
+{"description": "bare text with trailing spaces",
+ "options": {"strip_whitespace": true},
+ "input": [["Characters", "foo \t\r\n\u000C"]],
+ "expected": ["foo "]
+},
+
+{"description": "bare text with inner spaces",
+ "options": {"strip_whitespace": true},
+ "input": [["Characters", "foo \t\r\n\u000C bar"]],
+ "expected": ["foo bar"]
+},
+
+{"description": "text within <pre>",
+ "options": {"strip_whitespace": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "pre", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "pre"]],
+ "expected": ["<pre>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</pre>"]
+},
+
+{"description": "text within <pre>, with inner markup",
+ "options": {"strip_whitespace": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "pre", {}], ["Characters", "\t\r\n\u000C fo"], ["StartTag", "http://www.w3.org/1999/xhtml", "span", {}], ["Characters", "o \t\r\n\u000C b"], ["EndTag", "http://www.w3.org/1999/xhtml", "span"], ["Characters", "ar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "pre"]],
+ "expected": ["<pre>\t\r\n\u000C fo<span>o \t\r\n\u000C b</span>ar \t\r\n\u000C</pre>"]
+},
+
+{"description": "text within <textarea>",
+ "options": {"strip_whitespace": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "textarea", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "textarea"]],
+ "expected": ["<textarea>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</textarea>"]
+},
+
+{"description": "text within <script>",
+ "options": {"strip_whitespace": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "script", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "script"]],
+ "expected": ["<script>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</script>"]
+},
+
+{"description": "text within <style>",
+ "options": {"strip_whitespace": true},
+ "input": [["StartTag", "http://www.w3.org/1999/xhtml", "style", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "style"]],
+ "expected": ["<style>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</style>"]
+}
+
+]}
\ No newline at end of file
diff --git a/html5lib/tests/support.py b/html5lib/tests/support.py
index 54a64a85..6e6a916b 100644
--- a/html5lib/tests/support.py
+++ b/html5lib/tests/support.py
@@ -69,8 +69,8 @@
     }
 
 
-def get_data_files(subdirectory, files='*.dat'):
-    return sorted(glob.glob(os.path.join(test_dir, subdirectory, files)))
+def get_data_files(subdirectory, files='*.dat', search_dir=test_dir):
+    return sorted(glob.glob(os.path.join(search_dir, subdirectory, files)))
 
 
 class DefaultDict(dict):
diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
index af76075e..c7e9d7ed 100644
--- a/html5lib/tests/test_serializer.py
+++ b/html5lib/tests/test_serializer.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, unicode_literals
 
+import os
 import json
 import unittest
 
@@ -170,7 +171,7 @@ def testEntityNoResolve(self):
 
 
 def test_serializer():
-    for filename in get_data_files('serializer', '*.test'):
+    for filename in get_data_files('serializer-testdata', '*.test', os.path.dirname(__file__)):
         with open(filename) as fp:
             tests = json.load(fp)
             for index, test in enumerate(tests['tests']):

From b7a37d296562392170a406cf611adaf2821c9390 Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <geoffers@gmail.com>
Date: Sun, 8 May 2016 18:12:26 +0100
Subject: [PATCH 2/7] Reindent serializer testdata

---
 html5lib/tests/serializer-testdata/core.test  |  552 ++-
 .../tests/serializer-testdata/injectmeta.test |  444 +-
 .../serializer-testdata/optionaltags.test     | 4219 +++++++++++++----
 .../tests/serializer-testdata/options.test    |  265 +-
 .../tests/serializer-testdata/whitespace.test |  249 +-
 5 files changed, 4462 insertions(+), 1267 deletions(-)

diff --git a/html5lib/tests/serializer-testdata/core.test b/html5lib/tests/serializer-testdata/core.test
index c0b4222d..0f3092bb 100644
--- a/html5lib/tests/serializer-testdata/core.test
+++ b/html5lib/tests/serializer-testdata/core.test
@@ -1,125 +1,427 @@
-{"tests": [
-
-{"description": "proper attribute value escaping",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "test \"with\" &quot;"}]]],
- "expected": ["<span title='test \"with\" &amp;quot;'>"]
-},
-
-{"description": "proper attribute value non-quoting",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo"}]]],
- "expected": ["<span title=foo>"],
- "xhtml":    ["<span title=\"foo\">"]
-},
-
-{"description": "proper attribute value non-quoting (with <)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo<bar"}]]],
- "expected": ["<span title=foo<bar>"],
- "xhtml":    ["<span title=\"foo&lt;bar\">"]
-},
-
-{"description": "proper attribute value quoting (with =)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo=bar"}]]],
- "expected": ["<span title=\"foo=bar\">"]
-},
-
-{"description": "proper attribute value quoting (with >)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo>bar"}]]],
- "expected": ["<span title=\"foo>bar\">"]
-},
-
-{"description": "proper attribute value quoting (with \")",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\"bar"}]]],
- "expected": ["<span title='foo\"bar'>"]
-},
-
-{"description": "proper attribute value quoting (with ')",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo'bar"}]]],
- "expected": ["<span title=\"foo'bar\">"]
-},
-
-{"description": "proper attribute value quoting (with both \" and ')",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo'bar\"baz"}]]],
- "expected": ["<span title=\"foo'bar&quot;baz\">"]
-},
-
-{"description": "proper attribute value quoting (with space)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo bar"}]]],
- "expected": ["<span title=\"foo bar\">"]
-},
-
-{"description": "proper attribute value quoting (with tab)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\tbar"}]]],
- "expected": ["<span title=\"foo\tbar\">"]
-},
-
-{"description": "proper attribute value quoting (with LF)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\nbar"}]]],
- "expected": ["<span title=\"foo\nbar\">"]
-},
-
-{"description": "proper attribute value quoting (with CR)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\rbar"}]]],
- "expected": ["<span title=\"foo\rbar\">"]
-},
-
-{"description": "proper attribute value non-quoting (with linetab)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\u000Bbar"}]]],
- "expected": ["<span title=foo\u000Bbar>"],
- "xhtml": ["<span title=\"foo\u000Bbar\">"]
-},
-
-{"description": "proper attribute value quoting (with form feed)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "foo\u000Cbar"}]]],
- "expected": ["<span title=\"foo\u000Cbar\">"]
-},
-
-{"description": "void element (as EmptyTag token)",
- "input": [["EmptyTag", "img", {}]],
- "expected": ["<img>"],
- "xhtml":    ["<img />"]
-},
-
-{"description": "void element (as StartTag token)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "img", {}]],
- "expected": ["<img>"],
- "xhtml":    ["<img />"]
-},
-
-{"description": "doctype in error",
- "input": [["Doctype", "foo"]],
- "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", "http://www.w3.org/1999/xhtml", "script", {}], ["Characters", "a<b>c&d"]],
- "expected": ["<script>a<b>c&d"],
- "xhtml": ["<script>a&lt;b&gt;c&amp;d"]
-},
-
-{"description": "doctype",
- "input": [["Doctype", "HTML"]],
- "expected": ["<!DOCTYPE HTML>"]
-},
-
-{"description": "HTML 4.01 DOCTYPE",
- "input": [["Doctype", "HTML",  "-//W3C//DTD HTML 4.01//EN", "http://www.w3.org/TR/html4/strict.dtd"]],
- "expected": ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">"]
-},
-
-{"description": "HTML 4.01 DOCTYPE without system identifer",
- "input": [["Doctype", "HTML",  "-//W3C//DTD HTML 4.01//EN"]],
- "expected": ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"]
-},
-
-{"description": "IBM DOCTYPE without public identifer",
- "input": [["Doctype", "html",  "", "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"]],
- "expected": ["<!DOCTYPE html SYSTEM \"http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd\">"]
-}
-
-]}
+{
+    "tests": [
+        {
+            "expected": [
+                "<span title='test \"with\" &amp;quot;'>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "test \"with\" &quot;"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value escaping"
+        },
+        {
+            "expected": [
+                "<span title=foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo"
+                        }
+                    ]
+                ]
+            ],
+            "xhtml": [
+                "<span title=\"foo\">"
+            ],
+            "description": "proper attribute value non-quoting"
+        },
+        {
+            "expected": [
+                "<span title=foo<bar>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo<bar"
+                        }
+                    ]
+                ]
+            ],
+            "xhtml": [
+                "<span title=\"foo&lt;bar\">"
+            ],
+            "description": "proper attribute value non-quoting (with <)"
+        },
+        {
+            "expected": [
+                "<span title=\"foo=bar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo=bar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with =)"
+        },
+        {
+            "expected": [
+                "<span title=\"foo>bar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo>bar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with >)"
+        },
+        {
+            "expected": [
+                "<span title='foo\"bar'>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo\"bar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with \")"
+        },
+        {
+            "expected": [
+                "<span title=\"foo'bar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo'bar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with ')"
+        },
+        {
+            "expected": [
+                "<span title=\"foo'bar&quot;baz\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo'bar\"baz"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with both \" and ')"
+        },
+        {
+            "expected": [
+                "<span title=\"foo bar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo bar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with space)"
+        },
+        {
+            "expected": [
+                "<span title=\"foo\tbar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo\tbar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with tab)"
+        },
+        {
+            "expected": [
+                "<span title=\"foo\nbar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo\nbar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with LF)"
+        },
+        {
+            "expected": [
+                "<span title=\"foo\rbar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo\rbar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with CR)"
+        },
+        {
+            "expected": [
+                "<span title=foo\u000bbar>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo\u000bbar"
+                        }
+                    ]
+                ]
+            ],
+            "xhtml": [
+                "<span title=\"foo\u000bbar\">"
+            ],
+            "description": "proper attribute value non-quoting (with linetab)"
+        },
+        {
+            "expected": [
+                "<span title=\"foo\fbar\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "foo\fbar"
+                        }
+                    ]
+                ]
+            ],
+            "description": "proper attribute value quoting (with form feed)"
+        },
+        {
+            "expected": [
+                "<img>"
+            ],
+            "input": [
+                [
+                    "EmptyTag",
+                    "img",
+                    {}
+                ]
+            ],
+            "xhtml": [
+                "<img />"
+            ],
+            "description": "void element (as EmptyTag token)"
+        },
+        {
+            "expected": [
+                "<img>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "img",
+                    {}
+                ]
+            ],
+            "xhtml": [
+                "<img />"
+            ],
+            "description": "void element (as StartTag token)"
+        },
+        {
+            "expected": [
+                "<!DOCTYPE foo>"
+            ],
+            "input": [
+                [
+                    "Doctype",
+                    "foo"
+                ]
+            ],
+            "description": "doctype in error"
+        },
+        {
+            "expected": [
+                "a&lt;b&gt;c&amp;d"
+            ],
+            "input": [
+                [
+                    "Characters",
+                    "a<b>c&d"
+                ]
+            ],
+            "description": "character data",
+            "options": {
+                "encoding": "utf-8"
+            }
+        },
+        {
+            "expected": [
+                "<script>a<b>c&d"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "script",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "a<b>c&d"
+                ]
+            ],
+            "xhtml": [
+                "<script>a&lt;b&gt;c&amp;d"
+            ],
+            "description": "rcdata"
+        },
+        {
+            "expected": [
+                "<!DOCTYPE HTML>"
+            ],
+            "input": [
+                [
+                    "Doctype",
+                    "HTML"
+                ]
+            ],
+            "description": "doctype"
+        },
+        {
+            "expected": [
+                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">"
+            ],
+            "input": [
+                [
+                    "Doctype",
+                    "HTML",
+                    "-//W3C//DTD HTML 4.01//EN",
+                    "http://www.w3.org/TR/html4/strict.dtd"
+                ]
+            ],
+            "description": "HTML 4.01 DOCTYPE"
+        },
+        {
+            "expected": [
+                "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">"
+            ],
+            "input": [
+                [
+                    "Doctype",
+                    "HTML",
+                    "-//W3C//DTD HTML 4.01//EN"
+                ]
+            ],
+            "description": "HTML 4.01 DOCTYPE without system identifer"
+        },
+        {
+            "expected": [
+                "<!DOCTYPE html SYSTEM \"http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd\">"
+            ],
+            "input": [
+                [
+                    "Doctype",
+                    "html",
+                    "",
+                    "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"
+                ]
+            ],
+            "description": "IBM DOCTYPE without public identifer"
+        }
+    ]
+}
diff --git a/html5lib/tests/serializer-testdata/injectmeta.test b/html5lib/tests/serializer-testdata/injectmeta.test
index feaaa44f..0e3e1cd7 100644
--- a/html5lib/tests/serializer-testdata/injectmeta.test
+++ b/html5lib/tests/serializer-testdata/injectmeta.test
@@ -1,66 +1,378 @@
-{"tests": [
-
-{"description": "no encoding",
- "options": {"inject_meta_charset": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": [""],
- "xhtml": ["<head></head>"]
-},
-
-{"description": "empytag head",
- "options": {"inject_meta_charset": true, "encoding":"utf-8"},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["StartTag", "http://www.w3.org/1999/xhtml","title",{}], ["Characters", "foo"],["EndTag", "http://www.w3.org/1999/xhtml", "title"], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "name", "value": "robots"},{"namespace": null, "name": "content", "value": "noindex"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "name", "value": "robots"},{"namespace": null, "name": "content", "value": "noindex"}]], ["EmptyTag","meta",[{"namespace": null, "name": "charset", "value": "ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "http-equiv", "value": "content-type"}, {"namespace": null, "name": "content", "value": "text/html; charset=ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag","meta",[{"namespace": null, "name": "name", "value": "robots"},{"namespace": null, "name": "content", "value": "noindex"}]], ["EmptyTag","meta",[{"namespace": null, "name": "http-equiv", "value": "content-type"}, {"namespace": null, "name": "content", "value": "text/html; charset=ascii"}]], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": ["<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>"]
-}
-
-]}
+{
+    "tests": [
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head></head>"
+            ],
+            "description": "no encoding",
+            "options": {
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta charset=utf-8>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta charset=\"utf-8\" /></head>"
+            ],
+            "description": "empytag head",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta charset=utf-8><title>foo</title>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "title",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "title"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta charset=\"utf-8\" /><title>foo</title></head>"
+            ],
+            "description": "head w/title",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta charset=utf-8>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "charset",
+                            "value": "ascii"
+                        }
+                    ]
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta charset=\"utf-8\" /></head>"
+            ],
+            "description": "head w/meta-charset",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta charset=utf-8><meta charset=utf-8>",
+                "<head><meta charset=utf-8><meta charset=ascii>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "charset",
+                            "value": "ascii"
+                        }
+                    ]
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "charset",
+                            "value": "ascii"
+                        }
+                    ]
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta charset=\"utf-8\" /><meta charset=\"utf-8\" /></head>",
+                "<head><meta charset=\"utf-8\" /><meta charset=\"ascii\" /></head>"
+            ],
+            "description": "head w/ two meta-charset",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta charset=utf-8><meta content=noindex name=robots>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "name",
+                            "value": "robots"
+                        },
+                        {
+                            "namespace": null,
+                            "name": "content",
+                            "value": "noindex"
+                        }
+                    ]
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta charset=\"utf-8\" /><meta content=\"noindex\" name=\"robots\" /></head>"
+            ],
+            "description": "head w/robots",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta content=noindex name=robots><meta charset=utf-8>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "name",
+                            "value": "robots"
+                        },
+                        {
+                            "namespace": null,
+                            "name": "content",
+                            "value": "noindex"
+                        }
+                    ]
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "charset",
+                            "value": "ascii"
+                        }
+                    ]
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta content=\"noindex\" name=\"robots\" /><meta charset=\"utf-8\" /></head>"
+            ],
+            "description": "head w/robots & charset",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta content=\"text/html; charset=utf-8\" http-equiv=content-type>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "http-equiv",
+                            "value": "content-type"
+                        },
+                        {
+                            "namespace": null,
+                            "name": "content",
+                            "value": "text/html; charset=ascii"
+                        }
+                    ]
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\" /></head>"
+            ],
+            "description": "head w/ charset in http-equiv content-type",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        },
+        {
+            "expected": [
+                "<meta content=noindex name=robots><meta content=\"text/html; charset=utf-8\" http-equiv=content-type>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "name",
+                            "value": "robots"
+                        },
+                        {
+                            "namespace": null,
+                            "name": "content",
+                            "value": "noindex"
+                        }
+                    ]
+                ],
+                [
+                    "EmptyTag",
+                    "meta",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "http-equiv",
+                            "value": "content-type"
+                        },
+                        {
+                            "namespace": null,
+                            "name": "content",
+                            "value": "text/html; charset=ascii"
+                        }
+                    ]
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "xhtml": [
+                "<head><meta content=\"noindex\" name=\"robots\" /><meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\" /></head>"
+            ],
+            "description": "head w/robots & charset in http-equiv content-type",
+            "options": {
+                "encoding": "utf-8",
+                "inject_meta_charset": true
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/html5lib/tests/serializer-testdata/optionaltags.test b/html5lib/tests/serializer-testdata/optionaltags.test
index 80a5edf8..a2a88438 100644
--- a/html5lib/tests/serializer-testdata/optionaltags.test
+++ b/html5lib/tests/serializer-testdata/optionaltags.test
@@ -1,965 +1,3254 @@
-{"tests": [
-
-{"description": "html start-tag followed by text, with attributes",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", [{"namespace": null, "name": "lang", "value": "en"}]], ["Characters", "foo"]],
- "expected": ["<html lang=en>foo"]
-},
-
-
-
-{"description": "html start-tag followed by comment",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["Comment", "foo"]],
- "expected": ["<html><!--foo-->"]
-},
-
-{"description": "html start-tag followed by space character",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["Characters", " foo"]],
- "expected": ["<html> foo"]
-},
-
-{"description": "html start-tag followed by text",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["Characters", "foo"]],
- "expected": ["foo"]
-},
-
-{"description": "html start-tag followed by start-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "html start-tag followed by end-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "html start-tag at EOF (shouldn't ever happen?!)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "html", {}]],
- "expected": [""]
-},
-
-
-
-{"description": "html end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["Comment", "foo"]],
- "expected": ["</html><!--foo-->"]
-},
-
-{"description": "html end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["Characters", " foo"]],
- "expected": ["</html> foo"]
-},
-
-{"description": "html end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["Characters", "foo"]],
- "expected": ["foo"]
-},
-
-{"description": "html end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "html end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "html end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "html"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "head start-tag followed by comment",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["Comment", "foo"]],
- "expected": ["<head><!--foo-->"]
-},
-
-{"description": "head start-tag followed by space character",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["Characters", " foo"]],
- "expected": ["<head> foo"]
-},
-
-{"description": "head start-tag followed by text",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["Characters", "foo"]],
- "expected": ["<head>foo"]
-},
-
-{"description": "head start-tag followed by start-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "head start-tag followed by end-tag (shouldn't ever happen?!)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["<head></foo>", "</foo>"]
-},
-
-{"description": "empty head element",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": [""]
-},
-
-{"description": "head start-tag followed by empty-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}], ["EmptyTag", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "head start-tag at EOF (shouldn't ever happen?!)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "head", {}]],
- "expected": ["<head>", ""]
-},
-
-
-
-{"description": "head end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["Comment", "foo"]],
- "expected": ["</head><!--foo-->"]
-},
-
-{"description": "head end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["Characters", " foo"]],
- "expected": ["</head> foo"]
-},
-
-{"description": "head end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["Characters", "foo"]],
- "expected": ["foo"]
-},
-
-{"description": "head end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "head end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "head end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "head"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "body start-tag followed by comment",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["Comment", "foo"]],
- "expected": ["<body><!--foo-->"]
-},
-
-{"description": "body start-tag followed by space character",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["Characters", " foo"]],
- "expected": ["<body> foo"]
-},
-
-{"description": "body start-tag followed by text",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["Characters", "foo"]],
- "expected": ["foo"]
-},
-
-{"description": "body start-tag followed by start-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "body start-tag followed by end-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "body start-tag at EOF (shouldn't ever happen?!)",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "body", {}]],
- "expected": [""]
-},
-
-
-
-{"description": "body end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["Comment", "foo"]],
- "expected": ["</body><!--foo-->"]
-},
-
-{"description": "body end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["Characters", " foo"]],
- "expected": ["</body> foo"]
-},
-
-{"description": "body end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["Characters", "foo"]],
- "expected": ["foo"]
-},
-
-{"description": "body end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "body end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "body end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "body"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "li end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["Comment", "foo"]],
- "expected": ["</li><!--foo-->"]
-},
-
-{"description": "li end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["Characters", " foo"]],
- "expected": ["</li> foo"]
-},
-
-{"description": "li end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["Characters", "foo"]],
- "expected": ["</li>foo"]
-},
-
-{"description": "li end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</li><foo>"]
-},
-
-{"description": "li end-tag followed by li start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["StartTag", "http://www.w3.org/1999/xhtml", "li", {}]],
- "expected": ["<li>"]
-},
-
-{"description": "li end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "li end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "li"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "dt end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["Comment", "foo"]],
- "expected": ["</dt><!--foo-->"]
-},
-
-{"description": "dt end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["Characters", " foo"]],
- "expected": ["</dt> foo"]
-},
-
-{"description": "dt end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["Characters", "foo"]],
- "expected": ["</dt>foo"]
-},
-
-{"description": "dt end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</dt><foo>"]
-},
-
-{"description": "dt end-tag followed by dt start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["StartTag", "http://www.w3.org/1999/xhtml", "dt", {}]],
- "expected": ["<dt>"]
-},
-
-{"description": "dt end-tag followed by dd start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["StartTag", "http://www.w3.org/1999/xhtml", "dd", {}]],
- "expected": ["<dd>"]
-},
-
-{"description": "dt end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</dt></foo>"]
-},
-
-{"description": "dt end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dt"]],
- "expected": ["</dt>"]
-},
-
-
-
-
-{"description": "dd end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["Comment", "foo"]],
- "expected": ["</dd><!--foo-->"]
-},
-
-{"description": "dd end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["Characters", " foo"]],
- "expected": ["</dd> foo"]
-},
-
-{"description": "dd end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["Characters", "foo"]],
- "expected": ["</dd>foo"]
-},
-
-{"description": "dd end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</dd><foo>"]
-},
-
-{"description": "dd end-tag followed by dd start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["StartTag", "http://www.w3.org/1999/xhtml", "dd", {}]],
- "expected": ["<dd>"]
-},
-
-{"description": "dd end-tag followed by dt start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["StartTag", "http://www.w3.org/1999/xhtml", "dt", {}]],
- "expected": ["<dt>"]
-},
-
-{"description": "dd end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "dd end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "dd"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "p end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["Comment", "foo"]],
- "expected": ["</p><!--foo-->"]
-},
-
-{"description": "p end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["Characters", " foo"]],
- "expected": ["</p> foo"]
-},
-
-{"description": "p end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["Characters", "foo"]],
- "expected": ["</p>foo"]
-},
-
-{"description": "p end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</p><foo>"]
-},
-
-{"description": "p end-tag followed by address start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "address", {}]],
- "expected": ["<address>"]
-},
-
-{"description": "p end-tag followed by article start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "article", {}]],
- "expected": ["<article>"]
-},
-
-{"description": "p end-tag followed by aside start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "aside", {}]],
- "expected": ["<aside>"]
-},
-
-{"description": "p end-tag followed by blockquote start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "blockquote", {}]],
- "expected": ["<blockquote>"]
-},
-
-{"description": "p end-tag followed by datagrid start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "datagrid", {}]],
- "expected": ["<datagrid>"]
-},
-
-{"description": "p end-tag followed by dialog start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "dialog", {}]],
- "expected": ["<dialog>"]
-},
-
-{"description": "p end-tag followed by dir start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "dir", {}]],
- "expected": ["<dir>"]
-},
-
-{"description": "p end-tag followed by div start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "div", {}]],
- "expected": ["<div>"]
-},
-
-{"description": "p end-tag followed by dl start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "dl", {}]],
- "expected": ["<dl>"]
-},
-
-{"description": "p end-tag followed by fieldset start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "fieldset", {}]],
- "expected": ["<fieldset>"]
-},
-
-{"description": "p end-tag followed by footer start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "footer", {}]],
- "expected": ["<footer>"]
-},
-
-{"description": "p end-tag followed by form start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "form", {}]],
- "expected": ["<form>"]
-},
-
-{"description": "p end-tag followed by h1 start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h1", {}]],
- "expected": ["<h1>"]
-},
-
-{"description": "p end-tag followed by h2 start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h2", {}]],
- "expected": ["<h2>"]
-},
-
-{"description": "p end-tag followed by h3 start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h3", {}]],
- "expected": ["<h3>"]
-},
-
-{"description": "p end-tag followed by h4 start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h4", {}]],
- "expected": ["<h4>"]
-},
-
-{"description": "p end-tag followed by h5 start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h5", {}]],
- "expected": ["<h5>"]
-},
-
-{"description": "p end-tag followed by h6 start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "h6", {}]],
- "expected": ["<h6>"]
-},
-
-{"description": "p end-tag followed by header start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "header", {}]],
- "expected": ["<header>"]
-},
-
-{"description": "p end-tag followed by hr empty-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["EmptyTag", "hr", {}]],
- "expected": ["<hr>"]
-},
-
-{"description": "p end-tag followed by menu start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "menu", {}]],
- "expected": ["<menu>"]
-},
-
-{"description": "p end-tag followed by nav start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "nav", {}]],
- "expected": ["<nav>"]
-},
-
-{"description": "p end-tag followed by ol start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "ol", {}]],
- "expected": ["<ol>"]
-},
-
-{"description": "p end-tag followed by p start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "p", {}]],
- "expected": ["<p>"]
-},
-
-{"description": "p end-tag followed by pre start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "pre", {}]],
- "expected": ["<pre>"]
-},
-
-{"description": "p end-tag followed by section start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "section", {}]],
- "expected": ["<section>"]
-},
-
-{"description": "p end-tag followed by table start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "table", {}]],
- "expected": ["<table>"]
-},
-
-{"description": "p end-tag followed by ul start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["StartTag", "http://www.w3.org/1999/xhtml", "ul", {}]],
- "expected": ["<ul>"]
-},
-
-{"description": "p end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "p end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "p"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "optgroup end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["Comment", "foo"]],
- "expected": ["</optgroup><!--foo-->"]
-},
-
-{"description": "optgroup end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["Characters", " foo"]],
- "expected": ["</optgroup> foo"]
-},
-
-{"description": "optgroup end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["Characters", "foo"]],
- "expected": ["</optgroup>foo"]
-},
-
-{"description": "optgroup end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</optgroup><foo>"]
-},
-
-{"description": "optgroup end-tag followed by optgroup start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "optgroup", {}]],
- "expected": ["<optgroup>"]
-},
-
-{"description": "optgroup end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "optgroup end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "optgroup"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "option end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["Comment", "foo"]],
- "expected": ["</option><!--foo-->"]
-},
-
-{"description": "option end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["Characters", " foo"]],
- "expected": ["</option> foo"]
-},
-
-{"description": "option end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["Characters", "foo"]],
- "expected": ["</option>foo"]
-},
-
-{"description": "option end-tag followed by optgroup start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["StartTag", "http://www.w3.org/1999/xhtml", "optgroup", {}]],
- "expected": ["<optgroup>"]
-},
-
-{"description": "option end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</option><foo>"]
-},
-
-{"description": "option end-tag followed by option start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["StartTag", "http://www.w3.org/1999/xhtml", "option", {}]],
- "expected": ["<option>"]
-},
-
-{"description": "option end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "option end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "option"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "colgroup start-tag followed by comment",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["Comment", "foo"]],
- "expected": ["<colgroup><!--foo-->"]
-},
-
-{"description": "colgroup start-tag followed by space character",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["Characters", " foo"]],
- "expected": ["<colgroup> foo"]
-},
-
-{"description": "colgroup start-tag followed by text",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["Characters", "foo"]],
- "expected": ["<colgroup>foo"]
-},
-
-{"description": "colgroup start-tag followed by start-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<colgroup><foo>"]
-},
-
-{"description": "first colgroup in a table with a col child",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "table", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["EmptyTag", "col", {}]],
- "expected": ["<table><col>"]
-},
-
-{"description": "colgroup with a col child, following another colgroup",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "col", {}]],
- "expected": ["</colgroup><col>", "<colgroup><col>"]
-},
-
-{"description": "colgroup start-tag followed by end-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["<colgroup></foo>"]
-},
-
-{"description": "colgroup start-tag at EOF",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "colgroup", {}]],
- "expected": ["<colgroup>"]
-},
-
-
-
-{"description": "colgroup end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["Comment", "foo"]],
- "expected": ["</colgroup><!--foo-->"]
-},
-
-{"description": "colgroup end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["Characters", " foo"]],
- "expected": ["</colgroup> foo"]
-},
-
-{"description": "colgroup end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["Characters", "foo"]],
- "expected": ["foo"]
-},
-
-{"description": "colgroup end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<foo>"]
-},
-
-{"description": "colgroup end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "colgroup end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "colgroup"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "thead end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["Comment", "foo"]],
- "expected": ["</thead><!--foo-->"]
-},
-
-{"description": "thead end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["Characters", " foo"]],
- "expected": ["</thead> foo"]
-},
-
-{"description": "thead end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["Characters", "foo"]],
- "expected": ["</thead>foo"]
-},
-
-{"description": "thead end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</thead><foo>"]
-},
-
-{"description": "thead end-tag followed by tbody start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
- "expected": ["<tbody>"]
-},
-
-{"description": "thead end-tag followed by tfoot start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "tfoot", {}]],
- "expected": ["<tfoot>"]
-},
-
-{"description": "thead end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</thead></foo>"]
-},
-
-{"description": "thead end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"]],
- "expected": ["</thead>"]
-},
-
-
-
-
-{"description": "tbody start-tag followed by comment",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["Comment", "foo"]],
- "expected": ["<tbody><!--foo-->"]
-},
-
-{"description": "tbody start-tag followed by space character",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["Characters", " foo"]],
- "expected": ["<tbody> foo"]
-},
-
-{"description": "tbody start-tag followed by text",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["Characters", "foo"]],
- "expected": ["<tbody>foo"]
-},
-
-{"description": "tbody start-tag followed by start-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["<tbody><foo>"]
-},
-
-{"description": "first tbody in a table with a tr child",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "table", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
- "expected": ["<table><tr>"]
-},
-
-{"description": "tbody with a tr child, following another tbody",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
- "expected": ["<tbody><tr>", "</tbody><tr>"]
-},
-
-{"description": "tbody with a tr child, following a thead",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "thead"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
- "expected": ["<tbody><tr>", "</thead><tr>"]
-},
-
-{"description": "tbody with a tr child, following a tfoot",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
- "expected": ["<tbody><tr>", "</tfoot><tr>"]
-},
-
-{"description": "tbody start-tag followed by end-tag",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["<tbody></foo>"]
-},
-
-{"description": "tbody start-tag at EOF",
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
- "expected": ["<tbody>"]
-},
-
-
-
-{"description": "tbody end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["Comment", "foo"]],
- "expected": ["</tbody><!--foo-->"]
-},
-
-{"description": "tbody end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["Characters", " foo"]],
- "expected": ["</tbody> foo"]
-},
-
-{"description": "tbody end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["Characters", "foo"]],
- "expected": ["</tbody>foo"]
-},
-
-{"description": "tbody end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</tbody><foo>"]
-},
-
-{"description": "tbody end-tag followed by tbody start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
- "expected": ["<tbody>", "</tbody>"]
-},
-
-{"description": "tbody end-tag followed by tfoot start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["StartTag", "http://www.w3.org/1999/xhtml", "tfoot", {}]],
- "expected": ["<tfoot>"]
-},
-
-{"description": "tbody end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "tbody end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tbody"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "tfoot end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["Comment", "foo"]],
- "expected": ["</tfoot><!--foo-->"]
-},
-
-{"description": "tfoot end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["Characters", " foo"]],
- "expected": ["</tfoot> foo"]
-},
-
-{"description": "tfoot end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["Characters", "foo"]],
- "expected": ["</tfoot>foo"]
-},
-
-{"description": "tfoot end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</tfoot><foo>"]
-},
-
-{"description": "tfoot end-tag followed by tbody start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["StartTag", "http://www.w3.org/1999/xhtml", "tbody", {}]],
- "expected": ["<tbody>", "</tfoot>"]
-},
-
-{"description": "tfoot end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "tfoot end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tfoot"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "tr end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["Comment", "foo"]],
- "expected": ["</tr><!--foo-->"]
-},
-
-{"description": "tr end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["Characters", " foo"]],
- "expected": ["</tr> foo"]
-},
-
-{"description": "tr end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["Characters", "foo"]],
- "expected": ["</tr>foo"]
-},
-
-{"description": "tr end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</tr><foo>"]
-},
-
-{"description": "tr end-tag followed by tr start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["StartTag", "http://www.w3.org/1999/xhtml", "tr", {}]],
- "expected": ["<tr>", "</tr>"]
-},
-
-{"description": "tr end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "tr end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "tr"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "td end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["Comment", "foo"]],
- "expected": ["</td><!--foo-->"]
-},
-
-{"description": "td end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["Characters", " foo"]],
- "expected": ["</td> foo"]
-},
-
-{"description": "td end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["Characters", "foo"]],
- "expected": ["</td>foo"]
-},
-
-{"description": "td end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</td><foo>"]
-},
-
-{"description": "td end-tag followed by td start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["StartTag", "http://www.w3.org/1999/xhtml", "td", {}]],
- "expected": ["<td>", "</td>"]
-},
-
-{"description": "td end-tag followed by th start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["StartTag", "http://www.w3.org/1999/xhtml", "th", {}]],
- "expected": ["<th>", "</td>"]
-},
-
-{"description": "td end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "td end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "td"]],
- "expected": [""]
-},
-
-
-
-
-{"description": "th end-tag followed by comment",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["Comment", "foo"]],
- "expected": ["</th><!--foo-->"]
-},
-
-{"description": "th end-tag followed by space character",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["Characters", " foo"]],
- "expected": ["</th> foo"]
-},
-
-{"description": "th end-tag followed by text",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["Characters", "foo"]],
- "expected": ["</th>foo"]
-},
-
-{"description": "th end-tag followed by start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["StartTag", "http://www.w3.org/1999/xhtml", "foo", {}]],
- "expected": ["</th><foo>"]
-},
-
-{"description": "th end-tag followed by th start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["StartTag", "http://www.w3.org/1999/xhtml", "th", {}]],
- "expected": ["<th>", "</th>"]
-},
-
-{"description": "th end-tag followed by td start-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["StartTag", "http://www.w3.org/1999/xhtml", "td", {}]],
- "expected": ["<td>", "</th>"]
-},
-
-{"description": "th end-tag followed by end-tag",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml", "th"], ["EndTag", "http://www.w3.org/1999/xhtml", "foo"]],
- "expected": ["</foo>"]
-},
-
-{"description": "th end-tag at EOF",
- "input": [["EndTag", "http://www.w3.org/1999/xhtml"    , "th"]],
- "expected": [""]
-}
-
-]}
+{
+    "tests": [
+        {
+            "expected": [
+                "<html lang=en>foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "lang",
+                            "value": "en"
+                        }
+                    ]
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "html start-tag followed by text, with attributes"
+        },
+        {
+            "expected": [
+                "<html><!--foo-->"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html",
+                    {}
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "html start-tag followed by comment"
+        },
+        {
+            "expected": [
+                "<html> foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html",
+                    {}
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "html start-tag followed by space character"
+        },
+        {
+            "expected": [
+                "foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "html start-tag followed by text"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "html start-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "html start-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html",
+                    {}
+                ]
+            ],
+            "description": "html start-tag at EOF (shouldn't ever happen?!)"
+        },
+        {
+            "expected": [
+                "</html><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "html end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</html> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "html end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "html end-tag followed by text"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "html end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "html end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "html"
+                ]
+            ],
+            "description": "html end-tag at EOF"
+        },
+        {
+            "expected": [
+                "<head><!--foo-->"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "head start-tag followed by comment"
+        },
+        {
+            "expected": [
+                "<head> foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "head start-tag followed by space character"
+        },
+        {
+            "expected": [
+                "<head>foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "head start-tag followed by text"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "head start-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<head></foo>",
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "head start-tag followed by end-tag (shouldn't ever happen?!)"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "description": "empty head element"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "head start-tag followed by empty-tag"
+        },
+        {
+            "expected": [
+                "<head>",
+                ""
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head",
+                    {}
+                ]
+            ],
+            "description": "head start-tag at EOF (shouldn't ever happen?!)"
+        },
+        {
+            "expected": [
+                "</head><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "head end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</head> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "head end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "head end-tag followed by text"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "head end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "head end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "head"
+                ]
+            ],
+            "description": "head end-tag at EOF"
+        },
+        {
+            "expected": [
+                "<body><!--foo-->"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body",
+                    {}
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "body start-tag followed by comment"
+        },
+        {
+            "expected": [
+                "<body> foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body",
+                    {}
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "body start-tag followed by space character"
+        },
+        {
+            "expected": [
+                "foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "body start-tag followed by text"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "body start-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "body start-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body",
+                    {}
+                ]
+            ],
+            "description": "body start-tag at EOF (shouldn't ever happen?!)"
+        },
+        {
+            "expected": [
+                "</body><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "body end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</body> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "body end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "body end-tag followed by text"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "body end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "body end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "body"
+                ]
+            ],
+            "description": "body end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</li><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "li end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</li> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "li end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</li>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "li end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</li><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "li end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<li>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li",
+                    {}
+                ]
+            ],
+            "description": "li end-tag followed by li start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "li end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "li"
+                ]
+            ],
+            "description": "li end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</dt><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "dt end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</dt> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "dt end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</dt>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "dt end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</dt><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "dt end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<dt>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt",
+                    {}
+                ]
+            ],
+            "description": "dt end-tag followed by dt start-tag"
+        },
+        {
+            "expected": [
+                "<dd>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd",
+                    {}
+                ]
+            ],
+            "description": "dt end-tag followed by dd start-tag"
+        },
+        {
+            "expected": [
+                "</dt></foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "dt end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                "</dt>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt"
+                ]
+            ],
+            "description": "dt end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</dd><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "dd end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</dd> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "dd end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</dd>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "dd end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</dd><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "dd end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<dd>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd",
+                    {}
+                ]
+            ],
+            "description": "dd end-tag followed by dd start-tag"
+        },
+        {
+            "expected": [
+                "<dt>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dt",
+                    {}
+                ]
+            ],
+            "description": "dd end-tag followed by dt start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "dd end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dd"
+                ]
+            ],
+            "description": "dd end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</p><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "p end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</p> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "p end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</p>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "p end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</p><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<address>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "address",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by address start-tag"
+        },
+        {
+            "expected": [
+                "<article>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "article",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by article start-tag"
+        },
+        {
+            "expected": [
+                "<aside>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "aside",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by aside start-tag"
+        },
+        {
+            "expected": [
+                "<blockquote>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "blockquote",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by blockquote start-tag"
+        },
+        {
+            "expected": [
+                "<datagrid>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "datagrid",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by datagrid start-tag"
+        },
+        {
+            "expected": [
+                "<dialog>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dialog",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by dialog start-tag"
+        },
+        {
+            "expected": [
+                "<dir>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dir",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by dir start-tag"
+        },
+        {
+            "expected": [
+                "<div>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by div start-tag"
+        },
+        {
+            "expected": [
+                "<dl>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "dl",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by dl start-tag"
+        },
+        {
+            "expected": [
+                "<fieldset>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "fieldset",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by fieldset start-tag"
+        },
+        {
+            "expected": [
+                "<footer>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "footer",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by footer start-tag"
+        },
+        {
+            "expected": [
+                "<form>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "form",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by form start-tag"
+        },
+        {
+            "expected": [
+                "<h1>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "h1",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by h1 start-tag"
+        },
+        {
+            "expected": [
+                "<h2>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "h2",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by h2 start-tag"
+        },
+        {
+            "expected": [
+                "<h3>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "h3",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by h3 start-tag"
+        },
+        {
+            "expected": [
+                "<h4>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "h4",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by h4 start-tag"
+        },
+        {
+            "expected": [
+                "<h5>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "h5",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by h5 start-tag"
+        },
+        {
+            "expected": [
+                "<h6>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "h6",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by h6 start-tag"
+        },
+        {
+            "expected": [
+                "<header>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "header",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by header start-tag"
+        },
+        {
+            "expected": [
+                "<hr>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "EmptyTag",
+                    "hr",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by hr empty-tag"
+        },
+        {
+            "expected": [
+                "<menu>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "menu",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by menu start-tag"
+        },
+        {
+            "expected": [
+                "<nav>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "nav",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by nav start-tag"
+        },
+        {
+            "expected": [
+                "<ol>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "ol",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by ol start-tag"
+        },
+        {
+            "expected": [
+                "<p>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by p start-tag"
+        },
+        {
+            "expected": [
+                "<pre>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "pre",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by pre start-tag"
+        },
+        {
+            "expected": [
+                "<section>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "section",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by section start-tag"
+        },
+        {
+            "expected": [
+                "<table>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "table",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by table start-tag"
+        },
+        {
+            "expected": [
+                "<ul>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "ul",
+                    {}
+                ]
+            ],
+            "description": "p end-tag followed by ul start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "p end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "p"
+                ]
+            ],
+            "description": "p end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</optgroup><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "optgroup end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</optgroup> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "optgroup end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</optgroup>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "optgroup end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</optgroup><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "optgroup end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<optgroup>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup",
+                    {}
+                ]
+            ],
+            "description": "optgroup end-tag followed by optgroup start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "optgroup end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup"
+                ]
+            ],
+            "description": "optgroup end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</option><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "option end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</option> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "option end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</option>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "option end-tag followed by text"
+        },
+        {
+            "expected": [
+                "<optgroup>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "optgroup",
+                    {}
+                ]
+            ],
+            "description": "option end-tag followed by optgroup start-tag"
+        },
+        {
+            "expected": [
+                "</option><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "option end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<option>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option",
+                    {}
+                ]
+            ],
+            "description": "option end-tag followed by option start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "option end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "option"
+                ]
+            ],
+            "description": "option end-tag at EOF"
+        },
+        {
+            "expected": [
+                "<colgroup><!--foo-->"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "colgroup start-tag followed by comment"
+        },
+        {
+            "expected": [
+                "<colgroup> foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "colgroup start-tag followed by space character"
+        },
+        {
+            "expected": [
+                "<colgroup>foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "colgroup start-tag followed by text"
+        },
+        {
+            "expected": [
+                "<colgroup><foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "colgroup start-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<table><col>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "table",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ],
+                [
+                    "EmptyTag",
+                    "col",
+                    {}
+                ]
+            ],
+            "description": "first colgroup in a table with a col child"
+        },
+        {
+            "expected": [
+                "</colgroup><col>",
+                "<colgroup><col>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "col",
+                    {}
+                ]
+            ],
+            "description": "colgroup with a col child, following another colgroup"
+        },
+        {
+            "expected": [
+                "<colgroup></foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "colgroup start-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                "<colgroup>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup",
+                    {}
+                ]
+            ],
+            "description": "colgroup start-tag at EOF"
+        },
+        {
+            "expected": [
+                "</colgroup><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "colgroup end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</colgroup> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "colgroup end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "colgroup end-tag followed by text"
+        },
+        {
+            "expected": [
+                "<foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "colgroup end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "colgroup end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "colgroup"
+                ]
+            ],
+            "description": "colgroup end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</thead><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "thead end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</thead> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "thead end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</thead>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "thead end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</thead><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "thead end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<tbody>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ]
+            ],
+            "description": "thead end-tag followed by tbody start-tag"
+        },
+        {
+            "expected": [
+                "<tfoot>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot",
+                    {}
+                ]
+            ],
+            "description": "thead end-tag followed by tfoot start-tag"
+        },
+        {
+            "expected": [
+                "</thead></foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "thead end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                "</thead>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ]
+            ],
+            "description": "thead end-tag at EOF"
+        },
+        {
+            "expected": [
+                "<tbody><!--foo-->"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "tbody start-tag followed by comment"
+        },
+        {
+            "expected": [
+                "<tbody> foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "tbody start-tag followed by space character"
+        },
+        {
+            "expected": [
+                "<tbody>foo"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "tbody start-tag followed by text"
+        },
+        {
+            "expected": [
+                "<tbody><foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "tbody start-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<table><tr>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "table",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr",
+                    {}
+                ]
+            ],
+            "description": "first tbody in a table with a tr child"
+        },
+        {
+            "expected": [
+                "<tbody><tr>",
+                "</tbody><tr>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr",
+                    {}
+                ]
+            ],
+            "description": "tbody with a tr child, following another tbody"
+        },
+        {
+            "expected": [
+                "<tbody><tr>",
+                "</thead><tr>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "thead"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr",
+                    {}
+                ]
+            ],
+            "description": "tbody with a tr child, following a thead"
+        },
+        {
+            "expected": [
+                "<tbody><tr>",
+                "</tfoot><tr>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr",
+                    {}
+                ]
+            ],
+            "description": "tbody with a tr child, following a tfoot"
+        },
+        {
+            "expected": [
+                "<tbody></foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "tbody start-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                "<tbody>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ]
+            ],
+            "description": "tbody start-tag at EOF"
+        },
+        {
+            "expected": [
+                "</tbody><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "tbody end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</tbody> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "tbody end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</tbody>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "tbody end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</tbody><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "tbody end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<tbody>",
+                "</tbody>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ]
+            ],
+            "description": "tbody end-tag followed by tbody start-tag"
+        },
+        {
+            "expected": [
+                "<tfoot>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot",
+                    {}
+                ]
+            ],
+            "description": "tbody end-tag followed by tfoot start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "tbody end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody"
+                ]
+            ],
+            "description": "tbody end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</tfoot><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "tfoot end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</tfoot> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "tfoot end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</tfoot>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "tfoot end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</tfoot><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "tfoot end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<tbody>",
+                "</tfoot>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tbody",
+                    {}
+                ]
+            ],
+            "description": "tfoot end-tag followed by tbody start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "tfoot end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tfoot"
+                ]
+            ],
+            "description": "tfoot end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</tr><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "tr end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</tr> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "tr end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</tr>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "tr end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</tr><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "tr end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<tr>",
+                "</tr>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr",
+                    {}
+                ]
+            ],
+            "description": "tr end-tag followed by tr start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "tr end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "tr"
+                ]
+            ],
+            "description": "tr end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</td><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "td end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</td> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "td end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</td>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "td end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</td><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "td end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<td>",
+                "</td>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td",
+                    {}
+                ]
+            ],
+            "description": "td end-tag followed by td start-tag"
+        },
+        {
+            "expected": [
+                "<th>",
+                "</td>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th",
+                    {}
+                ]
+            ],
+            "description": "td end-tag followed by th start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "td end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td"
+                ]
+            ],
+            "description": "td end-tag at EOF"
+        },
+        {
+            "expected": [
+                "</th><!--foo-->"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ],
+                [
+                    "Comment",
+                    "foo"
+                ]
+            ],
+            "description": "th end-tag followed by comment"
+        },
+        {
+            "expected": [
+                "</th> foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ],
+                [
+                    "Characters",
+                    " foo"
+                ]
+            ],
+            "description": "th end-tag followed by space character"
+        },
+        {
+            "expected": [
+                "</th>foo"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ],
+                [
+                    "Characters",
+                    "foo"
+                ]
+            ],
+            "description": "th end-tag followed by text"
+        },
+        {
+            "expected": [
+                "</th><foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo",
+                    {}
+                ]
+            ],
+            "description": "th end-tag followed by start-tag"
+        },
+        {
+            "expected": [
+                "<th>",
+                "</th>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th",
+                    {}
+                ]
+            ],
+            "description": "th end-tag followed by th start-tag"
+        },
+        {
+            "expected": [
+                "<td>",
+                "</th>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "td",
+                    {}
+                ]
+            ],
+            "description": "th end-tag followed by td start-tag"
+        },
+        {
+            "expected": [
+                "</foo>"
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "foo"
+                ]
+            ],
+            "description": "th end-tag followed by end-tag"
+        },
+        {
+            "expected": [
+                ""
+            ],
+            "input": [
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "th"
+                ]
+            ],
+            "description": "th end-tag at EOF"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/html5lib/tests/serializer-testdata/options.test b/html5lib/tests/serializer-testdata/options.test
index 6f342dd3..d52a353e 100644
--- a/html5lib/tests/serializer-testdata/options.test
+++ b/html5lib/tests/serializer-testdata/options.test
@@ -1,60 +1,205 @@
-{"tests":[
-
-{"description": "quote_char=\"'\"",
- "options": {"quote_char": "'"},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": null, "name": "title", "value": "test 'with' quote_char"}]]],
- "expected": ["<span title='test &#39;with&#39; quote_char'>"]
-},
-
-{"description": "quote_attr_values=true",
- "options": {"quote_attr_values": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "button", [{"namespace": null, "name": "disabled", "value" :"disabled"}]]],
- "expected": ["<button disabled>"],
- "xhtml":    ["<button disabled=\"disabled\">"]
-},
-
-{"description": "quote_attr_values=true with irrelevant",
- "options": {"quote_attr_values": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", [{"namespace": null, "name": "irrelevant", "value" :"irrelevant"}]]],
- "expected": ["<div irrelevant>"],
- "xhtml":    ["<div irrelevant=\"irrelevant\">"]
-},
-
-{"description": "use_trailing_solidus=true with void element",
- "options": {"use_trailing_solidus": true},
- "input": [["EmptyTag", "img", {}]],
- "expected": ["<img />"]
-},
-
-{"description": "use_trailing_solidus=true with non-void element",
- "options": {"use_trailing_solidus": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", {}]],
- "expected": ["<div>"]
-},
-
-{"description": "minimize_boolean_attributes=false",
- "options": {"minimize_boolean_attributes": false},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", [{"namespace": null, "name": "irrelevant", "value" :"irrelevant"}]]],
- "expected": ["<div irrelevant=irrelevant>"],
- "xhtml":    ["<div irrelevant=\"irrelevant\">"]
-},
-
-{"description": "minimize_boolean_attributes=false with empty value",
- "options": {"minimize_boolean_attributes": false},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "div", [{"namespace": null, "name": "irrelevant", "value" :""}]]],
- "expected": ["<div irrelevant=\"\">"]
-},
-
-{"description": "escape less than signs in attribute values",
- "options": {"escape_lt_in_attrs": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "a", [{"namespace": null, "name": "title", "value": "a<b>c&d"}]]],
- "expected": ["<a title=\"a&lt;b>c&amp;d\">"]
-},
-
-{"description": "rcdata",
- "options": {"escape_rcdata": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "script", {}], ["Characters", "a<b>c&d"]],
- "expected": ["<script>a&lt;b&gt;c&amp;d"]
-}
-
-]}
+{
+    "tests": [
+        {
+            "expected": [
+                "<span title='test &#39;with&#39; quote_char'>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "test 'with' quote_char"
+                        }
+                    ]
+                ]
+            ],
+            "description": "quote_char=\"'\"",
+            "options": {
+                "quote_char": "'"
+            }
+        },
+        {
+            "expected": [
+                "<button disabled>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "button",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "disabled",
+                            "value": "disabled"
+                        }
+                    ]
+                ]
+            ],
+            "xhtml": [
+                "<button disabled=\"disabled\">"
+            ],
+            "description": "quote_attr_values=true",
+            "options": {
+                "quote_attr_values": true
+            }
+        },
+        {
+            "expected": [
+                "<div irrelevant>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "irrelevant",
+                            "value": "irrelevant"
+                        }
+                    ]
+                ]
+            ],
+            "xhtml": [
+                "<div irrelevant=\"irrelevant\">"
+            ],
+            "description": "quote_attr_values=true with irrelevant",
+            "options": {
+                "quote_attr_values": true
+            }
+        },
+        {
+            "expected": [
+                "<img />"
+            ],
+            "input": [
+                [
+                    "EmptyTag",
+                    "img",
+                    {}
+                ]
+            ],
+            "description": "use_trailing_solidus=true with void element",
+            "options": {
+                "use_trailing_solidus": true
+            }
+        },
+        {
+            "expected": [
+                "<div>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    {}
+                ]
+            ],
+            "description": "use_trailing_solidus=true with non-void element",
+            "options": {
+                "use_trailing_solidus": true
+            }
+        },
+        {
+            "expected": [
+                "<div irrelevant=irrelevant>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "irrelevant",
+                            "value": "irrelevant"
+                        }
+                    ]
+                ]
+            ],
+            "xhtml": [
+                "<div irrelevant=\"irrelevant\">"
+            ],
+            "description": "minimize_boolean_attributes=false",
+            "options": {
+                "minimize_boolean_attributes": false
+            }
+        },
+        {
+            "expected": [
+                "<div irrelevant=\"\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "irrelevant",
+                            "value": ""
+                        }
+                    ]
+                ]
+            ],
+            "description": "minimize_boolean_attributes=false with empty value",
+            "options": {
+                "minimize_boolean_attributes": false
+            }
+        },
+        {
+            "expected": [
+                "<a title=\"a&lt;b>c&amp;d\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "a",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "title",
+                            "value": "a<b>c&d"
+                        }
+                    ]
+                ]
+            ],
+            "description": "escape less than signs in attribute values",
+            "options": {
+                "escape_lt_in_attrs": true
+            }
+        },
+        {
+            "expected": [
+                "<script>a&lt;b&gt;c&amp;d"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "script",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "a<b>c&d"
+                ]
+            ],
+            "description": "rcdata",
+            "options": {
+                "escape_rcdata": true
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/html5lib/tests/serializer-testdata/whitespace.test b/html5lib/tests/serializer-testdata/whitespace.test
index e5d050d3..dac3a69e 100644
--- a/html5lib/tests/serializer-testdata/whitespace.test
+++ b/html5lib/tests/serializer-testdata/whitespace.test
@@ -1,51 +1,198 @@
-{"tests": [
-
-{"description": "bare text with leading spaces",
- "options": {"strip_whitespace": true},
- "input": [["Characters", "\t\r\n\u000C foo"]],
- "expected": [" foo"]
-},
-
-{"description": "bare text with trailing spaces",
- "options": {"strip_whitespace": true},
- "input": [["Characters", "foo \t\r\n\u000C"]],
- "expected": ["foo "]
-},
-
-{"description": "bare text with inner spaces",
- "options": {"strip_whitespace": true},
- "input": [["Characters", "foo \t\r\n\u000C bar"]],
- "expected": ["foo bar"]
-},
-
-{"description": "text within <pre>",
- "options": {"strip_whitespace": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "pre", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "pre"]],
- "expected": ["<pre>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</pre>"]
-},
-
-{"description": "text within <pre>, with inner markup",
- "options": {"strip_whitespace": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "pre", {}], ["Characters", "\t\r\n\u000C fo"], ["StartTag", "http://www.w3.org/1999/xhtml", "span", {}], ["Characters", "o \t\r\n\u000C b"], ["EndTag", "http://www.w3.org/1999/xhtml", "span"], ["Characters", "ar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "pre"]],
- "expected": ["<pre>\t\r\n\u000C fo<span>o \t\r\n\u000C b</span>ar \t\r\n\u000C</pre>"]
-},
-
-{"description": "text within <textarea>",
- "options": {"strip_whitespace": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "textarea", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "textarea"]],
- "expected": ["<textarea>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</textarea>"]
-},
-
-{"description": "text within <script>",
- "options": {"strip_whitespace": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "script", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "script"]],
- "expected": ["<script>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</script>"]
-},
-
-{"description": "text within <style>",
- "options": {"strip_whitespace": true},
- "input": [["StartTag", "http://www.w3.org/1999/xhtml", "style", {}], ["Characters", "\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C"], ["EndTag", "http://www.w3.org/1999/xhtml", "style"]],
- "expected": ["<style>\t\r\n\u000C foo \t\r\n\u000C bar \t\r\n\u000C</style>"]
-}
-
-]}
\ No newline at end of file
+{
+    "tests": [
+        {
+            "expected": [
+                " foo"
+            ],
+            "input": [
+                [
+                    "Characters",
+                    "\t\r\n\f foo"
+                ]
+            ],
+            "description": "bare text with leading spaces",
+            "options": {
+                "strip_whitespace": true
+            }
+        },
+        {
+            "expected": [
+                "foo "
+            ],
+            "input": [
+                [
+                    "Characters",
+                    "foo \t\r\n\f"
+                ]
+            ],
+            "description": "bare text with trailing spaces",
+            "options": {
+                "strip_whitespace": true
+            }
+        },
+        {
+            "expected": [
+                "foo bar"
+            ],
+            "input": [
+                [
+                    "Characters",
+                    "foo \t\r\n\f bar"
+                ]
+            ],
+            "description": "bare text with inner spaces",
+            "options": {
+                "strip_whitespace": true
+            }
+        },
+        {
+            "expected": [
+                "<pre>\t\r\n\f foo \t\r\n\f bar \t\r\n\f</pre>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "pre",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "\t\r\n\f foo \t\r\n\f bar \t\r\n\f"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "pre"
+                ]
+            ],
+            "description": "text within <pre>",
+            "options": {
+                "strip_whitespace": true
+            }
+        },
+        {
+            "expected": [
+                "<pre>\t\r\n\f fo<span>o \t\r\n\f b</span>ar \t\r\n\f</pre>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "pre",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "\t\r\n\f fo"
+                ],
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "o \t\r\n\f b"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "span"
+                ],
+                [
+                    "Characters",
+                    "ar \t\r\n\f"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "pre"
+                ]
+            ],
+            "description": "text within <pre>, with inner markup",
+            "options": {
+                "strip_whitespace": true
+            }
+        },
+        {
+            "expected": [
+                "<textarea>\t\r\n\f foo \t\r\n\f bar \t\r\n\f</textarea>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "textarea",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "\t\r\n\f foo \t\r\n\f bar \t\r\n\f"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "textarea"
+                ]
+            ],
+            "description": "text within <textarea>",
+            "options": {
+                "strip_whitespace": true
+            }
+        },
+        {
+            "expected": [
+                "<script>\t\r\n\f foo \t\r\n\f bar \t\r\n\f</script>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "script",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "\t\r\n\f foo \t\r\n\f bar \t\r\n\f"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "script"
+                ]
+            ],
+            "description": "text within <script>",
+            "options": {
+                "strip_whitespace": true
+            }
+        },
+        {
+            "expected": [
+                "<style>\t\r\n\f foo \t\r\n\f bar \t\r\n\f</style>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "style",
+                    {}
+                ],
+                [
+                    "Characters",
+                    "\t\r\n\f foo \t\r\n\f bar \t\r\n\f"
+                ],
+                [
+                    "EndTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "style"
+                ]
+            ],
+            "description": "text within <style>",
+            "options": {
+                "strip_whitespace": true
+            }
+        }
+    ]
+}
\ No newline at end of file

From acf03505187dbdf57a26873aadf2c729003e7b46 Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <geoffers@gmail.com>
Date: Sun, 8 May 2016 18:15:23 +0100
Subject: [PATCH 3/7] Remove unused XHTML serializer expectations

---
 html5lib/tests/serializer-testdata/core.test  | 18 ------------
 .../tests/serializer-testdata/injectmeta.test | 28 -------------------
 .../tests/serializer-testdata/options.test    |  9 ------
 3 files changed, 55 deletions(-)

diff --git a/html5lib/tests/serializer-testdata/core.test b/html5lib/tests/serializer-testdata/core.test
index 0f3092bb..af890fcd 100644
--- a/html5lib/tests/serializer-testdata/core.test
+++ b/html5lib/tests/serializer-testdata/core.test
@@ -38,9 +38,6 @@
                     ]
                 ]
             ],
-            "xhtml": [
-                "<span title=\"foo\">"
-            ],
             "description": "proper attribute value non-quoting"
         },
         {
@@ -61,9 +58,6 @@
                     ]
                 ]
             ],
-            "xhtml": [
-                "<span title=\"foo&lt;bar\">"
-            ],
             "description": "proper attribute value non-quoting (with <)"
         },
         {
@@ -264,9 +258,6 @@
                     ]
                 ]
             ],
-            "xhtml": [
-                "<span title=\"foo\u000bbar\">"
-            ],
             "description": "proper attribute value non-quoting (with linetab)"
         },
         {
@@ -300,9 +291,6 @@
                     {}
                 ]
             ],
-            "xhtml": [
-                "<img />"
-            ],
             "description": "void element (as EmptyTag token)"
         },
         {
@@ -317,9 +305,6 @@
                     {}
                 ]
             ],
-            "xhtml": [
-                "<img />"
-            ],
             "description": "void element (as StartTag token)"
         },
         {
@@ -365,9 +350,6 @@
                     "a<b>c&d"
                 ]
             ],
-            "xhtml": [
-                "<script>a&lt;b&gt;c&amp;d"
-            ],
             "description": "rcdata"
         },
         {
diff --git a/html5lib/tests/serializer-testdata/injectmeta.test b/html5lib/tests/serializer-testdata/injectmeta.test
index 0e3e1cd7..399590c3 100644
--- a/html5lib/tests/serializer-testdata/injectmeta.test
+++ b/html5lib/tests/serializer-testdata/injectmeta.test
@@ -17,9 +17,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head></head>"
-            ],
             "description": "no encoding",
             "options": {
                 "inject_meta_charset": true
@@ -42,9 +39,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta charset=\"utf-8\" /></head>"
-            ],
             "description": "empytag head",
             "options": {
                 "encoding": "utf-8",
@@ -83,9 +77,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta charset=\"utf-8\" /><title>foo</title></head>"
-            ],
             "description": "head w/title",
             "options": {
                 "encoding": "utf-8",
@@ -120,9 +111,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta charset=\"utf-8\" /></head>"
-            ],
             "description": "head w/meta-charset",
             "options": {
                 "encoding": "utf-8",
@@ -169,10 +157,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta charset=\"utf-8\" /><meta charset=\"utf-8\" /></head>",
-                "<head><meta charset=\"utf-8\" /><meta charset=\"ascii\" /></head>"
-            ],
             "description": "head w/ two meta-charset",
             "options": {
                 "encoding": "utf-8",
@@ -212,9 +196,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta charset=\"utf-8\" /><meta content=\"noindex\" name=\"robots\" /></head>"
-            ],
             "description": "head w/robots",
             "options": {
                 "encoding": "utf-8",
@@ -265,9 +246,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta content=\"noindex\" name=\"robots\" /><meta charset=\"utf-8\" /></head>"
-            ],
             "description": "head w/robots & charset",
             "options": {
                 "encoding": "utf-8",
@@ -307,9 +285,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\" /></head>"
-            ],
             "description": "head w/ charset in http-equiv content-type",
             "options": {
                 "encoding": "utf-8",
@@ -365,9 +340,6 @@
                     "head"
                 ]
             ],
-            "xhtml": [
-                "<head><meta content=\"noindex\" name=\"robots\" /><meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\" /></head>"
-            ],
             "description": "head w/robots & charset in http-equiv content-type",
             "options": {
                 "encoding": "utf-8",
diff --git a/html5lib/tests/serializer-testdata/options.test b/html5lib/tests/serializer-testdata/options.test
index d52a353e..ba48064c 100644
--- a/html5lib/tests/serializer-testdata/options.test
+++ b/html5lib/tests/serializer-testdata/options.test
@@ -41,9 +41,6 @@
                     ]
                 ]
             ],
-            "xhtml": [
-                "<button disabled=\"disabled\">"
-            ],
             "description": "quote_attr_values=true",
             "options": {
                 "quote_attr_values": true
@@ -67,9 +64,6 @@
                     ]
                 ]
             ],
-            "xhtml": [
-                "<div irrelevant=\"irrelevant\">"
-            ],
             "description": "quote_attr_values=true with irrelevant",
             "options": {
                 "quote_attr_values": true
@@ -126,9 +120,6 @@
                     ]
                 ]
             ],
-            "xhtml": [
-                "<div irrelevant=\"irrelevant\">"
-            ],
             "description": "minimize_boolean_attributes=false",
             "options": {
                 "minimize_boolean_attributes": false

From 2bd05f7ed32ae8cecffd79ff8ad14ccc3bb04c3c Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <geoffers@gmail.com>
Date: Sun, 8 May 2016 18:48:47 +0100
Subject: [PATCH 4/7] Lint serializer test input; fix broken examples

---
 html5lib/filters/lint.py                           |  8 ++++++--
 html5lib/tests/serializer-testdata/core.test       | 14 --------------
 .../tests/serializer-testdata/optionaltags.test    |  6 +++---
 html5lib/tests/test_serializer.py                  |  6 ++----
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/html5lib/filters/lint.py b/html5lib/filters/lint.py
index 3ec63d72..af231d8e 100644
--- a/html5lib/filters/lint.py
+++ b/html5lib/filters/lint.py
@@ -10,6 +10,10 @@
 
 
 class Filter(_base.Filter):
+    def __init__(self, source, require_matching_tags=True):
+        super(Filter, self).__init__(source)
+        self.require_matching_tags = require_matching_tags
+
     def __iter__(self):
         open_elements = []
         for token in _base.Filter.__iter__(self):
@@ -26,7 +30,7 @@ def __iter__(self):
                     assert type == "EmptyTag"
                 else:
                     assert type == "StartTag"
-                if type == "StartTag":
+                if type == "StartTag" and self.require_matching_tags:
                     open_elements.append((namespace, name))
                 for (namespace, name), value in token["data"].items():
                     assert namespace is None or isinstance(namespace, text_type)
@@ -44,7 +48,7 @@ def __iter__(self):
                 assert name != ""
                 if (not namespace or namespace == namespaces["html"]) and name in voidElements:
                     assert False, "Void element reported as EndTag token: %(tag)s" % {"tag": name}
-                else:
+                elif self.require_matching_tags:
                     start = open_elements.pop()
                     assert start == (namespace, name)
 
diff --git a/html5lib/tests/serializer-testdata/core.test b/html5lib/tests/serializer-testdata/core.test
index af890fcd..db6bb617 100644
--- a/html5lib/tests/serializer-testdata/core.test
+++ b/html5lib/tests/serializer-testdata/core.test
@@ -293,20 +293,6 @@
             ],
             "description": "void element (as EmptyTag token)"
         },
-        {
-            "expected": [
-                "<img>"
-            ],
-            "input": [
-                [
-                    "StartTag",
-                    "http://www.w3.org/1999/xhtml",
-                    "img",
-                    {}
-                ]
-            ],
-            "description": "void element (as StartTag token)"
-        },
         {
             "expected": [
                 "<!DOCTYPE foo>"
diff --git a/html5lib/tests/serializer-testdata/optionaltags.test b/html5lib/tests/serializer-testdata/optionaltags.test
index a2a88438..e67725ca 100644
--- a/html5lib/tests/serializer-testdata/optionaltags.test
+++ b/html5lib/tests/serializer-testdata/optionaltags.test
@@ -347,7 +347,7 @@
         },
         {
             "expected": [
-                "<foo>"
+                "<meta>"
             ],
             "input": [
                 [
@@ -358,7 +358,7 @@
                 ],
                 [
                     "EmptyTag",
-                    "foo",
+                    "meta",
                     {}
                 ]
             ],
@@ -2094,7 +2094,7 @@
                     {}
                 ],
                 [
-                    "StartTag",
+                    "EmptyTag",
                     "http://www.w3.org/1999/xhtml",
                     "col",
                     {}
diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
index c7e9d7ed..8e0585cf 100644
--- a/html5lib/tests/test_serializer.py
+++ b/html5lib/tests/test_serializer.py
@@ -13,6 +13,7 @@
 
 import html5lib
 from html5lib import constants
+from html5lib.filters.lint import Filter as Lint
 from html5lib.serializer import HTMLSerializer, serialize
 from html5lib.treewalkers._base import TreeWalker
 
@@ -83,7 +84,7 @@ def _convertAttrib(self, attribs):
 
 def serialize_html(input, options):
     options = dict([(str(k), v) for k, v in options.items()])
-    stream = JsonWalker(input)
+    stream = Lint(JsonWalker(input), False)
     serializer = HTMLSerializer(alphabetical_attributes=True, **options)
     return serializer.render(stream, options.get("encoding", None))
 
@@ -125,9 +126,6 @@ def testCharacters(self):
     def testStartTagName(self):
         self.throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "\u0101", []]])
 
-    def testEmptyTagName(self):
-        self.throwsWithLatin1([["EmptyTag", "http://www.w3.org/1999/xhtml", "\u0101", []]])
-
     def testAttributeName(self):
         self.throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": None, "name": "\u0101", "value": "potato"}]]])
 

From 6bd01d06612877c2e763646f1c32823ad053a2e5 Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <geoffers@gmail.com>
Date: Wed, 11 May 2016 15:03:36 -0700
Subject: [PATCH 5/7] Get rid of unittest from test_serializer.py

---
 html5lib/tests/test_serializer.py | 120 ++++++++++++++++--------------
 1 file changed, 64 insertions(+), 56 deletions(-)

diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
index 8e0585cf..33f2a3be 100644
--- a/html5lib/tests/test_serializer.py
+++ b/html5lib/tests/test_serializer.py
@@ -2,16 +2,11 @@
 
 import os
 import json
-import unittest
 
-from .support import get_data_files
+import pytest
 
-try:
-    unittest.TestCase.assertEqual
-except AttributeError:
-    unittest.TestCase.assertEqual = unittest.TestCase.assertEquals
+from .support import get_data_files
 
-import html5lib
 from html5lib import constants
 from html5lib.filters.lint import Filter as Lint
 from html5lib.serializer import HTMLSerializer, serialize
@@ -102,70 +97,83 @@ def runSerializerTest(input, expected, options):
         assert False, "Expected: %s, Received: %s" % (expected, result)
 
 
-class EncodingTestCase(unittest.TestCase):
-    def throwsWithLatin1(self, input):
-        self.assertRaises(UnicodeEncodeError, serialize_html, input, {"encoding": "iso-8859-1"})
+def throwsWithLatin1(input):
+    with pytest.raises(UnicodeEncodeError):
+        serialize_html(input, {"encoding": "iso-8859-1"})
+
+
+def testDoctypeName():
+    throwsWithLatin1([["Doctype", "\u0101"]])
+
+
+def testDoctypePublicId():
+    throwsWithLatin1([["Doctype", "potato", "\u0101"]])
+
+
+def testDoctypeSystemId():
+    throwsWithLatin1([["Doctype", "potato", "potato", "\u0101"]])
+
+
+def testCdataCharacters():
+    runSerializerTest([["StartTag", "http://www.w3.org/1999/xhtml", "style", {}], ["Characters", "\u0101"]],
+                      ["<style>&amacr;"], {"encoding": "iso-8859-1"})
+
+
+def testCharacters():
+    runSerializerTest([["Characters", "\u0101"]],
+                      ["&amacr;"], {"encoding": "iso-8859-1"})
+
+
+def testStartTagName():
+    throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "\u0101", []]])
+
 
-    def testDoctypeName(self):
-        self.throwsWithLatin1([["Doctype", "\u0101"]])
+def testAttributeName():
+    throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": None, "name": "\u0101", "value": "potato"}]]])
 
-    def testDoctypePublicId(self):
-        self.throwsWithLatin1([["Doctype", "potato", "\u0101"]])
 
-    def testDoctypeSystemId(self):
-        self.throwsWithLatin1([["Doctype", "potato", "potato", "\u0101"]])
+def testAttributeValue():
+    runSerializerTest([["StartTag", "http://www.w3.org/1999/xhtml", "span",
+                        [{"namespace": None, "name": "potato", "value": "\u0101"}]]],
+                      ["<span potato=&amacr;>"], {"encoding": "iso-8859-1"})
 
-    def testCdataCharacters(self):
-        runSerializerTest([["StartTag", "http://www.w3.org/1999/xhtml", "style", {}], ["Characters", "\u0101"]],
-                          ["<style>&amacr;"], {"encoding": "iso-8859-1"})
 
-    def testCharacters(self):
-        runSerializerTest([["Characters", "\u0101"]],
-                          ["&amacr;"], {"encoding": "iso-8859-1"})
+def testEndTagName():
+    throwsWithLatin1([["EndTag", "http://www.w3.org/1999/xhtml", "\u0101"]])
 
-    def testStartTagName(self):
-        self.throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "\u0101", []]])
 
-    def testAttributeName(self):
-        self.throwsWithLatin1([["StartTag", "http://www.w3.org/1999/xhtml", "span", [{"namespace": None, "name": "\u0101", "value": "potato"}]]])
+def testComment():
+    throwsWithLatin1([["Comment", "\u0101"]])
 
-    def testAttributeValue(self):
-        runSerializerTest([["StartTag", "http://www.w3.org/1999/xhtml", "span",
-                            [{"namespace": None, "name": "potato", "value": "\u0101"}]]],
-                          ["<span potato=&amacr;>"], {"encoding": "iso-8859-1"})
 
-    def testEndTagName(self):
-        self.throwsWithLatin1([["EndTag", "http://www.w3.org/1999/xhtml", "\u0101"]])
+@pytest.fixture
+def lxml_parser():
+    return etree.XMLParser(resolve_entities=False)
 
-    def testComment(self):
-        self.throwsWithLatin1([["Comment", "\u0101"]])
 
+@pytest.mark.skipif("lxml" not in optionals_loaded, reason="lxml not importable")
+def testEntityReplacement(lxml_parser):
+    doc = '<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&beta;</html>'
+    tree = etree.fromstring(doc, parser=lxml_parser).getroottree()
+    result = serialize(tree, tree="lxml", omit_optional_tags=False)
+    assert result == '<!DOCTYPE html SYSTEM "about:legacy-compat"><html>\u03B2</html>'
 
-if "lxml" in optionals_loaded:
-    class LxmlTestCase(unittest.TestCase):
-        def setUp(self):
-            self.parser = etree.XMLParser(resolve_entities=False)
-            self.treewalker = html5lib.getTreeWalker("lxml")
-            self.serializer = HTMLSerializer()
 
-        def testEntityReplacement(self):
-            doc = """<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&beta;</html>"""
-            tree = etree.fromstring(doc, parser=self.parser).getroottree()
-            result = serialize(tree, tree="lxml", omit_optional_tags=False)
-            self.assertEqual("""<!DOCTYPE html SYSTEM "about:legacy-compat"><html>\u03B2</html>""", result)
+@pytest.mark.skipif("lxml" not in optionals_loaded, reason="lxml not importable")
+def testEntityXML(lxml_parser):
+    doc = '<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&gt;</html>'
+    tree = etree.fromstring(doc, parser=lxml_parser).getroottree()
+    result = serialize(tree, tree="lxml", omit_optional_tags=False)
+    assert result == '<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&gt;</html>'
 
-        def testEntityXML(self):
-            doc = """<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&gt;</html>"""
-            tree = etree.fromstring(doc, parser=self.parser).getroottree()
-            result = serialize(tree, tree="lxml", omit_optional_tags=False)
-            self.assertEqual("""<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&gt;</html>""", result)
 
-        def testEntityNoResolve(self):
-            doc = """<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&beta;</html>"""
-            tree = etree.fromstring(doc, parser=self.parser).getroottree()
-            result = serialize(tree, tree="lxml", omit_optional_tags=False,
-                                          resolve_entities=False)
-            self.assertEqual("""<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&beta;</html>""", result)
+@pytest.mark.skipif("lxml" not in optionals_loaded, reason="lxml not importable")
+def testEntityNoResolve(lxml_parser):
+    doc = '<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&beta;</html>'
+    tree = etree.fromstring(doc, parser=lxml_parser).getroottree()
+    result = serialize(tree, tree="lxml", omit_optional_tags=False,
+                                  resolve_entities=False)
+    assert result == '<!DOCTYPE html SYSTEM "about:legacy-compat"><html>&beta;</html>'
 
 
 def test_serializer():

From 4768c64cd71f9bd7c4c58ca55775269926ab4031 Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <geoffers@gmail.com>
Date: Fri, 19 Jul 2013 23:10:35 +0100
Subject: [PATCH 6/7] Update characters that need be quoted in attributes in
 the serializer per spec

This also moves to using re, which seems far cleaner than the reduce-based
search previously used.
---
 html5lib/serializer/htmlserializer.py        | 12 +++++-------
 html5lib/tests/serializer-testdata/core.test |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/html5lib/serializer/htmlserializer.py b/html5lib/serializer/htmlserializer.py
index b87d9a75..6c983f22 100644
--- a/html5lib/serializer/htmlserializer.py
+++ b/html5lib/serializer/htmlserializer.py
@@ -1,10 +1,7 @@
 from __future__ import absolute_import, division, unicode_literals
 from six import text_type
 
-try:
-    from functools import reduce
-except ImportError:
-    pass
+import re
 
 from ..constants import voidElements, booleanAttributes, spaceCharacters
 from ..constants import rcdataElements, entities, xmlEntities
@@ -13,6 +10,8 @@
 
 spaceCharacters = "".join(spaceCharacters)
 
+quoteAttributeSpec = re.compile("[" + spaceCharacters + "\"'=<>`]")
+
 try:
     from codecs import register_error, xmlcharrefreplace_errors
 except ImportError:
@@ -240,11 +239,10 @@ def serialize(self, treewalker, encoding=None):
                         (k not in booleanAttributes.get(name, tuple()) and
                          k not in booleanAttributes.get("", tuple())):
                         yield self.encodeStrict("=")
-                        if self.quote_attr_values or not v:
+                        if self.quote_attr_values:
                             quote_attr = True
                         else:
-                            quote_attr = reduce(lambda x, y: x or (y in v),
-                                                spaceCharacters + ">\"'=", False)
+                            quote_attr = len(v) == 0 or quoteAttributeSpec.search(v)
                         v = v.replace("&", "&amp;")
                         if self.escape_lt_in_attrs:
                             v = v.replace("<", "&lt;")
diff --git a/html5lib/tests/serializer-testdata/core.test b/html5lib/tests/serializer-testdata/core.test
index db6bb617..d18b7bf1 100644
--- a/html5lib/tests/serializer-testdata/core.test
+++ b/html5lib/tests/serializer-testdata/core.test
@@ -42,7 +42,7 @@
         },
         {
             "expected": [
-                "<span title=foo<bar>"
+                "<span title=\"foo<bar\">"
             ],
             "input": [
                 [

From 9b8d8eb5afbc066b7fac9390f5ec75e5e8a7cab7 Mon Sep 17 00:00:00 2001
From: Geoffrey Sneddon <geoffers@gmail.com>
Date: Fri, 19 Jul 2013 23:15:47 +0100
Subject: [PATCH 7/7] Fix #11, #12: quote attributes that need escaping in
 legacy browsers

These are mostly out of the market now, so this isn't massively
needed any more; nevertheless, avoiding XSS as much as possible is
inevitably desirable.

This alters the API so that quote_attr_values is now a ternary
setting, choosing between legacy-safe behaviour, spec behaviour, and
always quoting.
---
 CHANGES.rst                                   |  7 ++
 html5lib/serializer/htmlserializer.py         | 26 +++++--
 html5lib/tests/serializer-testdata/core.test  |  2 +-
 .../tests/serializer-testdata/options.test    | 77 ++++++++++++++++++-
 html5lib/tests/test_serializer.py             | 31 ++++++++
 5 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 62a6a233..1b557816 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -33,6 +33,13 @@ Released on XXX
 * **Use scripting disabled by default (as we don't implement
   scripting).**
 
+* **Fix #11, avoiding the XSS bug potentially caused by serializer
+  allowing attribute values to be escaped out of in old browser versions,
+  changing the quote_attr_values option on serializer to take one of
+  three values, "always" (the old True value), "legacy" (the new option,
+  and the new default), and "spec" (the old False value, and the old
+  default).**
+
 
 0.9999999/1.0b8
 ~~~~~~~~~~~~~~~
diff --git a/html5lib/serializer/htmlserializer.py b/html5lib/serializer/htmlserializer.py
index 6c983f22..afe2e0e2 100644
--- a/html5lib/serializer/htmlserializer.py
+++ b/html5lib/serializer/htmlserializer.py
@@ -10,7 +10,16 @@
 
 spaceCharacters = "".join(spaceCharacters)
 
-quoteAttributeSpec = re.compile("[" + spaceCharacters + "\"'=<>`]")
+quoteAttributeSpecChars = spaceCharacters + "\"'=<>`"
+quoteAttributeSpec = re.compile("[" + quoteAttributeSpecChars + "]")
+quoteAttributeLegacy = re.compile("[" + quoteAttributeSpecChars +
+                                  "\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n"
+                                  "\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15"
+                                  "\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                                  "\x20\x2f\x60\xa0\u1680\u180e\u180f\u2000"
+                                  "\u2001\u2002\u2003\u2004\u2005\u2006\u2007"
+                                  "\u2008\u2009\u200a\u2028\u2029\u202f\u205f"
+                                  "\u3000]")
 
 try:
     from codecs import register_error, xmlcharrefreplace_errors
@@ -72,7 +81,7 @@ def htmlentityreplace_errors(exc):
 class HTMLSerializer(object):
 
     # attribute quoting options
-    quote_attr_values = False
+    quote_attr_values = "legacy"  # be secure by default
     quote_char = '"'
     use_best_quote_char = True
 
@@ -108,9 +117,9 @@ def __init__(self, **kwargs):
         inject_meta_charset=True|False
           Whether it insert a meta element to define the character set of the
           document.
-        quote_attr_values=True|False
+        quote_attr_values="legacy"|"spec"|"always"
           Whether to quote attribute values that don't require quoting
-          per HTML5 parsing rules.
+          per legacy browser behaviour, when required by the standard, or always.
         quote_char=u'"'|u"'"
           Use given quote character for attribute quoting. Default is to
           use double quote unless attribute value contains a double quote,
@@ -239,10 +248,15 @@ def serialize(self, treewalker, encoding=None):
                         (k not in booleanAttributes.get(name, tuple()) and
                          k not in booleanAttributes.get("", tuple())):
                         yield self.encodeStrict("=")
-                        if self.quote_attr_values:
+                        if self.quote_attr_values == "always" or len(v) == 0:
                             quote_attr = True
+                        elif self.quote_attr_values == "spec":
+                            quote_attr = quoteAttributeSpec.search(v) is not None
+                        elif self.quote_attr_values == "legacy":
+                            quote_attr = quoteAttributeLegacy.search(v) is not None
                         else:
-                            quote_attr = len(v) == 0 or quoteAttributeSpec.search(v)
+                            raise ValueError("quote_attr_values must be one of: "
+                                             "'always', 'spec', or 'legacy'")
                         v = v.replace("&", "&amp;")
                         if self.escape_lt_in_attrs:
                             v = v.replace("<", "&lt;")
diff --git a/html5lib/tests/serializer-testdata/core.test b/html5lib/tests/serializer-testdata/core.test
index d18b7bf1..70828d0d 100644
--- a/html5lib/tests/serializer-testdata/core.test
+++ b/html5lib/tests/serializer-testdata/core.test
@@ -242,7 +242,7 @@
         },
         {
             "expected": [
-                "<span title=foo\u000bbar>"
+                "<span title=\"foo\u000bbar\">"
             ],
             "input": [
                 [
diff --git a/html5lib/tests/serializer-testdata/options.test b/html5lib/tests/serializer-testdata/options.test
index ba48064c..eedcb3f0 100644
--- a/html5lib/tests/serializer-testdata/options.test
+++ b/html5lib/tests/serializer-testdata/options.test
@@ -41,9 +41,9 @@
                     ]
                 ]
             ],
-            "description": "quote_attr_values=true",
+            "description": "quote_attr_values='always'",
             "options": {
-                "quote_attr_values": true
+                "quote_attr_values": "always"
             }
         },
         {
@@ -64,9 +64,78 @@
                     ]
                 ]
             ],
-            "description": "quote_attr_values=true with irrelevant",
+            "description": "quote_attr_values='always' with irrelevant",
             "options": {
-                "quote_attr_values": true
+                "quote_attr_values": "always"
+            }
+        },
+        {
+            "expected": [
+                "<div class=\"foo\">"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "class",
+                            "value": "foo"
+                        }
+                    ]
+                ]
+            ],
+            "description": "non-minimized quote_attr_values='always'",
+            "options": {
+                "quote_attr_values": "always"
+            }
+        },
+        {
+            "expected": [
+                "<div class=foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "class",
+                            "value": "foo"
+                        }
+                    ]
+                ]
+            ],
+            "description": "non-minimized quote_attr_values='legacy'",
+            "options": {
+                "quote_attr_values": "legacy"
+            }
+        },
+        {
+            "expected": [
+                "<div class=foo>"
+            ],
+            "input": [
+                [
+                    "StartTag",
+                    "http://www.w3.org/1999/xhtml",
+                    "div",
+                    [
+                        {
+                            "namespace": null,
+                            "name": "class",
+                            "value": "foo"
+                        }
+                    ]
+                ]
+            ],
+            "description": "non-minimized quote_attr_values='spec'",
+            "options": {
+                "quote_attr_values": "spec"
             }
         },
         {
diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
index 33f2a3be..93276267 100644
--- a/html5lib/tests/test_serializer.py
+++ b/html5lib/tests/test_serializer.py
@@ -146,6 +146,37 @@ def testComment():
     throwsWithLatin1([["Comment", "\u0101"]])
 
 
+@pytest.mark.parametrize("c", list("\t\n\u000C\x20\r\"'=<>`"))
+def testSpecQuoteAttribute(c):
+    input_ = [["StartTag", "http://www.w3.org/1999/xhtml", "span",
+               [{"namespace": None, "name": "foo", "value": c}]]]
+    if c == '"':
+        output_ = ["<span foo='%s'>" % c]
+    else:
+        output_ = ['<span foo="%s">' % c]
+    options_ = {"quote_attr_values": "spec"}
+    runSerializerTest(input_, output_, options_)
+
+
+@pytest.mark.parametrize("c", list("\t\n\u000C\x20\r\"'=<>`"
+                                   "\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n"
+                                   "\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15"
+                                   "\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                                   "\x20\x2f\x60\xa0\u1680\u180e\u180f\u2000"
+                                   "\u2001\u2002\u2003\u2004\u2005\u2006\u2007"
+                                   "\u2008\u2009\u200a\u2028\u2029\u202f\u205f"
+                                   "\u3000"))
+def testLegacyQuoteAttribute(c):
+    input_ = [["StartTag", "http://www.w3.org/1999/xhtml", "span",
+               [{"namespace": None, "name": "foo", "value": c}]]]
+    if c == '"':
+        output_ = ["<span foo='%s'>" % c]
+    else:
+        output_ = ['<span foo="%s">' % c]
+    options_ = {"quote_attr_values": "legacy"}
+    runSerializerTest(input_, output_, options_)
+
+
 @pytest.fixture
 def lxml_parser():
     return etree.XMLParser(resolve_entities=False)