[html5] r1265 - /
whatwg at whatwg.org
whatwg at whatwg.org
Wed Feb 27 13:26:39 PST 2008
Author: ianh
Date: 2008-02-27 13:26:36 -0800 (Wed, 27 Feb 2008)
New Revision: 1265
Modified:
index
source
Log:
[t] (1) Make the processing of '<' characters in attributes while doing the encoding-scan parse match the behaviour of the main parser. Also, various minor editorial fixes.
Modified: index
===================================================================
--- index 2008-02-27 21:01:10 UTC (rev 1264)
+++ index 2008-02-27 21:26:36 UTC (rev 1265)
@@ -38070,15 +38070,15 @@
<dt>A sequence of bytes starting with: 0x3C, 0x4D or 0x6D, 0x45 or
0x65, 0x54 or 0x74, 0x41 or 0x61, and finally one of 0x09, 0x0A,
- 0x0B, 0x0C, 0x0D, 0x20 (case-insensitive ASCII '<meta' followed by
- a space)
+ 0x0B, 0x0C, 0x0D, 0x20, 0x2F (case-insensitive ASCII '<meta'
+ followed by a space or slash)
<dd>
<ol>
<li>
<p>Advance the <var title="">position</var> pointer so that it
- points at the next 0x09, 0x0A, 0x0B, 0x0C, 0x0D, or 0x20 byte (the
- one in sequence of characters matched above).
+ points at the next 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x20, or 0x2F
+ byte (the one in sequence of characters matched above).
<li>
<p><a href="#get-an" title=concept-get-attributes-when-sniffing>Get
@@ -38141,14 +38141,10 @@
<li>
<p>Advance the <var title="">position</var> pointer so that it
points at the next 0x09 (ASCII TAB), 0x0A (ASCII LF), 0x0B (ASCII
- VT), 0x0C (ASCII FF), 0x0D (ASCII CR), 0x20 (ASCII space), 0x3E
- (ASCII '>'), 0x3C (ASCII '<') byte.
+ VT), 0x0C (ASCII FF), 0x0D (ASCII CR), 0x20 (ASCII space), or 0x3E
+ (ASCII '>') byte.
<li>
- <p>If the pointer points to a 0x3C (ASCII '<') byte, then return
- to the first step in the overall "two step" algorithm.
-
- <li>
<p>Repeatedly <a href="#get-an"
title=concept-get-attributes-when-sniffing>get an attribute</a>
until no further attributes can be found, then jump to the second
@@ -38186,14 +38182,9 @@
<p>If the byte at <var title="">position</var> is one of 0x09 (ASCII
TAB), 0x0A (ASCII LF), 0x0B (ASCII VT), 0x0C (ASCII FF), 0x0D (ASCII
CR), 0x20 (ASCII space), or 0x2F (ASCII '/') then advance <var
- title="">position</var> to the next byte and start over.
+ title="">position</var> to the next byte and redo this substep.
<li>
- <p>If the byte at <var title="">position</var> is 0x3C (ASCII '<'),
- then move <var title="">position</var> back to the previous byte, and
- stop looking for an attribute. There isn't one.
-
- <li>
<p>If the byte at <var title="">position</var> is 0x3E (ASCII '>'),
then stop looking for an attribute. There isn't one.
@@ -38218,8 +38209,7 @@
<dd>Jump to the step below labelled <em>spaces</em>.
- <dt>If it is 0x2F (ASCII '/'), 0x3C (ASCII '<'), or 0x3E (ASCII
- '>')
+ <dt>If it is 0x2F (ASCII '/') or 0x3E (ASCII '>')
<dd>Stop looking for an attribute. The attribute's name is the value
of <var title="">attribute name</var>, its value is the empty string.
@@ -38298,7 +38288,7 @@
<li>Return to the second step in these substeps.
</ol>
- <dt>If it is 0x3C (ASCII '<'), or 0x3E (ASCII '>')
+ <dt>If it is 0x3E (ASCII '>')
<dd>Stop looking for an attribute. The attribute's name is the value
of <var title="">attribute name</var>, its value is the empty string.
@@ -38322,8 +38312,7 @@
<dl class=switch>
<dt>If it is 0x09 (ASCII TAB), 0x0A (ASCII LF), 0x0B (ASCII VT), 0x0C
- (ASCII FF), 0x0D (ASCII CR), 0x20 (ASCII space), 0x3C (ASCII '<'),
- or 0x3E (ASCII '>')
+ (ASCII FF), 0x0D (ASCII CR), 0x20 (ASCII space), or 0x3E (ASCII '>')
<dd>Stop looking for an attribute. The attribute's name is the value
of <var title="">attribute name</var> and its value is the value of
@@ -38434,7 +38423,7 @@
REPLACEMENT CHARACTERs. Any occurrences of such characters is a <a
href="#parse0">parse error</a>.
- <p>Any occurances of any characters in the ranges U+0001 to U+0008,
+ <p>Any occurrences of any characters in the ranges U+0001 to U+0008,
<!-- space characters allowed --> U+000E to U+001F, <!-- ASCII
allowed -->
U+007F <!--to U+0084, (U+0085 NEL not allowed),
@@ -43793,13 +43782,13 @@
</ol>
<p><dfn id=escapingString>Escaping a string</dfn> (for the purposes of the
- algorithm above) consists of replacing any occurances of the "<code
+ algorithm above) consists of replacing any occurrences of the "<code
title="">&</code>" character by the string "<code
- title="">&</code>", any occurances of the "<code
+ title="">&</code>", any occurrences of the "<code
title=""><</code>" character by the string "<code
- title=""><</code>", any occurances of the "<code
+ title=""><</code>", any occurrences of the "<code
title="">></code>" character by the string "<code
- title="">></code>", and any occurances of the "<code
+ title="">></code>", and any occurrences of the "<code
title="">"</code>" character by the string "<code
title="">"</code>".
Modified: source
===================================================================
--- source 2008-02-27 21:01:10 UTC (rev 1264)
+++ source 2008-02-27 21:26:36 UTC (rev 1265)
@@ -35597,14 +35597,14 @@
</dd>
- <dt>A sequence of bytes starting with: 0x3C, 0x4D or 0x6D, 0x45 or 0x65, 0x54 or 0x74, 0x41 or 0x61, and finally one of 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x20 (case-insensitive ASCII '<meta' followed by a space)</dt>
+ <dt>A sequence of bytes starting with: 0x3C, 0x4D or 0x6D, 0x45 or 0x65, 0x54 or 0x74, 0x41 or 0x61, and finally one of 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x20, 0x2F (case-insensitive ASCII '<meta' followed by a space or slash)</dt>
<dd>
<ol>
<li><p>Advance the <var title="">position</var> pointer so
- that it points at the next 0x09, 0x0A, 0x0B, 0x0C, 0x0D, or
- 0x20 byte (the one in sequence of characters matched
+ that it points at the next 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
+ 0x20, or 0x2F byte (the one in sequence of characters matched
above).</p></li>
<li><p><span title="concept-get-attributes-when-sniffing">Get
@@ -35672,13 +35672,8 @@
<li><p>Advance the <var title="">position</var> pointer so
that it points at the next 0x09 (ASCII TAB), 0x0A (ASCII LF),
0x0B (ASCII VT), 0x0C (ASCII FF), 0x0D (ASCII CR), 0x20
- (ASCII space), 0x3E (ASCII '>'), 0x3C (ASCII '<')
- byte.</p></li>
+ (ASCII space), or 0x3E (ASCII '>') byte.</p></li>
- <li><p>If the pointer points to a 0x3C (ASCII '<') byte, then
- return to the first step in the overall "two step"
- algorithm.</p></li>
-
<li><p>Repeatedly <span
title="concept-get-attributes-when-sniffing">get an
attribute</span> until no further attributes can be found,
@@ -35726,14 +35721,9 @@
<li><p>If the byte at <var title="">position</var> is one of 0x09
(ASCII TAB), 0x0A (ASCII LF), 0x0B (ASCII VT), 0x0C (ASCII FF),
0x0D (ASCII CR), 0x20 (ASCII space), or 0x2F (ASCII '/') then
- advance <var title="">position</var> to the next byte and start
- over.</p></li>
+ advance <var title="">position</var> to the next byte and redo
+ this substep.</p></li>
- <li><p>If the byte at <var title="">position</var> is 0x3C (ASCII
- '<'), then move <var title="">position</var> back to the
- previous byte, and stop looking for an attribute. There isn't
- one.</p></li>
-
<li><p>If the byte at <var title="">position</var> is 0x3E (ASCII
'>'), then stop looking for an attribute. There isn't
one.</p></li>
@@ -35760,8 +35750,7 @@
<dd>Jump to the step below labelled <em>spaces</em>.</dd>
- <dt>If it is 0x2F (ASCII '/'), 0x3C (ASCII '<'), or 0x3E
- (ASCII '>')</dt>
+ <dt>If it is 0x2F (ASCII '/') or 0x3E (ASCII '>')</dt>
<dd>Stop looking for an attribute. The attribute's name is the
value of <var title="">attribute name</var>, its value is the
@@ -35853,7 +35842,7 @@
</dd>
- <dt>If it is 0x3C (ASCII '<'), or 0x3E (ASCII '>')</dt>
+ <dt>If it is 0x3E (ASCII '>')</dt>
<dd>Stop looking for an attribute. The attribute's name is the
value of <var title="">attribute name</var>, its value is the
@@ -35884,8 +35873,8 @@
<dl class="switch">
<dt>If it is 0x09 (ASCII TAB), 0x0A (ASCII LF), 0x0B (ASCII
- VT), 0x0C (ASCII FF), 0x0D (ASCII CR), 0x20 (ASCII space), 0x3C
- (ASCII '<'), or 0x3E (ASCII '>')</dt>
+ VT), 0x0C (ASCII FF), 0x0D (ASCII CR), 0x20 (ASCII space), or
+ 0x3E (ASCII '>')</dt>
<dd>Stop looking for an attribute. The attribute's name is the
value of <var title="">attribute name</var> and its value is the
@@ -36002,7 +35991,7 @@
U+FFFD REPLACEMENT CHARACTERs. Any occurrences of such characters is
a <span>parse error</span>.</p>
- <p>Any occurances of any characters in the ranges U+0001 to U+0008,
+ <p>Any occurrences of any characters in the ranges U+0001 to U+0008,
<!-- space characters allowed --> U+000E to U+001F, <!-- ASCII
allowed --> U+007F <!--to U+0084, (U+0085 NEL not allowed),
U+0086--> to U+009F, U+D800 to U+DFFF <!-- surrogates not allowed
@@ -41159,12 +41148,12 @@
<p><dfn id="escapingString">Escaping a string</dfn> (for the
purposes of the algorithm above) consists of replacing any
- occurances of the "<code title="">&</code>" character by the
- string "<code title="">&</code>", any occurances of the
+ occurrences of the "<code title="">&</code>" character by the
+ string "<code title="">&</code>", any occurrences of the
"<code title=""><</code>" character by the string "<code
- title=""><</code>", any occurances of the "<code
+ title=""><</code>", any occurrences of the "<code
title="">></code>" character by the string "<code
- title="">></code>", and any occurances of the "<code
+ title="">></code>", and any occurrences of the "<code
title="">"</code>" character by the string "<code
title="">"</code>".</p>
More information about the Commit-Watchers
mailing list