Merge branch 'develop' into merge/big_merge_of_bens_stuff_before_2_11_3_0

[jalview.git] / schemas / jalview.xsd

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index e7cb580..adaa3ee 100755 (executable)
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -496,6 +496,8 @@
                                                        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" />
@@ -552,6 +554,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>