#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 MYTHES_H_LOCATION
#include "frontends/alert.h"
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) {
// check for appropriate version of index file
}
}
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) {
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);
}
-Thesaurus::Thesaurus() : d(new Thesaurus::Private)
+Thesaurus::Thesaurus()
+ : d(new Thesaurus::Private)
{
}