Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / EnchantChecker.cpp

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 4e9494ad2a9964d49735fc87952ec1112b2a0482..dc8ea4d864af9e9ff5a589a0a840583ac4f803b5 100644 (file)
--- a/src/EnchantChecker.cpp
+++ b/src/EnchantChecker.cpp
@@ -40,7 +40,8 @@ typedef map<string, Speller> Spellers;
 
 struct EnchantChecker::Private
 {
-       Private() {}
+       Private()
+       {}
 
        ~Private();
 
@@ -60,30 +61,29 @@ EnchantChecker::Private::~Private()
        Spellers::iterator it = spellers_.begin();
        Spellers::iterator end = spellers_.end();
 
-       for (; it != end; ++it) {
+       for (; it != end; ++it)
                delete it->second.speller;
-       }
 }
 
 
 enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
 {
        enchant::Broker * instance = enchant::Broker::instance();
+       Speller m;
 
-       if (!instance->dict_exists(lang))
+       try {
+               LYXERR(Debug::FILES, "request enchant speller for language " << lang);
+               m.speller = instance->request_dict(lang);
+       }
+       catch (enchant::Exception & e) {
                // FIXME error handling?
-               return 0;
-
-       enchant::Dict * dict = instance->request_dict(lang);
-
-       if (dict) {
-               Speller m;
-               m.speller = dict;
-               spellers_[lang] = m;
-               return m.speller;
+               const char * what = e.what();
+               LYXERR(Debug::FILES, "cannot add enchant speller: " <<
+                          ((what && *what) ? what : "unspecified enchant exception in request_dict()"));
+               m.speller = 0;
        }
-       // FIXME error handling?
-       return 0;
+       spellers_[lang] = m;
+       return m.speller;
 }
 
 
@@ -97,9 +97,9 @@ enchant::Dict * EnchantChecker::Private::speller(string const & lang)
 }
 
 
-EnchantChecker::EnchantChecker(): d(new Private)
-{
-}
+EnchantChecker::EnchantChecker()
+       : d(new Private)
+{}
 
 
 EnchantChecker::~EnchantChecker()
@@ -112,7 +112,10 @@ SpellChecker::Result EnchantChecker::check(WordLangTuple const & word)
 {
        enchant::Dict * m = d->speller(word.lang()->code());
 
-       if (!m || word.word().empty())
+       if (!m)
+               return NO_DICTIONARY;
+
+       if (word.word().empty())
                return WORD_OK;
 
        string utf8word = to_utf8(word.word());
@@ -124,19 +127,39 @@ SpellChecker::Result EnchantChecker::check(WordLangTuple const & word)
 }
 
 
+void EnchantChecker::advanceChangeNumber()
+{
+       nextChangeNumber();
+}
+
+
 void EnchantChecker::insert(WordLangTuple const & word)
 {
-       Spellers::iterator it = d->spellers_.find(word.lang()->code());
-       if (it != d->spellers_.end())
-               it->second.speller->add(to_utf8(word.word()));
+       enchant::Dict * m = d->speller(word.lang()->code());
+       if (m) {
+               m->add(to_utf8(word.word()));
+               advanceChangeNumber();
+       }
+}
+       
+       
+void EnchantChecker::remove(WordLangTuple const & word)
+{
+       enchant::Dict * m = d->speller(word.lang()->code());
+       if (m) {
+               m->remove(to_utf8(word.word()));
+               advanceChangeNumber();
+       }
 }
 
 
 void EnchantChecker::accept(WordLangTuple const & word)
 {
-       Spellers::iterator it = d->spellers_.find(word.lang()->code());
-       if (it != d->spellers_.end())
-               it->second.speller->add_to_session(to_utf8(word.word()));
+       enchant::Dict * m = d->speller(word.lang()->code());
+       if (m) {
+               m->add_to_session(to_utf8(word.word()));
+               advanceChangeNumber();
+       }
 }
 
 
@@ -168,6 +191,12 @@ bool EnchantChecker::hasDictionary(Language const * lang) const
 }
 
 
+int EnchantChecker::numDictionaries() const
+{
+       return d->spellers_.size();
+}
+       
+
 docstring const EnchantChecker::error()
 {
        return docstring();