[html5] r1904 - [e] (0) Terminology cleanup near the term 'CDATA'
whatwg at whatwg.org
whatwg at whatwg.org
Tue Jul 22 17:51:33 PDT 2008
Author: ianh
Date: 2008-07-22 17:51:32 -0700 (Tue, 22 Jul 2008)
New Revision: 1904
Modified:
index
source
Log:
[e] (0) Terminology cleanup near the term 'CDATA'
Modified: index
===================================================================
--- index 2008-07-22 21:57:11 UTC (rev 1903)
+++ index 2008-07-23 00:51:32 UTC (rev 1904)
@@ -24,7 +24,7 @@
<h1 id=html-5>HTML 5</h1>
- <h2 class="no-num no-toc" id=draft>Draft Recommendation — 22 July
+ <h2 class="no-num no-toc" id=draft>Draft Recommendation — 23 July
2008</h2>
<p>You can take part in this work. <a
@@ -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>
@@ -29336,8 +29337,8 @@
<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
@@ -29410,8 +29411,9 @@
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
@@ -30092,16 +30094,17 @@
</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
@@ -43443,7 +43446,7 @@
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><</code>) or an <a
@@ -43999,18 +44002,18 @@
a <a href="#space">space character</a>, a U+003C LESS-THAN SIGN character
('<'), or another U+0026 AMPERSAND (<code>&</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=""><![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=""><![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>).
@@ -44863,7 +44866,7 @@
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
@@ -46120,7 +46123,7 @@
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>
@@ -46740,7 +46743,7 @@
<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
@@ -47446,10 +47449,10 @@
<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>
@@ -47461,11 +47464,11 @@
<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
@@ -48076,7 +48079,8 @@
<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
@@ -48084,7 +48088,8 @@
<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
@@ -49150,7 +49155,8 @@
<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"
@@ -49348,7 +49354,8 @@
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"
@@ -51165,29 +51172,32 @@
<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>
Modified: source
===================================================================
--- source 2008-07-22 21:57:11 UTC (rev 1903)
+++ source 2008-07-23 00:51:32 UTC (rev 1904)
@@ -26773,7 +26773,8 @@
<p>If the <code title="attr-rule-condition">condition</code>
attribute is not specified, then the condition applies to all
- elements, text nodes, CDATA nodes, and processing instructions.</p>
+ elements, text nodes, <code>CDATASection</code> nodes, and
+ processing instructions.</p>
<p>The <dfn title="attr-rule-mode"><code>mode</code></dfn>
attribute, if specified, must have a value that is an
@@ -26834,8 +26835,9 @@
href="#refsSELECTORS">[SELECTORS]</a></p>
<p>If the <code title="attr-nest-filter">filter</code> attribute is
- not specified, then all elements, text nodes, CDATA nodes, and
- processing instructions are processed.</p>
+ not specified, then all elements, text nodes,
+ <code>CDATASection</code> nodes, and processing instructions are
+ processed.</p>
<p>The <dfn title="attr-nest-mode"><code>mode</code></dfn>
attribute, if specified, must have a value that is a word token
@@ -27539,14 +27541,16 @@
</ol>
<p>Otherwise, the <var title="">new node</var> is a text node,
- CDATA block, or PI. Run these substeps instead:</p>
+ <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 <span>text expansion
- algorithm for templates</span> along with <var title="">source
+ of the text node, <code>CDATASection</code> node, or processing
+ instruction) to the <span>text expansion algorithm for
+ templates</span> along with <var title="">source
node</var>.</p></li>
<li><p>If the value of the <var title="">new node</var> is
@@ -41059,7 +41063,7 @@
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 blocks</span>, other <span
+ title="syntax-cdata">CDATA sections</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
@@ -41634,22 +41638,22 @@
character.</p>
- <h4>CDATA blocks</h4>
+ <h4>CDATA sections</h4>
- <p><dfn 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=""><![CDATA[</code>). Following this
- sequence, the block may have <span title="syntax-text">text</span>,
- 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 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>).</p>
+ <p><dfn 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=""><![CDATA[</code>). Following this
+ sequence, the CDATA section may have <span
+ title="syntax-text">text</span>, 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
+ 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>).</p>
<h4>Comments</h4>
@@ -42478,7 +42482,8 @@
title="insertion mode: after after frameset">after after
frameset</span>" during the course of the parsing, as described in
the <span>tree construction</span> stage. The insertion mode affects
- how tokens are processed and whether CDATA blocks are supported.</p>
+ how tokens are processed and whether CDATA sections are
+ supported.</p>
<p>Seven of these modes, namely "<span title="insertion mode: in
head">in head</span>", "<span title="insertion mode: in body">in
@@ -43686,7 +43691,7 @@
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
- <span>CDATA block state</span> (which is unrelated to the
+ <span>CDATA section state</span> (which is unrelated to the
<span>content model flag</span>'s CDATA state).</p>
<p>Otherwise, this is a <span>parse error</span>. Switch to the
@@ -44283,7 +44288,7 @@
</dd>
- <dt><dfn>CDATA block state</dfn></dt>
+ <dt><dfn>CDATA section state</dfn></dt>
<dd>
@@ -44711,10 +44716,10 @@
</table>
- <p>The <dfn>generic CDATA parsing algorithm</dfn> and the
- <dfn>generic RCDATA parsing algorithm</dfn> consist of the following
- steps. These algorithms are always invoked in response to a start
- tag token.</p>
+ <p>The <dfn>generic CDATA element parsing algorithm</dfn> and the
+ <dfn>generic RCDATA element parsing algorithm</dfn> consist of the
+ following steps. These algorithms are always invoked in response to
+ a start tag token.</p>
<ol>
@@ -44725,11 +44730,11 @@
node</span>.</p></li>
<li><p>If the algorithm that was invoked is the <span>generic CDATA
- parsing algorithm</span>, switch the tokeniser's <span>content
- model flag</span> to the CDATA state; otherwise the algorithm
- invoked was the <span>generic RCDATA parsing algorithm</span>,
- switch the tokeniser's <span>content model flag</span> to the
- RCDATA state.</p></li>
+ element parsing algorithm</span>, switch the tokeniser's
+ <span>content model flag</span> to the CDATA state; otherwise the
+ algorithm invoked was the <span>generic RCDATA element parsing
+ algorithm</span>, switch the tokeniser's <span>content model
+ flag</span> to the RCDATA state.</p></li>
<li><p>Then, collect all the character tokens that the tokeniser
returns until it returns a token that is not a character token, or
@@ -45213,13 +45218,13 @@
<dt>A start tag whose tag name is "title"</dt>
<dd>
- <p>Follow the <span>generic RCDATA parsing algorithm</span>.</p>
+ <p>Follow the <span>generic RCDATA element parsing algorithm</span>.</p>
</dd>
<dt>A start tag whose tag name is "noscript", if the <span>scripting flag</span> is enabled</dt>
<dt>A start tag whose tag name is one of: "noframes", "style"</dt>
<dd>
- <p>Follow the <span>generic CDATA parsing algorithm</span>.</p>
+ <p>Follow the <span>generic CDATA element parsing algorithm</span>.</p>
</dd>
<dt>A start tag whose tag name is "noscript", if the <span>scripting flag</span> is disabled</dt>
@@ -46347,7 +46352,7 @@
<p><span>Reconstruct the active formatting elements</span>, if
any.</p>
- <p>Follow the <span>generic CDATA parsing algorithm</span>.</p>
+ <p>Follow the <span>generic CDATA element parsing algorithm</span>.</p>
</dd>
@@ -46563,7 +46568,7 @@
<dt>A start tag whose tag name is one of: "iframe", "noembed"</dt>
<dt>A start tag whose tag name is "noscript", if the <span>scripting flag</span> is enabled</dt>
<dd>
- <p>Follow the <span>generic CDATA parsing algorithm</span>.</p>
+ <p>Follow the <span>generic CDATA element parsing algorithm</span>.</p>
</dd>
<dt>A start tag whose tag name is "select"</dt>
@@ -48480,7 +48485,7 @@
element</dt>
<dd>Set the <span>content model flag</span> to
- <i>RCDATA</i>.</dd>
+ the RCDATA state.</dd>
<dt>If it is a <code>style</code>, <code>script</code>,
@@ -48488,25 +48493,27 @@
<code>noframes</code> element</dt>
<dd>Set the <span>content model flag</span> to
- <i>CDATA</i>.</dd>
+ the CDATA state.</dd>
<dt>If it is a <code>noscript</code> element</dt>
<dd>If the <span>scripting flag</span> is enabled, set the
- <span>content model flag</span> to <i>CDATA</i>. Otherwise, set
- the <span>content model flag</span> to <i>PCDATA</i>.</dd>
+ <span>content model flag</span> to the CDATA
+ state. Otherwise, set the <span>content model flag</span> to the
+ PCDATA state.</dd>
<dt>If it is a <code>plaintext</code> element</dt>
<dd>Set the <span>content model flag</span> to
- <i>PLAINTEXT</i>.</dd>
+ PLAINTEXT.</dd>
<dt>Otherwise</dt>
- <dd>Set the <span>content model flag</span> to <i>PCDATA</i>.</dd>
+ <dd>Set the <span>content model flag</span> to the PCDATA
+ state.</dd>
</dl>
More information about the Commit-Watchers
mailing list