X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpspell.C;h=9ca0feaeeec9882301fdbf6d0324c938943158b4;hb=d13d6da879462707cd947cdf00c0cf7c3dfac924;hp=f31605d02a9d1201fd96be1a5fb982f7306f6c6d;hpb=6b5c9696b6669b48062bec96707c78d605e1af58;p=lyx.git diff --git a/src/pspell.C b/src/pspell.C index f31605d02a..9ca0feaeee 100644 --- a/src/pspell.C +++ b/src/pspell.C @@ -1,64 +1,66 @@ /** * \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 + * \author John Levon + * + * Full author contact details are available in file CREDITS. */ #include -#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" -extern "C" { +// new aspell pspell missing extern "C" +extern "C" { #include } #include "pspell.h" +#include "WordLangTuple.h" + +#include using std::endl; +using std::string; + PSpell::PSpell(BufferParams const &, string const & lang) : els(0), spell_error_object(0) { - addManager(lang); + 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) { + + 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(); @@ -67,7 +69,7 @@ void PSpell::addManager(string const & lang) if (spell_error_object) delete_pspell_can_have_error(spell_error_object); spell_error_object = 0; - + if (pspell_error_number(err) == 0) { Manager m; m.manager = to_pspell_manager(err); @@ -78,52 +80,41 @@ 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()) { addManager(word.lang_code()); it = managers_.find(word.lang_code()); // FIXME - if (it == managers_.end()) + if (it == managers_.end()) return res; } PspellManager * m = it->second.manager; - + int word_ok = pspell_manager_check(m, word.word().c_str()); - lyx::Assert(word_ok != -1); + 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); + 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()); @@ -135,7 +126,7 @@ void PSpell::insert(WordLangTuple const & word) void PSpell::accept(WordLangTuple const & word) { Managers::iterator it = managers_.find(word.lang_code()); - if (it != managers_.end()) + if (it != managers_.end()) pspell_manager_add_to_session(it->second.manager, word.word().c_str()); } @@ -143,7 +134,7 @@ void PSpell::accept(WordLangTuple const & word) string const PSpell::nextMiss() { char const * str = 0; - + if (els) str = pspell_string_emulation_next(els); if (str) @@ -155,7 +146,7 @@ string const PSpell::nextMiss() string const PSpell::error() { char const * err = 0; - + if (spell_error_object && pspell_error_number(spell_error_object) != 0) { err = pspell_error_message(spell_error_object); }