X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEnchantChecker.cpp;h=dc8ea4d864af9e9ff5a589a0a840583ac4f803b5;hb=67fa69ce6b6f7ce60ef4e38836baa09ddefa759f;hp=23cbee923e55f48ed7ffd81d7aa019ab8d43ae5a;hpb=7746747506617b952e04e2e805c3688f4fef5256;p=lyx.git

diff --git a/src/EnchantChecker.cpp b/src/EnchantChecker.cpp
index 23cbee923e..dc8ea4d864 100644
--- a/src/EnchantChecker.cpp
+++ b/src/EnchantChecker.cpp
@@ -34,13 +34,14 @@ struct Speller {
 	enchant::Dict * speller;
 };
 
-typedef std::map<std::string, Speller> Spellers;
+typedef map<string, Speller> Spellers;
   
 } // anon namespace
 
 struct EnchantChecker::Private
 {
-	Private() {}
+	Private()
+	{}
 
 	~Private();
 
@@ -60,25 +61,29 @@ EnchantChecker::Private::~Private()
 	Spellers::iterator it = spellers_.begin();
 	Spellers::iterator end = spellers_.end();
 
-	for (; it != end; ++it) {
+	for (; it != end; ++it)
 		delete it->second.speller;
-	}
 }
 
 
 enchant::Dict * EnchantChecker::Private::addSpeller(string const & lang)
 {
 	enchant::Broker * instance = enchant::Broker::instance();
-	enchant::Dict * dict = instance->request_dict(lang);
+	Speller m;
 
-	if (dict) {
-		Speller m;
-		m.speller = dict;
-		spellers_[lang] = m;
-		return m.speller;
+	try {
+		LYXERR(Debug::FILES, "request enchant speller for language " << lang);
+		m.speller = instance->request_dict(lang);
+	}
+	catch (enchant::Exception & e) {
+		// FIXME error handling?
+		const char * what = e.what();
+		LYXERR(Debug::FILES, "cannot add enchant speller: " <<
+			   ((what && *what) ? what : "unspecified enchant exception in request_dict()"));
+		m.speller = 0;
 	}
-	// FIXME error handling?
-	return 0;
+	spellers_[lang] = m;
+	return m.speller;
 }
 
 
@@ -92,9 +97,9 @@ enchant::Dict * EnchantChecker::Private::speller(string const & lang)
 }
 
 
-EnchantChecker::EnchantChecker(): d(new Private)
-{
-}
+EnchantChecker::EnchantChecker()
+	: d(new Private)
+{}
 
 
 EnchantChecker::~EnchantChecker()
@@ -105,33 +110,56 @@ EnchantChecker::~EnchantChecker()
 
 SpellChecker::Result EnchantChecker::check(WordLangTuple const & word)
 {
-	enchant::Dict * m = d->speller(word.lang_code());
+	enchant::Dict * m = d->speller(word.lang()->code());
 
 	if (!m)
-		return OK;
+		return NO_DICTIONARY;
 
-	std::string utf8word(to_utf8(word.word()));
+	if (word.word().empty())
+		return WORD_OK;
+
+	string utf8word = to_utf8(word.word());
 
 	if (m->check(utf8word))
-		return OK;
+		return WORD_OK;
 
 	return UNKNOWN_WORD;
 }
 
 
+void EnchantChecker::advanceChangeNumber()
+{
+	nextChangeNumber();
+}
+
+
 void EnchantChecker::insert(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(word.lang_code());
-	if (it != d->spellers_.end())
-		it->second.speller->add(to_utf8(word.word()));
+	enchant::Dict * m = d->speller(word.lang()->code());
+	if (m) {
+		m->add(to_utf8(word.word()));
+		advanceChangeNumber();
+	}
+}
+	
+	
+void EnchantChecker::remove(WordLangTuple const & word)
+{
+	enchant::Dict * m = d->speller(word.lang()->code());
+	if (m) {
+		m->remove(to_utf8(word.word()));
+		advanceChangeNumber();
+	}
 }
 
 
 void EnchantChecker::accept(WordLangTuple const & word)
 {
-	Spellers::iterator it = d->spellers_.find(word.lang_code());
-	if (it != d->spellers_.end())
-		it->second.speller->add_to_session(to_utf8(word.word()));
+	enchant::Dict * m = d->speller(word.lang()->code());
+	if (m) {
+		m->add_to_session(to_utf8(word.word()));
+		advanceChangeNumber();
+	}
 }
 
 
@@ -139,7 +167,7 @@ void EnchantChecker::suggest(WordLangTuple const & wl,
 	docstring_list & suggestions)
 {
 	suggestions.clear();
-	enchant::Dict * m = d->speller(wl.lang_code());
+	enchant::Dict * m = d->speller(wl.lang()->code());
 
 	if (!m)
 		return;
@@ -154,6 +182,21 @@ void EnchantChecker::suggest(WordLangTuple const & wl,
 }
 
 
+bool EnchantChecker::hasDictionary(Language const * lang) const
+{
+	if (!lang)
+		return false;
+	enchant::Broker * instance = enchant::Broker::instance();
+	return (instance->dict_exists(lang->code()));
+}
+
+
+int EnchantChecker::numDictionaries() const
+{
+	return d->spellers_.size();
+}
+	
+
 docstring const EnchantChecker::error()
 {
 	return docstring();