Update

Thu Jul  6 15:16:28 2000  Owen Taylor  <otaylor@redhat.com>

	* docs/pango-sections.txt docs/tmpl/*: Update

7 files changed, 337 insertions, 157 deletions

diff --git a/docs/tmpl/coverage-maps.sgml b/docs/tmpl/coverage-maps.sgml
index 217c46b7..1793ab8d 100644
--- a/docs/tmpl/coverage-maps.sgml
+++ b/docs/tmpl/coverage-maps.sgml
@@ -55,6 +55,7 @@ point to #PangoCoverageLevel. It is an opaque structure with no public fields.
 </para>
 
 @coverage: 
+@Returns: 
 
 
 <!-- ##### FUNCTION pango_coverage_unref ##### -->
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index 762be79e..01007dd2 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -39,8 +39,8 @@ the characteristics of a font to load.
 </para>
 
 @PANGO_STYLE_NORMAL: 
-@PANGO_STYLE_OBLIQUE:
-@PANGO_STYLE_ITALIC:
+@PANGO_STYLE_OBLIQUE: 
+@PANGO_STYLE_ITALIC: 
 
 <!-- ##### ENUM PangoWeight ##### -->
 <para>
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index b5e8b81f..f099bdd9 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -28,6 +28,14 @@ for a screen, and points for a printer.) PANGO_SCALE is currently
 
 
 
+<!-- ##### MACRO PANGO_PIXELS ##### -->
+<para>
+
+</para>
+
+@d: 
+
+
 <!-- ##### STRUCT PangoRectangle ##### -->
 <para>
 The #PangoRectangle structure represents a rectangle. It is frequently
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index b0ee815f..f4b0fdc0 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -57,22 +57,6 @@ fields.
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_layout_ref ##### -->
-<para>
-
-</para>
-
-@layout: 
-
-
-<!-- ##### FUNCTION pango_layout_unref ##### -->
-<para>
-
-</para>
-
-@layout: 
-
-
 <!-- ##### FUNCTION pango_layout_get_context ##### -->
 <para>
 
@@ -109,6 +93,15 @@ fields.
 @attrs: 
 
 
+<!-- ##### FUNCTION pango_layout_set_font_description ##### -->
+<para>
+
+</para>
+
+@layout: 
+@desc: 
+
+
 <!-- ##### FUNCTION pango_layout_set_width ##### -->
 <para>
 
@@ -278,6 +271,36 @@ for partial lines.
 @logical_rect: 
 
 
+<!-- ##### FUNCTION pango_layout_get_pixel_extents ##### -->
+<para>
+
+</para>
+
+@layout: 
+@ink_rect: 
+@logical_rect: 
+
+
+<!-- ##### FUNCTION pango_layout_get_size ##### -->
+<para>
+
+</para>
+
+@layout: 
+@width: 
+@height: 
+
+
+<!-- ##### FUNCTION pango_layout_get_pixel_size ##### -->
+<para>
+
+</para>
+
+@layout: 
+@width: 
+@height: 
+
+
 <!-- ##### FUNCTION pango_layout_get_line_count ##### -->
 <para>
 
@@ -359,6 +382,16 @@ a #PangoLayoutLine.
 @logical_rect: 
 
 
+<!-- ##### FUNCTION pango_layout_line_get_pixel_extents ##### -->
+<para>
+
+</para>
+
+@layout_line: 
+@ink_rect: 
+@logical_rect: 
+
+
 <!-- ##### FUNCTION pango_layout_line_index_to_x ##### -->
 <para>
 
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index 2e54d922..a3458d59 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -221,43 +221,6 @@ for text.
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_context_ref ##### -->
-<para>
-
-</para>
-
-@context: 
-
-
-<!-- ##### FUNCTION pango_context_unref ##### -->
-<para>
-
-</para>
-
-@context: 
-
-
-<!-- ##### FUNCTION pango_context_get_data ##### -->
-<para>
-
-</para>
-
-@context: 
-@key: 
-@Returns: 
-
-
-<!-- ##### FUNCTION pango_context_set_data ##### -->
-<para>
-
-</para>
-
-@context: 
-@key: 
-@data: 
-@destroy_func: 
-
-
 <!-- ##### FUNCTION pango_context_add_font_map ##### -->
 <para>
 
diff --git a/docs/tmpl/pango-unused.sgml b/docs/tmpl/pango-unused.sgml
index d55e95f5..14e3d1d4 100644
--- a/docs/tmpl/pango-unused.sgml
+++ b/docs/tmpl/pango-unused.sgml
@@ -1,18 +1,13 @@
-<!-- ##### FUNCTION pango_layout_line_x_to_cp ##### -->
-=======
-
-
-<!-- ##### FUNCTION pango_font_ref ##### -->
+<!-- ##### MACRO PANGO_LAYOUT_GET_CLASS ##### -->
 <para>
 
 </para>
 
-@font: 
+@obj: 
 
-<!-- ##### FUNCTION pango_x_to_cp ##### -->
+<!-- ##### FUNCTION pango_layout_line_x_to_cp ##### -->
 =======
 
-@coverage: 
 
 <!-- ##### FUNCTION pango_cfont_init ##### -->
 >>>>>>> 1.8
@@ -56,19 +51,12 @@ that may be accessed by derived classes:
 
 @font: 
 
-<!-- ##### FUNCTION pango_font_map_unref ##### -->
+<!-- ##### FUNCTION pango_context_unref ##### -->
 <para>
 
 </para>
 
-@fontmap: 
-
-<!-- ##### FUNCTION pango_font_unref ##### -->
-<para>
-
-</para>
-
-@font: 
+@context: 
 
 <!-- ##### FUNCTION pango_font_get_data ##### -->
 <para>
@@ -79,46 +67,12 @@ that may be accessed by derived classes:
 @key: 
 @Returns: 
 
-<!-- ##### FUNCTION pango_x_xlfd_get_ranges ##### -->
-=======
-
-
-<!-- ##### FUNCTION pango_context_set_size ##### -->
+<!-- ##### FUNCTION pango_layout_ref ##### -->
 <para>
 
 </para>
 
-@context: 
-@size: =======
-@text: 
-@length: 
-@analysis: 
-@glyphs: 
-@char_pos: 
-@trailing: 
-@x_pos: >>>>>>> 1.8
-
-<!-- ##### TYPEDEF PangoGlyphIndex ##### -->
-<para>
-The #PangoGlyphIndex type is an integral type used to store glyph
-indices.
-</para>
-
-
-<!-- ##### FUNCTION pango_x_glyph_extents ##### -->
-<para>
-
-</para>
-
-@font: 
-@glyph: 
-@lbearing: 
-@rbearing: 
-@width: 
-@ascent: 
-@descent: 
-@logical_ascent: 
-@logical_descent: 
+@layout: 
 
 <!-- ##### FUNCTION pango_attribute_register_type ##### -->
 <para>
@@ -128,12 +82,6 @@ indices.
 @name: 
 @Returns: 
 
-<!-- ##### SECTION ./tmpl/pango-x.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### SECTION ./tmpl/pango-x.sgml:Title ##### -->
 X Rendering
 =======
@@ -152,23 +100,6 @@ X Rendering
 
 <<<<<<< pango-unused.sgml
 
-<!-- ##### 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_layout_set_first_line_width ##### -->
 >>>>>>> 1.8
 <para>
@@ -206,6 +137,20 @@ X Rendering
 
 <<<<<<< 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
@@ -241,25 +186,23 @@ X Rendering
 
 @font: 
 
-<!-- ##### FUNCTION pango_x_list_cfonts ##### -->
+<!-- ##### FUNCTION pango_layout_get_type ##### -->
 <para>
 
 </para>
 
-@font: 
-@charsets: 
-@n_charsets: 
-@xlfds: 
-@n_xlfds: 
+@Returns: 
 
-<!-- ##### FUNCTION pango_x_load_xlfd ##### -->
+<!-- ##### FUNCTION pango_x_list_cfonts ##### -->
 <para>
 
 </para>
 
 @font: 
-@xlfd: 
-@Returns: 
+@charsets: 
+@n_charsets: 
+@xlfds: 
+@n_xlfds: 
 
 <!-- ##### FUNCTION pango_font_set_data ##### -->
 <para>
@@ -295,6 +238,211 @@ X Rendering
 
 @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
+
+<!-- ##### TYPEDEF PangoGlyphIndex ##### -->
+<para>
+The #PangoGlyphIndex type is an integral type used to store glyph
+indices.
+</para>
+
+
+<!-- ##### FUNCTION pango_x_glyph_extents ##### -->
+<para>
+
+</para>
+
+@font: 
+@glyph: 
+@lbearing: 
+@rbearing: 
+@width: 
+@ascent: 
+@descent: 
+@logical_ascent: 
+@logical_descent: 
+
+<!-- ##### 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
@@ -321,56 +469,56 @@ has the following publically accessible fields:
 @display: 
 @font_struct: 
 
-<!-- ##### FUNCTION g_glyph_string_free ##### -->
+<!-- ##### MACRO PANGO_LAYOUT_CLASS ##### -->
 <para>
 
 </para>
 
-@string: 
+@klass: 
 
-<!-- ##### FUNCTION pango_layout_cp_to_line_x ##### -->
+<!-- ##### FUNCTION pango_layout_unref ##### -->
 <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.
+<!-- ##### MACRO PANGO_CONTEXT_CLASS ##### -->
+<para>
 
+</para>
 
-<!-- ##### FUNCTION pango_context_get_size ##### -->
+@klass: 
+
+<!-- ##### FUNCTION pango_context_set_data ##### -->
 <para>
 
 </para>
 
 @context: 
-@Returns: 
+@key: 
+@data: 
+@destroy_func: 
 
-<!-- ##### FUNCTION g_glyph_string_new ##### -->
+<!-- ##### MACRO PANGO_TYPE_CONTEXT ##### -->
 <para>
 
 </para>
 
-@Returns: 
 
-<!-- ##### FUNCTION pango_font_map_ref ##### -->
+<!-- ##### FUNCTION g_glyph_string_new ##### -->
 <para>
 
 </para>
 
-@fontmap: 
+@Returns: 
 
-<!-- ##### SECTION ./tmpl/pango-x.sgml:Long_Description ##### -->
+<!-- ##### FUNCTION pango_context_ref ##### -->
 <para>
 
 </para>
 
+@context: 
 
 <!-- ##### STRUCT PangoCFontClass ##### -->
 <para>
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 66f025d6..d274d388 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -320,6 +320,15 @@ for more than one paragraph of text.
 @list: 
 
 
+<!-- ##### FUNCTION pango_attr_list_copy ##### -->
+<para>
+
+</para>
+
+@list: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_attr_list_insert ##### -->
 <para>
 
@@ -329,6 +338,15 @@ for more than one paragraph of text.
 @attr: 
 
 
+<!-- ##### FUNCTION pango_attr_list_insert_before ##### -->
+<para>
+
+</para>
+
+@list: 
+@attr: 
+
+
 <!-- ##### FUNCTION pango_attr_list_change ##### -->
 <para>
 
@@ -359,6 +377,15 @@ attributes currently in effect can be queried.
 </para>
 
 
+<!-- ##### FUNCTION pango_attr_iterator_copy ##### -->
+<para>
+
+</para>
+
+@iterator: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_attr_iterator_next ##### -->
 <para>