[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 git-svn-id: http://svn.whatwg.org/webapps@8465 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Feb 5, 2014 · 185d4ab · 185d4ab
1 parent 3c1e6fb
commit 185d4ab
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/complete.html b/complete.html
@@ -31979,6 +31979,14 @@ <h4 id=mathml><span class=secno>4.7.14 </span>MathML</h4>
   <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: -->

diff --git a/index b/index
@@ -31979,6 +31979,14 @@ dictionary <dfn id=trackeventinit>TrackEventInit</dfn> : <a href=#eventinit>Even
   <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: -->

diff --git a/source b/source
@@ -34646,6 +34646,16 @@ dictionary <dfn>TrackEventInit</dfn> : <span>EventInit</span> {
   <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: -->