tex2lyx: honor grouping in optional arguments.

[lyx.git] / src / EnchantChecker.cpp

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 179e8365a584a6adc6ccab230d30445ae9b126d7..5ef399a24ad14ea8769d387223fd36a2a5e69793 100644 (file)
--- a/src/EnchantChecker.cpp
+++ b/src/EnchantChecker.cpp
@@ -35,12 +35,13 @@ struct Speller {
 };
 
 typedef map<string, Speller> Spellers;
-  
-} // anon namespace
+
+} // namespace
 
 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;
 }
 
 
@@ -92,14 +92,14 @@ enchant::Dict * EnchantChecker::Private::speller(string const & lang)
        Spellers::iterator it = spellers_.find(lang);
        if (it != spellers_.end())
                return it->second.speller;
-       
+
        return addSpeller(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());
@@ -132,19 +135,19 @@ void EnchantChecker::advanceChangeNumber()
 
 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)
 {
-       Spellers::iterator it = d->spellers_.find(word.lang()->code());
-       if (it != d->spellers_.end()) {
-               it->second.speller->remove(to_utf8(word.word()));
+       enchant::Dict * m = d->speller(word.lang()->code());
+       if (m) {
+               m->remove(to_utf8(word.word()));
                advanceChangeNumber();
        }
 }
@@ -152,9 +155,9 @@ void EnchantChecker::remove(WordLangTuple const & word)
 
 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();
        }
 }
@@ -173,7 +176,7 @@ void EnchantChecker::suggest(WordLangTuple const & wl,
 
        vector<string> suggs = m->suggest(utf8word);
        vector<string>::const_iterator it = suggs.begin();
-       
+
        for (; it != suggs.end(); ++it)
                suggestions.push_back(from_utf8(*it));
 }
@@ -192,7 +195,7 @@ int EnchantChecker::numDictionaries() const
 {
        return d->spellers_.size();
 }
-       
+
 
 docstring const EnchantChecker::error()
 {