Merge lp:~kamstrup/dee/icu-transliterators into lp:dee

[Mikkel Kamstrup Erlandsen]

Add advanced transliteration support using ICU. This is an optional dependency. Developers relying on this feature will have to check it with pkg-config on the module dee-icu-1.0 and include the header file dee-icu.h.

[Michal Hruby (mhr3)]

Great start of something magnificent! :)

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-01-02 12:40:15 +0000
+++ Makefile.am	2012-01-26 12:28:22 +0000
@@ -3,6 +3,10 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dee-1.0.pc
 
+if HAVE_ICU
+pkgconfig_DATA += dee-icu-1.0.pc
+endif
+
 if WANT_TESTS
 SUBDIRS += tests
 
@@ -17,6 +21,7 @@
 EXTRA_DIST = \
 	autogen.sh \
 	dee-1.0.pc.in \
+	dee-icu-1.0.pc.in \
 	COPYING.GPL
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection=no

=== modified file 'configure.ac'
--- configure.ac	2012-01-02 12:40:15 +0000
+++ configure.ac	2012-01-26 12:28:22 +0000
@@ -155,6 +155,36 @@
 AC_PATH_PROG([VALA_API_GEN], [vapigen])
 AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VALA_API_GEN" != "x"])
 
+dnl = Check for ICU ====================================
+AC_ARG_ENABLE([icu],
+              AS_HELP_STRING([--enable-icu=@<:@no/yes@:>@],[build with advanced unicode text handling (requires ICU >= 4.8) @<:@default=yes@:>@]),,
+              [enable_icu=yes])
+
+if test "x$enable_icu" = "xyes"; then
+	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+	#include "unicode/uvernum.h"
+	#if U_ICU_VERSION_MAJOR_NUM < 4
+	#error Dee ICU requires at least ICU v4.8
+	#elif U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM < 8
+	#error Dee ICU requires at least ICU v4.8
+	#endif]], [[]])],
+	[icu_available=yes],
+	[icu_available=no])
+
+	if test "x$icu_available" = "xyes"; then
+		AC_DEFINE(HAVE_ICU, 1, [Define to 1 if we have ICU])
+		ICU_CFLAGS="$(icu-config --cflags)"
+		ICU_LIBS="$(icu-config --ldflags-libsonly)"
+		AC_SUBST(ICU_CFLAGS)
+		AC_SUBST(ICU_LIBS)
+		AC_OUTPUT([dee-icu-1.0.pc])
+	else
+		AC_MSG_ERROR([Dee ICU support requires ICU >= 4.8])
+	fi
+fi
+
+AM_CONDITIONAL(HAVE_ICU, test "x$enable_icu" = "xyes")
+
 dnl ===========================================================================
 AC_OUTPUT([
   Makefile
@@ -171,7 +201,7 @@
   tools/Makefile
   examples/Makefile
   vapi/Makefile
-])
+]) 
 
 dnl Output the results
 AC_MSG_NOTICE([
@@ -181,6 +211,8 @@
 
   Prefix         : ${prefix}
 
+  ICU support    : ${enable_icu}
+
   Documentation  : ${enable_gtk_doc}
   Introspection  : ${enable_introspection}
 

=== modified file 'dee-1.0.pc.in'
--- dee-1.0.pc.in	2010-05-06 14:37:39 +0000
+++ dee-1.0.pc.in	2012-01-26 12:28:22 +0000
@@ -8,4 +8,4 @@
 Version: @VERSION@
 Libs: -L${libdir} -ldee-1.0
 Cflags: -I${includedir}/dee-1.0
-Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 dbus-glib-1
+Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0

=== added file 'dee-icu-1.0.pc.in'
--- dee-icu-1.0.pc.in	1970-01-01 00:00:00 +0000
+++ dee-icu-1.0.pc.in	2012-01-26 12:28:22 +0000
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: Dee ICU integration
+Version: @VERSION@
+Libs: -L${libdir} -ldee-1.0
+Cflags: -I${includedir}/dee-1.0
+Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0

=== modified file 'doc/reference/dee-1.0/dee-1.0-docs.sgml'
--- doc/reference/dee-1.0/dee-1.0-docs.sgml	2012-01-10 07:43:54 +0000
+++ doc/reference/dee-1.0/dee-1.0-docs.sgml	2012-01-26 12:28:22 +0000
@@ -38,6 +38,7 @@
       <xi:include href="xml/dee-term-list.xml"/>
       <xi:include href="xml/dee-text-analyzer.xml"/>
       <xi:include href="xml/dee-tree-index.xml"/>
+      <xi:include href="xml/dee-icu.xml"/>
   </chapter>
 
   <chapter>

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-01-02 10:44:20 +0000
+++ src/Makefile.am	2012-01-26 12:28:22 +0000
@@ -118,6 +118,12 @@
 	$(DEE_CFLAGS) \
 	$(MAINTAINER_CFLAGS)
 
+if HAVE_ICU
+devel_headers += dee-icu.h
+libdee_1_0_la_SOURCES += dee-icu-term-filter.c
+libdee_1_0_la_LIBADD += $(ICU_LIBS)
+endif
+
 ##
 # If trace logging is not enabled
 # all the macros are removed by the preprocessor

=== added file 'src/dee-icu-term-filter.c'
--- src/dee-icu-term-filter.c	1970-01-01 00:00:00 +0000
+++ src/dee-icu-term-filter.c	2012-01-26 12:28:22 +0000
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ */
+
+#include <unicode/utypes.h>
+#include <unicode/localpointer.h>
+#include <unicode/urep.h>
+#include <unicode/parseerr.h>
+#include <unicode/uenum.h>
+#include <unicode/utrans.h>
+#include <unicode/ustring.h>
+
+#include <string.h>
+
+#include "dee-icu.h"
+
+/**
+ * SECTION:dee-icu
+ * @title: Dee ICU Extensions
+ * @short_description: A suite of #DeeTermFilter<!-- -->s based on ICU
+ * @include: dee-icu.h
+ *
+ * This module allows developers to easily construct powerful
+ * #DeeTermFilter<!-- -->s with ease. The filters leverage the ICU
+ * framework to provide world class transliteration features.
+ *
+ * The filters can be employed manually by calling dee_icu_term_filter_apply()
+ * or installed in a #DeeAnalyzer by calling dee_analyzer_add_term_filter()
+ * passing the term filter instance as the user data and
+ * dee_icu_term_filter_destroy() as the #GDestroyNotify.
+ */
+
+struct _DeeICUTermFilter {
+  UTransliterator *transliterator;
+};
+
+static UChar*
+gchar2uchar (const gchar *string, int32_t *u_len)
+{
+  int32_t     len;
+  UChar      *u_string;
+  UErrorCode  u_error_code = U_ZERO_ERROR;
+
+  if (string == NULL)
+    {
+      *u_len = -1;
+      return NULL;
+    }
+
+
+  len = strlen (string) * 2;
+  u_string = g_new(UChar, 2*len + 1);
+  u_string[2*len] = '\0';
+
+  u_strFromUTF8Lenient (u_string, len, u_len, string, -1, &u_error_code);
+
+  if (U_FAILURE(u_error_code))
+    {
+      g_critical ("Failed to convert string '%s' into UTF-16: %s",
+                  string, u_errorName(u_error_code));
+      return NULL;
+    }
+
+  return u_string;
+}
+
+static gchar*
+print_error (const gchar *system_id,
+             const gchar   *rules,
+             UParseError    *u_parse_error,
+             UErrorCode      u_error_code)
+{
+  GString *str;
+  gchar   *msg;
+
+  str = g_string_new ("");
+
+  g_string_append_printf (str, "[%s]: Error creating transliterator "
+                          "for system id '%s' and rules '%s'.",
+                          u_errorName (u_error_code), system_id, rules);
+
+  if (u_parse_error->line >= 0)
+    g_string_append_printf(str, " On line %i.", u_parse_error->line);
+
+  if (u_parse_error->offset >= 0)
+    g_string_append_printf(str, " Offset %i.", u_parse_error->offset);
+
+  msg = str->str;
+  g_string_free (str, FALSE);
+
+  return msg;
+}
+
+static DeeICUError
+get_error_code (UErrorCode u_error_code)
+{
+  /* The ICU error codes are quite tangled up,
+   * so excuse the spaghetti logic please :-)
+   */
+
+  if ( ! (u_error_code > U_PARSE_ERROR_START &&
+          u_error_code < U_PARSE_ERROR_LIMIT) &&
+          u_error_code != U_ILLEGAL_ARGUMENT_ERROR)
+    {
+      return DEE_ICU_ERROR_UNKNOWN;
+    }
+
+  switch (u_error_code)
+  {
+    case U_INVALID_ID:
+    case U_INVALID_FUNCTION:
+      return DEE_ICU_ERROR_BAD_ID;
+    case U_ILLEGAL_ARGUMENT_ERROR:
+    default:
+      return DEE_ICU_ERROR_BAD_RULE;
+  }
+}
+
+
+/**
+ * dee_icu_term_filter_new:
+ * @system_id: A system id for the transliterator to use.
+ *             See <link anchor="http://userguide.icu-project.org/transforms/general">userguide.icu-project.org/transforms/general</link>
+ * @rules: (allow-none): A set of transliteration rules to use.
+ *                       See <link anchor="http://userguide.icu-project.org/transforms/general/rules">userguide.icu-project.org/transforms/general/rules</link>
+ * @error: (allow-none) (error-domains Dee.ICUError): A place to return a #GError, or %NULL to ignore errors
+ *
+ * Create a new #DeeICUTermFilter for a given ICU transliterator system id
+ * and/or set of transliteration rules.
+ *
+ * Returns: (transfer full): A newly allocated #DeeICUTermFilter.
+ *                           Free with dee_icu_term_filter_destroy().
+ */
+DeeICUTermFilter*
+dee_icu_term_filter_new (const gchar *system_id,
+                         const gchar  *rules,
+                         GError      **error)
+{
+  DeeICUTermFilter *self;
+  UChar            *u_rules, *u_id;
+  int32_t           u_rules_len, u_id_len;
+  UErrorCode        u_error_code = 0;
+  UParseError       u_parse_error = { 0 };
+  
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  self = g_new0 (DeeICUTermFilter, 1);
+  u_id = gchar2uchar (system_id, &u_id_len);
+  u_rules = gchar2uchar (rules, &u_rules_len);
+
+  self->transliterator = utrans_openU (u_id, u_id_len,
+                                       UTRANS_FORWARD,
+                                       u_rules, u_rules_len,
+                                       &u_parse_error, &u_error_code);
+
+  if (U_FAILURE(u_error_code))
+    {
+      DeeICUError error_code;
+      gchar *msg;
+
+      error_code = get_error_code (u_error_code);
+      msg = print_error (system_id, rules, &u_parse_error, u_error_code);
+
+      g_set_error_literal (error, DEE_ICU_ERROR, error_code, msg);
+      g_free (msg);
+
+      return NULL;
+    }
+  
+  g_free (u_rules);
+  g_free (u_id);
+
+  return self;
+}
+
+/**
+ * dee_icu_term_filter_new_ascii_folder:
+ *
+ * Construct a term filter that folds any UTF-8 string into ASCII.
+ *
+ * Returns: (transfer full): A newly allocated #DeeICUTermFilter. Free with
+ *                           dee_icu_term_filter_destroy().
+ */
+DeeICUTermFilter*
+dee_icu_term_filter_new_ascii_folder ()
+{
+  return dee_icu_term_filter_new ("Latin; Latin-ASCII;", NULL, NULL);
+}
+
+/**
+ * dee_icu_term_filter_apply:
+ * @self: The filter to apply
+ * @text: The text to apply the filter on
+ *
+ * Apply a #DeeICUTermFilter on a piece of UTF-8 text.
+ *
+ * Returns: (transfer full): A newly allocated string. Free with g_free().
+ */
+gchar*
+dee_icu_term_filter_apply (DeeICUTermFilter *self,
+                           const gchar *text)
+{
+  UChar      *u_text;
+  int32_t     u_cap, u_len, u_limit;
+  UErrorCode  u_error_code = U_ZERO_ERROR;
+  gchar      *result;
+
+  g_return_val_if_fail (self != NULL, NULL);
+  g_return_val_if_fail (text != NULL, NULL);
+
+  u_cap = strlen (text) * 4 + 1;
+  u_text = g_new (UChar, u_cap);
+  u_text[u_cap - 1] = '\0';
+
+  u_strFromUTF8Lenient (u_text, u_cap, &u_len, text, -1, &u_error_code);
+
+  if (U_FAILURE(u_error_code))
+    {
+      g_critical ("Failed to convert string '%s' into UTF-16: %s",
+                  text, u_errorName(u_error_code));
+      return NULL;
+    }
+
+  u_limit = u_len;
+  utrans_transUChars (self->transliterator,
+                      u_text, &u_len, u_cap,
+                      0, &u_limit,
+                      &u_error_code);
+
+  if (U_FAILURE(u_error_code))
+    {
+      g_critical ("Failed to transliterate '%s': %s",
+                  text, u_errorName(u_error_code));
+      g_free (u_text);
+      return NULL;
+    }
+
+  result = g_utf16_to_utf8(u_text, u_len, NULL, NULL, NULL);
+
+  g_free (u_text);
+  return result;
+}
+
+/**
+ * dee_icu_term_filter_destroy:
+ * @filter: The filter to free
+ *
+ * Free all resources allocated by a #DeeICUTermFilter.
+ */
+void
+dee_icu_term_filter_destroy (DeeICUTermFilter *filter)
+{
+  g_return_if_fail (filter != NULL);
+
+  utrans_close (filter->transliterator);
+
+  g_free (filter);
+}
+
+GQuark
+dee_icu_error_quark (void)
+{
+  return g_quark_from_static_string ("dee-icu-error-quark");
+}

=== added file 'src/dee-icu.h'
--- src/dee-icu.h	1970-01-01 00:00:00 +0000
+++ src/dee-icu.h	2012-01-26 12:28:22 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ */
+
+#ifndef _HAVE_DEE_ICU_H
+#define _HAVE_DEE_ICU_H
+
+#include <glib.h>
+#include <glib-object.h>
+#include <dee-analyzer.h>
+#include <dee-term-list.h>
+
+G_BEGIN_DECLS
+
+/**
+ * DEE_ICU_ERROR:
+ *
+ * Error domain for the ICU extension to Dee. Error codes will be from the
+ * #DeeICUError enumeration
+ */
+#define DEE_ICU_ERROR dee_icu_error_quark()
+
+/**
+ * DeeICUError:
+ *
+ * Error codes for the ICU extension to Dee. These codes will be set when the
+ * error domain is #DEE_ICU_ERROR.
+ *
+ * @DEE_ICU_ERROR_BAD_RULE: Error parsing a transliteration rule
+ * @DEE_ICU_ERROR_BAD_ID: Error parsing a transliterator system id
+ * @DEE_ICU_ERROR_UNKNOWN: The ICU subsystem returned an error that is not
+ *                         handled in Dee
+ */
+typedef enum {
+  DEE_ICU_ERROR_BAD_RULE,
+  DEE_ICU_ERROR_BAD_ID,
+  DEE_ICU_ERROR_UNKNOWN
+} DeeICUError;
+
+typedef struct _DeeICUTermFilter DeeICUTermFilter;
+
+DeeICUTermFilter*        dee_icu_term_filter_new         (const gchar* system_id,
+                                                          const gchar  *rules,
+                                                       GError      **error);
+
+DeeICUTermFilter*        dee_icu_term_filter_new_ascii_folder ();
+
+gchar*                   dee_icu_term_filter_apply       (DeeICUTermFilter *self,
+                                                          const gchar *text);
+
+void                     dee_icu_term_filter_destroy     (DeeICUTermFilter *filter);
+
+GQuark                   dee_icu_error_quark              (void);
+
+G_END_DECLS
+
+#endif /* _HAVE_DEE_ICU_H */

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-01-02 12:40:15 +0000
+++ tests/Makefile.am	2012-01-26 12:28:22 +0000
@@ -44,6 +44,10 @@
 
 test_dee_LDADD = $(top_builddir)/src/libdee-1.0.la $(DEE_LIBS)
 
+if HAVE_ICU
+test_dee_SOURCES += test-icu.c
+endif
+
 if HAVE_GTX
 test_dee_SOURCES += test-model-interactions.c
 test_dee_SOURCES += test-peer-interactions.c

=== modified file 'tests/test-dee.c'
--- tests/test-dee.c	2011-12-15 13:41:06 +0000
+++ tests/test-dee.c	2012-01-26 12:28:22 +0000
@@ -43,6 +43,10 @@
 void test_client_server_interactions_create_suite(void);
 #endif  /* HAVE_GTX */
 
+#ifdef HAVE_ICU
+void test_icu_create_suite(void);
+#endif  /* HAVE_ICU */
+
 gint
 main (gint argc, gchar *argv[])
 {
@@ -75,5 +79,9 @@
   g_message ("Interactions' test suite disabled. GTX not found. You can download GTX from https://launchpad.net/gtx");
 #endif  /* HAVE_GTX */
   
+#ifdef HAVE_ICU
+  test_icu_create_suite ();
+#endif
+
   return g_test_run ();
 }

=== added file 'tests/test-icu.c'
--- tests/test-icu.c	1970-01-01 00:00:00 +0000
+++ tests/test-icu.c	2012-01-26 12:28:22 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library 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 Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
+ */
+
+#include <dee.h>
+#include <dee-icu.h>
+
+typedef struct
+{
+  DeeICUTermFilter *filter;
+} Fixture;
+
+static void setup    (Fixture *fix, gconstpointer data);
+static void teardown (Fixture *fix, gconstpointer data);
+
+static void
+setup (Fixture *fix, gconstpointer data)
+{
+  fix->filter = NULL;
+}
+
+static void
+teardown (Fixture *fix, gconstpointer data)
+{
+  if (fix->filter)
+    dee_icu_term_filter_destroy (fix->filter);
+}
+
+static void
+test_ascii_folder (Fixture *fix, gconstpointer data)
+{
+  gchar *result;
+
+  fix->filter = dee_icu_term_filter_new_ascii_folder();
+
+  result = dee_icu_term_filter_apply (fix->filter, "Hello world");
+  g_assert_cmpstr (result, ==, "Hello world");
+  g_free (result);
+
+  result = dee_icu_term_filter_apply (fix->filter, "øöô");
+  g_assert_cmpstr (result, ==, "ooo");
+  g_free (result);
+
+  result = dee_icu_term_filter_apply (fix->filter, "Θεοδωράτου, Ελένη");
+  g_assert_cmpstr (result, ==, "Theodoratou, Elene");
+  g_free (result);
+
+  result = dee_icu_term_filter_apply (fix->filter, "Догилева, Татьяна");
+  g_assert_cmpstr (result, ==, "Dogileva, Tatʹana");
+  g_free (result);
+
+  result = dee_icu_term_filter_apply (fix->filter, "김, 국삼");
+  g_assert_cmpstr (result, ==,  "gim, gugsam");
+  g_free (result);
+
+  result = dee_icu_term_filter_apply (fix->filter, "たけだ, まさゆき");
+  g_assert_cmpstr (result, ==, "takeda, masayuki");
+  g_free (result);
+
+  /* One last time to honor the French ;-) */
+  result = dee_icu_term_filter_apply (fix->filter, "Est-ce que tes enfants sont de bons élèves? Ça va pour eux?");
+  g_assert_cmpstr (result, ==, "Est-ce que tes enfants sont de bons eleves? Ca va pour eux?");
+  g_free (result);
+}
+
+static void
+test_bad_id (Fixture *fix, gconstpointer data)
+{
+  GError *error = NULL;
+
+  fix->filter = dee_icu_term_filter_new ("*-sad ???", NULL, &error);
+
+  g_assert (fix->filter == NULL);
+  g_assert (error != NULL);
+  g_assert_cmpint (error->domain, ==, DEE_ICU_ERROR);
+  g_assert_cmpint (error->code, ==, DEE_ICU_ERROR_BAD_ID);
+
+  g_error_free (error);
+}
+
+static void
+test_bad_rule (Fixture *fix, gconstpointer data)
+{
+  GError *error = NULL;
+
+  fix->filter = dee_icu_term_filter_new (NULL, "*-sad ???", &error);
+
+  g_assert (fix->filter == NULL);
+  g_assert (error != NULL);
+  g_assert_cmpint (error->domain, ==, DEE_ICU_ERROR);
+  g_assert_cmpint (error->code, ==, DEE_ICU_ERROR_BAD_RULE);
+
+  g_error_free (error);
+}
+
+void
+test_icu_create_suite (void)
+{
+#define DOMAIN "/ICU/TermFilter"
+
+  g_test_add (DOMAIN"/Default/AsciiFolder", Fixture, 0,
+              setup, test_ascii_folder, teardown);
+  g_test_add (DOMAIN"/Default/BadId", Fixture, 0,
+              setup, test_bad_id, teardown);
+  g_test_add (DOMAIN"/Default/BadRule", Fixture, 0,
+              setup, test_bad_rule, teardown);
+}

=== modified file 'vapi/Dee-1.0-custom.vala'
--- vapi/Dee-1.0-custom.vala	2012-01-16 08:18:04 +0000
+++ vapi/Dee-1.0-custom.vala	2012-01-26 12:28:22 +0000
@@ -36,4 +36,9 @@
 		[CCode (returns_floating_reference = true)]
 		public GLib.Variant externalize ();
 	}
+	
+	[CCode (cheader_filename = "dee-icu.h", free_function = "dee_icu_term_filter_destroy")]
+	[Compact]
+	public class ICUTermFilter {
+	}
 }

