[LyX/master] Remap typographical apostrophe from Hunspell to plain apostrophe (#11832)

[Juergen Spitzmueller]

commit ca28c9866a916494c6613076842aa32e8d572c37
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sat Apr 18 11:21:48 2020 +0200

    Remap typographical apostrophe from Hunspell to plain apostrophe (#11832)
---
 src/HunspellChecker.cpp |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp
index 1c2612e..593a123 100644
--- a/src/HunspellChecker.cpp
+++ b/src/HunspellChecker.cpp
@@ -47,6 +47,13 @@ typedef map<std::string, PersonalWordList *> 
LangPersonalWordList;
 
 typedef vector<WordLangTuple> IgnoreList;
 
+docstring remap_result(docstring const s)
+{
+       // substitute RIGHT SINGLE QUOTATION MARK
+       // by APOSTROPHE
+       return subst(s, 0x2019, 0x0027);
+}
+
 } // namespace
 
 
@@ -418,14 +425,14 @@ void HunspellChecker::suggest(WordLangTuple const & wl,
 #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));
+               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
 }
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs