[html5] r925 - /

whatwg at whatwg.org whatwg at whatwg.org
Tue Jun 19 02:46:28 PDT 2007


Author: ianh
Date: 2007-06-19 02:46:26 -0700 (Tue, 19 Jun 2007)
New Revision: 925

Modified:
   index
   source
Log:
[e] (0) Oops, forgot to update the syntax section with the new rules.

Modified: index
===================================================================
--- index	2007-06-19 08:02:34 UTC (rev 924)
+++ index	2007-06-19 09:46:26 UTC (rev 925)
@@ -32420,41 +32420,39 @@
   <p>Void elements can't have any contents (since there's no end tag, no
    content can be put between the start tag and the end tag.)
 
-  <p>CDATA elements can have <a href="#text1" title=syntax-text>text</a>,
-   but:
+  <p>CDATA elements can have <a href="#text1" title=syntax-text>text</a>.
 
-  <ul>
-   <li>The text must not contain the two character sequence "<code
-    title=""></</code>" (U+003C LESS-THAN SIGN, U+002F SOLIDUS).
-
-   <li>For every 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), there must be 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 first sequence. (This means
-    the hyphens from the "<code title=""><!--</code>" part can overlap
-    those in the "<code title="">--></code>" part, as in "<code
-    title="">&lt!--></code>".)
-  </ul>
-
   <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 the character U+0026 AMPERSAND
-   (<code>&</code>).
+   LESS-THAN SIGN (<code><</code>) or 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.
+
+  <p class=note>The hyphens from the "<code title=""><!--</code>" part can
+   overlap those in the "<code title="">--></code>" part, as in "<code
+   title="">&lt!--></code>".
+
   <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
    href="#comments0" title=syntax-comments>comments</a>, but the text must
-   not contain the character U+003C LESS-THAN SIGN (<code><</code>) or the
-   character U+0026 AMPERSAND (<code>&</code>). Some normal elements also
-   have <a href="#have-extra" title=syntax-element-restrictions>yet more
-   restrictions</a> on what content they are allowed to hold, beyond the
-   restrictions imposed by the content model and those described in this
-   paragraph. Those restrictions are described below.
+   not contain the character U+003C LESS-THAN SIGN (<code><</code>) or an
+   <a href="#ambiguous" title=syntax-ambiguous-ampersand>ambiguous
+   ampersand</a>. Some normal elements also have <a href="#have-extra"
+   title=syntax-element-restrictions>yet more restrictions</a> on what
+   content they are allowed to hold, beyond the restrictions imposed by the
+   content model and those described in this paragraph. Those restrictions
+   are described below.
 
   <p>Tags contain a <dfn id=tag-name title=syntax-tag-name>tag name</dfn>,
    giving the element's name. HTML elements all have names that only use
@@ -32539,8 +32537,9 @@
   <p><dfn id=attribute0 title=syntax-attribute-value>Attribute values</dfn>
    are a mixture of <a href="#text1" title=syntax-text>text</a> and <a
    href="#character0" title=syntax-entities>character entity references</a>,
-   except with the additional restriction that the text cannot contain a
-   U+0026 AMPERSAND (<code>&</code>) character.
+   except with the additional restriction that the text cannot contain an <a
+   href="#ambiguous" title=syntax-ambiguous-ampersand>ambiguous
+   ampersand</a>.
 
   <p>Attributes can be specified in four different ways:
 
@@ -32920,6 +32919,13 @@
     character (<code title="">;</code>).
   </dl>
 
+  <p>An <dfn id=ambiguous title=syntax-ambiguous-ampersand>ambiguous
+   ampersand</dfn> is a U+0026 AMPERSAND (<code>&</code>) character that
+   is not the last character in the file, that is not followed by a <a
+   href="#space">space character</a>, that is not followed by a start tag
+   that has not been omitted, and that is not followed by another U+0026
+   AMPERSAND (<code>&</code>) character.
+
   <h4 id=comments><span class=secno>8.1.5. </span>Comments</h4>
 
   <p><dfn id=comments0 title=syntax-comments>Comments</dfn> must start with

Modified: source
===================================================================
--- source	2007-06-19 08:02:34 UTC (rev 924)
+++ source	2007-06-19 09:46:26 UTC (rev 925)
@@ -29957,46 +29957,41 @@
   tag, no content can be put between the start tag and the end
   tag.)</p>
 
-  <p>CDATA elements can have <span title="syntax-text">text</span>,
-  but:</p>
+  <p>CDATA elements can have <span
+  title="syntax-text">text</span>.</p>
 
-  <ul>
-
-   <li>The text must not contain the two character sequence "<code
-   title=""></</code>" (U+003C LESS-THAN SIGN, U+002F
-   SOLIDUS).</li>
-
-   <li>For every 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), there must be 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 first sequence. (This means the hyphens
-   from the "<code title=""><!--</code>" part can overlap those in
-   the "<code title="">--></code>" part, as in "<code
-   title="">&lt!--></code>".)</li>
-
-  </ul>
-
   <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 the character U+0026
-  AMPERSAND (<code>&</code>).</p>
+  U+003C LESS-THAN SIGN (<code><</code>) or 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>
+
+  <p class="note">The hyphens from the "<code title=""><!--</code>"
+  part can overlap those in the "<code title="">--></code>" part,
+  as in "<code title="">&lt!--></code>".</p>
+
   <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
   title="syntax-comments">comments</span>, but the text must not
   contain the character U+003C LESS-THAN SIGN (<code><</code>) or
-  the character U+0026 AMPERSAND (<code>&</code>). Some normal
-  elements also have <span title="syntax-element-restrictions">yet
-  more restrictions</span> on what content they are allowed to hold,
-  beyond the restrictions imposed by the content model and those
-  described in this paragraph. Those restrictions are described
-  below.</p>
+  an <span title="syntax-ambiguous-ampersand">ambiguous
+  ampersand</span>. Some normal elements also have <span
+  title="syntax-element-restrictions">yet more restrictions</span> on
+  what content they are allowed to hold, beyond the restrictions
+  imposed by the content model and those described in this
+  paragraph. Those restrictions are described below.</p>
 
   <p>Tags contain a <dfn title="syntax-tag-name">tag name</dfn>,
   giving the element's name. HTML elements all have names that only
@@ -30091,8 +30086,9 @@
   <p><dfn title="syntax-attribute-value">Attribute values</dfn> are a
   mixture of <span title="syntax-text">text</span> and <span
   title="syntax-entities">character entity references</span>, except
-  with the additional restriction that the text cannot contain a
-  U+0026 AMPERSAND (<code>&</code>) character.</p>
+  with the additional restriction that the text cannot contain an
+  <span title="syntax-ambiguous-ampersand">ambiguous
+  ampersand</span>.</p>
 
   <p>Attributes can be specified in four different ways:</p>
 
@@ -30484,7 +30480,14 @@
 
   </dl>
 
+  <p>An <dfn title="syntax-ambiguous-ampersand">ambiguous
+  ampersand</dfn> is a U+0026 AMPERSAND (<code>&</code>) character
+  that is not the last character in the file, that is not followed by
+  a <span>space character</span>, that is not followed by a start tag
+  that has not been omitted, and that is not followed by another
+  U+0026 AMPERSAND (<code>&</code>) character.</p>
 
+
   <h4>Comments</h4>
 
   <p><dfn title="syntax-comments">Comments</dfn> must start with the




More information about the Commit-Watchers mailing list