html5/spec spec.html,1.1142,1.1143 tokenization.html,1.23,1.24

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

Modified Files:
	spec.html tokenization.html 
Log Message:
Coalesce text nodes even if they're not parser-inserted. (whatwg r5298)

[updated by splitter]


Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/spec/tokenization.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- tokenization.html	16 Aug 2010 20:26:50 -0000	1.23
+++ tokenization.html	16 Aug 2010 20:47:31 -0000	1.24
@@ -2408,11 +2408,10 @@
   <p>When the steps below require the UA to <dfn id="insert-a-character">insert a
   character</dfn> into a node, if that node has a child immediately
   before where the character is to be inserted, and that child is a
-  <code><a href="infrastructure.html#text">Text</a></code> node, and that <code><a href="infrastructure.html#text">Text</a></code> node was the last
-  node that the parser inserted into the document, then the character
-  must be appended to that <code><a href="infrastructure.html#text">Text</a></code> node; otherwise, a new
-  <code><a href="infrastructure.html#text">Text</a></code> node whose data is just that character must be
-  inserted in the appropriate place.</p>
+  <code><a href="infrastructure.html#text">Text</a></code> node, then the character must be appended to that
+  <code><a href="infrastructure.html#text">Text</a></code> node; otherwise, a new <code><a href="infrastructure.html#text">Text</a></code> node
+  whose data is just that character must be inserted in the
+  appropriate place.</p>
 
   <div class="example">
 
@@ -2425,24 +2424,24 @@
 var&#160;script&#160;=&#160;document.getElementsByTagName('script')[0];
 document.body.removeChild(script);
 &lt;/script&gt;B</pre>
-      </td><td>Two adjacent text nodes in the document, containing "A" and "B".
+      </td><td>One text node in the document, containing "AB".
      </td></tr><tr><td><pre>A&lt;script&gt;
 var&#160;text&#160;=&#160;document.createTextNode('B');
 document.body.appendChild(text);
 &lt;/script&gt;C</pre>
-      </td><td>Four text nodes; "A" before the script, the script's contents, "B" after the script, and then, immediately after that, "C".
+      </td><td>Three text nodes; "A" before the script, the script's contents, and "BC" after the script (the parser appends to the text node created by the script).
      </td></tr><tr><td><pre>A&lt;script&gt;
 var&#160;text&#160;=&#160;document.getElementsByTagName('script')[0].firstChild;
 text.data&#160;=&#160;'B';
 document.body.appendChild(text);
-&lt;/script&gt;B</pre>
-      </td><td>Two adjacent text nodes in the document, containing "A" and "BB".
-     </td></tr><tr><td><pre>A&lt;table&gt;B&lt;tr&gt;C&lt;/tr&gt;C&lt;/table&gt;</pre>
-      </td><td>Three adjacent text nodes before the table, containing "A", "B", and "CC" respectively. (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
-     </td></tr><tr><td><pre>A&lt;table&gt;&lt;tr&gt;&#160;B&lt;/tr&gt;&#160;B&lt;/table&gt;</pre>
-      </td><td>Two adjacent text nodes before the table, containing "A" and "&#160;B&#160;B" (space-B-space-B) respectively. (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
+&lt;/script&gt;C</pre>
+      </td><td>Two adjacent text nodes in the document, containing "A" and "BC".
+     </td></tr><tr><td><pre>A&lt;table&gt;B&lt;tr&gt;C&lt;/tr&gt;D&lt;/table&gt;</pre>
+      </td><td>One text node before the table, containing "ABCD". (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
+     </td></tr><tr><td><pre>A&lt;table&gt;&lt;tr&gt;&#160;B&lt;/tr&gt;&#160;C&lt;/table&gt;</pre>
+      </td><td>One text node before the table, containing "A&#160;B&#160;C" (A-space-B-space-C). (This is caused by <a href="#foster-parent" title="foster parent">foster parenting</a>.)
      </td></tr><tr><td><pre>A&lt;table&gt;&lt;tr&gt;&#160;B&lt;/tr&gt;&#160;&lt;/em&gt;C&lt;/table&gt;</pre>
-      </td><td>Three adjacent text nodes before the table, containing "A", "&#160;B" (space-B), and "C" respectively, and one text node inside the table (as a child of a <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>) with a single space character. (Space characters separated from non-space characters by non-character tokens are not affected by <a href="#foster-parent" title="foster parent">foster parenting</a>, even if those other tokens then get ignored.)
+      </td><td>One text node before the table, containing "A&#160;BC" (A-space-B-C), and one text node inside the table (as a child of a <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>) with a single space character. (Space characters separated from non-space characters by non-character tokens are not affected by <a href="#foster-parent" title="foster parent">foster parenting</a>, even if those other tokens then get ignored.)
    </td></tr></tbody></table></div>
 
   <p id="mutation-during-parsing">DOM mutation events must not fire

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1142
retrieving revision 1.1143
diff -u -d -r1.1142 -r1.1143
--- spec.html	16 Aug 2010 20:26:49 -0000	1.1142
+++ spec.html	16 Aug 2010 20:47:27 -0000	1.1143
@@ -336,7 +336,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">author edition</a>.
-This is revision 1.4220.
+This is revision 1.4221.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2010 <a href="http://www.w3.org/"><abbr title="World Wide

Received on Monday, 16 August 2010 20:47:34 UTC