Skip to content

Commit

Permalink
[e] (0) kill the 'formatBlock candidates' category
Browse files Browse the repository at this point in the history 
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=13424

git-svn-id: http://svn.whatwg.org/webapps@6587 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Sep 23, 2011
1 parent c398d2a commit 9015f62
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 195 deletions.
77 changes: 13 additions & 64 deletions complete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16626,7 +16626,6 @@ <h4 id=the-section-element><span class=secno>4.4.2 </span>The <dfn><code>section
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#sectioning-content>Sectioning content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -16748,7 +16747,6 @@ <h4 id=the-nav-element><span class=secno>4.4.3 </span>The <dfn><code>nav</code><
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#sectioning-content>Sectioning content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -16908,7 +16906,6 @@ <h4 id=the-article-element><span class=secno>4.4.4 </span>The <dfn><code>article
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#sectioning-content>Sectioning content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -17010,7 +17007,6 @@ <h4 id=the-aside-element><span class=secno>4.4.5 </span>The <dfn><code>aside</co
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#sectioning-content>Sectioning content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -17157,7 +17153,6 @@ <h4 id=the-h1,-h2,-h3,-h4,-h5,-and-h6-elements><span class=secno>4.4.6 </span>Th
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#heading-content>Heading content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>As a child of an <code><a href=#the-hgroup-element>hgroup</a></code> element.</dd>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
Expand Down Expand Up @@ -17222,7 +17217,6 @@ <h4 id=the-hgroup-element><span class=secno>4.4.7 </span>The <dfn><code>hgroup</
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#heading-content>Heading content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -17289,7 +17283,6 @@ <h4 id=the-header-element><span class=secno>4.4.8 </span>The <dfn><code>header</

<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -17387,7 +17380,6 @@ <h4 id=the-footer-element><span class=secno>4.4.9 </span>The <dfn><code>footer</

<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -17534,7 +17526,6 @@ <h4 id=the-address-element><span class=secno>4.4.10 </span>The <dfn><code>addres

<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -18162,7 +18153,6 @@ <h4 id=the-p-element><span class=secno>4.5.1 </span>The <dfn><code>p</code></dfn

<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -18342,7 +18332,6 @@ <h4 id=the-pre-element><span class=secno>4.5.3 </span>The <dfn><code>pre</code><

<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -18458,7 +18447,6 @@ <h4 id=the-blockquote-element><span class=secno>4.5.4 </span>The <dfn><code>bloc
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#sectioning-root>Sectioning root</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -19283,7 +19271,6 @@ <h4 id=the-div-element><span class=secno>4.5.13 </span>The <dfn><code>div</code>

<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
<dd><a href=#formatblock-candidate><code title="">formatBlock</code> candidate</a>.</dd>
<dt>Contexts in which this element can be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
Expand Down Expand Up @@ -71918,8 +71905,6 @@ <h4 id=editing-apis><span class=secno>8.5.5 </span>Editing APIs</h4>
interaction of editing and the undo/redo features in user agents is
defined by the UndoManager and DOM Transaction specification. <a href=#refsEDITING>[EDITING]</a> <a href=#refsDOMRANGE>[DOMRANGE]</a> <a href=#refsUNDO>[UNDO]</a></p>

<p class=XXX>Need to decide what to do with the <dfn id=formatblock-candidate><code title="">formatBlock</code> candidate</dfn> category.</p>

