- From: poot <cvsmail@w3.org>
- Date: Wed, 16 Sep 2009 18:37:32 +0900 (JST)
- To: public-html-diffs@w3.org
hixie: Sync with Unicode terminology. (whatwg r3872) http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.3036&r2=1.3037&f=h http://html5.org/tools/web-apps-tracker?from=3871&to=3872 =================================================================== RCS file: /sources/public/html5/spec/Overview.html,v retrieving revision 1.3036 retrieving revision 1.3037 diff -u -d -r1.3036 -r1.3037 --- Overview.html 16 Sep 2009 09:16:20 -0000 1.3036 +++ Overview.html 16 Sep 2009 09:32:44 -0000 1.3037 @@ -1705,7 +1705,9 @@ We'll have to change that if anyone comes up with a way to have a document that is valid as two different encodings at once, with different <meta charset> elements applying in each case. - --><h3 id="conformance-requirements"><span class="secno">2.2 </span>Conformance requirements</h3><p class="XXX annotation"><b>Status: </b><i>Implemented and widely deployed</i><p>All diagrams, examples, and notes in this specification are + --><p>The term <dfn title="">Unicode character</dfn> is used to mean a + <i title="">Unicode scalar value</i> (i.e. any Unicode code point + that is not a surrogate code point). <a href="#refsUNICODE">[UNICODE]</a><h3 id="conformance-requirements"><span class="secno">2.2 </span>Conformance requirements</h3><p class="XXX annotation"><b>Status: </b><i>Implemented and widely deployed</i><p>All diagrams, examples, and notes in this specification are non-normative, as are all sections explicitly marked non-normative. Everything else in this specification is normative.<p>The key words "MUST", "MUST NOT", "REQUIRED", <!--"SHALL", "SHALL NOT",--> "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and @@ -55176,11 +55178,11 @@ 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 - control characters other than <a href="#space-character" title="space character">space - characters</a>. Extra constraints are placed on what is and what - is not allowed in text based on where the text is to be put, as - described in the other sections.<h5 id="newlines"><span class="secno">9.1.3.1 </span>Newlines</h5><p><dfn id="syntax-newlines" title="syntax-newlines">Newlines</dfn> in HTML may be + permanently undefined Unicode characters (noncharacters). Text must + not contain control characters other than <a href="#space-character" title="space + character">space characters</a>. Extra constraints are placed on + what is and what is not allowed in text based on where the text is + to be put, as described in the other sections.<h5 id="newlines"><span class="secno">9.1.3.1 </span>Newlines</h5><p><dfn id="syntax-newlines" title="syntax-newlines">Newlines</dfn> in HTML may be represented either as U+000D CARRIAGE RETURN (CR) characters, U+000A LINE FEED (LF) characters, or pairs of U+000D CARRIAGE RETURN (CR), U+000A LINE FEED (LF) characters in that order.<h4 id="character-references"><span class="secno">9.1.4 </span>Character references</h4><p>In certain cases described in other sections, <a href="#syntax-text" title="syntax-text">text</a> may be mixed with <dfn id="syntax-charref" title="syntax-charref">character references</dfn>. These can be used @@ -55900,8 +55902,8 @@ U+9FFFE, U+9FFFF, U+AFFFE, U+AFFFF, U+BFFFE, U+BFFFF, U+CFFFE, U+CFFFF, U+DFFFE, U+DFFFF, U+EFFFE, U+EFFFF, U+FFFFE, U+FFFFF, U+10FFFE, and U+10FFFF are <a href="#parse-error" title="parse error">parse - errors</a>. (These are all control characters or permanently - undefined Unicode characters.)</p> + errors</a>. These are all control characters or permanently + undefined Unicode characters (noncharacters).</p> <p>U+000D CARRIAGE RETURN (CR) characters and U+000A LINE FEED (LF) characters are treated specially. Any CR characters that are
Received on Wednesday, 16 September 2009 09:38:09 UTC