- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 08 Aug 2009 01:40:28 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv10292
Modified Files:
Overview.html
Log Message:
Rename 'CDATA' to 'Raw Text' to avoid confusing it with CDATA sections. (bug 6689) (whatwg r3562)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2754
retrieving revision 1.2755
diff -u -d -r1.2754 -r1.2755
--- Overview.html 8 Aug 2009 01:25:45 -0000 1.2754
+++ Overview.html 8 Aug 2009 01:40:25 -0000 1.2755
@@ -983,7 +983,7 @@
<li><a href="#attributes"><span class="secno">9.1.2.3 </span>Attributes</a></li>
<li><a href="#optional-tags"><span class="secno">9.1.2.4 </span>Optional tags</a></li>
<li><a href="#element-restrictions"><span class="secno">9.1.2.5 </span>Restrictions on content models</a></li>
- <li><a href="#cdata-rcdata-restrictions"><span class="secno">9.1.2.6 </span>Restrictions on the contents of CDATA and RCDATA elements</a></ol></li>
+ <li><a href="#cdata-rcdata-restrictions"><span class="secno">9.1.2.6 </span>Restrictions on the contents of raw text and RCDATA elements</a></ol></li>
<li><a href="#text-0"><span class="secno">9.1.3 </span>Text</a>
<ol>
<li><a href="#newlines"><span class="secno">9.1.3.1 </span>Newlines</a></ol></li>
@@ -1058,7 +1058,7 @@
<li><a href="#parsing-main-inheadnoscript"><span class="secno">9.2.5.8 </span>The "in head noscript" insertion mode</a></li>
<li><a href="#the-after-head-insertion-mode"><span class="secno">9.2.5.9 </span>The "after head" insertion mode</a></li>
<li><a href="#parsing-main-inbody"><span class="secno">9.2.5.10 </span>The "in body" insertion mode</a></li>
- <li><a href="#parsing-main-incdata"><span class="secno">9.2.5.11 </span>The "in CDATA/RCDATA" insertion mode</a></li>
+ <li><a href="#parsing-main-incdata"><span class="secno">9.2.5.11 </span>The "in RAWTEXT/RCDATA" insertion mode</a></li>
<li><a href="#parsing-main-intable"><span class="secno">9.2.5.12 </span>The "in table" insertion mode</a></li>
<li><a href="#parsing-main-intabletext"><span class="secno">9.2.5.13 </span>The "in table text" insertion mode</a></li>
<li><a href="#parsing-main-incaption"><span class="secno">9.2.5.14 </span>The "in caption" insertion mode</a></li>
@@ -23280,10 +23280,11 @@
<p>User agents must handle text other than <a href="#inter-element-whitespace">inter-element
whitespace</a> found in MathML elements whose content models do
- not allow raw text by pretending for the purposes of MathML content
- models, layout, and rendering that that text is actually wrapped in
- an <code title="">mtext</code> element in the <a href="#mathml-namespace">MathML
- namespace</a>. (Such text is not, however, conforming.)</p>
+ not allow straight text by pretending for the purposes of MathML
+ content models, layout, and rendering that that text is actually
+ wrapped in an <code title="">mtext</code> element in the
+ <a href="#mathml-namespace">MathML namespace</a>. (Such text is not, however,
+ conforming.)</p>
<p>User agents must act as if any MathML element whose contents does
not match the element's content model was replaced, for the purposes
@@ -53099,7 +53100,7 @@
'about:legacy-compat'></code>, case-insensitively except for the bit
in quotes.<p>The <a href="#doctype-legacy-string">DOCTYPE legacy string</a> should not be used unless
the document is generated from a system that cannot output the
- shorter string.<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, CDATA
+ shorter string.<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.<dl><dt><dfn id="void-elements">Void elements</dfn></dt>
@@ -53109,10 +53110,10 @@
<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>CDATA elements</dt>
+ <dt>Raw text elements</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 CDATA for syntax purposes -->
+ noscript don't count as raw text for syntax purposes -->
<dt>RCDATA elements</dt>
@@ -53129,7 +53130,7 @@
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. CDATA, RCDATA, and normal
+ 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
@@ -53149,7 +53150,7 @@
the contents by those content models, however, the five types of
elements have additional <em>syntactic</em> requirements.<p><a href="#void-elements">Void elements</a> 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="#syntax-text" title="syntax-text">text</a>,
+ tag).<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>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
@@ -53466,7 +53467,7 @@
<p>The following two <code><a href="#the-pre-element">pre</a></code> blocks are equivalent:</p>
<pre><pre>Hello</pre></pre>
<pre><pre><br>Hello</pre></pre>
- </div><h5 id="cdata-rcdata-restrictions"><span class="secno">9.1.2.6 </span>Restrictions on the contents of CDATA and RCDATA elements</h5><p>The text in CDATA and RCDATA elements must not contain any
+ </div><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=""></</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
@@ -53490,9 +53491,10 @@
U+003E GREATER-THAN SIGN (>).<p>An <a href="#syntax-escape-start" title="syntax-escape-start">escaping text span
start</a> may share its U+002D HYPHEN-MINUS characters with its
corresponding <a href="#syntax-escape-end" title="syntax-escape-end">escaping text span
- end</a>.<p>The text in CDATA 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>.<h4 id="text-0"><span class="secno">9.1.3 </span>Text</h4><p><dfn id="syntax-text" title="syntax-text">Text</dfn> is allowed inside elements,
+ end</a>.<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>.<h4 id="text-0"><span class="secno">9.1.3 </span>Text</h4><p><dfn id="syntax-text" title="syntax-text">Text</dfn> is allowed inside elements,
attributes, and comments. Text must consist of Unicode characters.
Text must not contain U+0000 characters. Text must not contain
permanently undefined Unicode characters. Text must not contain
@@ -54208,7 +54210,7 @@
"<a href="#the-before-html-insertion-mode" title="insertion mode: before html">before html</a>",
"<a href="#the-before-head-insertion-mode" title="insertion mode: before head">before head</a>",
"<a href="#parsing-main-inhead" title="insertion mode: in head">in head</a>", "<a href="#parsing-main-inheadnoscript" title="insertion mode: in head noscript">in head noscript</a>",
- "<a href="#the-after-head-insertion-mode" title="insertion mode: after head">after head</a>", "<a href="#parsing-main-inbody" title="insertion mode: in body">in body</a>", "<a href="#parsing-main-incdata" title="insertion mode: in CDATA/RCDATA">in CDATA/RCDATA</a>",
+ "<a href="#the-after-head-insertion-mode" title="insertion mode: after head">after head</a>", "<a href="#parsing-main-inbody" title="insertion mode: in body">in body</a>", "<a href="#parsing-main-incdata" title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>",
"<a href="#parsing-main-intable" title="insertion mode: in table">in table</a>", "<a href="#parsing-main-intabletext" title="insertion mode: in table text">in table text</a>", "<a href="#parsing-main-incaption" title="insertion mode: in caption">in caption</a>", "<a href="#parsing-main-incolgroup" title="insertion mode: in column group">in column group</a>",
"<a href="#parsing-main-intbody" title="insertion mode: in table body">in table body</a>",
"<a href="#parsing-main-intr" title="insertion mode: in row">in row</a>", "<a href="#parsing-main-intd" title="insertion mode: in cell">in cell</a>", "<a href="#parsing-main-inselect" title="insertion mode: in select">in select</a>", "<a href="#parsing-main-inselectintable" title="insertion mode: in select in table">in select in
@@ -54239,7 +54241,7 @@
to a new value.</p>
<p>When the insertion mode is switched to "<a href="#parsing-main-incdata" title="insertion
- mode: in CDATA/RCDATA">in CDATA/RCDATA</a>" or "<a href="#parsing-main-intabletext" title="insertion mode: in table text">in table text</a>", the
+ mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>" or "<a href="#parsing-main-intabletext" title="insertion mode: in table text">in table text</a>", the
<dfn id="original-insertion-mode">original insertion mode</dfn> is also set. This is the
insertion mode to which the tree construction stage will return.</p>
@@ -54635,8 +54637,8 @@
<p>The exact behavior of certain states depends on a <dfn id="content-model-flag">content
model flag</dfn> that is set after certain tokens are emitted. The
- flag has several states: <i title="">PCDATA</i>, <i title="">RCDATA</i>, <i title="">CDATA</i>, and <i title="">PLAINTEXT</i>. Initially, it must be in the PCDATA
- state. In the RCDATA and CDATA states, a further <dfn id="escape-flag">escape
+ flag has several states: <i title="">PCDATA</i>, <i title="">RCDATA</i>, <i title="">RAWTEXT</i>, and <i title="">PLAINTEXT</i>. Initially, it must be in the PCDATA
+ state. In the RCDATA and RAWTEXT states, a further <dfn id="escape-flag">escape
flag</dfn> is used to control the behavior of the tokenizer. It is
either true or false, and initially must be set to the false
state. The <a href="#insertion-mode">insertion mode</a> and the <a href="#stack-of-open-elements">stack of open
@@ -54713,7 +54715,7 @@
<dd>
<p>If the <a href="#content-model-flag">content model flag</a> is set to either the
- RCDATA state or the CDATA state, and the <a href="#escape-flag">escape flag</a>
+ RCDATA state or the RAWTEXT state, and the <a href="#escape-flag">escape flag</a>
is false, and there are at least three characters before this
one in the input stream, and the last four characters in the
input stream, including this one, are U+003C LESS-THAN SIGN,
@@ -54730,7 +54732,7 @@
<dd>When the <a href="#content-model-flag">content model flag</a> is set to the PCDATA
state: switch to the <a href="#tag-open-state">tag open state</a>.</dd>
<dd>When the <a href="#content-model-flag">content model flag</a> is set to either the
- RCDATA state or the CDATA state, and the <a href="#escape-flag">escape flag</a>
+ RCDATA state or the RAWTEXT state, and the <a href="#escape-flag">escape flag</a>
is false: switch to the <a href="#tag-open-state">tag open state</a>.</dd>
<dd>Otherwise: treat it as per the "anything else" entry
below.</dd>
@@ -54739,7 +54741,7 @@
<dd>
<p>If the <a href="#content-model-flag">content model flag</a> is set to either the
- RCDATA state or the CDATA state, and the <a href="#escape-flag">escape
+ RCDATA state or the RAWTEXT state, and the <a href="#escape-flag">escape
flag</a> is true, and the last three characters in the input
stream including this one are U+002D HYPHEN-MINUS, U+002D
HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"), set the
@@ -54763,7 +54765,7 @@
</dl><h5 id="character-reference-data-state"><span class="secno">9.2.4.2 </span><dfn>Character reference data state</dfn></h5>
<p><i>(This cannot happen if the <a href="#content-model-flag">content model flag</a>
- is set to the CDATA state.)</i></p>
+ is set to the RAWTEXT state.)</i></p>
<p>Attempt to <a href="#consume-a-character-reference">consume a character reference</a>, with no
<a href="#additional-allowed-character">additional allowed character</a>.</p>
@@ -54782,7 +54784,7 @@
flag</a>.</p>
<dl><dt>If the <a href="#content-model-flag">content model flag</a> is set to the RCDATA
- or CDATA states</dt>
+ or RAWTEXT states</dt>
<dd>
@@ -54839,9 +54841,9 @@
</dl><h5 id="close-tag-open-state"><span class="secno">9.2.4.4 </span><dfn>Close tag open state</dfn></h5>
<p>If the <a href="#content-model-flag">content model flag</a> is set to the RCDATA or
- CDATA states but no start tag token has ever been emitted by this
+ RAWTEXT states but no start tag token has ever been emitted by this
instance of the tokenizer (<a href="#fragment-case">fragment case</a>), or, if the
- <a href="#content-model-flag">content model flag</a> is set to the RCDATA or CDATA states
+ <a href="#content-model-flag">content model flag</a> is set to the RCDATA or RAWTEXT states
and the next few characters do not match the tag name of the last
start tag token emitted (compared in an <a href="#ascii-case-insensitive">ASCII
case-insensitive</a> manner), or if they do but they are not
@@ -55273,8 +55275,7 @@
an <span>ASCII case-sensitive</span> 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="#cdata-section-state">CDATA section state</a> (which is
- unrelated to the <a href="#content-model-flag">content model flag</a>'s CDATA state).</p>
+ and switch to the <a href="#cdata-section-state">CDATA section state</a>.</p>
<p>Otherwise, this is a <a href="#parse-error">parse error</a>. Switch to the
<a href="#bogus-comment-state">bogus comment state</a>. The next character that is
@@ -55806,8 +55807,7 @@
</dl><h5 id="cdata-section-state"><span class="secno">9.2.4.38 </span><dfn>CDATA section state</dfn></h5>
<p><i>(This can only happen if the <a href="#content-model-flag">content model
- flag</a> is set to the PCDATA state, and is unrelated to the
- <a href="#content-model-flag">content model flag</a>'s CDATA state.)</i></p>
+ flag</a> is set to the PCDATA state.)</i></p>
<p>Consume every character up to the next occurrence of the three
character sequence U+005D RIGHT SQUARE BRACKET U+005D RIGHT SQUARE
@@ -56249,16 +56249,16 @@
<tr><td> <code title="">xml:space</code> <td> <code title="">xml</code> <td> <code title="">space</code> <td> <a href="#xml-namespace">XML namespace</a>
<tr><td> <code title="">xmlns</code> <td> (none) <td> <code title="">xmlns</code> <td> <a href="#xmlns-namespace">XMLNS namespace</a>
<tr><td> <code title="">xmlns:xlink</code> <td> <code title="">xmlns</code> <td> <code title="">xlink</code> <td> <a href="#xmlns-namespace">XMLNS namespace</a>
- </table><hr><p>The <dfn id="generic-cdata-element-parsing-algorithm">generic CDATA element parsing algorithm</dfn> and the
+ </table><hr><p>The <dfn id="generic-raw-text-element-parsing-algorithm">generic raw text element parsing algorithm</dfn> and the
<dfn id="generic-rcdata-element-parsing-algorithm">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><li><p><a href="#insert-an-html-element">Insert an HTML element</a> for the token.</li>
- <li><p>If the algorithm that was invoked is the <a href="#generic-cdata-element-parsing-algorithm">generic CDATA
- element parsing algorithm</a>, switch the tokenizer's
- <a href="#content-model-flag">content model flag</a> to the CDATA state; otherwise the
+ <li><p>If the algorithm that was invoked is the <a href="#generic-raw-text-element-parsing-algorithm">generic raw
+ text element parsing algorithm</a>, switch the tokenizer's
+ <a href="#content-model-flag">content model flag</a> to the RAWTEXT state; otherwise the
algorithm invoked was the <a href="#generic-rcdata-element-parsing-algorithm">generic RCDATA element parsing
algorithm</a>, switch the tokenizer's <a href="#content-model-flag">content model
flag</a> to the RCDATA state.</li>
@@ -56266,8 +56266,8 @@
<li><p>Let the <a href="#original-insertion-mode">original insertion mode</a> be the current
<a href="#insertion-mode">insertion mode</a>.</p>
- <li><p>Then, switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incdata" title="insertion mode: in CDATA/RCDATA">in
- CDATA/RCDATA</a>".</li>
+ <li><p>Then, switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incdata" title="insertion mode: in RAWTEXT/RCDATA">in
+ RAWTEXT/RCDATA</a>".</li>
</ol><h5 id="closing-elements-that-have-implied-end-tags"><span class="secno">9.2.5.2 </span>Closing elements that have implied end tags</h5>
@@ -56734,7 +56734,7 @@
<dt>A start tag whose tag name is "noscript", if the <a href="#scripting-flag">scripting flag</a> is enabled</dt>
<dt>A start tag whose tag name is one of: "noframes", "style"</dt>
<dd>
- <p>Follow the <a href="#generic-cdata-element-parsing-algorithm">generic CDATA element parsing algorithm</a>.</p>
+ <p>Follow the <a href="#generic-raw-text-element-parsing-algorithm">generic raw text element parsing algorithm</a>.</p>
</dd>
<dt>A start tag whose tag name is "noscript", if the <a href="#scripting-flag">scripting flag</a> is disabled</dt>
@@ -56776,13 +56776,13 @@
elements</a>.</li>
<li><p>Switch the tokenizer's <a href="#content-model-flag">content model flag</a> to
- the CDATA state.</li>
+ the RAWTEXT state.</li>
<li><p>Let the <a href="#original-insertion-mode">original insertion mode</a> be the current
<a href="#insertion-mode">insertion mode</a>.</p>
- <li><p>Switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incdata" title="insertion mode: in CDATA/RCDATA">in
- CDATA/RCDATA</a>".</li>
+ <li><p>Switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incdata" title="insertion mode: in RAWTEXT/RCDATA">in
+ RAWTEXT/RCDATA</a>".</li>
</ol></dd>
@@ -57910,8 +57910,8 @@
<li><p>Set the <a href="#frameset-ok-flag">frameset-ok flag</a> to "not
ok".</li>
- <li><p>Switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incdata" title="insertion mode: in CDATA/RCDATA">in
- CDATA/RCDATA</a>".</li>
+ <li><p>Switch the <a href="#insertion-mode">insertion mode</a> to "<a href="#parsing-main-incdata" title="insertion mode: in RAWTEXT/RCDATA">in
+ RAWTEXT/RCDATA</a>".</li>
</ol></dd>
@@ -57923,7 +57923,7 @@
<p>Set the <a href="#frameset-ok-flag">frameset-ok flag</a> to "not ok".</p>
- <p>Follow the <a href="#generic-cdata-element-parsing-algorithm">generic CDATA element parsing algorithm</a>.</p>
+ <p>Follow the <a href="#generic-raw-text-element-parsing-algorithm">generic raw text element parsing algorithm</a>.</p>
</dd>
@@ -57932,7 +57932,7 @@
<p>Set the <a href="#frameset-ok-flag">frameset-ok flag</a> to "not ok".</p>
- <p>Follow the <a href="#generic-cdata-element-parsing-algorithm">generic CDATA element parsing algorithm</a>.</p>
+ <p>Follow the <a href="#generic-raw-text-element-parsing-algorithm">generic raw text element parsing algorithm</a>.</p>
</dd>
@@ -57940,7 +57940,7 @@
<dt>A start tag whose tag name is "noscript", if the <a href="#scripting-flag">scripting flag</a> is enabled</dt>
<dd>
- <p>Follow the <a href="#generic-cdata-element-parsing-algorithm">generic CDATA element parsing algorithm</a>.</p>
+ <p>Follow the <a href="#generic-raw-text-element-parsing-algorithm">generic raw text element parsing algorithm</a>.</p>
</dd>
@@ -58158,10 +58158,10 @@
</ol></dd>
- </dl><h5 id="parsing-main-incdata"><span class="secno">9.2.5.11 </span>The "<dfn title="insertion mode: in CDATA/RCDATA">in CDATA/RCDATA</dfn>" insertion mode</h5>
+ </dl><h5 id="parsing-main-incdata"><span class="secno">9.2.5.11 </span>The "<dfn title="insertion mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</dfn>" insertion mode</h5>
<p>When the <a href="#insertion-mode">insertion mode</a> is "<a href="#parsing-main-incdata" title="insertion
- mode: in CDATA/RCDATA">in CDATA/RCDATA</a>", tokens must be
+ mode: in RAWTEXT/RCDATA">in RAWTEXT/RCDATA</a>", tokens must be
handled as follows:</p>
<dl class="switch"><dt>A character token</dt>
@@ -60339,13 +60339,13 @@
<code><a href="#noframes">noframes</a></code> element</dt>
<dd>Set the <a href="#content-model-flag">content model flag</a> to
- the CDATA state.</dd>
+ the RAWTEXT state.</dd>
<dt>If it is a <code><a href="#the-noscript-element">noscript</a></code> element</dt>
<dd>If the <a href="#scripting-flag">scripting flag</a> is enabled, set the
- <a href="#content-model-flag">content model flag</a> to the CDATA
+ <a href="#content-model-flag">content model flag</a> to the RAWTEXT
state. Otherwise, set the <a href="#content-model-flag">content model flag</a> to the
PCDATA state.</dd>
Received on Saturday, 8 August 2009 01:40:38 UTC