~Private();
- bool haveDictionary(string const & lang) const;
+ bool haveDictionary(string const & lang, string & hpath);
Hunspell * addSpeller(string const & lang);
Hunspell * speller(string const & lang);
/// ignored words
}
-bool HunspellChecker::Private::haveDictionary(string const & lang) const
+bool HunspellChecker::Private::haveDictionary(string const & lang, string & hunspell_path)
{
- string hunspell_path = lyxrc.hunspelldir_path;
LYXERR(Debug::FILES, "hunspell path: " << external_path(hunspell_path));
if (hunspell_path.empty()) {
// FIXME We'd like to issue a better error message here, but there seems
{
string hunspell_path = lyxrc.hunspelldir_path;
- if (!haveDictionary(lang))
+ if (!haveDictionary(lang, hunspell_path))
return 0;
FileName const affix(hunspell_path + ".aff");
if (d->isIgnored(wl))
return OK;
- string const word_to_check = to_utf8(wl.word());
Hunspell * h = d->speller(wl.lang()->code());
if (!h)
return OK;
int info;
+
+ string const encoding = h->get_dic_encoding();
+ string const word_to_check = to_iconv_encoding(wl.word(), encoding);
+
if (h->spell(word_to_check.c_str(), &info))
return OK;
docstring_list & suggestions)
{
suggestions.clear();
- string const word_to_check = to_utf8(wl.word());
Hunspell * h = d->speller(wl.lang()->code());
if (!h)
return;
+ string const encoding = h->get_dic_encoding();
+ string const word_to_check = to_iconv_encoding(wl.word(), encoding);
char ** suggestion_list;
int const suggestion_number = h->suggest(&suggestion_list, word_to_check.c_str());
if (suggestion_number <= 0)
return;
for (int i = 0; i != suggestion_number; ++i)
- suggestions.push_back(from_utf8(suggestion_list[i]));
+ suggestions.push_back(from_iconv_encoding(suggestion_list[i], encoding));
h->free_list(&suggestion_list, suggestion_number);
}
{
if (!lang)
return false;
- return (d->haveDictionary(lang->code()));
+ string hunspell_path = lyxrc.hunspelldir_path;
+ return (d->haveDictionary(lang->code(), hunspell_path));
}