Bug 613 – 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.

NOTE: The current preferred location for bug reports is the GitHub issue tracker.

Bug 613 - 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.


Summary:	Update some of the content models and element categories. Also, create some l...

Status:	NEW

Product:	Validator.nu
Classification:	Unclassified
Component:	General
Version:	HEAD
Hardware:	All All

Importance:	P2 normal
Assigned To:	Nobody

URL:	http://svn.whatwg.org/webapps/source?...

Depends on:
Blocks:
	Show dependency tree / graph

Reported:	2009-07-14 15:03 CEST by Henri Sivonen
Modified:	2009-11-23 17:17 CET (History)
CC List:	0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Henri Sivonen 2009-07-14 15:03:41 CEST

Index: source
===================================================================
--- source	(revision 3337)
+++ source	(revision 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,6 +8336,16 @@
   (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>
 
@@ -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">