html5/spec Overview.html,1.5562,1.5563

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv23418

Modified Files:
	Overview.html 
Log Message:
Hoist requirements on what text can consist of from the text/html syntax to the DOM, so it also applies to XML and script-provided data. (whatwg r6968)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5562
retrieving revision 1.5563
diff -u -d -r1.5562 -r1.5563
--- Overview.html	6 Feb 2012 23:16:11 -0000	1.5562
+++ Overview.html	6 Feb 2012 23:41:57 -0000	1.5563
@@ -10194,7 +10194,22 @@
   own, but is also <a href="#phrasing-content">phrasing content</a>, and can be
   <a href="#inter-element-whitespace">inter-element whitespace</a> (if the <code><a href="#text">Text</a></code>
   nodes are empty or contain just <a href="#space-character" title="space character">space
-  characters</a>).</p><h6 id="embedded-content-0"><span class="secno">3.2.5.1.6 </span>Embedded content</h6><p><dfn id="embedded-content">Embedded content</dfn> is content that imports another
+  characters</a>).<p><code><a href="#text">Text</a></code> nodes and attribute values must consist of
+  <a href="#unicode-character" title="Unicode character">Unicode characters</a>, must not
+  contain U+0000 characters, must not contain permanently undefined
+  Unicode characters (noncharacters), and must not contain control
+  characters other than <a href="#space-character" title="space character">space
+  characters</a>.
+
+   
+
+  This specification includes extra constraints on the exact value of
+  <code><a href="#text">Text</a></code> nodes and attribute values depending on their
+  precise context.
+
+  
+
+  <h6 id="embedded-content-0"><span class="secno">3.2.5.1.6 </span>Embedded content</h6><p><dfn id="embedded-content">Embedded content</dfn> is content that imports another
   resource into the document, or content from another vocabulary that
   is inserted into the document.</p><ul class="brief category-list"><li><code><a href="#the-audio-element">audio</a></code></li>
    <li><code><a href="#the-canvas-element">canvas</a></code></li>
@@ -57865,13 +57880,9 @@
   TABULATION (tab), U+000A LINE FEED (LF), U+000C FORM FEED (FF), U+000D
   CARRIAGE RETURN (CR), U+0020 SPACE, U+003E GREATER-THAN SIGN (&gt;), or
   U+002F SOLIDUS (/).<h4 id="text-0"><span class="secno">8.1.3 </span>Text</h4><p><dfn id="syntax-text" title="syntax-text">Text</dfn> is allowed inside elements,
-  attribute values, and comments. Text must consist of <a href="#unicode-character" title="Unicode character">Unicode characters</a>. Text must not
-  contain U+0000 characters. Text must not contain 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">8.1.3.1 </span>Newlines</h5><p><dfn id="syntax-newlines" title="syntax-newlines">Newlines</dfn> in HTML may be
+  attribute values, and comments. 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">8.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.<p>Where <a href="#syntax-charref" title="syntax-charref">character references</a>

Received on Monday, 6 February 2012 23:44:07 UTC