- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 29 Jun 2009 11:05:21 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv1240
Modified Files:
Overview.html
Log Message:
Add lists of elements for the remaining categories used in content models. (whatwg r3339)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2477
retrieving revision 1.2478
diff -u -d -r1.2477 -r1.2478
--- Overview.html 29 Jun 2009 10:46:24 -0000 1.2477
+++ Overview.html 29 Jun 2009 11:05:18 -0000 1.2478
@@ -7109,7 +7109,7 @@
particular category.<h5 id="metadata-content"><span class="secno">3.4.1.1 </span>Metadata content</h5><p><dfn id="metadata-content-0">Metadata content</dfn> is content that sets up the
presentation or behavior of the rest of the content, or that sets
up the relationship of the document with other documents, or that
- conveys other "out of band" information.<ul class="brief"><li><code><a href="#the-base-element">base</a></code>
+ conveys other "out of band" information.<ul class="brief category-list"><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>
@@ -7146,7 +7146,7 @@
<p>This isn't possible in the HTML serialization, however.</p>
</div><h5 id="flow-content"><span class="secno">3.4.1.2 </span>Flow content</h5><p>Most elements that are used in the body of documents and
- applications are categorized as <dfn id="flow-content-0">flow content</dfn>.<ul class="brief"><li><code><a href="#the-a-element">a</a></code>
+ applications are categorized as <dfn id="flow-content-0">flow content</dfn>.<ul class="brief category-list"><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)
@@ -7241,7 +7241,7 @@
when it is used as a placeholder which will later be filled in by a
script, or when the element is part of a template and would on most
pages be filled in but on some pages is not relevant.<h5 id="sectioning-content"><span class="secno">3.4.1.3 </span>Sectioning content</h5><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>.<ul class="brief"><li><code><a href="#the-article-element">article</a></code>
+ of <a href="#heading-content-0" title="heading content">headings</a> and <a href="#the-footer-element" title="footer">footers</a>.<ul class="brief category-list"><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>
@@ -7251,7 +7251,7 @@
from <a href="#sectioning-content-0">sectioning content</a>, but they can also have an
<a href="#outline">outline</a>.<h5 id="heading-content"><span class="secno">3.4.1.4 </span>Heading content</h5><p><dfn id="heading-content-0">Heading content</dfn> defines the header of a section
(whether explicitly marked up using <a href="#sectioning-content-0">sectioning content</a>
- elements, or implied by the heading content itself).<ul class="brief"><li><code><a href="#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code>
+ elements, or implied by the heading content itself).<ul class="brief category-list"><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>
@@ -7260,7 +7260,7 @@
<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><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>.<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>)
+ level. Runs of <a href="#phrasing-content-0">phrasing content</a> form <a href="#paragraph" title="paragraph">paragraphs</a>.<ul class="brief category-list"><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>
@@ -7328,7 +7328,7 @@
node">text nodes</a> are empty or contain just <a href="#space-character" title="space
character">space characters</a>).<h5 id="embedded-content"><span class="secno">3.4.1.6 </span>Embedded content</h5><p><dfn id="embedded-content-2">Embedded content</dfn> is content that imports another
resource into the document, or content from another vocabulary that
- is inserted into the document.<ul class="brief"><li><code><a href="#audio">audio</a></code>
+ is inserted into the document.<ul class="brief category-list"><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>
@@ -7350,7 +7350,7 @@
http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0A%3Cform%20action%3D%22http%3A//google.com/%22%20onsubmit%3D%22w%28%27onsubmit%27%29%22%3E%3Cem%3EA%3C/em%3E%3C/form%3E%0A%3Cscript%3E%0Adocument.getElementsByTagName%28%27form%27%29%5B0%5D.attachEvent%28%27onsubmit%27%2C%20function%20%28%29%20%7B%20w%28%27submit%20fired%27%29%20%7D%29%3B%0Adocument.getElementsByTagName%28%27form%27%29%5B0%5D.fireEvent%28%27onsubmit%27%29%3B%0A%3C/script%3E
http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0A%3Cform%20action%3D%22http%3A//google.com/%22%3EX%3C/form%3E%0A%3Cscript%3E%0Avar%20evt%20%3D%20document.createEvent%28%22Events%22%29%3B%0Aevt.initEvent%28%22submit%22%2C%20true%2C%20true%29%3B%0Adocument.getElementsByTagName%28%27form%27%29%5B0%5D.dispatchEvent%28evt%29%3B%0A%3C/script%3E
--><p><dfn id="interactive-content-0">Interactive content</dfn> is content that is specifically
- intended for user interaction.<ul class="brief"><li><code><a href="#the-a-element">a</a></code>
+ intended for user interaction.<ul class="brief category-list"><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>
@@ -10993,7 +10993,12 @@
root">sectioning roots</dfn>, including <code><a href="#the-blockquote-element">blockquote</a></code> and
<code><a href="#the-td-element">td</a></code> elements. These elements can have their own
outlines, but the sections and headings inside these elements do not
- contribute to the outlines of their ancestors.<div class="example">
+ contribute to the outlines of their ancestors.<ul class="brief category-list"><li><code><a href="#the-blockquote-element">blockquote</a></code>
+ <li><code><a href="#the-body-element">body</a></code>
+ <li><code><a href="#datagrid">datagrid</a></code>
+ <li><code><a href="#the-figure-element">figure</a></code>
+ <li><code><a href="#the-td-element">td</a></code>
+ </ul><div class="example">
<p>For the following fragment:</p>
<pre><body>
<h1>Foo</h1>
@@ -24753,26 +24758,75 @@
content</a>, and <a href="#interactive-content-0">interactive content</a>.<p>A number of the elements are <dfn id="form-associated-element" title="form-associated
element">form-associated elements</dfn>, which means they can have a
<a href="#form-owner">form owner</a> and, to expose this, have a <code title="attr-fae-form"><a href="#attr-fae-form">form</a></code> content attribute with a matching
- <code title="dom-fae-form"><a href="#dom-fae-form">form</a></code> DOM attribute.<p>The <a href="#form-associated-element" title="form-associated element">form-associated
- elements</a> fall into several subcategories:<dl><dt><dfn id="category-submit" title="category-submit">Submittable elements</dfn></dt>
+ <code title="dom-fae-form"><a href="#dom-fae-form">form</a></code> DOM attribute.<ul class="brief category-list"><li><code><a href="#the-button-element">button</a></code>
+ <li><code><a href="#the-fieldset-element">fieldset</a></code>
+ <li><code><a href="#the-input-element">input</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-object-element">object</a></code>
+ <li><code><a href="#the-output-element">output</a></code>
+ <li><code><a href="#the-select-element">select</a></code>
+ <li><code><a href="#the-textarea-element">textarea</a></code>
+ </ul><p>The <a href="#form-associated-element" title="form-associated element">form-associated
+ elements</a> fall into several subcategories:<dl><dt><dfn id="category-listed" title="category-listed">Listed</dfn></dt>
- <dd>Denotes elements that can be used for <a href="#constructing-form-data-set">constructing the form data
- set</a> when a <code><a href="#the-form-element">form</a></code> element is <a href="#concept-form-submit" title="concept-form-submit">submitted</a>.</dd>
+ <dd>
- <dt><dfn id="category-reset" title="category-reset">Resettable elements</dfn></dt>
+ <p>Denotes elements that are listed in the <code title="dom-form-elements"><a href="#dom-form-elements"><var title="">form</var>.elements</a></code>
+ and <code title="dom-fieldset-elements"><a href="#dom-fieldset-elements"><var title="">fieldset</var>.elements</a></code> APIs.</p>
- <dd>Denotes elements that can be affected when a <code><a href="#the-form-element">form</a></code>
- element is <a href="#concept-form-reset" title="concept-form-reset">reset</a>.</dd>
+ <ul class="brief category-list"><li><code><a href="#the-button-element">button</a></code>
+ <li><code><a href="#the-fieldset-element">fieldset</a></code>
+ <li><code><a href="#the-input-element">input</a></code>
+ <li><code><a href="#the-keygen-element">keygen</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-select-element">select</a></code>
+ <li><code><a href="#the-textarea-element">textarea</a></code>
+ </ul></dd>
- <dt><dfn id="category-listed" title="category-listed">Listed</dfn></dt>
+ <dt><dfn id="category-label" title="category-label">Labelable</dfn></dt>
- <dd>Denotes elements that are listed in the <code title="dom-form-elements"><a href="#dom-form-elements"><var title="">form</var>.elements</a></code>
- and <code title="dom-fieldset-elements"><a href="#dom-fieldset-elements"><var title="">fieldset</var>.elements</a></code> APIs.</dd>
+ <dd>
- <dt><dfn id="category-label" title="category-label">Labelable</dfn></dt>
+ <p>Denotes elements that can be associated with <code><a href="#the-label-element">label</a></code>
+ elements.</p>
- <dd>Denotes elements that can be associated with <code><a href="#the-label-element">label</a></code>
- elements.</dd>
+ <ul class="brief category-list"><li><code><a href="#the-button-element">button</a></code>
+ <li><code><a href="#the-input-element">input</a></code>
+ <li><code><a href="#the-keygen-element">keygen</a></code>
+ <li><code><a href="#the-select-element">select</a></code>
+ <li><code><a href="#the-textarea-element">textarea</a></code>
+ </ul></dd>
+
+ <dt><dfn id="category-submit" title="category-submit">Submittable elements</dfn></dt>
+
+ <dd>
+
+ <p>Denotes elements that can be used for <a href="#constructing-form-data-set">constructing the form data
+ set</a> when a <code><a href="#the-form-element">form</a></code> element is <a href="#concept-form-submit" title="concept-form-submit">submitted</a>.</p>
+
+ <ul class="brief category-list"><li><code><a href="#the-button-element">button</a></code>
+ <li><code><a href="#the-input-element">input</a></code>
+ <li><code><a href="#the-keygen-element">keygen</a></code>
+ <li><code><a href="#the-object-element">object</a></code>
+ <li><code><a href="#the-select-element">select</a></code>
+ <li><code><a href="#the-textarea-element">textarea</a></code>
+ </ul></dd>
+
+ <dt><dfn id="category-reset" title="category-reset">Resettable elements</dfn></dt>
+
+ <dd>
+
+ <p>Denotes elements that can be affected when a <code><a href="#the-form-element">form</a></code>
+ element is <a href="#concept-form-reset" title="concept-form-reset">reset</a>.</p>
+
+ <ul class="brief category-list"><li><code><a href="#the-input-element">input</a></code>
+ <li><code><a href="#the-keygen-element">keygen</a></code>
+ <li><code><a href="#the-output-element">output</a></code>
+ <li><code><a href="#the-select-element">select</a></code>
+ <li><code><a href="#the-textarea-element">textarea</a></code>
+ </ul></dd>
</dl><p>In addition, some <a href="#category-submit" title="category-submit">submittable
elements</a> can be, depending on their attributes, <dfn id="concept-button" title="concept-button">buttons</dfn>. The prose below defines when
Received on Monday, 29 June 2009 11:05:38 UTC