Add the special word type conjunction to the keduvoc library.

REVIEW: 103204

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 83cf9af568074e411c77eefbce3ee987c3d2ed89..6fd675829af9d593acd9d3f5bae2803101dfecf0 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -589,6 +589,9 @@ bool KEduVocKvtml2Reader::readWordType( KEduVocWordType* parentContainer, QDomEl
         if ( specialType == KVTML_SPECIALWORDTYPE_NOUN_NEUTRAL ) {
             wordTypeContainer->setWordType(KEduVocWordFlag::Noun| KEduVocWordFlag::Neuter);
         }
+        if ( specialType == KVTML_SPECIALWORDTYPE_CONJUNCTION ) {
+            wordTypeContainer->setWordType(KEduVocWordFlag::Conjunction);
+        }
     } // special type
 
     // read entries

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 9e26743370066cf2965ed802a70704961e289917..99ad94d8c9b963a06ada72c1241add54ff64ad93 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -403,6 +403,9 @@ bool KEduVocKvtml2Writer::writeWordTypes( QDomElement &typesElement, KEduVocWord
         else if (wordType->wordType().testFlag(KEduVocWordFlag::Adverb))
             typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_ADVERB ) );
 
+        else if (wordType->wordType().testFlag(KEduVocWordFlag::Conjunction))
+            typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_CONJUNCTION ) );
+
 
 // child entries
 

diff --git a/keduvocdocument/kvtml2defs.h b/keduvocdocument/kvtml2defs.h
index 18b79bbe5e77764469619f8a647f1671a68f78fe..d2903ed9b18aadf18a070b99d6c7f3976c8009c2 100644 (file)
--- a/keduvocdocument/kvtml2defs.h
+++ b/keduvocdocument/kvtml2defs.h
@@ -111,6 +111,7 @@ static const QString KVTML_GRAMMATICAL_DEFINITENESS[] = {
 #define KVTML_SPECIALWORDTYPE_VERB        "verb"
 #define KVTML_SPECIALWORDTYPE_ADJECTIVE   "adjective"
 #define KVTML_SPECIALWORDTYPE_ADVERB      "adverb"
+#define KVTML_SPECIALWORDTYPE_CONJUNCTION "conjunction"
 
 
 #define KVTML_TENSES            "tenses"