#include "LyXRC.h"
#include "WordLangTuple.h"
-#include "frontends/alert.h"
-
#include "support/debug.h"
#include "support/docstring_list.h"
#include "support/filetools.h"
#include "support/Package.h"
#include "support/FileName.h"
-#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include "support/os.h"
#include <hunspell/hunspell.hxx>
typedef map<std::string, Hunspell *> Spellers;
typedef map<std::string, PersonalWordList *> LangPersonalWordList;
-typedef vector<WordLangTuple> IgnoreList;
-
docstring remap_result(docstring const & s)
{
// substitute RIGHT SINGLE QUOTATION MARK
/// the spellers
Spellers spellers_;
///
- IgnoreList ignored_;
+ WordLangTable ignored_;
///
LangPersonalWordList personal_;
///
for (; it != end; ++it) {
delete it->second;
- it->second = 0;
+ it->second = nullptr;
}
LangPersonalWordList::const_iterator pdit = personal_.begin();
LangPersonalWordList::const_iterator pdet = personal_.end();
for (; pdit != pdet; ++pdit) {
- if ( 0 == pdit->second)
+ if (pdit->second == nullptr)
continue;
PersonalWordList * pd = pdit->second;
pd->save();
Hunspell * HunspellChecker::Private::lookup(Language const * lang)
{
Spellers::iterator it = spellers_.find(lang->lang());
- return it != spellers_.end() ? it->second : 0;
+ return it != spellers_.end() ? it->second : nullptr;
}
Hunspell * HunspellChecker::Private::addSpeller(Language const * lang)
{
- Hunspell * h = 0;
- for (int p = 0; p < maxLookupSelector() && 0 == h; ++p) {
+ Hunspell * h = nullptr;
+ for (int p = 0; p < maxLookupSelector() && nullptr == h; ++p) {
string lpath = dictPath(p);
h = addSpeller(lang, lpath);
}
Spellers::const_iterator et = spellers_.end();
for (; it != et; ++it)
- result += it->second != 0;
+ result += it->second != nullptr;
return result;
}
bool HunspellChecker::Private::isIgnored(WordLangTuple const & wl) const
{
- IgnoreList::const_iterator it = ignored_.begin();
+ WordLangTable::const_iterator it = ignored_.begin();
for (; it != ignored_.end(); ++it) {
if (it->lang()->code() != wl.lang()->code())
continue;
}
-SpellChecker::Result HunspellChecker::check(WordLangTuple const & wl)
+SpellChecker::Result HunspellChecker::check(WordLangTuple const & wl,
+ vector<WordLangTuple> const & docdict)
{
if (d->isIgnored(wl))
return WORD_OK;
+ WordLangTable::const_iterator it = docdict.begin();
+ for (; it != docdict.end(); ++it) {
+ if (it->lang()->code() != wl.lang()->code())
+ continue;
+ if (it->word() == wl.word())
+ return DOCUMENT_LEARNED_WORD;
+ }
+
Hunspell * h = d->speller(wl.lang());
if (!h)
return NO_DICTIONARY;