W3C home > Mailing lists > Public > public-html-commits@w3.org > May 2009

html5/markup Overview.html,1.306,1.307 button.button.html,1.4,1.5 button.reset.html,1.4,1.5 button.submit.html,1.4,1.5 common-models.html,1.6,1.7 embed.html,1.5,1.6 map.html,1.4,1.5 schema.html,1.96,1.97 schema.rnc,1.83,1.84 shared-attributes.html,1.3,1.4 spec.html,1.15,1.16

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 30 May 2009 11:38:58 +0000
To: public-html-commits@w3.org
Message-Id: <E1MAMtu-0001vr-9N@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv7302

Modified Files:
	Overview.html button.button.html button.reset.html 
	button.submit.html common-models.html embed.html map.html 
	schema.html schema.rnc shared-attributes.html spec.html 
Log Message:
h:tml; pull down upstream schema change that makes <map> content model transparent; also, locally refine handling of value attribute on button elements so that it's not a shared attribute pattern any longer


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- Overview.html	9 May 2009 08:32:59 -0000	1.306
+++ Overview.html	30 May 2009 11:38:55 -0000	1.307
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>9 May 2009</em>
+<h2>Editor&#8217;s Draft <em>30 May 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 9 May 2009 Editor&#8217;s Draft of 
+        This document is the 30 May 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- schema.html	8 May 2009 07:48:07 -0000	1.96
+++ schema.html	30 May 2009 11:38:55 -0000	1.97
@@ -173,6 +173,7 @@
   | <a class='ref' href='#embed.elem'>embed.elem</a>
   | <a class='ref' href='#object.elem.phrasing'>object.elem.phrasing</a>
   | <a class='ref' href='#iframe.elem'>iframe.elem</a>
+  | <a class='ref' href='#map.elem.phrasing'>map.elem.phrasing</a>
   | <a class='ref' href='#area.elem'>area.elem</a>
   | <a class='ref' href='#script.elem'>script.elem</a>
   | <a class='ref' href='#noscript.elem.phrasing'>noscript.elem.phrasing</a>
@@ -217,7 +218,7 @@
   | <a class='ref' href='#address.elem'>address.elem</a>
   | <a class='ref' href='#blockquote.elem'>blockquote.elem</a>
   | <a class='ref' href='#object.elem.flow'>object.elem.flow</a>
-  | <a class='ref' href='#map.elem'>map.elem</a>
+  | <a class='ref' href='#map.elem.flow'>map.elem.flow</a>
   | <a class='ref' href='#noscript.elem.flow'>noscript.elem.flow</a>
   | <a class='ref' href='#section.elem'>section.elem</a>
   | <a class='ref' href='#nav.elem'>nav.elem</a>
@@ -559,7 +560,7 @@
   <div class='patternname' id='the-common.data.sizes'><a href='#the-common.data.sizes'>common.data.sizes</a> =</div>
   <span class='pattern' id='common.data.sizes'><span class='comment'># list { w:sizes }</span>
   list{
-    xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }
+    xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }*
   }</span>
 </div>
 <div class='define' id='common.data.mimetype-define'>
@@ -2283,12 +2284,23 @@
                        | onsubmit
                        | onunload
                        | role
+                       | aria-atomic
+                       | aria-busy
+                       | aria-controls
                        | aria-describedby
+                       | aria-disabled
                        | aria-dropeffect
                        | aria-flowto
-                       | aria-grab
+                       | aria-grabbed
                        | aria-haspopup
+                       | aria-hidden
+                       | aria-invalid
+                       | aria-label
                        | aria-labelledby
+                       | aria-live
+                       | aria-owns
+                       | aria-relevant
+                       | aria-required
                        | about
                        | property
                        | resource
@@ -2535,17 +2547,27 @@
   
   &amp; empty</span>
 </div>
-<div class='define' id='map.elem-define'>
+<div class='define' id='map.elem.flow-define'>
 
 <span class='comment'>## </span>
 <span class='comment'>## Image Maps</span>
 
 <span class='comment'>## Map Definition: &lt;map></span>
