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.

8 files changed, 285 insertions, 546 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index b4fd8669..9009a918 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -35,6 +35,9 @@ tmpl_sources =				\
 	tmpl/x-fonts.sgml		\
 	tmpl/x-rendering.sgml
 
+content_files =				\
+	pango_markup.sgml
+
 
 ####################################
 # Everything below here is generic #
@@ -43,6 +46,7 @@ tmpl_sources =				\
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
 EXTRA_DIST = 				\
+	$(content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-decl.txt		\
 	$(DOC_MODULE)-sections.txt	\
diff --git a/docs/pango-docs.sgml b/docs/pango-docs.sgml
index 6fb0cd0b..91d7c782 100644
--- a/docs/pango-docs.sgml
+++ b/docs/pango-docs.sgml
@@ -8,6 +8,7 @@
 <!entity pango-engines SYSTEM "sgml/engines.sgml">
 <!entity x-fonts SYSTEM "sgml/x-fonts.sgml">
 <!entity x-rendering SYSTEM "sgml/x-rendering.sgml">
+<!entity markup-format SYSTEM "pango_markup.sgml">
 ]>
 <book id="index">
   <bookinfo>
@@ -20,6 +21,7 @@
     &pango-glyphs;
     &pango-fonts;
     &pango-text-attributes;
+    &markup-format;
     &pango-layout;
     &pango-coverage-maps;
     &pango-engines;
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index a863276c..fcad5d6c 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -140,8 +140,10 @@ PangoAttribute
 PangoAttrString
 PangoAttrColor
 PangoAttrInt
+PangoAttrFloat
 PangoAttrFontDesc
 PangoAttrShape
+pango_parse_markup
 pango_attr_type_register
 pango_attribute_copy
 pango_attribute_compare
@@ -160,6 +162,7 @@ pango_attr_background_new
 pango_attr_strikethrough_new
 pango_attr_underline_new
 pango_attr_shape_new
+pango_attr_scale_new
 PangoUnderline
 pango_attr_rise_new
 <SUBSECTION>
@@ -209,7 +212,10 @@ pango_layout_get_context
 pango_layout_context_changed
 
 pango_layout_set_text
+pango_layout_set_markup
+pango_layout_set_markup_with_accel
 pango_layout_set_attributes
+pango_layout_get_attributes
 pango_layout_set_font_description
 pango_layout_set_width
 pango_layout_get_width
@@ -221,8 +227,8 @@ pango_layout_set_justify
 pango_layout_get_justify
 pango_layout_set_alignment
 pango_layout_get_alignment
-pango_layout_get_tabs
 pango_layout_set_tabs
+pango_layout_get_tabs
 PangoAlignment
 
 pango_layout_get_log_attrs
