* src/LaTeX.C

[lyx.git] / src / pspell.C

diff --git a/src/pspell.C b/src/pspell.C
index 8f0c93b5dde79449f4b79a31f9cc43d37c18a1fe..f80aabd3ecfca943cc2f4673beb7afceb606021a 100644 (file)
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -11,8 +11,6 @@
 
 #include <config.h>
 
-#ifdef USE_PSPELL
-
 #include "debug.h"
 
 #define USE_ORIGINAL_MANAGER_FUNCS 1
@@ -26,7 +24,11 @@ extern "C" {
 
 #include <boost/assert.hpp>
 
+
+namespace lyx {
+
 using std::endl;
+using std::string;
 
 
 PSpell::PSpell(BufferParams const &, string const & lang)
@@ -64,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);
@@ -82,7 +85,7 @@ void PSpell::addManager(string const & lang)
 
 enum PSpell::Result PSpell::check(WordLangTuple const & word)
 {
-       Result res = UNKNOWN;
+       Result res = UNKNOWN_WORD;
 
        Managers::iterator it = managers_.find(word.lang_code());
        if (it == managers_.end()) {
@@ -95,20 +98,20 @@ 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))
-                       res = UNKNOWN;
+                       res = UNKNOWN_WORD;
                else
-                       res = MISSED;
+                       res = SUGGESTED_WORDS;
        }
        return res;
 }
@@ -118,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());
 }
 
 
@@ -126,23 +129,23 @@ 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();
 }
 
 
-string const PSpell::error()
+docstring const PSpell::error()
 {
        char const * err = 0;
 
@@ -151,8 +154,9 @@ string const PSpell::error()
        }
 
        if (err)
-               return err;
-       return "";
+               return from_utf8(err);
+       return docstring();
 }
 
-#endif // USE_PSPELL
+
+} // namespace lyx