=== modified file 'vapi/Dee-1.0.metadata'
--- vapi/Dee-1.0.metadata	2012-01-16 08:18:04 +0000
+++ vapi/Dee-1.0.metadata	2012-01-26 12:28:22 +0000
@@ -32,6 +32,8 @@
 SharedModelError errordomain
 	.shared_model_error_leader_invalidated name="LEADER_INVALIDATED"
 
+ICUError cheader_filename="dee-icu.h"
+
 // why does gir add these twice?
 resource_manager_get_default skip
 serializable_parse skip

=== modified file 'vapi/dee-1.0.vapi'
--- vapi/dee-1.0.vapi	2012-01-16 08:18:04 +0000
+++ vapi/dee-1.0.vapi	2012-01-26 12:28:22 +0000
@@ -48,6 +48,12 @@
 		[CCode (has_construct_function = false)]
 		public HashIndex (Dee.Model model, Dee.Analyzer analyzer, Dee.ModelReader reader);
 	}
+	[CCode (cheader_filename = "dee-icu.h", free_function = "dee_icu_term_filter_destroy")]
+	[Compact]
+	public class ICUTermFilter {
+		public string apply (string text);
+		public void destroy ();
+	}
 	[CCode (cheader_filename = "dee.h", type_id = "dee_index_get_type ()")]
 	public abstract class Index : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -291,18 +297,32 @@
 		public static Dee.ModelReader new_for_uint32_column (uint column);
 		public string read (Dee.Model model, Dee.ModelIter iter);
 	}
