Changeset 27572

Timestamp:

11/16/08 19:48:25 (2 months ago)

Author:

spitz

Message:

Add support for MyThes? (i.e., OpenOffice? thesauri).

RegExp? experts please have a look at the FIXMEs in GuiThesaurus?.cpp.

Files:

• lyx-devel/trunk/configure.ac (modified) (2 diffs)
• lyx-devel/trunk/src/LyXAction.cpp (modified) (1 diff)
• lyx-devel/trunk/src/LyXFunc.cpp (modified) (2 diffs)
• lyx-devel/trunk/src/LyXRC.cpp (modified) (4 diffs)
• lyx-devel/trunk/src/LyXRC.h (modified) (2 diffs)
• lyx-devel/trunk/src/Text3.cpp (modified) (1 diff)
• lyx-devel/trunk/src/Thesaurus.cpp (modified) (9 diffs)
• lyx-devel/trunk/src/Thesaurus.h (modified) (3 diffs)
• lyx-devel/trunk/src/frontends/qt4/GuiPrefs.cpp (modified) (5 diffs)
• lyx-devel/trunk/src/frontends/qt4/GuiPrefs.h (modified) (1 diff)
• lyx-devel/trunk/src/frontends/qt4/GuiThesaurus.cpp (modified) (12 diffs)
• lyx-devel/trunk/src/frontends/qt4/GuiThesaurus.h (modified) (2 diffs)
• lyx-devel/trunk/src/frontends/qt4/ui/PrefPathsUi.ui (modified) (3 diffs)
• lyx-devel/trunk/src/frontends/qt4/ui/ThesaurusUi.ui (modified) (4 diffs)

lyx-devel/trunk/configure.ac

@@ -113 +113 @@
-AC_SUBST(LIBSHLWAPI)
-AC_CHECK_LIB(gdi32, main)
+
+AC_ARG_WITH(mythes,
+  [  --without-mythes        do not use the MyThes library],
+  [lyx_use_mythes=$withval])
+if test x$lyx_use_mythes != xno; then
+AC_CHECK_LIB(mythes, main,
+        [AC_DEFINE(HAVE_LIBMYTHES,1,[Define this if you have the MyThes library])
+         MYTHES_LIBS="-lmythes"
+         lyx_flags="mythes $lyx_flags"
+        ])
+AC_CHECK_HEADER(mythes.hxx,[
+  ac_cv_header_mythes_h=yes
+  lyx_cv_mythes_h_location="<mythes.hxx>"])
+AC_CHECK_HEADER(mythes/mythes.hxx,[
+  ac_cv_header_mythes_h=yes
+  lyx_cv_mythes_h_location="<mythes/mythes.hxx>"])
+AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx])
+fi
+AC_SUBST(MYTHES_LIBS)
-
-AC_ARG_WITH(aiksaurus,
@@ -132 +151 @@
-fi
-AC_SUBST(AIKSAURUS_LIBS)
+
+AC_DEFINE(HAVE_THESAURUS, (HAVE_LIBMYTHES || HAVE_LIBAIKSAURUS),[Define this if you have a supported thesaurus library])
-
-LYX_USE_INCLUDED_BOOST

lyx-devel/trunk/src/LyXAction.cpp

@@ -962 +962 @@
- * \var lyx::FuncCode lyx::LFUN_THESAURUS_ENTRY
- * \li Action: Look up thesaurus entries with respect to the word under the cursor.
-
+
+
+
- * \li Origin: Levon, 20 Jul 2001
- * \endvar

lyx-devel/trunk/src/LyXFunc.cpp

@@ -396 +396 @@
-        switch (cmd.action) {
-        case LFUN_UNKNOWN_ACTION:
-LIBAIK
+THE
-        case LFUN_THESAURUS_ENTRY:
-#endif
@@ -1944 +1944 @@
-                        os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
-                }
+        case LyXRC::RC_THESAURUSDIRPATH:
-        case LyXRC::RC_UIFILE:
-        case LyXRC::RC_USER_EMAIL:

lyx-devel/trunk/src/LyXRC.cpp

@@ -166 +166 @@
-        { "\\tex_allows_spaces", LyXRC::RC_TEX_ALLOWS_SPACES },
-        { "\\tex_expects_windows_paths", LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS },
+        { "\\thesaurusdir_path", LyXRC::RC_THESAURUSDIRPATH },
-        { "\\ui_file", LyXRC::RC_UIFILE },
-        { "\\use_alt_language", LyXRC::RC_USE_ALT_LANG },
@@ -671 +672 @@
-                        break;
-
+                case RC_THESAURUSDIRPATH:
+                        if (lexrc.next()) {
+                                thesaurusdir_path = os::internal_path(lexrc.getString());
+                                thesaurusdir_path = expandPath(thesaurusdir_path);
+                        }
+                        break;
+
-                case RC_USETEMPDIR:
-                        if (lexrc.next())
@@ -2040 +2048 @@
-                if (tag != RC_LAST)
-                        break;
+        case RC_THESAURUSDIRPATH:
+                if (ignore_system_lyxrc ||
+                    thesaurusdir_path != system_lyxrc.thesaurusdir_path) {
+                        string const path = os::external_path(thesaurusdir_path);
+                        os << "\\thesaurusdir_path \"" << path << "\"\n";
+                }
+                if (tag != RC_LAST)
+                        break;
-        case RC_USETEMPDIR:
-                if (tag != RC_LAST)
@@ -2792 +2808 @@
-                break;
-
+        case RC_THESAURUSDIRPATH:
+                str = _("This is the place where the files of the thesaurus library reside.");
+                break;
+
-        case RC_TEMPLATEPATH:
-                str = _("The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from.");

lyx-devel/trunk/src/LyXRC.h

@@ -150 +150 @@
-                RC_TEX_ALLOWS_SPACES,
-                RC_TEX_EXPECTS_WINDOWS_PATHS,
+                RC_THESAURUSDIRPATH,
-                RC_UIFILE,
-                RC_USELASTFILEPOS,
@@ -258 +259 @@
-        ///
-        std::string tempdir_path;
+        ///
+        std::string thesaurusdir_path;
-        ///
-        bool auto_region_delete;

lyx-devel/trunk/src/Text3.cpp

@@ -1799 +1799 @@
-                                selectWordWhenUnderCursor(cur, WHOLE_WORD);
-                                arg = cur.selectionAsString(false);
+                                arg += " lang=" + from_ascii(cur.getFont().language()->lang());
-                        }
-                }

