From: Jeremy Paul Whiting <jpwhiting@kde.org>
Date: Thu, 5 Jul 2007 17:26:35 +0000 (+0000)
Subject: make dtd valid
X-Git-Tag: v3.92.0~45
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=6e46e712c33fd4aa33f83dbe023c3fcad9293284;p=libqmvoc.git

make dtd valid

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=683950
---

diff --git a/kdeeducore/kvtml2.dtd b/kdeeducore/kvtml2.dtd
index 33c1032..c142c55 100644
--- a/kdeeducore/kvtml2.dtd
+++ b/kdeeducore/kvtml2.dtd
@@ -4,74 +4,74 @@
 <!ELEMENT information    (generator?, title, author, license, comment?) >
 <!-- generator and comment are optional, all others are required exactly once -->
 
-<!ELEMENT generator      (#CDATA) >
-<!ELEMENT title          (#CDATA) >
-<!ELEMENT author         (#CDATA) >
-<!ELEMENT license        (#CDATA) >
-<!ELEMENT comment        (#CDATA) >
+<!ELEMENT generator      (#PCDATA) >
+<!ELEMENT title          (#PCDATA) >
+<!ELEMENT author         (#PCDATA) >
+<!ELEMENT license        (#PCDATA) >
+<!ELEMENT comment        (#PCDATA) >
 
 <!ELEMENT identifiers    (identifier*) >
 <!ELEMENT identifier     (type, twoalpha, name, comment, sizehint, article, conjugation) >
-<!ELEMENT type           (user|language|#CDATA) >
-<!ELEMENT twoalpha       (#CDATA) >
-<!ELEMENT name           (#CDATA) >
-<!ELEMENT comment        (#CDATA) >
-<!ELEMENT sizehint       (#CDATA) >
+<!ELEMENT type           (user|language|CDATA) >
+<!ELEMENT twoalpha       (#PCDATA) >
+<!ELEMENT name           (#PCDATA) >
+<!ELEMENT comment        (#PCDATA) >
+<!ELEMENT sizehint       (#PCDATA) >
 <!ELEMENT article        (definite?, indefinite?) >
 <!ELEMENT definite       (male?, female?, neutral?) >
 <!ELEMENT indefinite     (male?, female?, neutral?) >
-<!ELEMENT male           (#CDATA) >
-<!ELEMENT female         (#CDATA) >
-<!ELEMENT neutral        (#CDATA) >
+<!ELEMENT male           (#PCDATA) >
+<!ELEMENT female         (#PCDATA) >
+<!ELEMENT neutral        (#PCDATA) >
 <!ELEMENT conjugation    (singular?, plural?) >
-<!ELEMENT singular       (#CDATA) >
-<!ELEMENT plural         (#CDATA) >
+<!ELEMENT singular       (#PCDATA) >
+<!ELEMENT plural         (#PCDATA) >
 
 <!ELEMENT types          (type*) >
-<!ELEMENT type           (#CDATA) >
+<!ELEMENT type           (#PCDATA) >
 
 <!ELEMENT tenses         (tense*) >
-<!ELEMENT tense          (#CDATA) >
+<!ELEMENT tense          (#PCDATA) >
 
 <!ELEMENT usages         (usage*) >
-<!ELEMENT usage          (#CDATA) >
+<!ELEMENT usage          (#PCDATA) >
 
 <!ELEMENT lessons        (lesson*, entry*) >
-<!ELEMENT lesson         (name, query?, current?)
-<!ELEMENT query          (#CDATA) >
+<!ELEMENT lesson         (name, query?, current?) >
+<!ELEMENT query          (#PCDATA) >
 <!ELEMENT current        EMPTY >
 
 <!ELEMENT entry          (inactive?, inquery?, sizehint?, translation*) >
 <!ELEMENT inactive       EMPTY >
 <!ELEMENT inquery        EMPTY >
-<!ELEMENT sizehint       (#CDATA) >
+<!ELEMENT sizehint       (#PCDATA) >
 
 <!ELEMENT translation    (text, type, inquery?, comment?, pronunciation, falsfriendfrom, falsefriendto, falsefriend, antonym*, synonym*, example, usage, paraphrase, comparison) >
-<!ELEMENT text           (#CDATA) >
-<!ELEMENT pronunciation  (#CDATA) >
-<!ELEMENT falsefriendfrom  (#CDATA) >
-<!ELEMENT falsefriendto  (#CDATA) >
-<!ELEMENT falsefriend    (#CDATA) >
-<!ELEMENT antonym        (#CDATA) >
-<!ELEMENT synonym        (#CDATA) >
-<!ELEMENT example        (#CDATA) >
-<!ELEMENT usage          (#CDATA) >
-<!ELEMENT paraphrase     (#CDATA) >
+<!ELEMENT text           (#PCDATA) >
+<!ELEMENT pronunciation  (#PCDATA) >
+<!ELEMENT falsefriendfrom  (#PCDATA) >
+<!ELEMENT falsefriendto  (#PCDATA) >
+<!ELEMENT falsefriend    (#PCDATA) >
+<!ELEMENT antonym        (#PCDATA) >
+<!ELEMENT synonym        (#PCDATA) >
+<!ELEMENT example        (#PCDATA) >
+<!ELEMENT usage          (#PCDATA) >
+<!ELEMENT paraphrase     (#PCDATA) >
 
 <!ELEMENT comparison     (absolute, comparative, superlative) >
-<!ELEMENT absolute       (#CDATA) >
-<!ELEMENT comparative    (#CDATA) >
-<!ELEMENT superlative    (#CDATA) >
+<!ELEMENT absolute       (#PCDATA) >
+<!ELEMENT comparative    (#PCDATA) >
+<!ELEMENT superlative    (#PCDATA) >
 
 <!ELEMENT multiplechoice  (choice+) >
-<!ELEMENT choice          (#CDATA) >
+<!ELEMENT choice          (#PCDATA) >
 
-<!ELEMENT image          (#CDATA) >
-<!ELEMENT sound          (#CDATA) >
+<!ELEMENT image          (#PCDATA) >
+<!ELEMENT sound          (#PCDATA) >
 
 <!ELEMENT grade          (currentgradeint, count, errorcount, date) >
-<!ELEMENT currentgradeint  (#CDATA) >
-<!ELEMENT count          (#CDATA) >
-<!ELEMENT errorcount     (#CDATA) >
-<!ELEMENT date           (#CDATA) >
+<!ELEMENT currentgradeint  (#PCDATA) >
+<!ELEMENT count          (#PCDATA) >
+<!ELEMENT errorcount     (#PCDATA) >
+<!ELEMENT date           (#PCDATA) >