diff --git a/docs/pango_markup.sgml b/docs/pango_markup.sgml
new file mode 100644
index 00000000..a0311e31
--- /dev/null
+++ b/docs/pango_markup.sgml
@@ -0,0 +1,202 @@
+<refentry id="PangoMarkupFormat" revision="23 Oct 2000">
+<refmeta>
+<refentrytitle>Pango Text Attribute Markup</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>Pango Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Pango Text Attribute Markup</refname><refpurpose>Simple
+markup language to encode text plus a <link linkend="PangoAttrList">PangoAttrList</link></refpurpose>
+</refnamediv>
+
+<refsect1>
+<title>Pango Text Attribute Markup Language</title>
+
+<para>
+Frequently, you want to display some text to the user with attributes
+applied to part of the text (for example, you might want bold or
+italicized words). With the base Pango interfaces, you could create a
+#PangoAttrList and apply it to the text; the problem is that you'd
+need to apply attributes to some numeric range of characters, for
+example "characters 12-17." This is broken from an
+internationalization standpoint; once the text is translated, the word
+you wanted to italicize could be in a different position.
+</para>
+
+<para>
+The solution is to include the text attributes in the string to be
+translated. Pango provides this feature with a small markup language.
+You can parse a marked-up string into the string text plus a
+<link linkend="PangoAttrList">PangoAttrList</link> using the function 
+pango_parse_markup().
+</para>
+
+<para>
+A simple example of a marked-up string might be:
+<literal>"&lt;span foreground="blue" size="100"&gt;Blue text&lt;/span&gt; is &lt;i&gt;cool&lt;/i&gt;!"</literal>
+</para>
+
+<para>
+The root tag of a marked-up document is &lt;markup&gt;, but
+pango_parse_markup() allows you to omit this tag, so you will most
+likely never need to use it. The most general markup tag is
+&lt;span&gt;, then there are some convenience tags. &lt;span&gt; has
+the following attributes:
+<variablelist><title>&lt;span&gt; attributes</title>
+
+<varlistentry><term>font_desc</term>
+<listitem><para>
+A font description string, such as "Sans Italic 12"; note that any other 
+span attributes will override this description. So if you have "Sans
+Italic" and also a style="normal" attribute, you will get Sans normal,
+not italic.
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>font_family</term>
+<listitem><para>
+A font family name
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>face</term>
+<listitem><para>
+Synonym for font_family
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>size</term>
+<listitem><para>
+Font size in 1000ths of a point, one of the absolute sizes 
+'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large',
+'xx-large', or one of the relative sizes 'smaller' or 'larger'.
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>style</term>
+<listitem><para>
+One of 'normal', 'oblique', 'italic'
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>weight</term>
+<listitem><para>
+One of 'ultralight', 'light', 'normal', 'bold', 'ultrabold', 'heavy',
+or a numeric weight
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>variant</term>
+<listitem><para>
+'normal' or 'smallcaps'
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>stretch</term>
+<listitem><para>
+One of 'ultracondensed', 'extracondensed', 'condensed',
+'semicondensed', 'normal', 'semiexpanded', 'expanded',
+'extraexpanded', 'ultraexpanded'
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>foreground</term>
+<listitem><para>
+An RGB color specification such as '#00FF00' or a color name such as 
+'red'
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>background</term>
+<listitem><para>
+An RGB color specification such as '#00FF00' or a color name such as 
+'red'
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>underline</term>
+<listitem><para>
+One of 'single', 'double', 'low', 'none'
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>rise</term>
+<listitem><para>
+Vertical displacement, in 10000ths of an em. Can be negative for 
+subscript, positive for superscript.
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>strikethrough</term>
+<listitem><para>
+'true' or 'false' whether to strike through the text
+</para></listitem>
+</varlistentry>
+
+<varlistentry><term>lang</term>
+<listitem><para>
+A language code, indicating the text language
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+</para>
+
+<para>
+The following convenience tags are provided:
+
+<variablelist><title>Convenience tags</title>
+<varlistentry><term>b</term>
+<listitem><para>
+Bold
+</para></listitem>
+</varlistentry>
+<varlistentry><term>big</term>
+<listitem><para>
+Makes font relatively larger, equivalent to &lt;span size="larger"&gt;
+</para></listitem>
+</varlistentry>
+<varlistentry><term>i</term>
+<listitem><para>
+Italic
+</para></listitem>
+</varlistentry>
+<varlistentry><term>s</term>
+<listitem><para>
+Strikethrough
+</para></listitem>
+</varlistentry>
+<varlistentry><term>sub</term>
+<listitem><para>
+Subscript
+</para></listitem>
+</varlistentry>
+<varlistentry><term>sup</term>
+<listitem><para>
+Superscript
+</para></listitem>
+</varlistentry>
+<varlistentry><term>small</term>
+<listitem><para>
+Makes font relatively smaller, equivalent to &lt;span size="smaller"&gt;
+</para></listitem>
+</varlistentry>
+<varlistentry><term>tt</term>
+<listitem><para>
+Monospace font
+</para></listitem>
+</varlistentry>
+<varlistentry><term>u</term>
+<listitem><para>
+Underline
+</para></listitem>
+</varlistentry>
+</variablelist>
+
+</para>
+
+</refsect1>
+
+</refentry>
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 9ca78964..fca9db60 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -84,6 +84,28 @@ fields.
 @length: 
 
 
+<!-- ##### FUNCTION pango_layout_set_markup ##### -->
+<para>
+
+</para>
+
+@layout: 
+@markup: 
+@length: 
+
+
+<!-- ##### FUNCTION pango_layout_set_markup_with_accel ##### -->
+<para>
+
+</para>
+
+@layout: 
+@markup: 
+@length: 
+@accel_marker: 
+@accel_char: 
+
+
 <!-- ##### FUNCTION pango_layout_set_attributes ##### -->
 <para>
 
@@ -93,6 +115,15 @@ fields.
 @attrs: 
 
 
+<!-- ##### FUNCTION pango_layout_get_attributes ##### -->
+<para>
+
+</para>
+
+@layout: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_layout_set_font_description ##### -->
 <para>
 
@@ -192,22 +223,22 @@ fields.
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_layout_get_tabs ##### -->
+<!-- ##### FUNCTION pango_layout_set_tabs ##### -->
 <para>
 
 </para>
 
 @layout: 
-@Returns: 
+@tabs: 
 
 
-<!-- ##### FUNCTION pango_layout_set_tabs ##### -->
+<!-- ##### FUNCTION pango_layout_get_tabs ##### -->
 <para>
 
 </para>
 
 @layout: 
