[html5] r3338 - [c] (0) Update some of the content models and element categories. Also, create s [...]

whatwg at whatwg.org whatwg at whatwg.org
Mon Jun 29 03:46:21 PDT 2009


Author: ianh
Date: 2009-06-29 03:46:19 -0700 (Mon, 29 Jun 2009)
New Revision: 3338

Modified:
   index
   source
Log:
[c] (0) Update some of the content models and element categories. Also, create some lists to cross-reference from the definitions of the main catgories to the elements in those categories.

Modified: index
===================================================================
--- index	2009-06-29 09:59:02 UTC (rev 3337)
+++ index	2009-06-29 10:46:19 UTC (rev 3338)
@@ -6716,7 +6716,7 @@
   <p>The <dfn id=document.title title=dom-document-title><code>title</code></dfn> attribute must,
   on getting, run the following algorithm:</p>
 
-  <ol><li><p>If the <a href=#root-element>root element</a> is an <code>svg</code>
+  <ol><li><p>If the <a href=#root-element>root element</a> is an <code><a href=#svg-0>svg</a></code>
    element in the "<code title="">http://www.w3.org/2000/svg</code>"
    namespace, and the user agent supports SVG, then return the value
    that would have been returned by the DOM attribute of the same name
@@ -6738,7 +6738,7 @@
   </ol><p>On setting, the following algorithm must be run. Mutation events
   must be fired as appropriate.</p>
 
-  <ol><li><p>If the <a href=#root-element>root element</a> is an <code>svg</code>
+  <ol><li><p>If the <a href=#root-element>root element</a> is an <code><a href=#svg-0>svg</a></code>
    element in the "<code title="">http://www.w3.org/2000/svg</code>"
    namespace, and the user agent supports SVG, then the setter must
    defer to the setter for the DOM attribute of the same name on the
@@ -8011,7 +8011,15 @@
   up the relationship of the document with other documents, or that
   conveys other "out of band" information.</p>
 
-  <p>Elements from other namespaces whose semantics are primarily
+  <ul class=brief><li><code><a href=#the-base-element>base</a></code>
+   <li><code><a href=#the-command>command</a></code>
+   <li><code><a href=#the-link-element>link</a></code>
+   <li><code><a href=#meta>meta</a></code>
+   <li><code><a href=#the-noscript-element>noscript</a></code>
+   <li><code><a href=#script>script</a></code>
+   <li><code><a href=#the-style-element>style</a></code>
+   <li><code><a href=#the-title-element>title</a></code>
+  </ul><p>Elements from other namespaces whose semantics are primarily
   metadata-related (e.g. RDF) are also <a href=#metadata-content-0>metadata
   content</a>.</p>
 
@@ -8049,7 +8057,90 @@
   <p>Most elements that are used in the body of documents and
   applications are categorized as <dfn id=flow-content-0>flow content</dfn>.</p>
 
