Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[e] (0) Oops, forgot to update the syntax section with the new rules.
git-svn-id: http://svn.whatwg.org/webapps@925 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Jun 19, 2007
1 parent 19d82fc commit 71f8237
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 60 deletions.
62 changes: 34 additions & 28 deletions index
Expand Up @@ -32420,41 +32420,39 @@ function receiver(e) {
<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:

<ul>
<li>The text must not contain the two character sequence "<code
title="">&lt;/</code>" (U+003C LESS-THAN SIGN, U+002F SOLIDUS).

<li>For every occurrence of the four character sequence "<code
title="">&lt;!--</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="">--&gt;</code>" (U+002D
HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose U+003E
GREATER-THAN SIGN (&gt;) character occurs later in the text than the
U+003C LESS-THAN SIGN (&lt;) character of the first sequence. (This means
the hyphens from the "<code title="">&lt;!--</code>" part can overlap
those in the "<code title="">--&gt;</code>" part, as in "<code
title="">&lt!--&gt;</code>".)
</ul>
<p>CDATA elements can have <a href="#text1" title=syntax-text>text</a>.

<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>&lt;</code>) or the character U+0026 AMPERSAND
(<code>&amp;</code>).
LESS-THAN SIGN (<code>&lt;</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="">&lt;!--</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="">--&gt;</code>" (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E
GREATER-THAN SIGN) whose U+003E GREATER-THAN SIGN (&gt;) character occurs
later in the text than the U+003C LESS-THAN SIGN (&lt;) character of the
"<code title="">&lt;!--</code>" sequence.

<p class=note>The hyphens from the "<code title="">&lt;!--</code>" part can
overlap those in the "<code title="">--&gt;</code>" part, as in "<code
title="">&lt!--&gt;</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>&lt;</code>) or the
character U+0026 AMPERSAND (<code>&amp;</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>&lt;</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
Expand Down Expand Up @@ -32539,8 +32537,9 @@ function receiver(e) {
<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>&amp;</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:

Expand Down Expand Up @@ -32920,6 +32919,13 @@ function receiver(e) {
character (<code title="">;</code>).
</dl>

<p>An <dfn id=ambiguous title=syntax-ambiguous-ampersand>ambiguous
ampersand</dfn> is a U+0026 AMPERSAND (<code>&amp;</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>&amp;</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
Expand Down
67 changes: 35 additions & 32 deletions source
Expand Up @@ -29957,46 +29957,41 @@ function receiver(e) {
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>

<ul>

<li>The text must not contain the two character sequence "<code
title="">&lt;/</code>" (U+003C LESS-THAN SIGN, U+002F
SOLIDUS).</li>

<li>For every occurrence of the four character sequence "<code
title="">&lt;!--</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="">--&gt;</code>" (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS,
U+003E GREATER-THAN SIGN) whose U+003E GREATER-THAN SIGN (&gt;)
character occurs later in the text than the U+003C LESS-THAN SIGN
(&lt;) character of the first sequence. (This means the hyphens
from the "<code title="">&lt;!--</code>" part can overlap those in
the "<code title="">--&gt;</code>" part, as in "<code
title="">&lt!--&gt;</code>".)</li>

</ul>
<p>CDATA elements can have <span
title="syntax-text">text</span>.</p>

<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>&lt;</code>) or the character U+0026
AMPERSAND (<code>&amp;</code>).</p>
U+003C LESS-THAN SIGN (<code>&lt;</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="">&lt;!--</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="">--&gt;</code>" (U+002D
HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose
U+003E GREATER-THAN SIGN (&gt;) character occurs later in the text
than the U+003C LESS-THAN SIGN (&lt;) character of the "<code
title="">&lt;!--</code>" sequence.</p>

<p class="note">The hyphens from the "<code title="">&lt;!--</code>"
part can overlap those in the "<code title="">--&gt;</code>" part,
as in "<code title="">&lt!--&gt;</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>&lt;</code>) or
the character U+0026 AMPERSAND (<code>&amp;</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
Expand Down Expand Up @@ -30091,8 +30086,9 @@ function receiver(e) {
<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>&amp;</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>

Expand Down Expand Up @@ -30484,6 +30480,13 @@ function receiver(e) {

</dl>

<p>An <dfn title="syntax-ambiguous-ampersand">ambiguous
ampersand</dfn> is a U+0026 AMPERSAND (<code>&amp;</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>&amp;</code>) character.</p>


<h4>Comments</h4>

Expand Down

0 comments on commit 71f8237

Please sign in to comment.