Fix bug #12772

[lyx.git] / src / AppleSpellChecker.cpp

diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp
index f763471f5f87195a394dde5e944375654d45eaf3..0a82d38b3228f04ee27ad3e45bbd889e6947690d 100644 (file)
--- a/src/AppleSpellChecker.cpp
+++ b/src/AppleSpellChecker.cpp
@@ -13,7 +13,6 @@
 #include "AppleSpellChecker.h"
 #include "WordLangTuple.h"
 
-#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/docstring_list.h"
 #include "support/AppleSpeller.h"
@@ -31,9 +30,13 @@ struct AppleSpellChecker::Private
 
        SpellChecker::Result toResult(SpellCheckResult status);
        string toString(SpellCheckResult status);
+       int numDictionaries() const;
 
        /// the speller
        AppleSpeller speller;
+
+       /// language map
+       map<string, string> languageMap;
 };
 
 
@@ -50,9 +53,9 @@ AppleSpellChecker::Private::~Private()
 }
 
 
-AppleSpellChecker::AppleSpellChecker(): d(new Private)
-{
-}
+AppleSpellChecker::AppleSpellChecker()
+       : d(new Private)
+{}
 
 
 AppleSpellChecker::~AppleSpellChecker()
@@ -75,15 +78,29 @@ string AppleSpellChecker::Private::toString(SpellCheckResult status)
 }
 
 
-SpellChecker::Result AppleSpellChecker::check(WordLangTuple const & word)
+SpellChecker::Result AppleSpellChecker::check(WordLangTuple const & word,
+        std::vector<WordLangTuple> const & docdict)
 {
+       if (!hasDictionary(word.lang()))
+               return NO_DICTIONARY;
+
        string const word_str = to_utf8(word.word());
+       string const lang = d->languageMap[word.lang()->lang()];
+
+       vector<WordLangTuple>::const_iterator it = docdict.begin();
+       for (; it != docdict.end(); ++it) {
+               if (it->lang()->code() != word.lang()->code())
+                       continue;
+               if (it->word() == word.word())
+                       return DOCUMENT_LEARNED_WORD;
+       }
+
        SpellCheckResult result =
                AppleSpeller_check(d->speller,
-                       word_str.c_str(), word.lang()->code().c_str());
+                       word_str.c_str(), lang.c_str());
        LYXERR(Debug::GUI, "spellCheck: \"" <<
                   word.word() << "\" = " << d->toString(result) <<
-                  ", lang = " << word.lang()->code()) ;
+                  ", lang = " << lang) ;
        return d->toResult(result);
 }
 
@@ -99,7 +116,7 @@ void AppleSpellChecker::insert(WordLangTuple const & word)
 {
        string const word_str = to_utf8(word.word());
        AppleSpeller_learn(d->speller, word_str.c_str());
-       LYXERR(Debug::GUI, "learn word: \"" << word.word() << "\"") ;
+       LYXERR(Debug::GUI, "learn word: \"" << word.word() << "\"");
        advanceChangeNumber();
 }
 
@@ -109,7 +126,7 @@ void AppleSpellChecker::remove(WordLangTuple const & word)
 {
        string const word_str = to_utf8(word.word());
        AppleSpeller_unlearn(d->speller, word_str.c_str());
-       LYXERR(Debug::GUI, "unlearn word: \"" << word.word() << "\"") ;
+       LYXERR(Debug::GUI, "unlearn word: \"" << word.word() << "\"");
        advanceChangeNumber();
 }
 
@@ -119,6 +136,7 @@ void AppleSpellChecker::accept(WordLangTuple const & word)
 {
        string const word_str = to_utf8(word.word());
        AppleSpeller_ignore(d->speller, word_str.c_str());
+       LYXERR(Debug::GUI, "ignore word: \"" << word.word() << "\"");
        advanceChangeNumber();
 }
 
@@ -128,7 +146,8 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 {
        suggestions.clear();
        string const word_str = to_utf8(wl.word());
-       size_t num = AppleSpeller_makeSuggestion(d->speller, word_str.c_str(), wl.lang()->code().c_str());
+       size_t num = AppleSpeller_makeSuggestion(d->speller,
+                                       word_str.c_str(), wl.lang()->code().c_str());
        for (size_t i = 0; i < num; i++) {
                char const * next = AppleSpeller_getSuggestion(d->speller, i);
                if (!next) break;
@@ -139,7 +158,36 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 
 bool AppleSpellChecker::hasDictionary(Language const * lang) const
 {
-       return AppleSpeller_hasLanguage(d->speller,lang->code().c_str());
+       string const langmap = d->languageMap[lang->lang()];
+       bool result = !langmap.empty();
+
+       if (result)
+               return result;
+
+       result = AppleSpeller_hasLanguage(d->speller, lang->code().c_str());
+       if (result) {
+               d->languageMap[lang->lang()] = lang->code();
+       } else {
+               result = AppleSpeller_hasLanguage(d->speller, lang->lang().c_str());
+               if (result)
+                       d->languageMap[lang->lang()] = lang->lang();
+       }
+       LYXERR(Debug::GUI, "has dictionary: " << lang->lang() << " = " << result);
+       return result;
+}
+
+
+int AppleSpellChecker::numDictionaries() const
+{
+       int result = 0;
+       map<string, string>::const_iterator it = d->languageMap.begin();
+       map<string, string>::const_iterator et = d->languageMap.end();
+
+       for (; it != et; ++it) {
+               string const langmap = it->second;
+               result += langmap.empty() ? 0 : 1;
+       }
+       return result;
 }