git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@123 ab42f6e…

…0-554d-0410-b580-99e487e6eeb2

shared/xsd/lcf.xsd

@@ -45,11 +45,15 @@
   <xsd:complexType name="shortcuttype">
     <xsd:sequence>
       <xsd:element name="name" type="xsd:string" />
-      <xsd:element name="definition" type="lcf:mixedwithexpands"/>
+      <xsd:element name="definition">
+        <xsd:complexType mixed="true">
+           <group ref="lcf:mixedwithexpands"/>
+        <xsd:complexType>
+      </xsd:element>
     </xsd:sequence>
   </xsd:complexType>
 
-  <xsd:complexType name="mixedwithexpands" mixed="true">
+  <xsd:group name="mixedwithexpands">
     <xsd:sequence>
       <xsd:choice minOccurs="0" maxOccurs="unbounded">
         <xsd:element name="expand" type="xsd:string" />
@@ -85,14 +89,12 @@
         </xsd:element>
       </xsd:choice>
     </xsd:sequence>
-  </xsd:complexType>
+  </xsd:group>
 
   <xsd:complexType name="commandtype" mixed="true">
-    <xsd:complexContent>
-      <xsd:extension base="lcf:mixedwithexpands">
-        <xsd:attribute name="err" type="xsd:string" use="optional" />
-        <xsd:attribute name="out" type="xsd:string" use="optional" />
-      </xsd:extension>
+      <group ref="lcf:mixedwithexpands"/>
+      <xsd:attribute name="err" type="xsd:string" use="optional" />
+      <xsd:attribute name="out" type="xsd:string" use="optional" />
     </xsd:complexContent>
   </xsd:complexType>
 
@@ -103,7 +105,11 @@
       <xsd:element name="arguments">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element maxOccurs="unbounded" name="argument" type="lcf:mixedwithexpands"/>
+            <xsd:element maxOccurs="unbounded" name="argument">
+               <xsd:complexType mixed="true">
+                  <group ref="lcf:mixedwithexpands"/>
+               <xsd:complexType>
+            </xsd:element>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>