#include "LyXRC.h"
#include "WordLangTuple.h"
-#include "frontends/alert.h"
-
#include "support/debug.h"
#include "support/docstring_list.h"
#include "support/filetools.h"
#include "support/Package.h"
#include "support/FileName.h"
-#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include "support/os.h"
#include <hunspell/hunspell.hxx>
typedef vector<WordLangTuple> IgnoreList;
+docstring remap_result(docstring const & s)
+{
+ // substitute RIGHT SINGLE QUOTATION MARK
+ // by APOSTROPHE
+ return subst(s, 0x2019, 0x0027);
+}
+
} // namespace
}
-Hunspell * HunspellChecker::Private::addSpeller(Language const * lang,string & path)
+Hunspell * HunspellChecker::Private::addSpeller(Language const * lang, string & path)
{
if (!haveDictionary(lang, path)) {
- spellers_[lang->lang()] = 0;
- return 0;
+ spellers_[lang->lang()] = nullptr;
+ return nullptr;
}
FileName const affix(path + ".aff");
string const word_to_check = to_iconv_encoding(wl.word(), encoding);
#ifdef HAVE_HUNSPELL_CXXABI
vector<string> wlst = h->suggest(word_to_check);
- for (auto const s : wlst)
- suggestions.push_back(from_iconv_encoding(s, encoding));
+ for (auto const & s : wlst)
+ suggestions.push_back(remap_result(from_iconv_encoding(s, encoding)));
#else
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_iconv_encoding(suggestion_list[i], encoding));
+ suggestions.push_back(remap_result(from_iconv_encoding(suggestion_list[i], encoding)));
h->free_list(&suggestion_list, suggestion_number);
#endif
}
string const word_to_check = to_iconv_encoding(wl.word(), encoding);
#ifdef HAVE_HUNSPELL_CXXABI
vector<string> wlst = h->stem(word_to_check);
- for (auto const s : wlst)
+ for (auto const & s : wlst)
suggestions.push_back(from_iconv_encoding(s, encoding));
#else
char ** suggestion_list;