* src/LaTeX.C

[lyx.git] / src / pspell.C

diff --git a/src/pspell.C b/src/pspell.C
index 1285769e5eb383a93f284483f8d432f5b3cd40af..f80aabd3ecfca943cc2f4673beb7afceb606021a 100644 (file)
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -1,21 +1,17 @@
 /**
  * \file pspell.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Kevin Atkinson
- * \author John Levon <levon@movementarian.org>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#ifdef USE_PSPELL
-
-#include "support/LAssert.h"
+#include "debug.h"
 
 #define USE_ORIGINAL_MANAGER_FUNCS 1
 // new aspell pspell missing extern "C"
@@ -26,42 +22,51 @@ extern "C" {
 #include "pspell.h"
 #include "WordLangTuple.h"
 
+#include <boost/assert.hpp>
+
+
+namespace lyx {
+
+using std::endl;
+using std::string;
+
+
 PSpell::PSpell(BufferParams const &, string const & lang)
        : els(0), spell_error_object(0)
 {
        addManager(lang);
+       lyxerr[Debug::GUI] << "created pspell" << endl;
 }
 
 
 PSpell::~PSpell()
 {
-       cleanUp();
-       close();
+       lyxerr[Debug::GUI] << "killed pspell" << endl;
+
+       if (spell_error_object) {
+               delete_pspell_can_have_error(spell_error_object);
+               spell_error_object = 0;
+       }
+
        if (els)
                delete_pspell_string_emulation(els);
+
        Managers::iterator it = managers_.begin();
        Managers::iterator end = managers_.end();
 
        for (; it != end; ++it) {
+               pspell_manager_save_all_word_lists(it->second.manager);
                delete_pspell_manager(it->second.manager);
                delete_pspell_config(it->second.config);
        }
 }
 
 
-void PSpell::cleanUp()
-{
-       if (spell_error_object) {
-               delete_pspell_can_have_error(spell_error_object);
-               spell_error_object = 0;
-       }
-}
-
-
 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);
@@ -80,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()) {
@@ -93,41 +98,30 @@ enum PSpell::Result PSpell::check(WordLangTuple const & word)
 
        PspellManager * m = it->second.manager;
 
-       int word_ok = pspell_manager_check(m, word.word().c_str());
-       lyx::Assert(word_ok != -1);
+       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());
-               lyx::Assert(sugs != 0);
+                       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;
 }
 
 
-void PSpell::close()
-{
-       Managers::iterator it = managers_.begin();
-       Managers::iterator end = managers_.end();
-
-       for (; it != end; ++it) {
-               pspell_manager_save_all_word_lists(it->second.manager);
-       }
-}
-
-
 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());
 }
 
 
@@ -135,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;
 
@@ -160,8 +154,9 @@ string const PSpell::error()
        }
 
        if (err)
-               return err;
-       return "";
+               return from_utf8(err);
+       return docstring();
 }
 
-#endif // USE_PSPELL
+
+} // namespace lyx