X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Faspell.C;h=69252704041db9471ae5ec63dd67acad668c261d;hb=c727c6db7f2dd7f6a727462f5d11964888d0e76e;hp=1d711a3bf40e9e92add4fb09534f89ef8c142419;hpb=a6444784dca48da8b1f7723be12069b2e1dbb4c5;p=lyx.git

diff --git a/src/aspell.C b/src/aspell.C
index 1d711a3bf4..6925270404 100644
--- a/src/aspell.C
+++ b/src/aspell.C
@@ -20,10 +20,9 @@
 
 #include <boost/assert.hpp>
 
-using lyx::docstring;
-
 using std::string;
 
+namespace lyx {
 
 ASpell::ASpell(BufferParams const &, string const & lang)
 	: els(0), spell_error_object(0)
@@ -56,7 +55,16 @@ ASpell::~ASpell()
 void ASpell::addSpeller(string const & lang)
 {
 	AspellConfig * config = new_aspell_config();
+	// FIXME The aspell documentation says to use "lang"
 	aspell_config_replace(config, "language-tag", lang.c_str());
+	// Set the encoding to utf-8.
+	// aspell does also understand "ucs-4", so we would not need a
+	// conversion in theory, but if this is used it expects all
+	// char const * arguments to be a cast from  uint const *, and it
+	// seems that this uint is not compatible with our char_type on some
+	// platforms (cygwin, OS X). Therefore we use utf-8, that does
+	// always work.
+	aspell_config_replace(config, "encoding", "utf-8");
 	AspellCanHaveError * err = new_aspell_speller(config);
 	if (spell_error_object)
 		delete_aspell_can_have_error(spell_error_object);
@@ -88,14 +96,14 @@ ASpell::Result ASpell::check(WordLangTuple const & word)
 
 	AspellSpeller * m = it->second.speller;
 
-	int const word_ok = aspell_speller_check(m, word.word().c_str(), -1);
+	int const word_ok = aspell_speller_check(m, to_utf8(word.word()).c_str(), -1);
 	BOOST_ASSERT(word_ok != -1);
 
 	if (word_ok) {
 		res = OK;
 	} else {
 		AspellWordList const * sugs =
-			aspell_speller_suggest(m, word.word().c_str(), -1);
+			aspell_speller_suggest(m, to_utf8(word.word()).c_str(), -1);
 		BOOST_ASSERT(sugs != 0);
 		els = aspell_word_list_elements(sugs);
 		if (aspell_word_list_empty(sugs))
@@ -111,7 +119,7 @@ void ASpell::insert(WordLangTuple const & word)
 {
 	Spellers::iterator it = spellers_.find(word.lang_code());
 	if (it != spellers_.end())
-		aspell_speller_add_to_personal(it->second.speller, word.word().c_str(), -1);
+		aspell_speller_add_to_personal(it->second.speller, to_utf8(word.word()).c_str(), -1);
 }
 
 
@@ -119,18 +127,18 @@ void ASpell::accept(WordLangTuple const & word)
 {
 	Spellers::iterator it = spellers_.find(word.lang_code());
 	if (it != spellers_.end())
-		aspell_speller_add_to_session(it->second.speller, word.word().c_str(), -1);
+		aspell_speller_add_to_session(it->second.speller, to_utf8(word.word()).c_str(), -1);
 }
 
 
-string const ASpell::nextMiss()
+docstring const ASpell::nextMiss()
 {
 	char const * str = 0;
 
 	if (els)
 		str = aspell_string_enumeration_next(els);
 
-	return (str ? str : "");
+	return (str ? from_utf8(str) : docstring());
 }
 
 
@@ -142,5 +150,9 @@ docstring const ASpell::error()
 		err = aspell_error_message(spell_error_object);
 	}
 
-	return (err ? lyx::from_utf8(err) : docstring());
+	// FIXME UNICODE: err is not in UTF8, but probably the locale encoding
+	return (err ? from_utf8(err) : docstring());
 }
+
+
+} // namespace lyx