-  <p>As a general rule, elements whose content model allows any
+  <ul class=brief><li><code><a href=#the-a-element>a</a></code>
+   <li><code><a href=#the-abbr-element>abbr</a></code>
+   <li><code><a href=#the-address-element>address</a></code>
+   <li><code><a href=#the-area-element>area</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element)
+   <li><code><a href=#the-article-element>article</a></code>
+   <li><code><a href=#the-aside-element>aside</a></code>
+   <li><code><a href=#audio>audio</a></code>
+   <li><code><a href=#the-b-element>b</a></code>
+   <li><code><a href=#the-bb-element>bb</a></code>
+   <li><code><a href=#the-bdo-element>bdo</a></code>
+   <li><code><a href=#the-blockquote-element>blockquote</a></code>
+   <li><code><a href=#the-br-element>br</a></code>
+   <li><code><a href=#the-button-element>button</a></code>
+   <li><code><a href=#the-canvas-element>canvas</a></code>
+   <li><code><a href=#the-cite-element>cite</a></code>
+   <li><code><a href=#the-code-element>code</a></code>
+   <li><code><a href=#the-command>command</a></code>
+   <li><code><a href=#datagrid>datagrid</a></code>
+   <li><code><a href=#the-datalist-element>datalist</a></code>
+   <li><code><a href=#the-del-element>del</a></code>
+   <li><code><a href=#the-details-element>details</a></code>
+   <li><code><a href=#the-dfn-element>dfn</a></code>
+   <li><code><a href=#the-dialog-element>dialog</a></code>
+   <li><code><a href=#the-div-element>div</a></code>
+   <li><code><a href=#the-dl-element>dl</a></code>
+   <li><code><a href=#the-em-element>em</a></code>
+   <li><code><a href=#the-embed-element>embed</a></code>
+   <li><code><a href=#the-fieldset-element>fieldset</a></code>
+   <li><code><a href=#the-figure-element>figure</a></code>
+   <li><code><a href=#the-footer-element>footer</a></code>
+   <li><code><a href=#the-form-element>form</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>
+   <li><code><a href=#the-header-element>header</a></code>
+   <li><code><a href=#the-hgroup-element>hgroup</a></code>
+   <li><code><a href=#the-hr-element>hr</a></code>
+   <li><code><a href=#the-i-element>i</a></code>
+   <li><code><a href=#the-iframe-element>iframe</a></code>
+   <li><code><a href=#the-img-element>img</a></code>
+   <li><code><a href=#the-input-element>input</a></code>
+   <li><code><a href=#the-ins-element>ins</a></code>
+   <li><code><a href=#the-kbd-element>kbd</a></code>
+   <li><code><a href=#the-keygen-element>keygen</a></code>
+   <li><code><a href=#the-label-element>label</a></code>
+   <li><code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)
+   <li><code><a href=#the-map-element>map</a></code>
+   <li><code><a href=#the-mark-element>mark</a></code>
+   <li><code>math</code>
+   <li><code><a href=#menus>menu</a></code>
+   <li><code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)
+   <li><code><a href=#the-meter-element>meter</a></code>
+   <li><code><a href=#the-nav-element>nav</a></code>
+   <li><code><a href=#the-noscript-element>noscript</a></code>
+   <li><code><a href=#the-object-element>object</a></code>
+   <li><code><a href=#the-ol-element>ol</a></code>
+   <li><code><a href=#the-output-element>output</a></code>
+   <li><code><a href=#the-p-element>p</a></code>
+   <li><code><a href=#the-pre-element>pre</a></code>
+   <li><code><a href=#the-progress-element>progress</a></code>
+   <li><code><a href=#the-q-element>q</a></code>
+   <li><code><a href=#the-ruby-element>ruby</a></code>
+   <li><code><a href=#the-samp-element>samp</a></code>
+   <li><code><a href=#script>script</a></code>
+   <li><code><a href=#the-section-element>section</a></code>
+   <li><code><a href=#the-select-element>select</a></code>
+   <li><code><a href=#the-small-element>small</a></code>
+   <li><code><a href=#the-span-element>span</a></code>
+   <li><code><a href=#the-strong-element>strong</a></code>
+   <li><code><a href=#the-style-element>style</a></code> (if the <code title=attr-style-scoped><a href=#attr-style-scoped>scoped</a></code> attribute is present)
+   <li><code><a href=#the-sub-and-sup-elements>sub</a></code>
+   <li><code><a href=#the-sub-and-sup-elements>sup</a></code>
+   <li><code><a href=#svg-0>svg</a></code>
+   <li><code><a href=#the-table-element>table</a></code>
+   <li><code><a href=#the-textarea-element>textarea</a></code>
+   <li><code><a href=#the-time-element>time</a></code>
+   <li><code><a href=#the-ul-element>ul</a></code>
+   <li><code><a href=#the-var-element>var</a></code>
+   <li><code><a href=#video>video</a></code>
+   <li><a href=#text-content title="text content">Text</a>
+  </ul><p>As a general rule, elements whose content model allows any
   <a href=#flow-content-0>flow content</a> should have either at least one descendant
   <a href=#text-node>text node</a> that is not <a href=#inter-element-whitespace>inter-element
   whitespace</a>, or at least one descendant element node that is
@@ -8070,7 +8161,11 @@
   <p><dfn id=sectioning-content-0>Sectioning content</dfn> is content that defines the scope
   of <a href=#heading-content-0 title="heading content">headings</a> and <a href=#the-footer-element title=footer>footers</a>.</p>
 
