X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FThesaurus.C;h=12f7a029a9af5fedd0bad00061f4dcd2952d896f;hb=2c832e6578ae146a2b51967cbc78cd640959f196;hp=37376bc5b052610ad48cca8bcdfd908059b720a9;hpb=4c6e0fe4226ce3b55d13726977f1e579f17c2ad1;p=lyx.git

diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index 37376bc5b0..12f7a029a9 100644
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -12,17 +12,22 @@
 
 #include "Thesaurus.h"
 
-#ifdef HAVE_LIBAIKSAURUS
+#include "support/lstrings.h"
 
 #include <algorithm>
 
+
+namespace lyx {
+
+#ifdef HAVE_LIBAIKSAURUS
+
 using std::sort;
+using std::string;
 
 
 Thesaurus::Thesaurus()
-{
-	aik_ = new Aiksaurus;
-}
+	: aik_(new Aiksaurus)
+{}
 
 
 Thesaurus::~Thesaurus()
@@ -31,10 +36,19 @@ Thesaurus::~Thesaurus()
 }
 
 
-Thesaurus::Meanings Thesaurus::lookup(string const & text)
+Thesaurus::Meanings Thesaurus::lookup(docstring const & t)
 {
 	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);
 	if (!aik_->find(text.c_str()))
 		return meanings;
 
@@ -42,29 +56,27 @@ Thesaurus::Meanings Thesaurus::lookup(string const & text)
 
 	int prev_meaning = -1;
 	int cur_meaning;
-	string meaning;
+	docstring meaning;
 
 	// correct, returns "" at the end
 	string ret = aik_->next(cur_meaning);
 
 	while (!ret.empty()) {
 		if (cur_meaning != prev_meaning) {
-			meaning = ret;
+			meaning = from_ascii(ret);
 			ret = aik_->next(cur_meaning);
 			prev_meaning = cur_meaning;
 		} else {
-			if (ret != text) {
-				meanings[meaning].push_back(ret);
-			}
+			if (ret != text)
+				meanings[meaning].push_back(from_ascii(ret));
 		}
 
 		ret = aik_->next(cur_meaning);
 	}
 
 	for (Meanings::iterator it = meanings.begin();
-		it != meanings.end(); ++it) {
-			sort(it->second.begin(), it->second.end());
-	}
+	     it != meanings.end(); ++it)
+		sort(it->second.begin(), it->second.end());
 
 	return meanings;
 }
@@ -81,7 +93,7 @@ Thesaurus::~Thesaurus()
 }
 
 
-Thesaurus::Meanings Thesaurus::lookup(string const &)
+Thesaurus::Meanings Thesaurus::lookup(docstring const &)
 {
 	return Meanings();
 }
@@ -90,3 +102,6 @@ Thesaurus::Meanings Thesaurus::lookup(string const &)
 
 // Global instance
 Thesaurus thesaurus;
+
+
+} // namespace lyx