[e] (0) Replace the paragraphs about relationships between kinds of c…

…ontent with a diagram. git-svn-id: http://svn.whatwg.org/webapps@2594 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Dec 27, 2008 · 3988476 · 3988476
1 parent 1b13a00
commit 3988476
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 35 deletions.
diff --git a/images/content-venn.png b/images/content-venn.png
diff --git a/index b/index
@@ -6997,7 +6997,14 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
    <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>
+
+  <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>
 
@@ -7075,10 +7082,6 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
   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>
 
-  <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>
-
   <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>
@@ -7094,21 +7097,13 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
   (whether explicitly marked up using <a href=#sectioning-content-0>sectioning content</a>
   elements, or implied by the heading content itself).</p>
 
-  <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>.</p>
-
 
   <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>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>
-
   <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
@@ -7132,11 +7127,6 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
   resource into the document, or content from another vocabulary that
   is inserted into the document.</p>
 
-  <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>
-
   <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

diff --git a/source b/source
@@ -7116,6 +7116,13 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
    <li><span>Interactive content</span></li>
   </ul>
 
+  <p>These categories are related as follows:
+
+  <p><img src="images/content-venn.png" 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."></p>
+
   <p>In addition, certain elements are categorised as <span
   title="form-associated element">form-associated elements</span> and
   further subcategorised so so to define their role in various
@@ -7196,10 +7203,6 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
   title="footer">footers</span>, and <span title="address">contact
   information</span>.</p>
 
-  <p>All <span>sectioning content</span> is also <span>flow
-  content</span>. Any content model that expects <span>flow
-  content</span> thus accepts <span>sectioning content</span>.</p>
-
   <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>
@@ -7216,10 +7219,6 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
   (whether explicitly marked up using <span>sectioning content</span>
   elements, or implied by the heading content itself).</p>
 
-  <p>All <span>heading content</span> is also <span>flow
-  content</span>. Any content model that expects <span>flow
-  content</span> thus accepts <span>sectioning content</span>.</p>
-
 
   <h5>Phrasing content</h5>
 
@@ -7228,10 +7227,6 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
   level. Runs of <span>phrasing content</span> form <span
   title="paragraph">paragraphs</span>.</p>
 
-  <p>All <span>phrasing content</span> is also <span>flow
-  content</span>. Any content model that expects <span>flow
-  content</span> thus accepts <span>phrasing content</span>.</p>
-
   <p>As a general rule, elements whose content model allows any
   <span>phrasing content</span> should have either at least one
   descendant text node that is not <span>inter-element
@@ -7255,11 +7250,6 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
   resource into the document, or content from another vocabulary that
   is inserted into the document.</p>
 
-  <p>All <span>embedded content</span> is also <span>phrasing
-  content</span> and <span>flow content</span>. Any content model that
-  expects <span>phrasing content</span> or <span>flow content</span>
-  thus accepts <span>embedded content</span>.</p>
-
   <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