From 6e637bfa7182b5497d5052df19638f488434eea4 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 28 Sep 2001 15:35:12 +0000 Subject: Use PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the mask. Add Fri Sep 28 11:27:57 2001 Owen Taylor * pango/pango-attributes.c (pango_attr_iterator_get_font): Use PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the mask. Add fields to mask for PANGO_ATTR_FONT_DESC so it won't be overwritten by later attributes. (Fixes from Tony Graham, #61297) --- ChangeLog | 8 ++++++++ ChangeLog.pre-1-0 | 8 ++++++++ ChangeLog.pre-1-10 | 8 ++++++++ ChangeLog.pre-1-2 | 8 ++++++++ ChangeLog.pre-1-4 | 8 ++++++++ ChangeLog.pre-1-6 | 8 ++++++++ ChangeLog.pre-1-8 | 8 ++++++++ pango/pango-attributes.c | 29 +++++++++++++++-------------- 8 files changed, 71 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4320d814..24a1545f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Sep 28 11:27:57 2001 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): Use + PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the + mask. Add fields to mask for PANGO_ATTR_FONT_DESC so + it won't be overwritten by later attributes. + (Fixes from Tony Graham, #61297) + Thu Sep 27 12:08:23 2001 Owen Taylor * pango/pango-utils.c (pango_log2vis_get_embedding_levels): diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 4320d814..24a1545f 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,11 @@ +Fri Sep 28 11:27:57 2001 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): Use + PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the + mask. Add fields to mask for PANGO_ATTR_FONT_DESC so + it won't be overwritten by later attributes. + (Fixes from Tony Graham, #61297) + Thu Sep 27 12:08:23 2001 Owen Taylor * pango/pango-utils.c (pango_log2vis_get_embedding_levels): diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 4320d814..24a1545f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Fri Sep 28 11:27:57 2001 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): Use + PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the + mask. Add fields to mask for PANGO_ATTR_FONT_DESC so + it won't be overwritten by later attributes. + (Fixes from Tony Graham, #61297) + Thu Sep 27 12:08:23 2001 Owen Taylor * pango/pango-utils.c (pango_log2vis_get_embedding_levels): diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 4320d814..24a1545f 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,11 @@ +Fri Sep 28 11:27:57 2001 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): Use + PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the + mask. Add fields to mask for PANGO_ATTR_FONT_DESC so + it won't be overwritten by later attributes. + (Fixes from Tony Graham, #61297) + Thu Sep 27 12:08:23 2001 Owen Taylor * pango/pango-utils.c (pango_log2vis_get_embedding_levels): diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 4320d814..24a1545f 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Fri Sep 28 11:27:57 2001 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): Use + PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the + mask. Add fields to mask for PANGO_ATTR_FONT_DESC so + it won't be overwritten by later attributes. + (Fixes from Tony Graham, #61297) + Thu Sep 27 12:08:23 2001 Owen Taylor * pango/pango-utils.c (pango_log2vis_get_embedding_levels): diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 4320d814..24a1545f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Fri Sep 28 11:27:57 2001 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): Use + PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the + mask. Add fields to mask for PANGO_ATTR_FONT_DESC so + it won't be overwritten by later attributes. + (Fixes from Tony Graham, #61297) + Thu Sep 27 12:08:23 2001 Owen Taylor * pango/pango-utils.c (pango_log2vis_get_embedding_levels): diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 4320d814..24a1545f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Fri Sep 28 11:27:57 2001 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): Use + PANGO_FONT_MASK_* not PANGO_ATTR_* when manipulating the + mask. Add fields to mask for PANGO_ATTR_FONT_DESC so + it won't be overwritten by later attributes. + (Fixes from Tony Graham, #61297) + Thu Sep 27 12:08:23 2001 Owen Taylor * pango/pango-utils.c (pango_log2vis_get_embedding_levels): diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c index 6d6fbf1c..630c30b0 100644 --- a/pango/pango-attributes.c +++ b/pango/pango-attributes.c @@ -1410,57 +1410,58 @@ pango_attr_iterator_get_font (PangoAttrIterator *iterator, case PANGO_ATTR_FONT_DESC: { PangoFontMask new_mask = pango_font_description_get_set_fields (((PangoAttrFontDesc *)attr)->desc) & ~mask; + mask |= new_mask; pango_font_description_unset_fields (desc, new_mask); pango_font_description_merge_static (desc, ((PangoAttrFontDesc *)attr)->desc, FALSE); break; } case PANGO_ATTR_FAMILY: - if (!(mask & PANGO_ATTR_FAMILY)) + if (!(mask & PANGO_FONT_MASK_FAMILY)) { - mask |= PANGO_ATTR_FAMILY; + mask |= PANGO_FONT_MASK_FAMILY; pango_font_description_set_family (desc, ((PangoAttrString *)attr)->value); } break; case PANGO_ATTR_STYLE: - if (!(mask & PANGO_ATTR_STYLE)) + if (!(mask & PANGO_FONT_MASK_STYLE)) { - mask |= PANGO_ATTR_STYLE; + mask |= PANGO_FONT_MASK_STYLE; pango_font_description_set_style (desc, ((PangoAttrInt *)attr)->value); } break; case PANGO_ATTR_VARIANT: - if (!(mask & PANGO_ATTR_VARIANT)) + if (!(mask & PANGO_FONT_MASK_VARIANT)) { - mask |= PANGO_ATTR_VARIANT; + mask |= PANGO_FONT_MASK_VARIANT; pango_font_description_set_variant (desc, ((PangoAttrInt *)attr)->value); } break; case PANGO_ATTR_WEIGHT: - if (!(mask & PANGO_ATTR_WEIGHT)) + if (!(mask & PANGO_FONT_MASK_WEIGHT)) { - mask |= PANGO_ATTR_WEIGHT; + mask |= PANGO_FONT_MASK_WEIGHT; pango_font_description_set_weight (desc, ((PangoAttrInt *)attr)->value); } break; case PANGO_ATTR_STRETCH: - if (!(mask & PANGO_ATTR_STRETCH)) + if (!(mask & PANGO_FONT_MASK_STRETCH)) { - mask |= PANGO_ATTR_STRETCH; + mask |= PANGO_FONT_MASK_STRETCH; pango_font_description_set_stretch (desc, ((PangoAttrInt *)attr)->value); } break; case PANGO_ATTR_SIZE: - if (!(mask & PANGO_ATTR_SIZE)) + if (!(mask & PANGO_FONT_MASK_SIZE)) { - mask |= PANGO_ATTR_SIZE; + mask |= PANGO_FONT_MASK_SIZE; pango_font_description_set_size (desc, ((PangoAttrInt *)attr)->value); } break; case PANGO_ATTR_SCALE: - if (!(mask & PANGO_ATTR_SIZE)) + if (!(mask & PANGO_FONT_MASK_SIZE)) { - mask |= PANGO_ATTR_SIZE; + mask |= PANGO_FONT_MASK_SIZE; pango_font_description_set_size (desc, ((PangoAttrFloat *)attr)->value * pango_font_description_get_size (desc)); } -- cgit v1.2.1