Skip to content

Commit

Permalink
[e] (0) Terminology cleanup near the term 'CDATA'
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.whatwg.org/webapps@1904 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jul 23, 2008
1 parent 26f2b6b commit 45eb03b
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 87 deletions.
96 changes: 53 additions & 43 deletions index
View file
Expand Up @@ -24,7 +24,7 @@

<h1 id=html-5>HTML 5</h1>

<h2 class="no-num no-toc" id=draft>Draft Recommendation &mdash; 22 July
<h2 class="no-num no-toc" id=draft>Draft Recommendation &mdash; 23 July
2008</h2>

<p>You can take part in this work. <a
Expand Down Expand Up @@ -1709,7 +1709,8 @@
<li><a href="#character"><span class=secno>8.1.4 </span>Character
references</a>

<li><a href="#cdata"><span class=secno>8.1.5 </span>CDATA blocks</a>
<li><a href="#cdata"><span class=secno>8.1.5 </span>CDATA sections</a>


<li><a href="#comments"><span class=secno>8.1.6 </span>Comments</a>
</ul>
Expand Down Expand Up @@ -29336,8 +29337,8 @@ menu li:not(:first-child)::before { content: ' | '; }</pre>

<p>If the <code title=attr-rule-condition><a
href="#condition">condition</a></code> attribute is not specified, then
the condition applies to all elements, text nodes, CDATA nodes, and
processing instructions.
the condition applies to all elements, text nodes,
<code>CDATASection</code> nodes, and processing instructions.

<p>The <dfn id=mode title=attr-rule-mode><code>mode</code></dfn> attribute,
if specified, must have a value that is an <a href="#unordered">unordered
Expand Down Expand Up @@ -29410,8 +29411,9 @@ menu li:not(:first-child)::before { content: ' | '; }</pre>
processing at this point. <a href="#refsSELECTORS">[SELECTORS]</a>

<p>If the <code title=attr-nest-filter><a href="#filter">filter</a></code>
attribute is not specified, then all elements, text nodes, CDATA nodes,
and processing instructions are processed.
attribute is not specified, then all elements, text nodes,
<code>CDATASection</code> nodes, and processing instructions are
processed.

<p>The <dfn id=mode1 title=attr-nest-mode><code>mode</code></dfn>
attribute, if specified, must have a value that is a word token consisting
Expand Down Expand Up @@ -30092,16 +30094,17 @@ never reset. This is nice and consistent.)
</ol>
</ol>

<p>Otherwise, the <var title="">new node</var> is a text node, CDATA
block, or PI. Run these substeps instead:</p>
<p>Otherwise, the <var title="">new node</var> is a text node,
<code>CDATASection</code> node, or processing instruction. Run these
substeps instead:</p>

<ol>
<li>
<p>Let <var title="">expanded</var> be the result of passing the node
value of <var title="">template node</var> (the content of the text
node, CDATA block, or PI) to the <a href="#text-expansion">text
expansion algorithm for templates</a> along with <var title="">source
node</var>.
node, <code>CDATASection</code> node, or processing instruction) to
the <a href="#text-expansion">text expansion algorithm for
templates</a> along with <var title="">source node</var>.

