- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 30 Jun 2008 22:47:27 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec In directory hutz:/tmp/cvs-serv3840 Modified Files: Overview.html Log Message: Make the language around parse errors and ignoring tokens more consistent. (bug 5792) (credit: hs) (whatwg r1832) Index: Overview.html =================================================================== RCS file: /sources/public/html5/spec/Overview.html,v retrieving revision 1.1020 retrieving revision 1.1021 diff -u -d -r1.1020 -r1.1021 --- Overview.html 30 Jun 2008 21:58:48 -0000 1.1020 +++ Overview.html 30 Jun 2008 22:47:24 -0000 1.1021 @@ -47605,8 +47605,8 @@ <dd> <p>If the <a href="#form-element"><code title=form>form</code> element - pointer</a> is not null, ignore the token with a <a href="#parse2">parse - error</a>.</p> + pointer</a> is not null, then this is a <a href="#parse2">parse + error</a>; ignore the token.</p> <p>Otherwise:</p> @@ -47748,7 +47748,7 @@ <p>If the <a href="#stack">stack of open elements</a> does not <a href="#have-an" title="has an element in scope">have an element in scope</a> with the same tag name as that of the token, then this is a <a - href="#parse2">parse error</a>.</p> + href="#parse2">parse error</a>; ignore the token.</p> <p>Otherwise, run these steps:</p> @@ -47778,7 +47778,7 @@ <p>If the <a href="#stack">stack of open elements</a> does not <a href="#have-an" title="has an element in scope">have an element in scope</a> with the same tag name as that of the token, then this is a <a - href="#parse2">parse error</a>.</p> + href="#parse2">parse error</a>; ignore the token.</p> <p>Otherwise, run these steps:</p> @@ -47835,7 +47835,7 @@ <p>If the <a href="#stack">stack of open elements</a> does not <a href="#have-an" title="has an element in scope">have an element in scope</a> with the same tag name as that of the token, then this is a <a - href="#parse2">parse error</a>.</p> + href="#parse2">parse error</a>; ignore the token.</p> <p>Otherwise, run these steps:</p> @@ -47864,10 +47864,10 @@ <p>If the <a href="#stack">stack of open elements</a> does not <a href="#have-an" title="has an element in scope">have an element in scope</a> whose tag name is one of "h1", "h2", "h3", "h4", "h5", or - "h6", then this is a <a href="#parse2">parse error</a>. - <!-- XXX quirk: Act as if - a start tag with the tag name given in the token had been seen, - then reprocess the current token. --></p> + "h6", then this is a <a href="#parse2">parse error</a>; ignore the + token. <!-- + XXX quirk: Act as if a start tag with the tag name given in the + token had been seen, then reprocess the current token. --></p> <p>Otherwise, run these steps:</p> @@ -47946,7 +47946,7 @@ <p>If the <a href="#stack">stack of open elements</a> <a href="#have-an" title="has an element in scope">has a <code>nobr</code> element in - scope</a>, then this is a <a href="#parse2">parse error</a>. Act as if + scope</a>, then this is a <a href="#parse2">parse error</a>; act as if an end tag with the tag name "nobr" had been seen, then once again <a href="#reconstruct">reconstruct the active formatting elements</a>, if any.</p> @@ -47978,8 +47978,8 @@ <p>If there is no such node, or, if that node is also in the <a href="#stack">stack of open elements</a> but the element is not <a href="#have-an" title="has an element in scope">in scope</a>, then - this is a <a href="#parse2">parse error</a>. Abort these steps. The - token is ignored.</p> + this is a <a href="#parse2">parse error</a>; ignore the token, and + abort these steps.</p> <p>Otherwise, if there is such a node, but that node is not in the <a href="#stack">stack of open elements</a>, then this is a <a @@ -48163,7 +48163,7 @@ <p>If the <a href="#stack">stack of open elements</a> does not <a href="#have-an" title="has an element in scope">have an element in scope</a> with the same tag name as that of the token, then this is a <a - href="#parse2">parse error</a>.</p> + href="#parse2">parse error</a>; ignore the token.</p> <p>Otherwise, run these steps:</p> @@ -48543,7 +48543,7 @@ <dt>Any other end tag <dd> - <p>Run the following algorithm:</p> + <p>Run the following steps:</p> <ol> <li> @@ -48566,15 +48566,15 @@ <li> <p>Pop all the nodes from the <a href="#current5">current node</a> up to <var title="">node</var>, including <var title="">node</var>, - then stop this algorithm. + then stop these steps. </ol> <li> <p>Otherwise, if <var title="">node</var> is in neither the <a href="#formatting">formatting</a> category nor the <a href="#phrasing1">phrasing</a> category, then this is a <a - href="#parse2">parse error</a>. Stop this algorithm. The end tag token - is ignored. + href="#parse2">parse error</a>; ignore the token, and abort these + steps. <li> <p>Set <var title="">node</var> to the previous entry in the <a @@ -48885,7 +48885,7 @@ <dd> <p>If the <a href="#current5">current node</a> is the root <code><a href="#html">html</a></code> element, then this is a <a - href="#parse2">parse error</a>, ignore the token. (<a + href="#parse2">parse error</a>; ignore the token. (<a href="#fragment">fragment case</a>)</p> <p>Otherwise, pop the <a href="#current5">current node</a> (which will be @@ -49264,14 +49264,14 @@ <p>If the <a href="#current5">current node</a> is an <code>optgroup</code> element, then pop that node from the <a href="#stack">stack of open elements</a>. Otherwise, this is a <a - href="#parse2">parse error</a>, ignore the token.</p> + href="#parse2">parse error</a>; ignore the token.</p> <dt>An end tag whose tag name is "option" <dd> <p>If the <a href="#current5">current node</a> is an <code>option</code> element, then pop that node from the <a href="#stack">stack of open - elements</a>. Otherwise, this is a <a href="#parse2">parse error</a>, + elements</a>. Otherwise, this is a <a href="#parse2">parse error</a>; ignore the token.</p> <dt>An end tag whose tag name is "select"
Received on Monday, 30 June 2008 22:48:04 UTC