lo and behold: the xstring!

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@147 ab42f6e0-554d-0410-b580-99e487e6eeb2
grammarware · Aug 6, 2008 · 0d4a544 · 0d4a544
1 parent 416c555
commit 0d4a544
Showing 1 changed file with 14 additions and 35 deletions.
diff --git a/shared/xsd/lcf.xsd b/shared/xsd/lcf.xsd
@@ -43,33 +43,16 @@
     </xsd:annotation>
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string" />
-      <xsd:element name="expansion">
-        <xsd:complexType mixed="true">
+      <xsd:element name="expansion" type="lcf:xstring">
           <xsd:annotation>
             <xsd:documentation>
               Shortcuts can be defined on basis of other shortcuts defined before them in the LCF file.
             </xsd:documentation>
           </xsd:annotation>
-          <xsd:sequence>
-            <xsd:element name="expand" type="xsd:string"  minOccurs="0" maxOccurs="unbounded"/>
-          </xsd:sequence>
-        </xsd:complexType>
       </xsd:element>
     </xsd:sequence>
   </xsd:complexType>
 
-  <xsd:complexType name="commandType" mixed="true">
-    <xsd:annotation>
-      <xsd:documentation>
-        A command in LCF is something that is possible to run with a given shell.
-        An expand in LCF is a way to use shortcuts.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="expand" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
   <xsd:complexType name="sourceType">
     <xsd:annotation>
       <xsd:documentation>
@@ -84,34 +67,22 @@
       <xsd:element name="extraction">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element name="name">
-              <xsd:complexType mixed="true">
-                <xsd:sequence>
-                  <xsd:element name="expand" type="xsd:string"  minOccurs="0" maxOccurs="unbounded"/>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-            <xsd:element maxOccurs="unbounded" name="argument">
-              <xsd:complexType mixed="true">
-                <xsd:sequence>
-                  <xsd:element name="expand" type="xsd:string"  minOccurs="0" maxOccurs="unbounded"/>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
+            <xsd:element name="name" type="lcf:xstring"/>
+            <xsd:element maxOccurs="unbounded" name="argument" type="lcf:xstring"/>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
       <xsd:element name="parsing" minOccurs="0">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element name="command" type="lcf:commandType"/>
+            <xsd:element name="command" type="lcf:xstring"/>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
       <xsd:element name="evaluation" minOccurs="0">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element name="command" type="lcf:commandType"/>
+            <xsd:element name="command" type="lcf:xstring"/>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
@@ -171,7 +142,7 @@
     </xsd:annotation>
     <xsd:sequence>
       <xsd:element name="name" type="lcf:tool"/>
-      <xsd:element name="command" type="lcf:commandType"/>
+      <xsd:element name="command" type="lcf:xstring"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -183,4 +154,12 @@
       <xsd:enumeration value="transformation"/>
     </xsd:restriction>
   </xsd:simpleType>
+
+  <xsd:complexType name="xstring" mixed="true">
+    <xsd:sequence>
+      <xsd:element name="expand" type="xsd:string"  minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+
 </xsd:schema>