-	[CCode (cheader_filename = "dee.h", cprefix = "DEE_TERM_MATCH_")]
+	[CCode (cheader_filename = "dee.h")]
 	[Flags]
 	public enum TermMatchFlag {
+		[CCode (cname = "DEE_TERM_MATCH_EXACT")]
 		EXACT,
+		[CCode (cname = "DEE_TERM_MATCH_PREFIX")]
 		PREFIX
 	}
-	[CCode (cheader_filename = "dee.h", cprefix = "DEE_TRANSACTION_ERROR_")]
+	[CCode (cheader_filename = "dee.h")]
 	public enum TransactionError {
+		[CCode (cname = "DEE_TRANSACTION_ERROR_CONCURRENT_MODIFICATION")]
 		CONCURRENT_MODIFICATION,
+		[CCode (cname = "DEE_TRANSACTION_ERROR_COMMITTED")]
 		COMMITTED
 	}
-	[CCode (cheader_filename = "dee.h", cprefix = "DEE_SHARED_MODEL_ERROR_LEADER_")]
+	[CCode (cheader_filename = "dee-icu.h")]
+	public errordomain ICUError {
+		[CCode (cname = "DEE_ICU_ERROR_BAD_RULE")]
+		BAD_RULE,
+		[CCode (cname = "DEE_ICU_ERROR_BAD_ID")]
+		BAD_ID,
+		[CCode (cname = "DEE_ICU_ERROR_UNKNOWN")]
+		UNKNOWN;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "dee.h")]
 	public errordomain SharedModelError {
 		[CCode (cname = "DEE_SHARED_MODEL_ERROR_LEADER_INVALIDATED")]
 		LEADER_INVALIDATED