typedef vector<WordLangTuple> IgnoreList;
-} // anon namespace
+} // namespace
struct HunspellChecker::Private
Hunspell * addSpeller(Language const * lang, string & hpath);
Hunspell * addSpeller(Language const * lang);
Hunspell * speller(Language const * lang);
+ Hunspell * lookup(Language const * lang);
/// ignored words
bool isIgnored(WordLangTuple const & wl) const;
/// personal word list interface
/// the location below system/user directory
/// there the aff+dic files lookup will happen
const string dictDirectory(void) const { return "dicts"; }
- int maxLookupSelector(void) const { return 4; }
+ int maxLookupSelector(void) const { return 5; }
const string HunspellDictionaryName(Language const * lang) {
- return lang->variety().empty()
+ return lang->variety().empty()
? lang->code()
: lang->code() + "-" + lang->variety();
}
- const string osPackageDictDirectory(void) {
+ const string myspellPackageDictDirectory(void) {
return "/usr/share/myspell";
}
+ const string hunspellPackageDictDirectory(void) {
+ return "/usr/share/hunspell";
+ }
};
const string HunspellChecker::Private::dictPath(int selector)
{
switch (selector) {
+ case 4:
+ return hunspellPackageDictDirectory();
case 3:
- return addName(osPackageDictDirectory(),dictDirectory());
- break;
+ return myspellPackageDictDirectory();
case 2:
return addName(package().system_support().absFileName(),dictDirectory());
- break;
case 1:
return addName(package().user_support().absFileName(),dictDirectory());
- break;
default:
return user_path_;
}
bool HunspellChecker::Private::haveDictionary(Language const * lang, string & hpath)
{
- if (hpath.empty())
+ if (hpath.empty() || !lang)
return false;
+ if (lookup(lang)) return true;
+
+ string d_name = HunspellDictionaryName(lang);
+
LYXERR(Debug::FILES, "check hunspell path: " << hpath
- << " for language " << (lang ? lang->lang() : "NULL" ));
+ << " for language " << lang->lang() << " with name " << d_name);
- string h_path = addName(hpath, HunspellDictionaryName(lang));
+ string h_path = addName(hpath, d_name);
// first we try lang code+variety
if (haveLanguageFiles(h_path)) {
LYXERR(Debug::FILES, " found " << h_path);
string lpath = dictPath(p);
result = haveDictionary(lang, lpath);
}
- // FIXME: if result is false...
- // 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 result;
}
Hunspell * HunspellChecker::Private::speller(Language const * lang)
{
+ Hunspell * h = lookup(lang);
+ if (h) return h;
+
setUserPath(lyxrc.hunspelldir_path);
- Spellers::iterator it = spellers_.find(lang->lang());
- if (it != spellers_.end())
- return it->second;
return addSpeller(lang);
}
+Hunspell * HunspellChecker::Private::lookup(Language const * lang)
+{
+ Spellers::iterator it = spellers_.find(lang->lang());
+ return it != spellers_.end() ? it->second : 0;
+}
+
+
Hunspell * HunspellChecker::Private::addSpeller(Language const * lang,string & path)
{
if (!haveDictionary(lang, path)) {
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");
+ LYXERR(Debug::FILES, "Hunspell speller for langage " << lang << " at " << dict << " added.");
spellers_[lang->lang()] = h;
return h;
}
string const encoding = h->get_dic_encoding();
string const word_to_check = to_iconv_encoding(wl.word(), encoding);
+ LYXERR(Debug::GUI, "spellCheck: \"" <<
+ wl.word() << "\", lang = " << wl.lang()->lang()) ;
if (h->spell(word_to_check.c_str(), &info))
return d->learned(wl) ? LEARNED_WORD : WORD_OK;
if (info & SPELL_COMPOUND) {
// FIXME: What to do with that?
- LYXERR(Debug::FILES, "Hunspell compound word found " << word_to_check);
+ LYXERR(Debug::GUI, "Hunspell compound word found " << word_to_check);
}
if (info & SPELL_FORBIDDEN) {
// This was removed from personal dictionary
- LYXERR(Debug::FILES, "Hunspell explicit forbidden word found " << word_to_check);
+ LYXERR(Debug::GUI, "Hunspell explicit forbidden word found " << word_to_check);
}
return UNKNOWN_WORD;