-  <div class='patternname' id='the-map.elem'><a href='#the-map.elem'>map.elem</a> =</div>
-  <span class='pattern' id='map.elem'><span class='type'>element </span>
+  <div class='patternname' id='the-map.elem.flow'><a href='#the-map.elem.flow'>map.elem.flow</a> =</div>
+  <span class='pattern' id='map.elem.flow'><span class='type'>element </span>
   <span class='name'>map</span>
    {<span class='model'>
-      <a class='ref' href='#map.inner'>map.inner</a>
+      <a class='ref' href='#map.inner.flow'>map.inner.flow</a>
+      &amp; <a class='ref' href='#map.attrs'>map.attrs</a>
+    </span>}
+  </span>
+</div>
+<div class='define' id='map.elem.phrasing-define'>
+  <div class='patternname' id='the-map.elem.phrasing'><a href='#the-map.elem.phrasing'>map.elem.phrasing</a> =</div>
+  <span class='pattern' id='map.elem.phrasing'><span class='type'>element </span>
+  <span class='name'>map</span>
+   {<span class='model'>
+      <a class='ref' href='#map.inner.phrasing'>map.inner.phrasing</a>
       &amp; <a class='ref' href='#map.attrs'>map.attrs</a>
     </span>}
   </span>
@@ -2564,9 +2586,13 @@
     </span>}
   </span>
 </div>
-<div class='define' id='map.inner-define'>
-  <div class='patternname' id='the-map.inner'><a href='#the-map.inner'>map.inner</a> =</div>
-  <span class='pattern' id='map.inner'><a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
+<div class='define' id='map.inner.flow-define'>
+  <div class='patternname' id='the-map.inner.flow'><a href='#the-map.inner.flow'>map.inner.flow</a> =</div>
+  <span class='pattern' id='map.inner.flow'><a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
+</div>
+<div class='define' id='map.inner.phrasing-define'>
+  <div class='patternname' id='the-map.inner.phrasing'><a href='#the-map.inner.phrasing'>map.inner.phrasing</a> =</div>
+  <span class='pattern' id='map.inner.phrasing'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
 <div class='define' id='area.elem-define'>
 
@@ -4634,16 +4660,9 @@
   <span class='pattern' id='select.inner'><a class='ref' href='#optgroup.elem'>optgroup.elem</a>*
   &amp; <a class='ref' href='#option.elem'>option.elem</a>*</span>
 </div>
-<div class='define' id='button.attrs.value-define'>
+<div class='define' id='button.inner-define'>
 
 <span class='comment'>## Shared Definitions for Complex Button</span>
-  <div class='patternname' id='the-button.attrs.value'><a href='#the-button.attrs.value'>button.attrs.value</a> =</div>
-  <span class='pattern' id='button.attrs.value'><span class='type'>attribute </span>
-  <span class='name'>value</span>
-   {<span class='model'> string </span>}
-  </span>
-</div>
-<div class='define' id='button.inner-define'>
   <div class='patternname' id='the-button.inner'><a href='#the-button.inner'>button.inner</a> =</div>
   <span class='pattern' id='button.inner'><a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
 </div>
@@ -4664,7 +4683,7 @@
   <span class='pattern' id='button.submit.attrs'>(<a class='ref' href='#common.attrs'>common.attrs</a>
    &amp; <a class='ref' href='#common-form.attrs'>common-form.attrs</a>
    &amp; <a class='ref' href='#button.submit.attrs.type'>button.submit.attrs.type</a>?
-   &amp; <a class='ref' href='#button.attrs.value'>button.attrs.value</a>?)
+   &amp; <a class='ref' href='#button.submit.attrs.value'>button.submit.attrs.value</a>?)
   >> <span class='annotation'>## a:documentation "Complex Submit Button: &lt;button type='submit'>, extensions"</span>
 
   &amp; (<a class='ref' href='#shared-form.attrs.formaction'>shared-form.attrs.formaction</a>?
@@ -4681,6 +4700,13 @@
    {<span class='model'> d:string "submit" </span>}
   </span>
 </div>
+<div class='define' id='button.submit.attrs.value-define'>
+  <div class='patternname' id='the-button.submit.attrs.value'><a href='#the-button.submit.attrs.value'>button.submit.attrs.value</a> =</div>
+  <span class='pattern' id='button.submit.attrs.value'><span class='type'>attribute </span>
+  <span class='name'>value</span>
+   {<span class='model'> string </span>}
+  </span>
+</div>
 <div class='define' id='button.elem-define'>
   <div class='patternname' id='the-button.elem'><a href='#the-button.elem'>button.elem</a> =</div>
   <span class='pattern' id='button.elem'><a class='ref' href='#button.submit.elem'>button.submit.elem</a>
@@ -4704,7 +4730,7 @@
   <span class='pattern' id='button.reset.attrs'>(<a class='ref' href='#common.attrs'>common.attrs</a>
    &amp; <a class='ref' href='#common-form.attrs'>common-form.attrs</a>
    &amp; <a class='ref' href='#button.reset.attrs.type'>button.reset.attrs.type</a>
-   &amp; <a class='ref' href='#button.attrs.value'>button.attrs.value</a>?)
+   &amp; <a class='ref' href='#button.reset.attrs.value'>button.reset.attrs.value</a>?)
   >> <span class='annotation'>## a:documentation "Complex Reset Button: &lt;button type='reset'>, extensions"</span>
 
   &amp; <a class='ref' href='#shared-form.attrs.autofocus'>shared-form.attrs.autofocus</a>?</span>
