mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 19:07:45 +00:00
Remap typographical apostrophe from Hunspell to plain apostrophe (#11832)
This commit is contained in:
parent
0135682fca
commit
ca28c9866a
@ -47,6 +47,13 @@ typedef map<std::string, PersonalWordList *> LangPersonalWordList;
|
|||||||
|
|
||||||
typedef vector<WordLangTuple> IgnoreList;
|
typedef vector<WordLangTuple> IgnoreList;
|
||||||
|
|
||||||
|
docstring remap_result(docstring const s)
|
||||||
|
{
|
||||||
|
// substitute RIGHT SINGLE QUOTATION MARK
|
||||||
|
// by APOSTROPHE
|
||||||
|
return subst(s, 0x2019, 0x0027);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
|
||||||
@ -418,14 +425,14 @@ void HunspellChecker::suggest(WordLangTuple const & wl,
|
|||||||
#ifdef HAVE_HUNSPELL_CXXABI
|
#ifdef HAVE_HUNSPELL_CXXABI
|
||||||
vector<string> wlst = h->suggest(word_to_check);
|
vector<string> wlst = h->suggest(word_to_check);
|
||||||
for (auto const s : wlst)
|
for (auto const s : wlst)
|
||||||
suggestions.push_back(from_iconv_encoding(s, encoding));
|
suggestions.push_back(remap_result(from_iconv_encoding(s, encoding)));
|
||||||
#else
|
#else
|
||||||
char ** suggestion_list;
|
char ** suggestion_list;
|
||||||
int const suggestion_number = h->suggest(&suggestion_list, word_to_check.c_str());
|
int const suggestion_number = h->suggest(&suggestion_list, word_to_check.c_str());
|
||||||
if (suggestion_number <= 0)
|
if (suggestion_number <= 0)
|
||||||
return;
|
return;
|
||||||
for (int i = 0; i != suggestion_number; ++i)
|
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);
|
h->free_list(&suggestion_list, suggestion_number);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user