-@tabs: 
+@Returns: 
 
 
 <!-- ##### ENUM PangoAlignment ##### -->
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index a8f37c15..7e5c4068 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -171,8 +171,10 @@ for text.
 
 @context: 
 @text: 
+@start_index: 
 @length: 
 @attrs: 
+@cached_iter: 
 @Returns: 
 <!-- # Unused Parameters # -->
 @lang_info: 
diff --git a/docs/tmpl/pango-unused.sgml b/docs/tmpl/pango-unused.sgml
deleted file mode 100644
index 60f815a4..00000000
--- a/docs/tmpl/pango-unused.sgml
+++ /dev/null
@@ -1,541 +0,0 @@
-<!-- ##### MACRO PANGO_LAYOUT_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-<!-- ##### FUNCTION pango_layout_line_x_to_cp ##### -->
-=======
-
-
-<!-- ##### FUNCTION pango_cfont_init ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-@line: 
-@x_pos: 
-@char_pos: 
-@trailing: <<<<<<< pango-unused.sgml
-
-<!-- ##### STRUCT PangoCFont ##### -->
-<para>
-The #PangoCFont structure is used to represent a single componenent
-of a font n a rendering-system-independent matter. A component of a
-font is an opaque object that makes sense only to the rendering
-system. A glyph (the #PangoGlyph structure) is stored as a #PangoCFont
-and a numeric glyph index.
-</para>
-<para>
-To create an implementation of a #PangoCFont,
-the rendering-system specific code should malloc
-a larger structure that contains a nested
-#PangoCFont, fill in the klass member of
-the nested #PangoCFont with a pointer to
-a appropriate #PangoCFontClass, then call
-pango_cfont_init() on the structure.
-</para>
-<para>
-The #PangoCFont structure contains one member
-that may be accessed by derived classes:
-
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
-<tbody>
->>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-</para>
-
-@font: 
-
-<!-- ##### FUNCTION pango_context_unref ##### -->
-<para>
-
-</para>
-
-@context: 
-
-<!-- ##### FUNCTION pango_font_get_data ##### -->
-<para>
-
-</para>
-
-@font: 
-@key: 
-@Returns: 
-
-<!-- ##### FUNCTION pango_layout_ref ##### -->
-<para>
-
-</para>
-
-@layout: 
-
-<!-- ##### FUNCTION pango_attribute_register_type ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:Title ##### -->
-X Rendering
-=======
-
-
-<!-- ##### FUNCTION pango_cfont_ref ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@coverage: =======
-@font: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### FUNCTION pango_layout_set_first_line_width ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@string: =======
-@layout: 
-@width: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### FUNCTION pango_x_extents ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@font: 
-@xlfd: 
-@Returns: =======
-@font: 
-@glyphs: 
-@lbearing: 
-@rbearing: 
-@width: 
-@ascent: 
-@descent: 
-@logical_ascent: 
-@logical_descent: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### MACRO PANGO_IS_LAYOUT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### FUNCTION pango_context_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION pango_coverage_destroy ##### -->
-<para>
->>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-=======
-</para>
->>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-
-<!-- ##### FUNCTION pango_cp_to_x ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@text: 
-@length: 
-@analysis: 
-@glyphs: 
-@x_pos: 
-@char_pos: 
-@trailing: 
-
-<!-- ##### FUNCTION pango_font_init ##### -->
-<para>
-
-</para>
-
-@font: 
-
-<!-- ##### FUNCTION pango_layout_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION pango_x_list_cfonts ##### -->
-<para>
-
-</para>
-
-@font: 
-@charsets: 
-@n_charsets: 
-@xlfds: 
-@n_xlfds: 
-
-<!-- ##### FUNCTION pango_font_set_data ##### -->
-<para>
-
-</para>
-
-@font: 
-@key: 
-@data: 
-@destroy_func: 
-
-<!-- ##### FUNCTION g_glyph_string_set_size ##### -->
-<para>
-
-</para>
-
-@string: 
-@new_len: 
-
-<!-- ##### FUNCTION pango_x_find_cfont ##### -->
-<para>
-
-</para>
-
-@font: 
-@charset: 
-@Returns: 
-
-<!-- ##### FUNCTION pango_font_map_init ##### -->
-<para>
-
-</para>
-
-@fontmap: 
-
-<!-- ##### MACRO PANGO_CONTEXT ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### FUNCTION g_glyph_string_free ##### -->
-<para>
-
-</para>
-
-@string: 
-
-<!-- ##### FUNCTION pango_layout_cp_to_line_x ##### -->
-<para>
-
-</para>
-
-@layout: 
-@char_pos: 
-@trailing: 
-@line: 
-@x_pos: 
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:Short_Description ##### -->
-Functions for rendering and measuring glyphs on
-the X Window system.
-
-
-<!-- ##### FUNCTION pango_context_get_size ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-<!-- ##### FUNCTION pango_font_map_ref ##### -->
-<para>
-
-</para>
-
-@fontmap: 
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT PangoContextClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION pango_font_ref ##### -->
-<para>
-
-</para>
-
-@font: 
-
-<!-- ##### FUNCTION pango_x_to_cp ##### -->
-=======
-
-@coverage: 
-
-<!-- ##### STRUCT PangoLayoutClass ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO PANGO_IS_LAYOUT ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### FUNCTION pango_font_map_unref ##### -->
-<para>
-
-</para>
-
-@fontmap: 
-
-<!-- ##### FUNCTION pango_font_unref ##### -->
-<para>
-
-</para>
-
-@font: 
-
-<!-- ##### FUNCTION pango_x_xlfd_get_ranges ##### -->
-=======
-
-
-<!-- ##### FUNCTION pango_context_set_size ##### -->
-<para>
-
-</para>
-
-@context: 
-@size: =======
-@text: 
-@length: 
-@analysis: 
-@glyphs: 
-@char_pos: 
-@trailing: 
-@x_pos: >>>>>>> 1.8
-
-<!-- ##### FUNCTION pango_x_glyph_extents ##### -->
-<para>
-
-</para>
-
-@font: 
-@glyph: 
-@lbearing: 
-@rbearing: 
-@width: 
-@ascent: 
-@descent: 
-@logical_ascent: 
-@logical_descent: 
-
-<!-- ##### TYPEDEF PangoGlyphIndex ##### -->
-<para>
-The #PangoGlyphIndex type is an integral type used to store glyph
-indices.
-</para>
-
-
-<!-- ##### SECTION ./tmpl/pango-x.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO PANGO_LAYOUT ##### -->
-<para>
-
-</para>
-
-@object: 
-
-<!-- ##### FUNCTION pango_cfont_unref ##### -->
->>>>>>> 1.8
-<para>
-
-</para>
-
-<<<<<<< pango-unused.sgml
-
-@font: 
-@xlfd: 
-@ranges: 
-@n_ranges: 
-@Returns: =======
-@font: >>>>>>> 1.8
-
-<<<<<<< pango-unused.sgml
-
-<!-- ##### FUNCTION pango_context_get_data ##### -->
-<para>
-
-</para>
-
-@context: 
-@key: 
-@Returns: 
-
-<!-- ##### MACRO PANGO_CONTEXT_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-<!-- ##### MACRO PANGO_IS_CONTEXT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### FUNCTION pango_x_load_xlfd ##### -->
-<para>
-
-</para>
-
-@font: 
-@xlfd: 
-@Returns: 
-
-<!-- ##### MACRO PANGO_TYPE_LAYOUT ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT PangoXCFont ##### -->
-<para>
-The PangoXCFont represents a component of a
-composite font for the X window system. It
-has the following publically accessible fields:
-
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
-<tbody>
-
-<row>
-<entry><structname>Display</structname> *display;</entry>
-<entry>the X Display for which this font component was created.</entry>
-</row>
-
-<row>
-<entry><structname>XFontStruct</structname> *font_struct;</entry>
-<entry>the X font information for the corresponding X font.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
-</para>
-
-@display: 
-@font_struct: 
-
-<!-- ##### MACRO PANGO_LAYOUT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### FUNCTION pango_layout_unref ##### -->
-<para>
-
-</para>
-
-@layout: 
-
-<!-- ##### MACRO PANGO_CONTEXT_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-<!-- ##### FUNCTION pango_context_set_data ##### -->
-<para>
-
-</para>
-
-@context: 
-@key: 
-@data: 
-@destroy_func: 
-
-<!-- ##### MACRO PANGO_TYPE_CONTEXT ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION g_glyph_string_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-<!-- ##### FUNCTION pango_context_ref ##### -->
-<para>
-
-</para>
-
-@context: 
-
-<!-- ##### STRUCT PangoCFontClass ##### -->
-<para>
-The PangoCFontClass structure contains the virtual
-functions for an implementation of a a PangoCFont.
-
-It contains the following member:
-
-<informaltable pgwide=1 frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"><colspec colwidth="8*">
-<tbody>
-
-<row>
-<entry>void (*destroy) (#PangoFont *font);</entry>
-<entry>a function to free the font structure and associated resources.</entry>
-</row>
-</tbody></tgroup></informaltable>
-</para>
-
-
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