@@ -4716,6 +4742,13 @@
    {<span class='model'> d:string "reset" </span>}
   </span>
 </div>
+<div class='define' id='button.reset.attrs.value-define'>
+  <div class='patternname' id='the-button.reset.attrs.value'><a href='#the-button.reset.attrs.value'>button.reset.attrs.value</a> =</div>
+  <span class='pattern' id='button.reset.attrs.value'><span class='type'>attribute </span>
+  <span class='name'>value</span>
+   {<span class='model'> string </span>}
+  </span>
+</div>
 <div class='define' id='button.button.elem-define'>
 
 <span class='comment'>## Complex Push Button: &lt;button type='button'></span>
@@ -4733,7 +4766,7 @@
   <span class='pattern' id='button.button.attrs'>(<a class='ref' href='#common.attrs'>common.attrs</a>
    &amp; <a class='ref' href='#common-form.attrs'>common-form.attrs</a>
    &amp; <a class='ref' href='#button.button.attrs.type'>button.button.attrs.type</a>
-   &amp; <a class='ref' href='#button.attrs.value'>button.attrs.value</a>?)
+   &amp; <a class='ref' href='#button.button.attrs.value'>button.button.attrs.value</a>?)
   >> <span class='annotation'>## a:documentation "Complex Push Button: &lt;button type='button'>, extensions"</span>
 
   &amp; <a class='ref' href='#shared-form.attrs.autofocus'>shared-form.attrs.autofocus</a>?</span>
@@ -4745,6 +4778,13 @@
    {<span class='model'> d:string "button" </span>}
   </span>
 </div>
+<div class='define' id='button.button.attrs.value-define'>
+  <div class='patternname' id='the-button.button.attrs.value'><a href='#the-button.button.attrs.value'>button.button.attrs.value</a> =</div>
+  <span class='pattern' id='button.button.attrs.value'><span class='type'>attribute </span>
+  <span class='name'>value</span>
+   {<span class='model'> string </span>}
+  </span>
+</div>
 <div class='define' id='form.elem-define'>
 
 <span class='comment'>## Form: &lt;form></span>

Index: embed.html
===================================================================
RCS file: /sources/public/html5/markup/embed.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- embed.html	6 May 2009 10:26:29 -0000	1.5
+++ embed.html	30 May 2009 11:38:55 -0000	1.6
@@ -84,12 +84,23 @@
                        | onsubmit
                        | onunload
                        | role
+                       | aria-atomic
+                       | aria-busy
+                       | aria-controls
                        | aria-describedby
+                       | aria-disabled
                        | aria-dropeffect
                        | aria-flowto
-                       | aria-grab
+                       | aria-grabbed
                        | aria-haspopup
+                       | aria-hidden
+                       | aria-invalid
+                       | aria-label
                        | aria-labelledby
