updated dtd, defs, and sample file

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

diff --git a/kdeeducore/kvtml2.dtd b/kdeeducore/kvtml2.dtd
index 93de06a62124f3734307143c53c044e2f8192f1e..c3393774754964d97f7ba6e04e546f89c7de7fe7 100644 (file)
--- a/kdeeducore/kvtml2.dtd
+++ b/kdeeducore/kvtml2.dtd
@@ -11,7 +11,7 @@
 <!ELEMENT comment        (#PCDATA) >
 
 <!ELEMENT identifiers    (identifier*) >
-<!ELEMENT identifier     (type, locale, name, comment, sizehint?, article?, conjugation?) >
+<!ELEMENT identifier     (type, locale, name, comment, sizehint?, article?, personalpronouns?) >
 <!ELEMENT type           (user|language|CDATA) >
 <!ELEMENT locale         (#PCDATA) >
 <!ELEMENT name           (#PCDATA) >
@@ -23,9 +23,12 @@
 <!ELEMENT male           (#PCDATA) >
 <!ELEMENT female         (#PCDATA) >
 <!ELEMENT neutral        (#PCDATA) >
-<!ELEMENT conjugation    (singular?, plural?) >
-<!ELEMENT singular       (#PCDATA) >
-<!ELEMENT plural         (#PCDATA) >
+<!ELEMENT personalpronouns (singular?, plural?) >
+<!ELEMENT singular       (firstperson, secondperson, thirdperson) >
+<!ELEMENT plural         (firstperson, secondperson, thirdperson) >
+<!ELEMENT firstperson    (#PCDATA) >
+<!ELEMENT secondperson   (#PCDATA) >
+<!ELEMENT thirdperson    (common|(male, female, neutral)) >
 
 <!ELEMENT types          (type*) >
 <!ELEMENT type           (#PCDATA) >
@@ -46,7 +49,7 @@
 <!ELEMENT inquery        EMPTY >
 <!ELEMENT sizehint       (#PCDATA) >
 
-<!ELEMENT translation    (text, type, inquery?, comment?, pronunciation, falsfriendfrom, falsefriendto, falsefriend, antonym*, synonym*, example, usage, paraphrase, comparison) >
+<!ELEMENT translation    (text, type, inquery?, comment?, pronunciation, falsfriendfrom, falsefriendto, falsefriend, antonym*, synonym*, example, usage, paraphrase, comparison, conjugation?) >
 <!ELEMENT text           (#PCDATA) >
 <!ELEMENT pronunciation  (#PCDATA) >
 <!ELEMENT falsefriendfrom  (#PCDATA) >
@@ -57,6 +60,7 @@
 <!ELEMENT example        (#PCDATA) >
 <!ELEMENT usage          (#PCDATA) >
 <!ELEMENT paraphrase     (#PCDATA) >
+<!ELEMENT conjugation    (singular?, plural?) >
 
 <!ELEMENT comparison     (absolute, comparative, superlative) >
 <!ELEMENT absolute       (#PCDATA) >

diff --git a/kdeeducore/kvtml2defs.h b/kdeeducore/kvtml2defs.h
index 6a6b76d5723282202be500382a8e85df5275a76b..21e0da327e1f44b156faf4d5f1ff57ee0e00b5f9 100644 (file)
--- a/kdeeducore/kvtml2defs.h
+++ b/kdeeducore/kvtml2defs.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                   Vocabulary Document for KDE Edu version 2
+                   Vocabulary Document for KDE Edu KVTML version 2
     -----------------------------------------------------------------------
     copyright     : (C) 2007 Jeremy Whiting <jeremy@scitools.com>
  ***************************************************************************/
@@ -16,84 +16,85 @@
 #ifndef KVTML2DEFS_H
 #define KVTML2DEFS_H
 
-#define KVTML_TAG "kvtml"
-#define KVTML_VERSION "version"
-#define KVTML_ID "id"
-
-#define KVTML_INFORMATION "information"
-
-#define KVTML_GENERATOR "generator"
-#define KVTML_TITLE "title"
-#define KVTML_AUTHOR "author"
-#define KVTML_LICENSE "license"
-#define KVTML_COMMENT "comment"
-
-#define KVTML_IDENTIFIERS "identifiers"
-#define KVTML_IDENTIFIER "identifier"
-#define KVTML_TYPE "type"
-#define KVTML_LOCALE "locale"
-#define KVTML_NAME "name"
-#define KVTML_SIZEHINT "sizehint"
-#define KVTML_ARTICLE "article"
-#define KVTML_DEFINITE "definite"
-#define KVTML_INDEFINITE "indefinite"
-#define KVTML_MALE "male"
-#define KVTML_FEMALE "female"
-#define KVTML_NEUTRAL "neutral"
-#define KVTML_CONJUGATION "conjugation"
-#define KVTML_PERSONALPRONOUNS "personalpronouns"
-#define KVTML_SINGULAR "singular"
-#define KVTML_PLURAL "plural"
-#define KVTML_FIRSTPERSON "firstperson"
-#define KVTML_SECONDPERSON "secondperson"
-#define KVTML_THIRDPERSON "thirdperson"
-#define KVTML_COMMON "common"
-
-#define KVTML_TYPES "types"
-
-#define KVTML_TENSES "tenses"
-#define KVTML_TENSE "tense"
-
-#define KVTML_USAGES "usages"
-#define KVTML_USAGE "usage"
-
-#define KVTML_LESSONS "lessons"
-#define KVTML_LESSON "lesson"
-#define KVTML_QUERY "query"
-#define KVTML_CURRENT "current"
-
-#define KVTML_ENTRIES "entries"
-#define KVTML_ENTRY "entry"
-#define KVTML_INACTIVE "inactive"
-#define KVTML_INQUERY "inquery"
-
-#define KVTML_TRANSLATION "translation"
-#define KVTML_TEXT "text"
-#define KVTML_PRONUNCIATION "pronunciation"
-#define KVTML_FALSEFRIENDFROM "falsefriendfrom"
-#define KVTML_FALSEFRIENDTO "falsefriendto"
-#define KVTML_FALSEFRIEND "falsefriend"
-#define KVTML_ANTONYM "antonym"
-#define KVTML_SYNONYM "synonym"
-#define KVTML_EXAMPLE "example"
-#define KVTML_PARAPHRASE "paraphrase"
-
-#define KVTML_COMPARISON "comparison"
-#define KVTML_ABS "absolute"
-#define KVTML_COMP "comparative"
-#define KVTML_SUPER "superlative"
-
-#define KVTML_MULTI "multiplechoice"
-#define KVTML_CHOICE "choice"
-
-#define KVTML_IMG "image"
-#define KVTML_SND "sound"
-
-#define KVTML_GRADE "grade"
-#define KVTML_CURRENTGRADE "currentgradeint"
-#define KVTML_COUNT "count"
-#define KVTML_WRONG "errorcount"
-#define KVTML_DATE "date"
+#define KVTML_TAG               "kvtml"
+#define KVTML_VERSION           "version"
+#define KVTML_ID                "id"
+
+#define KVTML_INFORMATION       "information"
+
+#define KVTML_GENERATOR         "generator"
+#define KVTML_TITLE             "title"
+#define KVTML_AUTHOR            "author"
+#define KVTML_LICENSE           "license"
+#define KVTML_COMMENT           "comment"
+
+#define KVTML_IDENTIFIERS       "identifiers"
+#define KVTML_IDENTIFIER        "identifier"
+#define KVTML_TYPE              "type"
+#define KVTML_LOCALE            "locale"
+#define KVTML_NAME              "name"
+#define KVTML_SIZEHINT          "sizehint"
+#define KVTML_ARTICLE           "article"
+#define KVTML_DEFINITE          "definite"
+#define KVTML_INDEFINITE        "indefinite"
+#define KVTML_MALE              "male"
+#define KVTML_FEMALE            "female"
+#define KVTML_NEUTRAL           "neutral"
+#define KVTML_PERSONALPRONOUNS  "personalpronouns"
+#define KVTML_SINGULAR          "singular"
+#define KVTML_PLURAL            "plural"
+#define KVTML_1STPERSON         "firstperson"
+#define KVTML_2NDPERSON         "secondperson"
+#define KVTML_3RDPERSON         "thirdperson"
+#define KVTML_COMMON            "common"
+
+#define KVTML_CONJUGATION       "conjugation"
+
+#define KVTML_TYPES             "types"
+
+#define KVTML_TENSES            "tenses"
+#define KVTML_TENSE             "tense"
+
+#define KVTML_USAGES            "usages"
+#define KVTML_USAGE             "usage"
+
+#define KVTML_LESSONS           "lessons"
+#define KVTML_LESSON            "lesson"
+#define KVTML_QUERY             "query"
+#define KVTML_CURRENT           "current"
+
+#define KVTML_ENTRIES           "entries"
+#define KVTML_ENTRY             "entry"
+#define KVTML_INACTIVE          "inactive"
+#define KVTML_INQUERY           "inquery"
+
+#define KVTML_TRANSLATION       "translation"
+#define KVTML_TEXT              "text"
+#define KVTML_PRONUNCIATION     "pronunciation"
+#define KVTML_FALSEFRIENDFROM   "falsefriendfrom"
+#define KVTML_FALSEFRIENDTO     "falsefriendto"
+#define KVTML_FALSEFRIEND       "falsefriend"
+#define KVTML_ANTONYM           "antonym"
+#define KVTML_SYNONYM           "synonym"
+#define KVTML_EXAMPLE           "example"
+#define KVTML_PARAPHRASE        "paraphrase"
+
+#define KVTML_COMPARISON        "comparison"
+#define KVTML_ABS               "absolute"
+#define KVTML_COMP              "comparative"
+#define KVTML_SUPER             "superlative"
+
+#define KVTML_MULTI             "multiplechoice"
+#define KVTML_CHOICE            "choice"
+
+#define KVTML_IMG               "image"
+#define KVTML_SND               "sound"
+
+#define KVTML_GRADE             "grade"
+#define KVTML_CURRENTGRADE      "currentgradeint"
+#define KVTML_COUNT             "count"
+#define KVTML_WRONG             "errorcount"
+#define KVTML_DATE              "date"
 
 #endif
 

diff --git a/kdeeducore/kvtml_empty_sample.kvtml b/kdeeducore/kvtml_empty_sample.kvtml
index 07c06e8faf4e7f8b534853f5569c93bb2ae1f088..166464c4a08e78a1faa42f9c5e9607bca05b25b3 100644 (file)
--- a/kdeeducore/kvtml_empty_sample.kvtml
+++ b/kdeeducore/kvtml_empty_sample.kvtml
@@ -29,7 +29,7 @@
             <neutral>ein</neutral>
         </indefinite>
       </article>
-      <conjugation>
+      <personalpronouns>
         <singular>
             <firstPerson>ich</firstPerson>
             <secondPerson>du</secondPerson>
@@ -46,7 +46,7 @@
                 <common>sie</common>
             </thirdPerson>
         </plural>
-      </conjugation>
+      </personalpronouns>
     </identifier>
   </identifiers>
 
@@ -83,6 +83,24 @@
         <example></example>
         <usage></usage>
         <paraphrase></paraphrase>
+        <conjugation>
+          <singular>
+              <firstPerson>ich</firstPerson>
+              <secondPerson>du</secondPerson>
+              <thirdPerson>
+                  <male>er</male>
+                  <female>sie</female>
+                  <neutral>es</neutral>
+              </thirdPerson>
+          </singular>
+          <plural>
+              <firstPerson>wir</firstPerson>
+              <secondPerson>ihr</secondPerson>
+              <thirdPerson>
+                  <common>sie</common>
+              </thirdPerson>
+          </plural>
+        </conjugation>
         <comparison>
           <comp1>gut</comp1>
           <comp2>besser</comp2>