W3C home > Mailing lists > Public > public-html-commits@w3.org > January 2010

html5/markup/schema applications.rnc,1.1,1.2 aria.rnc,1.1,1.2 assertions.sch,1.1,1.2 common.rnc,1.1,1.2 core-scripting.rnc,1.1,1.2 data.rnc,1.1,1.2 embed.rnc,1.1,1.2 media.rnc,1.1,1.2 meta.rnc,1.1,1.2 microdata.rnc,1.1,1.2 structural.rnc,1.1,1.2 tables.rnc,1.1,1.2 web-forms.rnc,1.1,1.2

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 28 Jan 2010 17:11:55 +0000
To: public-html-commits@w3.org
Message-Id: <E1NaXuO-00043J-15@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/schema
In directory hutz:/tmp/cvs-serv14776/schema

Modified Files:
	applications.rnc aria.rnc assertions.sch common.rnc 
	core-scripting.rnc data.rnc embed.rnc media.rnc meta.rnc 
	microdata.rnc structural.rnc tables.rnc web-forms.rnc 
Log Message:
updated status section

Index: data.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/data.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- data.rnc	29 Aug 2009 01:43:07 -0000	1.1
+++ data.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -1,3 +1,5 @@
+datatypes w = "http://whattf.org/datatype-draft"
+
 # #####################################################################
 ##  RELAX NG Schema for HTML 5: Static Data Markup                    #
 # #####################################################################
@@ -9,11 +11,16 @@
 	time.attrs =
 		(	common.attrs
 		&	time.attrs.datetime?
+		&	time.attrs.pubdate?
 		)
 		time.attrs.datetime =
 			attribute datetime {
 				common.data.date-or-time #REVISIT check format
 			}
+		time.attrs.pubdate =
+			attribute pubdate {
+				w:string "pubdate" | w:string ""
+			}
 	time.inner =
 		( common.inner.phrasing ) #Cannot enforce textContent format here
 
