Account for old versions of Pygments

[lyx.git] / src / Thesaurus.cpp

diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp
index f8e8448979a5f1bad70b5c8db6dfc3a78e69636f..cf8567eb53f5c9a5403296c3e1615ccd3ce7530d 100644 (file)
--- a/src/Thesaurus.cpp
+++ b/src/Thesaurus.cpp
@@ -27,12 +27,8 @@
 #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"
 
@@ -107,6 +103,11 @@ 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) {
                                // check for appropriate version of index file
@@ -129,6 +130,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) {
@@ -150,9 +165,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);
@@ -271,7 +285,8 @@ Thesaurus::Meanings Thesaurus::lookup(WordLangTuple const & wl)
 }
 
 
-Thesaurus::Thesaurus() : d(new Thesaurus::Private)
+Thesaurus::Thesaurus()
+       : d(new Thesaurus::Private)
 {
 }