+                       | aria-live
+                       | aria-owns
+                       | aria-relevant
+                       | aria-required
                        | about
                        | property
                        | resource

Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- common-models.html	3 May 2009 15:59:40 -0000	1.6
+++ common-models.html	30 May 2009 11:38:55 -0000	1.7
@@ -54,7 +54,7 @@
   | <a class="ref" href="address.html#address">address</a>
   | <a class="ref" href="blockquote.html#blockquote">blockquote</a>
   | <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a>
-  | <a class="ref" href="map.html#map">map</a>
+  | <a class="ref" href="map.html#map.elem.flow">map.elem.flow</a>
   | <a class="ref" href="noscript.html#noscript.elem.flow">noscript.elem.flow</a>
   | <a class="ref" href="section.html#section">section</a>
   | <a class="ref" href="nav.html#nav">nav</a>
@@ -123,6 +123,7 @@
   | <a class="ref" href="embed.html#embed">embed</a>
   | <a class="ref" href="object.html#object.elem.phrasing">object.elem.phrasing</a>
   | <a class="ref" href="iframe.html#iframe">iframe</a>
+  | <a class="ref" href="map.html#map.elem.phrasing">map.elem.phrasing</a>
   | <a class="ref" href="area.html#area">area</a>
   | <a class="ref" href="script.html#script">script</a>
   | <a class="ref" href="noscript.html#noscript.elem.phrasing">noscript.elem.phrasing</a>

Index: map.html
===================================================================
RCS file: /sources/public/html5/markup/map.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- map.html	3 May 2009 15:59:42 -0000	1.4
+++ map.html	30 May 2009 11:38:55 -0000	1.5
@@ -20,13 +20,20 @@
   </div>
       <div class="no-number no-toc" id="map-content">
         <h2 class="element-subhead">Content model <a class="hash" href="#map-content">#</a></h2>
-        <div class="content-models" id="map-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="map-mdl" href="map.html#map-mdl" class="element">map</a> = </span><span>
+        <dl class="content-models" id="map-mdls">
+        <dt class="content-model"><span class="element-pattern-name" id="map.elem.flow"><a class="hash" href="map.html#map.elem.flow"><span class="element">map</span>.elem.flow</a> = </span></dt>
+        <dd class="elem-mdl"><span>
       (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
-    </span></p>
-        </div>
+    </span></dd>
+        <dt class="content-model"><span class="element-pattern-name" id="map.elem.phrasing"><a class="hash" href="map.html#map.elem.phrasing"><span class="element">map</span>.elem.phrasing</a> = </span></dt>
+        <dd class="elem-mdl"><span>
+      (text
+  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
+      &amp; <a class="ref" href="map.html#map.attrs">map.attrs</a>
+    </span></dd>
+        </dl>
       </div><div class="no-number no-toc" id="map-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#map-attr-mdl">#</a></h2>
         <div class="attr-content-models">
@@ -64,6 +71,7 @@
       <div class="no-number no-toc" id="map-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#map-context">#</a></h2>
         <ul>
+        <li class="context-mdl"><a href="common-models.html#common.elem.phrasing">common.elem.phrasing</a></li>
         <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
       </div>
       <div class="no-number no-toc" id="map-display">

Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- schema.rnc	8 May 2009 07:48:09 -0000	1.83
+++ schema.rnc	30 May 2009 11:38:55 -0000	1.84
@@ -67,6 +67,7 @@
       | embed.elem
       | object.elem.phrasing
       | iframe.elem
+      | map.elem.phrasing
       | area.elem
       | script.elem
       | noscript.elem.phrasing
@@ -109,7 +110,7 @@
       | address.elem
       | blockquote.elem
       | object.elem.flow
-      | map.elem
+      | map.elem.flow
       | noscript.elem.flow
       | section.elem
       | nav.elem
@@ -270,7 +271,7 @@
     common.data.sizes =
       # list { w:sizes }
       list {
-        xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }
+        xsd:string { pattern = "[1-9][0-9]*x[1-9][0-9]*" }*
       }
     
     ## MIME types
@@ -825,12 +826,23 @@
                            | onsubmit
                            | onunload
                            | role
+                           | aria-atomic
+                           | aria-busy
+                           | aria-controls
                            | aria-describedby
+                           | aria-disabled
                            | aria-dropeffect
                            | aria-flowto
-                           | aria-grab
+                           | aria-grabbed
                            | aria-haspopup
+                           | aria-hidden
+                           | aria-invalid
+                           | aria-label
                            | aria-labelledby
+                           | aria-live
+                           | aria-owns
+                           | aria-relevant
+                           | aria-required
                            | about
                            | property
                            | resource
@@ -930,10 +942,12 @@
     ## Image Maps
     
     ## Map Definition: <map>
-    map.elem = element map { map.inner & map.attrs }
+    map.elem.flow = element map { map.inner.flow & map.attrs }
+    map.elem.phrasing = element map { map.inner.phrasing & map.attrs }
     map.attrs = common.attrs & map.attrs.name
     map.attrs.name = attribute name { common.data.name }
-    map.inner = common.inner.flow
+    map.inner.flow = common.inner.flow
+    map.inner.phrasing = common.inner.phrasing
     
     ## Map Area Definition: <area>
     area.elem = element area { empty & area.attrs }
@@ -1670,7 +1684,6 @@
     select.inner = optgroup.elem* & option.elem*
     
     ## Shared Definitions for Complex Button
-    button.attrs.value = attribute value { string }
     button.inner = common.inner.flow
     
     ## Complex Submit Button: <button type='submit'>
@@ -1680,7 +1693,7 @@
       (common.attrs
        & common-form.attrs
        & button.submit.attrs.type?
-       & button.attrs.value?)
+       & button.submit.attrs.value?)
       >> a:documentation [
            "Complex Submit Button: <button type='submit'>, extensions"
          ]
