Skip to content

Commit

Permalink
[e] (0) More xreffing.
Browse files Browse the repository at this point in the history 
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=7504

git-svn-id: http://svn.whatwg.org/webapps@3955 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Sep 22, 2009
1 parent ec57dfd commit 8bc1f8b
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 82 deletions.
83 changes: 42 additions & 41 deletions index
View file
Expand Up @@ -61218,9 +61218,9 @@ interface <dfn id=messageport>MessagePort</dfn> {

<h4 id=elements-0><span class=secno>9.1.2 </span>Elements</h4>

<p>There are five different kinds of <dfn id=syntax-elements title=syntax-elements>elements</dfn>: void elements, raw text
elements, RCDATA elements, foreign elements, and normal
elements.</p>
<p>There are five different kinds of <dfn id=syntax-elements title=syntax-elements>elements</dfn>: <a href=#void-elements>void elements</a>,
<a href=#raw-text-elements>raw text elements</a>, <a href=#rcdata-elements>RCDATA elements</a>,
<a href=#foreign-elements>foreign elements</a>, and <a href=#normal-elements>normal elements</a>.</p>

<dl><dt><dfn id=void-elements>Void elements</dfn></dt>

Expand All @@ -61230,36 +61230,39 @@ interface <dfn id=messageport>MessagePort</dfn> {
<code><a href=#the-keygen-element>keygen</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#meta>meta</a></code>,
<code><a href=#the-param-element>param</a></code>, <code><a href=#the-source-element>source</a></code></dd>

<dt>Raw text elements</dt>
<dt><dfn id=raw-text-elements>Raw text elements</dfn></dt>

<dd><code><a href=#script>script</a></code>, <code><a href=#the-style-element>style</a></code></dd> <!-- iframe and
noscript don't count as raw text for syntax purposes -->

<dt>RCDATA elements</dt>
<dt><dfn id=rcdata-elements>RCDATA elements</dfn></dt>

<dd><code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-title-element-0>title</a></code></dd>

<dt>Foreign elements</dt>
<dt><dfn id=foreign-elements>Foreign elements</dfn></dt>

<dd>Elements from the <a href=#mathml-namespace>MathML namespace</a>
and the <a href=#svg-namespace>SVG namespace</a>.</dd>

<dt>Normal elements</dt>
<dt><dfn id=normal-elements>Normal elements</dfn></dt>

<dd>All other allowed <a href=#html-elements>HTML elements</a> are normal
elements.</dd>

</dl><p><dfn id=syntax-tags title=syntax-tags>Tags</dfn> are used to delimit the start
and end of elements in the markup. Raw text, RCDATA, and normal
elements have a <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> to
indicate where they begin, and an <a href=#syntax-end-tag title=syntax-end-tag>end
tag</a> to indicate where they end. The start and end tags of
certain normal elements can be <a href=#syntax-tag-omission title=syntax-tag-omission>omitted</a>, as described
and end of elements in the markup. <a href=#raw-text-elements title="raw text
elements">Raw text</a>, <a href=#rcdata-elements title="RCDATA
elements">RCDATA</a>, and <a href=#normal-elements title="normal
elements">normal</a> elements have a <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> to indicate where they
begin, and an <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> to
indicate where they end. The start and end tags of certain
<a href=#normal-elements>normal elements</a> can be <a href=#syntax-tag-omission title=syntax-tag-omission>omitted</a>, as described
later. Those that cannot be omitted must not be omitted. <a href=#void-elements>Void
elements</a> only have a start tag; end tags must not be
specified for void elements. Foreign elements must either have a
start tag and an end tag, or a start tag that is marked as
self-closing, in which case they must not have an end tag.</p>
specified for <a href=#void-elements>void elements</a>. <a href=#foreign-elements>Foreign
elements</a> must either have a start tag and an end tag, or a
start tag that is marked as self-closing, in which case they must
not have an end tag.</p>

<p>The contents of the element must be placed between just after the
start tag (which <a href=#syntax-tag-omission title=syntax-tag-omission>might be implied,
Expand All @@ -61276,31 +61279,27 @@ interface <dfn id=messageport>MessagePort</dfn> {
no end tag, no content can be put between the start tag and the end
tag).</p>

<p>Raw text elements can have <a href=#syntax-text title=syntax-text>text</a>,
though it has <a href=#cdata-rcdata-restrictions>restrictions</a>
described below.</p>
<p><a href=#raw-text-elements>Raw text elements</a> can have <a href=#syntax-text title=syntax-text>text</a>, though it has <a href=#cdata-rcdata-restrictions>restrictions</a> described
below.</p>

<p>RCDATA elements can have <a href=#syntax-text title=syntax-text>text</a>
and <a href=#syntax-charref title=syntax-charref>character references</a>, but
the text must not contain an <a href=#syntax-ambiguous-ampersand title=syntax-ambiguous-ampersand>ambiguous ampersand</a>.
<p><a href=#rcdata-elements>RCDATA elements</a> can have <a href=#syntax-text title=syntax-text>text</a> and <a href=#syntax-charref title=syntax-charref>character references</a>, but the text
must not contain an <a href=#syntax-ambiguous-ampersand title=syntax-ambiguous-ampersand>ambiguous ampersand</a>.
There are also <a href=#cdata-rcdata-restrictions>further
restrictions</a> described below.</p>

<p>Foreign elements whose start tag is marked as self-closing can't
have any contents (since, again, as there's no end tag, no content
can be put between the start tag and the end tag). Foreign elements
whose start tag is <em>not</em> marked as self-closing can have
<a href=#syntax-text title=syntax-text>text</a>, <a href=#syntax-charref title=syntax-charref>character references</a>, <a href=#syntax-cdata title=syntax-cdata>CDATA sections</a>, other <a href=#syntax-elements title=syntax-elements>elements</a>, and <a href=#syntax-comments title=syntax-comments>comments</a>, but the text must not
<p><a href=#foreign-elements>Foreign elements</a> whose start tag is marked as
self-closing can't have any contents (since, again, as there's no
end tag, no content can be put between the start tag and the end
tag). <a href=#foreign-elements>Foreign elements</a> whose start tag is <em>not</em>
marked as self-closing can have <a href=#syntax-text title=syntax-text>text</a>, <a href=#syntax-charref title=syntax-charref>character references</a>, <a href=#syntax-cdata title=syntax-cdata>CDATA sections</a>, other <a href=#syntax-elements title=syntax-elements>elements</a>, and <a href=#syntax-comments title=syntax-comments>comments</a>, but the text must not
contain the character U+003C LESS-THAN SIGN (<code>&lt;</code>) or
an <a href=#syntax-ambiguous-ampersand title=syntax-ambiguous-ampersand>ambiguous
ampersand</a>.</p>

<p>Normal elements can have <a href=#syntax-text title=syntax-text>text</a>,
<a href=#syntax-charref title=syntax-charref>character references</a>, other
<a href=#syntax-elements title=syntax-elements>elements</a>, and <a href=#syntax-comments title=syntax-comments>comments</a>, but the text must not
<p><a href=#normal-elements>Normal elements</a> can have <a href=#syntax-text title=syntax-text>text</a>, <a href=#syntax-charref title=syntax-charref>character references</a>, other <a href=#syntax-elements title=syntax-elements>elements</a>, and <a href=#syntax-comments title=syntax-comments>comments</a>, but the text must not
contain the character U+003C LESS-THAN SIGN (<code>&lt;</code>) or
an <a href=#syntax-ambiguous-ampersand title=syntax-ambiguous-ampersand>ambiguous
ampersand</a>. Some normal elements also have <a href=#element-restrictions>yet more restrictions</a> on what
ampersand</a>. Some <a href=#normal-elements>normal elements</a> also have <a href=#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>
Expand Down Expand Up @@ -61338,10 +61337,11 @@ interface <dfn id=messageport>MessagePort</dfn> {
are required to be followed by a space. See the <a href=#syntax-attributes title=syntax-attributes>attributes section</a> below.)</li>

<li>Then, if the element is one of the <a href=#void-elements>void elements</a>,
or if the element is a foreign element, then there may be a single
U+002F SOLIDUS (<code>/</code>) character. This character has no
effect on void elements, but on foreign elements it marks the start
tag as self-closing.</li>
or if the element is a <a href=#foreign-elements title="foreign elements">foreign
element</a>, then there may be a single U+002F SOLIDUS
(<code>/</code>) character. This character has no effect on
<a href=#void-elements>void elements</a>, but on <a href=#foreign-elements>foreign elements</a> it
marks the start tag as self-closing.</li>

<li>Finally, start tags must be closed by a U+003E GREATER-THAN
SIGN (<code>&gt;</code>) character.</li>
Expand Down Expand Up @@ -61718,9 +61718,10 @@ interface <dfn id=messageport>MessagePort</dfn> {

<h5 id=cdata-rcdata-restrictions><span class=secno>9.1.2.6 </span>Restrictions on the contents of raw text and RCDATA elements</h5>

<p>The text in raw text and RCDATA elements must not contain any
occurrences of the string "<code title="">&lt;/</code>" (U+003C
LESS-THAN SIGN, U+002F SOLIDUS) followed by characters that
<p>The text in <a href=#raw-text-elements title="raw text elements">raw text</a> and
<a href=#rcdata-elements title="RCDATA elements">RCDATAs</a> element must not
contain any occurrences of the string "<code title="">&lt;/</code>"
(U+003C LESS-THAN SIGN, U+002F SOLIDUS) followed by characters that
case-insensitively match the tag name of the element followed by one
of U+0009 CHARACTER TABULATION, U+000A LINE FEED (LF), U+000C FORM
FEED (FF), U+000D CARRIAGE RETURN (CR), U+0020 SPACE, U+003E
Expand Down Expand Up @@ -61753,10 +61754,10 @@ interface <dfn id=messageport>MessagePort</dfn> {
corresponding <a href=#syntax-escape-end title=syntax-escape-end>escaping text span
end</a>.</p>

<p>The text in raw text elements and RCDATA elements must not have
an <a href=#syntax-escape-start title=syntax-escape-start>escaping text span start</a>
that is not followed by an <a href=#syntax-escape-end title=syntax-escape-end>escaping
text span end</a>.</p>
<p>The text in <a href=#raw-text-elements>raw text elements</a> and <a href=#rcdata-elements>RCDATA
elements</a> must not have an <a href=#syntax-escape-start title=syntax-escape-start>escaping text span start</a> that is
not followed by an <a href=#syntax-escape-end title=syntax-escape-end>escaping text
span end</a>.</p>


<h4 id=text-0><span class=secno>9.1.3 </span>Text</h4>
Expand Down
93 changes: 52 additions & 41 deletions source
View file
Expand Up @@ -75735,9 +75735,9 @@ interface <dfn>MessagePort</dfn> {
<h4>Elements</h4>

<p>There are five different kinds of <dfn
title="syntax-elements">elements</dfn>: void elements, raw text
elements, RCDATA elements, foreign elements, and normal
elements.</p>
title="syntax-elements">elements</dfn>: <span>void elements</span>,
<span>raw text elements</span>, <span>RCDATA elements</span>,
<span>foreign elements</span>, and <span>normal elements</span>.</p>

<dl>

Expand All @@ -75749,39 +75749,43 @@ interface <dfn>MessagePort</dfn> {
<code>keygen</code>, <code>link</code>, <code>meta</code>,
<code>param</code>, <code>source</code></dd>

<dt>Raw text elements</dt>
<dt><dfn>Raw text elements</dfn></dt>

<dd><code>script</code>, <code>style</code></dd> <!-- iframe and
noscript don't count as raw text for syntax purposes -->

<dt>RCDATA elements</dt>
<dt><dfn>RCDATA elements</dfn></dt>

<dd><code>textarea</code>, <code>title</code></dd>

<dt>Foreign elements</dt>
<dt><dfn>Foreign elements</dfn></dt>

<dd>Elements from the <span>MathML namespace</span>
and the <span>SVG namespace</span>.</dd>

<dt>Normal elements</dt>
<dt><dfn>Normal elements</dfn></dt>

<dd>All other allowed <span>HTML elements</span> are normal
elements.</dd>

</dl>

<p><dfn title="syntax-tags">Tags</dfn> are used to delimit the start
and end of elements in the markup. Raw text, RCDATA, and normal
elements have a <span title="syntax-start-tag">start tag</span> to
indicate where they begin, and an <span title="syntax-end-tag">end
tag</span> to indicate where they end. The start and end tags of
certain normal elements can be <span
and end of elements in the markup. <span title="raw text
elements">Raw text</span>, <span title="RCDATA
elements">RCDATA</span>, and <span title="normal
elements">normal</span> elements have a <span
title="syntax-start-tag">start tag</span> to indicate where they
begin, and an <span title="syntax-end-tag">end tag</span> to
indicate where they end. The start and end tags of certain
<span>normal elements</span> can be <span
title="syntax-tag-omission">omitted</span>, as described
later. Those that cannot be omitted must not be omitted. <span>Void
elements</span> only have a start tag; end tags must not be
specified for void elements. Foreign elements must either have a
start tag and an end tag, or a start tag that is marked as
self-closing, in which case they must not have an end tag.</p>
specified for <span>void elements</span>. <span>Foreign
elements</span> must either have a start tag and an end tag, or a
start tag that is marked as self-closing, in which case they must
not have an end tag.</p>

<p>The contents of the element must be placed between just after the
start tag (which <span title="syntax-tag-omission">might be implied,
Expand All @@ -75798,22 +75802,25 @@ interface <dfn>MessagePort</dfn> {
no end tag, no content can be put between the start tag and the end
tag).</p>

<p>Raw text elements can have <span title="syntax-text">text</span>,
though it has <a href="#cdata-rcdata-restrictions">restrictions</a>
described below.</p>
<p><span>Raw text elements</span> can have <span
title="syntax-text">text</span>, though it has <a
href="#cdata-rcdata-restrictions">restrictions</a> described
below.</p>

<p>RCDATA elements can have <span title="syntax-text">text</span>
and <span title="syntax-charref">character references</span>, but
the text must not contain an <span
<p><span>RCDATA elements</span> can have <span
title="syntax-text">text</span> and <span
title="syntax-charref">character references</span>, but the text
must not contain an <span
title="syntax-ambiguous-ampersand">ambiguous ampersand</span>.
There are also <a href="#cdata-rcdata-restrictions">further
restrictions</a> described below.</p>

<p>Foreign elements whose start tag is marked as self-closing can't
have any contents (since, again, as there's no end tag, no content
can be put between the start tag and the end tag). Foreign elements
whose start tag is <em>not</em> marked as self-closing can have
<span title="syntax-text">text</span>, <span
<p><span>Foreign elements</span> whose start tag is marked as
self-closing can't have any contents (since, again, as there's no
end tag, no content can be put between the start tag and the end
tag). <span>Foreign elements</span> whose start tag is <em>not</em>
marked as self-closing can have <span
title="syntax-text">text</span>, <span
title="syntax-charref">character references</span>, <span
title="syntax-cdata">CDATA sections</span>, other <span
title="syntax-elements">elements</span>, and <span
Expand All @@ -75822,13 +75829,14 @@ interface <dfn>MessagePort</dfn> {
an <span title="syntax-ambiguous-ampersand">ambiguous
ampersand</span>.</p>

<p>Normal elements can have <span title="syntax-text">text</span>,
<span title="syntax-charref">character references</span>, other
<span title="syntax-elements">elements</span>, and <span
<p><span>Normal elements</span> can have <span
title="syntax-text">text</span>, <span
title="syntax-charref">character 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
an <span title="syntax-ambiguous-ampersand">ambiguous
ampersand</span>. Some normal elements also have <a
ampersand</span>. Some <span>normal elements</span> also have <a
href="#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
Expand Down Expand Up @@ -75872,10 +75880,11 @@ interface <dfn>MessagePort</dfn> {
title="syntax-attributes">attributes section</span> below.)</li>

<li>Then, if the element is one of the <span>void elements</span>,
or if the element is a foreign element, then there may be a single
U+002F SOLIDUS (<code>/</code>) character. This character has no
effect on void elements, but on foreign elements it marks the start
tag as self-closing.</li>
or if the element is a <span title="foreign elements">foreign
element</span>, then there may be a single U+002F SOLIDUS
(<code>/</code>) character. This character has no effect on
<span>void elements</span>, but on <span>foreign elements</span> it
marks the start tag as self-closing.</li>

<li>Finally, start tags must be closed by a U+003E GREATER-THAN
SIGN (<code>&gt;</code>) character.</li>
Expand Down Expand Up @@ -76291,9 +76300,10 @@ interface <dfn>MessagePort</dfn> {

<h5 id="cdata-rcdata-restrictions">Restrictions on the contents of raw text and RCDATA elements</h5>

<p>The text in raw text and RCDATA elements must not contain any
occurrences of the string "<code title="">&lt;/</code>" (U+003C
LESS-THAN SIGN, U+002F SOLIDUS) followed by characters that
<p>The text in <span title="raw text elements">raw text</span> and
<span title="RCDATA elements">RCDATAs</span> element must not
contain any occurrences of the string "<code title="">&lt;/</code>"
(U+003C LESS-THAN SIGN, U+002F SOLIDUS) followed by characters that
case-insensitively match the tag name of the element followed by one
of U+0009 CHARACTER TABULATION, U+000A LINE FEED (LF), U+000C FORM
FEED (FF), U+000D CARRIAGE RETURN (CR), U+0020 SPACE, U+003E
Expand Down Expand Up @@ -76329,10 +76339,11 @@ interface <dfn>MessagePort</dfn> {
corresponding <span title="syntax-escape-end">escaping text span
end</span>.</p>

<p>The text in raw text elements and RCDATA elements must not have
an <span title="syntax-escape-start">escaping text span start</span>
that is not followed by an <span title="syntax-escape-end">escaping
text span end</span>.</p>
<p>The text in <span>raw text elements</span> and <span>RCDATA
elements</span> must not have an <span
title="syntax-escape-start">escaping text span start</span> that is
not followed by an <span title="syntax-escape-end">escaping text
span end</span>.</p>


<h4>Text</h4>
Expand Down

0 comments on commit 8bc1f8b

Please sign in to comment.