fixing errors: ok, every kvtml file version 2.0 should be able to pass the test at...

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=711841

diff --git a/keduvocdocument/kvtml2.xsd b/keduvocdocument/kvtml2.xsd
index ad04efd53ab77ace8ba27ce6e5b4dbcc4f70ec76..d965c14eee585aaff4a6a2e63a92b552f811f6ac 100644 (file)
--- a/keduvocdocument/kvtml2.xsd
+++ b/keduvocdocument/kvtml2.xsd
@@ -71,14 +71,6 @@
           </complexType>
         </element>
         
-        <element name="tenses" minOccurs="0">
-          <complexType>
-            <sequence>
-              <element name="tense" minOccurs="0" maxOccurs="unbounded" />
-            </sequence>
-          </complexType>
-        </element>
-        
         <element name="usages" minOccurs="0">
           <complexType>
             <sequence>
@@ -87,23 +79,6 @@
           </complexType>
         </element>
         
-        <element name="lessons" minOccurs="0">
-          <complexType>
-            <sequence>
-              <element name="lesson" minOccurs="0" maxOccurs="unbounded">
-                <complexType>
-                  <sequence>
-                    <element name="name" />
-                    <element name="query" minOccurs="0" />
-                    <element name="current" minOccurs="0" />
-                    <element name="entryid" minOccurs="0" maxOccurs="unbounded" />
-                  </sequence>
-                </complexType>
-              </element>
-            </sequence>
-          </complexType>
-        </element>
-        
         <element name="entries">
           <complexType>
             <sequence>
@@ -119,15 +94,15 @@
                           <element name="text" />
                           <element name="wordtype" minOccurs="0">
                             <complexType>
-                              <choice>
+                              <sequence>
                                 <element name="typename" minOccurs="0" />
                                 <element name="subtypename" minOccurs="0" />
-                              </choice>
+                              </sequence>
                             </complexType>
                           </element>
                           <element name="inquery" minOccurs="0" />
                           <element name="comment" minOccurs="0" />
-                          <element name="pronounciation" minOccurs="0" />
+                          <element name="pronunciation" minOccurs="0" />
                           <element name="falsefriend" minOccurs="0">
                             <complexType>
                               <simpleContent>
@@ -191,6 +166,31 @@
             </sequence>
           </complexType>
         </element>
+
+        <element name="tenses" minOccurs="0">
+          <complexType>
+            <sequence>
+              <element name="tense" minOccurs="0" maxOccurs="unbounded" />
+            </sequence>
+          </complexType>
+        </element>
+
+        <element name="lessons" minOccurs="0">
+          <complexType>
+            <sequence>
+              <element name="lesson" minOccurs="0" maxOccurs="unbounded">
+                <complexType>
+                  <sequence>
+                    <element name="name" />
+                    <element name="query" minOccurs="0" />
+                    <element name="current" minOccurs="0" />
+                    <element name="entryid" minOccurs="0" maxOccurs="unbounded" />
+                  </sequence>
+                </complexType>
+              </element>
+            </sequence>
+          </complexType>
+        </element>
       </sequence>
       <attribute name="version" use="required" />
     </complexType>