diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 10 | ||||
| -rw-r--r-- | pango/pango-attributes.c | 2 | ||||
| -rw-r--r-- | pango/pango-context.c | 3 |
6 files changed, 44 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (update_attr_iterator): Initialize + state->lang from context->language if not otherwise set. + Without doing this, the default language tag was, not + suprisingly, having no effect! (#137334, Frederic Zhang) + + * pango/pango-attributes.c (pango_attr_iterator_get_font): + Fix typo in doc comment. + Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com> * docs/pango_markup.sgml: use x-large instead of 100 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8319c278..e38e6367 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,13 @@ +Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (update_attr_iterator): Initialize + state->lang from context->language if not otherwise set. + Without doing this, the default language tag was, not + suprisingly, having no effect! (#137334, Frederic Zhang) + + * pango/pango-attributes.c (pango_attr_iterator_get_font): + Fix typo in doc comment. + Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com> * docs/pango_markup.sgml: use x-large instead of 100 diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8319c278..e38e6367 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,13 @@ +Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (update_attr_iterator): Initialize + state->lang from context->language if not otherwise set. + Without doing this, the default language tag was, not + suprisingly, having no effect! (#137334, Frederic Zhang) + + * pango/pango-attributes.c (pango_attr_iterator_get_font): + Fix typo in doc comment. + Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com> * docs/pango_markup.sgml: use x-large instead of 100 diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8319c278..e38e6367 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,13 @@ +Mon Jun 21 15:26:44 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (update_attr_iterator): Initialize + state->lang from context->language if not otherwise set. + Without doing this, the default language tag was, not + suprisingly, having no effect! (#137334, Frederic Zhang) + + * pango/pango-attributes.c (pango_attr_iterator_get_font): + Fix typo in doc comment. + Mon Jun 21 14:42:02 2004 Owen Taylor <otaylor@redhat.com> * docs/pango_markup.sgml: use x-large instead of 100 diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c index a8801948..cd0af8bd 100644 --- a/pango/pango-attributes.c +++ b/pango/pango-attributes.c @@ -1406,7 +1406,7 @@ pango_attr_iterator_get (PangoAttrIterator *iterator, * so if you plan to keep it around, you must call: * <literal>pango_font_description_set_family (desc, pango_font_description_get_family (desc))</literal>. * @language: if non-%NULL, location to store language tag for item, or %NULL - * if non is found. + * if none is found. * @extra_attrs: if non-%NULL, location in which to store a list of non-font * attributes at the the current position; only the highest priority * value of each attribute will be added to this list. In order diff --git a/pango/pango-context.c b/pango/pango-context.c index ea5dd83e..5f0ec379 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -619,6 +619,9 @@ update_attr_iterator (ItemizeState *state) &state->lang, &state->extra_attrs); state->copy_extra_attrs = FALSE; + if (!state->lang) + state->lang = state->context->language; + fallback = find_attribute (state->extra_attrs, PANGO_ATTR_FALLBACK); state->enable_fallback = (fallback == NULL || ((PangoAttrInt *)fallback)->value); |