X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FHunspellChecker.cpp;h=a2d2c95e05250c6976d25bdef81f57e42faac338;hb=e903d0158e1d92c0d9c17656af10df9fa9a3d723;hp=b2803c9679c04ec8b05a5baed089008489cdb41f;hpb=a20b7acd18a5259bdd9ce0cfdd6e91280abe2330;p=lyx.git

diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp
index b2803c9679..a2d2c95e05 100644
--- a/src/HunspellChecker.cpp
+++ b/src/HunspellChecker.cpp
@@ -55,10 +55,13 @@ struct HunspellChecker::Private
 	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);
@@ -74,31 +77,53 @@ struct HunspellChecker::Private
 	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();
@@ -125,6 +150,9 @@ bool HunspellChecker::Private::haveLanguageFiles(string const & hpath)
 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;
@@ -132,7 +160,7 @@ const string HunspellChecker::Private::dictPath(int selector)
 		return addName(package().user_support().absFileName(),dictDirectory());
 		break;
 	default:
-		return lyxrc.hunspelldir_path;
+		return user_path_;
 	}
 }
 
@@ -167,6 +195,8 @@ bool HunspellChecker::Private::haveDictionary(Language const * lang, string & hp
 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);
@@ -181,10 +211,11 @@ bool HunspellChecker::Private::haveDictionary(Language const * lang)
 
 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);
 }
 
@@ -228,6 +259,19 @@ Hunspell * HunspellChecker::Private::addSpeller(Language const * 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();
@@ -298,7 +342,7 @@ SpellChecker::Result HunspellChecker::check(WordLangTuple const & wl)
 
 	Hunspell * h = d->speller(wl.lang());
 	if (!h)
-		return WORD_OK;
+		return NO_DICTIONARY;
 	int info;
 
 	string const encoding = h->get_dic_encoding();
@@ -369,6 +413,25 @@ void HunspellChecker::suggest(WordLangTuple const & wl,
 }
 
 
+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)
@@ -377,6 +440,12 @@ bool HunspellChecker::hasDictionary(Language const * lang) const
 }
 
 
+int HunspellChecker::numDictionaries() const
+{
+	return d->numDictionaries();
+}
+
+
 docstring const HunspellChecker::error()
 {
 	return docstring();