-  <p>Each <a href=#sectioning-content-0>sectioning content</a> element potentially has a
+  <ul class=brief><li><code><a href=#the-article-element>article</a></code>
+   <li><code><a href=#the-aside-element>aside</a></code>
+   <li><code><a href=#the-nav-element>nav</a></code>
+   <li><code><a href=#the-section-element>section</a></code>
+  </ul><p>Each <a href=#sectioning-content-0>sectioning content</a> element potentially has a
   heading and an <a href=#outline>outline</a>. See the section on
   <a href=#headings-and-sections>headings and sections</a> for further details.</p>
 
@@ -8085,14 +8180,72 @@
   (whether explicitly marked up using <a href=#sectioning-content-0>sectioning content</a>
   elements, or implied by the heading content itself).</p>
 
+  <ul class=brief><li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>
+   <li><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>
+   <li><code><a href=#the-hgroup-element>hgroup</a></code>
+  </ul><h5 id=phrasing-content><span class=secno>3.4.1.5 </span>Phrasing content</h5>
 
-  <h5 id=phrasing-content><span class=secno>3.4.1.5 </span>Phrasing content</h5>
-
   <p><dfn id=phrasing-content-0>Phrasing content</dfn> is the text of the document, as well
   as elements that mark up that text at the intra-paragraph
   level. Runs of <a href=#phrasing-content-0>phrasing content</a> form <a href=#paragraph title=paragraph>paragraphs</a>.</p>
 
-  <p>As a general rule, elements whose content model allows any
+  <ul class=brief><li><code><a href=#the-a-element>a</a></code> (if it contains only <a href=#phrasing-content-0>phrasing content</a>)
+   <li><code><a href=#the-abbr-element>abbr</a></code> (if it is a descendant of a <code><a href=#the-map-element>map</a></code> element)
+   <li><code><a href=#the-area-element>area</a></code>
+   <li><code><a href=#audio>audio</a></code>
+   <li><code><a href=#the-b-element>b</a></code>
+   <li><code><a href=#the-bb-element>bb</a></code>
+   <li><code><a href=#the-bdo-element>bdo</a></code>
+   <li><code><a href=#the-br-element>br</a></code>
+   <li><code><a href=#the-button-element>button</a></code>
+   <li><code><a href=#the-canvas-element>canvas</a></code>
+   <li><code><a href=#the-cite-element>cite</a></code>
+   <li><code><a href=#the-code-element>code</a></code>
+   <li><code><a href=#the-command>command</a></code>
+   <li><code><a href=#the-datalist-element>datalist</a></code>
+   <li><code><a href=#the-del-element>del</a></code> (if it contains only <a href=#phrasing-content-0>phrasing content</a>)
+   <li><code><a href=#the-dfn-element>dfn</a></code>
+   <li><code><a href=#the-em-element>em</a></code>
+   <li><code><a href=#the-embed-element>embed</a></code>
+   <li><code><a href=#the-i-element>i</a></code>
+   <li><code><a href=#the-iframe-element>iframe</a></code>
+   <li><code><a href=#the-img-element>img</a></code>
+   <li><code><a href=#the-input-element>input</a></code>
+   <li><code><a href=#the-ins-element>ins</a></code> (if it contains only <a href=#phrasing-content-0>phrasing content</a>)
+   <li><code><a href=#the-kbd-element>kbd</a></code>
+   <li><code><a href=#the-keygen-element>keygen</a></code>
+   <li><code><a href=#the-label-element>label</a></code>
+   <li><code><a href=#the-link-element>link</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)
+   <li><code><a href=#the-map-element>map</a></code> (if it contains only <a href=#phrasing-content-0>phrasing content</a>)
+   <li><code><a href=#the-mark-element>mark</a></code>
+   <li><code>math</code>
+   <li><code><a href=#meta>meta</a></code> (if the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present)
+   <li><code><a href=#the-meter-element>meter</a></code>
+   <li><code><a href=#the-noscript-element>noscript</a></code>
+   <li><code><a href=#the-object-element>object</a></code>
+   <li><code><a href=#the-output-element>output</a></code>
+   <li><code><a href=#the-progress-element>progress</a></code>
+   <li><code><a href=#the-q-element>q</a></code>
+   <li><code><a href=#the-ruby-element>ruby</a></code>
+   <li><code><a href=#the-samp-element>samp</a></code>
+   <li><code><a href=#script>script</a></code>
+   <li><code><a href=#the-select-element>select</a></code>
+   <li><code><a href=#the-small-element>small</a></code>
+   <li><code><a href=#the-span-element>span</a></code>
+   <li><code><a href=#the-strong-element>strong</a></code>
+   <li><code><a href=#the-sub-and-sup-elements>sub</a></code>
+   <li><code><a href=#the-sub-and-sup-elements>sup</a></code>
+   <li><code><a href=#svg-0>svg</a></code>
+   <li><code><a href=#the-textarea-element>textarea</a></code>
+   <li><code><a href=#the-time-element>time</a></code>
+   <li><code><a href=#the-var-element>var</a></code>
+   <li><code><a href=#video>video</a></code>
+   <li><a href=#text-content title="text content">Text</a>
+  </ul><p>As a general rule, elements whose content model allows any
   <a href=#phrasing-content-0>phrasing content</a> should have either at least one
   descendant <a href=#text-node>text node</a> that is not <a href=#inter-element-whitespace>inter-element
   whitespace</a>, or at least one descendant element node that is
