diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-09-23 23:47:54 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-09-23 23:47:54 +0000 |
| commit | 2f01311f451738499e0b9e3de111e04e2f45d830 (patch) | |
| tree | 35d4069d45700480f91219575b9a8f4e8c055765 | |
| parent | 0f36f55ee0e7c9bf224fabbaf31843b3868f213c (diff) | |
| download | pango-2f01311f451738499e0b9e3de111e04e2f45d830.tar.gz | |
Don't break runs when we hit neutral characters.
Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (itemize_state_add_character): Don't
break runs when we hit neutral characters.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pango-context.c | 20 |
6 files changed, 35 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (itemize_state_add_character): Don't + break runs when we hit neutral characters. + Tue Sep 23 18:03:57 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-engines.[ch] pango/pango-engines-private.h: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 5bbb8adf..fe74e603 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (itemize_state_add_character): Don't + break runs when we hit neutral characters. + Tue Sep 23 18:03:57 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-engines.[ch] pango/pango-engines-private.h: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 5bbb8adf..fe74e603 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (itemize_state_add_character): Don't + break runs when we hit neutral characters. + Tue Sep 23 18:03:57 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-engines.[ch] pango/pango-engines-private.h: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 5bbb8adf..fe74e603 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (itemize_state_add_character): Don't + break runs when we hit neutral characters. + Tue Sep 23 18:03:57 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-engines.[ch] pango/pango-engines-private.h: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 5bbb8adf..fe74e603 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (itemize_state_add_character): Don't + break runs when we hit neutral characters. + Tue Sep 23 18:03:57 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-engines.[ch] pango/pango-engines-private.h: diff --git a/pango/pango-context.c b/pango/pango-context.c index d6cf6bc9..aa0917dd 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -702,6 +702,16 @@ itemize_state_add_character (ItemizeState *state, { if (state->item) { + if (!state->item->analysis.shape_engine && shape_engine) + { + itemize_state_fill_shaper (state, shape_engine, font); + } + else if (state->item->analysis.shape_engine && !shape_engine) + { + font = state->item->analysis.font; + shape_engine = state->item->analysis.shape_engine; + } + if (!force_break && state->item->analysis.lang_engine == state->lang_engine && state->item->analysis.shape_engine == shape_engine && @@ -712,16 +722,6 @@ itemize_state_add_character (ItemizeState *state, } state->item->length = (pos - state->text) - state->item->offset; - - if (!state->item->analysis.shape_engine && shape_engine) - { - itemize_state_fill_shaper (state, shape_engine, font); - } - else if (state->item->analysis.shape_engine && !shape_engine) - { - font = state->item->analysis.font; - shape_engine = state->item->analysis.shape_engine; - } } state->item = pango_item_new (); |