diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-06-22 18:52:44 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-22 18:52:44 +0000 |
| commit | 8039327b77e272a721ff96d0e34a2b70c535a5e8 (patch) | |
| tree | 7ae7a39b3600ae09bc666c066d83ca58be2106de /tests | |
| parent | 6f2ebcdb53f740082734e6147c737b83a26e9b0c (diff) | |
| download | pango-8039327b77e272a721ff96d0e34a2b70c535a5e8.tar.gz | |
Handle new Unicode-4.0 WORD_JOINER and NEXT_LINE classes. (#143436, Jeroen
Tue Jun 22 14:10:41 2004 Owen Taylor <otaylor@redhat.com>
* pango/break.c: Handle new Unicode-4.0 WORD_JOINER
and NEXT_LINE classes. (#143436, Jeroen Zwartepoorte)
* pango/break.c (pango_default_break): Handle space
followed by a combining character as called for by
TR 14.
* tests/testboundaries.c (check_line_char): Fix up
for space+combining mark
* pango/break.c (pango_default_break): Change fixme
for G_UNICODE_BREAK_SURROGATE to g_assert_not_reached().
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testboundaries.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/testboundaries.c b/tests/testboundaries.c index fb45c4d3..829e0ab4 100644 --- a/tests/testboundaries.c +++ b/tests/testboundaries.c @@ -216,8 +216,9 @@ check_line_char (gunichar wc, if (break_type == G_UNICODE_BREAK_SPACE) { if (attr->is_line_break && prev_attr != NULL && - !attr->is_mandatory_break) - fail ("can't break lines before a space unless a mandatory break char precedes it; prev char was " CHFORMAT, prev_wc); + !attr->is_mandatory_break && + !(next_wc && g_unichar_break_type (next_wc) == G_UNICODE_BREAK_COMBINING_MARK)) + fail ("can't break lines before a space unless a mandatory break char precedes it or a combining mark follows; prev char was " CHFORMAT, prev_wc); } if (attr->is_mandatory_break && !attr->is_line_break) |