#include "support/debug.h"
#include "support/docstring_list.h"
+#include "support/FileName.h"
+#include "support/Path.h"
+
#include <aspell.h>
#include <map>
~Private();
- /// add a speller of the given language
- AspellSpeller * addSpeller(string const & lang);
+ /// add a speller of the given language and variety
+ AspellSpeller * addSpeller(string const & lang,
+ string const & variety = string());
///
- AspellSpeller * speller(string const & lang);
+ AspellSpeller * speller(string const & lang,
+ string const & variety);
+
+ /// create a unique ID from lang code and variety
+ string const spellerID(string const & lang,
+ string const & variety);
/// the spellers
Spellers spellers_;
}
-AspellSpeller * AspellChecker::Private::addSpeller(string const & lang)
+AspellConfig * getConfig()
{
AspellConfig * config = new_aspell_config();
- // FIXME The aspell documentation says to use "lang"
- aspell_config_replace(config, "language-tag", lang.c_str());
+#ifdef __APPLE__
+ char buf[2048] ;
+ bool have_dict = false;
+#ifdef ASPELL_FRAMEWORK
+ char * framework = ASPELL_FRAMEWORK ;
+
+ if ( strlen(framework) && getPrivateFrameworkPathName(buf, sizeof(buf), framework) ) {
+ lyx::support::FileName const base(buf);
+ lyx::support::FileName const data(base.absFileName() + "/Resources/data");
+ lyx::support::FileName const dict(base.absFileName() + "/Resources/dict");
+ LYXERR(Debug::FILES, "aspell bundle path: " << buf);
+ have_dict = dict.isDirectory() && data.isDirectory();
+ if (have_dict) {
+ aspell_config_replace(config, "dict-dir", dict.absFileName().c_str());
+ aspell_config_replace(config, "data-dir", data.absFileName().c_str());
+ LYXERR(Debug::FILES, "aspell dict: " << dict);
+ }
+ }
+#endif
+ if ( !have_dict ) {
+ lyx::support::FileName const base("/opt/local"); // check for mac-ports data
+ lyx::support::FileName const data(base.absFileName() + "/lib/aspell-0.60");
+ lyx::support::FileName const dict(base.absFileName() + "/share/aspell");
+ have_dict = dict.isDirectory() && data.isDirectory();
+ if (have_dict) {
+ aspell_config_replace(config, "dict-dir", dict.absFileName().c_str());
+ aspell_config_replace(config, "data-dir", data.absFileName().c_str());
+ LYXERR(Debug::FILES, "aspell dict: " << dict);
+ }
+ }
+#endif
+ return config ;
+}
+
+
+AspellSpeller * AspellChecker::Private::addSpeller(string const & lang,
+ string const & variety)
+{
+ AspellConfig * config = getConfig();
+ // Aspell supports both languages and varieties (such as German
+ // old vs. new spelling). The respective naming convention is
+ // lang_REGION-variety (e.g. de_DE-alt).
+ aspell_config_replace(config, "lang", lang.c_str());
+ if (!variety.empty())
+ aspell_config_replace(config, "variety", variety.c_str());
// Set the encoding to utf-8.
// aspell does also understand "ucs-4", so we would not need a
// conversion in theory, but if this is used it expects all
else
// Report run-together words as errors
aspell_config_replace(config, "run-together", "false");
+
AspellCanHaveError * err = new_aspell_speller(config);
if (spell_error_object)
delete_aspell_can_have_error(spell_error_object);
// FIXME: We should we indicate somehow that this language is not
// supported.
spell_error_object = err;
+ LYXERR(Debug::FILES, "aspell error: " << aspell_error_message(err));
return 0;
}
Speller m;
m.speller = to_aspell_speller(err);
m.config = config;
- spellers_[lang] = m;
+ spellers_[spellerID(lang, variety)] = m;
return m.speller;
}
-AspellSpeller * AspellChecker::Private::speller(string const & lang)
+AspellSpeller * AspellChecker::Private::speller(string const & lang,
+ string const & variety)
{
- Spellers::iterator it = spellers_.find(lang);
+ Spellers::iterator it = spellers_.find(spellerID(lang, variety));
if (it != spellers_.end())
return it->second.speller;
- return addSpeller(lang);
+ return addSpeller(lang, variety);
+}
+
+
+string const AspellChecker::Private::spellerID(string const & lang,
+ string const & variety)
+{
+ if (variety.empty())
+ return lang;
+ return lang + "-" + variety;
}
SpellChecker::Result AspellChecker::check(WordLangTuple const & word)
{
- AspellSpeller * m = d->speller(word.lang_code());
+
+ AspellSpeller * m =
+ d->speller(word.lang()->code(), word.lang()->variety());
+
if (!m)
return OK;
void AspellChecker::insert(WordLangTuple const & word)
{
- Spellers::iterator it = d->spellers_.find(word.lang_code());
+ Spellers::iterator it = d->spellers_.find(
+ d->spellerID(word.lang()->code(), word.lang()->variety()));
if (it != d->spellers_.end())
aspell_speller_add_to_personal(it->second.speller, to_utf8(word.word()).c_str(), -1);
}
void AspellChecker::accept(WordLangTuple const & word)
{
- Spellers::iterator it = d->spellers_.find(word.lang_code());
+ Spellers::iterator it = d->spellers_.find(
+ d->spellerID(word.lang()->code(), word.lang()->variety()));
if (it != d->spellers_.end())
aspell_speller_add_to_session(it->second.speller, to_utf8(word.word()).c_str(), -1);
}
docstring_list & suggestions)
{
suggestions.clear();
- AspellSpeller * m = d->speller(wl.lang_code());
+ AspellSpeller * m =
+ d->speller(wl.lang()->code(), wl.lang()->variety());
+
if (!m)
return;
}
+bool AspellChecker::hasDictionary(Language const * lang) const
+{
+ if (!lang)
+ return false;
+ // code taken from aspell's list-dicts example
+ AspellConfig * config;
+ AspellDictInfoList * dlist;
+ AspellDictInfoEnumeration * dels;
+ const AspellDictInfo * entry;
+
+ config = getConfig();
+
+ /* the returned pointer should _not_ need to be deleted */
+ dlist = get_aspell_dict_info_list(config);
+
+ /* config is no longer needed */
+ delete_aspell_config(config);
+
+ dels = aspell_dict_info_list_elements(dlist);
+
+ bool have = false;
+ while ((entry = aspell_dict_info_enumeration_next(dels)) != 0)
+ {
+ if (entry->code == lang->code()
+ && (lang->variety().empty() || entry->jargon == lang->variety())) {
+ have = true;
+ break;
+ }
+ }
+
+ delete_aspell_dict_info_enumeration(dels);
+
+ return have;
+}
+
+
docstring const AspellChecker::error()
{
char const * err = 0;
projects / lyx.git / blobdiff