--- aria-current.txt	2010-07-27 22:11:55.000000000 -0700
+++ aria-proposed.txt	2010-07-27 22:11:41.000000000 -0700
@@ -1,83 +1,92 @@
+@autocomplete | @aria-auto | strong
+@checked | @aria-checked | strong
+@contextmenu | @aria-haspopup | strong
+@disabled | @aria-disabled | strong
+@hidden | @aria-hidden | strong
+@invalid | @aria-invalid | strong
+@max | @aria-valuemax | strong
+@min | @aria-valuemin | strong
+@open | @aria-expanded | strong
+@readonly | @aria-readonly | strong
+@required | @aria-required | strong
+@value | @aria-valuenow | strong
 a (no href) | no role | any | undoc
-a href | link | strong
-abbr | no role | any | undoc
-address | no role | no role, contentinfo
+a href | link | button, link, menuitem, menuitemcheckbox, menuitemradio, radio, slider, scrollbar, progressbar
+abbr | no role | any
+address | no role | any
 area (no href) | no role | any | undoc
-area href | link | strong
+area href | link | button, link, menuitem, menuitemcheckbox, menuitemradio, radio, slider, scrollbar, progressbar
 article | article | application, article, document, main
 aside | note | complementary, note, search
-audio | no role | any | undoc
-b | no role | any | undoc
-base | no role | any | undoc
-bdo | no role | any | undoc
-blockquote | no role | any | undoc
-body | document | application, document
-br | no role | any | undoc
-button | button | strong
-canvas | no role | any | undoc
+audio | no role | no role, application
+b | no role | any
+base | no role | strong
+bdo | no role | any
+blockquote | no role | any
+body | document | document, application
+br | no role | any
+button | button | button, link, menuitem, menuitemcheckbox, menuitemradio, radio, slider, scrollbar, progressbar
+canvas | no role | any
 caption | no role | any | undoc
-cite | no role | any | undoc
-code | no role | any | undoc
-col | no role | any | undoc
-colgroup | no role | any | undoc
+cite | no role | any
+code | no role | any
+col | no role | any
+colgroup | no role | any
 command | no role | any | undoc
 datalist | listbox aria-multiselectable=false | strong
 dd | no role | any | undoc
-del | no role | any | undoc
-details | no role | any | undoc
-dfn | no role | any | undoc
-div | no role | any | undoc
+del | no role | any
+details | button | button, combobox
+dfn | no role | any
+div | no role | any
 dl | no role | any | undoc
 dt | no role | any | undoc
 element that defines a command type=checkbox (descendent of menu list) | menuitemcheckbox aria-checked=(command checked state) | strong
 element that defines a command type=command (descendent of menu list) | menuitem
 element that defines a command type=radio (descendent of menu list) | menuitemradio aria-checked=(command checked state) | strong
-elements that are disabled | aria-disabled=true | strong
-elements that are required | aria-required=true | strong
-em | no role | any | undoc
-embed | no role | any | undoc
-fieldset | no role | any | undoc
-figcaption | no role | any | undoc
-figure | no role | any | undoc
-footer | no role | no role, contentinfo
-form | no role | any | undoc
-frameset | document | application, document
+em | no role | any
+embed | no role | application, document, image
+fieldset | no role | any
+figcaption | no role | any
+figure | no role | any
+footer | no role | contentinfo
+form | form | application, form, search
 h1 (in hgroup) | no role | any | undoc
-h1 (not in hgroup) | heading aria-level=(outline depth) | strong
+h1 (not in hgroup) | heading aria-level=(outline depth) | button, checkbox, link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem
 h2 (in hgroup) | no role | any | undoc
-h2 (not in hgroup) | heading aria-level=(outline depth) | strong
+h2 (not in hgroup) | heading aria-level=(outline depth) | button, checkbox, link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem
 h3 (in hgroup) | no role | any | undoc
-h3 (not in hgroup) | heading aria-level=(outline depth) | strong
+h3 (not in hgroup) | heading aria-level=(outline depth) | button, checkbox, link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem
 h4 (in hgroup) | no role | any | undoc
-h4 (not in hgroup) | heading aria-level=(outline depth) | strong
+h4 (not in hgroup) | heading aria-level=(outline depth) | button, checkbox, link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem
 h5 (in hgroup) | no role | any | undoc
-h5 (not in hgroup) | heading aria-level=(outline depth) | strong
+h5 (not in hgroup) | heading aria-level=(outline depth) | button, checkbox, link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem
 h6 (in hgroup) | no role | any | undoc
-h6 (not in hgroup) | heading aria-level=(outline depth) | strong
-head | no role | any | undoc
+h6 (not in hgroup) | heading aria-level=(outline depth) | button, checkbox, link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem
+head | no role | strong
 header | no role | no role, banner
 hgroup | heading aria-level=(outline depth) | strong
 hr | separator | strong
-html | no role | any | undoc
-i | no role | any | undoc
-iframe | no role | any | undoc
+html | no role | strong
+i | no role | any
+iframe | no role | no role, application, document
 img (no empty alt) | no role | any | undoc
 img alt="" | presentation | strong
-input type=button | button | strong
-input type=checkbox | checkbox aria-checked=(checkedness) | strong
+input type=button | button | button, link, menuitem, menuitemcheckbox, menuitemradio, radio, slider, scrollbar, progressbar
+input type=checkbox | checkbox aria-checked=(checkedness) | button, link, menuitem, menuitemcheckbox, menuitemradio, radio, slider, scrollbar, progressbar
 input type=color | no role | strong
 input type=date | no role aria-readonly=(readonlyness) | strong
 input type=datetime | no role aria-readonly=(readonlyness) | strong
 input type=datetime-local | no role aria-readonly=(readonlyness) | strong
 input type=email (no suggestions source) | textbox aria-readonly=(readonlyness) | strong
 input type=email (suggestions source) | combobox aria-owns=list aria-readonly=(readonlyness) | strong
