From 009dbdbdbd0d8198ab66cc826ce6d079b584a6c8 Mon Sep 17 00:00:00 2001
From: Ian Hickson <ian@hixie.ch>
Date: Mon, 16 Jun 2014 20:52:46 +0000
Subject: [PATCH 1/2] update tests to support new #script-on #script-off format

---
 tree-construction/tests16.dat  | 85 ++++++++++++++++++++++++++++++++++
 tree-construction/tests5.dat   | 13 ++++++
 tree-construction/webkit02.dat | 18 +++++++
 3 files changed, 116 insertions(+)
diff --git a/tree-construction/tests16.dat b/tree-construction/tests16.dat
index c8f6d437..b1b27652 100644
--- a/tree-construction/tests16.dat
+++ b/tree-construction/tests16.dat
@@ -1029,6 +1029,7 @@
 <!doctype html><noscript><!--<noscript></noscript>--></noscript>
 #errors
 (1,64): unexpected-end-tag
+#script-on
 #document
 | <!DOCTYPE html>
 | <html>
@@ -1038,9 +1039,22 @@
 |   <body>
 |     "-->"
 
+#data
+<!doctype html><noscript><!--<noscript></noscript>--></noscript>
+#errors
+#script-off
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noscript>
+|       <!-- <noscript></noscript> -->
+|   <body>
+
 #data
 <!doctype html><noscript><!--</noscript>X<noscript>--></noscript>
 #errors
+#script-on
 #document
 | <!DOCTYPE html>
 | <html>
@@ -1052,9 +1066,22 @@
 |     <noscript>
 |       "-->"
 
+#data
+<!doctype html><noscript><!--</noscript>X<noscript>--></noscript>
+#errors
+#script-off
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noscript>
+|       <!-- </noscript>X<noscript> -->
+|   <body>
+
 #data
 <!doctype html><noscript><iframe></noscript>X
 #errors
+#script-on
 #document
 | <!DOCTYPE html>
 | <html>
@@ -1064,6 +1091,21 @@
 |   <body>
 |     "X"
 
+#data
+<!doctype html><noscript><iframe></noscript>X
+#errors
+ * (1,34) unexpected token in head noscript
+ * (1,46) unexpected EOF
+#script-off
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|     <noscript>
+|   <body>
+|     <iframe>
+|       "</noscript>X"
+
 #data
 <!doctype html><noframes><!--<noframes></noframes>--></noframes>
 #errors
@@ -2190,6 +2232,7 @@
 #errors
 (1,10): expected-doctype-but-got-start-tag
 (1,49): unexpected-end-tag
+#script-on
 #document
 | <html>
 |   <head>
@@ -2198,10 +2241,23 @@
 |   <body>
 |     "-->"
 
+#data
+<noscript><!--<noscript></noscript>--></noscript>
+#errors
+ * (1,11) missing DOCTYPE
+#script-off
+#document
+| <html>
+|   <head>
+|     <noscript>
+|       <!-- <noscript></noscript> -->
+|   <body>
+
 #data
 <noscript><!--</noscript>X<noscript>--></noscript>
 #errors
 (1,10): expected-doctype-but-got-start-tag
+#script-on
 #document
 | <html>
 |   <head>
@@ -2212,10 +2268,24 @@
 |     <noscript>
 |       "-->"
 
+
+#data
+<noscript><!--</noscript>X<noscript>--></noscript>
+#errors
+(1,10): expected-doctype-but-got-start-tag
+#script-off
+#document
+| <html>
+|   <head>
+|     <noscript>
+|       <!-- </noscript>X<noscript> -->
+|   <body>
+
 #data
 <noscript><iframe></noscript>X
 #errors
 (1,10): expected-doctype-but-got-start-tag
+#script-on
 #document
 | <html>
 |   <head>
@@ -2224,6 +2294,21 @@
 |   <body>
 |     "X"
 
+#data
+<noscript><iframe></noscript>X
+#errors
+ * (1,11) missing DOCTYPE
+ * (1,19) unexpected token in head noscript
+ * (1,31) unexpected EOF
+#script-off
+#document
+| <html>
+|   <head>
+|     <noscript>
+|   <body>
+|     <iframe>
+|       "</noscript>X"
+
 #data
 <noframes><!--<noframes></noframes>--></noframes>
 #errors
