Sync up with latest ARIA-in-HTML spec changes

This allows role=group for <header> & <footer>, and role=search for <form>.

Fixes #185. Fixes #193.

diff --git a/aria.rnc b/aria.rnc
index 3e724a1b5d84e3db908cace4c1066fba0cf058ca..4f2d22b8269b39e2f69e9be19ab2e846115ee9a5 100644 (file)
--- a/aria.rnc
+++ b/aria.rnc
@@ -53,6 +53,9 @@ common.attrs.aria.implicit.dialog |=
 common.attrs.aria.implicit.document |=
        (       aria.state.expanded? )
 
+common.attrs.aria.implicit.form |=
+       (       aria.state.expanded? )
+
 common.attrs.aria.implicit.group |=
        (       aria.state.expanded?
        &       aria.prop.activedescendant?

diff --git a/common.rnc b/common.rnc
index 6ac04aa523390d304b0bfbdbf7654c4f798d9a2e..4436010e3e5a14cff78e1746ac04cbc1b12fc1fa 100644 (file)
--- a/common.rnc
+++ b/common.rnc
@@ -479,6 +479,7 @@ common.attrs.aria.implicit.complementary = ( notAllowed )
 common.attrs.aria.implicit.contentinfo = ( notAllowed )
 common.attrs.aria.implicit.dialog = ( notAllowed )
 common.attrs.aria.implicit.document = ( notAllowed )
+common.attrs.aria.implicit.form = ( notAllowed )
 common.attrs.aria.implicit.group = ( notAllowed )
 common.attrs.aria.implicit.heading = ( notAllowed )
 common.attrs.aria.implicit.img = ( notAllowed )

diff --git a/structural.rnc b/structural.rnc
index ebb26bd995dc9c1e9d4ae6a2a2dd25a2cc36a531..410f34d27c242684b3798c893f6e43f1ebd534ec 100644 (file)
--- a/structural.rnc
+++ b/structural.rnc
@@ -93,6 +93,7 @@
                (       common.attrs
                &       (       common.attrs.aria.implicit.banner
                        |       common.attrs.aria.landmark.banner
+                       |       common.attrs.aria.role.group
                        |       common.attrs.aria.role.presentation
                        )?
                )
@@ -109,6 +110,7 @@
                (       common.attrs
                &       (       common.attrs.aria.implicit.contentinfo
                        |       common.attrs.aria.landmark.contentinfo
+                       |       common.attrs.aria.role.group
                        |       common.attrs.aria.role.presentation
                        )?
                )

diff --git a/web-forms.rnc b/web-forms.rnc
index a0d1d50220a2db6d876115a96fbc55905e760108..1372b7a11ac5622a4e959b6bf225e13a5cad9871 100644 (file)
--- a/web-forms.rnc
+++ b/web-forms.rnc
@@ -527,8 +527,10 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       form.attrs.enctype?
                &       common-form.attrs.name?
                &       form.attrs.accept-charset?
-               &       (       common.attrs.aria.implicit.group
-                       |       common.attrs.aria.role.group
+               &       (       common.attrs.aria.implicit.form
+                       |       common.attrs.aria.landmark.form
+                       |       common.attrs.aria.role.search
+                       |       common.attrs.aria.role.presentation
                        )?
                )
                form.attrs.action =