Merge branch 'develop' into bug/JAL-2934proportionalScrolling

[jalview.git] / schemas / jalview.xsd

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index e7cb580..c5d35fb 100755 (executable)
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -496,9 +496,13 @@
                                                        use="optional" default="true" />
                                                <xs:attribute name="startRes" type="xs:int" />
                                                <xs:attribute name="startSeq" type="xs:int" />
+                                               <xs:attribute name="charWidth" type="xs:int" />
+                                               <xs:attribute name="charHeight" type="xs:int" />
                                                <xs:attribute name="fontName" type="xs:string" />
                                                <xs:attribute name="fontSize" type="xs:int" />
                                                <xs:attribute name="fontStyle" type="xs:int" />
+                                               <xs:attribute name="idWidth" type="xs:int" />
+                                               <xs:attribute name="idWidthManuallyAdjusted" type="xs:boolean" />
                                                <xs:attribute name="scaleProteinAsCdna" type="xs:boolean" use="optional" default="true" />
                                                <xs:attribute name="viewName" type="xs:string" />
                                                <xs:attribute name="sequenceSetId" type="xs:string" />
@@ -552,6 +556,8 @@
                                                <xs:attribute name="markUnlinked" type="xs:boolean" />
                                                <xs:attribute name="fitToWindow" type="xs:boolean" />
                                                <xs:attribute name="currentTree" type="xs:boolean" />
+                                               <xs:attribute name="columnWise" type="xs:boolean" use="optional" default="false"><xs:annotation><xs:documentation>Set for trees associated with columns of an alignment, sequence or annotation row</xs:documentation></xs:annotation></xs:attribute>
+                                               <xs:attribute name="columnReference" type="xs:string" use="optional"><xs:annotation><xs:documentation>Refers to annotation row the tree is provided by</xs:documentation></xs:annotation></xs:attribute>
                                                <xs:attribute name="id" type="xs:ID" use="optional">
                                                        <xs:annotation>
                                                                <xs:documentation>