From b00a32cc4f7b8783d673f31502b4ef3555486995 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 1 Nov 2000 06:46:29 +0000 Subject: Add a new attribute for scaling a font; also required adding 2000-11-01 Havoc Pennington * pango/pango-attributes.c (pango_attr_scale_new): Add a new attribute for scaling a font; also required adding PangoAttrFloat. (pango_attr_iterator_get_font): Add PANGO_ATTR_SCALE handling. * pango/pango-utils.c (pango_parse_stretch): Take a plain string not a GString (pango_parse_weight): ditto (pango_parse_variant): ditto (pango_parse_style): ditto * pango/pangox-fontmap.c (pango_x_font_map_read_alias_file): pass GString::str instead of the GString itself to pango_parse_* * pango/pangoft2-fontmap.c (pango_ft2_insert_face): ditto * pango/pangowin32-fontmap.c (pango_win32_font_map_read_alias_file): ditto * pango/pango-layout.c (get_tab_pos): adapt to new pango_itemize() signature (pango_layout_check_lines): Raise attr list copy/creation out of the loop over paragraphs. Adapt to pango_itemize() changes. * pango/pango-context.c (pango_itemize): pass in a starting index and a cached iterator (add_engines): Easy optimization, pass in n_chars instead of recomputing it. Also, pass on the start index and cached iterator. * docs/pango-sections.txt: Add new stuff docs/pango_markup.sgml: Docs on markup format * pango/pango-layout.c (pango_layout_get_attributes): New function to retrieve the AttrList from a layout (pango_layout_set_markup): Set layout from markup (pango_layout_set_markup_with_accel): Set layout from markup including accelerator parsing. * pango/pango-attributes.h (pango_parse_markup): New function to convert a tag string to an attribute list * pango/pango-markup.c (pango_parse_markup): implement * docs/Makefile.am, docs/pango-docs.sgml, docs/pango-sections.txt, docs/pango_markup.sgml: oooooh, documentation for the above patch! * docs/tmpl/pango-unused.sgml: Remove from CVS; just causes problems, and was full of checked-in conflict markers. --- pango/pango-layout.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pango/pango-layout.h') diff --git a/pango/pango-layout.h b/pango/pango-layout.h index 6d60a66d..43f40955 100644 --- a/pango/pango-layout.h +++ b/pango/pango-layout.h @@ -74,10 +74,22 @@ PangoContext *pango_layout_get_context (PangoLayout *layout); void pango_layout_set_attributes (PangoLayout *layout, PangoAttrList *attrs); +PangoAttrList *pango_layout_get_attributes (PangoLayout *layout); + void pango_layout_set_text (PangoLayout *layout, const char *text, int length); +void pango_layout_set_markup (PangoLayout *layout, + const char *markup, + int length); + +void pango_layout_set_markup_with_accel (PangoLayout *layout, + const char *markup, + int length, + gunichar accel_marker, + gunichar *accel_char); + void pango_layout_set_font_description (PangoLayout *layout, const PangoFontDescription *desc); void pango_layout_set_width (PangoLayout *layout, -- cgit v1.2.1