Fix up doc comments not to have obvious errors that gtk-doc barfs on.

Sun Oct 29 01:27:39 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/pangoft2-fontcache.c pango/pangoft2.[ch]
	pango/pangowin32.h: Fix up doc comments not to
	have obvious errors that gtk-doc barfs on. Correct
	parameter descriptions still need to be filled in.

	* configure.in pango/docs/Makefile.am: upgrade to
	have a real install rule, etc.

	* pango/docs/pango-sections.txt: Add various missing
	functions.

4 files changed, 22 insertions, 9 deletions

diff --git a/pango/pangoft2-fontcache.c b/pango/pangoft2-fontcache.c
index fa58adbe..34e5af94 100644
--- a/pango/pangoft2-fontcache.c
+++ b/pango/pangoft2-fontcache.c
@@ -130,6 +130,7 @@ oa_equal (gconstpointer v1,
 
 /**
  * pango_ft2_font_cache_new:
+ * @library:
  * 
  * Create a font cache.
  * 
@@ -173,6 +174,8 @@ cache_entry_unref (PangoFT2FontCache *cache,
 /**
  * pango_ft2_font_cache_load:
  * @cache: a #PangoFT2FontCache
+ * @args: 
+ * @face_index:
  * 
  * Load a #FT_Face from #FT_Open_Args and a face index. The
  * result may be newly loaded, or it may have been previously
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 7e9b7540..589e8826 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -208,11 +208,16 @@ pango_ft2_font_class_init (PangoFT2FontClass *class)
 
 /**
  * pango_ft2_load_font:
- *
+ * @fontmap: a #PangoFontmap
+ * @open_args: parameters that control loading
+ * @face_indices: 
+ * @n_fonts: 
+ * @size: 
+ * 
  * Loads a logical font based on XXX
- *
- * Returns a new #PangoFont
- */
+ * 
+ * Return value: a new #PangoFont
+ **/
 PangoFont *
 pango_ft2_load_font (PangoFontMap  *fontmap,
 		     FT_Open_Args **open_args,
@@ -251,7 +256,6 @@ pango_ft2_load_font (PangoFontMap  *fontmap,
  
 /**
  * pango_ft2_render:
- *
  * @bitmap:  the FreeType2 bitmap onto which draw the string
  * @font:    the font in which to draw the string
  * @glyphs:  the glyph string to draw
@@ -259,7 +263,7 @@ pango_ft2_load_font (PangoFontMap  *fontmap,
  * @y:       the y position of baseline (in pixels)
  *
  * Render a PangoGlyphString onto a FreeType2 bitmap
- */
+ **/
 void 
 pango_ft2_render (FT_Bitmap        *bitmap,
 		  PangoFont        *font,
@@ -710,7 +714,10 @@ pango_ft2_font_get_metrics (PangoFont        *font,
 /**
  * pango_ft2_n_subfonts:
  * @font: a PangoFont
+ *
  * Returns number of subfonts in a PangoFT2Font.
+ *
+ * Return value: number of subfonts in @font
  **/
 int
 pango_ft2_n_subfonts (PangoFont *font)
@@ -796,6 +803,7 @@ pango_ft2_get_coverage (PangoFont  *font,
 /**
  * pango_ft2_font_subfont_open_args:
  * @font: a #PangoFont which must be from the FT2 backend
+ * @subfont_id: the id of a subfont within the font
  * @open_args: pointer where to store the #FT_Open_Args for this subfont
  * @face_index: pointer where to store the face index for this subfont
  * 
@@ -928,6 +936,7 @@ pango_ft2_get_unknown_glyph (PangoFont *font)
 
 /**
  * pango_ft2_render_layout_line:
+ * @bitmap:    a FT_Bitmap to render the line onto
  * @line:      a #PangoLayoutLine
  * @x:         the x position of start of string (in pixels)
  * @y:         the y position of baseline (in pixels)
@@ -1012,6 +1021,7 @@ pango_ft2_render_layout_line (FT_Bitmap       *bitmap,
 
 /**
  * pango_ft2_render_layout:
+ * @bitmap:    a FT_Bitmap to render the line onto
  * @layout:    a #PangoLayout
  * @x:         the X position of the left of the layout (in pixels)
  * @y:         the Y position of the top of the layout (in pixels)
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index ededcbc9..afed7497 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -38,7 +38,7 @@ extern "C" {
 PangoContext  *pango_ft2_get_context        (void);
 
 PangoFont     *pango_ft2_load_font          (PangoFontMap     *fontmap,
-					     FT_Open_Args    **args,
+					     FT_Open_Args    **open_args,
 					     FT_Long	      *face_indices,
 					     int               n_fonts,
 					     int               size);
diff --git a/pango/pangowin32.h b/pango/pangowin32.h
index 64275185..ccdda527 100644
--- a/pango/pangowin32.h
+++ b/pango/pangowin32.h
@@ -38,7 +38,7 @@ extern "C" {
  */
 PangoContext * pango_win32_get_context        (void);
 
-PangoFont *    pango_win32_load_font          (LOGFONT          *lfp,
+PangoFont *    pango_win32_load_font          (LOGFONT          *lfps,
 					       int               n_fonts);
 void           pango_win32_render             (HDC               hdc,
 					       PangoFont        *font,
@@ -164,7 +164,7 @@ PangoWin32FontCache *pango_win32_font_cache_new          (void);
 void                 pango_win32_font_cache_free         (PangoWin32FontCache *cache);
  
 HFONT                pango_win32_font_cache_load         (PangoWin32FontCache *cache,
-						          const LOGFONT       *lfp);
+						          const LOGFONT       *logfont);
 void                 pango_win32_font_cache_unload       (PangoWin32FontCache *cache,
 						     	  HFONT                hfont);