lyx-devel/trunk/src/Thesaurus.cpp

@@ -5 +5 @@
- *
- * \author John Levon
+ * \author JÃŒrgen SpitzmÃŒller
- *
- * Full author contact details are available in file CREDITS.
@@ -13 +14 @@
-#include "Thesaurus.h"
-
+#include "support/debug.h"
-#include "support/gettext.h"
-
+
+
+
+
-#include "support/lstrings.h"
+#include "support/os.h"
+#include "support/unicode.h"
-
-#include "frontends/alert.h"
-
-#include <algorithm>
+#include <cstring>
-
-using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
-
-namespace lyx {
-
+#ifndef HAVE_LIBMYTHES
-#ifdef HAVE_LIBAIKSAURUS
-using support::bformat;
-
-
-Thesaurus::Thesaurus()
-aik
+thes
-{}
-
@@ -36 +46 @@
-Thesaurus::~Thesaurus()
-{
-aik
-
-
-
-
+thes
+
+
+
+, docstring const &
-{
-        Meanings meanings;
@@ -54 +64 @@
-        string const text = to_ascii(t);
-
-aik
+thes
-        if (!error.empty()) {
-                static bool sent_error = false;
@@ -65 +75 @@
-                return meanings;
-        }
-aik
+thes
-                return meanings;
-
@@ -75 +85 @@
-
-        // correct, returns "" at the end
-aik
+thes
-
-        while (!ret.empty()) {
-                if (cur_meaning != prev_meaning) {
-                        meaning = from_ascii(ret);
-aik
+thes
-                        prev_meaning = cur_meaning;
-                } else {
@@ -87 +97 @@
-                }
-
-aik
+thes
-        }
-
@@ -97 +107 @@
-}
-
+
+bool Thesaurus::thesaurusAvailable(docstring const & lang) const
+{
+        // we support English only
+        return (prefixIs(lang, "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());
+}
+
+
+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)
+{
+        string const thes_path = external_path(lyxrc.thesaurusdir_path);
+        LYXERR(Debug::FILES, "thesaurus path: " << thes_path);
+        if (thes_path.empty())
+                return false;
+
+        if (thesaurusAvailable(lang))
+                return true;
+
+        FileNameList const idx_files = FileName(thes_path).dirList("idx");
+        FileNameList const data_files = FileName(thes_path).dirList("dat");
+        string idx;
+        string data;
+
+        for (FileNameList::const_iterator it = idx_files.begin();
+             it != idx_files.end(); ++it) {
+                LYXERR(Debug::FILES, "found thesaurus idx file: " << it->onlyFileName());
+                if (contains(it->onlyFileName(), to_ascii(lang))) {
+                        idx = it->absFilename();
+                        LYXERR(Debug::FILES, "selected thesaurus idx file: " << idx);
+                        break;
+                        }
+                }
+
+        for (support::FileNameList::const_iterator it = data_files.begin();
+             it != data_files.end(); ++it) {
+                LYXERR(Debug::FILES, "found thesaurus data file: " << it->onlyFileName());
+                if (contains(it->onlyFileName(), to_ascii(lang))) {
+                        data = it->absFilename();
+                        LYXERR(Debug::FILES, "selected thesaurus data file: " << data);
+                        break;
+                        }
+                }
+
+        if (idx.empty() || data.empty())
+                return false;
+
+        char const * af = idx.c_str();
+        char const * df = data.c_str();
+        thes_[lang] = new MyThes(af, df);
+        return true;
+}
+
+
+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 false;
+}
+
+
+Thesaurus::Meanings Thesaurus::lookup(docstring const & t, docstring const & lang)
+{
+        Meanings meanings;
+        MyThes * mythes = 0;
+
+        if (!addThesaurus(lang))
+                return meanings;
+
+        for (Thesauri::const_iterator it = thes_.begin();
+             it != thes_.end(); ++it) {
+                if (it->first == lang) {
+                        mythes = it->second;
+                        break;
+                }
+        }
+
+        if (!mythes)
+                return meanings;
+
+        string const encoding = mythes->get_th_encoding();
+        
+        mentry * pmean;
+        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;
+
+        // 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++) {
+                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);
+                }
+        meanings[meaning].push_back(ret);
+        pm++;
+        }
+        // now clean up all allocated memory
+        mythes->CleanUpAfterLookup(&pmean, count);
+
+        for (Meanings::iterator it = meanings.begin();
+             it != meanings.end(); ++it)
+                sort(it->second.begin(), it->second.end());
+
+        return meanings;
+}
+
-#else
-
@@ -114 +282 @@
-}
-
-AIKSAURU
+MYTHE
-
-// Global instance