@@ -25,7 +32,7 @@
 		element meter { meter.inner & meter.attrs }
 	meter.attrs =
 		(	common.attrs
-		&	meter.attrs.value?
+		&	meter.attrs.value
 		&	meter.attrs.min?
 		&	meter.attrs.low?
 		&	meter.attrs.high?

Index: embed.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/embed.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- embed.rnc	29 Aug 2009 01:43:07 -0000	1.1
+++ embed.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -187,9 +187,13 @@
 			                    | aria-required	
 			                    | spellcheck
 			                    | accesskey
-			                    | item
+			                    | itemref
 			                    | itemprop
-			                    | subject
+			                    | itemscope
+			                    | itemtype
+			                    | itemid
+			                    | name
+			                    | align
 			                    ) 
 			{
 				string
@@ -230,18 +234,6 @@
 			attribute type {
 				common.data.mimetype
 			}
-		object.attrs.classid =
-			attribute classid {
-				common.data.uri
-			}
-		object.attrs.codebase =
-			attribute codebase {
-				common.data.uri
-			}
-		object.attrs.codetype =
-			attribute codetype {
-				common.data.mimetype
-			}
 		object.attrs.height =
 			attribute height {
 				common.data.integer.positive

Index: common.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/common.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common.rnc	29 Aug 2009 01:43:07 -0000	1.1
+++ common.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -372,10 +372,13 @@
 common.attrs.aria.implicit.img = ( notAllowed )
 common.attrs.aria.implicit.select = ( notAllowed )
 common.attrs.aria.landmark.application = ( notAllowed )
-common.attrs.aria.landmark.article = ( notAllowed )
 common.attrs.aria.landmark.banner = ( notAllowed )
 common.attrs.aria.landmark.complementary = ( notAllowed )
 common.attrs.aria.landmark.contentinfo = ( notAllowed )
-common.attrs.aria.landmark.document = ( notAllowed )
 common.attrs.aria.landmark.main = ( notAllowed )
 common.attrs.aria.landmark.navigation = ( notAllowed )
+common.attrs.aria.landmark.search = ( notAllowed )
+# per ARIA spec: article, document, and note are not actually landmarks
+common.attrs.aria.landmark.article = ( notAllowed )
+common.attrs.aria.landmark.document = ( notAllowed )
+common.attrs.aria.landmark.note = ( notAllowed )

Index: applications.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/applications.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- applications.rnc	29 Aug 2009 01:43:07 -0000	1.1
+++ applications.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -243,22 +243,3 @@
 	common.elem.flow |= canvas.elem.flow
 	common.elem.phrasing |= canvas.elem.phrasing
 
-## Additional On-Demand Information: <details>
-
-	details.elem =
-		element details { details.inner & details.attrs }
-	details.attrs =
-		(	common.attrs
-		&	details.attrs.open?
-		&	common.attrs.aria.implicit.region?
-		)
-		details.attrs.open =
-			attribute open {
-				w:string "open" | w:string ""
-			}
-	details.inner =
-		(	legend.elem
-		,	common.inner.flow 
-		)
-	
-	common.elem.flow |= details.elem

Index: structural.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/structural.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- structural.rnc	29 Aug 2009 01:43:08 -0000	1.1
+++ structural.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -8,7 +8,9 @@
 		element section { section.inner & section.attrs }
 	section.attrs =
 		(	common.attrs
-		&	common.attrs.aria.implicit.region?
+		&	(	common.attrs.aria
+			|	common.attrs.aria.implicit.region
+			)?
 		)
 	section.inner =
 		(	style.elem.scoped*
@@ -38,17 +40,13 @@
 		element article { article.inner & article.attrs }
 	article.attrs =
 		(	common.attrs
-		&	article.attrs.pubdate?
 		&	( common.attrs.aria.implicit.region
 		  | common.attrs.aria.landmark.article
 		  | common.attrs.aria.landmark.main
 		  | common.attrs.aria.landmark.document
+		  | common.attrs.aria.landmark.application
 		  )?
 		)
-		article.attrs.pubdate =
-			attribute pubdate {
-				common.data.datetime
-			}
 	article.inner =
 		(	style.elem*
 		,	common.inner.flow 
@@ -64,6 +62,8 @@
 		(	common.attrs
 		&	( common.attrs.aria.implicit.region
 		  | common.attrs.aria.landmark.complementary
+		  | common.attrs.aria.landmark.search
+		  | common.attrs.aria.landmark.note
 		  )?
 		)
 	aside.inner =
@@ -103,18 +103,3 @@
 
 	common.elem.flow |= footer.elem
 
-## Dialog: <dialog>
-
-	dialog.elem =
-		element dialog { dialog.inner & dialog.attrs }
-	dialog.attrs =
-		(	common.attrs
-		&	common.attrs.aria.implicit.region?
-		)
-	dialog.inner =
-		(	(	dt.elem
-			,	dd.elem
-			)*
-		)
-
-	common.elem.flow |= dialog.elem

Index: meta.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/meta.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- meta.rnc	29 Aug 2009 01:43:08 -0000	1.1
+++ meta.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -47,6 +47,7 @@
 	body.attrs =
 		(	common.attrs
 		&	(	common.attrs.aria.landmark.application
+			|	common.attrs.aria.landmark.document
 			|	common.attrs.aria.implicit.structure
 			)?
 		&	body.attrs.onafterprint?
@@ -210,7 +211,10 @@
 	meta.name.elem =
 		element meta { meta.inner & meta.name.attrs }
 	meta.name.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
 		&	meta.name.attrs.name
 		&	meta.name.attrs.content
 		)
@@ -232,7 +236,10 @@
 	meta.http-equiv.refresh.elem =
 		element meta { meta.inner & meta.http-equiv.refresh.attrs }
 	meta.http-equiv.refresh.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
 		&	meta.http-equiv.attrs.http-equiv.refresh
 		&	meta.http-equiv.attrs.content.refresh
 		)
@@ -253,7 +260,10 @@
 	meta.http-equiv.default-style.elem =
 		element meta { meta.inner & meta.http-equiv.default-style.attrs }
 	meta.http-equiv.default-style.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
 		&	meta.http-equiv.attrs.http-equiv.default-style
 		&	meta.http-equiv.attrs.content.default-style
 		)
@@ -275,7 +285,10 @@
 	meta.http-equiv.content-language.elem =
 		element meta { meta.inner & meta.http-equiv.content-language.attrs }
 	meta.http-equiv.content-language.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
 		&	meta.http-equiv.attrs.http-equiv.content-language
 		&	meta.http-equiv.attrs.content.content-language
 		)
@@ -297,7 +310,10 @@
 	meta.charset.elem =
 		element meta { meta.inner & meta.charset.attrs }
 	meta.charset.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
 		&	meta.charset.attrs.charset
 		)
 		meta.charset.attrs.charset =
@@ -311,7 +327,10 @@
 		element meta { meta.inner & meta.http-equiv.content-type.attrs }
 		& HTMLonly
 	meta.http-equiv.content-type.attrs =
-		(	common.attrs
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
 		&	meta.http-equiv.attrs.http-equiv.content-type
 		&	meta.http-equiv.attrs.content.content-type
 		)

Index: microdata.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/microdata.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- microdata.rnc	29 Aug 2009 01:43:08 -0000	1.1
+++ microdata.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -5,23 +5,76 @@
 # #####################################################################
 
 common.attrs.microdata =
