html5/markup/schema applications.rnc,1.2,1.3 assertions.sch,1.3,1.4

Update of /sources/public/html5/markup/schema
In directory hutz:/tmp/cvs-serv29618/schema

Modified Files:
	applications.rnc assertions.sch 
Log Message:
added figcaption and summary; made tweaks to build files so that we can generate a WHATWG copy


Index: applications.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema/applications.rnc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- applications.rnc	28 Jan 2010 17:11:53 -0000	1.2
+++ applications.rnc	2 Feb 2010 17:04:54 -0000	1.3
@@ -243,3 +243,31 @@
 	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 =
+		(	summary.elem?
+		,	common.inner.flow 
+		)
+	
+	common.elem.flow |= details.elem
+
+## Caption/summary for details element: <summary>
+
+	summary.elem =
+		element summary { summary.inner & summary.attrs }
+	summary.attrs =
+		( common.attrs )
+	summary.inner =
+		( common.inner.phrasing )

Index: assertions.sch
===================================================================
RCS file: /sources/public/html5/markup/schema/assertions.sch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- assertions.sch	1 Feb 2010 11:33:27 -0000	1.3
+++ assertions.sch	2 Feb 2010 17:04:54 -0000	1.4
@@ -19,59 +19,6 @@
 				&#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'>

Received on Tuesday, 2 February 2010 17:05:02 UTC