html5/spec content-models.html,1.55,1.56 spec.html,1.1427,1.1428

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv12340

Modified Files:
	content-models.html spec.html 
Log Message:
apply wg decision (whatwg r5981)

[updated by splitter]


Index: content-models.html
===================================================================
RCS file: /sources/public/html5/spec/content-models.html,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- content-models.html	8 Apr 2011 20:46:56 -0000	1.55
+++ content-models.html	8 Apr 2011 23:46:39 -0000	1.56
@@ -1043,41 +1043,44 @@
   combined.</span></p><table id="table-aria-strong"><thead><tr><th>Language feature
      </th><th>Strong native semantics <span class="impl">and implied ARIA semantics</span>
 
-   </th></tr></thead><tbody><tr><td><code><a href="text-level-semantics.html#the-a-element">a</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
-     </td><td><code title="attr-aria-role-link">link</code> role
-
-    </td></tr><tr><td><code><a href="the-map-element.html#the-area-element">area</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
+   </th></tr></thead><tbody><tr><td><code><a href="the-map-element.html#the-area-element">area</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
      </td><td><code title="attr-aria-role-link">link</code> role
+     <!--!--><!-- (this should really be the same as <a>) -->
 
     </td></tr><tr><td><code><a href="semantics.html#the-base-element">base</a></code> element
      </td><td>No role
 
-    </td></tr><tr><td><code><a href="the-button-element.html#the-button-element">button</a></code> element
-     </td><td><code title="attr-aria-role-button">button</code> role
-
     </td></tr><tr><td><code><a href="the-button-element.html#the-datalist-element">datalist</a></code> element
      </td><td><code title="attr-aria-role-listbox">listbox</code> role, with the <code title="attr-aria-multiselectable">aria-multiselectable</code> property set to "false"
 
     </td></tr><tr><td><code><a href="interactive-elements.html#the-details-element">details</a></code> element
      </td><td><code title="attr-aria-expanded">aria-expanded</code> state set to "true" if the element's <code title="attr-details-open"><a href="interactive-elements.html#attr-details-open">open</a></code> attribute is present, and set to "false" otherwise
 
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+<!--!--><!--(these are in the next table at the moment)--><!--
+    <tr>
+     <td><code>h1</code> element that does not have an <code>hgroup</code> ancestor
+     <td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <span>outline depth</span>
 
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+    <tr>
+     <td><code>h2</code> element that does not have an <code>hgroup</code> ancestor
+     <td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <span>outline depth</span>
 
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+    <tr>
+     <td><code>h3</code> element that does not have an <code>hgroup</code> ancestor
+     <td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <span>outline depth</span>
 
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+    <tr>
+     <td><code>h4</code> element that does not have an <code>hgroup</code> ancestor
+     <td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <span>outline depth</span>
 
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+    <tr>
+     <td><code>h5</code> element that does not have an <code>hgroup</code> ancestor
+     <td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <span>outline depth</span>
 
-    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
-     </td><td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <a href="sections.html#outline-depth">outline depth</a>
+    <tr>
+     <td><code>h6</code> element that does not have an <code>hgroup</code> ancestor
+     <td><code title="attr-aria-role-heading">heading</code> role, with the <code title="attr-aria-level">aria-level</code> property set to the element's <span>outline depth</span>
+-->
 
     </td></tr><tr><td><code><a href="semantics.html#the-head-element-0">head</a></code> element
      </td><td>No role
@@ -1094,9 +1097,6 @@
     </td></tr><tr><td><code><a href="embedded-content-1.html#the-img-element">img</a></code> element whose <code title="attr-img-alt"><a href="embedded-content-1.html#attr-img-alt">alt</a></code> attribute's value is empty
      </td><td><code title="attr-aria-role-presentation">presentation</code> role
 
-    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#button-state" title="attr-input-type-button">Button</a> state
-     </td><td><code title="attr-aria-role-button">button</code> role
-
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state
      </td><td><code title="attr-aria-checked">aria-checked</code> state set to "mixed" if the element's <code title="dom-input-indeterminate"><a href="the-input-element.html#dom-input-indeterminate">indeterminate</a></code> IDL attribute is true, or "true" if the element's <a href="association-of-controls-and-forms.html#concept-fe-checked" title="concept-fe-checked">checkedness</a> is true, or "false" otherwise
 
@@ -1121,9 +1121,6 @@
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="states-of-the-type-attribute.html#hidden-state" title="attr-input-type-hidden">Hidden</a> state
      </td><td>No role
 
-    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state
-     </td><td><code title="attr-aria-role-button">button</code> role
-
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="states-of-the-type-attribute.html#month-state" title="attr-input-type-month">Month</a> state
      </td><td>No role, with the <code title="title-aria-readonly">aria-readonly</code> state set to "true" if the element has a <code title="attr-input-readonly"><a href="common-input-element-attributes.html#attr-input-readonly">readonly</a></code> attribute
 
@@ -1272,7 +1269,11 @@
      </th><th>Default implied ARIA semantic
      </th><th>Restrictions
 
