From c3b8596f4688889114430b133b95da50f03735c4 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Sat, 26 Dec 2015 22:25:19 +0900
Subject: [PATCH] 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.
---
 aria.rnc       | 3 +++
 common.rnc     | 1 +
 structural.rnc | 2 ++
 web-forms.rnc  | 6 ++++--
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/aria.rnc b/aria.rnc
index 3e724a1b5..4f2d22b82 100644
--- 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 6ac04aa52..4436010e3 100644
--- 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 ebb26bd99..410f34d27 100644
--- 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 a0d1d5022..1372b7a11 100644
--- 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 =
-- 
2.39.2