W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2010

html5/spec parsing.html,1.8,1.9 spec.html,1.1059,1.1060 tokenization.html,1.13,1.14

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 14 Jul 2010 21:17:00 +0000
To: public-html-commits@w3.org
Message-Id: <E1OZ9K8-0007J7-Q9@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv27967

Modified Files:
	parsing.html spec.html tokenization.html 
Log Message:
Revert a recent change making <option> and <optgroup> special; they're actually not, but I forgot. (whatwg r5165)

[updated by splitter]


Index: parsing.html
===================================================================
RCS file: /sources/public/html5/spec/parsing.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- parsing.html	14 Jul 2010 19:16:53 -0000	1.8
+++ parsing.html	14 Jul 2010 21:16:58 -0000	1.9
@@ -1425,14 +1425,14 @@
    <code><a href="obsolete.html#the-marquee-element">marquee</a></code>, <code><a href="interactive-elements.html#menus">menu</a></code>, <code><a href="semantics.html#meta">meta</a></code>,
    <code><a href="sections.html#the-nav-element">nav</a></code>, <code><a href="obsolete.html#noembed">noembed</a></code>, <code><a href="obsolete.html#noframes">noframes</a></code>,
    <code><a href="scripting-1.html#the-noscript-element">noscript</a></code>, <code><a href="the-iframe-element.html#the-object-element">object</a></code>, <code><a href="grouping-content.html#the-ol-element">ol</a></code>,
-   <code><a href="the-button-element.html#the-optgroup-element">optgroup</a></code>, <code><a href="the-button-element.html#the-option-element">option</a></code>, <code><a href="grouping-content.html#the-p-element">p</a></code>,
-   <code><a href="the-iframe-element.html#the-param-element">param</a></code>, <code><a href="obsolete.html#plaintext">plaintext</a></code>, <code><a href="grouping-content.html#the-pre-element">pre</a></code>,
-   <code><a href="scripting-1.html#script">script</a></code>, <code><a href="sections.html#the-section-element">section</a></code>, <code><a href="the-button-element.html#the-select-element">select</a></code>,
-   <code><a href="semantics.html#the-style-element">style</a></code>, <code><a href="tabular-data.html#the-table-element">table</a></code>, <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>,
-   <code><a href="tabular-data.html#the-td-element">td</a></code>, <code><a href="the-button-element.html#the-textarea-element">textarea</a></code>, <code><a href="tabular-data.html#the-tfoot-element">tfoot</a></code>,
-   <code><a href="tabular-data.html#the-th-element">th</a></code>, <code><a href="tabular-data.html#the-thead-element">thead</a></code>, <code><a href="semantics.html#the-title-element-0">title</a></code>,
-   <code><a href="tabular-data.html#the-tr-element">tr</a></code>, <code><a href="grouping-content.html#the-ul-element">ul</a></code>, <code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code>,
-   <code><a href="obsolete.html#xmp">xmp</a></code>, and SVG's <code>foreignObject</code>.</p></dd>
+   <code><a href="grouping-content.html#the-p-element">p</a></code>, <code><a href="the-iframe-element.html#the-param-element">param</a></code>, <code><a href="obsolete.html#plaintext">plaintext</a></code>,
+   <code><a href="grouping-content.html#the-pre-element">pre</a></code>, <code><a href="scripting-1.html#script">script</a></code>, <code><a href="sections.html#the-section-element">section</a></code>,
+   <code><a href="the-button-element.html#the-select-element">select</a></code>, <code><a href="semantics.html#the-style-element">style</a></code>, <code><a href="tabular-data.html#the-table-element">table</a></code>,
+   <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>, <code><a href="tabular-data.html#the-td-element">td</a></code>, <code><a href="the-button-element.html#the-textarea-element">textarea</a></code>,
+   <code><a href="tabular-data.html#the-tfoot-element">tfoot</a></code>, <code><a href="tabular-data.html#the-th-element">th</a></code>, <code><a href="tabular-data.html#the-thead-element">thead</a></code>,
+   <code><a href="semantics.html#the-title-element-0">title</a></code>, <code><a href="tabular-data.html#the-tr-element">tr</a></code>, <code><a href="grouping-content.html#the-ul-element">ul</a></code>,
+   <code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code>, <code><a href="obsolete.html#xmp">xmp</a></code>, and SVG's
+   <code>foreignObject</code>.</p></dd>
 
    <dt><dfn id="formatting">Formatting</dfn></dt>
    <dd><p>The following HTML elements are those that end up in the

Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/spec/tokenization.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- tokenization.html	14 Jul 2010 19:26:46 -0000	1.13
+++ tokenization.html	14 Jul 2010 21:16:58 -0000	1.14
@@ -411,7 +411,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="parsing.html#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>
 