@@ -8119,7 +8272,16 @@
   resource into the document, or content from another vocabulary that
   is inserted into the document.</p>
 
-  <p>Elements that are from namespaces other than the <a href=#html-namespace-0>HTML
+  <ul class=brief><li><code><a href=#audio>audio</a></code>
+   <li><code><a href=#the-canvas-element>canvas</a></code>
+   <li><code><a href=#the-embed-element>embed</a></code>
+   <li><code><a href=#the-iframe-element>iframe</a></code>
+   <li><code><a href=#the-img-element>img</a></code>
+   <li><code>math</code>
+   <li><code><a href=#the-object-element>object</a></code>
+   <li><code><a href=#svg-0>svg</a></code>
+   <li><code><a href=#video>video</a></code>
+  </ul><p>Elements that are from namespaces other than the <a href=#html-namespace-0>HTML
   namespace</a> and that convey content but not metadata, are
   <a href=#embedded-content-2>embedded content</a> for the purposes of the content models
   defined in this specification. (For example, MathML, or SVG.)</p>
@@ -8143,7 +8305,23 @@
   <p><dfn id=interactive-content-0>Interactive content</dfn> is content that is specifically
   intended for user interaction.</p>
 
-  <p>Certain elements in HTML have an <a href=#activation-behavior>activation
+  <ul class=brief><li><code><a href=#the-a-element>a</a></code>
+   <li><code><a href=#audio>audio</a></code> (if the <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code> attribute is present)
+   <li><code><a href=#the-bb-element>bb</a></code>
+   <li><code><a href=#the-button-element>button</a></code>
+   <li><code><a href=#datagrid>datagrid</a></code>
+   <li><code><a href=#the-details-element>details</a></code>
+   <li><code><a href=#the-embed-element>embed</a></code>
+   <li><code><a href=#the-img-element>img</a></code> (if the <code title=attr-hyperlink-usemap><a href=#attr-hyperlink-usemap>usemap</a></code> attribute is present)
+   <li><code><a href=#the-input-element>input</a></code> (if the <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is <em>not</em> in the <a href=#hidden-state title=attr-input-type-hidden>Hidden</a> state)
+   <li><code><a href=#the-keygen-element>keygen</a></code>
+   <li><code><a href=#the-label-element>label</a></code>
+   <li><code><a href=#menus>menu</a></code> (if the <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state)
+   <li><code><a href=#the-object-element>object</a></code> (if the <code title=attr-hyperlink-usemap><a href=#attr-hyperlink-usemap>usemap</a></code> attribute is present) <!-- see also comment in <object> section -->
+   <li><code><a href=#the-select-element>select</a></code>
+   <li><code><a href=#the-textarea-element>textarea</a></code>
+   <li><code><a href=#video>video</a></code> (if the <code title=attr-media-controls><a href=#attr-media-controls>controls</a></code> attribute is present)
+  </ul><p>Certain elements in HTML have an <a href=#activation-behavior>activation
   behavior</a>, which means that the user can activate them. This
   triggers a sequence of events dependent on the activation mechanism,
   and normally culminating in a <code title=event-click>click</code>