-   </th></tr></thead><tbody><tr><td><code><a href="sections.html#the-address-element">address</a></code> element
+   </th></tr></thead><tbody><tr><td><code><a href="text-level-semantics.html#the-a-element">a</a></code> element that creates a <a href="links.html#hyperlink">hyperlink</a>
+     </td><td><code title="attr-aria-role-link">link</code> role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code>, <code title="attr-aria-role-button">button</code><!--!-->, <code title="attr-aria-role-checkbox">checkbox</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-tab">tab</code><!--!-->, or <code title="attr-aria-role-treeitem">treeitem</code><!--!-->
+
+    </td></tr><tr><td><code><a href="sections.html#the-address-element">address</a></code> element
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-contentinfo">contentinfo</code>
 
@@ -1288,6 +1289,10 @@
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-application">application</code>
 
+    </td></tr><tr><td><code><a href="the-button-element.html#the-button-element">button</a></code> element
+     </td><td><code title="attr-aria-role-button">button</code> role
+     </td><td>Role must be either <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-radio">radio</code><!--!-->
+
     </td></tr><tr><td><code><a href="interactive-elements.html#the-details-element">details</a></code> element
      </td><td><code title="attr-aria-role-group">group</code> role
      </td><td>Role must be a role that supports <code title="attr-aria-expanded">aria-expanded</code>
@@ -1300,6 +1305,32 @@
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-contentinfo">contentinfo</code>
 
+<!--!--><!--(none of the following six rows make any sense)-->
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h1</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td>No role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code><!--!-->, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-tab">tab</code><!--!-->, or <code title="attr-aria-role-treeitem">treeitem</code><!--!-->
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h2</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td>No role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code><!--!-->, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-tab">tab</code><!--!-->, or <code title="attr-aria-role-treeitem">treeitem</code><!--!-->
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h3</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td>No role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code><!--!-->, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-tab">tab</code><!--!-->, or <code title="attr-aria-role-treeitem">treeitem</code><!--!-->
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h4</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td>No role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code><!--!-->, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-tab">tab</code><!--!-->, or <code title="attr-aria-role-treeitem">treeitem</code><!--!-->
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h5</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td>No role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code><!--!-->, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-tab">tab</code><!--!-->, or <code title="attr-aria-role-treeitem">treeitem</code><!--!-->
+
+    </td></tr><tr><td><code><a href="sections.html#the-h1-h2-h3-h4-h5-and-h6-elements">h6</a></code> element that does not have an <code><a href="sections.html#the-hgroup-element">hgroup</a></code> ancestor
+     </td><td>No role
+     </td><td>Role must be either <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code><!--!-->, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-tab">tab</code><!--!-->, or <code title="attr-aria-role-treeitem">treeitem</code><!--!-->
+<!--!--><!--(none of the preceding six rows make any sense)-->
+
     </td></tr><tr><td><code><a href="sections.html#the-header-element">header</a></code> element
      </td><td>No role
      </td><td>If specified, role must be <code title="attr-aria-role-banner">banner</code>
@@ -1312,10 +1343,22 @@
      </td><td><code title="attr-aria-role-img">img</code> role
      </td><td>No restrictions
 
+    </td></tr><tr><!--!--><!--(there's no reason to convey <img> elements with alt="" text as images to an AT)--><td><code><a href="embedded-content-1.html#the-img-element">img</a></code> element whose <code title="attr-img-alt"><a href="embedded-content-1.html#attr-img-alt">alt</a></code> attribute's value is present and not empty
+     </td><td><code title="attr-aria-role-img">img</code> role
+     </td><td>No restrictions
+
+    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#button-state" title="attr-input-type-button">Button</a> state
+     </td><td><code title="attr-aria-role-button">button</code> role
+     </td><td>Role must be either <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-radio">radio</code><!--!-->
+
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#checkbox-state" title="attr-input-type-checkbox">Checkbox</a> state
      </td><td><code title="attr-aria-role-checkbox">checkbox</code> role
      </td><td>Role must be either <code title="attr-aria-role-checkbox">checkbox</code> or <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code>
 
+    </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#image-button-state" title="attr-input-type-image">Image Button</a> state
+     </td><td><code title="attr-aria-role-button">button</code> role
+     </td><td>Role must be either <code title="attr-aria-role-button">button</code>, <code title="attr-aria-role-link">link</code><!--!-->, <code title="attr-aria-role-menuitem">menuitem</code>, <code title="attr-aria-role-menuitemcheckbox">menuitemcheckbox</code><!--!-->, <code title="attr-aria-role-menuitemradio">menuitemradio</code><!--!-->, <code title="attr-aria-role-radio">radio</code><!--!-->
+
     </td></tr><tr><td><code><a href="the-input-element.html#the-input-element">input</a></code> element with a <code title="attr-input-type"><a href="the-input-element.html#attr-input-type">type</a></code> attribute in the <a href="number-state.html#radio-button-state" title="attr-input-type-radio">Radio Button</a> state
      </td><td><code title="attr-aria-role-radio">radio</code> role
      </td><td>Role must be either <code title="attr-aria-role-radio">radio</code> or <code title="attr-aria-role-menuitemradio">menuitemradio</code>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1427
retrieving revision 1.1428
diff -u -d -r1.1427 -r1.1428
--- spec.html	8 Apr 2011 22:46:38 -0000	1.1427
+++ spec.html	8 Apr 2011 23:46:39 -0000	1.1428
@@ -371,7 +371,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">web developer edition</a>.
-This is revision 1.4808.
+This is revision 1.4809.
    </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 Friday, 8 April 2011 23:46:43 UTC