hixie: Make 'emit' always come after 'switch', and remove any mention of 'stay' in the tokeniser. (whatwg r5164)

hixie: Make 'emit' always come after 'switch', and remove any mention of
'stay' in the tokeniser. (whatwg r5164)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.4119&r2=1.4120&f=h
http://html5.org/tools/web-apps-tracker?from=5163&to=5164

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4119
retrieving revision 1.4120
diff -u -d -r1.4119 -r1.4120
--- Overview.html 14 Jul 2010 19:19:22 -0000 1.4119
+++ Overview.html 14 Jul 2010 21:10:58 -0000 1.4120
@@ -53318,7 +53318,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Stay in the <a href="#data-state">data state</a>.</dd>
+   token.</dd>
 
   </dl><h5 id="character-reference-in-data-state"><span class="secno">8.2.4.2 </span><dfn>Character reference in data state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -53349,7 +53349,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Stay in the <a href="#rcdata-state">RCDATA state</a>.</dd>
+   token.</dd>
 
   </dl><h5 id="character-reference-in-rcdata-state"><span class="secno">8.2.4.4 </span><dfn>Character reference in RCDATA state</dfn></h5>
 
@@ -53376,7 +53376,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Stay in the <a href="#rawtext-state">RAWTEXT state</a>.</dd>
+   token.</dd>
 
   </dl><h5 id="script-data-state"><span class="secno">8.2.4.6 </span><dfn>Script data state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -53390,7 +53390,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Stay in the <a href="#script-data-state">script data state</a>.</dd>
+   token.</dd>
 
   </dl><h5 id="plaintext-state"><span class="secno">8.2.4.7 </span><dfn>PLAINTEXT state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -53401,7 +53401,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Stay in the <a href="#plaintext-state">PLAINTEXT state</a>.</dd>
+   token.</dd>
 
   </dl><h5 id="tag-open-state"><span class="secno">8.2.4.8 </span><dfn>Tag open state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -53480,14 +53480,13 @@
    <dd>Switch to the <a href="#self-closing-start-tag-state">self-closing start tag state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current tag token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current tag
+   token.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
    <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
-   current tag token's tag name. Stay in the <a href="#tag-name-state">tag name
-   state</a>.</dd>
+   current tag token's tag name.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -53495,7 +53494,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   tag token's tag name. Stay in the <a href="#tag-name-state">tag name state</a>.</dd>
+   tag token's tag name.</dd>
 
   </dl><h5 id="rcdata-less-than-sign-state"><span class="secno">8.2.4.11 </span><dfn>RCDATA less-than sign state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
   <!-- identical to the RAWTEXT less-than sign state, except s/RAWTEXT/RCDATA/g -->
@@ -53569,14 +53568,12 @@
    <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
    current tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#rcdata-end-tag-name-state">RCDATA end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>U+0061 LATIN SMALL LETTER A through to U+007A LATIN SMALL LETTER Z</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#rcdata-end-tag-name-state">RCDATA end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
@@ -53657,14 +53654,12 @@
    <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
    current tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#rawtext-end-tag-name-state">RAWTEXT end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>U+0061 LATIN SMALL LETTER A through to U+007A LATIN SMALL LETTER Z</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#rawtext-end-tag-name-state">RAWTEXT end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
@@ -53682,9 +53677,9 @@
    to the <a href="#script-data-end-tag-open-state">script data end tag open state</a>.</dd>
 
    <dt>U+0021 EXCLAMATION MARK (!)</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and a U+0021
-   EXCLAMATION MARK character token. Switch to the <a href="#script-data-escape-start-state">script data
-   escape start state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-escape-start-state">script data escape start state</a>. Emit
+   a U+003C LESS-THAN SIGN character token and a U+0021 EXCLAMATION
+   MARK character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
@@ -53749,14 +53744,12 @@
    <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
    current tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#script-data-end-tag-name-state">script data end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>U+0061 LATIN SMALL LETTER A through to U+007A LATIN SMALL LETTER Z</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#script-data-end-tag-name-state">script data end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
