html5/spec spec.html,1.1144,1.1145 tokenization.html,1.24,1.25

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

Modified Files:
	spec.html tokenization.html 
Log Message:
Change how to handle unexpected HTML elements in foreign content to be a previously-solved problem, rather than rolling our own escapte hatch with all the problems that entails. (whatwg r5300)

[updated by splitter]


Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/spec/tokenization.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- tokenization.html	16 Aug 2010 20:47:31 -0000	1.24
+++ tokenization.html	16 Aug 2010 21:07:04 -0000	1.25
@@ -5707,10 +5707,26 @@
     <p><a href="parsing.html#parse-error">Parse error</a>.</p>
 
     <p>Pop elements from the <a href="parsing.html#stack-of-open-elements">stack of open elements</a> until
-    either a <code><a href="the-map-element.html#math">math</a></code> element or an <code><a href="the-map-element.html#svg">svg</a></code> element
-    has been popped from the stack, switch the <a href="parsing.html#insertion-mode">insertion
-    mode</a> to the <a href="parsing.html#secondary-insertion-mode">secondary insertion mode</a>, and
-    reprocess the token.</p>
+    the <a href="parsing.html#current-node">current node</a> is one of the following:</p>
+
+    <ul class="brief"><li>an <code title="">mi</code> element in the <a href="namespaces.html#mathml-namespace">MathML namespace</a></li>
+     <li>an <code title="">mo</code> element in the <a href="namespaces.html#mathml-namespace">MathML namespace</a></li>
+     <li>an <code title="">mn</code> element in the <a href="namespaces.html#mathml-namespace">MathML namespace</a></li>
+     <li>an <code title="">ms</code> element in the <a href="namespaces.html#mathml-namespace">MathML namespace</a></li>
+     <li>an <code title="">mtext</code> element in the <a href="namespaces.html#mathml-namespace">MathML namespace</a></li>
+     <li>a <code title="">foreignObject</code> element in the <a href="namespaces.html#svg-namespace">SVG namespace</a></li>
+     <li>a <code title="">desc</code> element in the <a href="namespaces.html#svg-namespace">SVG namespace</a></li>
+     <li>a <code title="">title</code> element in the <a href="namespaces.html#svg-namespace">SVG namespace</a></li>
+     <li>an element in the <a href="namespaces.html#html-namespace-0">HTML namespace</a></li>
+
+    </ul><p>If, after doing so, the <a href="parsing.html#insertion-mode">insertion mode</a> is still
+    "<a href="#parsing-main-inforeign" title="insertion mode: in foreign content">in foreign
+    content</a>", but there is no element <a href="parsing.html#has-an-element-in-scope" title="has an
+    element in scope">in scope</a> that has a namespace other than
+    the <a href="namespaces.html#html-namespace-0">HTML namespace</a>, switch the <a href="parsing.html#insertion-mode">insertion
+    mode</a> to the <a href="parsing.html#secondary-insertion-mode">secondary insertion mode</a>.</p>
+
+    <p>Reprocess the token.</p>
 
    </dd>
 

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1144
retrieving revision 1.1145
diff -u -d -r1.1144 -r1.1145
--- spec.html	16 Aug 2010 20:57:14 -0000	1.1144
+++ spec.html	16 Aug 2010 21:07:04 -0000	1.1145
@@ -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.4222.
+This is revision 1.4223.
    </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 21:07:08 UTC