@@ -442,7 +442,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="parsing.html#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>
 
@@ -469,7 +469,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="parsing.html#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>
 
@@ -483,7 +483,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="parsing.html#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>
 
@@ -494,7 +494,7 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="parsing.html#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>
 
@@ -573,14 +573,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="parsing.html#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="parsing.html#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -588,7 +587,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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 -->
@@ -662,14 +661,12 @@
    <dd>Append the lowercase version of the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="parsing.html#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
@@ -750,14 +747,12 @@
    <dd>Append the lowercase version of the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="parsing.html#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
@@ -775,9 +770,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
@@ -842,14 +837,12 @@
    <dd>Append the lowercase version of the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="parsing.html#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
@@ -863,8 +856,8 @@
   <p>Consume the <a href="parsing.html#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="parsing.html#current-input-character">current input character</a> in the
@@ -875,8 +868,8 @@
   <p>Consume the <a href="parsing.html#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="parsing.html#current-input-character">current input character</a> in the
@@ -887,8 +880,8 @@
   <p>Consume the <a href="parsing.html#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
@@ -900,15 +893,15 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="parsing.html#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="parsing.html#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
@@ -919,32 +912,31 @@
    <a href="#data-state">data state</a>.</dd>
 
    <dt>Anything else</dt>
-   <dd>Emit the <a href="parsing.html#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="parsing.html#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="parsing.html#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>.</p></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="parsing.html#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="parsing.html#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="parsing.html#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>
 
@@ -955,21 +947,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="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#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
@@ -1032,14 +1022,12 @@
    <dd>Append the lowercase version of the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> to the current
    tag token's tag name. Append the <a href="parsing.html#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
@@ -1059,23 +1047,21 @@
    <dt>U+0020 SPACE</dt>
    <dt>U+002F SOLIDUS (/)</dt>
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> as a character
-   token. Append the lowercase version of the <a href="parsing.html#current-input-character">current input
+   <dd>Append the lowercase version of the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> as a character
-   token. Append the <a href="parsing.html#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="parsing.html#current-input-character">current input character</a> to the
+   <var><a href="#temporary-buffer">temporary buffer</a></var>. Emit the <a href="parsing.html#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Reconsume the <a href="parsing.html#current-input-character">current input character</a> in the
@@ -1086,13 +1072,13 @@
   <p>Consume the <a href="parsing.html#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>.</p></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.</p></dd>
 
    <dt>EOF</dt>
    <dd><a href="parsing.html#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -1100,65 +1086,63 @@
 
    <dt>Anything else</dt>
    <dd>Emit the <a href="parsing.html#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="parsing.html#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>.</p></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.</p></dd>
 
    <dt>EOF</dt>
    <dd><a href="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#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>.</p></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.</p></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="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> in the
