From d17adb44478e516b207b25afc1d6e87d5d274c96 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 17 Apr 2001 01:49:07 +0000 Subject: Removed pango_justify(), since it has no implementation that I can find. 2001-04-16 Havoc Pennington * pango/pango-glyph.h: Removed pango_justify(), since it has no implementation that I can find. * pango/pango-attributes.c: docs * pango/pango-layout.c: docs --- pango/pango-attributes.c | 19 ++++++++++++++++++- pango/pango-glyph.h | 5 ----- pango/pango-layout.c | 22 ++++++++++++++++------ 3 files changed, 34 insertions(+), 12 deletions(-) (limited to 'pango') diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c index e8c7c731..6d5d5b90 100644 --- a/pango/pango-attributes.c +++ b/pango/pango-attributes.c @@ -1261,7 +1261,7 @@ pango_attr_iterator_next (PangoAttrIterator *iterator) } /** - * pango_attr_iterator_destroy: + * pango_attr_iterator_copy: * @iterator: a #PangoAttrIterator. * * Copy a #PangoAttrIterator @@ -1512,6 +1512,17 @@ pango_color_get_type (void) return our_type; } +/** + * pango_color_copy: + * @src: color to copy + * + * Creates a copy of @src, which should be freed with + * pango_color_free(). Primarily used by language bindings, + * not that useful otherwise (since colors can just be copied + * by assignment in C). + * + * Return value: an allocated #PangoColor + **/ PangoColor* pango_color_copy (const PangoColor *src) { @@ -1526,6 +1537,12 @@ pango_color_copy (const PangoColor *src) return ret; } +/** + * pango_color_free: + * @color: an allocated #PangoColor + * + * Frees a color allocated by pango_color_copy(). + **/ void pango_color_free (PangoColor *color) { diff --git a/pango/pango-glyph.h b/pango/pango-glyph.h index aefe833d..7cb3542e 100644 --- a/pango/pango-glyph.h +++ b/pango/pango-glyph.h @@ -118,11 +118,6 @@ void pango_glyph_string_x_to_index (PangoGlyphString *glyphs, int *index, int *trailing); -void pango_justify (PangoGlyphString *glyphs, - gint new_line_width, - gint min_kashida_width); - - /* Turn a string of characters into a string of glyphs */ void pango_shape (const gchar *text, diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 3a58860a..dc92dd8f 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -446,15 +446,15 @@ pango_layout_get_indent (PangoLayout *layout) } /** - * pango_layout_set_indent + * pango_layout_set_spacing: * @layout: a #PangoLayout. - * @indent: the amount of spacing + * @spacing: the amount of spacing * * Sets the amount of spacing between the lines of the layout. **/ void pango_layout_set_spacing (PangoLayout *layout, - int spacing) + int spacing) { g_return_if_fail (layout != NULL); @@ -508,7 +508,7 @@ pango_layout_set_attributes (PangoLayout *layout, * pango_layout_get_attributes: * @layout: a #PangoLayout * - * Returns the attribute list for the layout, if any + * Gets the attribute list for the layout, if any * * Return value: a #PangoAttrList **/ @@ -743,6 +743,16 @@ pango_layout_get_text (PangoLayout *layout) return layout->text; } +/** + * pango_layout_set_markup: + * @layout: a #PangoLayout + * @markup: marked-up text + * @length: length of marked-up text in bytes, or -1 + * + * Same as pango_layout_set_markup_with_accel(), but + * the markup text isn't scanned for accelerators. + * + **/ void pango_layout_set_markup (PangoLayout *layout, const char *markup, @@ -2814,8 +2824,8 @@ pango_layout_line_unref (PangoLayoutLine *line) * character within the text of the layout. If @x_pos is outside the line, * the start or end of the line will be stored at @index. * - * Return value: %FALSE if @x_pos was outside the line, %TRUE if inside - */ + * Returns: %FALSE if @x_pos was outside the line, %TRUE if inside + **/ gboolean pango_layout_line_x_to_index (PangoLayoutLine *line, int x_pos, -- cgit v1.2.1