make 'embedded content' an actual type of content

git-svn-id: http://svn.whatwg.org/webapps@364 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Nov 27, 2006 · 18322b5 · 18322b5
1 parent 967ec89
commit 18322b5
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 42 deletions.
diff --git a/index b/index
@@ -22,7 +22,7 @@
 
    <h1 id=web-applications>Web Applications 1.0</h1>
 
-   <h2 class="no-num no-toc" id=working>Working Draft &mdash; 26 November
+   <h2 class="no-num no-toc" id=working>Working Draft &mdash; 27 November
     2006</h2>
 
    <p>You can take part in this work. <a
@@ -515,8 +515,8 @@
         common to <code>ins</code> and <code>del</code> elements</a>
       </ul>
 
-     <li><a href="#embedded"><span class=secno>3.12. </span><dfn
-      id=embedded0>Embedded content</dfn></a>
+     <li><a href="#embedded"><span class=secno>3.12. </span>Embedded
+      content</a>
       <ul class=toc>
        <li><a href="#the-img"><span class=secno>3.12.1. </span>The <dfn
         id=img><code>img</code></dfn> element</a>
@@ -5707,20 +5707,20 @@ onActivate, onBeforeDeactivate, onDeactivate, document.hasFocus):
    id=inline-level1>Inline-level content</dfn></h5>
 
   <p>Inline-level content consists of text and various elements to annotate
-   the text, as well as some <a href="#embedded1">embedded content</a> (such
+   the text, as well as some <a href="#embedded0">embedded content</a> (such
    as images or sound clips).
 
   <p>Inline-level content comes in various types:
 
   <dl>
    <dt><dfn id=strictly>Strictly inline-level content</dfn>
 
-   <dd>Text, embedded content, and elements that annotate the text without
-    introducing structural grouping. For example: <code><a
-    href="#a0">a</a></code>, <code><a href="#meter0">meter</a></code>,
-    <code><a href="#img0">img</a></code>. Elements used in contexts allowing
-    only strictly inline-level content must not contain anything other than
-    strictly inline-level content.
+   <dd>Text, <a href="#embedded0">embedded content</a>, and elements that
+    annotate the text without introducing structural grouping. For example:
+    <code><a href="#a0">a</a></code>, <code><a
+    href="#meter0">meter</a></code>, <code><a href="#img0">img</a></code>.
+    Elements used in contexts allowing only strictly inline-level content
+    must not contain anything other than strictly inline-level content.
 
    <dt><dfn id=structured>Structured inline-level elements</dfn>
 
@@ -5733,8 +5733,7 @@ onActivate, onBeforeDeactivate, onDeactivate, document.hasFocus):
   <p>Some elements are defined to have as a content model <dfn
    id=significant>significant inline content</dfn>. This means that at least
    one descendant of the element must be <a href="#significant0">significant
-   text</a> or <a href="#embedded1">embedded content</a>.</p>
-  <!-- XXX links -->
+   text</a> or <a href="#embedded0">embedded content</a>.
 
   <p>Unless an element's content model explicitly states that it must contain
    <a href="#significant">significant inline content</a>, simply having no <a
@@ -5763,6 +5762,10 @@ onActivate, onBeforeDeactivate, onDeactivate, document.hasFocus):
 </pre>
   </div>
 
+  <p><dfn id=embedded0>Embedded content</dfn> consists of elements that
+   introduce content from other resources into the document, for example
+   <code><a href="#img0">img</a></code>.
+
   <h5 id=determining><span class=secno>3.4.3.3. </span><dfn
    id=determining1>Determining if a particular element contains block-level
    elements or inline-level content</dfn></h5>
@@ -9803,14 +9806,13 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    id=datetime2 title=dom-mod-datetime><code>datetime</code></dfn> DOM
    attributes must reflect the elements' content attributes of the same name.
 
-  <h3 id=embedded><span class=secno>3.12. </span><dfn id=embedded1>Embedded
-   content</dfn></h3>
-  <!-- aka replaced elements? XXX -->
+  <h3 id=embedded><span class=secno>3.12. </span>Embedded content</h3>
 
   <h4 id=the-img><span class=secno>3.12.1. </span>The <dfn
    id=img0><code>img</code></dfn> element</h4>
 
-  <p><a href="#strictly">Strictly inline-level content</a>.
+  <p><span>Strictly inline-level</span> <a href="#embedded0">embedded
+   content</a>.
 
   <dl class=element>
    <dt>Contexts in which this element may be used:
