Skip to content

Commit

Permalink
[c] (0) Fix the content models to handle <a> containing flow elements…
Browse files Browse the repository at this point in the history 
… without breaking the definition of paragraph, and remove redundant requirements for ins and del along the same lines.

git-svn-id: http://svn.whatwg.org/webapps@1964 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jul 30, 2008
1 parent 4684a43 commit df6ff47
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
19 changes: 7 additions & 12 deletions index
View file
Expand Up @@ -12488,10 +12488,13 @@ first matching case):&lt;/p&gt;
<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.
Expand Down Expand Up @@ -14969,11 +14972,7 @@ brighter. A &lt;b>rat&lt;/b> scurries past the corner wall.&lt;/p></pre>

<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>Otherwise: where <a href="#flow-content0">flow content</a> is
expected.
<dd>Where <a href="#phrasing0">phrasing content</a> is expected.

<dt>Content model:

Expand Down Expand Up @@ -15068,11 +15067,7 @@ brighter. A &lt;b>rat&lt;/b> scurries past the corner wall.&lt;/p></pre>

<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>Otherwise: where <a href="#flow-content0">flow content</a> is
expected.
<dd>Where <a href="#phrasing0">phrasing content</a> is expected.

<dt>Content model:

Expand Down
9 changes: 4 additions & 5 deletions source
View file
Expand Up @@ -10261,8 +10261,9 @@ first matching case):&lt;/p&gt;

<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>
Expand Down Expand Up @@ -12560,8 +12561,7 @@ brighter. A &lt;b>rat&lt;/b> scurries past the corner wall.&lt;/p></pre>
<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>
Expand Down Expand Up @@ -12647,8 +12647,7 @@ brighter. A &lt;b>rat&lt;/b> scurries past the corner wall.&lt;/p></pre>
<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>
Expand Down

0 comments on commit df6ff47

Please sign in to comment.