- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 27 Dec 2008 11:36:28 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv29608
Modified Files:
Overview.html
Log Message:
Replace the paragraphs about relationships between kinds of content with a diagram. (whatwg r2594)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1764
retrieving revision 1.1765
diff -u -d -r1.1764 -r1.1765
--- Overview.html 27 Dec 2008 10:57:31 -0000 1.1764
+++ Overview.html 27 Dec 2008 11:36:25 -0000 1.1765
@@ -5713,7 +5713,12 @@
<li><a href=#phrasing-content-0>Phrasing content</a></li>
<li><a href=#embedded-content-1>Embedded content</a></li>
<li><a href=#interactive-content-0>Interactive content</a></li>
- </ul><p>In addition, certain elements are categorised as <a href=#form-associated-element title="form-associated element">form-associated elements</a> and
+ </ul><p>These categories are related as follows:
+
+ <p><img alt="Sectioning content,
+ heading content, phrasing content, and embedded content are all
+ types of flow content. Embedded content is also a type of phrasing
+ content." src=images/content-venn.png><p>In addition, certain elements are categorised as <a href=#form-associated-element title="form-associated element">form-associated elements</a> and
further subcategorised so so to define their role in various
form-related processing models.</p><!-- XXX list all the elements for each kind of element in the
sections below and in a summary table at the end of the document --><p>Some elements have unique requirements and do not fit into any
@@ -5762,21 +5767,15 @@
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">headers</a>, <a href=#the-footer-element title=footer>footers</a>, and <a href=#the-address-element title=address>contact
- information</a>.<p>All <a href=#sectioning-content-0>sectioning content</a> is also <a href=#flow-content-0>flow
- content</a>. Any content model that expects <a href=#flow-content-0>flow
- content</a> thus accepts <a href=#sectioning-content-0>sectioning content</a>.<p>Each <a href=#sectioning-content-0>sectioning content</a> element potentially has a
+ information</a>.<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 class=note>There are also certain elements that are <a href=#sectioning-root title="sectioning root">sectioning roots</a>. These are distinct
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).<p>All <a href=#heading-content-0>heading content</a> is also <a href=#flow-content-0>flow
- content</a>. Any content model that expects <a href=#flow-content-0>flow
- content</a> thus accepts <a href=#sectioning-content-0>sectioning content</a>.<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
+ elements, or implied by the heading content itself).<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>All <a href=#phrasing-content-0>phrasing content</a> is also <a href=#flow-content-0>flow
- content</a>. Any content model that expects <a href=#flow-content-0>flow
- content</a> thus accepts <a href=#phrasing-content-0>phrasing content</a>.<p>As a general rule, elements whose content model allows any
+ level. Runs of <a href=#phrasing-content-0>phrasing content</a> form <a href=#paragraph title=paragraph>paragraphs</a>.<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 text node that is not <a href=#inter-element-whitespace>inter-element
whitespace</a>, or at least one descendant element node that is
@@ -5788,10 +5787,7 @@
phrasing content, not any flow content.<p>Text nodes that are not <a href=#inter-element-whitespace>inter-element whitespace</a> are
<a href=#phrasing-content-0>phrasing content</a>.<h5 id=embedded-content><span class=secno>3.4.1.6 </span>Embedded content</h5><p><dfn id=embedded-content-1>Embedded content</dfn> is content that imports another
resource into the document, or content from another vocabulary that
- is inserted into the document.<p>All <a href=#embedded-content-1>embedded content</a> is also <a href=#phrasing-content-0>phrasing
- content</a> and <a href=#flow-content-0>flow content</a>. Any content model that
- expects <a href=#phrasing-content-0>phrasing content</a> or <a href=#flow-content-0>flow content</a>
- thus accepts <a href=#embedded-content-1>embedded content</a>.<p>Elements that are from namespaces other than the <a href=#html-namespace-0>HTML
+ is inserted into the document.<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-1>embedded content</a> for the purposes of the content models
defined in this specification. (For example, MathML, or SVG.)<p>Some embedded content elements can have <dfn id=fallback-content>fallback
Received on Saturday, 27 December 2008 11:36:37 UTC