diff -u -r1.2 -r1.3
--- lcdd.xsd	8 Jul 2005 17:47:27 -0000	1.2
+++ lcdd.xsd	8 Jul 2005 23:22:37 -0000	1.3
@@ -30,7 +30,7 @@

 	  <xs:sequence>
 	    <xs:element minOccurs="0" maxOccurs="1" name="sdref" type="ReferenceType"/>
 	    <xs:element minOccurs="0" maxOccurs="1" name="regionref" type="ReferenceType"/>

-	    <xs:element minOccurs="0" maxOccurs="1" name="limitref" type="ReferenceType"/>

+<!--	    <xs:element minOccurs="0" maxOccurs="1" name="limitref" type="ReferenceType"/> -->

 	    <xs:element minOccurs="0" maxOccurs="1" name="limitsetref" type="ReferenceType"/>
 	    <xs:element minOccurs="0" maxOccurs="1" name="visref" type="ReferenceType" />
 	  </xs:sequence>

diff -u -r1.6 -r1.7
--- limits.xsd	8 Jul 2005 17:45:38 -0000	1.6
+++ limits.xsd	8 Jul 2005 23:22:37 -0000	1.7
@@ -12,13 +12,13 @@

 	A single Geant4 user limit parameter.
       </xs:documentation>
     </xs:annotation>

-    <xs:attribute name="name" type="xs:string" />
-    <xs:attribute name="particles" type="xs:string" />
-    <xs:attribute name="value" type="xs:double" />
-    <xs:attribute name="unit" type="xs:string" />

+    <xs:attribute name="name" type="xs:string" use="required" />
+    <xs:attribute name="value" type="xs:double" use="required" />
+    <xs:attribute name="unit" type="xs:string" use="required" />
+    <xs:attribute name="particles" type="xs:string" default="*"/>

   </xs:complexType>
 

-  <xs:element name="limitp" type="LimitParamType" />

+  <xs:element name="limit" type="LimitParamType" />

 
   <xs:complexType name="LimitSetType">
     <xs:annotation>

@@ -34,6 +34,7 @@

 
   <xs:element name="limitset" type="LimitSetType" />
 

+  <!--

   <xs:complexType name="UserLimitType">
     <xs:annotation>
       <xs:documentation>

@@ -41,25 +42,23 @@

       </xs:documentation>
     </xs:annotation>
 

-    <!-- id -->

     <xs:attribute name="name"             type="xs:ID" />

-
-    <!-- user limit settings -->

     <xs:attribute name="step_length_max"  type="xs:double" default="0.0" />
     <xs:attribute name="track_length_max" type="xs:double" default="0.0" />
     <xs:attribute name="time_max"         type="xs:double" default="0.0"/>
     <xs:attribute name="ekin_min"         type="xs:double" default="0.0"/>
     <xs:attribute name="range_min"        type="xs:double" default="0.0"/>

-
-    <!-- units -->

     <xs:attribute name="eunit" type="xs:string" default="MeV" />
     <xs:attribute name="lunit" type="xs:string" default="mm" />
     <xs:attribute name="tunit" type="xs:string" default="ns" />
 
   </xs:complexType>

+  -->

+  <!--

   <xs:element name="limit" type="UserLimitType">
   </xs:element>

+  -->

 
   <xs:complexType name="UserLimitsType">
     <xs:annotation>

@@ -67,12 +66,11 @@

       </xs:documentation>
     </xs:annotation>
     <xs:sequence>

-      <xs:element ref="limit" minOccurs="0" maxOccurs="unbounded" />

+<!--      <xs:element ref="limit" minOccurs="0" maxOccurs="unbounded" /> -->

       <xs:element ref="limitset" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
   </xs:complexType>
 

-  <xs:element name="limits" type="UserLimitsType">
-  </xs:element>

+  <xs:element name="limits" type="UserLimitsType" />

 
 </xs:schema>

\ No newline at end of file