[html5] r1401 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2008-04-05 03:46:12 -0700 (Sat, 05 Apr 2008)
New Revision: 1401

Modified:
   index
   source
Log:
[ac] (0) Define where <svg> and <math> fit into the HTML content model.

Modified: index
===================================================================
--- index	2008-04-05 10:35:47 UTC (rev 1400)
+++ index	2008-04-05 10:46:12 UTC (rev 1401)
@@ -591,7 +591,9 @@
        <li><a href="#the-bdo"><span class=secno>3.10.21 </span>The
         <code>bdo</code> element</a>
 
-       <li><a href="#usage"><span class=secno>3.10.22 </span>Usage
+       <li><a href="#mathml"><span class=secno>3.10.22 </span>MathML</a>
+
+       <li><a href="#usage"><span class=secno>3.10.23 </span>Usage
         summary</a>
       </ul>
 
@@ -744,7 +746,9 @@
        <li><a href="#image-maps"><span class=secno>3.12.14 </span>Image
         maps</a>
 
-       <li><a href="#dimension"><span class=secno>3.12.15 </span>Dimension
+       <li><a href="#svg"><span class=secno>3.12.15 </span>SVG</a>
+
+       <li><a href="#dimension"><span class=secno>3.12.16 </span>Dimension
         attributes</a>
       </ul>
 
@@ -12504,8 +12508,14 @@
    <a href="#refsCSS21">[CSS21]</a></p>
   <!-- XXX need examples -->
 
-  <h4 id=usage><span class=secno>3.10.22 </span>Usage summary</h4>
+  <h4 id=mathml><span class=secno>3.10.22 </span>MathML</h4>
 
+  <p>The <code>math</code> element from the <a href="#mathml0">MathML
+   namespace</a> falls into the <a href="#phrasing0">phrasing content</a>
+   category for the purposes of the content models in this specification.
+
+  <h4 id=usage><span class=secno>3.10.23 </span>Usage summary</h4>
+
   <p class=big-issue>We need to summarise the various elements, in particular
    to distinguish b/i/em/strong/var/q/mark/cite.</p>
   <!-- XXX when you do this, also reorder the elements in this section
@@ -19292,7 +19302,13 @@
    then the user agent must act as if it had rerun the algorithms for image
    maps.
 
-  <h4 id=dimension><span class=secno>3.12.15 </span><dfn
+  <h4 id=svg><span class=secno>3.12.15 </span>SVG</h4>
+
+  <p>The <code>svg</code> element from the <a href="#svg-namespace">SVG
+   namespace</a> falls into the <a href="#embedded1">embedded content</a>
+   category for the purposes of the content models in this specification.
+
+  <h4 id=dimension><span class=secno>3.12.16 </span><dfn
    id=dimension0>Dimension attributes</dfn></h4>
 
   <p>The <dfn id=width3 title=attr-dim-width><code>width</code></dfn> and
@@ -38151,7 +38167,7 @@
 
    <dt>Foreign elements
 
-   <dd>Elements from the <a href="#mathml">MathML namespace</a> and the <a
+   <dd>Elements from the <a href="#mathml0">MathML namespace</a> and the <a
     href="#svg-namespace">SVG namespace</a>.
 
    <dt>Normal elements
@@ -44932,7 +44948,7 @@
   <p>The <dfn id=html-namespace0>HTML namespace</dfn> is:
    <code>http://www.w3.org/1999/xhtml</code>
 
-  <p>The <dfn id=mathml>MathML namespace</dfn> is:
+  <p>The <dfn id=mathml0>MathML namespace</dfn> is:
    <code>http://www.w3.org/1998/Math/MathML</code>
 
   <p>The <dfn id=svg-namespace>SVG namespace</dfn> is:

Modified: source
===================================================================
--- source	2008-04-05 10:35:47 UTC (rev 1400)
+++ source	2008-04-05 10:46:12 UTC (rev 1401)
@@ -10488,7 +10488,15 @@
   <!-- XXX need examples -->
 
 
+  <h4>MathML</h4>
 
+  <p>The <code>math</code> element from the <span>MathML
+  namespace</span> falls into the <span>phrasing content</span>
+  category for the purposes of the content models in this
+  specification.</p>
+
+
+
   <h4>Usage summary</h4>
 
   <p class="big-issue">We need to summarise the various elements, in
@@ -16925,7 +16933,13 @@
   maps.</p>
 
 
+  <h4>SVG</h4>
 
+  <p>The <code>svg</code> element from the <span>SVG namespace</span>
+  falls into the <span>embedded content</span> category for the
+  purposes of the content models in this specification.</p>
+
+
   <h4><dfn>Dimension attributes</dfn></h4>
 
   <p>The <dfn title="attr-dim-width"><code>width</code></dfn> and <dfn