From: Frederik Gladhorn <gladhorn@kde.org>
Date: Fri, 24 Aug 2007 12:00:13 +0000 (+0000)
Subject: Fix identifier having type as child - now identifiertype. Add the posibility to save... 
X-Git-Tag: v3.93.0~66
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=d0b469c7b0a43a80766fe0cfb00b816a1c96cc83;p=libqmvoc.git

Fix identifier having type as child - now identifiertype. Add the posibility to save subtypes in a sane way.

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

diff --git a/keduvocdocument/kvtml2.dtd b/keduvocdocument/kvtml2.dtd
index 0d8b9f5..abd3852 100644
--- a/keduvocdocument/kvtml2.dtd
+++ b/keduvocdocument/kvtml2.dtd
@@ -1,4 +1,4 @@
-<!ELEMENT kvtml         (information, identifiers, types?, entries, tenses?, usages?, lessons?)     >
+<!ELEMENT kvtml         (information, identifiers, typedefinitions?, entries, tenses?, usages?, lessons?)     >
 <!ATTLIST kvtml version    CDATA  #REQUIRED>
 
 <!ELEMENT information    (generator?, title, author?, license?, comment?) >
@@ -10,9 +10,10 @@
 <!ELEMENT comment        (#PCDATA) >
 
 <!ELEMENT identifiers    (identifier*) >
-<!ELEMENT identifier     (type, locale, name?, comment?, sizehint?, article?, personalpronouns?) >
+<!ELEMENT identifier     (identifiertype, locale, name?, comment?, sizehint?, article?, personalpronouns?) >
 <!ATTLIST identifier id  CDATA  #REQUIRED>
-<!ELEMENT type           (#PCDATA) >
+
+<!ELEMENT identifiertype (#PCDATA) >
 <!ELEMENT locale         (#PCDATA) >
 <!ELEMENT name           (#PCDATA) >
 <!ELEMENT sizehint       (#PCDATA) >
@@ -29,7 +30,11 @@
 <!ELEMENT secondperson   (#PCDATA) >
 <!ELEMENT thirdperson    (common|(male, female, neutral)) >
 
-<!ELEMENT types          (type*) >
+<!ELEMENT specialtype    (#PCDATA) >
+<!ELEMENT subtype        (#PCDATA, specialtype?) >
+<!ELEMENT type           (#PCDATA, specialtype?, subtype?) >
+<!ELEMENT typedefinition (#PCDATA, specialtype?, subtype*) >
+<!ELEMENT typedefinitions (typedefinition*) >
 
 <!ELEMENT tenses         (tense*) >
 <!ELEMENT tense          (#PCDATA) >