@@ -53770,8 +53763,8 @@
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Switch to the
-   <a href="#script-data-escape-start-dash-state">script data escape start dash state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-escape-start-dash-state">script data escape start dash
+   state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Reconsume the <a href="#current-input-character">current input character</a> in the
@@ -53782,8 +53775,8 @@
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Switch to the
-   <a href="#script-data-escaped-dash-dash-state">script data escaped dash dash state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-escaped-dash-dash-state">script data escaped dash dash
+   state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Reconsume the <a href="#current-input-character">current input character</a> in the
@@ -53794,8 +53787,8 @@
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Switch to the
-   <a href="#script-data-escaped-dash-state">script data escaped dash state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-escaped-dash-state">script data escaped dash state</a>. Emit
+   a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>U+003C LESS-THAN SIGN (&lt;)</dt>
    <dd><p>Switch to the <a href="#script-data-escaped-less-than-sign-state">script data escaped less-than sign
@@ -53807,15 +53800,15 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Stay in the <a href="#script-data-escaped-state">script data escaped state</a>.</dd>
+   token.</dd>
 
   </dl><h5 id="script-data-escaped-dash-state"><span class="secno">8.2.4.23 </span><dfn>Script data escaped dash state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Switch to the
-   <a href="#script-data-escaped-dash-dash-state">script data escaped dash dash state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-escaped-dash-dash-state">script data escaped dash dash
+   state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>U+003C LESS-THAN SIGN (&lt;)</dt>
    <dd><p>Switch to the <a href="#script-data-escaped-less-than-sign-state">script data escaped less-than sign
@@ -53826,32 +53819,31 @@
    <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Switch to the <a href="#script-data-escaped-state">script data escaped state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-escaped-state">script data escaped state</a>. Emit the
+   <a href="#current-input-character">current input character</a> as a character token.</dd>
 
   </dl><h5 id="script-data-escaped-dash-dash-state"><span class="secno">8.2.4.24 </span><dfn>Script data escaped dash dash state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Stay in the
-   <a href="#script-data-escaped-dash-dash-state">script data escaped dash dash state</a>.</dd>
+   <dd>Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>U+003C LESS-THAN SIGN (&lt;)</dt>
    <dd><p>Switch to the <a href="#script-data-escaped-less-than-sign-state">script data escaped less-than sign
    state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit a U+003E GREATER-THAN SIGN character token. Switch to the
-   <a href="#script-data-state">script data state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-state">script data state</a>. Emit a U+003E
+   GREATER-THAN SIGN character token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Reconsume the EOF character in the
    <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Switch to the <a href="#script-data-escaped-state">script data escaped state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-escaped-state">script data escaped state</a>. Emit the
+   <a href="#current-input-character">current input character</a> as a character token.</dd>
 
   </dl><h5 id="script-data-escaped-less-than-sign-state"><span class="secno">8.2.4.25 </span><dfn>Script data escaped less-than sign state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -53862,21 +53854,19 @@
    to the <a href="#script-data-escaped-end-tag-open-state">script data escaped end tag open state</a>.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and the