@@ -1691,6 +1704,7 @@
          & shared-form.attrs.formtarget?
          & shared-form.attrs.formnovalidate?)
     button.submit.attrs.type = attribute type { d:string "submit" }
+    button.submit.attrs.value = attribute value { string }
     button.elem =
       button.submit.elem | button.reset.elem | button.button.elem
     
@@ -1701,12 +1715,13 @@
       (common.attrs
        & common-form.attrs
        & button.reset.attrs.type
-       & button.attrs.value?)
+       & button.reset.attrs.value?)
       >> a:documentation [
            "Complex Reset Button: <button type='reset'>, extensions"
          ]
       & shared-form.attrs.autofocus?
     button.reset.attrs.type = attribute type { d:string "reset" }
+    button.reset.attrs.value = attribute value { string }
     
     ## Complex Push Button: <button type='button'>
     button.button.elem =
@@ -1715,12 +1730,13 @@
       (common.attrs
        & common-form.attrs
        & button.button.attrs.type
-       & button.attrs.value?)
+       & button.button.attrs.value?)
       >> a:documentation [
            "Complex Push Button: <button type='button'>, extensions"
          ]
       & shared-form.attrs.autofocus?
     button.button.attrs.type = attribute type { d:string "button" }
+    button.button.attrs.value = attribute value { string }
     
     ## Form: <form>
     form.elem = element form { form.inner & form.attrs }

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- spec.html	9 May 2009 14:58:58 -0000	1.15
+++ spec.html	30 May 2009 11:38:55 -0000	1.16
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>9 May 2009</em>
+<h2>Editor&#8217;s Draft <em>30 May 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
     <p>
-        This document is the 9 May 2009 Editor&#8217;s Draft of 
+        This document is the 30 May 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -3162,7 +3162,7 @@
           <p><a href="#button.submit.attrs">button.submit.attrs</a> = <span class="pattern" id="button.submit.attrs">(<a class="ref" href="#common.attrs">common.attrs</a>
    &amp; <a class="ref" href="#common-form.attrs">common-form.attrs</a>
    &amp; <a class="ref" href="#button.submit.attrs.type" title="button.submit.attrs.type">type</a>?
-   &amp; <a class="ref" href="#button.attrs.value" title="button.attrs.value">value</a>?)
+   &amp; <a class="ref" href="#button.submit.attrs.value" title="button.submit.attrs.value">value</a>?)
   &amp; (<a class="ref" href="#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a>?
          &amp; <a class="ref" href="#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
          &amp; <a class="ref" href="#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a>?
@@ -3180,6 +3180,10 @@
             <dd>Specifies that its <a href="#button" class="element">button</a> element is a button for
         submitting a form.</dd>
           
+            <dt>
+<a class="attribute-name" id="button.submit.attrs.value" title="button.submit.attrs.value" href="#button.submit.attrs.value">value</a><span class="attr-values"> =  string </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
         </dl>
 </div>
       
@@ -3251,7 +3255,7 @@
           <p><a href="#button.reset.attrs">button.reset.attrs</a> = <span class="pattern" id="button.reset.attrs">(<a class="ref" href="#common.attrs">common.attrs</a>
    &amp; <a class="ref" href="#common-form.attrs">common-form.attrs</a>
    &amp; <a class="ref" href="#button.reset.attrs.type" title="button.reset.attrs.type">type</a>
-   &amp; <a class="ref" href="#button.attrs.value" title="button.attrs.value">value</a>?)
+   &amp; <a class="ref" href="#button.reset.attrs.value" title="button.reset.attrs.value">value</a>?)
   &amp; <a class="ref" href="#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p>
 </div>
 </div>
