diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-11-12 21:16:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-12 21:16:39 +0000 |
| commit | f726b8d49d00e325314ee6f17cf1f7eaed1fd019 (patch) | |
| tree | 6041b8551149c167352c65fda63c3e7aaeb88d9b /pango/pango-context.c | |
| parent | 1ff8a34d8c98aa47438515abd16f531e838d7404 (diff) | |
| download | pango-f726b8d49d00e325314ee6f17cf1f7eaed1fd019.tar.gz | |
Include a stripped-down version of fribidi to avoid the extra dependency.
Sun Nov 12 16:07:06 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango/pango-utils.[ch] pango/Makefile.am
pango/mini-fribidi/*: Include a stripped-down version of fribidi
to avoid the extra dependency. No fribidi symbols are
exported so conflicts with the real fribidi should not
happen. Library can optionally be compiled with the
real libfribidi.
* pango/pango-utils.[ch]: Wrappers for
fribidi_ functions when compiling with fribiid.
* modules/basic/basic-ft2.c modules/basic/basic-win32.c
modules/basic/basic.c modules/thai/thai.c pango/Makefile.am
pango/itemize.c pango/pango-context.c pango/pangoft2.c
pango/pangowin32.c pango/pangox.c: Use pango_ versions of fribidi
functions.
Diffstat (limited to 'pango/pango-context.c')
| -rw-r--r-- | pango/pango-context.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index fb4bc55e..dbdb5801 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -22,8 +22,8 @@ #include <string.h> #include <stdlib.h> -#include <fribidi/fribidi.h> -#include <pango/pango-context.h> +#include "pango/pango-context.h" +#include "pango/pango-utils.h" #include "iconv.h" #include "pango-modules.h" @@ -531,7 +531,7 @@ pango_itemize (PangoContext *context, gunichar *text_ucs4; int n_chars, i; guint8 *embedding_levels; - FriBidiCharType base_dir; + PangoDirection base_dir; PangoItem *item; const char *p; const char *next; @@ -550,11 +550,8 @@ pango_itemize (PangoContext *context, if (length == 0) return NULL; - if (context->base_dir == PANGO_DIRECTION_RTL) - base_dir = FRIBIDI_TYPE_RTL; - else - base_dir = FRIBIDI_TYPE_LTR; - + base_dir = context->base_dir; + if (length == 0) return NULL; @@ -568,7 +565,7 @@ pango_itemize (PangoContext *context, n_chars = g_utf8_strlen (text + start_index, length); embedding_levels = g_new (guint8, n_chars); - fribidi_log2vis_get_embedding_levels (text_ucs4, n_chars, &base_dir, + pango_log2vis_get_embedding_levels (text_ucs4, n_chars, &base_dir, embedding_levels); /* Storing these as ranges would be a lot more efficient, |