diff options
| author | Matthias Clasen <maclas@gmx.de> | 2003-09-24 22:30:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2003-09-24 22:30:15 +0000 |
| commit | 51910b9f94973e0e9292fa6b9b81015f821fdc25 (patch) | |
| tree | 8a88d866d4ddf959c9189d33ded551b1cb6fb79c | |
| parent | fb61dec5ae22b4bd34a7e12c7fd459b81d55e79f (diff) | |
| download | pango-51910b9f94973e0e9292fa6b9b81015f821fdc25.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 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/break.c | 5 |
6 files changed, 36 insertions, 4 deletions
@@ -1,3 +1,10 @@ +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 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c83a25db..ed9383c1 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +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 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index c83a25db..ed9383c1 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +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 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c83a25db..ed9383c1 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +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 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c83a25db..ed9383c1 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +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 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): diff --git a/pango/break.c b/pango/break.c index d49c242e..ad66842a 100644 --- a/pango/break.c +++ b/pango/break.c @@ -821,11 +821,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 { @@ -1528,4 +1526,3 @@ pango_get_log_attrs (const char *text, log_attrs + chars_broken, attrs_len - chars_broken); } - |