@@ -9987,7 +9989,8 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <h4 id=the-iframe><span class=secno>3.12.2. </span>The <dfn
    id=iframe0><code>iframe</code></dfn> element</h4>
 
-  <p><a href="#strictly">Strictly inline-level content</a>.
+  <p><span>Strictly inline-level</span> <a href="#embedded0">embedded
+   content</a>.
 
   <dl class=element>
    <dt>Contexts in which this element may be used:
@@ -10057,6 +10060,8 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
    <code><a href="#iframe0">iframe</a></code> elements, the contents would be
    parsed as markup that could act as fallback content.)
 
+  <p class=big-issue>restrictions for what that text must be
+
   <p class=note>The <a href="#html-0">HTML parser</a> treats markup inside
    <code><a href="#iframe0">iframe</a></code> elements as text.
 
@@ -10067,7 +10072,8 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <h4 id=the-embed><span class=secno>3.12.3. </span>The <dfn
    id=embed0><code>embed</code></dfn> element</h4>
 
-  <p><a href="#strictly">Strictly inline-level content</a>.
+  <p><span>Strictly inline-level</span> <a href="#embedded0">embedded
+   content</a>.
 
   <dl class=element>
    <dt>Contexts in which this element may be used:
@@ -10195,7 +10201,8 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <h4 id=the-object><span class=secno>3.12.4. </span>The <dfn
    id=object0><code>object</code></dfn> element</h4>
 
-  <p><a href="#strictly">Strictly inline-level content</a>.
+  <p><span>Strictly inline-level</span> <a href="#embedded0">embedded
+   content</a>.
 
   <dl class=element>
    <dt>Contexts in which this element may be used:
@@ -10452,8 +10459,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <h4 id=the-param><span class=secno>3.12.5. </span>The <dfn
    id=param0><code>param</code></dfn> element</h4>
-
-  <p><a href="#strictly">Strictly inline-level content</a>.
+  <!-- no type -->
 
   <dl class=element>
    <dt>Contexts in which this element may be used:
@@ -10511,6 +10517,9 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <h4 id=the-canvas><span class=secno>3.12.6. </span>The <dfn id=""
    title=""><code>canvas</code></dfn> element</h4>
 
+  <p><span>Strictly inline-level</span> <a href="#embedded0">embedded
+   content</a>.
+
   <p class=big-issue>This section will eventually contain the definition of
    <code><a href="#canvas">canvas</a></code> (though not the APIs).
 
@@ -10571,7 +10580,8 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <h4 id=the-area><span class=secno>3.12.8. </span>The <dfn
    id=area0><code>area</code></dfn> element</h4>
 
-  <p><a href="#strictly">Strictly inline-level content</a>.
+  <p><a href="#strictly">Strictly inline-level content</a>.</p>
+  <!-- XXX as defined, the area element on its own isn't enough to satisfy "significant inline-level content" model -->
 
   <dl class=element>
    <dt>Contexts in which this element may be used:

diff --git a/source b/source
@@ -4764,11 +4764,11 @@ onActivate, onBeforeDeactivate, onDeactivate, document.hasFocus):
   <dl>
 
    <dt><dfn>Strictly inline-level content</dfn></dt>
-   <dd>Text, embedded content, and elements that annotate the text
-   without introducing structural grouping. For example:
-   <code>a</code>, <code>meter</code>, <code>img</code>. Elements
-   used in contexts allowing only strictly inline-level content must
-   not contain anything other than strictly inline-level content.</dd>
+   <dd>Text, <span>embedded content</span>, and elements that annotate
+   the text without introducing structural grouping. For example:
+   <code>a</code>, <code>meter</code>, <code>img</code>. Elements used
+   in contexts allowing only strictly inline-level content must not
+   contain anything other than strictly inline-level content.</dd>
 
    <dt><dfn>Structured inline-level elements</dfn></dt>
    <dd>Block-level elements that can also be used as inline-level
@@ -4780,7 +4780,7 @@ onActivate, onBeforeDeactivate, onDeactivate, document.hasFocus):
   <p>Some elements are defined to have as a content model
   <dfn>significant inline content</dfn>. This means that at least one
   descendant of the element must be <span>significant text</span> or
