W3C home > Mailing lists > Public > public-html-commits@w3.org > May 2009

html5/markup patch-schema,1.57,1.58

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 26 May 2009 23:37:18 +0000
To: public-html-commits@w3.org
Message-Id: <E1M96Cs-0002YR-Aj@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv9731

Modified Files:
	patch-schema 
Log Message:
patch schema to make button.*.attrs.value handling consistent with
input.*.attrs.value handling


Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- patch-schema	27 Apr 2009 07:11:25 -0000	1.57
+++ patch-schema	26 May 2009 23:37:16 -0000	1.58
@@ -1,6 +1,6 @@
 Index: schema/web-forms.rnc
 ===================================================================
---- schema/web-forms.rnc	(revision 414)
+--- schema/web-forms.rnc	(revision 431)
 +++ schema/web-forms.rnc	(working copy)
 @@ -295,17 +295,9 @@
  		(	common.attrs
@@ -20,13 +20,97 @@
  		textarea.attrs.cols = 
  			attribute cols {
  				common.data.integer.positive
+@@ -394,10 +386,6 @@
+ 	
+ ## Shared Definitions for Complex Button
+ 	
+-	button.attrs.value =
+-		attribute value {
+-			string
+-		}
+ 	button.inner = 
+ 		( common.inner.flow )
+ 	
+@@ -409,13 +397,17 @@
+ 		(	common.attrs
+ 		&	common-form.attrs
+ 		&	button.submit.attrs.type?
+-		&	button.attrs.value?
++		&	button.submit.attrs.value?
+ 		&	common.attrs.aria.implicit.button?
+ 		)
+ 		button.submit.attrs.type =
+ 			attribute type {
+ 				w:string "submit"
+ 			}
++		button.submit.attrs.value =
++			attribute value {
++				string
++			}
+ 
+ 	button.elem = button.submit.elem
+ 	
+@@ -427,13 +419,17 @@
+ 		(	common.attrs
+ 		&	common-form.attrs
+ 		&	button.reset.attrs.type
+-		&	button.attrs.value? #REVISIT I guess this still affects the DOM
++		&	button.reset.attrs.value? #REVISIT I guess this still affects the DOM
+ 		&	common.attrs.aria.implicit.button?
+ 		)
+ 		button.reset.attrs.type =
+ 			attribute type {
+ 				w:string "reset"
+ 			}
++		button.reset.attrs.value =
++			attribute value {
++				string
++			}
+ 
+ 	button.elem |= button.reset.elem
+ 	
+@@ -445,7 +441,7 @@
+ 		(	common.attrs
+ 		&	common-form.attrs
+ 		&	button.button.attrs.type
+-		&	button.attrs.value? #REVISIT I guess this still affects the DOM
++		&	button.button.attrs.value? #REVISIT I guess this still affects the DOM
+ 		&	(	common.attrs.aria
+ 			|	common.attrs.aria.implicit.button
+ 			)?
+@@ -454,6 +450,10 @@
+ 			attribute type {
+ 				w:string "button"
+ 			}
++		button.button.attrs.value =
++			attribute value {
++				string
++			}
+ 
+ 	button.elem |= button.button.elem
+ 
+Index: schema/web-forms2.rnc
+===================================================================
+--- schema/web-forms2.rnc	(revision 430)
++++ schema/web-forms2.rnc	(working copy)
+@@ -668,10 +668,6 @@
+ 
+ ## Text Area: <textarea>, extensions
+ 
+-	textarea.attrs.rows-and-cols-wf1.inner &=
+-		notAllowed
+-	textarea.attrs.rows-and-cols-wf1 |= 
+-		empty
+ 	textarea.attrs &=
+ 		(	shared-form.attrs.maxlength?
+ 		&	shared-form.attrs.autofocus? 
 Index: schema/common.rnc
 ===================================================================
---- schema/common.rnc	(revision 414)
+--- schema/common.rnc	(revision 430)
 +++ schema/common.rnc	(working copy)
-@@ -342,16 +342,8 @@
- 	common.data.langcode =
- 		w:string "" | w:language
+@@ -351,16 +351,8 @@
+ 	common.data.keylabellist =
+ 		w:keylabellist
  
 -# #####################################################################
 -##  WF2 Module Hook                                                   #
@@ -41,18 +125,3 @@
  common.attrs.aria = ( notAllowed )
  common.attrs.aria.implicit.button = ( notAllowed )
  common.attrs.aria.implicit.input = ( notAllowed )
-Index: schema/web-forms2.rnc
-===================================================================
---- schema/web-forms2.rnc	(revision 414)
-+++ schema/web-forms2.rnc	(working copy)
-@@ -637,10 +637,6 @@
- 
- ## Text Area: <textarea>, extensions
- 
--	textarea.attrs.rows-and-cols-wf1.inner &=
--		notAllowed
--	textarea.attrs.rows-and-cols-wf1 |= 
--		empty
- 	textarea.attrs &=
- 		(	shared-form.attrs.maxlength?
- 		&	shared-form.attrs.autofocus? 
Received on Tuesday, 26 May 2009 23:37:25 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 26 May 2009 23:37:27 GMT