-   <a href="#current-input-character">current input character</a> as a character token. Set the
-   <var><a href="#temporary-buffer">temporary buffer</a></var> to the empty string. Append the
-   lowercase version of the <a href="#current-input-character">current input character</a> (add
-   0x0020 to the character's code point) to the <var><a href="#temporary-buffer">temporary
+   <dd>Set the <var><a href="#temporary-buffer">temporary buffer</a></var> to the empty string. Append
+   the lowercase version of the <a href="#current-input-character">current input character</a>
+   (add 0x0020 to the character's code point) to the <var><a href="#temporary-buffer">temporary
    buffer</a></var>. Switch to the <a href="#script-data-double-escape-start-state">script data double escape start
-   state</a>.</dd>
+   state</a>. Emit a U+003C LESS-THAN SIGN character token and the
+   <a href="#current-input-character">current input character</a> as a character token.</dd>
 
    <dt>U+0061 LATIN SMALL LETTER A through to U+007A LATIN SMALL LETTER Z</dt>
-   <dd>Emit a U+003C LESS-THAN SIGN character token and the
-   <a href="#current-input-character">current input character</a> as a character token. Set the
-   <var><a href="#temporary-buffer">temporary buffer</a></var> to the empty string. Append the
-   <a href="#current-input-character">current input character</a> to the <var><a href="#temporary-buffer">temporary
+   <dd>Set the <var><a href="#temporary-buffer">temporary buffer</a></var> to the empty string. Append
+   the <a href="#current-input-character">current input character</a> to the <var><a href="#temporary-buffer">temporary
    buffer</a></var>. Switch to the <a href="#script-data-double-escape-start-state">script data double escape start
-   state</a>.</dd>
+   state</a>. Emit a U+003C LESS-THAN SIGN character token and the
+   <a href="#current-input-character">current input character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit a U+003C LESS-THAN SIGN character token and reconsume the
@@ -53939,14 +53929,12 @@
    <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
    current tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#script-data-escaped-end-tag-name-state">script data escaped end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>U+0061 LATIN SMALL LETTER A through to U+007A LATIN SMALL LETTER Z</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="#current-input-character">current input
-   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the
-   <a href="#script-data-escaped-end-tag-name-state">script data escaped end tag name state</a>.</dd>
+   character</a> to the <var><a href="#temporary-buffer">temporary buffer</a></var>.</dd>
 
    <dt>Anything else</dt>
    <dd>Emit a U+003C LESS-THAN SIGN character token, a U+002F SOLIDUS
@@ -53966,23 +53954,21 @@
    <dt>U+0020 SPACE</dt>
    <dt>U+002F SOLIDUS (/)</dt>
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. If the <var><a href="#temporary-buffer">temporary buffer</a></var> is the string "<code title="">script</code>", then switch to the <a href="#script-data-double-escaped-state">script data
+   <dd>If the <var><a href="#temporary-buffer">temporary buffer</a></var> is the string "<code title="">script</code>", then switch to the <a href="#script-data-double-escaped-state">script data
    double escaped state</a>. Otherwise, switch to the <a href="#script-data-escaped-state">script
-   data escaped state</a>.</dd>
+   data escaped state</a>. Emit the <a href="#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Append the lowercase version of the <a href="#current-input-character">current input
+   <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
-   <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the <a href="#script-data-double-escape-start-state">script data double
-   escape start state</a>.</dd>
+   <var><a href="#temporary-buffer">temporary buffer</a></var>. Emit the <a href="#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>U+0061 LATIN SMALL LETTER A through to U+007A LATIN SMALL LETTER Z</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Append the <a href="#current-input-character">current input character</a> to the
-   <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the <a href="#script-data-double-escape-start-state">script data double
-   escape start state</a>.</dd>
+   <dd>Append the <a href="#current-input-character">current input character</a> to the
+   <var><a href="#temporary-buffer">temporary buffer</a></var>. Emit the <a href="#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Reconsume the <a href="#current-input-character">current input character</a> in the
@@ -53993,13 +53979,13 @@
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Switch to the
-   <a href="#script-data-double-escaped-dash-state">script data double escaped dash state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-double-escaped-dash-state">script data double escaped dash
+   state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>U+003C LESS-THAN SIGN (&lt;)</dt>
-   <dd><p>Emit a U+003C LESS-THAN SIGN character token. Switch to the
-   <a href="#script-data-double-escaped-less-than-sign-state">script data double escaped less-than sign
-   state</a>.</dd>
+   <dd><p>Switch to the <a href="#script-data-double-escaped-less-than-sign-state">script data double escaped less-than
+   sign state</a>. Emit a U+003C LESS-THAN SIGN character
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -54007,65 +53993,63 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Stay in the <a href="#script-data-double-escaped-state">script data double escaped
-   state</a>.</dd>
+   token.</dd>
 
   </dl><h5 id="script-data-double-escaped-dash-state"><span class="secno">8.2.4.30 </span><dfn>Script data double escaped dash state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Switch to the
-   <a href="#script-data-double-escaped-dash-dash-state">script data double escaped dash dash state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-double-escaped-dash-dash-state">script data double escaped dash dash
+   state</a>. Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>U+003C LESS-THAN SIGN (&lt;)</dt>
-   <dd><p>Emit a U+003C LESS-THAN SIGN character token. Switch to the
-   <a href="#script-data-double-escaped-less-than-sign-state">script data double escaped less-than sign
-   state</a>.</dd>
+   <dd><p>Switch to the <a href="#script-data-double-escaped-less-than-sign-state">script data double escaped less-than
+   sign state</a>. Emit a U+003C LESS-THAN SIGN character
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Reconsume the EOF character in the
    <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Switch to the <a href="#script-data-double-escaped-state">script data double escaped
-   state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-double-escaped-state">script data double escaped
+   state</a>. Emit the <a href="#current-input-character">current input character</a> as a
+   character token.</dd>
 
   </dl><h5 id="script-data-double-escaped-dash-dash-state"><span class="secno">8.2.4.31 </span><dfn>Script data double escaped dash dash state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002D HYPHEN-MINUS (-)</dt>
-   <dd>Emit a U+002D HYPHEN-MINUS character token. Stay in the
-   <a href="#script-data-double-escaped-dash-dash-state">script data double escaped dash dash state</a>.</dd>
+   <dd>Emit a U+002D HYPHEN-MINUS character token.</dd>
 
    <dt>U+003C LESS-THAN SIGN (&lt;)</dt>
-   <dd><p>Emit a U+003C LESS-THAN SIGN character token. Switch to the
-   <a href="#script-data-double-escaped-less-than-sign-state">script data double escaped less-than sign
-   state</a>.</dd>
+   <dd><p>Switch to the <a href="#script-data-double-escaped-less-than-sign-state">script data double escaped less-than
+   sign state</a>. Emit a U+003C LESS-THAN SIGN character
+   token.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit a U+003E GREATER-THAN SIGN character token. Switch to the
-   <a href="#script-data-state">script data state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-state">script data state</a>. Emit a U+003E
+   GREATER-THAN SIGN character token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Reconsume the EOF character in the
    <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Switch to the <a href="#script-data-double-escaped-state">script data double escaped
-   state</a>.</dd>
+   <dd>Switch to the <a href="#script-data-double-escaped-state">script data double escaped
+   state</a>. Emit the <a href="#current-input-character">current input character</a> as a
+   character token.</dd>
 
   </dl><h5 id="script-data-double-escaped-less-than-sign-state"><span class="secno">8.2.4.32 </span><dfn>Script data double escaped less-than sign state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+002F SOLIDUS (/)</dt>
-   <dd>Emit a U+002F SOLIDUS character token. Set the <var><a href="#temporary-buffer">temporary
-   buffer</a></var> to the empty string. Switch to the <a href="#script-data-double-escape-end-state">script data
-   double escape end state</a>.</dd>
+   <dd>Set the <var><a href="#temporary-buffer">temporary buffer</a></var> to the empty string. Switch
+   to the <a href="#script-data-double-escape-end-state">script data double escape end state</a>. Emit a
+   U+002F SOLIDUS character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Reconsume the <a href="#current-input-character">current input character</a> in the
@@ -54082,23 +54066,21 @@
    <dt>U+0020 SPACE</dt>
    <dt>U+002F SOLIDUS (/)</dt>
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. If the <var><a href="#temporary-buffer">temporary buffer</a></var> is the string "<code title="">script</code>", then switch to the <a href="#script-data-escaped-state">script data
+   <dd>If the <var><a href="#temporary-buffer">temporary buffer</a></var> is the string "<code title="">script</code>", then switch to the <a href="#script-data-escaped-state">script data
    escaped state</a>. Otherwise, switch to the <a href="#script-data-double-escaped-state">script data
-   double escaped state</a>.</dd>
+   double escaped state</a>. Emit the <a href="#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Append the lowercase version of the <a href="#current-input-character">current input
+   <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
-   <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the <a href="#script-data-double-escape-end-state">script data double
-   escape end state</a>.</dd>
+   <var><a href="#temporary-buffer">temporary buffer</a></var>. Emit the <a href="#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>U+0061 LATIN SMALL LETTER A through to U+007A LATIN SMALL LETTER Z</dt>
-   <dd>Emit the <a href="#current-input-character">current input character</a> as a character
-   token. Append the <a href="#current-input-character">current input character</a> to the
-   <var><a href="#temporary-buffer">temporary buffer</a></var>. Stay in the <a href="#script-data-double-escape-end-state">script data double
-   escape end state</a>.</dd>
+   <dd>Append the <a href="#current-input-character">current input character</a> to the
+   <var><a href="#temporary-buffer">temporary buffer</a></var>. Emit the <a href="#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Reconsume the <a href="#current-input-character">current input character</a> in the
@@ -54113,14 +54095,14 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#before-attribute-name-state">before attribute name state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+002F SOLIDUS (/)</dt>
    <dd>Switch to the <a href="#self-closing-start-tag-state">self-closing start tag state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current tag token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current tag
+   token.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -54164,14 +54146,13 @@
    <dd>Switch to the <a href="#before-attribute-value-state">before attribute value state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current tag token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current tag
+   token.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
    <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
-   current attribute's name. Stay in the <a href="#attribute-name-state">attribute name
-   state</a>.</dd>
+   current attribute's name.</dd>
 
    <dt>U+0022 QUOTATION MARK (")</dt>
    <dt>U+0027 APOSTROPHE (')</dt>
@@ -54185,8 +54166,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   attribute's name. Stay in the <a href="#attribute-name-state">attribute name
-   state</a>.</dd>
+   attribute's name.</dd>
 
   </dl><p>When the user agent leaves the attribute name state (and before
   emitting the tag token, if appropriate), the complete attribute's
@@ -54206,7 +54186,7 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#after-attribute-name-state">after attribute name state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+002F SOLIDUS (/)</dt>
    <dd>Switch to the <a href="#self-closing-start-tag-state">self-closing start tag state</a>.</dd>
@@ -54215,8 +54195,8 @@
    <dd>Switch to the <a href="#before-attribute-value-state">before attribute value state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current tag token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current tag
+   token.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
    <dd>Start a new attribute in the current tag token. Set that
@@ -54250,7 +54230,7 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#before-attribute-value-state">before attribute value state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+0022 QUOTATION MARK (")</dt>
    <dd>Switch to the <a href="#attribute-value-double-quoted-state">attribute value (double-quoted) state</a>.</dd>
@@ -54263,8 +54243,8 @@
    <dd>Switch to the <a href="#attribute-value-single-quoted-state">attribute value (single-quoted) state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd><a href="#parse-error">Parse error</a>. Emit the current tag token. Switch to
-   the <a href="#data-state">data state</a>.</dd>
+   <dd><a href="#parse-error">Parse error</a>. Switch to the <a href="#data-state">data
+   state</a>. Emit the current tag token.</dd>
 
    <dt>U+003C LESS-THAN SIGN (&lt;)</dt>
    <dt>U+003D EQUALS SIGN (=)</dt>
@@ -54300,8 +54280,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   attribute's value. Stay in the <a href="#attribute-value-double-quoted-state">attribute value
-   (double-quoted) state</a>.</dd>
+   attribute's value.</dd>
 
   </dl><h5 id="attribute-value-single-quoted-state"><span class="secno">8.2.4.39 </span><dfn>Attribute value (single-quoted) state</dfn></h5>
 
@@ -54322,8 +54301,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   attribute's value. Stay in the <a href="#attribute-value-single-quoted-state">attribute value
-   (single-quoted) state</a>.</dd>
+   attribute's value.</dd>
 
   </dl><h5 id="attribute-value-unquoted-state"><span class="secno">8.2.4.40 </span><dfn>Attribute value (unquoted) state</dfn></h5>
 
@@ -54342,8 +54320,8 @@
    being U+003E GREATER-THAN SIGN (&gt;).</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current tag token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current tag
+   token.</dd>
 
    <dt>U+0022 QUOTATION MARK (")</dt>
    <dt>U+0027 APOSTROPHE (')</dt>
@@ -54359,8 +54337,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   attribute's value. Stay in the <a href="#attribute-value-unquoted-state">attribute value (unquoted)
-   state</a>.</dd>
+   attribute's value.</dd>
 
   </dl><h5 id="character-reference-in-attribute-value-state"><span class="secno">8.2.4.41 </span><dfn>Character reference in attribute value state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -54391,8 +54368,8 @@
    <dd>Switch to the <a href="#self-closing-start-tag-state">self-closing start tag state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current tag token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current tag
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -54408,8 +54385,8 @@
 
   <dl class="switch"><dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd>Set the <i>self-closing flag</i> of the current tag
-   token. Emit the current tag token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   token. Switch to the <a href="#data-state">data state</a>. Emit the current tag
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -54470,9 +54447,9 @@
    <dd>Switch to the <a href="#comment-start-dash-state">comment start dash state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Switch to the
-   <a href="#data-state">data state</a>.</dd> <!-- see comment in comment end state
-   -->
+   <dd><a href="#parse-error">Parse error</a>. Switch to the <a href="#data-state">data
+   state</a>. Emit the comment token.</dd> <!-- see comment in
+   comment end state -->
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -54490,8 +54467,8 @@
    <dd>Switch to the <a href="#comment-end-state">comment end state</a></dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Switch to
-   the <a href="#data-state">data state</a>.</dd>
+   <dd><a href="#parse-error">Parse error</a>. Switch to the <a href="#data-state">data
+   state</a>. Emit the comment token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume the
@@ -54517,7 +54494,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the comment
-   token's data. Stay in the <a href="#comment-state">comment state</a>.</dd>
+   token's data.</dd>
 
   </dl><h5 id="comment-end-dash-state"><span class="secno">8.2.4.49 </span><dfn>Comment end dash state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -54541,8 +54518,8 @@
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the comment token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the comment
+   token.</dd>
 
    <dt>U+0009 CHARACTER TABULATION</dt>
    <dt>U+000A LINE FEED (LF)</dt>
@@ -54560,8 +54537,7 @@
 
    <dt>U+002D HYPHEN-MINUS (-)</dt>
    <dd><a href="#parse-error">Parse error</a>. Append a U+002D HYPHEN-MINUS
-   character (-) to the comment token's data. Stay in the
-   <a href="#comment-end-state">comment end state</a>.</dd>
+   character (-) to the comment token's data.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -54587,8 +54563,8 @@
    to the <a href="#comment-end-dash-state">comment end dash state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the comment token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the comment
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -54610,15 +54586,14 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Append the <a href="#current-input-character">current input character</a> to the comment token's data. Stay in
-   the <a href="#comment-end-space-state">comment end space state</a>.</dd>
+   <dd>Append the <a href="#current-input-character">current input character</a> to the comment token's data.</dd>
 
    <dt>U+002D HYPHEN-MINUS (-)</dt>
    <dd>Switch to the <a href="#comment-end-dash-state">comment end dash state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the comment token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the comment
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -54658,7 +54633,7 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#before-doctype-name-state">before DOCTYPE name state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
    <dd>Create a new DOCTYPE token. Set the token's name to the
@@ -54668,8 +54643,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Create a new DOCTYPE token. Set its
-   <i>force-quirks flag</i> to <i>on</i>. Emit the token. Switch to
-   the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit the token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Create a new DOCTYPE token. Set its
@@ -54693,14 +54668,13 @@
    <dd>Switch to the <a href="#after-doctype-name-state">after DOCTYPE name state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current DOCTYPE token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current DOCTYPE
+   token.</dd>
 
    <dt>U+0041 LATIN CAPITAL LETTER A through to U+005A LATIN CAPITAL LETTER Z</dt>
    <dd>Append the lowercase version of the <a href="#current-input-character">current input
    character</a> (add 0x0020 to the character's code point) to the
-   current DOCTYPE token's name. Stay in the <a href="#doctype-name-state">DOCTYPE name
-   state</a>.</dd>
+   current DOCTYPE token's name.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -54709,8 +54683,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   DOCTYPE token's name. Stay in the <a href="#doctype-name-state">DOCTYPE name
-   state</a>.</dd>
+   DOCTYPE token's name.</dd>
 
   </dl><h5 id="after-doctype-name-state"><span class="secno">8.2.4.56 </span><dfn>After DOCTYPE name state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -54721,11 +54694,11 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#after-doctype-name-state">after DOCTYPE name state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current DOCTYPE token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current DOCTYPE
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -54776,8 +54749,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -54798,7 +54771,7 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#before-doctype-public-identifier-state">before DOCTYPE public identifier state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+0022 QUOTATION MARK (")</dt>
    <dd>Set the DOCTYPE token's public identifier to the empty string
@@ -54812,8 +54785,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -54834,8 +54807,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -54844,8 +54817,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current DOCTYPE
-   token's public identifier. Stay in the <a href="#doctype-public-identifier-double-quoted-state">DOCTYPE public
-   identifier (double-quoted) state</a>.</dd>
+   token's public identifier.</dd>
 
   </dl><h5 id="doctype-public-identifier-single-quoted-state"><span class="secno">8.2.4.60 </span><dfn>DOCTYPE public identifier (single-quoted) state</dfn></h5>
 
@@ -54856,8 +54828,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -54866,8 +54838,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current DOCTYPE
-   token's public identifier. Stay in the <a href="#doctype-public-identifier-single-quoted-state">DOCTYPE public
-   identifier (single-quoted) state</a>.</dd>
+   token's public identifier.</dd>
 
   </dl><h5 id="after-doctype-public-identifier-state"><span class="secno">8.2.4.61 </span><dfn>After DOCTYPE public identifier state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -54882,8 +54853,8 @@
    identifiers state</a>.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current DOCTYPE token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current DOCTYPE
+   token.</dd>
 
    <dt>U+0022 QUOTATION MARK (")</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's system
@@ -54914,12 +54885,11 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#between-doctype-public-and-system-identifiers-state">between DOCTYPE public and system identifiers
-   state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current DOCTYPE token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current DOCTYPE
+   token.</dd>
 
    <dt>U+0022 QUOTATION MARK (")</dt>
    <dd>Set the DOCTYPE token's system identifier to the empty string
@@ -54965,8 +54935,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -54987,7 +54957,7 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#before-doctype-system-identifier-state">before DOCTYPE system identifier state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+0022 QUOTATION MARK (")</dt>
    <dd>Set the DOCTYPE token's system identifier to the empty string
@@ -55001,8 +54971,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -55024,8 +54994,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -55034,8 +55004,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   DOCTYPE token's system identifier. Stay in the <a href="#doctype-system-identifier-double-quoted-state">DOCTYPE system
-   identifier (double-quoted) state</a>.</dd>
+   DOCTYPE token's system identifier.</dd>
 
   </dl><h5 id="doctype-system-identifier-single-quoted-state"><span class="secno">8.2.4.66 </span><dfn>DOCTYPE system identifier (single-quoted) state</dfn></h5>
 
@@ -55047,8 +55016,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
-   <i>force-quirks flag</i> to <i>on</i>. Emit that DOCTYPE
-   token. Switch to the <a href="#data-state">data state</a>.</dd>
+   <i>force-quirks flag</i> to <i>on</i>. Switch to the <a href="#data-state">data
+   state</a>. Emit that DOCTYPE token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -55057,8 +55026,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="#current-input-character">current input character</a> to the current
-   DOCTYPE token's system identifier. Stay in the <a href="#doctype-system-identifier-single-quoted-state">DOCTYPE system
-   identifier (single-quoted) state</a>.</dd>
+   DOCTYPE token's system identifier.</dd>
 
   </dl><h5 id="after-doctype-system-identifier-state"><span class="secno">8.2.4.67 </span><dfn>After DOCTYPE system identifier state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -55069,12 +55037,11 @@
    <dt>U+000C FORM FEED (FF)</dt>
    <!--<dt>U+000D CARRIAGE RETURN (CR)</dt>-->
    <dt>U+0020 SPACE</dt>
-   <dd>Stay in the <a href="#after-doctype-system-identifier-state">after DOCTYPE system identifier
-   state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the current DOCTYPE token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the current DOCTYPE
+   token.</dd>
 
    <dt>EOF</dt>
    <dd><a href="#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -55091,15 +55058,15 @@
   <p>Consume the <a href="#next-input-character">next input character</a>:</p>
 
   <dl class="switch"><dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the DOCTYPE token. Switch to the <a href="#data-state">data
-   state</a>.</dd>
+   <dd>Switch to the <a href="#data-state">data state</a>. Emit the DOCTYPE
+   token.</dd>
 
    <dt>EOF</dt>
    <dd>Emit the DOCTYPE token. Reconsume the EOF character in the
    <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Stay in the <a href="#bogus-doctype-state">bogus DOCTYPE state</a>.</dd>
+   <dd>Ignore the character.</dd>
 
   </dl><h5 id="cdata-section-state"><span class="secno">8.2.4.69 </span><dfn>CDATA section state</dfn></h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p>
 
@@ -58278,9 +58245,9 @@
    <dd>
 
     <p>If the <a href="#stack-of-open-elements">stack of open elements</a> does not <a href="#has-an-element-in-table-scope" title="has an element in table scope">have an element in table
-    scope</a> with the same tag name as that of the token
-    (which can only happen for "tbody", "tfoot" and "thead", or,
-    in the <a href="#fragment-case">fragment case</a>), then this is a <a href="#parse-error">parse
+    scope</a> with the same tag name as that of the token (which
+    can only happen for "tbody", "tfoot" and "thead", or in the
+    <a href="#fragment-case">fragment case</a>), then this is a <a href="#parse-error">parse
     error</a> and the token must be ignored.</p>
 
     <p>Otherwise, <a href="#close-the-cell">close the cell</a> (see below) and

Received on Wednesday, 14 July 2010 21:11:44 UTC