Account for old versions of Pygments

[lyx.git] / src / AppleSpellChecker.cpp

diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp
index 9e83a23dbc8627433e2c14dd25ed19adb3377927..6020de7f27567e29ebe6ae1ff15b5bccc12f5aec 100644 (file)
--- a/src/AppleSpellChecker.cpp
+++ b/src/AppleSpellChecker.cpp
@@ -13,7 +13,6 @@
 #include "AppleSpellChecker.h"
 #include "WordLangTuple.h"
 
-#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/docstring_list.h"
 #include "support/AppleSpeller.h"
@@ -31,9 +30,14 @@ struct AppleSpellChecker::Private
 
        SpellChecker::Result toResult(SpellCheckResult status);
        string toString(SpellCheckResult status);
-
+       int numDictionaries() const;
+       
        /// the speller
        AppleSpeller speller;
+       
+       /// language map
+       map<string, string> languageMap;
+       
 };
 
 
@@ -50,9 +54,9 @@ AppleSpellChecker::Private::~Private()
 }
 
 
-AppleSpellChecker::AppleSpellChecker(): d(new Private)
-{
-}
+AppleSpellChecker::AppleSpellChecker()
+       : d(new Private)
+{}
 
 
 AppleSpellChecker::~AppleSpellChecker()
@@ -77,13 +81,17 @@ string AppleSpellChecker::Private::toString(SpellCheckResult status)
 
 SpellChecker::Result AppleSpellChecker::check(WordLangTuple const & word)
 {
+       if (!hasDictionary(word.lang()))
+               return NO_DICTIONARY;
+
        string const word_str = to_utf8(word.word());
+       string const lang = d->languageMap[word.lang()->lang()];
        SpellCheckResult result =
                AppleSpeller_check(d->speller,
-                       word_str.c_str(), word.lang()->code().c_str());
+                       word_str.c_str(), lang.c_str());
        LYXERR(Debug::GUI, "spellCheck: \"" <<
                   word.word() << "\" = " << d->toString(result) <<
-                  ", lang = " << word.lang()->code()) ;
+                  ", lang = " << lang) ;
        return d->toResult(result);
 }
 
@@ -129,7 +137,8 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 {
        suggestions.clear();
        string const word_str = to_utf8(wl.word());
-       size_t num = AppleSpeller_makeSuggestion(d->speller, word_str.c_str(), wl.lang()->code().c_str());
+       size_t num = AppleSpeller_makeSuggestion(d->speller, 
+                                       word_str.c_str(), wl.lang()->code().c_str());
        for (size_t i = 0; i < num; i++) {
                char const * next = AppleSpeller_getSuggestion(d->speller, i);
                if (!next) break;
@@ -140,10 +149,39 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 
 bool AppleSpellChecker::hasDictionary(Language const * lang) const
 {
-       return AppleSpeller_hasLanguage(d->speller,lang->code().c_str());
+       string const langmap = d->languageMap[lang->lang()];
+       bool result = !langmap.empty();
+
+       if (result)
+               return result;
+
+       result = AppleSpeller_hasLanguage(d->speller,lang->code().c_str());
+       if (result) {
+               d->languageMap[lang->lang()] = lang->code();
+       } else {
+               result = AppleSpeller_hasLanguage(d->speller,lang->lang().c_str());
+               if (result)
+                       d->languageMap[lang->lang()] = lang->lang();
+       }
+       LYXERR(Debug::GUI, "has dictionary: " << lang->lang() << " = " << result) ;
+       return result;
 }
 
 
+int AppleSpellChecker::numDictionaries() const
+{
+       int result = 0;
+       map<string, string>::const_iterator it = d->languageMap.begin();
+       map<string, string>::const_iterator et = d->languageMap.end();
+
+       for (; it != et; ++it) {
+               string const langmap = it->second;
+               result += langmap.empty() ? 0 : 1;
+       }
+       return result;
+}
+
+       
 int AppleSpellChecker::numMisspelledWords() const
 {
        return AppleSpeller_numMisspelledWords(d->speller);