Add a new attribute for scaling a font; also required adding

2000-11-01  Havoc Pennington  <hp@pobox.com>

* 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.

1 files changed, 33 insertions, 0 deletions

diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 0bf3ea3b..0682bad4 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -41,6 +41,7 @@ attribute is listed in parentheses after the description.
 @PANGO_ATTR_STRIKETHROUGH: whether the text is struck-through (#PangoAttrInt)
 @PANGO_ATTR_RISE: baseline displacement (#PangoAttrInt)
 @PANGO_ATTR_SHAPE: 
+@PANGO_ATTR_SCALE: 
 
 <!-- ##### STRUCT PangoAttrClass ##### -->
 <para>
@@ -98,6 +99,14 @@ a integer or enumeration value.
 @attr: the common portion of the attribute
 @value: the value of the attribute
 
+<!-- ##### STRUCT PangoAttrFloat ##### -->
+<para>
+
+</para>
+
+@attr: 
+@value: 
+
 <!-- ##### STRUCT PangoAttrFontDesc ##### -->
 <para>
 The #PangoAttrFontDesc structure is used to store an attribute that
@@ -116,6 +125,21 @@ sets all aspects of the font description at once.
 @ink_rect: 
 @logical_rect: 
 
+<!-- ##### FUNCTION pango_parse_markup ##### -->
+<para>
+
+</para>
+
+@markup_text: 
+@length: 
+@accel_marker: 
+@attr_list: 
+@text: 
+@accel_char: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_attr_type_register ##### -->
 <para>
 
@@ -274,6 +298,15 @@ sets all aspects of the font description at once.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_attr_scale_new ##### -->
+<para>
+
+</para>
+
+@scale_factor: 
+@Returns: 
+
+
 <!-- ##### ENUM PangoUnderline ##### -->
 <para>
 the #PangoUnderline enumeration is used to specify