diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-09-24 22:31:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-09-24 22:31:15 +0000 |
| commit | c94d7be497f178edf03ee68ac27b3bfe22623c79 (patch) | |
| tree | 3a0adbdd95e2759aa76da5371c3ead31deac523e | |
| parent | 2f01311f451738499e0b9e3de111e04e2f45d830 (diff) | |
| download | pango-c94d7be497f178edf03ee68ac27b3bfe22623c79.tar.gz | |
Only reset the word type to WordNone at a word end if it is not also a
2003-09-25 Matthias Clasen <maclas@gmx.de>
* pango/break.c (pango_default_break): Only reset the word
type to WordNone at a word end if it is not also a word
start. Otherwise both 't' and 'e' are classified as word
start in '123test'. (#122754, Hidetoshi Tajima)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rw-r--r-- | pango/break.c | 5 |
6 files changed, 41 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2003-09-25 Matthias Clasen <maclas@gmx.de> + + * pango/break.c (pango_default_break): Only reset the word + type to WordNone at a word end if it is not also a word + start. Otherwise both 't' and 'e' are classified as word + start in '123test'. (#122754, Hidetoshi Tajima) + + Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (itemize_state_add_character): Don't diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index fe74e603..6c703651 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +2003-09-25 Matthias Clasen <maclas@gmx.de> + + * pango/break.c (pango_default_break): Only reset the word + type to WordNone at a word end if it is not also a word + start. Otherwise both 't' and 'e' are classified as word + start in '123test'. (#122754, Hidetoshi Tajima) + + Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (itemize_state_add_character): Don't diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index fe74e603..6c703651 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +2003-09-25 Matthias Clasen <maclas@gmx.de> + + * pango/break.c (pango_default_break): Only reset the word + type to WordNone at a word end if it is not also a word + start. Otherwise both 't' and 'e' are classified as word + start in '123test'. (#122754, Hidetoshi Tajima) + + Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (itemize_state_add_character): Don't diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index fe74e603..6c703651 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +2003-09-25 Matthias Clasen <maclas@gmx.de> + + * pango/break.c (pango_default_break): Only reset the word + type to WordNone at a word end if it is not also a word + start. Otherwise both 't' and 'e' are classified as word + start in '123test'. (#122754, Hidetoshi Tajima) + + Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (itemize_state_add_character): Don't diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index fe74e603..6c703651 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +2003-09-25 Matthias Clasen <maclas@gmx.de> + + * pango/break.c (pango_default_break): Only reset the word + type to WordNone at a word end if it is not also a word + start. Otherwise both 't' and 'e' are classified as word + start in '123test'. (#122754, Hidetoshi Tajima) + + Tue Sep 23 19:43:05 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (itemize_state_add_character): Don't diff --git a/pango/break.c b/pango/break.c index bbe6b730..88a138b6 100644 --- a/pango/break.c +++ b/pango/break.c @@ -834,11 +834,9 @@ pango_default_break (const gchar *text, default: /* Punctuation, control/format chars, etc. all end a word. */ attrs[i].is_word_end = TRUE; + current_word_type = WordNone; break; } - - if (attrs[i].is_word_end) - current_word_type = WordNone; } else { @@ -1548,4 +1546,3 @@ pango_get_log_attrs (const char *text, log_attrs + chars_broken, attrs_len - chars_broken); } - |