+ cleanCache();
+}
+
+
+void HunspellChecker::Private::setUserPath(std::string const & 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) {
+ delete it->second;
+ it->second = 0;
+ }
+
+ LangPersonalWordList::const_iterator pdit = personal_.begin();
+ LangPersonalWordList::const_iterator pdet = personal_.end();
+
+ for (; pdit != pdet; ++pdit) {
+ if ( 0 == pdit->second)
+ continue;
+ PersonalWordList * pd = pdit->second;
+ pd->save();
+ delete pd;
+ }
+}
+
+
+bool HunspellChecker::Private::haveLanguageFiles(string const & hpath)
+{
+ FileName const affix(hpath + ".aff");
+ FileName const dict(hpath + ".dic");
+ return affix.isReadableFile() && dict.isReadableFile();
+}
+
+
+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;
+ 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())
+ return false;
+
+ 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;
+ }
+ // another try with code, '_' replaced by '-'
+ h_path = addName(hpath, subst(lang->code(), '_', '-'));
+ 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);
+ }
+ // 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)
+{
+ setUserPath(lyxrc.hunspelldir_path);
+ Spellers::iterator it = spellers_.find(lang->lang());
+ if (it != spellers_.end())
+ return it->second;
+ return addSpeller(lang);
+}
+
+
+Hunspell * HunspellChecker::Private::addSpeller(Language const * lang,string & path)
+{
+ if (!haveDictionary(lang, path)) {
+ spellers_[lang->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->lang()] = h;
+ return h;