[html5] r930 - /
whatwg at whatwg.org
whatwg at whatwg.org
Tue Jun 19 16:27:37 PDT 2007
Author: ianh
Date: 2007-06-19 16:27:35 -0700 (Tue, 19 Jun 2007)
New Revision: 930
Modified:
index
source
Log:
[e] (0) Disallow CDATA and RCDATA from containing end tags that match their end tag (required now that we allow < and </ in general). Allow < in attribute values for consistency with the parsing section.
Modified: index
===================================================================
--- index 2007-06-19 23:14:08 UTC (rev 929)
+++ index 2007-06-19 23:27:35 UTC (rev 930)
@@ -32430,24 +32430,36 @@
<p>RCDATA elements can have <a href="#text1" title=syntax-text>text</a> and
<a href="#character0" title=syntax-entities>character entity
- references</a>, but the text must not contain the character U+003C
- LESS-THAN SIGN (<code><</code>) or an <a href="#ambiguous"
+ references</a>, but the text must not contain an <a href="#ambiguous"
title=syntax-ambiguous-ampersand>ambiguous ampersand</a>.
<p>The <a href="#text1" title=syntax-text>text</a> in CDATA and RCDATA
- elements has the further restriction that the last occurrence of the four
- character sequence "<code title=""><!--</code>" (U+003C LESS-THAN SIGN,
- U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS) in the
- text, if any, must have a corresponding three-character sequence "<code
- title="">--></code>" (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E
- GREATER-THAN SIGN) whose U+003E GREATER-THAN SIGN (>) character occurs
- later in the text than the U+003C LESS-THAN SIGN (<) character of the
- "<code title=""><!--</code>" sequence.
+ elements have two further restrictions:
- <p class=note>The hyphens from the "<code title=""><!--</code>" part can
- overlap those in the "<code title="">--></code>" part, as in "<code
- title=""><!--></code>".
+ <ol>
+ <li>
+ <p>The last occurrence of the four character sequence "<code
+ title=""><!--</code>" (U+003C LESS-THAN SIGN, U+0021 EXCLAMATION
+ MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS) in the text, if any,
+ must have a corresponding three-character sequence "<code
+ title="">--></code>" (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS,
+ U+003E GREATER-THAN SIGN) whose U+003E GREATER-THAN SIGN (>)
+ character occurs later in the text than the U+003C LESS-THAN SIGN (<)
+ character of the "<code title=""><!--</code>" sequence.</p>
+ <p class=note>The hyphens from the "<code title=""><!--</code>" part
+ can overlap those in the "<code title="">--></code>" part, as in
+ "<code title=""><!--></code>".</p>
+
+ <li>
+ <p>There must not be any occurences of the string "<code
+ title=""></</code>" (U+003C LESS-THAN SIGN, U+002F SOLIDUS) followed
+ by characters that case-insensitively<!--ASCII--> match the tag name of
+ the element followed by one of U+0009 CHARACTER TABULATION, U+000A LINE
+ FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF), U+0020 SPACE,
+ U+003E GREATER-THAN SIGN (>), or U+002F SOLIDUS (/).</p>
+ </ol>
+
<p>Normal elements can have <a href="#text1" title=syntax-text>text</a>, <a
href="#character0" title=syntax-entities>character entity references</a>,
other <a href="#elements2" title=syntax-elements>elements</a>, and <a
@@ -32578,9 +32590,8 @@
character">space characters</a>, followed by the <a href="#attribute0"
title=syntax-attribute-value>attribute value</a>, which, in addition to
the requirements given above for attribute values, must not contain any
- literal <a href="#space" title="space character">space characters</a>,
- U+003E GREATER-THAN SIGN (<code>></code>) characters, or U+003C
- LESS-THAN SIGN (<code><</code>) characters, and must not,
+ literal <a href="#space" title="space character">space characters</a> or
+ U+003E GREATER-THAN SIGN (<code>></code>) characters, and must not,
furthermore, start with either a literal U+0022 QUOTATION MARK
(<code>"</code>) character or a literal U+0027 APOSTROPHE
(<code>'</code>) character.</p>
Modified: source
===================================================================
--- source 2007-06-19 23:14:08 UTC (rev 929)
+++ source 2007-06-19 23:27:35 UTC (rev 930)
@@ -29968,25 +29968,47 @@
<p>RCDATA elements can have <span title="syntax-text">text</span>
and <span title="syntax-entities">character entity
- references</span>, but the text must not contain the character
- U+003C LESS-THAN SIGN (<code><</code>) or an <span
+ references</span>, but the text must not contain an <span
title="syntax-ambiguous-ampersand">ambiguous ampersand</span>.</p>
<p>The <span title="syntax-text">text</span> in CDATA and RCDATA
- elements has the further restriction that the last occurrence of the
- four character sequence "<code title=""><!--</code>" (U+003C
- LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D
- HYPHEN-MINUS) in the text, if any, must have a corresponding
- three-character sequence "<code title="">--></code>" (U+002D
- HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose
- U+003E GREATER-THAN SIGN (>) character occurs later in the text
- than the U+003C LESS-THAN SIGN (<) character of the "<code
- title=""><!--</code>" sequence.</p>
+ elements have two further restrictions:</p>
- <p class="note">The hyphens from the "<code title=""><!--</code>"
- part can overlap those in the "<code title="">--></code>" part,
- as in "<code title=""><!--></code>".</p>
+ <ol>
+ <li>
+
+ <p>The last occurrence of the four character sequence "<code
+ title=""><!--</code>" (U+003C LESS-THAN SIGN, U+0021
+ EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS) in the
+ text, if any, must have a corresponding three-character sequence
+ "<code title="">--></code>" (U+002D HYPHEN-MINUS, U+002D
+ HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose U+003E GREATER-THAN
+ SIGN (>) character occurs later in the text than the U+003C
+ LESS-THAN SIGN (<) character of the "<code
+ title=""><!--</code>" sequence.</p>
+
+ <p class="note">The hyphens from the "<code
+ title=""><!--</code>" part can overlap those in the "<code
+ title="">--></code>" part, as in "<code
+ title=""><!--></code>".</p>
+
+ </li>
+
+ <li>
+
+ <p>There must not be any occurences of the string "<code
+ title=""></</code>" (U+003C LESS-THAN SIGN, U+002F SOLIDUS)
+ followed by characters that case-insensitively<!--ASCII--> match
+ the tag name of the element followed by one of U+0009 CHARACTER
+ TABULATION, U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C
+ FORM FEED (FF), U+0020 SPACE, U+003E GREATER-THAN SIGN (>), or
+ U+002F SOLIDUS (/).</p>
+
+ </li>
+
+ </ol>
+
<p>Normal elements can have <span title="syntax-text">text</span>,
<span title="syntax-entities">character entity references</span>,
other <span title="syntax-elements">elements</span>, and <span
@@ -30135,8 +30157,7 @@
title="syntax-attribute-value">attribute value</span>, which, in
addition to the requirements given above for attribute values,
must not contain any literal <span title="space character">space
- characters</span>, U+003E GREATER-THAN SIGN (<code>></code>)
- characters, or U+003C LESS-THAN SIGN (<code><</code>)
+ characters</span> or U+003E GREATER-THAN SIGN (<code>></code>)
characters, and must not, furthermore, start with either a literal
U+0022 QUOTATION MARK (<code>"</code>) character or a literal
U+0027 APOSTROPHE (<code>'</code>) character.</p>
More information about the Commit-Watchers
mailing list