@@ -3264,6 +3268,10 @@
             <dd>Specifies that its <a href="#button" class="element">button</a> element is a button for
         resetting a form.</dd>
           
+            <dt>
+<a class="attribute-name" id="button.reset.attrs.value" title="button.reset.attrs.value" href="#button.reset.attrs.value">value</a><span class="attr-values"> =  string </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
         </dl>
 </div>
       
@@ -3335,7 +3343,7 @@
           <p><a href="#button.button.attrs">button.button.attrs</a> = <span class="pattern" id="button.button.attrs">(<a class="ref" href="#common.attrs">common.attrs</a>
    &amp; <a class="ref" href="#common-form.attrs">common-form.attrs</a>
    &amp; <a class="ref" href="#button.button.attrs.type" title="button.button.attrs.type">type</a>
-   &amp; <a class="ref" href="#button.attrs.value" title="button.attrs.value">value</a>?)
+   &amp; <a class="ref" href="#button.button.attrs.value" title="button.button.attrs.value">value</a>?)
   &amp; <a class="ref" href="#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p>
 </div>
 </div>
@@ -3348,6 +3356,10 @@
             <dd>Specifies that its <a href="#button" class="element">button</a> element is a button with no
       additional semantics.</dd>
           
+            <dt>
+<a class="attribute-name" id="button.button.attrs.value" title="button.button.attrs.value" href="#button.button.attrs.value">value</a><span class="attr-values"> =  string </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
         </dl>
 </div>
       
@@ -4899,12 +4911,23 @@
                        | onsubmit
                        | onunload
                        | role
+                       | aria-atomic
+                       | aria-busy
+                       | aria-controls
                        | aria-describedby
+                       | aria-disabled
                        | aria-dropeffect
                        | aria-flowto
-                       | aria-grab
+                       | aria-grabbed
                        | aria-haspopup
+                       | aria-hidden
+                       | aria-invalid
+                       | aria-label
                        | aria-labelledby
+                       | aria-live
+                       | aria-owns
+                       | aria-relevant
+                       | aria-required
                        | about
                        | property
                        | resource
@@ -9549,14 +9572,21 @@
       <div class="no-number no-toc" id="map-content">
         <h2 class="element-subhead">Content model <a class="hash" href="#map-content">#</a>
 </h2>
