W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2010

html5/spec parsing.html,1.9,1.10 spec.html,1.1060,1.1061 tokenization.html,1.14,1.15

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 14 Jul 2010 22:07:22 +0000
To: public-html-commits@w3.org
Message-Id: <E1OZA6s-0001Vh-9e@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv5108

Modified Files:
	parsing.html spec.html tokenization.html 
Log Message:
Make <figcaption> and <summary> act like other elements that have 'flow content' content models. (whatwg r5166)

[updated by splitter]


Index: parsing.html
===================================================================
RCS file: /sources/public/html5/spec/parsing.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- parsing.html	14 Jul 2010 21:16:58 -0000	1.9
+++ parsing.html	14 Jul 2010 22:07:20 -0000	1.10
@@ -1412,27 +1412,27 @@
    <code><a href="interactive-elements.html#the-command">command</a></code>, <!--v2DDATAGRID <code>datagrid</code>,-->
    <code><a href="grouping-content.html#the-dd-element">dd</a></code>, <code><a href="interactive-elements.html#the-details-element">details</a></code>, <code><a href="obsolete.html#dir">dir</a></code>,
    <code><a href="grouping-content.html#the-div-element">div</a></code>, <code><a href="grouping-content.html#the-dl-element">dl</a></code>, <code><a href="grouping-content.html#the-dt-element">dt</a></code>,
