From f1cac663a191cd6fb532cd01824d61d163e020f0 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Fri, 11 Dec 2015 19:18:30 +0900
Subject: [PATCH] Refine some ARIA checking to sync w/ current spec

---
 applications.rnc | 38 +-------------------------------------
 block.rnc        |  9 ++++-----
 data.rnc         |  4 ++--
 structural.rnc   |  2 --
 web-forms.rnc    | 13 +++----------
 5 files changed, 10 insertions(+), 56 deletions(-)

diff --git a/applications.rnc b/applications.rnc
index 2a592fbbd..618814d33 100644
--- a/applications.rnc
+++ b/applications.rnc
@@ -91,8 +91,6 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	progress.attrs.max?
 		&	(	common.attrs.aria.implicit.progressbar
 			|	common.attrs.aria.role.progressbar
-			|	common.attrs.aria.role.presentation
-			|	common.attrs.aria.role.menuitem
 			)?
 		)
 		progress.attrs.value =
@@ -371,40 +369,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		(	common.attrs
 		&	details.attrs.open?
 		&	(	common.attrs.aria.implicit.group # aria-expanded must be true if open attr present; check by assertions
-			|	common.attrs.aria.role.alertdialog
-			|	common.attrs.aria.role.banner
-			|	common.attrs.aria.role.button
-			|	common.attrs.aria.role.combobox
-			|	common.attrs.aria.role.dialog
-			|	common.attrs.aria.role.directory
 			|	common.attrs.aria.role.group
-			|	common.attrs.aria.role.heading
-			|	common.attrs.aria.role.img
-			|	common.attrs.aria.role.link
-			|	common.attrs.aria.role.list
-			|	common.attrs.aria.role.listbox
-			|	common.attrs.aria.role.listitem
-			|	common.attrs.aria.role.log
-			|	common.attrs.aria.role.marquee
-			|	common.attrs.aria.role.menu
-			|	common.attrs.aria.role.menubar
-			|	common.attrs.aria.role.note
-			|	common.attrs.aria.role.status
-			|	common.attrs.aria.role.tab
-			|	common.attrs.aria.role.tablist
-			|	common.attrs.aria.role.tabpanel
-			|	common.attrs.aria.role.toolbar
-			|	common.attrs.aria.role.tree
-			|	common.attrs.aria.role.treeitem
-			|	common.attrs.aria.landmark.application
-			|	common.attrs.aria.landmark.article
-			|	common.attrs.aria.landmark.complementary
-			|	common.attrs.aria.landmark.contentinfo
-			|	common.attrs.aria.landmark.document
-			|	common.attrs.aria.landmark.form
-			|	common.attrs.aria.landmark.main
-			|	common.attrs.aria.landmark.navigation
-			|	common.attrs.aria.landmark.search
 			)?
 		)
 		details.attrs.open =
@@ -424,8 +389,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		element summary { summary.inner & summary.attrs }
 	summary.attrs =
 		(	common.attrs
-		&	(	common.attrs.aria.role.presentation
-			|	common.attrs.aria.role.menuitem
+		&	(	common.attrs.aria.implicit.button
 			|	common.attrs.aria.role.button
 			)?
 		)
diff --git a/block.rnc b/block.rnc
index cd2980d17..6d0eb0d80 100644
--- a/block.rnc
+++ b/block.rnc
@@ -26,10 +26,7 @@ datatypes w = "http://whattf.org/datatype-draft"
 		element hr { hr.inner & hr.attrs }
 	hr.attrs =
 		(	common.attrs
-		&	(	common.attrs.aria.role.separator
-			|	common.attrs.aria.role.presentation
-			|	common.attrs.aria.role.menuitem
-			)?
+		&	common.attrs.aria.role.separator?
 		)
 	hr.inner =
 		( empty )
@@ -180,7 +177,9 @@ datatypes w = "http://whattf.org/datatype-draft"
 		element dl { dl.inner & dl.attrs }
 	dl.attrs =
 		(	common.attrs
-		&	common.attrs.aria?
+		&	(	common.attrs.aria.implicit.list
+			|	common.attrs.aria.role.list
+			)?
 		)
 	dl.inner =
 		(	(	(	dt.elem
diff --git a/data.rnc b/data.rnc
index acb79640b..991f6987d 100644
--- a/data.rnc
+++ b/data.rnc
@@ -60,8 +60,8 @@ datatypes w = "http://whattf.org/datatype-draft"
 		&	meter.attrs.high?
 		&	meter.attrs.max?
 		&	meter.attrs.optimum?
-		&	(	common.attrs.aria.role.presentation
-			|	common.attrs.aria.role.menuitem
+		&	(	common.attrs.aria.implicit.progressbar
+			|	common.attrs.aria.role.progressbar
 			)?
 		)
 		meter.attrs.value =
diff --git a/structural.rnc b/structural.rnc
index 9e72b5f14..ebb26bd99 100644
--- a/structural.rnc
+++ b/structural.rnc
@@ -37,8 +37,6 @@
 		(	common.attrs
 		&	(	common.attrs.aria.implicit.navigation
 			|	common.attrs.aria.landmark.navigation
-			|	common.attrs.aria.role.menuitem
-			|	common.attrs.aria.role.presentation
 			)?
 		)
 	nav.inner =
diff --git a/web-forms.rnc b/web-forms.rnc
index 3f8914341..a0d1d5022 100644
--- 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 {
-- 
2.39.2