diff options
author | Owen Taylor <otaylor@redhat.com> | 2005-06-21 22:37:59 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-21 22:37:59 +0000 |
commit | 4ce097d475ac26a1b872baaaae925f0a71b4563d (patch) | |
tree | e51739791aea42bd5fc9f51cf8910b9598e43f0a /tests/Makefile.am | |
parent | b4989509d6a353a2efe4ce2af41cf0f6b0308b37 (diff) | |
download | pango-4ce097d475ac26a1b872baaaae925f0a71b4563d.tar.gz |
Fix up the operation of PangoLayoutIter, especially for Bidi (#89541,
2005-06-21 Owen Taylor <otaylor@redhat.com>
Fix up the operation of PangoLayoutIter, especially for Bidi
(#89541, based on a patch from Amit Aronovitch)
* pango/pango-layout.c: Many changes to make iteration
consistently in visual order.
* pango/pango-layout.c (pango_layout_iter_next_char): Iterate
through each character in the layout exactly once. (Including
a hack to get two iterator positions for \r\n)
* pango/pango-layout.c (pango_layout_iter_next_cluster): Only
iterate through real clusters: that is, positions in the
layout that have glyphs.
* tests/testiter.c tests/Makefile.am: Add a (somewhat reworked)
test from Amit for the operation of PangoLayoutIter.
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c42d60c2..58175d28 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,6 +3,7 @@ INCLUDES = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ + $(CAIRO_CFLAGS) \ $(XFT_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ @@ -29,18 +30,25 @@ TESTS_ENVIRONMENT = \ srcdir=$(srcdir) \ PANGO_RC_FILE=./pangorc -noinst_PROGRAMS = gen-all-unicode dump-boundaries +noinst_PROGRAMS = gen-all-unicode dump-boundaries check_PROGRAMS = testboundaries testcolor testscript +if HAVE_CAIRO +check_PROGRAMS += testiter +endif + gen_all_unicode_SOURCES = gen-all-unicode.c testboundaries_SOURCES = testboundaries.c testcolor_SOURCES = testcolor.c +testiter_SOURCES = testiter.c + testscript_SOURCES = testscript.c + dump_boundaries_SOURCES = dump-boundaries.c gen_all_unicode_LDADD = $(GLIB_LIBS) @@ -49,6 +57,8 @@ testboundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la testcolor_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la +testiter_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la ../pango/libpangocairo-$(PANGO_API_VERSION).la + testscript_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la dump_boundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la |