lyx-devel/trunk/src/Thesaurus.h

@@ -6 +6 @@
- *
- * \author John Levon
+ * \author JÃŒrgen SpitzmÃŒller
- *
- * Full author contact details are available in file CREDITS.
@@ -17 +18 @@
-#include <vector>
-#include <map>
+#include <string>
-
+#ifdef HAVE_LIBMYTHES
+#include MYTHES_H_LOCATION
+#else
-#ifdef HAVE_LIBAIKSAURUS
-#include AIKSAURUS_H_LOCATION
-
+
+
-
-namespace lyx {
@@ -40 +46 @@
-         * look up some text in the thesaurus
-         */
-
+
+
+
-
-private:
+#ifdef HAVE_LIBMYTHES
+        /// add a thesaurus to the list
+        bool addThesaurus(docstring const & lang);
+
+        typedef std::map<docstring, MyThes *> Thesauri;
+        /// the thesauri
+        Thesauri thes_;
+#else
-#ifdef HAVE_LIBAIKSAURUS
-
-
+
+
+
-};
-

lyx-devel/trunk/src/frontends/qt4/GuiPrefs.cpp

@@ -927 +927 @@
-        connect(workingDirPB, SIGNAL(clicked()), this, SLOT(select_workingdir()));
-        connect(lyxserverDirPB, SIGNAL(clicked()), this, SLOT(select_lyxpipe()));
+        connect(thesaurusDirPB, SIGNAL(clicked()), this, SLOT(select_thesaurusdir()));
-        connect(workingDirED, SIGNAL(textChanged(QString)),
-                this, SIGNAL(changed()));
@@ -938 +939 @@
-                this, SIGNAL(changed()));
-        connect(lyxserverDirED, SIGNAL(textChanged(QString)),
+                this, SIGNAL(changed()));
+        connect(thesaurusDirED, SIGNAL(textChanged(QString)),
-                this, SIGNAL(changed()));
-        connect(pathPrefixED, SIGNAL(textChanged(QString)),
@@ -951 +954 @@
-        rc.backupdir_path = internal_path(fromqstr(backupDirED->text()));
-        rc.tempdir_path = internal_path(fromqstr(tempDirED->text()));
+        rc.thesaurusdir_path = internal_path(fromqstr(thesaurusDirED->text()));
-        rc.path_prefix = internal_path_list(fromqstr(pathPrefixED->text()));
-        // FIXME: should be a checkbox only
@@ -964 +968 @@
-        backupDirED->setText(toqstr(external_path(rc.backupdir_path)));
-        tempDirED->setText(toqstr(external_path(rc.tempdir_path)));
+        thesaurusDirED->setText(toqstr(external_path(rc.thesaurusdir_path)));
-        pathPrefixED->setText(toqstr(external_path_list(rc.path_prefix)));
-        // FIXME: should be a checkbox only
@@ -1012 +1017 @@
-        if (!file.isEmpty())
-                workingDirED->setText(file);
+}
+
+
+void PrefPaths::select_thesaurusdir()
+{
+        QString file = browseDir(internalPath(thesaurusDirED->text()),
+                qt_("Set the path to the thesaurus dictionaries"));
+        if (!file.isEmpty())
+                thesaurusDirED->setText(file);
-}
-