diff --git a/tree-construction/tests5.dat b/tree-construction/tests5.dat
index 4d5fcd7a..1ef8cae4 100644
--- a/tree-construction/tests5.dat
+++ b/tree-construction/tests5.dat
@@ -188,6 +188,7 @@
 #errors
 (1,10): expected-doctype-but-got-start-tag
 (1,39): unexpected-end-tag
+#script-on
 #document
 | <html>
 |   <head>
@@ -195,3 +196,15 @@
 |       "<!--"
 |   <body>
 |     "-->"
+
+#data
+<noscript><!--</noscript>--></noscript>
+#errors
+(1,10): expected-doctype-but-got-start-tag
+#script-off
+#document
+| <html>
+|   <head>
+|     <noscript>
+|       <!-- </noscript> -->
+|   <body>
diff --git a/tree-construction/webkit02.dat b/tree-construction/webkit02.dat
index 647fcfd4..1ce90dfe 100644
--- a/tree-construction/webkit02.dat
+++ b/tree-construction/webkit02.dat
@@ -14,6 +14,7 @@
 <p id="status"><noscript><strong>A</strong></noscript><span>B</span></p>
 #errors
 (1,15): expected-doctype-but-got-start-tag
+#script-on
 #document
 | <html>
 |   <head>
@@ -25,6 +26,23 @@
 |       <span>
 |         "B"
 
+#data
+<p id="status"><noscript><strong>A</strong></noscript><span>B</span></p>
+#errors
+(1,15): expected-doctype-but-got-start-tag
+#script-off
+#document
+| <html>
+|   <head>
+|   <body>
+|     <p>
+|       id="status"
+|       <noscript>
+|         <strong>
+|           "A"
+|       <span>
+|         "B"
+
 #data
 <div><sarcasm><div></div></sarcasm></div>
 #errors

From 093674af671225505f499846b6cb9542b2dac616 Mon Sep 17 00:00:00 2001
From: Ian Hickson <ian@hixie.ch>
Date: Mon, 16 Jun 2014 19:41:20 +0000
Subject: [PATCH 2/2] Update README file to include new and recent changes to
 the format

---
 tree-construction/README.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tree-construction/README.md b/tree-construction/README.md
index bc740ad9..2aba4bf8 100644
--- a/tree-construction/README.md
+++ b/tree-construction/README.md
@@ -21,8 +21,9 @@ final newline (on the last line) removed.
 Then there must be a line that says "\#errors". It must be followed by
 one line per parse error that a conformant checker would return. It
 doesn't matter what those lines are, although they can't be
-"\#document-fragment", "\#document", or empty, the only thing that
-matters is that there be the right number of parse errors.
+"\#document-fragment", "\#document", "\#script-off", "\#script-on", or
+empty, the only thing that matters is that there be the right number
+of parse errors.
 
 Then there \*may\* be a line that says "\#document-fragment", which must
 be followed by a newline (LF), followed by a string of characters that
@@ -30,6 +31,12 @@ indicates the context element, followed by a newline (LF). If this line
 is present the "\#data" must be parsed using the HTML fragment parsing
 algorithm with the context element as context.
 
+Then there \*may\* be a line that says "\#script-off" or
+"\#script-in". If a line that says "\#script-off" is present, the
+parser must set the scripting flag to disabled. If a line that says
+"\#script-on" is present, it must set it to enabled. Otherwise, the
+test should be run in both modes.
+
 Then there must be a line that says "\#document", which must be followed
 by a dump of the tree of the parsed DOM. Each node must be represented
 by a single line. Each line must start with "| ", followed by two spaces
@@ -53,6 +60,8 @@ per parent node that the node has before the root document node.
     space, then the data and then "`>`". (The HTML parser cannot emit
     processing instructions, but scripts can, and the WebVTT to DOM
     rules can emit them.)
+-   Template contents are represented by the string "content" with the
+    children below it.
 
 The *tag name string* is the local name prefixed by a namespace
 designator. For the HTML namespace, the namespace designator is the
