Make minlength checking behave as expected

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

diff --git a/web-forms.rnc b/web-forms.rnc
index f786a1bc76c3b6b20b2178951be293028ea423f6..c58e652485fdf0beca0b328ef5ddf32fa5c785c8 100644 (file)
--- a/web-forms.rnc
+++ b/web-forms.rnc
@@ -13,7 +13,7 @@ datatypes w = "http://whattf.org/datatype-draft"
                
        common-form.attrs.name = 
                attribute name {
-                       string #REVISIT should this be restricted somehow? No & and = perhaps?
+                       form.data.nonemptystring
                }
 
        common-form.attrs.disabled = 
@@ -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 = 
@@ -322,8 +325,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 +365,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 +415,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 =
@@ -459,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
@@ -484,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 =
@@ -509,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 =
@@ -536,7 +535,11 @@ 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.form
+                       |       common.attrs.aria.landmark.form
+                       |       common.attrs.aria.role.search
+                       |       common.attrs.aria.role.presentation
+                       )?
                )
                form.attrs.action =
                        attribute action {