X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FThesaurus.C;h=12f7a029a9af5fedd0bad00061f4dcd2952d896f;hb=9667cb383640866f47aea57f059a9d2a5caefc3d;hp=e41ecf5fb04b98733b3872c262c03b211b15dded;hpb=822c8ce43043d0f1d4d0b3a21039768e3c1d6e7b;p=lyx.git

diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index e41ecf5fb0..12f7a029a9 100644
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -1,25 +1,33 @@
 /**
  * \file Thesaurus.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "Thesaurus.h"
 
+#include "support/lstrings.h"
+
 #include <algorithm>
- 
-Thesaurus thesaurus; 
+
+
+namespace lyx {
 
 #ifdef HAVE_LIBAIKSAURUS
- 
+
+using std::sort;
+using std::string;
+
+
 Thesaurus::Thesaurus()
-{
-	aik_ = new Aiksaurus;
-}
+	: aik_(new Aiksaurus)
+{}
 
 
 Thesaurus::~Thesaurus()
@@ -28,41 +36,48 @@ 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;
 
 	// weird api, but ...
- 
+
 	int prev_meaning = -1;
 	int cur_meaning;
-	string meaning;
+	docstring meaning;
 
-	// correct, returns "" at the end 
+	// 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) {
-			std::sort(it->second.begin(), it->second.end());
-	}
- 
+	     it != meanings.end(); ++it)
+		sort(it->second.begin(), it->second.end());
+
 	return meanings;
 }
 
@@ -71,16 +86,22 @@ Thesaurus::Meanings Thesaurus::lookup(string const & text)
 Thesaurus::Thesaurus()
 {
 }
- 
- 
+
+
 Thesaurus::~Thesaurus()
 {
 }
 
- 
-Thesaurus::Meanings Thesaurus::lookup(string const &)
+
+Thesaurus::Meanings Thesaurus::lookup(docstring const &)
 {
 	return Meanings();
 }
 
 #endif // HAVE_LIBAIKSAURUS
+
+// Global instance
+Thesaurus thesaurus;
+
+
+} // namespace lyx