#include "Thesaurus.h"
-#include "support/debug.h"
-#include "support/gettext.h"
#include "LyXRC.h"
#include "support/FileNameList.h"
+#include "support/debug.h"
#include "support/filetools.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/os.h"
-#include "support/unicode.h"
+
+#include "support/mythes/mythes.hxx"
#include "frontends/alert.h"
namespace lyx {
-#ifndef HAVE_LIBMYTHES
-#ifdef HAVE_LIBAIKSAURUS
-
-
-Thesaurus::Thesaurus()
- : thes_(new Aiksaurus)
-{}
+namespace {
+typedef std::map<docstring, MyThes *> Thesauri;
-Thesaurus::~Thesaurus()
-{
- delete thes_;
-}
+} // namespace anon
-Thesaurus::Meanings Thesaurus::lookup(docstring const & t, docstring const &)
+struct Thesaurus::Private
{
- Meanings meanings;
-
- // aiksaurus is for english text only, therefore it does not work
- // with non-ascii strings.
- // The interface of the Thesaurus class uses docstring because a
- // non-english thesaurus is possible in theory.
- if (!support::isAscii(t))
- // to_ascii() would assert
- return meanings;
-
- string const text = to_ascii(t);
-
- docstring error = from_ascii(thes_->error());
- if (!error.empty()) {
- static bool sent_error = false;
- if (!sent_error) {
- frontend::Alert::error(_("Thesaurus failure"),
- bformat(_("Aiksaurus returned the following error:\n\n%1$s."),
- error));
- sent_error = true;
+ ~Private()
+ {
+ for (Thesauri::iterator it = thes_.begin();
+ it != thes_.end(); ++it) {
+ delete it->second;
}
- return meanings;
}
- if (!thes_->find(text.c_str()))
- return meanings;
-
- // weird api, but ...
-
- int prev_meaning = -1;
- int cur_meaning;
- docstring meaning;
-
- // correct, returns "" at the end
- string ret = thes_->next(cur_meaning);
-
- while (!ret.empty()) {
- if (cur_meaning != prev_meaning) {
- meaning = from_ascii(ret);
- ret = thes_->next(cur_meaning);
- prev_meaning = cur_meaning;
- } else {
- if (ret != text)
- meanings[meaning].push_back(from_ascii(ret));
+ ///
+ bool thesaurusAvailable(docstring const & lang) const
+ {
+ for (Thesauri::const_iterator it = thes_.begin();
+ it != thes_.end(); ++it) {
+ if (it->first == lang)
+ if (it->second)
+ return true;
}
-
- ret = thes_->next(cur_meaning);
+ return false;
}
- for (Meanings::iterator it = meanings.begin();
- it != meanings.end(); ++it)
- sort(it->second.begin(), it->second.end());
-
- return meanings;
-}
-
-
-bool Thesaurus::thesaurusAvailable(docstring const & lang) const
-{
- // we support English only
- return prefixIs(lang, from_ascii("en_"));
-}
-
-#endif // HAVE_LIBAIKSAURUS
-#endif // !HAVE_LIBMYTHES
-
-
-#ifdef HAVE_LIBMYTHES
-
-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());
-}
+ ///
+ typedef std::pair<std::string, std::string> ThesFiles;
+ ///
+ ThesFiles getThesaurus(docstring const & lang);
+ /// add a thesaurus to the list
+ bool addThesaurus(docstring const & lang);
+ /// the thesauri
+ Thesauri thes_;
+};
-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());
-}
-} // namespace anon
-
-
-Thesaurus::Thesaurus()
-{}
-
-
-Thesaurus::~Thesaurus()
-{
- for (Thesauri::iterator it = thes_.begin();
- it != thes_.end(); ++it) {
- delete it->second;
- }
-}
-
-
-bool Thesaurus::addThesaurus(docstring const & lang)
+pair<string, string> Thesaurus::Private::getThesaurus(docstring const & lang)
{
string const thes_path = external_path(lyxrc.thesaurusdir_path);
LYXERR(Debug::FILES, "thesaurus path: " << thes_path);
if (thes_path.empty())
- return false;
+ return make_pair(string(), string());
if (thesaurusAvailable(lang))
- return true;
+ return make_pair(string(), string());
FileNameList const idx_files = FileName(thes_path).dirList("idx");
FileNameList const data_files = FileName(thes_path).dirList("dat");
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;
}
}
+ return make_pair(idx, data);
+}
+
+
+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;
+
if (idx.empty() || data.empty())
return false;
bool Thesaurus::thesaurusAvailable(docstring const & lang) const
{
- for (Thesauri::const_iterator it = thes_.begin();
- it != thes_.end(); ++it) {
- if (it->first == lang)
- if (it->second)
- return true;
- }
+ return d->thesaurusAvailable(lang);
+}
+
- return false;
+bool Thesaurus::thesaurusInstalled(docstring const & lang) const
+{
+ pair<string, string> files = d->getThesaurus(lang);
+ return (!files.first.empty() && !files.second.empty());
}
Meanings meanings;
MyThes * mythes = 0;
- if (!addThesaurus(lang))
+ if (!d->addThesaurus(lang))
return meanings;
- for (Thesauri::const_iterator it = thes_.begin();
- it != thes_.end(); ++it) {
+ for (Thesauri::const_iterator it = d->thes_.begin();
+ it != d->thes_.end(); ++it) {
if (it->first == lang) {
mythes = it->second;
break;
return meanings;
}
-#else
-#ifndef HAVE_LIBAIKSAURUS
-Thesaurus::Thesaurus()
-{
-}
-
-
-Thesaurus::~Thesaurus()
-{
-}
-
-Thesaurus::Meanings Thesaurus::lookup(docstring const &, docstring const &)
+Thesaurus::Thesaurus() : d(new Thesaurus::Private)
{
- return Meanings();
}
-bool Thesaurus::thesaurusAvailable(docstring const & lang) const
+Thesaurus::~Thesaurus()
{
- return false;
+ delete d;
}
-#endif
-#endif // HAVE_LIBMYTHES
-
// Global instance
Thesaurus thesaurus;
projects / lyx.git / blobdiff