-input type=file | button | strong
+input type=file | no role | strong
 input type=hidden | no role | strong
-input type=image | button | strong
+input type=image | button  | button, link, menuitem, menuitemcheckbox, menuitemradio, radio, slider, scrollbar, progressbar
 input type=month | no role aria-readonly=(readonlyness) | strong 
 input type=number | spinutton aria-readonly=(readonlyness) aria-valuemax=(maximum) aria-valuemin=(minimum) aria-valuenow=(value) | strong
 input type=password | textbox aria-readonly=(readonlyness) | strong
-input type=radio | radio aria-checked=(checkedness) | strong
+input type=radio | radio aria-checked=(checkedness) | button, link, menuitem, menuitemcheckbox, menuitemradio, radio, slider, scrollbar, progressbar
 input type=range | slider aria-readonly=(readonlyness) aria-valuemax=(maximum) aria-valuemin=(minimum) aria-valuenow=(value) | strong
 input type=reset | button | strong
 input type=search (no suggestion source) | textbox aria-readonly=(readonlyness) | strong
@@ -91,66 +100,64 @@
 input type=url (no suggestion source) | textbox aria-readonly=(readonlyness) | strong
 input type=url (suggestions source) | combobox aria-owns=list aria-readonly=(readonlyness) | strong
 input type=week | no role aria-readonly=(readonlyness) | strong
-ins | no role | any | undoc
-kbd | no role | any | undoc
-keygen | no role | any | undoc
-label | no role | any | undoc
+ins | no role | any
+kbd | no role | any
+keygen | no role | strong
+label | no role | no role, alert, log, marquee, statos, timer
 legend | no role | any | undoc
 li (no ul or ol parent) | no role | any | undoc
-li (ul or ol parent) | listitem | listitem, treeitem
-link (hyperlink) | link | strong
-link (not hyperlink) | no role | any | undoc
-map | no role | any | undoc
-mark | no role | any | undoc
-math | no role | any | undoc
+li (ul or ol parent) | listitem | menuitem, menuitemcheckbox, menuitemradio, option, tab, treeitem, presentation
+link | no role | strong
+mark | no role | any
+math | math | strong
 menu type="" | menu | strong
-menu type=context | no role | strong
+menu type=context | menu | strong
 menu type=toolbar | toolbar | strong
-meta | no role | any | undoc
-meter | no role | any | undoc
+meta | no role | strong
+meter | no role | strong
 nav | navigation | strong
-noscript | no role | any | undoc
-object | no role | any | undoc
-ol | list | directory, list, tree
+noscript | no role | strong
+object | no role | no role, application, document, image
+ol | list | list, listbox, menu, menubar, tablist, toolbar, tree, directory, presentation
 optgroup | no role | any | undoc
 option (in list of options or datalist) | option aria-selected=(selectedness) | strong
 option (not in list of options or datalist) | no role | any | undoc
-output | status | any
-p | no role | any | undoc
-param | no role | any | undoc
-pre | no role | any | undoc
+output | no role | any
+p | no role | any
+param | no role | strong
+pre | no role | any
 progress | progressbar aria-valuemax=(maximum) aria-valuemin=(minimum) aria-valuenow=(value) | strong
-q | no role | any | undoc
+q | no role | any
 rp | no role | any | undoc
 rt | no role | any | undoc
-ruby | no role | any | undoc
-samp | no role | any | undoc
-script | no role | any | undoc
+ruby | no role | any
+samp | no role | any
+script | no role | strong
 section | region | alert, alertdialog, application, contentinfo, dialog, document, log, main,  region, search, status
 select (no multiple) | listbox aria-multiselectable=false | strong
 select multiple | listbox aria-multiselectable=true | strong
-small | no role | any | undoc
-source | no role | any | undoc
-span | no role | any | undoc
-strong | no role | any | undoc
-style | no role | any | undoc
-sub | no role | any | undoc
-summary | no role | any | undoc
-sup | no role | any | undoc
-svg | no role | any | undoc
-table | grid | grid, treegrid
-tbody | no role | any | undoc
-td | gridcell aria-labeledby=headers | strong
+small | no role | any
+source | no role | strong
+span | no role | any
+strong | no role | any
+style | no role | strong
+sub | no role | any
+summary | no role | any
+sup | no role | any
+svg | no role | no role, application, document, presentation
+table | no role | alertdialog, dialog, directory, grid, list, listbox, menu, menubar, tablist, toolbar, tree, treegrid, presentation
+tbody | no role | any
+td | no role | button, checkbox, gridcell,link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem, presentation
 textarea | textbox aria-multiline=true aria-readonly=(readonlyness) | strong
-tfoot | no role | any | undoc
+tfoot | no role | any
 th (column header) | columnheader aria-labeledby=headers | strong
 th (not column or row header) | gridcell aria-labeledby=headers | strong
 th (row header) | rowheader aria-labeledby=headers | strong
-thead | no role | any | undoc
-time | no role | any | undoc
-title | no role | any | undoc
-tr | row | strong
-ul | list | directory, list, tree
-var | no role | any | undoc
-video | no role | any | undoc
-wbr | no role | any | undoc
+thead | no role | any
+time | no role | any
+title | no role | strong
+tr | no role | button, checkbox, gridcell,link, menuitem, menuitemcheckbox, menuitemradio, option, radio, slider, spinbutton, scrollbar, tab, treeitem, presentation
+ul | list | list, listbox, menu, menubar, tablist, toolbar, tree, directory, presentation
+var | no role | any
+video | no role | no role, application
+wbr | no role | any