<li>
<p>If the value of the <var title="">new node</var> is different from
Expand Down Expand Up @@ -43443,7 +43446,7 @@ function receiver(e) {
is <em>not</em> marked as self-closing can have <a href="#text2"
title=syntax-text>text</a>, <a href="#character3"
title=syntax-charref>character references</a>, <a href="#cdata0"
title=syntax-cdata>CDATA blocks</a>, other <a href="#elements3"
title=syntax-cdata>CDATA sections</a>, other <a href="#elements3"
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 an <a
Expand Down Expand Up @@ -43999,18 +44002,18 @@ function receiver(e) {
a <a href="#space">space character</a>, a U+003C LESS-THAN SIGN character
('&lt;'), or another U+0026 AMPERSAND (<code>&amp;</code>) character.

<h4 id=cdata><span class=secno>8.1.5 </span>CDATA blocks</h4>
<h4 id=cdata><span class=secno>8.1.5 </span>CDATA sections</h4>

<p><dfn id=cdata0 title=syntax-cdata>CDATA blocks</dfn> must start with the
character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+005B
LEFT SQUARE BRACKET, U+0043 LATIN CAPITAL LETTER C, U+0044 LATIN CAPITAL
LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054 LATIN CAPITAL LETTER T,
U+0041 LATIN CAPITAL LETTER A, U+005B LEFT SQUARE BRACKET (<code
title="">&lt;![CDATA[</code>). Following this sequence, the block may have
<a href="#text2" title=syntax-text>text</a>, with the additional
<p><dfn id=cdata0 title=syntax-cdata>CDATA sections</dfn> must start with
the character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK,
U+005B LEFT SQUARE BRACKET, U+0043 LATIN CAPITAL LETTER C, U+0044 LATIN
CAPITAL LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054 LATIN CAPITAL
LETTER T, U+0041 LATIN CAPITAL LETTER A, U+005B LEFT SQUARE BRACKET (<code
title="">&lt;![CDATA[</code>). Following this sequence, the CDATA section
may have <a href="#text2" title=syntax-text>text</a>, with the additional
restriction that the text must not contain the three character sequence
U+005D RIGHT SQUARE BRACKET, U+005D RIGHT SQUARE BRACKET, U+003E
GREATER-THAN SIGN (<code title="">]]></code>). Finally, the CDATA block
GREATER-THAN SIGN (<code title="">]]></code>). Finally, the CDATA section
must be ended by the three character sequence U+005D RIGHT SQUARE BRACKET,
U+005D RIGHT SQUARE BRACKET, U+003E GREATER-THAN SIGN (<code
title="">]]></code>).
Expand Down Expand Up @@ -44863,7 +44866,7 @@ function receiver(e) {
after after frameset">after after frameset</a>" during the course of the
parsing, as described in the <a href="#tree-construction0">tree
construction</a> stage. The insertion mode affects how tokens are
processed and whether CDATA blocks are supported.
processed and whether CDATA sections are supported.

<p>Seven of these modes, namely "<a href="#in-head" title="insertion mode:
in head">in head</a>", "<a href="#in-body" title="insertion mode: in
Expand Down Expand Up @@ -46120,7 +46123,7 @@ function receiver(e) {
only --> match for
the string "[CDATA[" (the five uppercase letters "CDATA" with a U+005B
LEFT SQUARE BRACKET character before and after), then consume those
characters and switch to the <a href="#cdata1">CDATA block state</a>
characters and switch to the <a href="#cdata1">CDATA section state</a>
(which is unrelated to the <a href="#content3">content model flag</a>'s
CDATA state).</p>

Expand Down Expand Up @@ -46740,7 +46743,7 @@ function receiver(e) {
<dd>Stay in the <a href="#bogus0">bogus DOCTYPE state</a>.
</dl>

<dt><dfn id=cdata1>CDATA block state</dfn>
<dt><dfn id=cdata1>CDATA section state</dfn>

<dd>
<p><em>(This can only happen if the <a href="#content3">content model
Expand Down Expand Up @@ -47446,10 +47449,10 @@ function receiver(e) {
<td> <a href="#xmlns">XMLNS namespace</a>
</table>

<p>The <dfn id=generic>generic CDATA parsing algorithm</dfn> and the <dfn
id=generic0>generic RCDATA parsing algorithm</dfn> consist of the
following steps. These algorithms are always invoked in response to a
start tag token.
<p>The <dfn id=generic>generic CDATA element parsing algorithm</dfn> and
the <dfn id=generic0>generic RCDATA element parsing algorithm</dfn>
consist of the following steps. These algorithms are always invoked in
response to a start tag token.

<ol>
<li>
Expand All @@ -47461,11 +47464,11 @@ function receiver(e) {

<li>
<p>If the algorithm that was invoked is the <a href="#generic">generic
CDATA parsing algorithm</a>, switch the tokeniser's <a
CDATA element parsing algorithm</a>, switch the tokeniser's <a
href="#content3">content model flag</a> to the CDATA state; otherwise
the algorithm invoked was the <a href="#generic0">generic RCDATA parsing
algorithm</a>, switch the tokeniser's <a href="#content3">content model
flag</a> to the RCDATA state.
the algorithm invoked was the <a href="#generic0">generic RCDATA element
parsing algorithm</a>, switch the tokeniser's <a
href="#content3">content model flag</a> to the RCDATA state.

<li>
<p>Then, collect all the character tokens that the tokeniser returns
Expand Down Expand Up @@ -48076,15 +48079,17 @@ function receiver(e) {
<dt>A start tag whose tag name is "title"

<dd>
<p>Follow the <a href="#generic0">generic RCDATA parsing algorithm</a>.</p>
<p>Follow the <a href="#generic0">generic RCDATA element parsing
algorithm</a>.</p>

<dt>A start tag whose tag name is "noscript", if the <a
href="#scripting2">scripting flag</a> is enabled

<dt>A start tag whose tag name is one of: "noframes", "style"

<dd>
<p>Follow the <a href="#generic">generic CDATA parsing algorithm</a>.</p>
<p>Follow the <a href="#generic">generic CDATA element parsing
algorithm</a>.</p>

<dt>A start tag whose tag name is "noscript", if the <a
href="#scripting2">scripting flag</a> is disabled
Expand Down Expand Up @@ -49150,7 +49155,8 @@ function receiver(e) {
<p><a href="#reconstruct">Reconstruct the active formatting elements</a>,
if any.</p>

<p>Follow the <a href="#generic">generic CDATA parsing algorithm</a>.</p>
<p>Follow the <a href="#generic">generic CDATA element parsing
algorithm</a>.</p>

<dt>A start tag whose tag name is "table"

Expand Down Expand Up @@ -49348,7 +49354,8 @@ function receiver(e) {
href="#scripting2">scripting flag</a> is enabled

<dd>
<p>Follow the <a href="#generic">generic CDATA parsing algorithm</a>.</p>
<p>Follow the <a href="#generic">generic CDATA element parsing
algorithm</a>.</p>

<dt>A start tag whose tag name is "select"

Expand Down Expand Up @@ -51165,29 +51172,32 @@ http://lxr.mozilla.org/seamonkey/search?string=nested
<dt>If it is a <code><a href="#title1">title</a></code> or
<code>textarea</code> element

<dd>Set the <a href="#content3">content model flag</a> to <i>RCDATA</i>.
<dd>Set the <a href="#content3">content model flag</a> to the RCDATA
state.

<dt>If it is a <code><a href="#style1">style</a></code>, <code><a
href="#script1">script</a></code>, <code>xmp</code>, <code><a
href="#iframe">iframe</a></code>, <code>noembed</code>, or
<code>noframes</code> element

<dd>Set the <a href="#content3">content model flag</a> to <i>CDATA</i>.
<dd>Set the <a href="#content3">content model flag</a> to the CDATA
state.

<dt>If it is a <code><a href="#noscript">noscript</a></code> element

<dd>If the <a href="#scripting2">scripting flag</a> is enabled, set the
<a href="#content3">content model flag</a> to <i>CDATA</i>. Otherwise,
set the <a href="#content3">content model flag</a> to <i>PCDATA</i>.
<a href="#content3">content model flag</a> to the CDATA state.
Otherwise, set the <a href="#content3">content model flag</a> to the
PCDATA state.

<dt>If it is a <code>plaintext</code> element

<dd>Set the <a href="#content3">content model flag</a> to
<i>PLAINTEXT</i>.
<dd>Set the <a href="#content3">content model flag</a> to PLAINTEXT.

<dt>Otherwise

<dd>Set the <a href="#content3">content model flag</a> to <i>PCDATA</i>.
<dd>Set the <a href="#content3">content model flag</a> to the PCDATA
state.
</dl>

<li>
Expand Down

0 comments on commit 45eb03b

Please sign in to comment.