X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAppleSpellChecker.cpp;h=0a82d38b3228f04ee27ad3e45bbd889e6947690d;hb=9ec80456feed688440360e0a493cbf537c4fe5f9;hp=702f49baccce52f62236c4f2b7d510543ebad643;hpb=c95d441818ddf8bbfc384bb889288a55f0aa91ea;p=lyx.git

diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp
index 702f49bacc..0a82d38b32 100644
--- 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,13 +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;
-	
 };
 
 
@@ -54,9 +53,9 @@ AppleSpellChecker::Private::~Private()
 }
 
 
-AppleSpellChecker::AppleSpellChecker(): d(new Private)
-{
-}
+AppleSpellChecker::AppleSpellChecker()
+	: d(new Private)
+{}
 
 
 AppleSpellChecker::~AppleSpellChecker()
@@ -79,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 WORD_OK;
+		return NO_DICTIONARY;
 
 	string const word_str = to_utf8(word.word());
-	string const lang = d->languageMap[word.lang()->code()];
+	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());
@@ -107,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();
 }
 
@@ -117,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();
 }
 
@@ -127,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();
 }
 
@@ -137,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;
@@ -148,19 +158,34 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 
 bool AppleSpellChecker::hasDictionary(Language const * lang) const
 {
-	string const langmap = d->languageMap[lang->code()];
+	string const langmap = d->languageMap[lang->lang()];
 	bool result = !langmap.empty();
 
 	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->code()] = lang->code();
+		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->code()] = lang->lang();
+			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;
 }