Updates for recent API changes.

Mon Apr 24 20:28:31 2000  Owen Taylor  <otaylor@redhat.com>

	* docs/**: Updates for recent API changes.

4 files changed, 139 insertions, 40 deletions

diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index 66a8dae3..b0ee815f 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -145,6 +145,24 @@ fields.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_layout_get_spacing ##### -->
+<para>
+
+</para>
+
+@layout: 
+@Returns: 
+
+
+<!-- ##### FUNCTION pango_layout_set_spacing ##### -->
+<para>
+
+</para>
+
+@layout: 
+@spacing: 
+
+
 <!-- ##### FUNCTION pango_layout_set_justify ##### -->
 <para>
 
@@ -226,6 +244,30 @@ for partial lines.
 @pos: 
 
 
+<!-- ##### FUNCTION pango_layout_get_cursor_pos ##### -->
+<para>
+
+</para>
+
+@layout: 
+@index: 
+@strong_pos: 
+@weak_pos: 
+
+
+<!-- ##### FUNCTION pango_layout_move_cursor_visually ##### -->
+<para>
+
+</para>
+
+@layout: 
+@old_index: 
+@old_trailing: 
+@direction: 
+@new_index: 
+@new_trailing: 
+
+
 <!-- ##### FUNCTION pango_layout_get_extents ##### -->
 <para>
 
@@ -337,6 +379,19 @@ a #PangoLayoutLine.
 @x_pos: 
 @index: 
 @trailing: 
+<!-- # Unused Parameters # -->
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_layout_line_get_x_ranges ##### -->
+<para>
+
+</para>
+
+@line: 
+@start_index: 
+@end_index: 
+@ranges: 
+@n_ranges: 
+
+
diff --git a/docs/tmpl/pango-unused.sgml b/docs/tmpl/pango-unused.sgml
index ff507979..a2882e7d 100644
--- a/docs/tmpl/pango-unused.sgml
+++ b/docs/tmpl/pango-unused.sgml
@@ -1,32 +1,22 @@
 <!-- ##### FUNCTION pango_layout_line_x_to_cp ##### -->
-<para>
-
-</para>
+=======
 
-@line: 
-@x_pos: 
-@char_pos: 
-@trailing: 
 
 <!-- ##### FUNCTION pango_x_to_cp ##### -->
-<para>
+=======
 
-</para>
-
-@text: 
-@length: 
-@analysis: 
-@glyphs: 
-@x_pos: 
-@char_pos: 
-@trailing: 
+@coverage: 
 
 <!-- ##### FUNCTION pango_cfont_init ##### -->
+>>>>>>> 1.8
 <para>
 
 </para>
 
-@font: 
+@line: 
+@x_pos: 
+@char_pos: 
+@trailing: <<<<<<< pango-unused.sgml
 
 <!-- ##### STRUCT PangoCFont ##### -->
 <para>
@@ -52,27 +42,16 @@ 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
 
-<row>
-<entry>#PangoCFontClass *klass;</entry>
-<entry>a pointer to the <firstterm>class structure</firstterm>
-       for this font.</entry>
-</row>
-</tbody></tgroup></informaltable>
+<<<<<<< pango-unused.sgml
 </para>
 
-@klass: 
+@font: 
 
 <!-- ##### FUNCTION pango_x_xlfd_get_ranges ##### -->
-<para>
+=======
 
-</para>
-
-@font: 
-@xlfd: 
-@ranges: 
-@n_ranges: 
-@Returns: 
 
 <!-- ##### FUNCTION pango_context_set_size ##### -->
 <para>
@@ -80,7 +59,14 @@ that may be accessed by derived classes:
 </para>
 
 @context: 
-@size: 
+@size: =======
+@text: 
+@length: 
+@analysis: 
+@glyphs: 
+@char_pos: 
+@trailing: 
+@x_pos: >>>>>>> 1.8
 
 <!-- ##### FUNCTION pango_x_glyph_extents ##### -->
 <para>
@@ -120,35 +106,64 @@ indices.
 
 <!-- ##### SECTION ./tmpl/pango-x.sgml:Title ##### -->
 X Rendering
+=======
 
 
 <!-- ##### FUNCTION pango_cfont_ref ##### -->
+>>>>>>> 1.8
 <para>
 
 </para>
 
-@font: 
+<<<<<<< pango-unused.sgml
+
+@coverage: =======
+@font: >>>>>>> 1.8
+
+<<<<<<< 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>
 
 </para>
 
+<<<<<<< pango-unused.sgml
+
+@string: =======
 @layout: 
-@width: 
+@width: >>>>>>> 1.8
+
+<<<<<<< pango-unused.sgml
 
 <!-- ##### FUNCTION pango_x_extents ##### -->
+>>>>>>> 1.8
 <para>
 
 </para>
 
+<<<<<<< pango-unused.sgml
+
+@font: 
+@xlfd: 
+@Returns: =======
 @font: 
 @glyphs: 
 @lbearing: 
@@ -157,27 +172,37 @@ X Rendering
 @ascent: 
 @descent: 
 @logical_ascent: 
-@logical_descent: 
+@logical_descent: >>>>>>> 1.8
+
+<<<<<<< pango-unused.sgml
 
 <!-- ##### FUNCTION pango_coverage_destroy ##### -->
 <para>
+>>>>>>> 1.8
 
+<<<<<<< pango-unused.sgml
+=======
 </para>
+>>>>>>> 1.8
+
+<<<<<<< pango-unused.sgml
 
-@coverage: 
 
 <!-- ##### FUNCTION pango_cp_to_x ##### -->
+>>>>>>> 1.8
 <para>
 
 </para>
 
+<<<<<<< pango-unused.sgml
+
 @text: 
 @length: 
 @analysis: 
 @glyphs: 
+@x_pos: 
 @char_pos: 
 @trailing: 
-@x_pos: 
 
 <!-- ##### FUNCTION pango_x_list_cfonts ##### -->
 <para>
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index 7430f77a..66f025d6 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -34,6 +34,7 @@ attribute is listed in parentheses after the description.
 @PANGO_ATTR_VARIANT: font variant (normal or small caps) (#PangoAttrInt)
 @PANGO_ATTR_STRETCH: font stretch (#PangoAttrInt)
 @PANGO_ATTR_SIZE: font size in 1000th's of a point (#PangoAttrInt)
+@PANGO_ATTR_FONT_DESC: 
 @PANGO_ATTR_FOREGROUND: foreground color (#PangoAttrColor)
 @PANGO_ATTR_BACKGROUND: background color (#PangoAttrColor)
 @PANGO_ATTR_UNDERLINE: whether the text has an underline (#PangoAttrInt)
@@ -96,6 +97,15 @@ a integer or enumeration value.
 @attr: the common portion of the attribute
 @value: the value of the attribute
 
+<!-- ##### STRUCT PangoAttrFontDesc ##### -->
+<para>
+The #PangoAttrFontDesc structure is used to store an attribute that
+sets all aspects of the font description at once.
+</para>
+
+@attr: the common portion of the attribute
+@desc: the font description which is the value of this attribute
+
 <!-- ##### FUNCTION pango_attr_type_register ##### -->
 <para>
 
@@ -195,6 +205,15 @@ a integer or enumeration value.
 @Returns: 
 
 
+<!-- ##### FUNCTION pango_attr_font_desc_new ##### -->
+<para>
+
+</para>
+
+@desc: 
+@Returns: 
+
+
 <!-- ##### FUNCTION pango_attr_foreground_new ##### -->
 <para>
 
diff --git a/docs/tmpl/x-rendering.sgml b/docs/tmpl/x-rendering.sgml
index 844e685e..32a83c4d 100644
--- a/docs/tmpl/x-rendering.sgml
+++ b/docs/tmpl/x-rendering.sgml
@@ -65,7 +65,7 @@ the corresponding PangoGetGCFunc. The function used here will
 typically retrieve information from the context with pango_context_set_data().
 </para>
 
-@context: the #PangoContext 
+@context: the #PangoContext
 @gc: the GC to free