-  <span>embedded content</span>.</p> <!-- XXX links -->
+  <span>embedded content</span>.</p>
 
   <p>Unless an element's content model explicitly states that it must
   contain <span>significant inline content</span>, simply having no
@@ -4808,6 +4808,10 @@ onActivate, onBeforeDeactivate, onDeactivate, document.hasFocus):
 </pre>
   </div>
 
+  <p><dfn>Embedded content</dfn> consists of elements that introduce
+  content from other resources into the document, for example
+  <code>img</code>.</p>
+
 
   <h5><dfn>Determining if a particular element contains block-level
   elements or inline-level content</dfn></h5>
@@ -6057,9 +6061,10 @@ XXX attributes to give the date authored, date published
   <code>dd</code> elements represent paragraphs with various specific
   semantics when they are <span title="Determining if a particular
   element contains block-level elements or inline-level content">used
-  as inline-level content containers</span>, and the <code>p</code>
-  element represents all the other kinds of paragraphs, for which
-  there are no dedicated elements.</p>
+  as inline-level content containers</span>, the <code>figure</code>
+  element represents a paragraph in the form of embedded content, and
+  the <code>p</code> element represents all the other kinds of
+  paragraphs, for which there are no dedicated elements.</p>
 
   <h4>The <dfn><code>p</code></dfn> element</h4>
 
@@ -8318,12 +8323,11 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
 
 
-  <h3><dfn>Embedded content</dfn></h3>
-  <!-- aka replaced elements? XXX -->
+  <h3>Embedded content</h3>
 
   <h4>The <dfn><code>img</code></dfn> element</h4>
 
-  <p><span>Strictly inline-level content</span>.</p>
+  <p><span>Strictly inline-level</span> <span>embedded content</span>.</p>
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
@@ -8480,7 +8484,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <h4>The <dfn><code>iframe</code></dfn> element</h4>
 
-  <p><span>Strictly inline-level content</span>.</p>
+  <p><span>Strictly inline-level</span> <span>embedded content</span>.</p>
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
@@ -8539,6 +8543,8 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   the contents would be parsed as markup that could act as fallback
   content.)</p>
 
+  <p class="big-issue">restrictions for what that text must be</p>
+
   <p class="note">The <span>HTML parser</span> treats markup inside
   <code>iframe</code> elements as text.</p>
 
@@ -8549,7 +8555,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <h4>The <dfn><code>embed</code></dfn> element</h4>
 
-  <p><span>Strictly inline-level content</span>.</p>
+  <p><span>Strictly inline-level</span> <span>embedded content</span>.</p>
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
@@ -8669,7 +8675,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <h4>The <dfn><code>object</code></dfn> element</h4>
 
-  <p><span>Strictly inline-level content</span>.</p>
+  <p><span>Strictly inline-level</span> <span>embedded content</span>.</p>
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
@@ -8916,7 +8922,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <h4>The <dfn><code>param</code></dfn> element</h4>
 
-  <p><span>Strictly inline-level content</span>.</p>
+  <!-- no type -->
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
@@ -8962,13 +8968,14 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <h4>The <dfn id="" title=""><code>canvas</code></dfn> element</h4>
 
+  <p><span>Strictly inline-level</span> <span>embedded content</span>.</p>
+
   <p class="big-issue">This section will eventually contain the definition of <code>canvas</code> (though not the APIs).</p>
 
 
   <h4>The <dfn><code>map</code></dfn> element</h4>
 
-  <p><span title="block-level elements">Block-level
-  element</span>.</p>
+  <p><span title="block-level elements">Block-level element</span>.</p>
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
@@ -9015,6 +9022,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
   <h4>The <dfn><code>area</code></dfn> element</h4>
 
   <p><span>Strictly inline-level content</span>.</p>
+  <!-- XXX as defined, the area element on its own isn't enough to satisfy "significant inline-level content" model -->
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
@@ -9093,7 +9101,6 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
 
 
-
   <h3>Tabular data</h3>
 
   <h4>The <dfn><code>table</code></dfn> element</h4>
@@ -10329,7 +10336,7 @@ Address: &lt;input name="address"&gt;&lt;/p&gt;</pre>
 
   <h3>Interactive elements</h3>
 
-  <h4>Disclosure widgets: the <dfn><code>details</code></dfn> element</h4>
+  <h4>The <dfn><code>details</code></dfn> element</h4>
 
   <p><span title="interactive elements">Interactive</span>,
      <span title="block-level elements">block-level element</span>.</p>