@@ -1175,23 +1159,21 @@
    <dt>U+0020 SPACE</dt>
    <dt>U+002F SOLIDUS (/)</dt>
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
-   <dd>Emit the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> as a character
-   token. Append the lowercase version of the <a href="parsing.html#current-input-character">current input
+   <dd>Append the lowercase version of the <a href="parsing.html#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="parsing.html#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="parsing.html#current-input-character">current input character</a> as a character
-   token. Append the <a href="parsing.html#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="parsing.html#current-input-character">current input character</a> to the
+   <var><a href="#temporary-buffer">temporary buffer</a></var>. Emit the <a href="parsing.html#current-input-character">current input
+   character</a> as a character token.</dd>
 
    <dt>Anything else</dt>
    <dd>Reconsume the <a href="parsing.html#current-input-character">current input character</a> in the
@@ -1206,14 +1188,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
@@ -1257,14 +1239,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="parsing.html#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>
@@ -1278,8 +1259,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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
@@ -1299,7 +1279,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>
@@ -1308,8 +1288,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
@@ -1343,7 +1323,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>
@@ -1356,8 +1336,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="parsing.html#parse-error">Parse error</a>. Emit the current tag token. Switch to
-   the <a href="#data-state">data state</a>.</dd>
+   <dd><a href="parsing.html#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>
@@ -1393,8 +1373,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -1415,8 +1394,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -1435,8 +1413,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>
@@ -1452,8 +1430,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -1484,8 +1461,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="parsing.html#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -1501,8 +1478,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="parsing.html#parse-error">Parse error</a>. Reconsume the EOF character in the
@@ -1563,9 +1540,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="parsing.html#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="parsing.html#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="parsing.html#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -1583,8 +1560,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="parsing.html#parse-error">Parse error</a>. Emit the comment token. Switch to
-   the <a href="#data-state">data state</a>.</dd>
+   <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Emit the comment token. Reconsume the
@@ -1610,7 +1587,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -1634,8 +1611,8 @@
   <p>Consume the <a href="parsing.html#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>
@@ -1653,8 +1630,7 @@
 
    <dt>U+002D HYPHEN-MINUS (-)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -1680,8 +1656,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="parsing.html#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -1703,15 +1679,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="parsing.html#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="parsing.html#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="parsing.html#parse-error">Parse error</a>. Emit the comment token. Reconsume
@@ -1751,7 +1726,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
@@ -1761,8 +1736,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Create a new DOCTYPE token. Set its
@@ -1786,14 +1761,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="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -1802,8 +1776,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -1814,11 +1787,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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -1869,8 +1842,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -1891,7 +1864,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
@@ -1905,8 +1878,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -1927,8 +1900,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -1937,8 +1910,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -1949,8 +1921,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -1959,8 +1931,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -1975,8 +1946,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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's system
@@ -2007,12 +1978,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
@@ -2058,8 +2028,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -2080,7 +2050,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
@@ -2094,8 +2064,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -2117,8 +2087,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -2127,8 +2097,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -2140,8 +2109,8 @@
 
    <dt>U+003E GREATER-THAN SIGN (&gt;)</dt>
    <dd><a href="parsing.html#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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -2150,8 +2119,7 @@
 
    <dt>Anything else</dt>
    <dd>Append the <a href="parsing.html#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>
 
@@ -2162,12 +2130,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="parsing.html#parse-error">Parse error</a>. Set the DOCTYPE token's
@@ -2184,15 +2151,15 @@
   <p>Consume the <a href="parsing.html#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>
 
@@ -5371,9 +5338,9 @@
    <dd>
 
     <p>If the <a href="parsing.html#stack-of-open-elements">stack of open elements</a> does not <a href="parsing.html#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="the-end.html#fragment-case">fragment case</a>), then this is a <a href="parsing.html#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="the-end.html#fragment-case">fragment case</a>), then this is a <a href="parsing.html#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

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1059
retrieving revision 1.1060
diff -u -d -r1.1059 -r1.1060
--- spec.html	14 Jul 2010 19:26:46 -0000	1.1059
+++ spec.html	14 Jul 2010 21:16:58 -0000	1.1060
@@ -333,7 +333,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">author edition</a>.
-This is revision 1.4119.
+This is revision 1.4121.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2010 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Wednesday, 14 July 2010 21:17:03 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 14 July 2010 21:17:03 GMT