[html5] r8465 - [ac] (2) Allow HTML content in certain places in MathML Fixing https://www.w3.or [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2014-02-05 11:25:41 -0800 (Wed, 05 Feb 2014)
New Revision: 8465

Modified:
   complete.html
   index
   source
Log:
[ac] (2) Allow HTML content in certain places in MathML
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=24526
Affected topics: HTML

Modified: complete.html
===================================================================
--- complete.html	2014-02-05 18:49:51 UTC (rev 8464)
+++ complete.html	2014-02-05 19:25:41 UTC (rev 8465)
@@ -31979,6 +31979,14 @@
   <a href=#embedded-content>embedded content</a>, <a href=#phrasing-content>phrasing content</a>, and <a href=#flow-content>flow content</a>
   categories for the purposes of the content models in this specification.</p>
 
+  <p>When the MathML <code title="">annotation-xml</code> element contains elements from the <a href=#html-namespace-0>HTML
+  namespace</a>, such elements must all be <a href=#flow-content>flow content</a>. <a href=#refsMATHML>[MATHML]</a></p>
+
+  <p>When the MathML token elements (<code title="">mi</code>, <code title="">mo</code>, <code title="">mn</code>, <code title="">ms</code>, and <code title="">mtext</code>) are descendants
+  of HTML elements, they may contain <a href=#phrasing-content>phrasing content</a> elements from the <a href=#html-namespace-0>HTML
+  namespace</a>. <a href=#refsMATHML>[MATHML]</a></p>
+  <!-- this hooks into http://www.w3.org/TR/MathML3/chapter6.html#world-int-combine-other -->
+
   <div class=impl>
 
   <!-- apparently we get to define error handling, so: -->

Modified: index
===================================================================
--- index	2014-02-05 18:49:51 UTC (rev 8464)
+++ index	2014-02-05 19:25:41 UTC (rev 8465)
@@ -31979,6 +31979,14 @@
   <a href=#embedded-content>embedded content</a>, <a href=#phrasing-content>phrasing content</a>, and <a href=#flow-content>flow content</a>
   categories for the purposes of the content models in this specification.</p>
 
+  <p>When the MathML <code title="">annotation-xml</code> element contains elements from the <a href=#html-namespace-0>HTML
+  namespace</a>, such elements must all be <a href=#flow-content>flow content</a>. <a href=#refsMATHML>[MATHML]</a></p>
+
+  <p>When the MathML token elements (<code title="">mi</code>, <code title="">mo</code>, <code title="">mn</code>, <code title="">ms</code>, and <code title="">mtext</code>) are descendants
+  of HTML elements, they may contain <a href=#phrasing-content>phrasing content</a> elements from the <a href=#html-namespace-0>HTML
+  namespace</a>. <a href=#refsMATHML>[MATHML]</a></p>
+  <!-- this hooks into http://www.w3.org/TR/MathML3/chapter6.html#world-int-combine-other -->
+
   <div class=impl>
 
   <!-- apparently we get to define error handling, so: -->

Modified: source
===================================================================
--- source	2014-02-05 18:49:51 UTC (rev 8464)
+++ source	2014-02-05 19:25:41 UTC (rev 8465)
@@ -34646,6 +34646,16 @@
   <span>embedded content</span>, <span>phrasing content</span>, and <span>flow content</span>
   categories for the purposes of the content models in this specification.</p>
 
+  <p>When the MathML <code data-x="">annotation-xml</code> element contains elements from the <span>HTML
+  namespace</span>, such elements must all be <span>flow content</span>. <a
+  href="#refsMATHML">[MATHML]</a></p>
+
+  <p>When the MathML token elements (<code data-x="">mi</code>, <code data-x="">mo</code>, <code
+  data-x="">mn</code>, <code data-x="">ms</code>, and <code data-x="">mtext</code>) are descendants
+  of HTML elements, they may contain <span>phrasing content</span> elements from the <span>HTML
+  namespace</span>. <a href="#refsMATHML">[MATHML]</a></p>
+  <!-- this hooks into http://www.w3.org/TR/MathML3/chapter6.html#world-int-combine-other -->
+
   <div class="impl">
 
   <!-- apparently we get to define error handling, so: -->