Provide proper fallback if a bibliography processor is not found

[lyx.git] / src / AppleSpellChecker.cpp

diff --git a/src/AppleSpellChecker.cpp b/src/AppleSpellChecker.cpp
index 702f49baccce52f62236c4f2b7d510543ebad643..3ba1250b2dff695cb98ee551986f1a2bd32436bb 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,13 +30,13 @@ 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;
-       
 };
 
 
@@ -54,9 +53,9 @@ AppleSpellChecker::Private::~Private()
 }
 
 
-AppleSpellChecker::AppleSpellChecker(): d(new Private)
-{
-}
+AppleSpellChecker::AppleSpellChecker()
+       : d(new Private)
+{}
 
 
 AppleSpellChecker::~AppleSpellChecker()
@@ -82,10 +81,10 @@ string AppleSpellChecker::Private::toString(SpellCheckResult status)
 SpellChecker::Result AppleSpellChecker::check(WordLangTuple const & word)
 {
        if (!hasDictionary(word.lang()))
-               return WORD_OK;
+               return NO_DICTIONARY;
 
        string const word_str = to_utf8(word.word());
-       string const lang = d->languageMap[word.lang()->code()];
+       string const lang = d->languageMap[word.lang()->lang()];
        SpellCheckResult result =
                AppleSpeller_check(d->speller,
                        word_str.c_str(), lang.c_str());
@@ -107,7 +106,7 @@ void AppleSpellChecker::insert(WordLangTuple const & word)
 {
        string const word_str = to_utf8(word.word());
        AppleSpeller_learn(d->speller, word_str.c_str());
-       LYXERR(Debug::GUI, "learn word: \"" << word.word() << "\"") ;
+       LYXERR(Debug::GUI, "learn word: \"" << word.word() << "\"");
        advanceChangeNumber();
 }
 
@@ -117,7 +116,7 @@ void AppleSpellChecker::remove(WordLangTuple const & word)
 {
        string const word_str = to_utf8(word.word());
        AppleSpeller_unlearn(d->speller, word_str.c_str());
-       LYXERR(Debug::GUI, "unlearn word: \"" << word.word() << "\"") ;
+       LYXERR(Debug::GUI, "unlearn word: \"" << word.word() << "\"");
        advanceChangeNumber();
 }
 
@@ -127,7 +126,7 @@ void AppleSpellChecker::accept(WordLangTuple const & word)
 {
        string const word_str = to_utf8(word.word());
        AppleSpeller_ignore(d->speller, word_str.c_str());
-       LYXERR(Debug::GUI, "ignore word: \"" << word.word() << "\"") ;
+       LYXERR(Debug::GUI, "ignore word: \"" << word.word() << "\"");
        advanceChangeNumber();
 }
 
@@ -137,7 +136,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;
@@ -148,19 +148,34 @@ void AppleSpellChecker::suggest(WordLangTuple const & wl,
 
 bool AppleSpellChecker::hasDictionary(Language const * lang) const
 {
-       string const langmap = d->languageMap[lang->code()];
+       string const langmap = d->languageMap[lang->lang()];
        bool result = !langmap.empty();
 
        if (result)
                return result;
 
-       result = AppleSpeller_hasLanguage(d->speller,lang->code().c_str());
+       result = AppleSpeller_hasLanguage(d->speller, lang->code().c_str());
        if (result) {
-               d->languageMap[lang->code()] = lang->code();
+               d->languageMap[lang->lang()] = lang->code();
        } else {
-               result = AppleSpeller_hasLanguage(d->speller,lang->lang().c_str());
+               result = AppleSpeller_hasLanguage(d->speller, lang->lang().c_str());
                if (result)
-                       d->languageMap[lang->code()] = lang->lang();
+                       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;
 }