diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-06-11 22:33:01 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-06-11 22:33:01 +0000 |
| commit | 1eda6add15f4694372d0ebe1de7904045292c5ea (patch) | |
| tree | f710ad9d050ef0cc2605d5fdf456a0cfae891fd1 | |
| parent | 38d0a3dd33ba64d3bbfa1234607474663a4a8291 (diff) | |
| download | pango-1eda6add15f4694372d0ebe1de7904045292c5ea.tar.gz | |
Bug 446355 – the parsing with pango_parse_markup is not coherent
2007-06-11 Behdad Esfahbod <behdad@gnome.org>
Bug 446355 – the parsing with pango_parse_markup is not coherent
* pango/pango-markup.c (pango_parse_markup): Use
pango_attr_list_insert() instead of pango_attr_list_change() as
merging adjacent attributes of the same kind is not a safe operation
and can change the derived font of a segment in an unexpected and
incorrect way.
svn path=/trunk/; revision=2340
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | pango/pango-markup.c | 2 |
2 files changed, 11 insertions, 1 deletions
@@ -1,5 +1,15 @@ 2007-06-11 Behdad Esfahbod <behdad@gnome.org> + Bug 446355 – the parsing with pango_parse_markup is not coherent + + * pango/pango-markup.c (pango_parse_markup): Use + pango_attr_list_insert() instead of pango_attr_list_change() as + merging adjacent attributes of the same kind is not a safe operation + and can change the derived font of a segment in an unexpected and + incorrect way. + +2007-06-11 Behdad Esfahbod <behdad@gnome.org> + * pango/pangocairo-fontmap.c: Make sure all enabled font backends included (reported by Vincent Isambart). diff --git a/pango/pango-markup.c b/pango/pango-markup.c index 31086214..7f4f75cf 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -664,7 +664,7 @@ pango_parse_markup (const char *markup_text, PangoAttribute *attr = tmp_list->data; /* Innermost tags before outermost */ - pango_attr_list_change (md->attr_list, attr); + pango_attr_list_insert (md->attr_list, attr); tmp_list = g_slist_next (tmp_list); } |