Private();
~Private();
+ void cleanCache();
+ void setUserPath(std::string const & 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 5; }
const string HunspellDictionaryName(Language const * lang) {
return lang->variety().empty()
? lang->code()
: lang->code() + "-" + lang->variety();
}
+ const string myspellPackageDictDirectory(void) {
+ return "/usr/share/myspell";
+ }
+ const string hunspellPackageDictDirectory(void) {
+ return "/usr/share/hunspell";
+ }
};
HunspellChecker::Private::Private()
{
+ setUserPath(lyxrc.hunspelldir_path);
}
HunspellChecker::Private::~Private()
+{
+ 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) {
- 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 4:
+ return addName(hunspellPackageDictDirectory(),dictDirectory());
+ case 3:
+ return addName(myspellPackageDictDirectory(),dictDirectory());
case 2:
return addName(package().system_support().absFileName(),dictDirectory());
- break;
case 1:
return addName(package().user_support().absFileName(),dictDirectory());
- break;
default:
- return lyxrc.hunspelldir_path;
+ return user_path_;
}
}
bool HunspellChecker::Private::haveDictionary(Language const * lang, string & hpath)
{
- if (hpath.empty()) {
+ if (hpath.empty())
return false;
- }
LYXERR(Debug::FILES, "check hunspell path: " << hpath
<< " for language " << (lang ? lang->lang() : "NULL" ));
}
// another try with code, '_' replaced by '-'
h_path = addName(hpath, subst(lang->code(), '_', '-'));
- if (!haveLanguageFiles(h_path)) {
+ 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;
- for ( int p = 0; !result && p < maxLookupSelector(); p++ ) {
+
+ 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())
return it->second;
-
return addSpeller(lang);
}
Hunspell * HunspellChecker::Private::addSpeller(Language const * lang)
{
Hunspell * h = 0;
- for ( int p = 0; p < maxLookupSelector() && 0 == h; p++ ) {
+ for (int p = 0; p < maxLookupSelector() && 0 == h; ++p) {
string lpath = dictPath(p);
h = addSpeller(lang, lpath);
}
- if (0 != h) {
+ if (h) {
string const encoding = h->get_dic_encoding();
PersonalWordList * pd = new PersonalWordList(lang->lang());
pd->load();
}
+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();
for (; it != ignored_.end(); ++it) {
- if ((*it).lang()->code() != wl.lang()->code())
+ if (it->lang()->code() != wl.lang()->code())
continue;
- if ((*it).word() == wl.word())
+ if (it->word() == wl.word())
return true;
}
return false;
}
-HunspellChecker::HunspellChecker(): d(new Private)
-{
-}
+HunspellChecker::HunspellChecker()
+ : d(new Private)
+{}
HunspellChecker::~HunspellChecker()
Hunspell * h = d->speller(wl.lang());
if (!h)
- return WORD_OK;
+ return NO_DICTIONARY;
int info;
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;
}
+void HunspellChecker::stem(WordLangTuple const & wl,
+ docstring_list & suggestions)
+{
+ suggestions.clear();
+ Hunspell * h = d->speller(wl.lang());
+ 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->stem(&suggestion_list, word_to_check.c_str());
+ if (suggestion_number <= 0)
+ return;
+ for (int i = 0; i != suggestion_number; ++i)
+ suggestions.push_back(from_iconv_encoding(suggestion_list[i], encoding));
+ h->free_list(&suggestion_list, suggestion_number);
+}
+
+
bool HunspellChecker::hasDictionary(Language const * lang) const
{
if (!lang)
return false;
- return (d->haveDictionary(lang));
+ return d->haveDictionary(lang);
+}
+
+
+int HunspellChecker::numDictionaries() const
+{
+ return d->numDictionaries();
}
projects / lyx.git / blobdiff