X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpspell.C;h=f80aabd3ecfca943cc2f4673beb7afceb606021a;hb=cd4033aef3a3f1efdb5a676b8bab3d367f53a830;hp=cd03873b4440ae13ca9fd192ba683580608b2013;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/pspell.C b/src/pspell.C
index cd03873b44..f80aabd3ec 100644
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -27,8 +27,6 @@ extern "C" {
 
 namespace lyx {
 
-using docstring;
-
 using std::endl;
 using std::string;
 
@@ -68,6 +66,7 @@ void PSpell::addManager(string const & lang)
 {
 	PspellConfig * config = new_pspell_config();
 	pspell_config_replace(config, "language-tag", lang.c_str());
+	pspell_config_replace(config, "encoding", "utf-8");
 	PspellCanHaveError * err = new_pspell_manager(config);
 	if (spell_error_object)
 		delete_pspell_can_have_error(spell_error_object);
@@ -99,14 +98,14 @@ enum PSpell::Result PSpell::check(WordLangTuple const & word)
 
 	PspellManager * m = it->second.manager;
 
-	int word_ok = pspell_manager_check(m, word.word().c_str());
+	int word_ok = pspell_manager_check(m, to_utf8(word.word()).c_str());
 	BOOST_ASSERT(word_ok != -1);
 
 	if (word_ok) {
 		res = OK;
 	} else {
 		PspellWordList const * sugs =
-			pspell_manager_suggest(m, word.word().c_str());
+			pspell_manager_suggest(m, to_utf8(word.word()).c_str());
 		BOOST_ASSERT(sugs != 0);
 		els = pspell_word_list_elements(sugs);
 		if (pspell_word_list_empty(sugs))
@@ -122,7 +121,7 @@ void PSpell::insert(WordLangTuple const & word)
 {
 	Managers::iterator it = managers_.find(word.lang_code());
 	if (it != managers_.end())
-		pspell_manager_add_to_personal(it->second.manager, word.word().c_str());
+		pspell_manager_add_to_personal(it->second.manager, to_utf8(word.word()).c_str());
 }
 
 
@@ -130,19 +129,19 @@ void PSpell::accept(WordLangTuple const & word)
 {
 	Managers::iterator it = managers_.find(word.lang_code());
 	if (it != managers_.end())
-		pspell_manager_add_to_session(it->second.manager, word.word().c_str());
+		pspell_manager_add_to_session(it->second.manager, to_utf8(word.word()).c_str());
 }
 
 
-string const PSpell::nextMiss()
+docstring const PSpell::nextMiss()
 {
 	char const * str = 0;
 
 	if (els)
 		str = pspell_string_emulation_next(els);
 	if (str)
-		return str;
-	return "";
+		return from_utf8(str);
+	return docstring();
 }
 
 
@@ -155,8 +154,8 @@ docstring const PSpell::error()
 	}
 
 	if (err)
-		return err;
-	return "";
+		return from_utf8(err);
+	return docstring();
 }