-	(	common.attrs.microdata.item?
-	&	common.attrs.microdata.subject?
+	(	common.attrs.microdata.itemref?
 	&	common.attrs.microdata.itemprop?
+	&	common.attrs.microdata.itemscope?
+	&	common.attrs.microdata.itemtype?
+	&	common.attrs.microdata.itemid?
 	)
-	common.attrs.microdata.item =
-		attribute item {
-			(	w:string ""
-			|	common.data.microdata-identifier
-			)
-		}
-	common.attrs.microdata.subject =
-		attribute subject {
-			common.data.idref
+	common.attrs.microdata.itemref =
+		attribute itemref {
+			common.data.idrefs
 		}
 	common.attrs.microdata.itemprop =
 		attribute itemprop {
 			common.data.microdata-identifier
 		}
+	common.attrs.microdata.itemscope =
+		attribute itemscope {
+			w:string "itemscope" | w:string ""
+		}
+	common.attrs.microdata.itemtype =
+		attribute itemtype {
+			common.data.uri
+		}
+	common.attrs.microdata.itemid =
+		attribute itemid {
+			common.data.uri
+		}
 
 common.attrs &= common.attrs.microdata
+
+	link.elem.phrasing =
+		element link { link.inner & link.phrasing.attrs }
+	link.phrasing.attrs =
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
+		&	common.attrs.microdata.itemprop
+		&	common.attrs.microdata.itemref?
+		&	common.attrs.microdata.itemscope?
+		&	common.attrs.microdata.itemtype?
+		&	common.attrs.microdata.itemid?
+		&	shared-hyperlink.attrs.href
+		&	shared-hyperlink.attrs.rel
+		&	shared-hyperlink.attrs.hreflang?
+		&	shared-hyperlink.attrs.media?
+		&	shared-hyperlink.attrs.type?
+		&	link.attrs.sizes?
+		#	link.attrs.title included in common.attrs
+		)
+	common.elem.phrasing |= link.elem.phrasing
+
+## Property Metadata: <meta itemprop>
+
+	meta.itemprop.elem =
+		element meta { meta.inner & meta.itemprop.attrs }
+	meta.itemprop.attrs =
+		(	common.attrs.basic
+		&	common.attrs.i18n
+		&	common.attrs.present
+		&	common.attrs.other
+		&	common.attrs.microdata.itemprop
+		&	common.attrs.microdata.itemref?
+		&	common.attrs.microdata.itemscope?
+		&	common.attrs.microdata.itemtype?
+		&	common.attrs.microdata.itemid?
+		&	meta.itemprop.attrs.content
+		)
+		meta.itemprop.attrs.content =
+			attribute content {
+				string
+			}
+	common.elem.metadata |= meta.itemprop.elem
+	common.elem.phrasing |= meta.itemprop.elem

Index: assertions.sch
===================================================================
RCS file: /sources/public/html5/markup/schema/assertions.sch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- assertions.sch	29 Aug 2009 01:43:07 -0000	1.1
+++ assertions.sch	28 Jan 2010 17:11:53 -0000	1.2
@@ -12,6 +12,68 @@
 <schema xmlns='http://www.ascc.net/xml/schematron'>
 	<ns prefix='h' uri='http://www.w3.org/1999/xhtml'/>
 
+	<pattern name="required attributes">
+		<rule context='h:bdo[@dir]'>
+			<assert test='@dir'>
+				A &#x201C;bdo&#x201D; element must have an 
+				&#x201C;dir&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:img'>
+			<assert test='@src'>
+				An &#x201C;img&#x201D; element must have a
+				&#x201C;src&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:link'>
+			<assert test='@href'>
+				A &#x201C;link&#x201D; element must have an &#x201C;href&#x201D; attribute.
+			</assert>
+			<assert test='@rel'>
+				A &#x201C;link&#x201D; element must have a &#x201C;rel&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:map'>
+			<assert test='@name'>
+				A &#x201C;map&#x201D; element must have a &#x201C;name&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:meter'>
+			<assert test='@value'>
+				An &#x201C;meter&#x201D; element must have a
+				&#x201C;value&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:object'>
+			<assert test='@data or @type'>
+				An &#x201C;object&#x201D; element must have a
+				&#x201C;data&#x201D; attribute or a
+				&#x201C;type&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:param'>
+			<assert test='@name'>
+				A &#x201C;param&#x201D; element must have an &#x201C;name&#x201D; attribute.
+			</assert>
+			<assert test='@value'>
+				A &#x201C;param&#x201D; element must have a &#x201C;value&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:source'>
+			<assert test='@src'>
+				A &#x201C;source&#x201D; element must have a
+				&#x201C;src&#x201D; attribute.
+			</assert>
+		</rule>
+	</pattern>
+
 	<pattern name='Triggered on mutually exclusive elements and prohibited-descendant cases'>
 
 	<!-- Exclusions and prohibited-descendant contraints  - - - - - - - - - - - -->
@@ -52,10 +114,6 @@
 		</rule>
 
 		<rule context='h:section|h:nav|h:article|h:aside'>
-			<report test='ancestor::h:footer'>
-				The sectioning element &#x201C;<name/>&#x201D; must not
-				appear as a descendant of the &#x201C;footer&#x201D; element.
-			</report>
 			<report test='ancestor::h:address'>
 				The sectioning element &#x201C;<name/>&#x201D; must not
 				appear as a descendant of the &#x201C;address&#x201D; element.
@@ -78,10 +136,6 @@
 		</rule>
 
 		<rule context='h:h1|h:h2|h:h3|h:h4|h:h5|h:h6'>
-			<report test='ancestor::h:footer'>
-				The &#x201C;<name/>&#x201D; element must not appear as a 
-				descendant of the &#x201C;footer&#x201D; element.
-			</report>
 			<report test='ancestor::h:address'>
 				The &#x201C;<name/>&#x201D; element must not appear as a 
 				descendant of the &#x201C;address&#x201D; element.
@@ -103,7 +157,16 @@
 			</report>
 		</rule>
 
+		<rule context='h:table'>
+			<report test='ancestor::h:caption'>
+				The element &#x201C;table&#x201D; must not appear as a
+				descendant of the &#x201C;caption&#x201D; element.
+			</report>
+		</rule>
+	</pattern>
+
 	<!-- Interactive element exclusions -->
+	<pattern name='interactive element exclusions'>
 	
 		<!-- 
 		   - Interactive descendants:
@@ -116,13 +179,19 @@
 		   - input[type!=hidden]
 		   - textarea
 		   - select
-		   -
+		   - img[usemap]
+		   - embed
+		   - iframe
+		   - keygen
+		   - label
+		   - object[usemap]
+		
 		   - Interactive ancestors
 		   - a
 		   - button
 		  -->
 
-		<rule context='h:a|h:details'>
+		<rule context='h:a|h:details|h:embed|h:iframe|h:label'>
 			<report test='ancestor::h:a'>
 				The interactive element &#x201C;<name/>&#x201D; must not 
 				appear as a descendant of the &#x201C;a&#x201D; element.
@@ -188,19 +257,25 @@
 			</report>
 		</rule>
 
+		<rule context='h:object[@usemap]'>
+			<report test='ancestor::h:a'>
+				The element &#x201C;object&#x201D;
+				with the attribute &#x201C;usemap&#x201D; must not
+				appear as a descendant of the &#x201C;a&#x201D; element.
+			</report>
+			<report test='ancestor::h:button'>
+				The element &#x201C;object&#x201D;
+				with the attribute &#x201C;usemap&#x201D; must not
+				appear as a descendant of the &#x201C;button&#x201D; element.
+			</report>
+		</rule>
+	</pattern>
+
 	<!-- REVISIT fieldset http://lists.whatwg.org/pipermail/whatwg-whatwg.org/2006-April/006181.html -->
 
 	<!-- Misc requirements -->
 		
-		<rule context='h:script[translate(@language, "JAVSCRIPT", "javscript")="javascript"]'>
-			<assert test='not(@type) or translate(@type, "EXJAVSCRIPT", "exjavscript")="text/javascript"'>
-				A &#x201C;script&#x201D; element with the 
-				&#x201C;language="JavaScript"&#x201D; attribute set must not have a 
-				&#x201C;type&#x201D; attribute whose value is not 
-				&#x201C;text/javascript&#x201D;.
-			</assert>
-		</rule>
-
+	<pattern name="miscellaneous requirements">
 		<rule context='h:area'>
 			<assert test='ancestor::h:map'>
 				The &#x201C;area&#x201D; element must have a 
@@ -217,15 +292,55 @@
 			</assert>
 		</rule>
 
-		<rule context='h:progress[@max and @value]'>
-			<assert test='number(@value) &lt;= number(@max)'>
-				The value of the  &#x201C;value&#x201D; attribute must be less than or equal to
-				the value of the &#x201C;max&#x201D; attribute.
+		<rule context='h:input[@list]'>
+			<assert test='//h:datalist[@id = current()/@list] or 
+			              //h:select[@id = current()/@list]'>
+				The &#x201C;list&#x201D; attribute of the &#x201C;input&#x201D; 
+				element must refer to a &#x201C;datalist&#x201D; element.
 			</assert>
 		</rule>
 
-		<rule context='h:progress[not(@max) and @value]'>
-			<assert test='number(@value) &lt;= 1'>
+		<rule context='h:map[@id and @name]'>
+			<assert test='@id = @name'>
+				The &#x201C;id&#x201D; attribute on a &#x201C;map&#x201D; element must have an 
+				the same value as the &#x201C;name&#x201D; attribute.
+			</assert>
+		</rule>
+
+		<rule context='h:select[not(@multiple)]'>
+			<report test='count(descendant::h:option[@selected]) > 1'>
+				The &#x201C;select&#x201D; element cannot have more than one 
+				selected &#x201C;option&#x201D; descendant unless the 
+				&#x201C;multiple&#x201D; attribute is specified.
+			</report>
+		</rule>
+
+		<rule context='h:script[translate(@language, "JAVSCRIPT", "javscript")="javascript"]'>
+			<assert test='not(@type) or translate(@type, "EXJAVSCRIPT", "exjavscript")="text/javascript"'>
+				A &#x201C;script&#x201D; element with the 
+				&#x201C;language="JavaScript"&#x201D; attribute set must not have a 
+				&#x201C;type&#x201D; attribute whose value is not 
+				&#x201C;text/javascript&#x201D;.
+			</assert>
+		</rule>
+
+		<rule context='h:time'>
+			<report test='ancestor::h:time'>
+				The element &#x201C;meter&#x201D; must not
+				appear as a descendant of the &#x201C;meter&#x201D; element.
+			</report>
+		</rule>
+
+		<rule context='h:progress'>
+			<report test='ancestor::h:progress'>
+				The element &#x201C;progress&#x201D; must not
+				appear as a descendant of the &#x201C;progress&#x201D; element.
+			</report>
+			<assert test='@max and @value and number(@value) &lt;= number(@max)'>
+				The value of the  &#x201C;value&#x201D; attribute must be less than or equal to
+				the value of the &#x201C;max&#x201D; attribute.
+			</assert>
+			<assert test='not(@max) and @value and number(@value) &lt;= 1'>
 				The value of the  &#x201C;value&#x201D; attribute must be less than or equal to
 				one when the &#x201C;max&#x201D; attribute is absent.
 			</assert>
@@ -238,6 +353,10 @@
 		-->
 
 		<rule context='h:meter'>
+			<report test='ancestor::h:meter'>
+				The element &#x201C;meter&#x201D; must not
+				appear as a descendant of the &#x201C;meter&#x201D; element.
+			</report>
 			<report test='@min and @value and not(number(@min) &lt;= number(@value))'>
 				The value of the  &#x201C;min&#x201D; attribute must be less than or equal to
 				the value of the &#x201C;value&#x201D; attribute.
@@ -319,35 +438,388 @@
 				one when the &#x201C;max&#x201D; attribute is absent.
 			</report>
 		</rule>
-
+	</pattern>
 
 	<!-- Obsolete Elements - - - - - - - - - - - - - - - - - - - - - - -->
+	<pattern name="obsolete elements">
+		<rule context='h:acronym'>
+			<report test='true()'>
+				The &#x201C;acronym&#x201D; element is obsolete. Use the &#x201C;abbr&#x201D; element instead.
+			</report>
+		</rule>
 
-		<rule context='h:center|h:font|h:big|h:s|h:strike|h:tt|h:u|h:acronym|h:dir|h:applet
-		  |h:basefont
-		  |h:frameset
-		  |h:noframes'>
+		<rule context='h:applet'>
+			<report test='true()'>
+				The &#x201C;applet&#x201D; element is obsolete. Use the &#x201C;object&#x201D; element instead.
+			</report>
+		</rule>
+
+		<rule context='h:center|h:font|h:big|h:s|h:strike|h:tt|h:u|h:basefont'>
 			<report test='true()'>
 				The &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
 			</report>
 		</rule>
 
-	<!-- required attributes  - - - - - - - - - - - - - - - - - - - -->
+		<rule context='h:dir'>
+			<report test='true()'>
+				The &#x201C;dir&#x201D; element is obsolete. Use the &#x201C;ul&#x201D; element instead.
+			</report>
+		</rule>
 
-		<rule context='h:map[@id and @name]'>
-			<assert test='@id = @name'>
-				The &#x201C;id&#x201D; attribute on a &#x201C;map&#x201D; element must have an 
-				the same value as the &#x201C;name&#x201D; attribute.
-			</assert>
+		<rule context='h:frameset|h:noframes'>
+			<report test='true()'>
+				The &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;iframe&#x201D; element and CSS instead, or use server-side includes.
+			</report>
 		</rule>
+	</pattern>
 
-		<rule context='h:bdo[not(@dir)]'>
+	<!-- Obsolete Attributes- - - - - - - - - - - - - - - - - - - - - - -->
+
+	<pattern name="obsolete attributes">
+		<rule context='h:a|h:link'>
+			<report test='@coords and self::h:a'>
+				The &#x201C;coords&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use &#x201C;area&#x201D; instead of &#x201C;a&#x201D; for image maps.
+			</report>
+			<report test='@shape and self::h:a'>
+				The &#x201C;shape&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use &#x201C;area&#x201D; instead of &#x201C;a&#x201D; for image maps.
+			</report>
+			<report test='@urn and self::h:a'>
+				The &#x201C;urn&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Specify the preferred persistent identifier using the &#x201C;href&#x201D; attribute instead.
+			</report>
+			<report test='@target and self::h:link'>
+				The &#x201C;target&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				You can safely omit it.
+			</report>
+			<report test='@charset'>
+				The &#x201C;charset&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use an HTTP Content-Type header on the linked resource instead.
+			</report>
+			<report test='@methods'>
+				The &#x201C;methods&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the HTTP OPTIONS feature instead.
+			</report>
+			<report test='@rev'>
+				The &#x201C;rev&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;rel&#x201D; attribute instead, with a term having the opposite meaning.
+			</report>
+		</rule>
+
+		<rule context="h:area">
+			<report test='@nohref'>
+				The &#x201C;nohref&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Omitting the &#x201C;href&#x201D; attribute is sufficient.
+			</report>
+		</rule>
+
+		<rule context='h:embed'>
+			<report test='@name'>
+				The &#x201C;name&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;id&#x201D; attribute instead.
+			</report>
+		</rule>
+
+		<rule context='h:head'>
+			<report test='@profile'>
+				The &#x201C;profile&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				To declare which &#x201C;meta&#x201D; terms are used in the document, instead register the
+				names as meta extensions. &lt;http://wiki.whatwg.org/wiki/MetaExtensions>
+				To trigger specific UA behaviors, use a &#x201C;link&#x201D; element instead.
+			</report>
+		</rule>
+
+		<rule context='h:html'>
+			<report test='@version'>
+				The &#x201C;version&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				You can safely omit it.
+			</report>
+		</rule>
+
+		<rule context='h:iframe'>
+			<report test='@longdesc'>
+				The &#x201C;longdesc&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use a regular &#x201C;a&#x201D; element to link to the description.
+			</report>
+		</rule>
+
+		<rule context='h:img'>
+			<report test='@longdesc'>
+				The &#x201C;longdesc&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use a regular &#x201C;a&#x201D; element to link to the description.
+			</report>
+			<report test='@name'>
+				The &#x201C;name&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;id&#x201D; attribute instead.
+			</report>
+		</rule>
+
+		<rule context='h:input'>
+			<report test='@usemap'>
+				The &#x201C;usemap&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;img&#x201D; element instead of the &#x201C;input&#x201D; element for image maps.
+			</report>
+		</rule>
+
+		<rule context='h:li|h:ol|h:ul'>
+			<report test='@type'>
+				The &#x201C;type&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:meta'>
+			<report test='@scheme'>
+				The &#x201C;scheme&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use only one scheme per field, or make the scheme declaration part of the value.
+			</report>
+		</rule>
+
+		<rule context='h:object'>
+			<report test='@archive'>
+				The &#x201C;archive&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;data&#x201D; and &#x201C;type&#x201D; attributes to invoke plugins.
+				To set a parameter with the name &#x201C;archive&#x201D;, use the &#x201C;param&#x201D; element.
+			</report>
+			<report test='@classid'>
+				The &#x201C;classid&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;data&#x201D; and &#x201C;type&#x201D; attributes to invoke plugins.
+				To set a parameter with the name &#x201C;classid&#x201D;, use the &#x201C;param&#x201D; element.
+			</report>
+			<report test='@code'>
+				The &#x201C;code&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;data&#x201D; and &#x201C;type&#x201D; attributes to invoke plugins.
+				To set a parameter with the name &#x201C;code&#x201D;, use the &#x201C;param&#x201D; element.
+			</report>
+			<report test='@codebase'>
+				The &#x201C;codebase&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;data&#x201D; and &#x201C;type&#x201D; attributes to invoke plugins.
+				To set a parameter with the name &#x201C;codebase&#x201D;, use the &#x201C;param&#x201D; element.
+			</report>
+			<report test='@codetype'>
+				The &#x201C;codetype&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;data&#x201D; and &#x201C;type&#x201D; attributes to invoke plugins.
+				To set a parameter with the name &#x201C;codetype&#x201D;, use the &#x201C;param&#x201D; element.
+			</report>
+			<report test='@declare'>
+				The &#x201C;declare&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Repeat the &#x201C;object&#x201D; element completely each time the resource is to be reused.
+			</report>
+			<report test='@standby'>
+				The &#x201C;standby&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Optimise the linked resource so that it loads quickly or, at least, incrementally.
+			</report>
+		</rule>
+
+		<rule context='h:param'>
+			<report test='@type'>
+				The &#x201C;type&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;name&#x201D; and &#x201C;value&#x201D; attributes without declaring value types.
+			</report>
+			<report test='@valuetype'>
+				The &#x201C;valuetype&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;name&#x201D; and &#x201C;value&#x201D; attributes without declaring value types.
+			</report>
+		</rule>
+
+		<rule context='h:script[not(translate(@language, "JAVSCRIPT", "javscript")="javascript")]'>
 			<report test='true()'>
-				A &#x201C;bdo&#x201D; element must have an 
-				&#x201C;dir&#x201D; attribute.
+				The &#x201C;language&#x201D; attribute on the &#x201C;script&#x201D; element is obsolete.
+				Use the &#x201C;type&#x201D; attribute instead.
 			</report>
 		</rule>
 
+		<rule context='h:td|h:th'>
+			<report test='@scope and self::h:td'>
+				The &#x201C;scope&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;scope&#x201D; attribute on a &#x201C;th&#x201D; element instead.
+			</report>
+			<report test='@abbr'>
+				The &#x201C;abbr&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Consider instead beginning the cell contents with concise text, followed by further elaboration if needed.
+			</report>
+			<report test='@axis'>
+				The &#x201C;axis&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use the &#x201C;scope&#x201D; attribute.
+			</report>
+		</rule>
+	</pattern>
+
+	<pattern name="obsolete presentational align attribute">
+		<rule context='h:caption|h:iframe|h:img|h:input|h:object|h:embed|h:legend
+			|h:table|h:hr|h:div|h:h1|h:h2|h:h3|h:h4|h:h5|h:h6|h:p|h:col|h:colgroup
+			|h:tbody|h:td|h:tfoot|h:th|h:thead|h:tr'>
+			<report test='@align'>
+				The &#x201C;align&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+	</pattern>
+
+	<pattern name="obsolete presentational width attribute">
+		<rule context='h:col|h:colgroup|h:hr|h:pre|h:table|h:td|h:th'>
+			<report test='@width'>
+				The &#x201C;width&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+	</pattern>
+
+	<pattern name="obsolete presentational table attributes">
+		<rule context='h:col|h:colgroup|h:tbody|h:td|h:tfoot|h:th|h:thead|h:tr'>
+			<report test='@char'>
+				The &#x201C;char&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@charoff'>
+				The &#x201C;charoff&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@valign'>
+				The &#x201C;valign&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+	</pattern>
+
+	<pattern name="obsolete presentational attributes">
+		<rule context='h:body'>
+			<report test='@alink'>
+				The &#x201C;alink&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@background'>
+				The &#x201C;background&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@bgcolor'>
+				The &#x201C;bgcolor&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@link'>
+				The &#x201C;link&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@text'>
+				The &#x201C;text&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@vlink'>
+				The &#x201C;vlink&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:br'>
+			<report test='@clear'>
+				The &#x201C;clear&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:hr'>
+			<report test='@noshade'>
+				The &#x201C;noshade&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@size'>
+				The &#x201C;size&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:dl|h:menu|h:ol|h:ul'>
+			<report test='@compact'>
+				The &#x201C;compact&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:iframe'>
+			<report test='@frameborder'>
+				The &#x201C;frameborder&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@marginheight'>
+				The &#x201C;marginheight&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@marginwidth'>
+				The &#x201C;marginwidth&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@scrolling'>
+				The &#x201C;scrolling&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:img|h:object'>
+			<report test='@hspace'>
+				The &#x201C;hspace&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@vspace'>
+				The &#x201C;vspace&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@border and self::h:object'>
+				The &#x201C;border&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:table'>
+			<report test='@bgcolor'>
+				The &#x201C;bgcolor&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@border'>
+				The &#x201C;border&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@cellpadding'>
+				The &#x201C;cellpadding&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@cellspacing'>
+				The &#x201C;cellspacing&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@frame'>
+				The &#x201C;frame&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@rules'>
+				The &#x201C;rules&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:td|h:th'>
+			<report test='@bgcolor'>
+				The &#x201C;bgcolor&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@height'>
+				The &#x201C;height&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+			<report test='@nowrap'>
+				The &#x201C;nowrap&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
+
+		<rule context='h:tr'>
+			<report test='@bgcolor'>
+				The &#x201C;bgcolor&#x201D; attribute on the &#x201C;<name/>&#x201D; element is obsolete.
+				Use CSS instead. http://wiki.whatwg.org/wiki/Presentational_elements_and_attributes
+			</report>
+		</rule>
 	</pattern>
 
 <!-- lang and xml:lang in XHTML  - - - - - - - - - - - - - - - - - -->
@@ -355,18 +827,11 @@
 	<pattern name='lang and xml:lang in XHTML'>
 		<rule context='h:*[@lang and @xml:lang]'>
 			<assert test='translate(@lang, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz") = translate(@xml:lang, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'>
-				When the attribute &#x201C;lang&#x201D; is specified, the element must also have 
-				the attribute &#x201C;lang&#x201D; in the XML namespace present with the same 
-				value.
+				When the attribute &#x201C;lang&#x201D; in no namespace and the attribute 
+				&#x201C;lang&#x201D; in the XML namespace are both present, they must have the 
+				same value.
 			</assert>
 		</rule>
-		<rule context='h:*[@lang and not(@xml:lang)]'>
-			<report test='true()'>
-				When the attribute &#x201C;lang&#x201D; is specified, the element must also have 
-				the attribute &#x201C;lang&#x201D; in the XML namespace present with the same 
-				value.
-			</report>
-		</rule>
 	</pattern>
 
 <!-- IDREFs  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -382,33 +847,10 @@
 		</rule>
 	</pattern>
 
-	<pattern name='list on input must refer to a select or a datalist'>
-		<rule context='h:input[@list]'>
-			<assert test='//h:datalist[@id = current()/@list] or 
-			              //h:select[@id = current()/@list]'>
-				The &#x201C;list&#x201D; attribute of the &#x201C;input&#x201D; 
-				element must refer to a &#x201C;datalist&#x201D; element or to 
-				a &#x201C;select&#x201D; element.
-			</assert>
-		</rule>
-	</pattern>
-		
 	<!-- FIXME form attribute -->
 	
 	<!-- FIXME output for -->
 	
-<!-- Form Constraints  - - - - - - - - - - - - - - - - - - - - - - -->
-
-	<pattern name='Non-multiple select can have up to one selected option'>
-		<rule context='h:select[not(@multiple)]'>
-			<report test='count(descendant::h:option[@selected]) > 1'>
-				The &#x201C;select&#x201D; element cannot have more than one 
-				selected &#x201C;option&#x201D; descendant unless the 
-				&#x201C;multiple&#x201D; attribute is specified.
-			</report>
-		</rule>
-	</pattern>
-
 <!-- Unique Definitions  - - - - - - - - - - - - - - - - - - - - - -->
 	
 	<!-- Only one definition per term per document' -->

Index: media.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/media.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- media.rnc	29 Aug 2009 01:43:08 -0000	1.1
+++ media.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -110,17 +110,3 @@
 	common.elem.flow |= audio.elem.flow
 	common.elem.phrasing |= audio.elem.phrasing
 
-## Captioned Content: <figure>
-
-	figure.elem =
-		element figure { figure.inner & figure.attrs }
-	figure.attrs =
-		(	common.attrs
-		&	common.attrs.aria.implicit.img?
-		)
-	figure.inner =
-		(	( legend.elem, common.inner.flow )
-		|	( common.inner.flow, legend.elem? )
-		)
-
-	common.elem.flow |= figure.elem

Index: aria.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/aria.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aria.rnc	29 Aug 2009 01:43:07 -0000	1.1
+++ aria.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -756,6 +756,7 @@
 			attribute role { string "note" }
 	
 	common.attrs.aria |= aria.note
+	common.attrs.aria.landmark.note |= aria.note
 
 ## option
 	aria.option =
@@ -848,6 +849,7 @@
 			attribute role { string "search" }
 	
 	common.attrs.aria |= aria.search
+	common.attrs.aria.landmark.search |= aria.search
 
 ## separator
 	aria.separator =

Index: web-forms.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/web-forms.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- web-forms.rnc	29 Aug 2009 01:43:08 -0000	1.1
+++ web-forms.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -471,7 +471,9 @@
 		&	form.attrs.enctype?
 		&	common-form.attrs.name?
 		&	form.attrs.accept-charset?
-		&	common.attrs.aria.implicit.region?
+		&	(	common.attrs.aria
+			|	common.attrs.aria.implicit.region
+			)?
 		)
 		form.attrs.action =
 			attribute action {

Index: core-scripting.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/core-scripting.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- core-scripting.rnc	29 Aug 2009 01:43:07 -0000	1.1
+++ core-scripting.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -49,15 +49,12 @@
 			}
 		script.attrs.language =
 			attribute language {
-				common.data.javascript
+				string
 			}
-			common.data.javascript =
-				w:string "javascript"
-		
 	script.inner.embedded =
-		( non-replaceable-character-data )
+		( common.inner.anything )
 	script.inner.imported =
-		( empty )
+		( common.inner.anything )
 		
 	script.elem = 
 		(	script.elem.embedded

Index: tables.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/tables.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tables.rnc	29 Aug 2009 01:43:08 -0000	1.1
+++ tables.rnc	28 Jan 2010 17:11:53 -0000	1.2
@@ -81,7 +81,7 @@
 		&	common.attrs.aria.implicit.region?
 		)
 	caption.inner =
-		( common.inner.phrasing )
+		( common.inner.flow )
 
 # #####################################################################
 ## Table Super Structure
Received on Thursday, 28 January 2010 17:12:01 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 28 January 2010 17:12:01 GMT