@@ -9518,10 +9696,11 @@
   <dl class=element><dt>Categories</dt>
    <dd><a href=#metadata-content-0>Metadata content</a>.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#flow-content-0>flow content</a>.</dd>
+   <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#phrasing-content-0>phrasing content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#metadata-content-0>metadata content</a> is expected.</dd>
    <dd>In a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element>head</a></code> element.</dd>
-   <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#flow-content-0>flow content</a> is expected.</dd>
+   <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -9831,12 +10010,13 @@
   <dl class=element><dt>Categories</dt>
    <dd><a href=#metadata-content-0>Metadata content</a>.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#flow-content-0>flow content</a>.</dd>
+   <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#phrasing-content-0>phrasing content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>If the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute is present, or if the element is in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present, and the element is not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present, and the element is not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-name><a href=#attr-meta-name>name</a></code> attribute is present: where <a href=#metadata-content-0>metadata content</a> is expected.</dd>
-   <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#flow-content-0>flow content</a> is expected.</dd>
+   <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -13704,9 +13884,9 @@
   <h4 id=the-a-element><span class=secno>4.6.1 </span>The <dfn><code>a</code></dfn> element</h4>
 
   <dl class=element><dt>Categories</dt>
-   <dd><a href=#interactive-content-0>Interactive content</a>.</dd>
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dd>When the element only contains <a href=#phrasing-content-0>phrasing content</a>: <a href=#phrasing-content-0>phrasing content</a>.</dd>
+   <dd><a href=#interactive-content-0>Interactive content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
@@ -17963,6 +18143,7 @@
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dd><a href=#phrasing-content-0>Phrasing content</a>.</dd>
    <dd><a href=#embedded-content-2>Embedded content</a>.</dd>
+   <dd><a href=#interactive-content-0>Interactive content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#embedded-content-2>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
@@ -18460,6 +18641,7 @@
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dd><a href=#phrasing-content-0>Phrasing content</a>.</dd>
    <dd><a href=#embedded-content-2>Embedded content</a>.</dd>
+   <dd><a href=#interactive-content-0>Interactive content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#embedded-content-2>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
@@ -18658,8 +18840,8 @@
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dd><a href=#phrasing-content-0>Phrasing content</a>.</dd>
    <dd><a href=#embedded-content-2>Embedded content</a>.</dd>
+   <dd>If the element has a <code title=attr-hyperlink-usemap><a href=#attr-hyperlink-usemap>usemap</a></code> attribute: <a href=#interactive-content-0>Interactive content</a>.</dd> <!-- also when showing a plugin or a nested browsing context, but checking that statically is hard...) -->
    <dd><a href=#category-listed title=category-listed>Listed</a>,  <a href=#category-submit title=category-submit>submittable</a>, <a href=#form-associated-element>form-associated element</a>.</dd>
-   <dd>If the element has a <code title=attr-hyperlink-usemap><a href=#attr-hyperlink-usemap>usemap</a></code> attribute: <a href=#interactive-content-0>Interactive content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#embedded-content-2>embedded content</a> is expected.</dd>
    <dt>Content model:</dt>
@@ -25604,9 +25786,11 @@
 
   <h4 id=svg><span class=secno>4.8.16 </span>SVG</h4>
 
-  <p>The <code>svg</code> element from the <a href=#svg-namespace>SVG namespace</a>
-  falls into the <a href=#embedded-content-2>embedded content</a> category for the
-  purposes of the content models in this specification.</p>
+  <p>The <dfn id=svg-0><code>svg</code></dfn> element from the <a href=#svg-namespace>SVG
+  namespace</a> falls into the <a href=#embedded-content-2>embedded content</a>,
+  <a href=#phrasing-content-0>phrasing content</a>, and <a href=#flow-content-0>flow content</a>
+  categories for the purposes of the content models in this
+  specification.</p>
 
   <div class=impl>
 

