Commit e3396de4 authored by Paolo Maggi's avatar Paolo Maggi Committed by Paolo Borelli

Switch the spell plugin to the enchant library and use the iso-codes

2006-12-04  Paolo Maggi  <paolo@gnome.org>

	* configure.ac:
	* plugins/spell/*:

	Switch the spell plugin to the enchant library and use
	the iso-codes package to retrieve language names.
	The port to the enchant spell checking library is based
	on a patch by Sertaç Ö. Yıldız. Bug #365899.
parent 0f6dca11
2006-12-04 Paolo Maggi <paolo@gnome.org>
* configure.ac:
* plugins/spell/*:
Switch the spell plugin to the enchant library and use
the iso-codes package to retrieve language names.
The port to the enchant spell checking library is based
on a patch by Sertaç Ö. Yıldız. Bug #365899.
2006-12-02 Paolo Borelli <pborelli@katamail.com>
* gedit/gedit-window.c (gedit_window_key_press_event): avoid
......@@ -195,8 +205,8 @@
2006-11-05 Joachim Noreiko <jnoreiko@yahoo.com>
* plugins/externaltools/tools/stock-tools.xml: fixing a few mistakes
in the status bar descriptions of the stock External Tools. Bug 352950.
* plugins/externaltools/tools/stock-tools.xml: fixing a few mistakes
in the status bar descriptions of the stock External Tools. Bug 352950.
=== gedit 2.16.2 ===
......
......@@ -56,34 +56,63 @@ AM_GLIB_GNU_GETTEXT
dnl ================================================================
dnl pspell checks
dnl spell plugins checks: enchant and iso-codes
dnl ================================================================
AC_MSG_CHECKING([for aspell/pspell])
if pspell-config version > /dev/null 2>&1; then
pspell_ver=`pspell-config version`
pspell_num=`echo ${pspell_ver} | awk 'BEGIN {FS="."}{printf $1*10000 + $2*100 + $3;}'`
if test ${pspell_num} -lt 1200; then
AC_MSG_RESULT([pspell version .12 or later required, you have ${pspell_ver} installed])
ENCHANT_REQUIRED=1.2.0
ISO_CODES_REQUIRED=0.35
AC_ARG_ENABLE([spell],
AS_HELP_STRING([--disable-spell],[Disable spell plugin (default: enabled)]),
[enable_enchant=$enableval],
[enable_enchant=yes])
if test "x$enable_enchant" = "xyes" ; then
PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED, \
have_enchant=yes, have_enchant=no)
if test "x$have_enchant" = "xyes"; then
PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED],
[have_iso_codes=yes],[have_iso_codes=no])
if test "x$have_iso_codes" = "xyes"; then
AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains])
if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
$PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
result=yes
else
result=no
have_iso_codes=no
fi
AC_MSG_RESULT([$result])
fi
if test "x$have_iso_codes" = "xyes"; then
AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package])
else
AC_MSG_ERROR([iso-codes is required to build the spell plugin. Use --disable-spell to build without spell plugin.])
fi
enable_enchant=yes
ENCHANT_CFLAGS="${ENCHANT_CFLAGS}"
ENCHANT_LIBS="${ENCHANT_LIBS}"
SPELL_PLUGIN_DIR="spell"
else
AC_MSG_RESULT([found ($pspell_ver)])
AC_CHECK_HEADER(pspell/pspell.h,
[AC_CHECK_LIB(aspell, new_aspell_speller,
[PSPELL_LIBS="-laspell" SPELL_PLUGIN_DIR="spell" AC_SUBST(SPELL_PLUGIN_DIR)],
[AC_CHECK_LIB(pspell, new_pspell_manager,
[PSPELL_LIBS="-lpspell" SPELL_PLUGIN_DIR="spell" AC_SUBST(SPELL_PLUGIN_DIR)],
[AC_MSG_WARN([You must have the aspell or pspell dev packages to build the spell plugin.])]
)]
)],
[AC_MSG_WARN([You must have the aspell or pspell dev packages to build the spell plugin.])]
)
AC_MSG_ERROR([Enchant library not found or too old. Use --disable-spell to build without spell plugin.])
fi
else
AC_MSG_RESULT([not found])
enable_enchant=no
ENCHANT_CFLAGS=
ENCHANT_LIBS=
SPELL_PLUGIN_DIR=
fi
AC_SUBST(PSPELL_LIBS)
AC_SUBST(ENCHANT_CFLAGS)
AC_SUBST(ENCHANT_LIBS)
AC_SUBST(SPELL_PLUGIN_DIR)
dnl ================================================================
dnl libattr checks
......@@ -311,7 +340,7 @@ Configuration:
Source code location: ${srcdir}
Compiler: ${CC}
Python Plugins Support: $enable_python
Spell Plugin enabled: $enable_enchant
"
dnl uncomment this in developement releases
......
......@@ -73,11 +73,13 @@ gedit_convert_to_utf8_from_charset (const gchar *content,
return g_strndup (content, len);
}
else
else
{
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
"The file you are trying to open contains an invalid byte sequence.");
return NULL;
return NULL;
}
}
converted_contents = g_convert (content,
......
......@@ -9,6 +9,7 @@ BUILT_SOURCES = \
INCLUDES = \
-I$(top_srcdir) \
$(GEDIT_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DGEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
......@@ -24,6 +25,8 @@ libspell_la_SOURCES = \
gedit-spell-checker.h \
gedit-spell-checker-dialog.c \
gedit-spell-checker-dialog.h \
gedit-spell-checker-language.c \
gedit-spell-checker-language.h \
gedit-spell-language-dialog.c \
gedit-spell-language-dialog.h \
gedit-automatic-spell-checker.c \
......@@ -31,7 +34,7 @@ libspell_la_SOURCES = \
$(BUILT_SOURCES)
libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
libspell_la_LIBADD = $(PSPELL_LIBS)
libspell_la_LIBADD = $(ENCHANT_LIBS)
gladedir = $(datadir)/gedit-2/glade
glade_DATA = spell-checker.glade2 languages-dialog.glade2
......
......@@ -586,9 +586,9 @@ add_word_signal_cb (GeditSpellChecker *checker,
}
static void
set_language_cb (GeditSpellChecker *checker,
const GeditLanguage *lang,
GeditAutomaticSpellChecker *spell)
set_language_cb (GeditSpellChecker *checker,
const GeditSpellCheckerLanguage *lang,
GeditAutomaticSpellChecker *spell)
{
gedit_automatic_spell_checker_recheck_all (spell);
}
......
......@@ -404,8 +404,8 @@ gedit_spell_checker_dialog_new_from_spell_checker (GeditSpellChecker *spell)
void
gedit_spell_checker_dialog_set_spell_checker (GeditSpellCheckerDialog *dlg, GeditSpellChecker *spell)
{
const GeditLanguage* language;
gchar *lang;
const GeditSpellCheckerLanguage* language;
const gchar *lang;
gchar *tmp;
g_return_if_fail (GEDIT_IS_SPELL_CHECKER_DIALOG (dlg));
......@@ -419,9 +419,8 @@ gedit_spell_checker_dialog_set_spell_checker (GeditSpellCheckerDialog *dlg, Gedi
language = gedit_spell_checker_get_language (dlg->spell_checker);
lang = gedit_language_to_string (language);
lang = gedit_spell_checker_language_to_string (language);
tmp = g_strdup_printf("<b>%s</b>", lang);
g_free (lang);
gtk_label_set_label (GTK_LABEL (dlg->language_label), tmp);
g_free (tmp);
......
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* gedit-spell-checker-language.c
* This file is part of gedit
*
* Copyright (C) 2006 Paolo Maggi
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the gedit Team, 2006. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
*/
/* Part of the code taked from Epiphany.
*
* Copyright (C) 2003, 2004 Christian Persch
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <enchant.h>
#include <glib/gi18n.h>
#include <libxml/xmlreader.h>
#include "gedit-spell-checker-language.h"
#include <gedit/gedit-debug.h>
#define ISO_639_DOMAIN "iso_639"
#define ISO_3166_DOMAIN "iso_3166"
#define ISOCODESLOCALEDIR ISO_CODES_PREFIX "/share/locale"
struct _GeditSpellCheckerLanguage
{
gchar *abrev;
gchar *name;
};
static gboolean available_languages_initialized = FALSE;
static GSList *available_languages = NULL;
static GHashTable *iso_639_table = NULL;
static GHashTable *iso_3166_table = NULL;
static void
bind_iso_domains (void)
{
static gboolean bound = FALSE;
if (bound == FALSE)
{
bindtextdomain (ISO_639_DOMAIN, ISOCODESLOCALEDIR);
bind_textdomain_codeset (ISO_639_DOMAIN, "UTF-8");
bindtextdomain(ISO_3166_DOMAIN, ISOCODESLOCALEDIR);
bind_textdomain_codeset (ISO_3166_DOMAIN, "UTF-8");
bound = TRUE;
}
}
static void
read_iso_639_entry (xmlTextReaderPtr reader,
GHashTable *table)
{
xmlChar *code, *name;
code = xmlTextReaderGetAttribute (reader, (const xmlChar *) "iso_639_1_code");
name = xmlTextReaderGetAttribute (reader, (const xmlChar *) "name");
/* Get iso-639-2 code */
if (code == NULL || code[0] == '\0')
{
xmlFree (code);
/* FIXME: use the 2T or 2B code? */
code = xmlTextReaderGetAttribute (reader, (const xmlChar *) "iso_639_2T_code");
}
if (code != NULL && code[0] != '\0' && name != NULL && name[0] != '\0')
{
g_hash_table_insert (table, code, name);
}
else
{
xmlFree (code);
xmlFree (name);
}
}
static void
read_iso_3166_entry (xmlTextReaderPtr reader,
GHashTable *table)
{
xmlChar *code, *name;
code = xmlTextReaderGetAttribute (reader, (const xmlChar *) "alpha_2_code");
name = xmlTextReaderGetAttribute (reader, (const xmlChar *) "name");
if (code != NULL && code[0] != '\0' && name != NULL && name[0] != '\0')
{
char *lcode;
lcode = g_ascii_strdown ((char *) code, -1);
xmlFree (code);
/* g_print ("%s -> %s\n", lcode, name); */
g_hash_table_insert (table, lcode, name);
}
else
{
xmlFree (code);
xmlFree (name);
}
}
typedef enum
{
STATE_START,
STATE_STOP,
STATE_ENTRIES,
} ParserState;
static void
load_iso_entries (int iso,
GFunc read_entry_func,
gpointer user_data)
{
xmlTextReaderPtr reader;
ParserState state = STATE_START;
xmlChar iso_entries[32], iso_entry[32];
char *filename;
int ret = -1;
gedit_debug_message (DEBUG_PLUGINS, "Loading ISO-%d codes", iso);
filename = g_strdup_printf (ISO_CODES_PREFIX "/share/xml/iso-codes/iso_%d.xml", iso);
reader = xmlNewTextReaderFilename (filename);
if (reader == NULL) goto out;
xmlStrPrintf (iso_entries, sizeof (iso_entries), (const xmlChar *)"iso_%d_entries", iso);
xmlStrPrintf (iso_entry, sizeof (iso_entry), (const xmlChar *)"iso_%d_entry", iso);
ret = xmlTextReaderRead (reader);
while (ret == 1)
{
const xmlChar *tag;
xmlReaderTypes type;
tag = xmlTextReaderConstName (reader);
type = xmlTextReaderNodeType (reader);
if (state == STATE_ENTRIES &&
type == XML_READER_TYPE_ELEMENT &&
xmlStrEqual (tag, iso_entry))
{
read_entry_func (reader, user_data);
}
else if (state == STATE_START &&
type == XML_READER_TYPE_ELEMENT &&
xmlStrEqual (tag, iso_entries))
{
state = STATE_ENTRIES;
}
else if (state == STATE_ENTRIES &&
type == XML_READER_TYPE_END_ELEMENT &&
xmlStrEqual (tag, iso_entries))
{
state = STATE_STOP;
}
else if (type == XML_READER_TYPE_SIGNIFICANT_WHITESPACE ||
type == XML_READER_TYPE_WHITESPACE ||
type == XML_READER_TYPE_TEXT ||
type == XML_READER_TYPE_COMMENT)
{
/* eat it */
}
else
{
/* ignore it */
}
ret = xmlTextReaderRead (reader);
}
xmlFreeTextReader (reader);
out:
if (ret < 0 || state != STATE_STOP)
{
g_warning ("Failed to load ISO-%d codes from %s!\n",
iso, filename);
}
g_free (filename);
}
static GHashTable *
create_iso_639_table (void)
{
GHashTable *table;
bind_iso_domains ();
table = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) xmlFree,
(GDestroyNotify) xmlFree);
load_iso_entries (639, (GFunc) read_iso_639_entry, table);
return table;
}
static GHashTable *
create_iso_3166_table (void)
{
GHashTable *table;
bind_iso_domains ();
table = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) xmlFree);
load_iso_entries (3166, (GFunc) read_iso_3166_entry, table);
return table;
}
static char *
create_name_for_language (const char *code)
{
char **str;
char *name = NULL;
const char *langname, *localename;
int len;
g_return_val_if_fail (iso_639_table != NULL, NULL);
g_return_val_if_fail (iso_3166_table != NULL, NULL);
str = g_strsplit (code, "_", -1);
len = g_strv_length (str);
g_return_val_if_fail (len != 0, NULL);
langname = (const char *) g_hash_table_lookup (iso_639_table, str[0]);
if (len == 1 && langname != NULL)
{
name = g_strdup (dgettext (ISO_639_DOMAIN, langname));
}
else if (len == 2 && langname != NULL)
{
gchar *locale_code = g_ascii_strdown (str[1], -1);
localename = (const char *) g_hash_table_lookup (iso_3166_table, locale_code);
g_free (locale_code);
if (localename != NULL)
{
/* Translators: The text before the "|" is context to help you decide on
* the correct translation. You MUST OMIT it in the translated string.
* Translators: the first %s is the language name, and the
* second %s is the locale name. Example:
* "French (France)"
*/
name = g_strdup_printf (Q_("language|%s (%s)"),
dgettext (ISO_639_DOMAIN, langname),
dgettext (ISO_3166_DOMAIN, localename));
}
else
{
/* Translators: The text before the "|" is context to help you decide on
* the correct translation. You MUST OMIT it in the translated string. */
name = g_strdup_printf (Q_("language|%s (%s)"),
dgettext (ISO_639_DOMAIN, langname), str[1]);
}
}
else
{
/* Translators: The text before the "|" is context to help you decide on
* the correct translation. You MUST OMIT it in the translated string.
* Translators: this refers to an unknown language code
* (one which isn't in our built-in list).
*/
name = g_strdup_printf (Q_("language|Unknown (%s)"), code);
}
g_strfreev (str);
return name;
}
static void
enumerate_dicts (const char * const lang_tag,
const char * const provider_name,
const char * const provider_desc,
const char * const provider_file,
void * user_data)
{
gchar *lang_name;
GTree *dicts = (GTree *)user_data;
lang_name = create_name_for_language (lang_tag);
g_return_if_fail (lang_name != NULL);
/* g_print ("%s - %s\n", lang_tag, lang_name); */
g_tree_replace (dicts, g_strdup (lang_tag), lang_name);
}
static gint
key_cmp (gconstpointer a, gconstpointer b, gpointer user_data)
{
return strcmp (a, b);
}
static gint
lang_cmp (const GeditSpellCheckerLanguage *a,
const GeditSpellCheckerLanguage *b)
{
return g_utf8_collate (a->name, b->name);
}
static gboolean
build_langs_list (const gchar *key,
const gchar *value,
gpointer data)
{
GeditSpellCheckerLanguage *lang = g_new (GeditSpellCheckerLanguage, 1);
lang->abrev = g_strdup (key);
lang->name = g_strdup (value);
available_languages = g_slist_insert_sorted (available_languages,
lang,
(GCompareFunc)lang_cmp);
return FALSE;
}
const GSList *
gedit_spell_checker_get_available_languages (void)
{
EnchantBroker *broker;
GTree *dicts;
if (available_languages_initialized)
return available_languages;
g_return_val_if_fail (available_languages == NULL, NULL);
available_languages_initialized = TRUE;
broker = enchant_broker_init ();
g_return_val_if_fail (broker != NULL, NULL);
/* Use a GTree to efficiently remove duplicates while building the list */
dicts = g_tree_new_full (key_cmp,
NULL,
(GDestroyNotify)g_free,
(GDestroyNotify)g_free);
iso_639_table = create_iso_639_table ();
iso_3166_table = create_iso_3166_table ();
enchant_broker_list_dicts (broker, enumerate_dicts, dicts);
enchant_broker_free (broker);
g_hash_table_destroy (iso_639_table);
g_hash_table_destroy (iso_3166_table);
iso_639_table = NULL;
iso_3166_table = NULL;
g_tree_foreach (dicts, (GTraverseFunc)build_langs_list, NULL);
g_tree_destroy (dicts);
return available_languages;
}
const gchar *
gedit_spell_checker_language_to_string (const GeditSpellCheckerLanguage *lang)
{
if (lang == NULL)
/* Translators: The text before the "|" is context to help you decide on
* the correct translation. You MUST OMIT it in the translated string.
* Translators: this refers the Default language used by the
* spell checker
*/
return Q_("language|Default");
return lang->name;
}
const gchar *
gedit_spell_checker_language_to_key (const GeditSpellCheckerLanguage *lang)
{
g_return_val_if_fail (lang != NULL, NULL);
return lang->abrev;
}
const GeditSpellCheckerLanguage *
gedit_spell_checker_language_from_key (const gchar *key)
{
const GSList *langs;
g_return_val_if_fail (key != NULL, NULL);
langs = gedit_spell_checker_get_available_languages ();
while (langs != NULL)
{
const GeditSpellCheckerLanguage *l = (const GeditSpellCheckerLanguage *)langs->data;
if (g_ascii_strncasecmp (key, l->abrev, strlen (l->abrev)) == 0)
return l;
langs = g_slist_next (langs);
}
return NULL;
}
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* gedit-spell-checker-language.h
* This file is part of gedit
*
* Copyright (C) 2006 Paolo Maggi
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the gedit Team, 2006. See the AUTHORS file for a
* list of people on the gedit Team.
* See the ChangeLog files for a list of changes.
*/
#ifndef __GEDIT_SPELL_CHECKER_LANGUAGE_H__
#define __GEDIT_SPELL_CHECKER_LANGUAGE_H__
#include <glib.h>
G_BEGIN_DECLS
typedef struct _GeditSpellCheckerLanguage GeditSpellCheckerLanguage;
const gchar *gedit_spell_checker_language_to_string (const GeditSpellCheckerLanguage *lang);
const gchar *gedit_spell_checker_language_to_key (const GeditSpellCheckerLanguage *lang);
const GeditSpellCheckerLanguage *gedit_spell_checker_language_from_key (const gchar *key);
/* GSList contains "GeditSpellCheckerLanguage*" items */
const GSList *gedit_spell_checker_get_available_languages
(void);
G_END_DECLS
#endif /* __GEDIT_SPELL_CHECKER_LANGUAGE_H__ */
......@@ -33,7 +33,7 @@
#include <string.h>
#include <pspell/pspell.h>
#include <enchant.h>
#include <glib/gi18n.h>
#include <glib/gstrfuncs.h>
......@@ -47,20 +47,14 @@ struct _GeditSpellChecker
{
GObject parent_instance;
PspellManager *manager;
const GeditLanguage *active_lang;
};
struct _GeditLanguage
{
gchar *abrev;
gchar *name;
EnchantDict *dict;
EnchantBroker *broker;
const GeditSpellCheckerLanguage *active_lang;
};
/* GObject properties */
enum {
PROP_0 = 0,
PROP_AVAILABLE_LANGUAGES,
PROP_LANGUAGE,
LAST_PROP
};
......@@ -74,91 +68,6 @@ enum {
LAST_SIGNAL
};
static GeditLanguage known_languages [] =
{
{"af", N_("Afrikaans")},
{"am", N_("Amharic")},
{"ar", N_("Arabic")},
{"ar_EG", N_("Arabic (Egypt)")},
{"az", N_("Azerbaijani")},
{"be", N_("Belarusian")},
{"bg", N_("Bulgarian")},
{"bn", N_("Bengali")},
{"br", N_("Breton")},
{"ca", N_("Catalan")},