- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 25 Feb 2010 02:21:51 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv1691
Modified Files:
Overview.html
Log Message:
Make some algorithms things more consistent with other algorithms. (whatwg r4804)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3851
retrieving revision 1.3852
diff -u -d -r1.3851 -r1.3852
--- Overview.html 25 Feb 2010 02:10:06 -0000 1.3851
+++ Overview.html 25 Feb 2010 02:21:47 -0000 1.3852
@@ -24303,7 +24303,7 @@
<p>If there is no cell covering slot (<var title="">x</var>,
<var title="">y</var>), or if there is more than one cell
covering slot (<var title="">x</var>, <var title="">y</var>),
- return to the substep marked <i>loop</i>.</p>
+ return to the substep labeled <i>loop</i>.</p>
</li>
@@ -24377,7 +24377,7 @@
<li>
- <p>Return to the step marked <i>loop</i>.</p>
+ <p>Return to the step labeled <i>loop</i>.</p>
</li>
@@ -50475,7 +50475,7 @@
<li>One or more <a href="#space-character" title="space character">space characters</a>.</li>
<li>A U+0022 QUOTATION MARK or U+0027 APOSTROPHE character (the <i>quote mark</i>).</li>
<li>The literal string "<code><a href="#about:legacy-compat">about:legacy-compat</a></code>".</li>
- <li>A matching U+0022 QUOTATION MARK or U+0027 APOSTROPHE character (i.e. the same character as in the earlier step marked <i>quote mark</i>).</li>
+ <li>A matching U+0022 QUOTATION MARK or U+0027 APOSTROPHE character (i.e. the same character as in the earlier step labeled <i>quote mark</i>).</li>
</ol><p class="note">In other words, <code><!DOCTYPE HTML SYSTEM
"about:legacy-compat"></code> or <code><!DOCTYPE HTML SYSTEM
'about:legacy-compat'></code>, case-insensitively except for the bit
@@ -51943,38 +51943,38 @@
<li>If <var title="">node</var> is a <code><a href="#the-select-element">select</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-inselect" title="insertion mode: in select">in select</a>" and jump to the
- step marked <i title="">end</i>. (<a href="#fragment-case">fragment case</a>)</li>
+ step labeled <i title="">end</i>. (<a href="#fragment-case">fragment case</a>)</li>
<li>If <var title="">node</var> is a <code><a href="#the-td-element">td</a></code> or
<code><a href="#the-th-element">th</a></code> element and <var title="">last</var> is false, then
switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-intd" title="insertion
- mode: in cell">in cell</a>" and jump to the step marked <i title="">end</i>.</li>
+ mode: in cell">in cell</a>" and jump to the step labeled <i title="">end</i>.</li>
<li>If <var title="">node</var> is a <code><a href="#the-tr-element">tr</a></code> element, then
switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-intr" title="insertion
- mode: in row">in row</a>" and jump to the step marked <i title="">end</i>.</li>
+ mode: in row">in row</a>" and jump to the step labeled <i title="">end</i>.</li>
<li>If <var title="">node</var> is a <code><a href="#the-tbody-element">tbody</a></code>,
<code><a href="#the-thead-element">thead</a></code>, or <code><a href="#the-tfoot-element">tfoot</a></code> element, then switch the
<a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-intbody" title="insertion mode: in
- table body">in table body</a>" and jump to the step marked <i title="">end</i>.</li>
+ table body">in table body</a>" and jump to the step labeled <i title="">end</i>.</li>
<li>If <var title="">node</var> is a <code><a href="#the-caption-element">caption</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incaption" title="insertion mode: in caption">in caption</a>" and jump to
- the step marked <i title="">end</i>.</li>
+ the step labeled <i title="">end</i>.</li>
<li>If <var title="">node</var> is a <code><a href="#the-colgroup-element">colgroup</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incolgroup" title="insertion mode: in column group">in column group</a>" and
- jump to the step marked <i title="">end</i>. (<a href="#fragment-case">fragment
+ jump to the step labeled <i title="">end</i>. (<a href="#fragment-case">fragment
case</a>)</li>
<li>If <var title="">node</var> is a <code><a href="#the-table-element">table</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-intable" title="insertion mode: in table">in table</a>" and jump to the
- step marked <i title="">end</i>.</li>
+ step labeled <i title="">end</i>.</li>
<li>If <var title="">node</var> is a <code><a href="#the-head-element-0">head</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-inbody" title="insertion mode: in body">in body</a>" ("<a href="#parsing-main-inbody" title="insertion mode: in body">in body</a>"! <em> not "<a href="#parsing-main-inhead" title="insertion mode: in head">in head</a>"</em>!) and jump to
- the step marked <i title="">end</i>. (<a href="#fragment-case">fragment
+ the step labeled <i title="">end</i>. (<a href="#fragment-case">fragment
case</a>)</li> <!-- This is only here for now in case people
think that the spec accidentally omitted it and try to "fix"
it. Note that noscript-in-head is also handled this way. This is
@@ -51989,11 +51989,11 @@
<li>If <var title="">node</var> is a <code><a href="#the-body-element-0">body</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-inbody" title="insertion mode: in body">in body</a>" and jump to the
- step marked <i title="">end</i>.</li>
+ step labeled <i title="">end</i>.</li>
<li>If <var title="">node</var> is a <code><a href="#frameset">frameset</a></code> element,
then switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-inframeset" title="insertion mode: in frameset">in frameset</a>" and jump to
- the step marked <i title="">end</i>. (<a href="#fragment-case">fragment
+ the step labeled <i title="">end</i>. (<a href="#fragment-case">fragment
case</a>)</li>
<li>If <var title="">node</var> is an <code><a href="#the-html-element-0">html</a></code> element,
@@ -52002,7 +52002,7 @@
to "<a href="#the-before-head-insertion-mode" title="insertion mode: before head">before
head</a>"<!--, otherwise, switch the <span>insertion mode</span>
to "<span title="insertion mode: after head">after head</span>".-->
- Then, <!-- in either case, --> jump to the step marked <i title="">end</i>. (<a href="#fragment-case">fragment case</a>)</li> <!-- if the
+ Then, <!-- in either case, --> jump to the step labeled <i title="">end</i>. (<a href="#fragment-case">fragment case</a>)</li> <!-- if the
head element pointer can ever be non-null when we're going through
these steps, we'll need to uncomment out the commented-out bits -->
@@ -52012,12 +52012,12 @@
<li>If <var title="">last</var> is true, then switch the
<a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-inbody" title="insertion mode: in
- body">in body</a>" and jump to the step marked <i title="">end</i>. (<a href="#fragment-case">fragment case</a>)</li>
+ body">in body</a>" and jump to the step labeled <i title="">end</i>. (<a href="#fragment-case">fragment case</a>)</li>
<li>Let <var title="">node</var> now be the node before <var title="">node</var> in the <a href="#stack-of-open-elements">stack of open
elements</a>.</li>
- <li>Return to the step marked <i>loop</i>.</li>
+ <li>Return to the step labeled <i>loop</i>.</li>
<li><i>End</i>: If <var title="">foreign</var> is true, switch the
<a href="#secondary-insertion-mode">secondary insertion mode</a> to whatever the
@@ -56531,7 +56531,7 @@
node</a> (the bottommost node of the stack).</li>
<li><p>If <var title="">node</var> has the same tag name as
- the end tag token, then:</p>
+ the token, then:</p>
<ol><li><p><a href="#generate-implied-end-tags">Generate implied end tags</a>.</li>
@@ -57281,8 +57281,9 @@
with the same tag name as the token, then this is a
<a href="#parse-error">parse error</a>.</p>
- <p>Pop elements from this stack until an element with the same
- tag name as the token has been popped from the stack.</p>
+ <p>Pop elements from the <a href="#stack-of-open-elements">stack of open elements</a> stack
+ until an element with the same tag name as the token has been
+ popped from the stack.</p>
<p><a href="#clear-the-list-of-active-formatting-elements-up-to-the-last-marker">Clear the list of active formatting elements up to
the last marker</a>.</p>
Received on Thursday, 25 February 2010 02:21:52 UTC