<p class=XXX><dfn id=undo-transaction-history>undo transaction history</dfn> is currently
defined in <a href=#refsUNDO>[UNDO]</a> but this spec hasn't been
updated to make sense with the new definition</p>
Expand Down Expand Up @@ -97570,8 +97555,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td><code><a href=#htmlelement>HTMLElement</a></code></td>
<tr><th><code><a href=#the-address-element>address</a></code></th>
<td>Contact information for a page or <code><a href=#the-article-element>article</a></code> element</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a>*</td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand Down Expand Up @@ -97600,17 +97584,15 @@ <h3 class=no-num id=elements-1>Elements</h3>
<tr><th><code><a href=#the-article-element>article</a></code></th>
<td>Self-contained syndicatable or reusable composition</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#sectioning-content title="Sectioning content">sectioning</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<a href=#sectioning-content title="Sectioning content">sectioning</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
<td><code><a href=#htmlelement>HTMLElement</a></code></td>
<tr><th><code><a href=#the-aside-element>aside</a></code></th>
<td>Sidebar for tangentially related content</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#sectioning-content title="Sectioning content">sectioning</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<a href=#sectioning-content title="Sectioning content">sectioning</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand Down Expand Up @@ -97670,8 +97652,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<tr><th><code><a href=#the-blockquote-element>blockquote</a></code></th>
<td>A section quoted from another source</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#sectioning-root title="Sectioning root">sectioning root</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<a href=#sectioning-root title="Sectioning root">sectioning root</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a>;
Expand Down Expand Up @@ -97847,8 +97828,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td><code><a href=#htmlelement>HTMLElement</a></code></td>
<tr><th><code><a href=#the-div-element>div</a></code></th>
<td>Generic flow container</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand Down Expand Up @@ -97923,8 +97903,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td><code><a href=#htmlelement>HTMLElement</a></code></td>
<tr><th><code><a href=#the-footer-element>footer</a></code></th>
<td>Footer for a page or section</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a>*</td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand All @@ -97947,8 +97926,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<tr><th><code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code></th>
<td>Section heading</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#heading-content title="Heading content">heading</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<a href=#heading-content title="Heading content">heading</a></td>
<td><code><a href=#the-hgroup-element>hgroup</a></code>;
<a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
Expand All @@ -97963,17 +97941,15 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td><code><a href=#htmlheadelement>HTMLHeadElement</a></code></td>
<tr><th><code><a href=#the-header-element>header</a></code></th>
<td>Introductory or navigational aids for a page or section</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a>*</td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
<td><code><a href=#htmlelement>HTMLElement</a></code></td>
<tr><th><code><a href=#the-hgroup-element>hgroup</a></code></th>
<td>heading group</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#heading-content title="Heading content">heading</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<a href=#heading-content title="Heading content">heading</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and/or <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand Down Expand Up @@ -98225,8 +98201,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<tr><th><code><a href=#the-nav-element>nav</a></code></th>
<td>Section with navigational links</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#sectioning-content title="Sectioning content">sectioning</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<a href=#sectioning-content title="Sectioning content">sectioning</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand Down Expand Up @@ -98311,8 +98286,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td><code><a href=#htmloutputelement>HTMLOutputElement</a></code></td>
<tr><th><code><a href=#the-p-element>p</a></code></th>
<td>Paragraph</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand All @@ -98328,8 +98302,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td><code><a href=#htmlparamelement>HTMLParamElement</a></code></td>
<tr><th><code><a href=#the-pre-element>pre</a></code></th>
<td>Block of preformatted text</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#phrasing-content title="Phrasing content">phrasing</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand Down Expand Up @@ -98413,8 +98386,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<tr><th><code><a href=#the-section-element>section</a></code></th>
<td>Generic document or application section</td>
<td><a href=#flow-content title="Flow content">flow</a>;
<a href=#sectioning-content title="Sectioning content">sectioning</a>;
<a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidate</a></td>
<a href=#sectioning-content title="Sectioning content">sectioning</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#flow-content title="Flow content">flow</a></td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
Expand Down Expand Up @@ -99003,29 +98975,6 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
<td>
&mdash;

<tr><td> <a href=#formatblock-candidate title="formatBlock candidate"><code title="">formatBlock</code> candidates</a>
<td>
<code><a href=#the-section-element>section</a></code>;
<code><a href=#the-nav-element>nav</a></code>;
<code><a href=#the-article-element>article</a></code>;
<code><a href=#the-aside-element>aside</a></code>;
<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>;
<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>;
<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>;
<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>;
<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>;
<code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code>;
<code><a href=#the-hgroup-element>hgroup</a></code>;
<code><a href=#the-header-element>header</a></code>;
<code><a href=#the-footer-element>footer</a></code>;
<code><a href=#the-address-element>address</a></code>;
<code><a href=#the-p-element>p</a></code>;
<code><a href=#the-pre-element>pre</a></code>;
<code><a href=#the-blockquote-element>blockquote</a></code>;
<code><a href=#the-div-element>div</a></code>
<td>
&mdash;

</table><h3 class=no-num id=attributes-1>Attributes</h3>

<p><i>This section is non-normative.</i></p>
Expand Down

0 comments on commit 9015f62

Please sign in to comment.