-   <code><a href="the-iframe-element.html#the-embed-element">embed</a></code>, <code><a href="forms.html#the-fieldset-element">fieldset</a></code>, <code><a href="grouping-content.html#the-figure-element">figure</a></code>,
-   <code><a href="sections.html#the-footer-element">footer</a></code>, <code><a href="forms.html#the-form-element">form</a></code>, <code><a href="obsolete.html#frame">frame</a></code>,
-   <code><a href="obsolete.html#frameset">frameset</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code>,
-   <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code>,
-   <code><a href="semantics.html#the-head-element-0">head</a></code>, <code><a href="sections.html#the-header-element">header</a></code>, <code><a href="sections.html#the-hgroup-element">hgroup</a></code>,
-   <code><a href="grouping-content.html#the-hr-element">hr</a></code>, <code><a href="semantics.html#the-html-element-0">html</a></code>, <code><a href="the-iframe-element.html#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="embedded-content-1.html#the-img-element">img</a></code>, <code><a href="the-input-element.html#the-input-element">input</a></code>, <code><a href="obsolete.html#isindex-0">isindex</a></code>,
-   <code><a href="grouping-content.html#the-li-element">li</a></code>, <code><a href="semantics.html#the-link-element">link</a></code>, <code><a href="obsolete.html#listing">listing</a></code>,
-   <code><a href="obsolete.html#the-marquee-element">marquee</a></code>, <code><a href="interactive-elements.html#menus">menu</a></code>, <code><a href="semantics.html#meta">meta</a></code>,
-   <code><a href="sections.html#the-nav-element">nav</a></code>, <code><a href="obsolete.html#noembed">noembed</a></code>, <code><a href="obsolete.html#noframes">noframes</a></code>,
-   <code><a href="scripting-1.html#the-noscript-element">noscript</a></code>, <code><a href="the-iframe-element.html#the-object-element">object</a></code>, <code><a href="grouping-content.html#the-ol-element">ol</a></code>,
-   <code><a href="grouping-content.html#the-p-element">p</a></code>, <code><a href="the-iframe-element.html#the-param-element">param</a></code>, <code><a href="obsolete.html#plaintext">plaintext</a></code>,
-   <code><a href="grouping-content.html#the-pre-element">pre</a></code>, <code><a href="scripting-1.html#script">script</a></code>, <code><a href="sections.html#the-section-element">section</a></code>,
-   <code><a href="the-button-element.html#the-select-element">select</a></code>, <code><a href="semantics.html#the-style-element">style</a></code>, <code><a href="tabular-data.html#the-table-element">table</a></code>,
-   <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>, <code><a href="tabular-data.html#the-td-element">td</a></code>, <code><a href="the-button-element.html#the-textarea-element">textarea</a></code>,
-   <code><a href="tabular-data.html#the-tfoot-element">tfoot</a></code>, <code><a href="tabular-data.html#the-th-element">th</a></code>, <code><a href="tabular-data.html#the-thead-element">thead</a></code>,
-   <code><a href="semantics.html#the-title-element-0">title</a></code>, <code><a href="tabular-data.html#the-tr-element">tr</a></code>, <code><a href="grouping-content.html#the-ul-element">ul</a></code>,
-   <code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code>, <code><a href="obsolete.html#xmp">xmp</a></code>, and SVG's
-   <code>foreignObject</code>.</p></dd>
+   <code><a href="the-iframe-element.html#the-embed-element">embed</a></code>, <code><a href="forms.html#the-fieldset-element">fieldset</a></code>, <code><a href="grouping-content.html#the-figcaption-element">figcaption</a></code>,
+   <code><a href="grouping-content.html#the-figure-element">figure</a></code>, <code><a href="sections.html#the-footer-element">footer</a></code>, <code><a href="forms.html#the-form-element">form</a></code>,
+   <code><a href="obsolete.html#frame">frame</a></code>, <code><a href="obsolete.html#frameset">frameset</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code>,
+   <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code>, <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code>,
+   <code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code>, <code><a href="semantics.html#the-head-element-0">head</a></code>, <code><a href="sections.html#the-header-element">header</a></code>,
+   <code><a href="sections.html#the-hgroup-element">hgroup</a></code>, <code><a href="grouping-content.html#the-hr-element">hr</a></code>, <code><a href="semantics.html#the-html-element-0">html</a></code>,
+   <code><a href="the-iframe-element.html#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="embedded-content-1.html#the-img-element">img</a></code>, <code><a href="the-input-element.html#the-input-element">input</a></code>,
+   <code><a href="obsolete.html#isindex-0">isindex</a></code>, <code><a href="grouping-content.html#the-li-element">li</a></code>, <code><a href="semantics.html#the-link-element">link</a></code>,
+   <code><a href="obsolete.html#listing">listing</a></code>, <code><a href="obsolete.html#the-marquee-element">marquee</a></code>, <code><a href="interactive-elements.html#menus">menu</a></code>,
+   <code><a href="semantics.html#meta">meta</a></code>, <code><a href="sections.html#the-nav-element">nav</a></code>, <code><a href="obsolete.html#noembed">noembed</a></code>,
+   <code><a href="obsolete.html#noframes">noframes</a></code>, <code><a href="scripting-1.html#the-noscript-element">noscript</a></code>, <code><a href="the-iframe-element.html#the-object-element">object</a></code>,
+   <code><a href="grouping-content.html#the-ol-element">ol</a></code>, <code><a href="grouping-content.html#the-p-element">p</a></code>, <code><a href="the-iframe-element.html#the-param-element">param</a></code>,
+   <code><a href="obsolete.html#plaintext">plaintext</a></code>, <code><a href="grouping-content.html#the-pre-element">pre</a></code>, <code><a href="scripting-1.html#script">script</a></code>,
+   <code><a href="sections.html#the-section-element">section</a></code>, <code><a href="the-button-element.html#the-select-element">select</a></code>, <code><a href="semantics.html#the-style-element">style</a></code>,
+   <code><a href="interactive-elements.html#the-summary-element">summary</a></code>, <code><a href="tabular-data.html#the-table-element">table</a></code>, <code><a href="tabular-data.html#the-tbody-element">tbody</a></code>,
+   <code><a href="tabular-data.html#the-td-element">td</a></code>, <code><a href="the-button-element.html#the-textarea-element">textarea</a></code>, <code><a href="tabular-data.html#the-tfoot-element">tfoot</a></code>,
+   <code><a href="tabular-data.html#the-th-element">th</a></code>, <code><a href="tabular-data.html#the-thead-element">thead</a></code>, <code><a href="semantics.html#the-title-element-0">title</a></code>,
+   <code><a href="tabular-data.html#the-tr-element">tr</a></code>, <code><a href="grouping-content.html#the-ul-element">ul</a></code>, <code><a href="text-level-semantics.html#the-wbr-element">wbr</a></code>,
+   <code><a href="obsolete.html#xmp">xmp</a></code>, and SVG's <code>foreignObject</code>.</p></dd>
 
    <dt><dfn id="formatting">Formatting</dfn></dt>
    <dd><p>The following HTML elements are those that end up in the

Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/spec/tokenization.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tokenization.html	14 Jul 2010 21:16:58 -0000	1.14
+++ tokenization.html	14 Jul 2010 22:07:20 -0000	1.15
@@ -3523,8 +3523,9 @@
    <!-- 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
@@ -3745,8 +3746,9 @@
    <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="parsing.html#stack-of-open-elements">stack of open elements</a> does not <a href="parsing.html#has-an-element-in-scope" title="has an element in scope">have an element in scope</a>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1060
retrieving revision 1.1061
diff -u -d -r1.1060 -r1.1061
--- spec.html	14 Jul 2010 21:16:58 -0000	1.1060
+++ spec.html	14 Jul 2010 22:07:20 -0000	1.1061
@@ -333,7 +333,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">author edition</a>.
-This is revision 1.4121.
+This is revision 1.4122.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2010 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Wednesday, 14 July 2010 22:07:24 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 14 July 2010 22:07:25 GMT