-        <div class="content-models" id="map-mdls">
-        <p class="elem-mdl"><span class="element-pattern-name"><a id="map-mdl" href="#map-mdl" class="element">map</a> = </span><span>
+        <dl class="content-models" id="map-mdls">
+<dt class="content-model"><span class="element-pattern-name" id="map.elem.flow"><a class="hash" href="#map.elem.flow"><span class="element">map</span>.elem.flow</a> = </span></dt>
+        <dd class="elem-mdl"><span>
       (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="#map.attrs">map.attrs</a>
-    </span></p>
-        </div>
-      </div>
+    </span></dd>
+        <dt class="content-model"><span class="element-pattern-name" id="map.elem.phrasing"><a class="hash" href="#map.elem.phrasing"><span class="element">map</span>.elem.phrasing</a> = </span></dt>
+        <dd class="elem-mdl"><span>
+      (text
+  &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
+      &amp; <a class="ref" href="#map.attrs">map.attrs</a>
+    </span></dd>
+        </dl>
+</div>
 <div class="no-number no-toc" id="map-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#map-attr-mdl">#</a>
 </h2>
@@ -9602,7 +9632,10 @@
       <div class="no-number no-toc" id="map-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#map-context">#</a>
 </h2>
-        <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
+        <ul>
+<li class="context-mdl"><a href="#common.elem.phrasing">common.elem.phrasing</a></li>
+        <li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
+</ul>
 </div>
       <div class="no-number no-toc" id="map-display">
         <h2 class="element-subhead">Typical default display properties <a class="hash" href="#map-display">#</a>
@@ -13626,7 +13659,7 @@
   | <a class="ref" href="#address">address</a>
   | <a class="ref" href="#blockquote">blockquote</a>
   | <a class="ref" href="#object.elem.flow">object.elem.flow</a>
-  | <a class="ref" href="#map">map</a>
+  | <a class="ref" href="#map.elem.flow">map.elem.flow</a>
   | <a class="ref" href="#noscript.elem.flow">noscript.elem.flow</a>
   | <a class="ref" href="#section">section</a>
   | <a class="ref" href="#nav">nav</a>
@@ -13703,6 +13736,7 @@
   | <a class="ref" href="#embed">embed</a>
   | <a class="ref" href="#object.elem.phrasing">object.elem.phrasing</a>
   | <a class="ref" href="#iframe">iframe</a>
+  | <a class="ref" href="#map.elem.phrasing">map.elem.phrasing</a>
   | <a class="ref" href="#area">area</a>
   | <a class="ref" href="#script">script</a>
   | <a class="ref" href="#noscript.elem.phrasing">noscript.elem.phrasing</a>
@@ -14331,12 +14365,6 @@
 </dt>
 <dd><i class="TK">(detailed attribute description to come)</i></dd>
         </dl>
-<dl class="attr-defs">
-<dt>
-<dfn class="attribute-name" id="button.attrs.value" title="button.attrs.value">value</dfn><span class="attr-values"> =  string </span><a class="hash" href="#button.attrs.value">#</a>
-</dt>
-<dd><i class="TK">(detailed attribute description to come)</i></dd>
-        </dl>
 </div>
     </div>
     </div>

Index: button.button.html
===================================================================
RCS file: /sources/public/html5/markup/button.button.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.button.html	3 May 2009 15:59:40 -0000	1.4
+++ button.button.html	30 May 2009 11:38:55 -0000	1.5
@@ -34,7 +34,7 @@
           <p><a href="button.button.html#button.button.attrs">button.button.attrs</a> = <span class="pattern" id="button.button.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
    &amp; <a class="ref" href="shared-attributes.html#common-form.attrs">common-form.attrs</a>
    &amp; <a class="ref" href="button.button.html#button.button.attrs.type" title="button.button.attrs.type">type</a>
-   &amp; <a class="ref" href="shared-attributes.html#button.attrs.value" title="button.attrs.value">value</a>?)
+   &amp; <a class="ref" href="button.button.html#button.button.attrs.value" title="button.button.attrs.value">value</a>?)
   &amp; <a class="ref" href="shared-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p></div></div>
       <div class="no-number no-toc" id="button.button-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#button.button-attributes">#</a></h2>
@@ -43,6 +43,9 @@
             <dd>Specifies that its <a href="button.html#button" class="element">button</a> element is a button with no
       additional semantics.</dd>
           
+            <dt><a class="attribute-name" id="button.button.attrs.value" title="button.button.attrs.value" href="button.button.html#button.button.attrs.value">value</a><span class="attr-values"> =  string </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
         </dl></div>
       
       <div class="no-number no-toc" id="button.button-assertions">

Index: button.reset.html
===================================================================
RCS file: /sources/public/html5/markup/button.reset.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.reset.html	3 May 2009 15:59:40 -0000	1.4
+++ button.reset.html	30 May 2009 11:38:55 -0000	1.5
@@ -34,7 +34,7 @@
           <p><a href="button.reset.html#button.reset.attrs">button.reset.attrs</a> = <span class="pattern" id="button.reset.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
    &amp; <a class="ref" href="shared-attributes.html#common-form.attrs">common-form.attrs</a>
    &amp; <a class="ref" href="button.reset.html#button.reset.attrs.type" title="button.reset.attrs.type">type</a>
