Update Win installer for new dictionary links. Untested.

[lyx.git] / src / AppleSpellChecker.cpp

diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp
index 189ada71cf730bcc54b642202c355ffe289e48fc..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"
@@ -32,13 +31,12 @@ 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;
-       
 };
 
 
@@ -80,13 +78,23 @@ 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(), lang.c_str());
@@ -108,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();
 }
 
@@ -118,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();
 }
 
@@ -128,7 +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() << "\"") ;
+       LYXERR(Debug::GUI, "ignore word: \"" << word.word() << "\"");
        advanceChangeNumber();
 }
 
@@ -138,7 +146,7 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 {
        suggestions.clear();
        string const word_str = to_utf8(wl.word());
-       size_t num = AppleSpeller_makeSuggestion(d->speller, 
+       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);
@@ -156,15 +164,15 @@ bool AppleSpellChecker::hasDictionary(Language const * lang) const
        if (result)
                return result;
 
-       result = AppleSpeller_hasLanguage(d->speller,lang->code().c_str());
+       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());
+               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) ;
+       LYXERR(Debug::GUI, "has dictionary: " << lang->lang() << " = " << result);
        return result;
 }
 
@@ -182,7 +190,7 @@ int AppleSpellChecker::numDictionaries() const
        return result;
 }
 
-       
+
 int AppleSpellChecker::numMisspelledWords() const
 {
        return AppleSpeller_numMisspelledWords(d->speller);