- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 14 Jul 2010 19:16:55 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv8471
Modified Files:
parsing.html spec.html tokenization.html
Log Message:
Change the 'end tag' processing to not imply its own end tag, since that makes no sense. (Only affects parsing of rp and rt elements.) Also clean up the way categories are references to avoid too many negatives, and put option and optgroup in the 'special' category (should have no effect in practice). And make a loop use a label rather than jumping to a numbered step. (whatwg r5162)
[updated by splitter]
Index: parsing.html
===================================================================
RCS file: /sources/public/html5/spec/parsing.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- parsing.html 14 Jul 2010 18:17:28 -0000 1.7
+++ parsing.html 14 Jul 2010 19:16:53 -0000 1.8
@@ -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="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="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>
<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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tokenization.html 14 Jul 2010 19:06:43 -0000 1.11
+++ tokenization.html 14 Jul 2010 19:16:53 -0000 1.12
@@ -3653,12 +3653,10 @@
<code><a href="grouping-content.html#the-li-element">li</a></code> element, then act as if an end tag with the tag
name "li" had been seen, then jump to the last step.</p></li>
- <li><p>If <var title="">node</var> is not in the
- <a href="parsing.html#formatting">formatting</a> category, and is not in the
- <a href="parsing.html#ordinary">ordinary</a> category, and is not an
- <code><a href="sections.html#the-address-element">address</a></code>, <code><a href="grouping-content.html#the-div-element">div</a></code>, or <code><a href="grouping-content.html#the-p-element">p</a></code>
- element, then jump to the last step.</p></li> <!-- an element
- <foo> is in this list if the following markup:
+ <li><p>If <var title="">node</var> is in the <a href="parsing.html#special">special</a>
+ category, but is not an <code><a href="sections.html#the-address-element">address</a></code>, <code><a href="grouping-content.html#the-div-element">div</a></code>,
+ or <code><a href="grouping-content.html#the-p-element">p</a></code> element, then jump to the last step.</p></li>
+ <!-- an element <foo> is in this list if the following markup:
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><body><ol><li><foo><li>
@@ -3702,12 +3700,10 @@
tag with the same tag name as <var title="">node</var> had been
seen, then jump to the last step.</p></li>
- <li><p>If <var title="">node</var> is not in the
- <a href="parsing.html#formatting">formatting</a> category, and is not in the
- <a href="parsing.html#ordinary">ordinary</a> category, and is not an
- <code><a href="sections.html#the-address-element">address</a></code>, <code><a href="grouping-content.html#the-div-element">div</a></code>, or <code><a href="grouping-content.html#the-p-element">p</a></code>
- element, then jump to the last step.</p></li> <!-- an element
- <foo> is in this list if the following markup:
+ <li><p>If <var title="">node</var> is in the <a href="parsing.html#special">special</a>
+ category, but is not an <code><a href="sections.html#the-address-element">address</a></code>, <code><a href="grouping-content.html#the-div-element">div</a></code>,
+ or <code><a href="grouping-content.html#the-p-element">p</a></code> element, then jump to the last step.</p></li>
+ <!-- an element <foo> is in this list if the following markup:
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><body><dl><dt><foo><dt>
@@ -4044,12 +4040,11 @@
</li>
- <li><p>Let the <var title="">furthest block</var> be the
- topmost node in the <a href="parsing.html#stack-of-open-elements">stack of open elements</a> that
- is lower in the stack than the <var title="">formatting
- element</var>, and is not an element in the
- <a href="parsing.html#ordinary">ordinary</a> or <a href="parsing.html#formatting">formatting</a>
- categories. There might not be one.</p></li>
+ <li><p>Let the <var title="">furthest block</var> be the topmost
+ node in the <a href="parsing.html#stack-of-open-elements">stack of open elements</a> that is lower in
+ the stack than the <var title="">formatting element</var>, and is
+ an element in the <a href="parsing.html#special">special</a> category. There might not
+ be one.</p></li>
<li><p>If there is no <var title="">furthest block</var>,
then the UA must skip the subsequent steps and instead just
@@ -4586,10 +4581,11 @@
<ol><li><p>Initialize <var title="">node</var> to be the <a href="parsing.html#current-node">current
node</a> (the bottommost node of the stack).</p></li>
- <li><p>If <var title="">node</var> has the same tag name as
- the token, then:</p>
+ <li><p><i>Loop</i>: If <var title="">node</var> has the same tag
+ name as the token, then:</p>
- <ol><li><p><a href="#generate-implied-end-tags">Generate implied end tags</a>.</p></li>
+ <ol><li><p><a href="#generate-implied-end-tags">Generate implied end tags</a>, except
+ for elements with the same tag name as the token.</p></li>
<li><p>If the tag name of the end tag token does not match
the tag name of the <a href="parsing.html#current-node">current node</a>, this is a
@@ -4600,15 +4596,14 @@
</ol></li>
- <li><p>Otherwise, if <var title="">node</var> is in neither the
- <a href="parsing.html#formatting">formatting</a> category nor the <a href="parsing.html#ordinary">ordinary</a>
- category, then this is a <a href="parsing.html#parse-error">parse error</a>; ignore the
- token, and abort these steps.</p></li>
+ <li><p>Otherwise, if <var title="">node</var> is in the
+ <a href="parsing.html#special">special</a> category, then this is a <a href="parsing.html#parse-error">parse
+ error</a>; ignore the token, and abort these steps.</p></li>
<li><p>Set <var title="">node</var> to the previous entry in the
<a href="parsing.html#stack-of-open-elements">stack of open elements</a>.</p></li>
- <li><p>Return to step 2.</p></li>
+ <li><p>Return to the step labeld <i>loop</i>.</p></li>
</ol></dd>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1057
retrieving revision 1.1058
diff -u -d -r1.1057 -r1.1058
--- spec.html 14 Jul 2010 19:06:43 -0000 1.1057
+++ spec.html 14 Jul 2010 19:16:53 -0000 1.1058
@@ -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.4117.
+This is revision 1.4118.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2010 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Wednesday, 14 July 2010 19:16:57 UTC