#include <config.h>
-#ifdef USE_PSPELL
-
#include "debug.h"
#define USE_ORIGINAL_MANAGER_FUNCS 1
#include <boost/assert.hpp>
+
+namespace lyx {
+
using std::endl;
using std::string;
: els(0), spell_error_object(0)
{
addManager(lang);
- lyxerr[Debug::GUI] << "created pspell" << endl;
+ LYXERR(Debug::GUI) << "created pspell" << endl;
}
PSpell::~PSpell()
{
- lyxerr[Debug::GUI] << "killed pspell" << endl;
+ LYXERR(Debug::GUI) << "killed pspell" << endl;
if (spell_error_object) {
delete_pspell_can_have_error(spell_error_object);
{
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);
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))
{
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());
}
{
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;
}
if (err)
- return err;
- return "";
+ return from_utf8(err);
+ return docstring();
}
-#endif // USE_PSPELL
+
+} // namespace lyx