#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/os.h"
-#include "support/unicode.h"
#include "support/mythes/mythes.hxx"
namespace {
-string const to_iconv_encoding(docstring const & s, string const & encoding)
-{
- std::vector<char> const encoded =
- ucs4_to_eightbit(s.data(), s.length(), encoding);
- return string(encoded.begin(), encoded.end());
-}
-
-
-docstring const from_iconv_encoding(string const & s, string const & encoding)
-{
- std::vector<char_type> const ucs4 =
- eightbit_to_ucs4(s.data(), s.length(), encoding);
- return docstring(ucs4.begin(), ucs4.end());
-}
-
typedef std::map<docstring, MyThes *> Thesauri;
} // namespace anon
it != idx_files.end(); ++it) {
LYXERR(Debug::FILES, "found thesaurus idx file: " << it->onlyFileName());
if (contains(it->onlyFileName(), to_ascii(lang))) {
- idx = it->absFilename();
+ idx = it->absFileName();
LYXERR(Debug::FILES, "selected thesaurus idx file: " << idx);
break;
}
it != data_files.end(); ++it) {
LYXERR(Debug::FILES, "found thesaurus data file: " << it->onlyFileName());
if (contains(it->onlyFileName(), to_ascii(lang))) {
- data = it->absFilename();
+ data = it->absFileName();
LYXERR(Debug::FILES, "selected thesaurus data file: " << data);
break;
}
bool Thesaurus::Private::addThesaurus(docstring const & lang)
{
+ if (thesaurusAvailable(lang))
+ return true;
+
ThesFiles files = getThesaurus(lang);
string const idx = files.first;
string const data = files.second;