X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FThesaurus.cpp;h=4f4ad64d14aba691df74e59eb45445e20e76f261;hb=499fc04c9a417cb91ddc97a2110ac59882fd4909;hp=870f967f41578ba7fcbb70c6c5a6dd4ed174e952;hpb=333485fa34449c5a543f35abac040285c2851042;p=lyx.git

diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp
index 870f967f41..4f4ad64d14 100644
--- a/src/Thesaurus.cpp
+++ b/src/Thesaurus.cpp
@@ -15,15 +15,24 @@
 
 #include "LyXRC.h"
 
+#include "SpellChecker.h"
+#include "WordLangTuple.h"
+
 #include "support/FileNameList.h"
 #include "support/Package.h"
 #include "support/debug.h"
+#include "support/docstring_list.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 
+#ifdef USE_EXTERNAL_MYTHES
+#include MYTHES_H_LOCATION
+#else
+#include <cstdio>
 #include "support/mythes/mythes.hxx"
+#endif
 
 #include "frontends/alert.h"
 
@@ -98,11 +107,23 @@ pair<string,string> Thesaurus::Private::getThesaurus(string const & path, docstr
 	for (FileNameList::const_iterator it = idx_files.begin(); it != idx_files.end(); ++it) {
 		basename = it->onlyFileNameWithoutExt();
 		if (contains(basename, to_ascii(lang))) {
+			// do not use more specific dicts.
+			if (contains(basename, '_') && !contains(lang, '_'))
+				continue;
+			if (contains(basename, '-') && !contains(lang, '-'))
+				continue;
 			ifstream ifs(it->absFileName().c_str());
 			if (ifs) {
-				string s;
-				getline(ifs,s);
-				if (s.find_first_of(',') != string::npos) {
+				// check for appropriate version of index file
+				string encoding; // first line is encoding
+				int items = 0;   // second line is no. of items
+				getline(ifs,encoding);
+				ifs >> items;
+				if (ifs.fail()) {
+					LYXERR(Debug::FILES, "ignore irregular thesaurus idx file: " << it->absFileName());
+					continue;
+				}
+				if (encoding.length() == 0 || encoding.find_first_of(',') != string::npos) {
 					LYXERR(Debug::FILES, "ignore version1 thesaurus idx file: " << it->absFileName());
 					continue;
 				}
@@ -113,6 +134,20 @@ pair<string,string> Thesaurus::Private::getThesaurus(string const & path, docstr
 		}
 	}
 	if (idx.empty()) {
+		// try with a more general dictionary
+		docstring shortcode;
+		if (contains(lang, '_')) {
+			split(lang, shortcode, '_');
+			LYXERR(Debug::FILES, "Did not find thesaurus for LANG code "
+			       << lang << ". Trying with " << shortcode);
+			return getThesaurus(path, shortcode);
+		}
+		else if (contains(lang, '-')) {
+			split(lang, shortcode, '-');
+			LYXERR(Debug::FILES, "Did not find thesaurus for LANG code "
+			       << lang << ". Trying with " << shortcode);
+			return getThesaurus(path, shortcode);
+		}
 		return make_pair(string(), string());
 	}
 	for (support::FileNameList::const_iterator it = data_files.begin(); it != data_files.end(); ++it) {
@@ -134,9 +169,8 @@ pair<string,string> Thesaurus::Private::getThesaurus(docstring const & lang)
 	if (thesaurusAvailable(lang))
 		return make_pair(string(), string());
 
-	if (!thes_path.empty()) {
+	if (!thes_path.empty())
 		result = getThesaurus(thes_path, lang);
-	}
 	if (result.first.empty() || result.second.empty()) {
 		string const sys_path = external_path(addName(lyx::support::package().system_support().absFileName(),dataDirectory())) ;
 		result = getThesaurus(sys_path, lang);
@@ -183,17 +217,20 @@ bool Thesaurus::thesaurusInstalled(docstring const & lang) const
 }
 
 
-Thesaurus::Meanings Thesaurus::lookup(docstring const & t, docstring const & lang)
+Thesaurus::Meanings Thesaurus::lookup(WordLangTuple const & wl)
 {
 	Meanings meanings;
 	MyThes * mythes = 0;
 
-	if (!d->addThesaurus(lang))
+	docstring const lang_code = from_ascii(wl.lang()->code());
+	docstring const t = wl.word();
+
+	if (!d->addThesaurus(lang_code))
 		return meanings;
 
 	for (Thesauri::const_iterator it = d->thes_.begin();
 	     it != d->thes_.end(); ++it) {
-		if (it->first == lang) {
+		if (it->first == lang_code) {
 			mythes = it->second;
 			break;
 		}
@@ -208,24 +245,38 @@ Thesaurus::Meanings Thesaurus::lookup(docstring const & t, docstring const & lan
 	string const text = to_iconv_encoding(support::lowercase(t), encoding);
 	int len = strlen(text.c_str());
 	int count = mythes->Lookup(text.c_str(), len, &pmean);
-	if (!count)
-		return meanings;
+	if (!count) {
+		SpellChecker * speller = theSpellChecker();
+		if (!speller)
+			return meanings;
+		docstring_list suggestions;
+		speller->stem(wl, suggestions);
+		for (size_t i = 0; i != suggestions.size(); ++i) {
+			string const wordform = to_iconv_encoding(support::lowercase(suggestions[i]), encoding);
+			len = strlen(wordform.c_str());
+			count = mythes->Lookup(wordform.c_str(), len, &pmean);
+			if (count)
+				break;
+		}
+		if (!count)
+			return meanings;
+	}
 
 	// don't change value of pmean or count
 	// they are needed for the CleanUpAfterLookup routine
 	mentry * pm = pmean;
 	docstring meaning;
-	docstring ret;
 	for (int i = 0; i < count; i++) {
+		vector<docstring> ret;
 		meaning = from_iconv_encoding(string(pm->defn), encoding);
 		// remove silly item
 		if (support::prefixIs(meaning, '-'))
 			meaning = support::ltrim(meaning, "- ");
 		for (int j = 0; j < pm->count; j++) {
-			ret = from_iconv_encoding(string(pm->psyns[j]), encoding);
+			ret.push_back(from_iconv_encoding(string(pm->psyns[j]), encoding));
 		}
-	meanings[meaning].push_back(ret);
-	pm++;
+		meanings[meaning] = ret;
+		++pm;
 	}
 	// now clean up all allocated memory
 	mythes->CleanUpAfterLookup(&pmean, count);
@@ -238,7 +289,8 @@ Thesaurus::Meanings Thesaurus::lookup(docstring const & t, docstring const & lan
 }
 
 
-Thesaurus::Thesaurus() : d(new Thesaurus::Private)
+Thesaurus::Thesaurus()
+	: d(new Thesaurus::Private)
 {
 }