/// the speller
AppleSpeller speller;
+
+ /// language map
+ map<string, string> languageMap;
+
};
SpellChecker::Result AppleSpellChecker::check(WordLangTuple const & word)
{
+ if (!hasDictionary(word.lang()))
+ return WORD_OK;
+
string const word_str = to_utf8(word.word());
+ string const lang = d->languageMap[word.lang()->lang()];
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);
}
{
string const word_str = to_utf8(word.word());
AppleSpeller_ignore(d->speller, word_str.c_str());
+ LYXERR(Debug::GUI, "ignore word: \"" << word.word() << "\"") ;
advanceChangeNumber();
}
{
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;
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;
}