www-lcsim/schemas/compact/1.0

diff -u -r1.1 -r1.2
--- compact.xsd	22 Mar 2006 00:29:59 -0000	1.1
+++ compact.xsd	17 Sep 2006 01:14:27 -0000	1.2
@@ -125,6 +125,48 @@

     </xs:complexType>
   </xs:element>
 

+  <xs:element name="display">
+    <xs:complexType>
+      <xs:sequence>
+	<xs:element name="vis" minOccurs="0" maxOccurs="unbounded">
+	  <xs:complexType>
+
+	    <xs:attribute name="name" type="xs:string" use="required" />
+
+	    <xs:attribute name="r" type=" xs:double " default="1.0" />
+	    <xs:attribute name="g" type=" xs:double " default="1.0" />
+	    <xs:attribute name="b" type=" xs:double " default="1.0" />
+	    <xs:attribute name="alpha" type=" xs:double " default="1.0" />
+
+	    <xs:attribute name="visible" type="xs:boolean" default="true"/>
+
+	    <xs:attribute name="showDaughters" type="xs:boolean" default="true"/>
+
+	    <xs:attribute name="lineStyle" default="unbroken">
+	      <xs:simpleType>
+		<xs:restriction base="xs:string">
+		  <xs:enumeration value="unbroken"/>
+		  <xs:enumeration value="dashed"/>
+		  <xs:enumeration value="dotted"/>
+		</xs:restriction>
+	      </xs:simpleType>
+	    </xs:attribute>
+
+	    <xs:attribute name="drawingStyle" default="wireframe">
+	      <xs:simpleType>
+		<xs:restriction base="xs:string">
+		  <xs:enumeration value="wireframe"/>
+		  <xs:enumeration value="solid"/>
+		</xs:restriction>
+	      </xs:simpleType>
+	    </xs:attribute>
+
+	  </xs:complexType>
+	</xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+

   <xs:element name="detectors">
     <xs:complexType>
       <xs:sequence>

@@ -156,7 +198,7 @@

 		      </xs:complexType>
 		    </xs:element>
 		  </xs:sequence>

-<!--		  <xs:attribute name="id" type="xs:integer" use="optional" /> -->

+		  <!--		  <xs:attribute name="id" type="xs:integer" use="optional" /> -->

 		  <xs:anyAttribute processContents="lax"/> <!-- layer -->
 		</xs:complexType>
 	      </xs:element>

@@ -202,6 +244,9 @@

       <xs:sequence>
 	<xs:element name="field" minOccurs="0" maxOccurs="unbounded">
 	  <xs:complexType>

+	    <xs:sequence>
+	      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+	    </xs:sequence>

 	    <xs:attribute name="name" type="xs:string" use="required"/>
 	    <xs:attribute name="type" type="xs:string" use="required"/>
 	    <xs:anyAttribute processContents="lax"/>

@@ -219,12 +264,13 @@

 	<xs:element ref="materials" minOccurs="1" maxOccurs="1"/>
 	<xs:element ref="limits" minOccurs="0" maxOccurs="1"/>
 	<xs:element ref="regions" minOccurs="0" maxOccurs="1"/>

+	<xs:element ref="display" minOccurs="0" maxOccurs="1"/>

 	<xs:element ref="detectors" minOccurs="1" maxOccurs="1"/>
 	<xs:element ref="readouts" minOccurs="1" maxOccurs="1"/>

-	<xs:element ref="fields" minOccurs="1" maxOccurs="1"/>

+	<xs:element ref="fields" minOccurs="0" maxOccurs="1"/>

       </xs:sequence>
       <xs:attribute fixed="1.0.0" name="version" type="xs:string"/>
     </xs:complexType>
   </xs:element>
 

-</xs:schema>

\ No newline at end of file

+</xs:schema>