diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-03-08 18:39:49 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-03-08 18:39:49 +0000 |
| commit | 773bc55fc9e344f8040809ba8796b0ba2805e4c9 (patch) | |
| tree | 89e900594294e87b4a4de8f71571762d6ccc8871 /pango/itemize.c | |
| parent | dd0b4a5064c6f60adcfd2ea02e2d61fb60254d20 (diff) | |
| download | pango-773bc55fc9e344f8040809ba8796b0ba2805e4c9.tar.gz | |
First draft of highlevel driver. It currently only handles a paragraph as
Wed Mar 8 13:34:57 2000 Owen Taylor <otaylor@redhat.com>
* libpango/pango-layout.[ch]: First draft of highlevel
driver. It currently only handles a paragraph as a list
of lines, but it is probably necessary to make it handle
2D layout for a paragraph as well
* examples/viewer.c: Move over to new layout driver
(much of the code moved into pango-layout.c)
* libpango/glyphs.c libpango/pango-glyphs.h: Fixes to get_extents(),
add pango_glyph_string_get_logical_widths.
* libpango/pango-itemize.c: Handle 0-length text properly.
* libpango/pangox.c: When loading particular sized fonts,
use the original XLFD, since XFree86 doesn't handle wildcards
in aliases properly.
* libpango/pangox.[ch] (pango_x_render_layout_line): Add function
to render an entire PangoLayoutLine.
* libpango/reorder-items.c: Add a note to the effect
that pango_reorder_items() is basically replaced by a
similar function in PangoLayout.
Wed Mar 8 10:58:56 2000 Owen Taylor <otaylor@redhat.com>
* modules/arabic/arconv.c (shapecount): Fix from Karl
Koehler to joining behavior.
* modules/Makefile.am modules/arabic/*: Added arabic
shaper from Karl Koehler <koehler@or.uni-bonn.de>
* modules/basic/tables-{small,big}.i: Remove arabic
from the ranges that the basic shaper marks as "exact".
* examples/HELLO.utf8: Partially alphabetize, add arabic.
Diffstat (limited to 'pango/itemize.c')
| -rw-r--r-- | pango/itemize.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pango/itemize.c b/pango/itemize.c index bc7c9bd8..0f552915 100644 --- a/pango/itemize.c +++ b/pango/itemize.c @@ -52,10 +52,10 @@ static void add_engines (PangoContext *context, */ GList * pango_itemize (PangoContext *context, - gchar *text, - gint length, - PangoLangRange *lang_info, - gint n_langs) + gchar *text, + gint length, + PangoLangRange *lang_info, + gint n_langs) { guint16 *text_ucs2; gint n_chars; @@ -70,9 +70,10 @@ pango_itemize (PangoContext *context, PangoEngineInfo **lang_engines; g_return_val_if_fail (context != NULL, NULL); - g_return_val_if_fail (text != NULL, NULL); - g_return_val_if_fail (length >= 0, NULL); + g_return_val_if_fail (length == 0 || text != NULL, NULL); + if (length == 0) + return NULL; if (context->direction == PANGO_DIRECTION_RTL) base_dir = FRIBIDI_TYPE_RTL; |