Modified: source
===================================================================
--- source	2009-06-29 09:59:02 UTC (rev 3337)
+++ source	2009-06-29 10:46:19 UTC (rev 3338)
@@ -8156,6 +8156,17 @@
   up the relationship of the document with other documents, or that
   conveys other "out of band" information.</p>
 
+  <ul class="brief">
+   <li><code>base</code>
+   <li><code>command</code>
+   <li><code>link</code>
+   <li><code>meta</code>
+   <li><code>noscript</code>
+   <li><code>script</code>
+   <li><code>style</code>
+   <li><code>title</code>
+  </ul>
+
   <p>Elements from other namespaces whose semantics are primarily
   metadata-related (e.g. RDF) are also <span>metadata
   content</span>.</p>
@@ -8194,6 +8205,92 @@
   <p>Most elements that are used in the body of documents and
   applications are categorized as <dfn>flow content</dfn>.</p>
 
+  <ul class="brief">
+   <li><code>a</code>
+   <li><code>abbr</code>
+   <li><code>address</code>
+   <li><code>area</code> (if it is a descendant of a <code>map</code> element)
+   <li><code>article</code>
+   <li><code>aside</code>
+   <li><code>audio</code>
+   <li><code>b</code>
+   <li><code>bb</code>
+   <li><code>bdo</code>
+   <li><code>blockquote</code>
+   <li><code>br</code>
+   <li><code>button</code>
+   <li><code>canvas</code>
+   <li><code>cite</code>
+   <li><code>code</code>
+   <li><code>command</code>
+   <li><code>datagrid</code>
+   <li><code>datalist</code>
+   <li><code>del</code>
+   <li><code>details</code>
+   <li><code>dfn</code>
+   <li><code>dialog</code>
+   <li><code>div</code>
+   <li><code>dl</code>
+   <li><code>em</code>
+   <li><code>embed</code>
+   <li><code>fieldset</code>
+   <li><code>figure</code>
+   <li><code>footer</code>
+   <li><code>form</code>
+   <li><code>h1</code>
+   <li><code>h2</code>
+   <li><code>h3</code>
+   <li><code>h4</code>
+   <li><code>h5</code>
+   <li><code>h6</code>
+   <li><code>header</code>
+   <li><code>hgroup</code>
+   <li><code>hr</code>
+   <li><code>i</code>
+   <li><code>iframe</code>
+   <li><code>img</code>
+   <li><code>input</code>
+   <li><code>ins</code>
+   <li><code>kbd</code>
+   <li><code>keygen</code>
+   <li><code>label</code>
+   <li><code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)
+   <li><code>map</code>
+   <li><code>mark</code>
+   <li><code>math</code>
+   <li><code>menu</code>
+   <li><code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)
+   <li><code>meter</code>
+   <li><code>nav</code>
+   <li><code>noscript</code>
+   <li><code>object</code>
+   <li><code>ol</code>
+   <li><code>output</code>
+   <li><code>p</code>
+   <li><code>pre</code>
+   <li><code>progress</code>
+   <li><code>q</code>
+   <li><code>ruby</code>
+   <li><code>samp</code>
+   <li><code>script</code>
+   <li><code>section</code>
+   <li><code>select</code>
+   <li><code>small</code>
+   <li><code>span</code>
+   <li><code>strong</code>
+   <li><code>style</code> (if the <code title="attr-style-scoped">scoped</code> attribute is present)
+   <li><code>sub</code>
+   <li><code>sup</code>
+   <li><code>svg</code>
+   <li><code>table</code>
+   <li><code>textarea</code>
+   <li><code>time</code>
+   <li><code>ul</code>
+   <li><code>var</code>
+   <li><code>video</code>
+   <li><span title="text content">Text</span>
+  </ul>
+
   <p>As a general rule, elements whose content model allows any
   <span>flow content</span> should have either at least one descendant
   <span>text node</span> that is not <span>inter-element
@@ -8216,6 +8313,13 @@
   of <span title="heading content">headings</span> and <span
   title="footer">footers</span>.</p>
 