lyx-devel/trunk/src/frontends/qt4/GuiPrefs.h

@@ -284 +284 @@
-        void select_backupdir();
-        void select_workingdir();
+        void select_thesaurusdir();
-        void select_lyxpipe();
-

lyx-devel/trunk/src/frontends/qt4/GuiThesaurus.cpp

@@ -5 +5 @@
- *
- * \author John Levon
+ * \author JÃŒrgen SpitzmÃŒller
- *
- * Full author contact details are available in file CREDITS.
@@ -12 +13 @@
-
-#include "GuiThesaurus.h"
+#include "GuiApplication.h"
-
-#include "qt_helpers.h"
-
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "BufferView.h"
-#include "FuncRequest.h"
+#include "Language.h"
-#include "lyxfind.h"
-
-#include "support/debug.h"
-#include "support/gettext.h"
-
+
+
+
-#include <QHeaderView>
-#include <QLineEdit>
@@ -28 +36 @@
-
-
+using namespace lyx::support;
-using namespace std;
-
@@ -47 +56 @@
-        connect(replaceED, SIGNAL(textChanged(QString)),
-                this, SLOT(change_adaptor()));
-
+
+
+
+
+
-                this, SLOT(entryChanged()));
-        connect(replacePB, SIGNAL(clicked()),
-                this, SLOT(replaceClicked()));
+        connect(languageCO, SIGNAL(activated(int)),
+                this, SLOT(entryChanged()));
-        connect(meaningsTV, SIGNAL(itemClicked(QTreeWidgetItem *, int)),
-                this, SLOT(itemClicked(QTreeWidgetItem *, int)));
-        connect(meaningsTV, SIGNAL(itemSelectionChanged()),
-                this, SLOT(selectionChanged()));
-Activat
+DoubleClick
-                this, SLOT(selectionClicked(QTreeWidgetItem *, int)));
+
+        // language
+        QAbstractItemModel * language_model = guiApp->languageModel();
+        // FIXME: it would be nice if sorting was enabled/disabled via a checkbox.
+        language_model->sort(0);
+        languageCO->setModel(language_model);
-
-        bc().setCancel(closePB);
@@ -84 +105 @@
-                return;
-
-
+
+
+
+
+
+
+
+
+
+
+
-        replacePB->setEnabled(true);
-        changed();
@@ -98 +129 @@
-void GuiThesaurus::selectionClicked(QTreeWidgetItem * item, int col)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        selectionChanged();
-        updateLists();
@@ -109 +152 @@
-        meaningsTV->setUpdatesEnabled(false);
-
-
+
+
+
+
+
+
+
-
-        for (Thesaurus::Meanings::const_iterator cit = meanings.begin();
@@ -121 +170 @@
-                                i2->setText(0, toqstr(*cit2));
-                        }
+                meaningsTV->setEnabled(true);
+                lookupPB->setEnabled(true);
+                replaceED->setEnabled(true);
+                replacePB->setEnabled(true);
+        }
+
+        if (meanings.empty()) {
+                if (!thesaurus.thesaurusAvailable(lang_code)) {
+                        QTreeWidgetItem * i = new QTreeWidgetItem(meaningsTV);
+                        i->setText(0, qt_("No thesaurus available for this language!"));
+                        meaningsTV->setEnabled(false);
+                        lookupPB->setEnabled(false);
+                        replaceED->setEnabled(false);
+                        replacePB->setEnabled(false);
+                }
-        }
-
@@ -130 +194 @@
-void GuiThesaurus::updateContents()
-{
-
+
+
+
-        replaceED->setText("");
+        int const pos = languageCO->findData(toqstr(lang_));
+        if (pos != -1)
+                languageCO->setCurrentIndex(pos);
-        updateLists();
-}
@@ -144 +213 @@
-bool GuiThesaurus::initialiseParams(string const & data)
-{
-
+
+
+
+
+
+
+
+
+
+
+
-        return true;
-}
@@ -152 +231 @@
-{
-        text_.erase();
+        lang_.erase();
-}
-
@@ -171 +251 @@
-
-
-
+
+
-{
-        if (str != laststr_)
-
+, lang
-        return meanings_;
-}

