[e] (0) Define the 'Text' content model more clearly.

git-svn-id: http://svn.whatwg.org/webapps@3328 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jun 26, 2009 · 183676d · 183676d
1 parent c70f85f
commit 183676d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/index b/index
@@ -8090,9 +8090,12 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
   content can only contain elements that are themselves categorized as
   phrasing content, not any flow content.</p>
 
-  <p><a href=#text-node title="text node">Text nodes</a> that are not
-  <a href=#inter-element-whitespace>inter-element whitespace</a> are <a href=#phrasing-content-0>phrasing
-  content</a>.</p>
+  <p><dfn id=text-content title="text content">Text</dfn>, in the context of content
+  models, means <a href=#text-node title="text node">text nodes</a>. <a href=#text-content title="text content">Text</a> is sometimes used as a content
+  model on its own, but is also <a href=#phrasing-content-0>phrasing content</a>, and can
+  be <a href=#inter-element-whitespace>inter-element whitespace</a> (if the <a href=#text-node title="text
+  node">text nodes</a> are empty or contain just <a href=#space-character title="space
+  character">space characters</a>).</p>
 
 
   <h5 id=embedded-content><span class=secno>3.4.1.6 </span>Embedded content</h5>
@@ -9370,7 +9373,7 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
    <dt>Contexts in which this element may be used:</dt>
    <dd>In a <code><a href=#the-head-element>head</a></code> element containing no other <code><a href=#the-title-element>title</a></code> elements.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><a href=#text-content title="text content">Text</a>.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dt>DOM interface:</dt>
@@ -33559,7 +33562,7 @@ interface <dfn id=htmlselectelement>HTMLSelectElement</dfn> : <a href=#htmleleme
    <dd>As a child of a <code><a href=#the-datalist-element>datalist</a></code> element.</dd>
    <dd>As a child of an <code><a href=#the-optgroup-element>optgroup</a></code> element.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><a href=#text-content title="text content">Text</a>.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-option-disabled><a href=#attr-option-disabled>disabled</a></code></dd>
@@ -33747,7 +33750,7 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
    <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>
-   <dd>Text.</dd>
+   <dd><a href=#text-content title="text content">Text</a>.</dd>
    <dt>Content attributes:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dd><code title=attr-fe-autofocus><a href=#attr-fe-autofocus>autofocus</a></code></dd>

diff --git a/source b/source
@@ -8239,9 +8239,13 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
   content can only contain elements that are themselves categorized as
   phrasing content, not any flow content.</p>
 
-  <p><span title="text node">Text nodes</span> that are not
-  <span>inter-element whitespace</span> are <span>phrasing
-  content</span>.</p>
+  <p><dfn title="text content">Text</dfn>, in the context of content
+  models, means <span title="text node">text nodes</span>. <span
+  title="text content">Text</span> is sometimes used as a content
+  model on its own, but is also <span>phrasing content</span>, and can
+  be <span>inter-element whitespace</span> (if the <span title="text
+  node">text nodes</span> are empty or contain just <span title="space
+  character">space characters</span>).</p>
 
 
   <h5>Embedded content</h5>
@@ -9672,7 +9676,7 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
    <dt>Contexts in which this element may be used:</dt>
    <dd>In a <code>head</code> element containing no other <code>title</code> elements.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><span title="text content">Text</span>.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dt>DOM interface:</dt>
@@ -37471,7 +37475,7 @@ interface <dfn>HTMLSelectElement</dfn> : <span>HTMLElement</span> {
    <dd>As a child of a <code>datalist</code> element.</dd>
    <dd>As a child of an <code>optgroup</code> element.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><span title="text content">Text</span>.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-option-disabled">disabled</code></dd>
@@ -37707,7 +37711,7 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><span title="text content">Text</span>.</dd>
    <dt>Content attributes:</dt>
    <dd><span>Global attributes</span></dd>
    <dd><code title="attr-fe-autofocus">autofocus</code></dd>