+  <ul class="brief">
+   <li><code>article</code>
+   <li><code>aside</code>
+   <li><code>nav</code>
+   <li><code>section</code>
+  </ul>
+
   <p>Each <span>sectioning content</span> element potentially has a
   heading and an <span>outline</span>. See the section on
   <span>headings and sections</span> for further details.</p>
@@ -8232,7 +8336,17 @@
   (whether explicitly marked up using <span>sectioning content</span>
   elements, or implied by the heading content itself).</p>
 
+  <ul class="brief">
+   <li><code>h1</code>
+   <li><code>h2</code>
+   <li><code>h3</code>
+   <li><code>h4</code>
+   <li><code>h5</code>
+   <li><code>h6</code>
+   <li><code>hgroup</code>
+  </ul>
 
+
   <h5>Phrasing content</h5>
 
   <p><dfn>Phrasing content</dfn> is the text of the document, as well
@@ -8240,6 +8354,61 @@
   level. Runs of <span>phrasing content</span> form <span
   title="paragraph">paragraphs</span>.</p>
 
+  <ul class="brief">
+   <li><code>a</code> (if it contains only <span>phrasing content</span>)
+   <li><code>abbr</code> (if it is a descendant of a <code>map</code> element)
+   <li><code>area</code>
+   <li><code>audio</code>
+   <li><code>b</code>
+   <li><code>bb</code>
+   <li><code>bdo</code>
+   <li><code>br</code>
+   <li><code>button</code>
+   <li><code>canvas</code>
+   <li><code>cite</code>
+   <li><code>code</code>
+   <li><code>command</code>
+   <li><code>datalist</code>
+   <li><code>del</code> (if it contains only <span>phrasing content</span>)
+   <li><code>dfn</code>
+   <li><code>em</code>
+   <li><code>embed</code>
+   <li><code>i</code>
+   <li><code>iframe</code>
+   <li><code>img</code>
+   <li><code>input</code>
+   <li><code>ins</code> (if it contains only <span>phrasing content</span>)
+   <li><code>kbd</code>
+   <li><code>keygen</code>
+   <li><code>label</code>
+   <li><code>link</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)
+   <li><code>map</code> (if it contains only <span>phrasing content</span>)
+   <li><code>mark</code>
+   <li><code>math</code>
+   <li><code>meta</code> (if the <code title="attr-itemprop">itemprop</code> attribute is present)
+   <li><code>meter</code>
+   <li><code>noscript</code>
+   <li><code>object</code>
+   <li><code>output</code>
+   <li><code>progress</code>
+   <li><code>q</code>
+   <li><code>ruby</code>
+   <li><code>samp</code>
+   <li><code>script</code>
+   <li><code>select</code>
+   <li><code>small</code>
+   <li><code>span</code>
+   <li><code>strong</code>
+   <li><code>sub</code>
+   <li><code>sup</code>
+   <li><code>svg</code>
+   <li><code>textarea</code>
+   <li><code>time</code>
+   <li><code>var</code>
+   <li><code>video</code>
+   <li><span title="text content">Text</span>
+  </ul>
+
   <p>As a general rule, elements whose content model allows any
   <span>phrasing content</span> should have either at least one
   descendant <span>text node</span> that is not <span>inter-element
@@ -8268,6 +8437,18 @@
   resource into the document, or content from another vocabulary that
   is inserted into the document.</p>
 
+  <ul class="brief">
+   <li><code>audio</code>
+   <li><code>canvas</code>
+   <li><code>embed</code>
+   <li><code>iframe</code>
+   <li><code>img</code>
+   <li><code>math</code>
+   <li><code>object</code>
+   <li><code>svg</code>
+   <li><code>video</code>
+  </ul>
+
   <p>Elements that are from namespaces other than the <span>HTML
   namespace</span> and that convey content but not metadata, are
   <span>embedded content</span> for the purposes of the content models
@@ -8292,6 +8473,25 @@
   <p><dfn>Interactive content</dfn> is content that is specifically
   intended for user interaction.</p>
 
