minor dtd fix, also added defs file for reader/writer to use

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

diff --git a/kdeeducore/kvtml2.dtd b/kdeeducore/kvtml2.dtd
index 724db395401ccf50c3454fce55dca87ed6d3c85c..33c1032eadefab03620a0f1fcab95cfdd4faf8a5 100644 (file)
--- a/kdeeducore/kvtml2.dtd
+++ b/kdeeducore/kvtml2.dtd
@@ -1,77 +1,6 @@
 <!ELEMENT kvtml         (information, identifiers, types, tenses?, usages?, lessons?)     >
 <!ATTLIST kvtml version    CDATA  #REQUIRED>
 
-<!-- xml tree
- kvtml
-  information
-   generator
-   title
-   author
-   license
-   comment
-  identifiers
-   identifier
-    type
-    twoalpha
-    name
-    comment
-    sizehint
-    article
-     definite
-      male
-      female
-      neutral
-     indefinite
-      male
-      female
-      neutral
-    conjugation
-     singular
-     plural
-  types
-   type
-  tenses
-   tense
-  usages
-   usage
-  lessons
-   lesson
-    name
-    query
-    current
-   entry
-    inactive
-    inquery
-    sizehint
-    translation
-     text
-     type
-     inquery
-     comment
-     pronunciation
-     falsefriendfrom
-     falsefriendto
-     falsefriend
-     antonym
-     synonym
-     example
-     usage
-     paraphrase
-     comparison
-      comp1
-      comp2
-      comp3
-     multiplechoice
-      choice
-     image
-     sound
-     grade
-      currentgradeint
-      count
-      errorcount
-      date 
--->
-
 <!ELEMENT information    (generator?, title, author, license, comment?) >
 <!-- generator and comment are optional, all others are required exactly once -->
 
@@ -129,7 +58,7 @@
 <!ELEMENT usage          (#CDATA) >
 <!ELEMENT paraphrase     (#CDATA) >
 
-<!ELEMENT comparison     (comp1, comp2, comp3) >
+<!ELEMENT comparison     (absolute, comparative, superlative) >
 <!ELEMENT absolute       (#CDATA) >
 <!ELEMENT comparative    (#CDATA) >
 <!ELEMENT superlative    (#CDATA) >

diff --git a/kdeeducore/kvtml2defs.h b/kdeeducore/kvtml2defs.h
new file mode 100644 (file)
index 0000000..52f1486
--- /dev/null
+++ b/kdeeducore/kvtml2defs.h
@@ -0,0 +1,92 @@
+/***************************************************************************
+                   Vocabulary Document for KDE Edu version 2
+    -----------------------------------------------------------------------
+    copyright     : (C) 2007 Jeremy Whiting <jeremy@scitools.com>
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef KVTML2DEFS_H
+#define KVTML2DEFS_H
+
+#define KVTML_TAG = "kvtml"
+#define KVTML_VER = "version"
+
+#define KVTML_INFO = "information"
+
+#define KVTML_GEN = "generator"
+#define KVTML_TITLE = "title"
+#define KVTML_AUTH = "author"
+#define KVTML_LIC = "license"
+#define KVTML_COM = "comment"
+
+#define KVTML_IDS = "identifiers"
+#define KVTML_ID = "identifier"
+#define KVTML_TYPE = "type"
+#define KVTML_LOCALE = "twoalpha"
+#define KVTML_NAME = "name"
+#define KVTML_SIZEHINT = "sizehint"
+#define KVTML_ARTICLE = "article"
+#define KVTML_DEF = "definite"
+#define KVTML_INDEF = "indefinite"
+#define KVTML_MALE = "male"
+#define KVTML_FEM = "female"
+#define KVTML_NEU = "neutral"
+#define KVTML_CONJ = "conjugation"
+#define KVTML_SING = "singular"
+#define KVTML_PLU = "plural"
+
+#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_ENTRY = "entry"
+#define KVTML_INACTIVE = "inactive"
+#define KVTML_INQUERY = "inquery"
+
+#define KVTML_TRANS = "translation"
+#define KVTML_TEXT = "text"
+#define KVTML_PRONUNC = "pronunciation"
+#define KVTML_FFF = "falsefriendfrom"
+#define KVTML_FFT = "falsefriendto"
+#define KVTML_FF = "falsefriend"
+#define KVTML_ANT = "antonym"
+#define KVTML_SYN = "synonym"
+#define KVTML_EX = "example"
+#define KVTML_PAR = "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
+