graphColour, graphGroup, more relaxed annotation requirements

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index ace83dd..a18648f 100755 (executable)
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -9,9 +9,9 @@
                                                <xs:element name="Annotation" minOccurs="0">\r
                                                        <xs:complexType>\r
                                                                <xs:sequence>\r
-                                                                       <xs:element ref="vamsas:annotationElement" maxOccurs="unbounded"/>\r
+                                                                       <xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>\r
                                                                        <xs:element name="label" type="xs:string"/>\r
-                                                                       <xs:element name="description" type="xs:string"/>\r
+                                                                       <xs:element name="description" type="xs:string" minOccurs="0"/>\r
                                                                        <xs:element name="thresholdLine" minOccurs="0">\r
                                                                                <xs:complexType>\r
                                                                                        <xs:attribute name="label" type="xs:string"/>\r
@@ -23,6 +23,8 @@
                                                                <xs:attribute name="graph" type="xs:boolean" use="required"/>\r
                                                                <xs:attribute name="graphType" type="xs:int" use="optional"/>\r
                                                                <xs:attribute name="sequenceRef" type="xs:string" use="optional"/>\r
+                                                               <xs:attribute name="graphColour" type="xs:int" use="optional"/>\r
+                                                               <xs:attribute name="graphGroup" type="xs:int" use="optional"/>\r
                                                        </xs:complexType>\r
                                                </xs:element>\r
                                                <xs:element ref="vamsas:SequenceSet"/>\r
@@ -58,18 +60,19 @@
        <xs:element name="annotationElement">\r
                <xs:complexType>\r
                        <xs:sequence>\r
-                               <xs:element name="displayCharacter" type="xs:string"/>\r
-                               <xs:element name="description" type="xs:string"/>\r
-                               <xs:element name="secondaryStructure">\r
+                               <xs:element name="displayCharacter" type="xs:string" minOccurs="0"/>\r
+                               <xs:element name="description" type="xs:string" minOccurs="0"/>\r
+                               <xs:element name="secondaryStructure" minOccurs="0">\r
                                        <xs:simpleType>\r
                                                <xs:restriction base="xs:string">\r
                                                        <xs:length value="1"/>\r
                                                </xs:restriction>\r
                                        </xs:simpleType>\r
                                </xs:element>\r
-                               <xs:element name="value" type="xs:float"/>\r
+                               <xs:element name="value" type="xs:float" minOccurs="0"/>\r
                        </xs:sequence>\r
                        <xs:attribute name="position" type="xs:int" use="required"/>\r
+                       <xs:attribute name="colour" type="xs:int" use="optional"/>\r
                </xs:complexType>\r
        </xs:element>\r
        <xs:complexType name="SequenceType">\r