Allow ARIA role=switch

Fixes #135

diff --git a/aria.rnc b/aria.rnc
index 4f2d22b8269b39e2f69e9be19ab2e846115ee9a5..61e007bacb8284c94c1b12f1a0a48e48a6aa1d8f 100644 (file)
--- a/aria.rnc
+++ b/aria.rnc
@@ -1111,6 +1111,17 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
        common.attrs.aria |= aria.status
        common.attrs.aria.role.status |= aria.status
 
+## switch
+       aria.switch =
+               (       aria.role.switch
+               &       aria.state.checked #required!
+               )
+               aria.role.switch =
+                       attribute role { string "switch" }
+
+       common.attrs.aria |= aria.switch
+       common.attrs.aria.role.switch |= aria.switch
+
 ## tab
        aria.tab =
                (       aria.role.tab

diff --git a/common.rnc b/common.rnc
index 4436010e3e5a14cff78e1746ac04cbc1b12fc1fa..97c09dea79cc16026e2985886e674d11adc78d71 100644 (file)
--- a/common.rnc
+++ b/common.rnc
@@ -462,6 +462,7 @@ common.attrs.aria.role.separator = ( notAllowed )
 common.attrs.aria.role.slider = ( notAllowed )
 common.attrs.aria.role.spinbutton = ( notAllowed )
 common.attrs.aria.role.status = ( notAllowed )
+common.attrs.aria.role.switch = ( notAllowed )
 common.attrs.aria.role.tab = ( notAllowed )
 common.attrs.aria.role.tablist = ( notAllowed )
 common.attrs.aria.role.tabpanel = ( notAllowed )

diff --git a/phrase.rnc b/phrase.rnc
index dc70881320544d37fba6e28753c2580118bfb3d5..f8fa725a036dc013e75b5bf9efbb083ad465678a 100644 (file)
--- a/phrase.rnc
+++ b/phrase.rnc
@@ -30,6 +30,7 @@ datatypes w = "http://whattf.org/datatype-draft"
                        |       common.attrs.aria.role.menuitem
                        |       common.attrs.aria.role.menuitemcheckbox
                        |       common.attrs.aria.role.menuitemradio
+                       |       common.attrs.aria.role.switch
                        |       common.attrs.aria.role.tab
                        |       common.attrs.aria.role.treeitem
                        )?

diff --git a/web-forms.rnc b/web-forms.rnc
index 1372b7a11ac5622a4e959b6bf225e13a5cad9871..c58e652485fdf0beca0b328ef5ddf32fa5c785c8 100644 (file)
--- a/web-forms.rnc
+++ b/web-forms.rnc
@@ -114,6 +114,7 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       (       common.attrs.aria.implicit.checkbox
                        |       common.attrs.aria.role.checkbox
                        |       common.attrs.aria.role.menuitemcheckbox
+                       |       common.attrs.aria.role.switch
                        )?
                )
                input.checkbox.attrs.type = 
@@ -169,6 +170,7 @@ datatypes w = "http://whattf.org/datatype-draft"
                        |       common.attrs.aria.role.menuitemcheckbox
                        |       common.attrs.aria.role.menuitemradio
                        |       common.attrs.aria.role.radio
+                       |       common.attrs.aria.role.switch
                        )?
                )
                input.button.attrs.type = 
@@ -293,6 +295,7 @@ datatypes w = "http://whattf.org/datatype-draft"
                        |       common.attrs.aria.role.menuitemcheckbox
                        |       common.attrs.aria.role.menuitemradio
                        |       common.attrs.aria.role.radio
+                       |       common.attrs.aria.role.switch
                        )?
                )       
                input.image.attrs.type = 
@@ -450,6 +453,7 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       button.attrs.value?
                &       (       common.attrs.aria.implicit.button
                        |       common.attrs.aria.role.button
+                       |       common.attrs.aria.role.checkbox
                        |       common.attrs.aria.role.link
                        |       common.attrs.aria.role.menuitem
                        |       common.attrs.aria.role.menuitemcheckbox
@@ -475,11 +479,13 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       button.attrs.value? #REVISIT I guess this still affects the DOM
                &       (       common.attrs.aria.implicit.button
                        |       common.attrs.aria.role.button
+                       |       common.attrs.aria.role.checkbox
                        |       common.attrs.aria.role.link
                        |       common.attrs.aria.role.menuitem
                        |       common.attrs.aria.role.menuitemcheckbox
                        |       common.attrs.aria.role.menuitemradio
                        |       common.attrs.aria.role.radio
+                       |       common.attrs.aria.role.switch
                        )?
                )
                button.reset.attrs.type =
@@ -500,11 +506,13 @@ datatypes w = "http://whattf.org/datatype-draft"
                &       button.attrs.value? #REVISIT I guess this still affects the DOM
                &       (       common.attrs.aria.implicit.button
                        |       common.attrs.aria.role.button
+                       |       common.attrs.aria.role.checkbox
                        |       common.attrs.aria.role.link
                        |       common.attrs.aria.role.menuitem
                        |       common.attrs.aria.role.menuitemcheckbox
                        |       common.attrs.aria.role.menuitemradio
                        |       common.attrs.aria.role.radio
+                       |       common.attrs.aria.role.switch
                        )?
                )
                button.button.attrs.type =