Skip to content

Commit

Permalink
[giow] (2) Make <figcaption> and <summary> act like other elements th…
Browse files Browse the repository at this point in the history 
…at have 'flow content' content models.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=9535

git-svn-id: http://svn.whatwg.org/webapps@5166 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jul 14, 2010
1 parent 06510fc commit 30a2bdc
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 75 deletions.
52 changes: 27 additions & 25 deletions complete.html
View file
Expand Up @@ -78195,27 +78195,27 @@ <h5 id=the-insertion-mode><span class=secno>12.2.3.1 </span>The insertion mode</
<code><a href=#the-command>command</a></code>, <!--v2DDATAGRID <code>datagrid</code>,-->
<code><a href=#the-dd-element>dd</a></code>, <code><a href=#the-details-element>details</a></code>, <code><a href=#dir>dir</a></code>,
<code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>, <code><a href=#the-dt-element>dt</a></code>,
<code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-figure-element>figure</a></code>,
<code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#frame>frame</a></code>,
<code><a href=#frameset>frameset</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-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>, <code><a href=#the-hgroup-element>hgroup</a></code>,
<code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-html-element-0>html</a></code>, <code><a href=#the-iframe-element>iframe</a></code>, <!--
<code>image</code>, (commented out because this isn't an element
that can end up on the stack, so it doesn't matter) -->
<code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>, <code><a href=#isindex-0>isindex</a></code>,
<code><a href=#the-li-element>li</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#listing>listing</a></code>,
<code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#menus>menu</a></code>, <code><a href=#meta>meta</a></code>,
<code><a href=#the-nav-element>nav</a></code>, <code><a href=#noembed>noembed</a></code>, <code><a href=#noframes>noframes</a></code>,
<code><a href=#the-noscript-element>noscript</a></code>, <code><a href=#the-object-element>object</a></code>, <code><a href=#the-ol-element>ol</a></code>,
<code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>, <code><a href=#plaintext>plaintext</a></code>,
<code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>, <code><a href=#the-section-element>section</a></code>,
<code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>, <code><a href=#the-table-element>table</a></code>,
<code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-td-element>td</a></code>, <code><a href=#the-textarea-element>textarea</a></code>,
<code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-th-element>th</a></code>, <code><a href=#the-thead-element>thead</a></code>,
<code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>,
<code><a href=#the-wbr-element>wbr</a></code>, <code><a href=#xmp>xmp</a></code>, and SVG's
<code>foreignObject</code>.</dd>
<code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-figcaption-element>figcaption</a></code>,
<code><a href=#the-figure-element>figure</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>,
<code><a href=#frame>frame</a></code>, <code><a href=#frameset>frameset</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-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>,
<code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-html-element-0>html</a></code>,
<code><a href=#the-iframe-element>iframe</a></code>, <!-- <code>image</code>, (commented out
because this isn't an element that can end up on the stack, so it
doesn't matter) --> <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>,
<code><a href=#isindex-0>isindex</a></code>, <code><a href=#the-li-element>li</a></code>, <code><a href=#the-link-element>link</a></code>,
<code><a href=#listing>listing</a></code>, <code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#menus>menu</a></code>,
<code><a href=#meta>meta</a></code>, <code><a href=#the-nav-element>nav</a></code>, <code><a href=#noembed>noembed</a></code>,
<code><a href=#noframes>noframes</a></code>, <code><a href=#the-noscript-element>noscript</a></code>, <code><a href=#the-object-element>object</a></code>,
<code><a href=#the-ol-element>ol</a></code>, <code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>,
<code><a href=#plaintext>plaintext</a></code>, <code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>,
<code><a href=#the-section-element>section</a></code>, <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>,
<code><a href=#the-summary-element>summary</a></code>, <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>,
<code><a href=#the-td-element>td</a></code>, <code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>,
<code><a href=#the-th-element>th</a></code>, <code><a href=#the-thead-element>thead</a></code>, <code><a href=#the-title-element-0>title</a></code>,
<code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>, <code><a href=#the-wbr-element>wbr</a></code>,
<code><a href=#xmp>xmp</a></code>, and SVG's <code>foreignObject</code>.</dd>

<dt><dfn id=formatting>Formatting</dfn></dt>
<dd><p>The following HTML elements are those that end up in the
Expand Down Expand Up @@ -81631,8 +81631,9 @@ <h5 id=the-before-head-insertion-mode><span class=secno>12.2.5.6 </span>The "<df
<!-- the normal ones -->
<dt>A start tag whose tag name is one of: "address", "article",
"aside", "blockquote", "center", <!--v2DATAGRID"datagrid",-->
"details", "dir", "div", "dl", "fieldset", "figure", "footer",
"header", "hgroup", "menu", "nav", "ol", "p", "section", "ul"</dt>
"details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
"footer", "header", "hgroup", "menu", "nav", "ol", "p", "section",
"summary", "ul"</dt>
<dd>

<!-- As of May 2008 this doesn't match any browser exactly, but is
Expand Down Expand Up @@ -81853,8 +81854,9 @@ <h5 id=the-before-head-insertion-mode><span class=secno>12.2.5.6 </span>The "<df
<dt>An end tag whose tag name is one of: "address", "article",
"aside", "blockquote", "button", "center",
<!--v2DATAGRID"datagrid",--> "details", "dir", "div", "dl",
"fieldset", "figure", "footer", "header", "hgroup", "listing",
"menu", "nav", "ol", "pre", "section", "ul"</dt>
"fieldset", "figcaption", "figure", "footer", "header", "hgroup",
"listing", "menu", "nav", "ol", "pre", "section", "summary",
"ul"</dt>
<dd>

<p>If the <a href=#stack-of-open-elements>stack of open elements</a> does not <a href=#has-an-element-in-scope title="has an element in scope">have an element in scope</a>
Expand Down
52 changes: 27 additions & 25 deletions index
View file
Expand Up @@ -71436,27 +71436,27 @@ interface <dfn id=messageport>MessagePort</dfn> {
<code><a href=#the-command>command</a></code>, <!--v2DDATAGRID <code>datagrid</code>,-->
<code><a href=#the-dd-element>dd</a></code>, <code><a href=#the-details-element>details</a></code>, <code><a href=#dir>dir</a></code>,
<code><a href=#the-div-element>div</a></code>, <code><a href=#the-dl-element>dl</a></code>, <code><a href=#the-dt-element>dt</a></code>,
<code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-figure-element>figure</a></code>,
<code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>, <code><a href=#frame>frame</a></code>,
<code><a href=#frameset>frameset</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-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>, <code><a href=#the-hgroup-element>hgroup</a></code>,
<code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-html-element-0>html</a></code>, <code><a href=#the-iframe-element>iframe</a></code>, <!--
<code>image</code>, (commented out because this isn't an element
that can end up on the stack, so it doesn't matter) -->
<code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>, <code><a href=#isindex-0>isindex</a></code>,
<code><a href=#the-li-element>li</a></code>, <code><a href=#the-link-element>link</a></code>, <code><a href=#listing>listing</a></code>,
<code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#menus>menu</a></code>, <code><a href=#meta>meta</a></code>,
<code><a href=#the-nav-element>nav</a></code>, <code><a href=#noembed>noembed</a></code>, <code><a href=#noframes>noframes</a></code>,
<code><a href=#the-noscript-element>noscript</a></code>, <code><a href=#the-object-element>object</a></code>, <code><a href=#the-ol-element>ol</a></code>,
<code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>, <code><a href=#plaintext>plaintext</a></code>,
<code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>, <code><a href=#the-section-element>section</a></code>,
<code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>, <code><a href=#the-table-element>table</a></code>,
<code><a href=#the-tbody-element>tbody</a></code>, <code><a href=#the-td-element>td</a></code>, <code><a href=#the-textarea-element>textarea</a></code>,
<code><a href=#the-tfoot-element>tfoot</a></code>, <code><a href=#the-th-element>th</a></code>, <code><a href=#the-thead-element>thead</a></code>,
<code><a href=#the-title-element-0>title</a></code>, <code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>,
<code><a href=#the-wbr-element>wbr</a></code>, <code><a href=#xmp>xmp</a></code>, and SVG's
<code>foreignObject</code>.</dd>
<code><a href=#the-embed-element>embed</a></code>, <code><a href=#the-fieldset-element>fieldset</a></code>, <code><a href=#the-figcaption-element>figcaption</a></code>,
<code><a href=#the-figure-element>figure</a></code>, <code><a href=#the-footer-element>footer</a></code>, <code><a href=#the-form-element>form</a></code>,
<code><a href=#frame>frame</a></code>, <code><a href=#frameset>frameset</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-head-element-0>head</a></code>, <code><a href=#the-header-element>header</a></code>,
<code><a href=#the-hgroup-element>hgroup</a></code>, <code><a href=#the-hr-element>hr</a></code>, <code><a href=#the-html-element-0>html</a></code>,
<code><a href=#the-iframe-element>iframe</a></code>, <!-- <code>image</code>, (commented out
because this isn't an element that can end up on the stack, so it
doesn't matter) --> <code><a href=#the-img-element>img</a></code>, <code><a href=#the-input-element>input</a></code>,
<code><a href=#isindex-0>isindex</a></code>, <code><a href=#the-li-element>li</a></code>, <code><a href=#the-link-element>link</a></code>,
<code><a href=#listing>listing</a></code>, <code><a href=#the-marquee-element>marquee</a></code>, <code><a href=#menus>menu</a></code>,
<code><a href=#meta>meta</a></code>, <code><a href=#the-nav-element>nav</a></code>, <code><a href=#noembed>noembed</a></code>,
<code><a href=#noframes>noframes</a></code>, <code><a href=#the-noscript-element>noscript</a></code>, <code><a href=#the-object-element>object</a></code>,
<code><a href=#the-ol-element>ol</a></code>, <code><a href=#the-p-element>p</a></code>, <code><a href=#the-param-element>param</a></code>,
<code><a href=#plaintext>plaintext</a></code>, <code><a href=#the-pre-element>pre</a></code>, <code><a href=#script>script</a></code>,
<code><a href=#the-section-element>section</a></code>, <code><a href=#the-select-element>select</a></code>, <code><a href=#the-style-element>style</a></code>,
<code><a href=#the-summary-element>summary</a></code>, <code><a href=#the-table-element>table</a></code>, <code><a href=#the-tbody-element>tbody</a></code>,
<code><a href=#the-td-element>td</a></code>, <code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-tfoot-element>tfoot</a></code>,
<code><a href=#the-th-element>th</a></code>, <code><a href=#the-thead-element>thead</a></code>, <code><a href=#the-title-element-0>title</a></code>,
<code><a href=#the-tr-element>tr</a></code>, <code><a href=#the-ul-element>ul</a></code>, <code><a href=#the-wbr-element>wbr</a></code>,
<code><a href=#xmp>xmp</a></code>, and SVG's <code>foreignObject</code>.</dd>

<dt><dfn id=formatting>Formatting</dfn></dt>
<dd><p>The following HTML elements are those that end up in the
Expand Down Expand Up @@ -74872,8 +74872,9 @@ document.body.appendChild(text);
<!-- the normal ones -->
<dt>A start tag whose tag name is one of: "address", "article",
"aside", "blockquote", "center", <!--v2DATAGRID"datagrid",-->
"details", "dir", "div", "dl", "fieldset", "figure", "footer",
"header", "hgroup", "menu", "nav", "ol", "p", "section", "ul"</dt>
"details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
"footer", "header", "hgroup", "menu", "nav", "ol", "p", "section",
"summary", "ul"</dt>
<dd>

<!-- As of May 2008 this doesn't match any browser exactly, but is
Expand Down Expand Up @@ -75094,8 +75095,9 @@ document.body.appendChild(text);
<dt>An end tag whose tag name is one of: "address", "article",
"aside", "blockquote", "button", "center",
<!--v2DATAGRID"datagrid",--> "details", "dir", "div", "dl",
"fieldset", "figure", "footer", "header", "hgroup", "listing",
"menu", "nav", "ol", "pre", "section", "ul"</dt>
"fieldset", "figcaption", "figure", "footer", "header", "hgroup",
"listing", "menu", "nav", "ol", "pre", "section", "summary",
"ul"</dt>
<dd>

<p>If the <a href=#stack-of-open-elements>stack of open elements</a> does not <a href=#has-an-element-in-scope title="has an element in scope">have an element in scope</a>
Expand Down
52 changes: 27 additions & 25 deletions source
View file
Expand Up @@ -89295,27 +89295,27 @@ interface <dfn>SQLTransactionSync</dfn> {
<code>command</code>, <!--v2DDATAGRID <code>datagrid</code>,-->
<code>dd</code>, <code>details</code>, <code>dir</code>,
<code>div</code>, <code>dl</code>, <code>dt</code>,
<code>embed</code>, <code>fieldset</code>, <code>figure</code>,
<code>footer</code>, <code>form</code>, <code>frame</code>,
<code>frameset</code>, <code>h1</code>, <code>h2</code>,
<code>h3</code>, <code>h4</code>, <code>h5</code>, <code>h6</code>,
<code>head</code>, <code>header</code>, <code>hgroup</code>,
<code>hr</code>, <code>html</code>, <code>iframe</code>, <!--
<code>image</code>, (commented out because this isn't an element
that can end up on the stack, so it doesn't matter) -->
<code>img</code>, <code>input</code>, <code>isindex</code>,
<code>li</code>, <code>link</code>, <code>listing</code>,
<code>marquee</code>, <code>menu</code>, <code>meta</code>,
<code>nav</code>, <code>noembed</code>, <code>noframes</code>,
<code>noscript</code>, <code>object</code>, <code>ol</code>,
<code>p</code>, <code>param</code>, <code>plaintext</code>,
<code>pre</code>, <code>script</code>, <code>section</code>,
<code>select</code>, <code>style</code>, <code>table</code>,
<code>tbody</code>, <code>td</code>, <code>textarea</code>,
<code>tfoot</code>, <code>th</code>, <code>thead</code>,
<code>title</code>, <code>tr</code>, <code>ul</code>,
<code>wbr</code>, <code>xmp</code>, and SVG's
<code>foreignObject</code>.</p></dd>
<code>embed</code>, <code>fieldset</code>, <code>figcaption</code>,
<code>figure</code>, <code>footer</code>, <code>form</code>,
<code>frame</code>, <code>frameset</code>, <code>h1</code>,
<code>h2</code>, <code>h3</code>, <code>h4</code>, <code>h5</code>,
<code>h6</code>, <code>head</code>, <code>header</code>,
<code>hgroup</code>, <code>hr</code>, <code>html</code>,
<code>iframe</code>, <!-- <code>image</code>, (commented out
because this isn't an element that can end up on the stack, so it
doesn't matter) --> <code>img</code>, <code>input</code>,
<code>isindex</code>, <code>li</code>, <code>link</code>,
<code>listing</code>, <code>marquee</code>, <code>menu</code>,
<code>meta</code>, <code>nav</code>, <code>noembed</code>,
<code>noframes</code>, <code>noscript</code>, <code>object</code>,
<code>ol</code>, <code>p</code>, <code>param</code>,
<code>plaintext</code>, <code>pre</code>, <code>script</code>,
<code>section</code>, <code>select</code>, <code>style</code>,
<code>summary</code>, <code>table</code>, <code>tbody</code>,
<code>td</code>, <code>textarea</code>, <code>tfoot</code>,
<code>th</code>, <code>thead</code>, <code>title</code>,
<code>tr</code>, <code>ul</code>, <code>wbr</code>,
<code>xmp</code>, and SVG's <code>foreignObject</code>.</p></dd>

<dt><dfn>Formatting</dfn></dt>
<dd><p>The following HTML elements are those that end up in the
Expand Down Expand Up @@ -93231,8 +93231,9 @@ document.body.appendChild(text);
<!-- the normal ones -->
<dt>A start tag whose tag name is one of: "address", "article",
"aside", "blockquote", "center", <!--v2DATAGRID"datagrid",-->
"details", "dir", "div", "dl", "fieldset", "figure", "footer",
"header", "hgroup", "menu", "nav", "ol", "p", "section", "ul"</dt>
"details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
"footer", "header", "hgroup", "menu", "nav", "ol", "p", "section",
"summary", "ul"</dt>
<dd>

<!-- As of May 2008 this doesn't match any browser exactly, but is
Expand Down Expand Up @@ -93461,8 +93462,9 @@ document.body.appendChild(text);
<dt>An end tag whose tag name is one of: "address", "article",
"aside", "blockquote", "button", "center",
<!--v2DATAGRID"datagrid",--> "details", "dir", "div", "dl",
"fieldset", "figure", "footer", "header", "hgroup", "listing",
"menu", "nav", "ol", "pre", "section", "ul"</dt>
"fieldset", "figcaption", "figure", "footer", "header", "hgroup",
"listing", "menu", "nav", "ol", "pre", "section", "summary",
"ul"</dt>
<dd>

<p>If the <span>stack of open elements</span> does not <span
Expand Down

0 comments on commit 30a2bdc

Please sign in to comment.