for usabilities sake, changed some lines, and fixed one falsefriend error

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

diff --git a/keduvocdocument/kvtml2.dtd b/keduvocdocument/kvtml2.dtd
index 6a9c04589d2f8174be2672e3d16294b953a8a7f9..4d0b2da483d8e98bd3d4019eb6c39401009c69ef 100644 (file)
--- a/keduvocdocument/kvtml2.dtd
+++ b/keduvocdocument/kvtml2.dtd
@@ -31,14 +31,12 @@
 <!ELEMENT secondperson   (#PCDATA) >
 <!ELEMENT thirdperson    (common|(male, female, neutral)) >
 
+<!ELEMENT wordtypedefinitions (wordtypedefinition*) >
+<!ELEMENT wordtypedefinition (typename, specialwordtype?, subwordtypedefinition*) >
+<!ELEMENT subwordtypedefinition (subtypename, specialwordtype?) >
 <!ELEMENT specialwordtype    (#PCDATA) >
 <!ELEMENT subtypename        (#PCDATA) >
 <!ELEMENT typename           (#PCDATA) >
-<!ELEMENT wordtype           (typename?|(typename, subtypename?)) >
-
-<!ELEMENT subwordtypedefinition (subtypename, specialwordtype?) >
-<!ELEMENT wordtypedefinition (typename, specialwordtype?, subwordtypedefinition*) >
-<!ELEMENT wordtypedefinitions (wordtypedefinition*) >
 
 <!ELEMENT tenses         (tense*) >
 <!ELEMENT tense          (#PCDATA) >
@@ -58,7 +56,8 @@
 <!ELEMENT inactive       EMPTY >
 <!ELEMENT inquery        EMPTY >
 
-<!ELEMENT translation    (text, wordtype?, inquery?, comment?, pronunciation?, falsfriend?, antonym?, synonym?, example?, usage*, paraphrase?, comparison?, conjugation*) >
+<!ELEMENT translation    (text, wordtype?, inquery?, comment?, pronunciation?, falsefriend?, antonym?, synonym?, example?, usage*, paraphrase?, comparison?, conjugation*) >
+<!ELEMENT wordtype       (typename?|(typename, subtypename?)) >
 <!ELEMENT text           (#PCDATA) >
 <!ELEMENT pronunciation  (#PCDATA) >
 <!ELEMENT falsefriend    (#PCDATA) >