X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAppleSpellChecker.cpp;h=189ada71cf730bcc54b642202c355ffe289e48fc;hb=67fa69ce6b6f7ce60ef4e38836baa09ddefa759f;hp=003b8051ec83849c87251dda31b48be6036a74e4;hpb=e4f2484cb5899da6d98e0be6db465ca011989e04;p=lyx.git

diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp
index 003b8051ec..189ada71cf 100644
--- a/src/AppleSpellChecker.cpp
+++ b/src/AppleSpellChecker.cpp
@@ -31,9 +31,14 @@ 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 +55,9 @@ AppleSpellChecker::Private::~Private()
 }
 
 
-AppleSpellChecker::AppleSpellChecker(): d(new Private)
-{
-}
+AppleSpellChecker::AppleSpellChecker()
+	: d(new Private)
+{}
 
 
 AppleSpellChecker::~AppleSpellChecker()
@@ -77,19 +82,34 @@ string AppleSpellChecker::Private::toString(SpellCheckResult status)
 
 SpellChecker::Result AppleSpellChecker::check(WordLangTuple const & word)
 {
+	if (!hasDictionary(word.lang()))
+		return NO_DICTIONARY;
+
 	string const word_str = to_utf8(word.word());
-	SpellCheckResult result = checkAppleSpeller(d->speller, word_str.c_str(), word.lang()->code().c_str());
-	LYXERR(Debug::GUI, "spellCheck: \"" << word.word() << "\" = " << d->toString(result)) ;
+	string const lang = d->languageMap[word.lang()->lang()];
+	SpellCheckResult result =
+		AppleSpeller_check(d->speller,
+			word_str.c_str(), lang.c_str());
+	LYXERR(Debug::GUI, "spellCheck: \"" <<
+		   word.word() << "\" = " << d->toString(result) <<
+		   ", lang = " << lang) ;
 	return d->toResult(result);
 }
 
 
+void AppleSpellChecker::advanceChangeNumber()
+{
+	nextChangeNumber();
+}
+
+
 // add to personal dictionary
 void AppleSpellChecker::insert(WordLangTuple const & word)
 {
 	string const word_str = to_utf8(word.word());
-	learnAppleSpeller(d->speller, word_str.c_str());
+	AppleSpeller_learn(d->speller, word_str.c_str());
 	LYXERR(Debug::GUI, "learn word: \"" << word.word() << "\"") ;
+	advanceChangeNumber();
 }
 
 
@@ -97,8 +117,9 @@ void AppleSpellChecker::insert(WordLangTuple const & word)
 void AppleSpellChecker::remove(WordLangTuple const & word)
 {
 	string const word_str = to_utf8(word.word());
-	unlearnAppleSpeller(d->speller, word_str.c_str());
+	AppleSpeller_unlearn(d->speller, word_str.c_str());
 	LYXERR(Debug::GUI, "unlearn word: \"" << word.word() << "\"") ;
+	advanceChangeNumber();
 }
 
 
@@ -106,7 +127,9 @@ void AppleSpellChecker::remove(WordLangTuple const & word)
 void AppleSpellChecker::accept(WordLangTuple const & word)
 {
 	string const word_str = to_utf8(word.word());
-	ignoreAppleSpeller(d->speller, word_str.c_str());
+	AppleSpeller_ignore(d->speller, word_str.c_str());
+	LYXERR(Debug::GUI, "ignore word: \"" << word.word() << "\"") ;
+	advanceChangeNumber();
 }
 
 
@@ -115,9 +138,10 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 {
 	suggestions.clear();
 	string const word_str = to_utf8(wl.word());
-	size_t num = makeSuggestionAppleSpeller(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 = getSuggestionAppleSpeller(d->speller, i);
+		char const * next = AppleSpeller_getSuggestion(d->speller, i);
 		if (!next) break;
 		suggestions.push_back(from_utf8(next));
 	}
@@ -126,7 +150,48 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 
 bool AppleSpellChecker::hasDictionary(Language const * lang) const
 {
-	return hasLanguageAppleSpeller(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;
+}
+
+	
+int AppleSpellChecker::numMisspelledWords() const
+{
+	return AppleSpeller_numMisspelledWords(d->speller);
+}
+
+
+void AppleSpellChecker::misspelledWord(int index, int & start, int & length) const
+{
+	AppleSpeller_misspelledWord(d->speller, index, &start, &length);
 }