diff test-schema.xsd @ 606:65c7223bd817 Dev_main

Merge

--- a/test-schema.xsd	Wed Mar 09 15:00:19 2016 +0000
+++ b/test-schema.xsd	Thu Mar 10 17:08:10 2016 +0000
@@ -9,6 +9,21 @@
   <xs:attribute name="id" type="xs:ID"/>
   <xs:attribute name="mandatory" type="xs:boolean"/>
   <xs:attribute name="name" type="xs:string"/>
+
+  <xs:attribute name="preSilence" default="0">
+      <xs:simpleType>
+          <xs:restriction base="xs:decimal">
+              <xs:minInclusive value="0.0"/>
+          </xs:restriction>
+      </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="postSilence" default="0">
+      <xs:simpleType>
+          <xs:restriction base="xs:decimal">
+              <xs:minInclusive value="0.0"/>
+          </xs:restriction>
+      </xs:simpleType>
+  </xs:attribute>
   
   <!-- define complex elements-->
   <xs:element name="waet">
@@ -23,6 +38,7 @@
   <xs:element name="setup">
     <xs:complexType>
       <xs:sequence>
+        <xs:element name="exitText" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element ref="survey" minOccurs="0" maxOccurs="2"/>
         <xs:element ref="metric" maxOccurs="1"/>
         <xs:element ref="interface" maxOccurs="1"/>
@@ -33,6 +49,9 @@
       <xs:attribute name="testPages" type="xs:nonNegativeInteger" default="0"/>
       <xs:attribute name="loudness" type="xs:nonPositiveInteger" use="optional"/>
       <xs:attribute name="sampleRate" type="xs:positiveInteger" use="optional"/>
+      <xs:attribute name="calibration" type="xs:boolean" default="false"/>
+      <xs:attribute ref="preSilence"/>
+      <xs:attribute ref="postSilence"/>
     </xs:complexType>
   </xs:element>
 
@@ -51,8 +70,22 @@
       <xs:attribute name="randomiseOrder" type="xs:boolean" default="false"/>
       <xs:attribute name="repeatCount" type="xs:nonNegativeInteger" default="0"/>
       <xs:attribute name="loop" type="xs:boolean" default="false"/>
+      <xs:attribute name="synchronous" type="xs:boolean" default="false"/>
       <xs:attribute name="showElementComments" type="xs:boolean" default="false"/>
       <xs:attribute name="loudness" type="xs:nonPositiveInteger" use="optional"/>
+      <xs:attribute name="label" use="optional" default="default">
+          <xs:simpleType>
+              <xs:restriction base="xs:string">
+                  <xs:enumeration value="default"/>
+                  <xs:enumeration value="none"/>
+                  <xs:enumeration value="number"/>
+                  <xs:enumeration value="letter"/>
+                  <xs:enumeration value="capital"/>
+              </xs:restriction>
+          </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute ref="preSilence"/>
+      <xs:attribute ref="postSilence"/>
     </xs:complexType>
   </xs:element>
 
@@ -136,6 +169,8 @@
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute name="loudness" type="xs:nonPositiveInteger" use="optional"/>
+      <xs:attribute ref="preSilence"/>
+      <xs:attribute ref="postSilence"/>
     </xs:complexType>
   </xs:element>