+  <ul class="brief">
+   <li><code>a</code>
+   <li><code>audio</code> (if the <code title="attr-media-controls">controls</code> attribute is present)
+   <li><code>bb</code>
+   <li><code>button</code>
+   <li><code>datagrid</code>
+   <li><code>details</code>
+   <li><code>embed</code>
+   <li><code>img</code> (if the <code title="attr-hyperlink-usemap">usemap</code> attribute is present)
+   <li><code>input</code> (if the <code title="attr-input-type">type</code> attribute is <em>not</em> in the <span title="attr-input-type-hidden">Hidden</span> state)
+   <li><code>keygen</code>
+   <li><code>label</code>
+   <li><code>menu</code> (if the <code title="attr-menu-type">type</code> attribute is in the <span title="tool bar state">tool bar</span> state)
+   <li><code>object</code> (if the <code title="attr-hyperlink-usemap">usemap</code> attribute is present) <!-- see also comment in <object> section -->
+   <li><code>select</code>
+   <li><code>textarea</code>
+   <li><code>video</code> (if the <code title="attr-media-controls">controls</code> attribute is present)
+  </ul>
+
   <p>Certain elements in HTML have an <span>activation
   behavior</span>, which means that the user can activate them. This
   triggers a sequence of events dependent on the activation mechanism,
@@ -9838,10 +10038,11 @@
    <dt>Categories</dt>
    <dd><span>Metadata content</span>.</dd>
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>flow content</span>.</dd>
+   <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>phrasing content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>metadata content</span> is expected.</dd>
    <dd>In a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
-   <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>flow content</span> is expected.</dd>
+   <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -10198,12 +10399,13 @@
    <dt>Categories</dt>
    <dd><span>Metadata content</span>.</dd>
    <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>flow content</span>.</dd>
+   <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: <span>phrasing content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>If the <code title="attr-meta-charset">charset</code> attribute is present, or if the element is in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>head</code> element.</dd>
    <dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present, and the element is not in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>head</code> element.</dd>
    <dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present, and the element is not in the <span title="attr-meta-http-equiv-content-type">Encoding declaration state</span>: in a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
    <dd>If the <code title="attr-meta-name">name</code> attribute is present: where <span>metadata content</span> is expected.</dd>
-   <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>flow content</span> is expected.</dd>
+   <dd>If the <code title="attr-itemprop">itemprop</code> attribute is present: where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Content attributes:</dt>
@@ -14525,9 +14727,9 @@
 
   <dl class="element">
    <dt>Categories</dt>
-   <dd><span>Interactive content</span>.</dd>
    <dd><span>Flow content</span>.</dd>
    <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
+   <dd><span>Interactive content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
@@ -19148,6 +19350,7 @@
    <dd><span>Flow content</span>.</dd>
    <dd><span>Phrasing content</span>.</dd>
    <dd><span>Embedded content</span>.</dd>
+   <dd><span>Interactive content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dt>Content model:</dt>
@@ -19701,6 +19904,7 @@
    <dd><span>Flow content</span>.</dd>
    <dd><span>Phrasing content</span>.</dd>
    <dd><span>Embedded content</span>.</dd>
+   <dd><span>Interactive content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dt>Content model:</dt>
@@ -19923,8 +20127,8 @@
    <dd><span>Flow content</span>.</dd>
    <dd><span>Phrasing content</span>.</dd>
    <dd><span>Embedded content</span>.</dd>
+   <dd>If the element has a <code title="attr-hyperlink-usemap">usemap</code> attribute: <span>Interactive content</span>.</dd> <!-- also when showing a plugin or a nested browsing context, but checking that statically is hard...) -->
    <dd><span title="category-listed">Listed</span>,  <span title="category-submit">submittable</span>, <span>form-associated element</span>.</dd>
-   <dd>If the element has a <code title="attr-hyperlink-usemap">usemap</code> attribute: <span>Interactive content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>embedded content</span> is expected.</dd>
    <dt>Content model:</dt>
@@ -28166,9 +28370,11 @@
 
   <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>
+  <p>The <dfn><code>svg</code></dfn> element from the <span>SVG
+  namespace</span> falls into the <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>
 
   <div class="impl">
 




More information about the Commit-Watchers mailing list