Refine some ARIA checking to sync w/ current spec

[gnu-emacs-elpa] / web-forms.rnc

diff --git a/web-forms.rnc b/web-forms.rnc
index 3f89143415ca2ef2a40cf5288baf75a12d748d8e..a0d1d50220a2db6d876115a96fbc55905e760108 100644 (file)
--- a/web-forms.rnc
+++ b/web-forms.rnc
@@ -322,8 +322,6 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       shared-form.attrs.readonly?
                &       textarea.attrs.rows-and-cols-wf1
                &       (       common.attrs.aria.implicit.textbox
-                       |       common.attrs.aria.role.presentation
-                       |       common.attrs.aria.role.menuitem
                        |       common.attrs.aria.role.textbox
                        )?
                #FIXME onfocus, onblur, onselect,onchange
@@ -364,10 +362,6 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       option.attrs.value?
                &       (       common.attrs.aria.implicit.option
                        |       common.attrs.aria.role.option
-                       |       common.attrs.aria.role.menuitem
-                       |       common.attrs.aria.role.menuitemradio
-                       |       common.attrs.aria.role.menuitemcheckbox
-                       |       common.attrs.aria.role.presentation
                        )?
                )
                option.attrs.selected =
@@ -418,9 +412,6 @@ datatypes w = "http://whattf.org/datatype-draft"
                # FIXME onfocus, onblur, onchange
                &       (       common.attrs.aria.implicit.listbox
                        |       common.attrs.aria.role.listbox # aria-multiselectable depends on "multiple" value; check in assertions
-                       |       common.attrs.aria.role.menu
-                       |       common.attrs.aria.role.presentation
-                       |       common.attrs.aria.role.menuitem
                        )?
                )
                select.attrs.size =
@@ -536,7 +527,9 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       form.attrs.enctype?
                &       common-form.attrs.name?
                &       form.attrs.accept-charset?
-               &       common.attrs.aria?
+               &       (       common.attrs.aria.implicit.group
+                       |       common.attrs.aria.role.group
+                       )?
                )
                form.attrs.action =
                        attribute action {