X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fjalview.xsd;h=3df295114475d1a83d1739be99c358015d248a38;hb=a59b6146fab5f59c80b54b5ee60d977c62b15d08;hp=6c1e65fc633feb739077f68c9d822a2ecddf72ca;hpb=5b8b9fc6c16fe252fefb8ccc73358a2f215801e4;p=jalview.git

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 6c1e65f..3df2951 100755
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vamsas="www.vamsas.ac.uk/jalview/version2" xmlns:jalview="www.jalview.org/colours" xmlns:jv="www.jalview.org" targetNamespace="www.jalview.org" elementFormDefault="qualified" attributeFormDefault="unqualified">
-<xs:import namespace="www.vamsas.ac.uk/jalview/version2" schemaLocation="vamsas.xsd"/>
-<xs:import namespace="www.jalview.org/colours" schemaLocation="JalviewUserColours.xsd"/>
+	<xs:import namespace="www.vamsas.ac.uk/jalview/version2" schemaLocation="vamsas.xsd"/>
+	<xs:import namespace="www.jalview.org/colours" schemaLocation="JalviewUserColours.xsd"/>
 	<xs:complexType name="JalviewModel">
 		<xs:sequence>
 			<xs:element name="creationDate" type="xs:dateTime"/>
@@ -73,9 +73,6 @@
 						<xs:attribute name="renderGaps" type="xs:boolean"/>
 						<xs:attribute name="showSequenceFeatures" type="xs:boolean"/>
 						<xs:attribute name="showAnnotation" type="xs:boolean"/>
-						<xs:attribute name="showConservation" type="xs:boolean"/>
-						<xs:attribute name="showQuality" type="xs:boolean"/>
-						<xs:attribute name="showIdentity" type="xs:boolean"/>
 						<xs:attribute name="xpos" type="xs:int"/>
 						<xs:attribute name="ypos" type="xs:int"/>
 						<xs:attribute name="width" type="xs:int"/>
@@ -85,6 +82,9 @@
 						<xs:attribute name="fontName" type="xs:string"/>
 						<xs:attribute name="fontSize" type="xs:int"/>
 						<xs:attribute name="fontStyle" type="xs:int"/>
+						<xs:attribute name="viewName" type="xs:string"/>
+						<xs:attribute name="sequenceSetId" type="xs:string"/>
+						<xs:attribute name="gatheredViews" type="xs:boolean"/>
 					</xs:complexType>
 				</xs:element>
 				<xs:element name="UserColours" minOccurs="0" maxOccurs="unbounded">
@@ -133,12 +133,21 @@
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="feature">
+		<xs:sequence>
+			<xs:element name="otherData" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:attribute name="key" type="xs:string" use="required"/>
+					<xs:attribute name="value" type="xs:string" use="required"/>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
 		<xs:attribute name="begin" type="xs:int" use="required"/>
 		<xs:attribute name="end" type="xs:int" use="required"/>
 		<xs:attribute name="type" type="xs:string" use="required"/>
 		<xs:attribute name="description" type="xs:string" use="optional"/>
 		<xs:attribute name="status" type="xs:string" use="optional"/>
 		<xs:attribute name="featureGroup" type="xs:string" use="optional"/>
+		<xs:attribute name="score" type="xs:float" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="pdbentry">
 		<xs:sequence minOccurs="0" maxOccurs="unbounded">