X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FAspellChecker.cpp;h=c4b24199940fa2146418638e50024b11abf0694e;hb=0f21c5caf6c5ba4afdf97f4c780800adf49f6434;hp=16bc5802113061c1142628e609c6f5c6bf21d5ad;hpb=1ffc210d0d7d84c1db1a3196230841aae15ab753;p=lyx.git

diff --git a/src/AspellChecker.cpp b/src/AspellChecker.cpp
index 16bc580211..c4b2419994 100644
--- a/src/AspellChecker.cpp
+++ b/src/AspellChecker.cpp
@@ -19,12 +19,13 @@
 
 #include "support/lassert.h"
 #include "support/debug.h"
+#include "support/lstrings.h"
 #include "support/docstring_list.h"
 
 #include "support/filetools.h"
 #include "support/Package.h"
 #include "support/FileName.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 
 #include <aspell.h>
 
@@ -52,7 +53,8 @@ typedef map<std::string, PersonalWordList *> LangPersonalWordList;
 
 struct AspellChecker::Private
 {
-	Private() {}
+	Private()
+	{}
 
 	~Private();
 
@@ -64,6 +66,7 @@ struct AspellChecker::Private
 
 	bool isValidDictionary(AspellConfig * config,
 			string const & lang, string const & variety);
+	int numDictionaries() const;
 	bool checkAspellData(AspellConfig * config,
 		string const & basepath, string const & datapath, string const & dictpath,
 		string const & lang, string const & variety);
@@ -89,27 +92,38 @@ struct AspellChecker::Private
 
 	/// the location below system/user directory
 	/// there the rws files lookup will happen
-	const string dictDirectory(void) { return "dicts"; }
+	const string dictDirectory(void)
+	{
+		return "dicts";
+	}
 	/// there the dat+cmap files lookup will happen
-	const string dataDirectory(void) { return "data"; }
+	const string dataDirectory(void)
+	{
+		return "data";
+	}
 	/// os package directory constants
 	/// macports on Mac OS X or
 	/// aspell rpms on Linux
-	const string osPackageBase(void) {
+	const string osPackageBase(void)
+	{
 #ifdef USE_MACOSX_PACKAGING
 		return "/opt/local";
 #else
 		return "/usr";
 #endif
 	}
-	const string osPackageDictDirectory(void) {
+	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"; }
+	const string osPackageDataDirectory(void)
+	{
+		return "/lib/aspell-0.60";
+	}
 
 };
 
@@ -205,7 +219,7 @@ AspellConfig * AspellChecker::Private::getConfig(string const & lang, string con
 	}
 	if (!have_dict) {
 		// check for package data of OS installation
-		have_dict = checkAspellData(config, osPackageBase(), osPackageDataDirectory(), osPackageDictDirectory(), lang, variety);
+		checkAspellData(config, osPackageBase(), osPackageDataDirectory(), osPackageDictDirectory(), lang, variety);
 	}
 	return config ;
 }
@@ -311,20 +325,55 @@ AspellSpeller * AspellChecker::Private::speller(Language const * lang)
 	return addSpeller(lang);
 }
 
- 
+
+int AspellChecker::Private::numDictionaries() const
+{
+	int result = 0;
+	Spellers::const_iterator it = spellers_.begin();
+	Spellers::const_iterator et = spellers_.end();
+
+	for (; it != et; ++it) {
+		Speller aspell = it->second;
+		result += aspell.e_speller != 0;
+	}
+	return result;
+}
+
+
 string AspellChecker::Private::toAspellWord(docstring const & word) const
 {
-	return to_utf8(word);
+	size_t mpos;
+	string word_str = to_utf8(word);
+	while ((mpos = word_str.find('-')) != word_str.npos) {
+		word_str.erase(mpos, 1);
+	}
+	return word_str;
 }
 
- 
+
 SpellChecker::Result AspellChecker::Private::check(
 	AspellSpeller * m, WordLangTuple const & word) 
 	const
 {
+	SpellChecker::Result result = WORD_OK;
+	docstring w1;
+	LYXERR(Debug::GUI, "spellCheck: \"" <<
+		   word.word() << "\", lang = " << word.lang()->lang()) ;
+	docstring rest = split(word.word(), w1, '-');
+	for (; result == WORD_OK;) {
+		string const word_str = toAspellWord(w1);
+		int const word_ok = aspell_speller_check(m, word_str.c_str(), -1);
+		LASSERT(word_ok != -1, return UNKNOWN_WORD);
+		result = (word_ok) ? WORD_OK : UNKNOWN_WORD;
+		if (rest.empty())
+			break;
+		rest = split(rest,w1,'-');
+	}
+	if (result == WORD_OK)
+		return result;
 	string const word_str = toAspellWord(word.word());
 	int const word_ok = aspell_speller_check(m, word_str.c_str(), -1);
-	LASSERT(word_ok != -1, /**/);
+	LASSERT(word_ok != -1, return UNKNOWN_WORD);
 	return (word_ok) ? WORD_OK : UNKNOWN_WORD;
 }
 
@@ -369,9 +418,9 @@ bool AspellChecker::Private::learned(WordLangTuple const & word)
 }
 
 
-AspellChecker::AspellChecker(): d(new Private)
-{
-}
+AspellChecker::AspellChecker()
+	: d(new Private)
+{}
 
 
 AspellChecker::~AspellChecker()
@@ -386,7 +435,7 @@ SpellChecker::Result AspellChecker::check(WordLangTuple const & word)
 	AspellSpeller * m = d->speller(word.lang());
 
 	if (!m)
-		return WORD_OK;
+		return NO_DICTIONARY;
 
 	if (word.word().empty())
 		// MSVC compiled Aspell doesn't like it.
@@ -433,7 +482,7 @@ void AspellChecker::suggest(WordLangTuple const & wl,
 	string const word = d->toAspellWord(wl.word());
 	AspellWordList const * sugs =
 		aspell_speller_suggest(m, word.c_str(), -1);
-	LASSERT(sugs != 0, /**/);
+	LASSERT(sugs != 0, return);
 	AspellStringEnumeration * els = aspell_word_list_elements(sugs);
 	if (!els || aspell_word_list_empty(sugs))
 		return;
@@ -448,12 +497,14 @@ 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
 {
 	bool have = false;
@@ -474,6 +525,12 @@ bool AspellChecker::hasDictionary(Language const * lang) const
 }
 
 
+int AspellChecker::numDictionaries() const
+{
+	return d->numDictionaries();
+}
+	
+	
 docstring const AspellChecker::error()
 {
 	Spellers::iterator it = d->spellers_.begin();