lyx-devel/trunk/src/frontends/qt4/GuiThesaurus.h

@@ -55 +55 @@
-
-        /// get meanings
-
+
+
-
-private:
@@ -67 +68 @@
-        docstring text_;
-
+        /// language
+        docstring lang_;
+
-        /// not needed.
-        void apply() {}

lyx-devel/trunk/src/frontends/qt4/ui/PrefPathsUi.ui

@@ -7 +7 @@
-    <y>0</y>
-    <width>347</width>
-259
+311
-   </rect>
-  </property>
@@ -14 +14 @@
-  </property>
-  <layout class="QGridLayout" >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    <spacer>
-     <property name="orientation" >
@@ -175 +30 @@
-     <property name="sizeHint" >
-      <size>
-20
-20
+329
+16
-      </size>
-     </property>
-    </spacer>
+   </item>
+   <item row="7" column="0" >
+    <widget class="QLabel" name="pathPrefixLA" >
+     <property name="text" >
+      <string>&amp;PATH prefix:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>pathPrefixED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1" colspan="2" >
+    <widget class="QLineEdit" name="pathPrefixED" />
+   </item>
+   <item row="6" column="2" >
+    <widget class="QPushButton" name="thesaurusDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" >
+    <widget class="QLabel" name="thesaurusDirLA" >
+     <property name="text" >
+      <string>T&amp;hesaurus dictionaries:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>thesaurusDirED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1" >
+    <widget class="QLineEdit" name="thesaurusDirED" />
+   </item>
+   <item row="5" column="2" >
+    <widget class="QPushButton" name="tempDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" >
+    <widget class="QLineEdit" name="tempDirED" />
+   </item>
+   <item row="5" column="0" >
+    <widget class="QLabel" name="tempDirLA" >
+     <property name="text" >
+      <string>&amp;Temporary directory:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>tempDirED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2" >
+    <widget class="QPushButton" name="lyxserverDirPB" >
+     <property name="text" >
+      <string>Browse...</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <widget class="QLineEdit" name="lyxserverDirED" />
+   </item>
+   <item row="4" column="0" >
+    <widget class="QLabel" name="lyxserverDirLA" >
+     <property name="text" >
+      <string>Ly&amp;XSe