From 891b984fc26e0f2422a6c5c13d5b310dc7c2f7e9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 3 Dec 2002 06:21:49 +0000 Subject: Rename PangoLayoutRun to PangoGlyphItem (with a typedef for compat), add Sun Nov 17 23:28:26 2002 Owen Taylor * pango/pango-glyph-item.[ch] pango/pango-layout.h: Rename PangoLayoutRun to PangoGlyphItem (with a typedef for compat), add pango_glyph_item_split(), pango_glyph_item_apply_attrs(). * pango/pango-attributes.[ch]: Add pango_attr_list_filter(), pango_attr_iterator_get_attrs(). * pango/pango-layout.c: Remove attributes that don't affect shaping before shaping, shape and then add them back. Fixes the infamous "underscores break arabic shaping" bug (#83058) * pango/pango-item.h: Remove an extraneous include. * pango/pango-layout.c (imposed_shape): Fix bytes/chars problem for glyph->log_clusters. * pango/pango-layout.c (cluster_end_index) * pango/pango-layout.c (pango_layout_iter_next_cluster): Fix confusion between global indices and run-relative indices. * docs/tmpl/glyphs.sgml: Improve docs for log_clusters. * docs/*: Document new API and PangoOTRuleset --- pango/pango-layout.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'pango/pango-layout.h') diff --git a/pango/pango-layout.h b/pango/pango-layout.h index e840de79..f3c8dfce 100644 --- a/pango/pango-layout.h +++ b/pango/pango-layout.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include G_BEGIN_DECLS @@ -32,7 +32,9 @@ G_BEGIN_DECLS typedef struct _PangoLayout PangoLayout; typedef struct _PangoLayoutClass PangoLayoutClass; typedef struct _PangoLayoutLine PangoLayoutLine; -typedef struct _PangoLayoutRun PangoLayoutRun; + +/* For backwards compatiblity */ +typedef PangoGlyphItem PangoLayoutRun; typedef enum { PANGO_ALIGN_LEFT, @@ -54,12 +56,6 @@ struct _PangoLayoutLine GSList *runs; }; -struct _PangoLayoutRun -{ - PangoItem *item; - PangoGlyphString *glyphs; -}; - #define PANGO_TYPE_LAYOUT (pango_layout_get_type ()) #define PANGO_LAYOUT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_LAYOUT, PangoLayout)) #define PANGO_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_LAYOUT, PangoLayoutClass)) -- cgit v1.2.1