#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"
} // anon namespace
+
struct HunspellChecker::Private
{
Private() {}
~Private();
+ const string dictPath(int selector);
+ bool haveLanguageFiles(string const & hpath);
bool haveDictionary(string const & lang, string & hpath);
+ bool haveDictionary(string const & lang);
+ Hunspell * addSpeller(string const & lang, string & hpath);
Hunspell * addSpeller(string const & lang);
Hunspell * speller(string const & lang);
/// ignored words
Spellers spellers_;
///
IgnoreList ignored_;
+
+ /// the location below system/user directory
+ /// there the aff+dic files lookup will happen
+ const string dictDirectory(void) const { return "dict"; }
+ int maxLookupSelector(void) const { return 3; }
};
Spellers::iterator end = spellers_.end();
for (; it != end; ++it) {
- delete it->second;
+ if ( 0 != it->second) delete it->second;
}
}
-namespace {
-bool haveLanguageFiles(string const & hpath)
+bool HunspellChecker::Private::haveLanguageFiles(string const & hpath)
{
FileName const affix(hpath + ".aff");
FileName const dict(hpath + ".dic");
- if (!affix.isReadableFile()) {
- // FIXME: We should indicate somehow that this language is not
- // supported.
- LYXERR(Debug::FILES, "Hunspell affix file " << affix << " does not exist");
- return false;
- }
- if (!dict.isReadableFile()) {
- LYXERR(Debug::FILES, "Hunspell dictionary file " << dict << " does not exist");
- return false;
- }
- return true;
+ return affix.isReadableFile() && dict.isReadableFile();
}
+
+
+const string HunspellChecker::Private::dictPath(int selector)
+{
+ switch (selector) {
+ case 2:
+ return addName(lyx::support::package().system_support().absFileName(),dictDirectory());
+ break;
+ case 1:
+ return addName(lyx::support::package().user_support().absFileName(),dictDirectory());
+ break;
+ default:
+ return lyxrc.hunspelldir_path;
+ }
}
-bool HunspellChecker::Private::haveDictionary(string const & lang, string & hunspell_path)
+bool HunspellChecker::Private::haveDictionary(string const & lang, string & hpath)
{
- LYXERR(Debug::FILES, "hunspell path: " << external_path(hunspell_path));
- if (hunspell_path.empty()) {
- // FIXME We'd like to issue a better error message here, but there seems
- // to be a problem about thread safety, or something of the sort. If
- // we issue the message using frontend::Alert, then the code comes
- // back through here while the box is waiting, and causes some kind
- // of crash.
- static bool warned = false;
- if (!warned) {
- warned = true;
- LYXERR0("Hunspell path not set.");
- //frontend::Alert::error(_("Hunspell Path Not Found"),
- // _("You must set the Hunspell dictionary path in Tools>Preferences>Paths."));
- }
+ if (hpath.empty()) {
return false;
}
- hunspell_path = external_path(addName(hunspell_path, lang));
- if (!haveLanguageFiles(hunspell_path)) {
+ LYXERR(Debug::FILES, "check hunspell path: " << hpath << " for language " << lang);
+ string h_path = addName(hpath, lang);
+ if (!haveLanguageFiles(h_path)) {
// try with '_' replaced by '-'
- hunspell_path = subst(hunspell_path, '_', '-');
- if (!haveLanguageFiles(hunspell_path)) {
+ h_path = addName(hpath, subst(lang, '_', '-'));
+ if (!haveLanguageFiles(h_path)) {
// FIXME: We should indicate somehow that this language is not
// supported, probably by popping a warning. But we'll need to
// remember which warnings we've issued.
return false;
}
}
+ hpath = h_path;
return true;
}
-Hunspell * HunspellChecker::Private::addSpeller(string const & lang)
+bool HunspellChecker::Private::haveDictionary(string const & lang)
{
- string hunspell_path = lyxrc.hunspelldir_path;
-
- if (!haveDictionary(lang, hunspell_path))
- return 0;
-
- FileName const affix(hunspell_path + ".aff");
- FileName const dict(hunspell_path + ".dic");
- Hunspell * h = new Hunspell(affix.absFilename().c_str(), dict.absFilename().c_str());
- spellers_[lang] = h;
- return h;
+ bool result = false;
+ for ( int p = 0; !result && p < maxLookupSelector(); p++ ) {
+ string lpath = dictPath(p);
+ result = haveDictionary(lang, lpath);
+ }
+ return result;
}
}
+Hunspell * HunspellChecker::Private::addSpeller(string const & lang,string & path)
+{
+ if (!haveDictionary(lang, path)) {
+ spellers_[lang] = 0;
+ return 0;
+ }
+
+ FileName const affix(path + ".aff");
+ FileName const dict(path + ".dic");
+ Hunspell * h = new Hunspell(affix.absFileName().c_str(), dict.absFileName().c_str());
+ LYXERR(Debug::FILES, "Hunspell speller for langage " << lang << " at " << dict << " found");
+ spellers_[lang] = h;
+ return h;
+}
+
+
+Hunspell * HunspellChecker::Private::addSpeller(string const & lang)
+{
+ Hunspell * h = 0;
+ for ( int p = 0; p < maxLookupSelector() && 0 == h; p++ ) {
+ string lpath = dictPath(p);
+ h = addSpeller(lang, lpath);
+ }
+ return h;
+}
+
+
bool HunspellChecker::Private::isIgnored(WordLangTuple const & wl) const
{
IgnoreList::const_iterator it = ignored_.begin();
SpellChecker::Result HunspellChecker::check(WordLangTuple const & wl)
{
if (d->isIgnored(wl))
- return OK;
+ return WORD_OK;
- string const word_to_check = to_utf8(wl.word());
Hunspell * h = d->speller(wl.lang()->code());
if (!h)
- return OK;
+ return WORD_OK;
int info;
+
+ string const encoding = h->get_dic_encoding();
+ string const word_to_check = to_iconv_encoding(wl.word(), encoding);
+
if (h->spell(word_to_check.c_str(), &info))
- return OK;
+ return WORD_OK;
if (info & SPELL_COMPOUND) {
// FIXME: What to do with that?
}
+void HunspellChecker::advanceChangeNumber()
+{
+ nextChangeNumber();
+}
+
+
void HunspellChecker::insert(WordLangTuple const & wl)
{
string const word_to_check = to_utf8(wl.word());
if (!h)
return;
h->add(word_to_check.c_str());
+ advanceChangeNumber();
}
void HunspellChecker::accept(WordLangTuple const & wl)
{
d->ignored_.push_back(wl);
+ advanceChangeNumber();
}
docstring_list & suggestions)
{
suggestions.clear();
- string const word_to_check = to_utf8(wl.word());
Hunspell * h = d->speller(wl.lang()->code());
if (!h)
return;
+ string const encoding = h->get_dic_encoding();
+ string const word_to_check = to_iconv_encoding(wl.word(), encoding);
char ** suggestion_list;
int const suggestion_number = h->suggest(&suggestion_list, word_to_check.c_str());
if (suggestion_number <= 0)
return;
for (int i = 0; i != suggestion_number; ++i)
- suggestions.push_back(from_utf8(suggestion_list[i]));
+ suggestions.push_back(from_iconv_encoding(suggestion_list[i], encoding));
h->free_list(&suggestion_list, suggestion_number);
}
{
if (!lang)
return false;
- string hunspell_path = lyxrc.hunspelldir_path;
- return (d->haveDictionary(lang->code(), hunspell_path));
+ return (d->haveDictionary(lang->code()));
}
projects / lyx.git / blobdiff