From 51910b9f94973e0e9292fa6b9b81015f821fdc25 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 24 Sep 2003 22:30:15 +0000 Subject: Only reset the word type to WordNone at a word end if it is not also a 2003-09-25 Matthias Clasen * 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) --- ChangeLog | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ ChangeLog.pre-1-4 | 7 +++++++ ChangeLog.pre-1-6 | 7 +++++++ ChangeLog.pre-1-8 | 7 +++++++ pango/break.c | 5 +---- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c83a25db..ed9383c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-09-25 Matthias Clasen + + * 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 * 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 + + * 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 * 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 + + * 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 * 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 + + * 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 * 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 + + * 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 * 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); } - -- cgit v1.2.1