diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-09-18 20:05:20 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-09-18 20:05:20 +0000 |
commit | a49e070d24242c0297e6325587c4bc135e13e26c (patch) | |
tree | 0510d066cc185e9d0b1b736736da5266d259878e /pango/pango-markup.c | |
parent | 39f3626e34e0522e0bdec591f6c0334307d39625 (diff) | |
download | pango-a49e070d24242c0297e6325587c4bc135e13e26c.tar.gz |
Up to 0.19.
Tue Sep 18 15:47:08 2001 Owen Taylor <otaylor@redhat.com>
* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
* pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c
pango/pangoxft-fontmap.c pango/pangoft-fontmap.c pango/pango-context.[ch]
pango/pangox-fontmap.c: Add new PangoFontFace and PangoFontFamily
object types, and change the font listing API to list faces and
families, instead of face names and font descriptions.
* pango/pango-font.h pango/fonts.c: Make PangoFontDescription
an opaque heap-allocated structure, add accessors and
convenience functions.
* pango/pango-font.h pango/pango-private.h: Make PangoFontMetrics
heap allocated, protect the structure definition with
#ifdef PANGO_ENABLE_BACKEND, and add getters for the fields.
* pango/pango-attributes.[ch] ( pango_attr_iterator_get_font):
instead of providing a base font description and one to fill
in, provide a single font description to modify based on
the attributes.
* pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have
a PangoFontDescription by reference, not by value.
* pango/pango-utils.[ch]: make pango_parse_style() and friends
take pointers to individual enumerations instead of to a
PangoFontDescription structure.
* pango/*.c: Fix for the PangoFontDescription and PangoFontMetrics
changes.
* pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am
pango/opentype/Makefile.am: Protect portions with
PANGO_ENABLE_ENGINE to shrink the public API.
* modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE.
* pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: Move
pango_x_font_get_unknown_glyph() into public header since it is
used from modules.
* pango/pango-{context,font,fontmap,modules.utils}.h pango/Makefile.am:
Protect portions with PANGO_ENABLE_BACKEND to shrink the public API.
* pango/*.h: Use G_BEGIN/END_DECLS
* examples/viewer-qt.[cc,h]: Fix for changes to font listing API,
PangoFontDescription.
* pango/pango-indic.h modules/indic/*: Since we install this
header fix it up to Pango conventions, namespece
ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER.
* docs/pango-sections.txt: Updated.
Diffstat (limited to 'pango/pango-markup.c')
-rw-r--r-- | pango/pango-markup.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pango/pango-markup.c b/pango/pango-markup.c index 041eaa3d..0ce40c68 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -943,7 +943,7 @@ span_parse_func (MarkupData *md, if (parsed) { add_attribute (tag, pango_attr_font_desc_new (parsed)); - open_tag_set_absolute_font_size (tag, parsed->size); + open_tag_set_absolute_font_size (tag, pango_font_description_get_size (parsed)); pango_font_description_free (parsed); } } @@ -1004,10 +1004,10 @@ span_parse_func (MarkupData *md, if (style) { - PangoFontDescription desc; + PangoStyle pango_style; - if (pango_parse_style (style, &desc, FALSE)) - add_attribute (tag, pango_attr_style_new (desc.style)); + if (pango_parse_style (style, &pango_style, FALSE)) + add_attribute (tag, pango_attr_style_new (pango_style)); else { g_set_error (error, @@ -1023,11 +1023,11 @@ span_parse_func (MarkupData *md, if (weight) { - PangoFontDescription desc; + PangoWeight pango_weight; - if (pango_parse_weight (weight, &desc, FALSE)) + if (pango_parse_weight (weight, &pango_weight, FALSE)) add_attribute (tag, - pango_attr_weight_new (desc.weight)); + pango_attr_weight_new (pango_weight)); else { g_set_error (error, @@ -1043,10 +1043,10 @@ span_parse_func (MarkupData *md, if (variant) { - PangoFontDescription desc; + PangoVariant pango_variant; - if (pango_parse_variant (variant, &desc, FALSE)) - add_attribute (tag, pango_attr_variant_new (desc.variant)); + if (pango_parse_variant (variant, &pango_variant, FALSE)) + add_attribute (tag, pango_attr_variant_new (pango_variant)); else { g_set_error (error, @@ -1062,10 +1062,10 @@ span_parse_func (MarkupData *md, if (stretch) { - PangoFontDescription desc; + PangoStretch pango_stretch; - if (pango_parse_stretch (stretch, &desc, FALSE)) - add_attribute (tag, pango_attr_stretch_new (desc.stretch)); + if (pango_parse_stretch (stretch, &pango_stretch, FALSE)) + add_attribute (tag, pango_attr_stretch_new (pango_stretch)); else { g_set_error (error, |