1 files changed, 41 insertions, 30 deletions
diff --git a/test/data/tree-construction/tests7.dat b/test/data/tree-construction/tests7.dat
index be0b9a5..d80b618 100644
--- a/test/data/tree-construction/tests7.dat
+++ b/test/data/tree-construction/tests7.dat
@@ -12,7 +12,8 @@
 #data
 <!doctype html><table><title>X</title></table>
 #errors
-xxx
+Line: 1 Col: 29 Unexpected start tag (title) in table context caused voodoo mode.
+Line: 1 Col: 38 Unexpected end tag (title) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -25,7 +26,7 @@ xxx
 #data
 <!doctype html><head></head><title>X</title>
 #errors
-element-belongs-in-da-head
+Line: 1 Col: 35 Unexpected start tag (title) that can be in head. Moved.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -37,7 +38,7 @@ element-belongs-in-da-head
 #data
 <!doctype html></head><title>X</title>
 #errors
-element-belongs-in-da-head
+Line: 1 Col: 29 Unexpected start tag (title) that can be in head. Moved.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -49,8 +50,7 @@ element-belongs-in-da-head
 #data
 <!doctype html></body><title>X</title>
 #errors
-22: Stray end tag “body”.
-29: “title” element outside “head”.
+Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -62,7 +62,7 @@ element-belongs-in-da-head
 #data
 <!doctype html><table><meta></table>
 #errors
-meta-in-table
+Line: 1 Col: 28 Unexpected start tag (meta) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -74,7 +74,8 @@ meta-in-table
 #data
 <!doctype html><table> X<meta></table>
 #errors
-characters-in-table
+Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 30 Unexpected start tag (meta) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -88,8 +89,8 @@ characters-in-table
 #data
 <!doctype html><table>X<tr><td><table> <meta></table></table>
 #errors
-characters-in-table
-meta-in-table
+Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 45 Unexpected start tag (meta) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -125,7 +126,7 @@ meta-in-table
 #data
 <!doctype html><table> x</table>
 #errors
-node-in-table
+Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -138,7 +139,7 @@ node-in-table
 #data
 <!doctype html><table> x </table>
 #errors
-node-in-table
+Line: 1 Col: 25 Unexpected non-space characters in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -151,7 +152,7 @@ node-in-table
 #data
 <!doctype html><table><tr> x</table>
 #errors
-node-in-table-row
+Line: 1 Col: 28 Unexpected non-space characters in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -166,6 +167,7 @@ node-in-table-row
 #data
 <!doctype html><table><style> <tr>x </style> </table>
 #errors
+Line: 1 Col: 44 Unexpected end tag (style) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -179,6 +181,7 @@ node-in-table-row
 #data
 <!doctype html><table><TBODY><script> <tr>x </script> </table>
 #errors
+Line: 1 Col: 53 Unexpected end tag (script) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -193,7 +196,9 @@ node-in-table-row
 #data
 <!doctype html><table>X<style> <tr>x </style> </table>
 #errors
-xxxx
+Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 30 Unexpected start tag (style) in table context caused voodoo mode.
+Line: 1 Col: 45 Unexpected end tag (style) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -233,7 +238,7 @@ X</listing>
 #data
 <!doctype html><select><input>X
 #errors
-input-in-select
+Line: 1 Col: 30 Unexpected input start tag in the select phase.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -246,7 +251,7 @@ input-in-select
 #data
 <!doctype html><select><select>X
 #errors
-select-in-select
+Line: 1 Col: 31 Unexpected select start tag in the select phase treated as select end tag.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -258,7 +263,7 @@ select-in-select
 #data
 <!doctype html><table><input type=hidDEN></table>
 #errors
-input-in-table
+Line: 1 Col: 41 Unexpected input with type hidden in table context.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -271,7 +276,8 @@ input-in-table
 #data
 <!doctype html><table>X<input type=hidDEN></table>
 #errors
-input-in-table
+Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
+Line: 1 Col: 42 Unexpected start tag (input) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -285,7 +291,7 @@ input-in-table
 #data
 <!doctype html><table>  <input type=hidDEN></table>
 #errors
-input-in-table
+Line: 1 Col: 43 Unexpected input with type hidden in table context.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -299,7 +305,7 @@ input-in-table
 #data
 <!doctype html><table>  <input type='hidDEN'></table>
 #errors
-input-in-table
+Line: 1 Col: 45 Unexpected input with type hidden in table context.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -313,7 +319,8 @@ input-in-table
 #data
 <!doctype html><table><input type=" hidden"><input type=hidDEN></table>
 #errors
-input-in-table
+Line: 1 Col: 44 Unexpected start tag (input) in table context caused voodoo mode.
+Line: 1 Col: 63 Unexpected start tag (input) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -328,9 +335,9 @@ input-in-table
 #data
 <!doctype html><table><select>X<tr>
 #errors
-select-in-table
-unexpected-tr-in-select-in-table
-eof
+Line: 1 Col: 30 Unexpected start tag (select) in table context caused voodoo mode.
+Line: 1 Col: 35 Unexpected table element start tag (trs) in the select in table phase.
+Line: 1 Col: 35 Unexpected end of file. Expected table content.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -356,8 +363,9 @@ eof
 #data
 <!DOCTYPE hTmL><html></html>
 #errors
+Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
 #document
-| <!DOCTYPE hTmL>
+| <!DOCTYPE html>
 | <html>
 |   <head>
 |   <body>
@@ -365,8 +373,9 @@ eof
 #data
 <!DOCTYPE HTML><html></html>
 #errors
+Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
 #document
-| <!DOCTYPE HTML>
+| <!DOCTYPE html>
 | <html>
 |   <head>
 |   <body>
@@ -374,7 +383,8 @@ eof
 #data
 <body>X</body></body>
 #errors
-21: Saw an end tag after body had been closed.
+Line: 1 Col: 21 Unexpected end tag token (body) in the after body phase.
+Line: 1 Col: 21 Unexpected EOF in inner html mode.
 #document-fragment
 html
 #document
@@ -385,7 +395,8 @@ html
 #data
 <!doctype html><div><table><a>foo</a> <tr><td>bar</td> </tr></table></div>
 #errors
-unexpected-start-tag-implies-table-voodoo
+Line: 1 Col: 30 Unexpected start tag (a) in table context caused voodoo mode.
+Line: 1 Col: 37 Unexpected end tag (a) in table context caused voodoo mode.
 #document
 | <!DOCTYPE html>
 | <html>
@@ -404,9 +415,9 @@ unexpected-start-tag-implies-table-voodoo
 #data
 <div><p>a</x> b
 #errors
-5: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-13: Stray end tag “x”.
-15: End of file seen and there were open elements.
+Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
+Line: 1 Col: 13 Unexpected end tag (x). Ignored.
+Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
 #document
 | <html>
 |   <head>