Private();
~Private();
+ void cleanCache();
+ void setUserPath(std::string path);
const string dictPath(int selector);
bool haveLanguageFiles(string const & hpath);
bool haveDictionary(Language const * lang, string & hpath);
bool haveDictionary(Language const * lang);
+ int numDictionaries() const;
Hunspell * addSpeller(Language const * lang, string & hpath);
Hunspell * addSpeller(Language const * lang);
Hunspell * speller(Language const * lang);
IgnoreList ignored_;
///
LangPersonalWordList personal_;
+ ///
+ std::string user_path_;
/// 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 3; }
+ int maxLookupSelector(void) const { return 4; }
const string HunspellDictionaryName(Language const * lang) {
return lang->variety().empty()
? lang->code()
: lang->code() + "-" + lang->variety();
}
+ const string osPackageDictDirectory(void) {
+ return "/usr/share/myspell";
+ }
};
HunspellChecker::Private::Private()
{
+ setUserPath(lyxrc.hunspelldir_path);
}
HunspellChecker::Private::~Private()
+{
+ cleanCache();
+}
+
+
+void HunspellChecker::Private::setUserPath(std::string path)
+{
+ if (user_path_ != lyxrc.hunspelldir_path) {
+ cleanCache();
+ user_path_ = path;
+ }
+}
+
+
+void HunspellChecker::Private::cleanCache()
{
Spellers::iterator it = spellers_.begin();
Spellers::iterator end = spellers_.end();
for (; it != end; ++it) {
- if ( 0 != it->second) delete it->second;
+ delete it->second;
+ it->second = 0;
}
LangPersonalWordList::const_iterator pdit = personal_.begin();
const string HunspellChecker::Private::dictPath(int selector)
{
switch (selector) {
+ case 3:
+ return addName(osPackageDictDirectory(),dictDirectory());
+ break;
case 2:
return addName(package().system_support().absFileName(),dictDirectory());
break;
return addName(package().user_support().absFileName(),dictDirectory());
break;
default:
- return lyxrc.hunspelldir_path;
+ return user_path_;
}
}
return false;
}
- LYXERR(Debug::FILES, "check hunspell path: " << hpath << " for language " << lang);
+ LYXERR(Debug::FILES, "check hunspell path: " << hpath
+ << " for language " << (lang ? lang->lang() : "NULL" ));
+
string h_path = addName(hpath, HunspellDictionaryName(lang));
// first we try lang code+variety
if (haveLanguageFiles(h_path)) {
+ LYXERR(Debug::FILES, " found " << h_path);
hpath = h_path;
return true;
}
if (!haveLanguageFiles(h_path)) {
return false;
}
+ LYXERR(Debug::FILES, " found " << h_path);
hpath = h_path;
return true;
}
bool HunspellChecker::Private::haveDictionary(Language const * lang)
{
bool result = false;
+
+ setUserPath(lyxrc.hunspelldir_path);
for ( int p = 0; !result && p < maxLookupSelector(); p++ ) {
string lpath = dictPath(p);
result = haveDictionary(lang, lpath);
Hunspell * HunspellChecker::Private::speller(Language const * lang)
{
+ setUserPath(lyxrc.hunspelldir_path);
Spellers::iterator it = spellers_.find(lang->lang());
- if (it != spellers_.end())
+ if (it != spellers_.end()) {
return it->second;
-
+ }
return addSpeller(lang);
}
}
+int HunspellChecker::Private::numDictionaries() const
+{
+ int result = 0;
+ Spellers::const_iterator it = spellers_.begin();
+ Spellers::const_iterator et = spellers_.end();
+
+ for (; it != et; ++it) {
+ result += it->second != 0;
+ }
+ return result;
+}
+
+
bool HunspellChecker::Private::isIgnored(WordLangTuple const & wl) const
{
IgnoreList::const_iterator it = ignored_.begin();
Hunspell * h = d->speller(wl.lang());
if (!h)
- return WORD_OK;
+ return NO_DICTIONARY;
int info;
string const encoding = h->get_dic_encoding();
}
+int HunspellChecker::numDictionaries() const
+{
+ return d->numDictionaries();
+}
+
+
docstring const HunspellChecker::error()
{
return docstring();