diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-06-21 16:13:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-06-21 16:13:42 +0000 |
| commit | 0e6409a158d9dd76a31b9eccf7c4f26c5466d082 (patch) | |
| tree | dc120946f7efa23c6c91c64aee2686d2637e3970 /pango/itemize.c | |
| parent | 197a2a68c145d3568cd4f0f2fee3d3b55570134f (diff) | |
| download | pango-0e6409a158d9dd76a31b9eccf7c4f26c5466d082.tar.gz | |
Remove tests for libunicode
Wed Jun 21 12:11:56 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Remove tests for libunicode
* pango/utils.[ch]: Removed. The functions from here are now in
GLib.
* **.[ch]: Removed use of libunicode and utils.c in favor of
Unicode functions in GLib. Requires latest GLib from CVS.
Diffstat (limited to 'pango/itemize.c')
| -rw-r--r-- | pango/itemize.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pango/itemize.c b/pango/itemize.c index ed877fc0..da8b0fbc 100644 --- a/pango/itemize.c +++ b/pango/itemize.c @@ -20,10 +20,8 @@ */ #include <fribidi/fribidi.h> -#include <unicode.h> #include "pango.h" #include "iconv.h" -#include "utils.h" #include "modules.h" static void add_engines (PangoContext *context, @@ -90,7 +88,7 @@ pango_itemize (PangoContext *context, if (!text_ucs2) return NULL; - n_chars = unicode_strlen (text, length); + n_chars = g_utf8_strlen (text, length); embedding_levels = g_new (guint8, n_chars); /* Storing these as ranges would be a lot more efficient, @@ -126,7 +124,7 @@ pango_itemize (PangoContext *context, p = text; for (i=0; i<n_chars; i++) { - next = unicode_next_utf8 (p); + next = g_utf8_next_char (p); if (i == 0 || embedding_levels[i] != embedding_levels[i-1] || @@ -182,7 +180,7 @@ add_engines (PangoContext *context, GUChar4 wc; int i, j; - n_chars = unicode_strlen (text, length); + n_chars = g_utf8_strlen (text, length); pos = text; last_lang = NULL; @@ -211,7 +209,8 @@ add_engines (PangoContext *context, last_lang = lang; } - pos = unicode_get_utf8 (pos, &wc); + wc = g_utf8_get_char (pos); + pos = g_utf8_next_char (pos); if (!lang_engines[i]) { |