X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAspellChecker.cpp;h=284bcace7088c44d27870c0cdbc12feb3b1778bc;hb=d83e0022017fa6245173e55332f60b7a4a78dc31;hp=a0560bf3c2d28dbea04d897762276211886bbed1;hpb=5c59e8c7cb3a804d403061e76a34c0378320b9b0;p=lyx.git

diff --git a/src/AspellChecker.cpp b/src/AspellChecker.cpp
index a0560bf3c2..284bcace70 100644
--- a/src/AspellChecker.cpp
+++ b/src/AspellChecker.cpp
@@ -12,6 +12,8 @@
 #include <config.h>
 
 #include "AspellChecker.h"
+#include "PersonalWordList.h"
+
 #include "LyXRC.h"
 #include "WordLangTuple.h"
 
@@ -19,80 +21,225 @@
 #include "support/debug.h"
 #include "support/docstring_list.h"
 
+#include "support/filetools.h"
+#include "support/Package.h"
+#include "support/FileName.h"
+#include "support/Path.h"
+
 #include <aspell.h>
 
 #include <map>
 #include <string>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
 namespace {
 
 struct Speller {
-	AspellSpeller * speller;
 	AspellConfig * config;
+	AspellCanHaveError * e_speller;
+	docstring_list ignored_words_;
 };
 
 typedef std::map<std::string, Speller> Spellers;
+typedef map<std::string, PersonalWordList *> LangPersonalWordList;
 
 } // anon namespace
 
 struct AspellChecker::Private
 {
-	Private(): spell_error_object(0) {}
+	Private() {}
 
 	~Private();
 
 	/// add a speller of the given language and variety
-	AspellSpeller * addSpeller(string const & lang,
-				   string const & variety = string());
+	AspellSpeller * addSpeller(Language const * lang);
 
 	///
-	AspellSpeller * speller(string const & lang,
-				string const & variety);
+	AspellSpeller * speller(Language const * lang);
+
+	bool isValidDictionary(AspellConfig * config,
+			string const & lang, string const & variety);
+	bool checkAspellData(AspellConfig * config,
+		string const & basepath, string const & datapath, string const & dictpath,
+		string const & lang, string const & variety);
+	AspellConfig * getConfig(string const & lang, string const & variety);
 
-	/// create a unique ID from lang code and variety
-	string const spellerID(string const & lang,
-			       string const & variety);
+	SpellChecker::Result check(AspellSpeller * m,
+		string const & word) const;
+
+	void initSessionDictionary(Speller const & speller, PersonalWordList * pd);
+	void insert(WordLangTuple const & word);
+	void remove(WordLangTuple const & word);
+	bool learned(WordLangTuple const & word);
+
+	void accept(Speller & speller, WordLangTuple const & word);
 
 	/// the spellers
 	Spellers spellers_;
 
-	/// FIXME
-	AspellCanHaveError * spell_error_object;
+	LangPersonalWordList personal_;
+
+	/// the location below system/user directory
+	/// there the rws files lookup will happen
+	const string dictDirectory(void) { return "dicts"; }
+	/// there the dat+cmap files lookup will happen
+	const string dataDirectory(void) { return "data"; }
+	/// os package directory constants
+	/// macports on Mac OS X or
+	/// aspell rpms on Linux
+	const string osPackageBase(void) {
+#ifdef USE_MACOSX_PACKAGING
+		return "/opt/local";
+#else
+		return "/usr";
+#endif
+	}
+	const string osPackageDictDirectory(void) {
+#ifdef USE_MACOSX_PACKAGING
+		return "/share/aspell";
+#else
+		return "/lib/aspell-0.60";
+#endif
+	}
+	const string osPackageDataDirectory(void) { return "/lib/aspell-0.60"; }
+
 };
 
 
 AspellChecker::Private::~Private()
 {
-	if (spell_error_object) {
-		delete_aspell_can_have_error(spell_error_object);
-		spell_error_object = 0;
-	}
-
 	Spellers::iterator it = spellers_.begin();
 	Spellers::iterator end = spellers_.end();
 
 	for (; it != end; ++it) {
-		aspell_speller_save_all_word_lists(it->second.speller);
-		delete_aspell_speller(it->second.speller);
+		if (it->second.e_speller) {
+			AspellSpeller * speller = to_aspell_speller(it->second.e_speller);
+			aspell_speller_save_all_word_lists(speller);
+			delete_aspell_can_have_error(it->second.e_speller);
+		}
 		delete_aspell_config(it->second.config);
 	}
+
+	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 AspellChecker::Private::isValidDictionary(AspellConfig * config,
+		string const & lang, string const & variety)
+{
+	bool have = false;
+	// code taken from aspell's list-dicts example
+	// the returned pointer should _not_ need to be deleted
+	AspellDictInfoList * dlist = get_aspell_dict_info_list(config);
+	AspellDictInfoEnumeration * dels = aspell_dict_info_list_elements(dlist);
+	const AspellDictInfo * entry;
+
+	while (0 != (entry = aspell_dict_info_enumeration_next(dels))) {
+		LYXERR(Debug::DEBUG, "aspell dict:"
+			<< " name="    << entry->name
+			<< ",code="    << entry->code
+			<< ",variety=" << entry->jargon);
+		if (entry->code == lang && (variety.empty() || entry->jargon == variety)) {
+			have = true;
+			break;
+		}
+	}
+	delete_aspell_dict_info_enumeration(dels);
+	LYXERR(Debug::FILES, "aspell dictionary: " << lang << (have ? " yes" : " no"));
+	return have;
+}
+
+
+bool AspellChecker::Private::checkAspellData(AspellConfig * config,
+	string const & basepath, string const & datapath, string const & dictpath,
+	string const & lang, string const & variety)
+{
+	FileName base(basepath);
+	bool have_dict = base.isDirectory() ;
+
+	if (have_dict) {
+		FileName data(addPath(base.absFileName(), datapath));
+		FileName dict(addPath(base.absFileName(), dictpath));
+		have_dict = dict.isDirectory() && data.isDirectory();
+		if (have_dict) {
+			LYXERR(Debug::FILES, "aspell dict-dir: " << dict);
+			LYXERR(Debug::FILES, "aspell data-dir: " << data);
+			aspell_config_replace(config, "dict-dir", dict.absFileName().c_str());
+			aspell_config_replace(config, "data-dir", data.absFileName().c_str());
+			have_dict = isValidDictionary(config, lang, variety);
+		}
+	}
+	return have_dict ;
 }
 
 
-AspellSpeller * AspellChecker::Private::addSpeller(string const & lang,
-						   string const & variety)
+AspellConfig * AspellChecker::Private::getConfig(string const & lang, string const & variety)
 {
 	AspellConfig * config = new_aspell_config();
+	bool have_dict = false;
+	string const sysdir = lyx::support::package().system_support().absFileName() ;
+	string const userdir = lyx::support::package().user_support().absFileName() ;
+
+	LYXERR(Debug::FILES, "aspell user dir: " << userdir);
+	have_dict = checkAspellData(config, userdir, dataDirectory(), dictDirectory(), lang, variety);
+	if (!have_dict) {
+		LYXERR(Debug::FILES, "aspell sysdir dir: " << sysdir);
+		have_dict = checkAspellData(config, sysdir, dataDirectory(), dictDirectory(), lang, variety);
+	}
+	if (!have_dict) {
+		// check for package data of OS installation
+		have_dict = checkAspellData(config, osPackageBase(), osPackageDataDirectory(), osPackageDictDirectory(), lang, variety);
+	}
+	return config ;
+}
+
+
+void AspellChecker::Private::initSessionDictionary(
+	Speller const & speller,
+	PersonalWordList * pd)
+{
+	AspellSpeller * aspell = to_aspell_speller(speller.e_speller);
+	aspell_speller_clear_session(aspell);
+	docstring_list::const_iterator it = pd->begin();
+	docstring_list::const_iterator et = pd->end();
+	for (; it != et; ++it) {
+		string const word_to_add = to_utf8(*it);
+		aspell_speller_add_to_session(aspell, word_to_add.c_str(), -1);
+	}
+	it = speller.ignored_words_.begin();
+	et = speller.ignored_words_.end();
+	for (; it != et; ++it) {
+		string const word_to_add = to_utf8(*it);
+		aspell_speller_add_to_session(aspell, word_to_add.c_str(), -1);
+	}
+}
+
+
+AspellSpeller * AspellChecker::Private::addSpeller(Language const * lang)
+{
+	Speller m;
+	string const code = lang->code();
+	string const variety = lang->variety();
+	m.config = getConfig(code, variety);
 	// Aspell supports both languages and varieties (such as German
 	// old vs. new spelling). The respective naming convention is
 	// lang_REGION-variety (e.g. de_DE-alt).
-	aspell_config_replace(config, "lang", lang.c_str());
+	aspell_config_replace(m.config, "lang", code.c_str());
 	if (!variety.empty())
-		aspell_config_replace(config, "variety", variety.c_str());
+		aspell_config_replace(m.config, "variety", variety.c_str());
 	// Set the encoding to utf-8.
 	// aspell does also understand "ucs-4", so we would not need a
 	// conversion in theory, but if this is used it expects all
@@ -100,49 +247,92 @@ AspellSpeller * AspellChecker::Private::addSpeller(string const & lang,
 	// seems that this uint is not compatible with our char_type on some
 	// platforms (cygwin, OS X). Therefore we use utf-8, that does
 	// always work.
-	aspell_config_replace(config, "encoding", "utf-8");
+	aspell_config_replace(m.config, "encoding", "utf-8");
 	if (lyxrc.spellchecker_accept_compound)
 		// Consider run-together words as legal compounds
-		aspell_config_replace(config, "run-together", "true");
+		aspell_config_replace(m.config, "run-together", "true");
 	else
 		// Report run-together words as errors
-		aspell_config_replace(config, "run-together", "false");
-	AspellCanHaveError * err = new_aspell_speller(config);
-	if (spell_error_object)
-		delete_aspell_can_have_error(spell_error_object);
-	spell_error_object = 0;
-
-	if (aspell_error_number(err) != 0) {
-		// FIXME: We should we indicate somehow that this language is not
-		// supported.
-		spell_error_object = err;
-		return 0;
+		aspell_config_replace(m.config, "run-together", "false");
+
+	m.e_speller = new_aspell_speller(m.config);
+	if (aspell_error_number(m.e_speller) != 0) {
+		// FIXME: We should indicate somehow that this language is not supported.
+		LYXERR(Debug::FILES, "aspell error: " << aspell_error_message(m.e_speller));
+		delete_aspell_can_have_error(m.e_speller);
+		delete_aspell_config(m.config);
+		m.config = 0;
+		m.e_speller = 0;
+	} else {
+		PersonalWordList * pd = new PersonalWordList(lang->lang());
+		pd->load();
+		personal_[lang->lang()] = pd;
+		initSessionDictionary(m, pd);
 	}
-	Speller m;
-	m.speller = to_aspell_speller(err);
-	m.config = config;
-	spellers_[spellerID(lang, variety)] = m;
-	return m.speller;
+	
+	spellers_[lang->lang()] = m;
+	return m.e_speller ? to_aspell_speller(m.e_speller) : 0;
 }
 
 
-AspellSpeller * AspellChecker::Private::speller(string const & lang,
-						string const & variety)
+AspellSpeller * AspellChecker::Private::speller(Language const * lang)
 {
-	Spellers::iterator it = spellers_.find(spellerID(lang, variety));
+	Spellers::iterator it = spellers_.find(lang->lang());
 	if (it != spellers_.end())
-		return it->second.speller;
+		return to_aspell_speller(it->second.e_speller);
 	
-	return addSpeller(lang, variety);
+	return addSpeller(lang);
 }
 
 
-string const AspellChecker::Private::spellerID(string const & lang,
-					string const & variety)
+SpellChecker::Result AspellChecker::Private::check(
+	AspellSpeller * m, string const & word) 
+	const
+{
+	int const word_ok = aspell_speller_check(m, word.c_str(), -1);
+	LASSERT(word_ok != -1, /**/);
+	return (word_ok) ? WORD_OK : UNKNOWN_WORD;
+}
+
+void AspellChecker::Private::accept(Speller & speller, WordLangTuple const & word)
 {
-	if (variety.empty())
-		return lang;
-	return lang + "-" + variety;
+	speller.ignored_words_.push_back(word.word());
+}
+
+
+/// personal word list interface
+void AspellChecker::Private::remove(WordLangTuple const & word)
+{
+	PersonalWordList * pd = personal_[word.lang()->lang()];
+	if (!pd)
+		return;
+	pd->remove(word.word());
+	Spellers::iterator it = spellers_.find(word.lang()->lang());
+	if (it != spellers_.end()) {
+		initSessionDictionary(it->second, pd);
+	}
+}
+
+		
+void AspellChecker::Private::insert(WordLangTuple const & word)
+{
+	Spellers::iterator it = spellers_.find(word.lang()->lang());
+	if (it != spellers_.end()) {
+		AspellSpeller * speller = to_aspell_speller(it->second.e_speller);
+		aspell_speller_add_to_session(speller, to_utf8(word.word()).c_str(), -1);
+		PersonalWordList * pd = personal_[word.lang()->lang()];
+		if (!pd)
+			return;
+		pd->insert(word.word());
+	}
+}
+
+bool AspellChecker::Private::learned(WordLangTuple const & word)
+{
+	PersonalWordList * pd = personal_[word.lang()->lang()];
+	if (!pd)
+		return false;
+	return pd->exists(word.word());
 }
 
 
@@ -160,38 +350,43 @@ AspellChecker::~AspellChecker()
 SpellChecker::Result AspellChecker::check(WordLangTuple const & word)
 {
   
-	AspellSpeller * m =
-		d->speller(word.lang()->code(), word.lang()->variety());
+	AspellSpeller * m = d->speller(word.lang());
 
 	if (!m)
-		return OK;
+		return WORD_OK;
 
 	if (word.word().empty())
 		// MSVC compiled Aspell doesn't like it.
-		return OK;
+		return WORD_OK;
 
-	int const word_ok = aspell_speller_check(m, to_utf8(word.word()).c_str(), -1);
-	LASSERT(word_ok != -1, /**/);
+	string const word_str = to_utf8(word.word());
+	SpellChecker::Result rc = d->check(m, word_str);
+	return (rc == WORD_OK && d->learned(word)) ? LEARNED_WORD : rc;
+}
 
-	return (word_ok) ? OK : UNKNOWN_WORD;
+
+void AspellChecker::advanceChangeNumber()
+{
+	nextChangeNumber();
 }
 
 
 void AspellChecker::insert(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(
-		d->spellerID(word.lang()->code(), word.lang()->variety()));
-	if (it != d->spellers_.end())
-		aspell_speller_add_to_personal(it->second.speller, to_utf8(word.word()).c_str(), -1);
+	d->insert(word);
+	advanceChangeNumber();
 }
 
 
 void AspellChecker::accept(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(
-		d->spellerID(word.lang()->code(), word.lang()->variety()));
-	if (it != d->spellers_.end())
-		aspell_speller_add_to_session(it->second.speller, to_utf8(word.word()).c_str(), -1);
+	Spellers::iterator it = d->spellers_.find(word.lang()->lang());
+	if (it != d->spellers_.end()) {
+		AspellSpeller * speller = to_aspell_speller(it->second.e_speller);
+		aspell_speller_add_to_session(speller, to_utf8(word.word()).c_str(), -1);
+		d->accept(it->second, word);
+		advanceChangeNumber();
+	}
 }
 
 
@@ -199,8 +394,7 @@ void AspellChecker::suggest(WordLangTuple const & wl,
 	docstring_list & suggestions)
 {
 	suggestions.clear();
-	AspellSpeller * m =
-		d->speller(wl.lang()->code(), wl.lang()->variety());
+	AspellSpeller * m = d->speller(wl.lang());
 
 	if (!m)
 		return;
@@ -222,49 +416,42 @@ void AspellChecker::suggest(WordLangTuple const & wl,
 	delete_aspell_string_enumeration(els);
 }
 
+void AspellChecker::remove(WordLangTuple const & word)
+{
+	d->remove(word);
+	advanceChangeNumber();
+}
 
 bool AspellChecker::hasDictionary(Language const * lang) const
 {
-	if (!lang)
-		return false;
-	// code taken from aspell's list-dicts example
-	AspellConfig * config;
-	AspellDictInfoList * dlist;
-	AspellDictInfoEnumeration * dels;
-	const AspellDictInfo * entry;
-
-	config = new_aspell_config();
-
-	/* the returned pointer should _not_ need to be deleted */
-	dlist = get_aspell_dict_info_list(config);
-
-	/* config is no longer needed */
-	delete_aspell_config(config);
-
-	dels = aspell_dict_info_list_elements(dlist);
-
 	bool have = false;
-	while ((entry = aspell_dict_info_enumeration_next(dels)) != 0)
-	{
-		if (entry->code == lang->code()
-		    && (lang->variety().empty() || entry->jargon == lang->variety())) {
-			have = true;
-			break;
+	Spellers::iterator it = d->spellers_.begin();
+	Spellers::iterator end = d->spellers_.end();
+
+	if (lang) {
+		for (; it != end && !have; ++it) {
+			have = it->second.config && d->isValidDictionary(it->second.config, lang->code(), lang->variety());
+		}
+		if (!have) {
+			AspellConfig * config = d->getConfig(lang->code(), lang->variety());
+			have = d->isValidDictionary(config, lang->code(), lang->variety());
+			delete_aspell_config(config);
 		}
 	}
-
-	delete_aspell_dict_info_enumeration(dels);
-
 	return have;
 }
 
 
 docstring const AspellChecker::error()
 {
+	Spellers::iterator it = d->spellers_.begin();
+	Spellers::iterator end = d->spellers_.end();
 	char const * err = 0;
 
-	if (d->spell_error_object && aspell_error_number(d->spell_error_object) != 0)
-		err = aspell_error_message(d->spell_error_object);
+	for (; it != end && 0 == err; ++it) {
+		if (it->second.e_speller && aspell_error_number(it->second.e_speller) != 0)
+			err = aspell_error_message(it->second.e_speller);
+	}
 
 	// FIXME UNICODE: err is not in UTF8, but probably the locale encoding
 	return (err ? from_utf8(err) : docstring());