Mercurial > hg > xformsusers / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset
Made xforms schema in sync with the new Control.Common.Attrs attribute group from the spec default tip
authorNick Van den Bleeken <nick@bleeken.eu>
Fri, 31 Oct 2014 13:54:22 -0700
changeset 24 1180ef4957b0
parent 23 e93013b4a347
Made xforms schema in sync with the new Control.Common.Attrs attribute group from the spec
2.0/core/schema/xsd/XForms-20-Schema.xsd 
--- a/2.0/core/schema/xsd/XForms-20-Schema.xsd	Fri Oct 31 11:40:07 2014 -0700
+++ b/2.0/core/schema/xsd/XForms-20-Schema.xsd	Fri Oct 31 13:54:22 2014 -0700
@@ -261,8 +261,18 @@
 		</xsd:choice>
 	</xsd:group>
 
+	<xsd:attributeGroup name="Control.Common.Attrs">
+		<xsd:attributeGroup ref="xforms:Common.Attributes"/>
+		<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
+		<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
+		<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
+	</xsd:attributeGroup>
+
 	<xsd:attributeGroup name="UI.Common.Attrs">
-		<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
+		<xsd:attribute name="label" type="xsd:string" use="optional"/>
+		<xsd:attribute name="help" type="xsd:string" use="optional"/>
+		<xsd:attribute name="hint" type="xsd:string" use="optional"/>
+		<xsd:attribute name="alert"" type="xsd:string" use="optional"/>
 	</xsd:attributeGroup>
 
 	<xsd:group name="UI.Content">
@@ -277,6 +287,7 @@
 	<xsd:group name="UI.Common">
 		<xsd:sequence>
 			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:element ref="xforms:label"/>
 				<xsd:element ref="xforms:help"/>
 				<xsd:element ref="xforms:hint"/>
 				<xsd:element ref="xforms:alert"/>
@@ -290,24 +301,28 @@
 	<xsd:complexType name="LabelType" mixed="true">
 		<xsd:group ref="xforms:UI.Content"/>
 		<xsd:attributeGroup ref="xforms:Common.Attributes"/>
+		<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
 		<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
 	</xsd:complexType>
 	<xsd:element name="hint" type="xforms:HintType"/>
 	<xsd:complexType name="HintType" mixed="true">
 		<xsd:group ref="xforms:UI.Content"/>
 		<xsd:attributeGroup ref="xforms:Common.Attributes"/>
+		<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
 		<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
 	</xsd:complexType>
 	<xsd:element name="help" type="xforms:HelpType"/>
 	<xsd:complexType name="HelpType" mixed="true">
 		<xsd:group ref="xforms:UI.Content" />
 		<xsd:attributeGroup ref="xforms:Common.Attributes" />
+		<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
 		<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes" />
 	</xsd:complexType>
 	<xsd:element name="alert" type="xforms:AlertType"/>
 	<xsd:complexType name="AlertType" mixed="true">
 		<xsd:group ref="xforms:UI.Content"/>
 		<xsd:attributeGroup ref="xforms:Common.Attributes"/>
+		<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
 		<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
 	</xsd:complexType>
 	<xsd:group name="List.UI.Common">
@@ -322,11 +337,12 @@
 	<xsd:element name="item">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
 				<xsd:element ref="xforms:value"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
+			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
+			<xsd:attribute name="value" type="xforms:XPathExpression" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="itemset">
@@ -356,6 +372,7 @@
 				</xsd:sequence>
 			</xsd:sequence>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
+			<xsd:attribute name="label" type="xsd:string" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 
@@ -409,72 +426,54 @@
 	<xsd:element name="input">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="inputmode" type="xsd:string" use="optional"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
 			<xsd:attribute name="incremental" type="xsd:boolean" use="optional" default="false"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="secret">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="inputmode" type="xsd:string" use="optional"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
 			<xsd:attribute name="incremental" type="xsd:boolean" use="optional" default="false"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="textarea">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="inputmode" type="xsd:string" use="optional"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
 			<xsd:attribute name="incremental" type="xsd:boolean" use="optional" default="false"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="upload">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
-				<!--
-				<xsd:element ref="xforms:filename" minOccurs="0"/>
-				<xsd:element ref="xforms:mediatype" minOccurs="0"/>
-				-->
 				<xsd:element name="filename" type="xforms:filename" minOccurs="0"/>
 				<xsd:element name="mediatype" type="xforms:mediatype" minOccurs="0"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
+			<xsd:attribute name="accept" type="xsd:string" use="optional"/>
 			<xsd:attribute name="mediatype" type="xsd:string" use="optional"/>
-			<xsd:attribute name="accept" type="xsd:string" use="optional"/>
 			<xsd:attribute name="incremental" type="xsd:boolean" use="optional" default="false"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="select1">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
+				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 				<xsd:group ref="xforms:List.UI.Common" maxOccurs="unbounded"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="selection" use="optional" default="closed">
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
@@ -489,13 +488,11 @@
 	<xsd:element name="select">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
+				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 				<xsd:group ref="xforms:List.UI.Common" maxOccurs="unbounded"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="selection" use="optional" default="closed">
 				<xsd:simpleType>
 					<xsd:restriction base="xsd:string">
@@ -510,12 +507,9 @@
 	<xsd:element name="range">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="start" type="xsd:string" use="optional"/>
 			<xsd:attribute name="end" type="xsd:string" use="optional"/>
 			<xsd:attribute name="step" type="xsd:string" use="optional"/>
@@ -525,27 +519,21 @@
 	<xsd:element name="trigger">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label" minOccurs="0"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 		</xsd:complexType>
 	</xsd:element>
-	<xsd:element name="output">
+	<xsd:element name="output"> 
 		<xsd:complexType>
 			<xsd:sequence minOccurs="0">
-				<xsd:element ref="xforms:label" minOccurs="0"/>
 				<!--
 				<xsd:element ref="xforms:mediatype" minOccurs="0"/>
 				-->
 				<xsd:element name="mediatype" type="xforms:mediatypeWithValue" minOccurs="0"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="value" type="xforms:XPathExpression" use="optional"/>
 			<xsd:attribute name="mediatype" type="xsd:string" use="optional"/>
 		</xsd:complexType>
@@ -553,13 +541,10 @@
 	<xsd:element name="submit">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element ref="xforms:label"/>
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
+			<xsd:attributeGroup ref="xforms:Control.Common.Attrs"/>
 			<xsd:attribute name="submission" type="xsd:IDREF" use="optional"/>
-			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
 		</xsd:complexType>
 	</xsd:element>
xformsusers

Hosted by W3C Systems Team, please report bugs to sysreq@w3.org