X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAppleSpellChecker.cpp;h=0a82d38b3228f04ee27ad3e45bbd889e6947690d;hb=5e290e4bf9fb8e7d94912dd0126751d5f6649859;hp=6020de7f27567e29ebe6ae1ff15b5bccc12f5aec;hpb=b8be856f7902d25ff6a219f0adeeff9935b7307a;p=lyx.git

diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp
index 6020de7f27..0a82d38b32 100644
--- a/src/AppleSpellChecker.cpp
+++ b/src/AppleSpellChecker.cpp
@@ -31,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;
-	
 };
 
 
@@ -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 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());
@@ -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,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);
@@ -155,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;
 }
 
@@ -181,7 +190,7 @@ int AppleSpellChecker::numDictionaries() const
 	return result;
 }
 
-	
+
 int AppleSpellChecker::numMisspelledWords() const
 {
 	return AppleSpeller_numMisspelledWords(d->speller);