[html5] r1964 - [c] (0) Fix the content models to handle <a> containing flow elements without br [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2008-07-30 15:14:36 -0700 (Wed, 30 Jul 2008)
New Revision: 1964

Modified:
   index
   source
Log:
[c] (0) Fix the content models to handle <a> containing flow elements without breaking the definition of paragraph, and remove redundant requirements for ins and del along the same lines.

Modified: index
===================================================================
--- index	2008-07-30 21:55:35 UTC (rev 1963)
+++ index	2008-07-30 22:14:36 UTC (rev 1964)
@@ -12488,10 +12488,13 @@
   <dl class=element>
    <dt>Categories
 
-   <dd><a href="#phrasing0">Phrasing content</a>.
-
    <dd><a href="#interactive1">Interactive content</a>.
 
+   <dd>When the element only contains <a href="#phrasing0">phrasing
+    content</a>: <a href="#phrasing0">phrasing content</a>.
+
+   <dd>Otherwise: <a href="#flow-content0">flow content</a>.
+
    <dt>Contexts in which this element may be used:
 
    <dd>Where <a href="#phrasing0">phrasing content</a> is expected.
@@ -14969,12 +14972,8 @@
 
    <dt>Contexts in which this element may be used:
 
-   <dd>When the element only contains <a href="#phrasing0">phrasing
-    content</a>: where <a href="#phrasing0">phrasing content</a> is expected.
+   <dd>Where <a href="#phrasing0">phrasing content</a> is expected.
 
-   <dd>Otherwise: where <a href="#flow-content0">flow content</a> is
-    expected.
-
    <dt>Content model:
 
    <dd><a href="#transparent0">Transparent</a>.
@@ -15068,12 +15067,8 @@
 
    <dt>Contexts in which this element may be used:
 
-   <dd>When the element only contains <a href="#phrasing0">phrasing
-    content</a>: where <a href="#phrasing0">phrasing content</a> is expected.
+   <dd>Where <a href="#phrasing0">phrasing content</a> is expected.
 
-   <dd>Otherwise: where <a href="#flow-content0">flow content</a> is
-    expected.
-
    <dt>Content model:
 
    <dd><a href="#transparent0">Transparent</a>.

Modified: source
===================================================================
--- source	2008-07-30 21:55:35 UTC (rev 1963)
+++ source	2008-07-30 22:14:36 UTC (rev 1964)
@@ -10261,8 +10261,9 @@
 
   <dl class="element">
    <dt>Categories</dt>
-   <dd><span>Phrasing content</span>.</dd>
    <dd><span>Interactive content</span>.</dd>
+   <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
+   <dd>Otherwise: <span>flow 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>
@@ -12560,8 +12561,7 @@
    <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
    <dd>Otherwise: <span>flow content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
-   <dd>When the element only contains <span>phrasing content</span>: where <span>phrasing content</span> is expected.</dd>
-   <dd>Otherwise: where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
    <dd><span>Transparent</span>.</dd>
    <dt>Element-specific attributes:</dt>
@@ -12647,8 +12647,7 @@
    <dd>When the element only contains <span>phrasing content</span>: <span>phrasing content</span>.</dd>
    <dd>Otherwise: <span>flow content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
-   <dd>When the element only contains <span>phrasing content</span>: where <span>phrasing content</span> is expected.</dd>
-   <dd>Otherwise: where <span>flow content</span> is expected.</dd>
+   <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
    <dd><span>Transparent</span>.</dd>
    <dt>Element-specific attributes:</dt>