-   &amp; <a class="ref" href="shared-attributes.html#button.attrs.value" title="button.attrs.value">value</a>?)
+   &amp; <a class="ref" href="button.reset.html#button.reset.attrs.value" title="button.reset.attrs.value">value</a>?)
   &amp; <a class="ref" href="shared-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?</span></p></div></div>
       <div class="no-number no-toc" id="button.reset-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#button.reset-attributes">#</a></h2>
@@ -43,6 +43,9 @@
             <dd>Specifies that its <a href="button.html#button" class="element">button</a> element is a button for
         resetting a form.</dd>
           
+            <dt><a class="attribute-name" id="button.reset.attrs.value" title="button.reset.attrs.value" href="button.reset.html#button.reset.attrs.value">value</a><span class="attr-values"> =  string </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
         </dl></div>
       
       <div class="no-number no-toc" id="button.reset-assertions">

Index: button.submit.html
===================================================================
RCS file: /sources/public/html5/markup/button.submit.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button.submit.html	3 May 2009 15:59:40 -0000	1.4
+++ button.submit.html	30 May 2009 11:38:55 -0000	1.5
@@ -34,7 +34,7 @@
           <p><a href="button.submit.html#button.submit.attrs">button.submit.attrs</a> = <span class="pattern" id="button.submit.attrs">(<a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
    &amp; <a class="ref" href="shared-attributes.html#common-form.attrs">common-form.attrs</a>
    &amp; <a class="ref" href="button.submit.html#button.submit.attrs.type" title="button.submit.attrs.type">type</a>?
-   &amp; <a class="ref" href="shared-attributes.html#button.attrs.value" title="button.attrs.value">value</a>?)
+   &amp; <a class="ref" href="button.submit.html#button.submit.attrs.value" title="button.submit.attrs.value">value</a>?)
   &amp; (<a class="ref" href="shared-attributes.html#shared-form.attrs.formaction" title="shared-form.attrs.formaction">formaction</a>?
          &amp; <a class="ref" href="shared-attributes.html#shared-form.attrs.autofocus" title="shared-form.attrs.autofocus">autofocus</a>?
          &amp; <a class="ref" href="shared-attributes.html#shared-form.attrs.formenctype" title="shared-form.attrs.formenctype">formenctype</a>?
@@ -48,6 +48,9 @@
             <dd>Specifies that its <a href="button.html#button" class="element">button</a> element is a button for
         submitting a form.</dd>
           
+            <dt><a class="attribute-name" id="button.submit.attrs.value" title="button.submit.attrs.value" href="button.submit.html#button.submit.attrs.value">value</a><span class="attr-values"> =  string </span> </dt>
+            <dd><i class="TK">(detailed attribute description to come)</i></dd>
+          
         </dl></div>
       
       <div class="no-number no-toc" id="button.submit-assertions">

Index: shared-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/shared-attributes.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- shared-attributes.html	6 May 2009 12:46:50 -0000	1.3
+++ shared-attributes.html	30 May 2009 11:38:55 -0000	1.4
@@ -137,8 +137,6 @@
       | <a class="ref" href="datatypes.html#common.data.integer.positive" title="common.data.integer.positive">integer.positive</a>
     </span><a class="hash" href="shared-attributes.html#input.attrs.step.integer">#</a></dt><dd><i class="TK">(detailed attribute description to come)</i></dd><dt><dfn class="attribute-name" id="input.attrs.multiple" title="input.attrs.multiple">multiple</dfn><span class="attr-values"> =   "multiple" |  "" </span><a class="hash" href="shared-attributes.html#input.attrs.multiple">#</a></dt><dd><i class="TK">(detailed attribute description to come)</i></dd>
         </dl>
-    <dl class="attr-defs"><dt><dfn class="attribute-name" id="button.attrs.value" title="button.attrs.value">value</dfn><span class="attr-values"> =  string </span><a class="hash" href="shared-attributes.html#button.attrs.value">#</a></dt><dd><i class="TK">(detailed attribute description to come)</i></dd>
-        </dl>
     </div>
     </div>
     </div>
Received on Saturday, 30 May 2009 11:39:08 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 30 May 2009 11:39:08 GMT