diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-0 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 11 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 11 | ||||
-rw-r--r-- | docs/pango-sections.txt | 7 | ||||
-rw-r--r-- | docs/tmpl/main.sgml | 10 | ||||
-rw-r--r-- | pango/pango-attributes.c | 19 | ||||
-rw-r--r-- | pango/pango-glyph.h | 5 | ||||
-rw-r--r-- | pango/pango-layout.c | 22 |
12 files changed, 107 insertions, 33 deletions
@@ -1,3 +1,12 @@ +2001-04-16 Havoc Pennington <hp@pobox.com> + + * 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 + Mon Apr 16 19:20:12 2001 Owen Taylor <otaylor@redhat.com> * modules/tamil/tamil-x.c: Remove warning when using fallback @@ -34,7 +43,7 @@ Mon Apr 16 14:26:54 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am (EXTRA_DIST): Update to the latest version. - + 2001-04-14 Hans Breuer <hans@breuer.org> * pango/pangowin32-fontmap.c : instead of simply adding one diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index d8bb1b6b..fe224b62 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,12 @@ +2001-04-16 Havoc Pennington <hp@pobox.com> + + * 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 + Mon Apr 16 19:20:12 2001 Owen Taylor <otaylor@redhat.com> * modules/tamil/tamil-x.c: Remove warning when using fallback @@ -34,7 +43,7 @@ Mon Apr 16 14:26:54 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am (EXTRA_DIST): Update to the latest version. - + 2001-04-14 Hans Breuer <hans@breuer.org> * pango/pangowin32-fontmap.c : instead of simply adding one diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d8bb1b6b..fe224b62 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +2001-04-16 Havoc Pennington <hp@pobox.com> + + * 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 + Mon Apr 16 19:20:12 2001 Owen Taylor <otaylor@redhat.com> * modules/tamil/tamil-x.c: Remove warning when using fallback @@ -34,7 +43,7 @@ Mon Apr 16 14:26:54 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am (EXTRA_DIST): Update to the latest version. - + 2001-04-14 Hans Breuer <hans@breuer.org> * pango/pangowin32-fontmap.c : instead of simply adding one diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index d8bb1b6b..fe224b62 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,12 @@ +2001-04-16 Havoc Pennington <hp@pobox.com> + + * 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 + Mon Apr 16 19:20:12 2001 Owen Taylor <otaylor@redhat.com> * modules/tamil/tamil-x.c: Remove warning when using fallback @@ -34,7 +43,7 @@ Mon Apr 16 14:26:54 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am (EXTRA_DIST): Update to the latest version. - + 2001-04-14 Hans Breuer <hans@breuer.org> * pango/pangowin32-fontmap.c : instead of simply adding one diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d8bb1b6b..fe224b62 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +2001-04-16 Havoc Pennington <hp@pobox.com> + + * 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 + Mon Apr 16 19:20:12 2001 Owen Taylor <otaylor@redhat.com> * modules/tamil/tamil-x.c: Remove warning when using fallback @@ -34,7 +43,7 @@ Mon Apr 16 14:26:54 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am (EXTRA_DIST): Update to the latest version. - + 2001-04-14 Hans Breuer <hans@breuer.org> * pango/pangowin32-fontmap.c : instead of simply adding one diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d8bb1b6b..fe224b62 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +2001-04-16 Havoc Pennington <hp@pobox.com> + + * 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 + Mon Apr 16 19:20:12 2001 Owen Taylor <otaylor@redhat.com> * modules/tamil/tamil-x.c: Remove warning when using fallback @@ -34,7 +43,7 @@ Mon Apr 16 14:26:54 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am (EXTRA_DIST): Update to the latest version. - + 2001-04-14 Hans Breuer <hans@breuer.org> * pango/pangowin32-fontmap.c : instead of simply adding one diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d8bb1b6b..fe224b62 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +2001-04-16 Havoc Pennington <hp@pobox.com> + + * 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 + Mon Apr 16 19:20:12 2001 Owen Taylor <otaylor@redhat.com> * modules/tamil/tamil-x.c: Remove warning when using fallback @@ -34,7 +43,7 @@ Mon Apr 16 14:26:54 2001 Owen Taylor <otaylor@redhat.com> * docs/Makefile.am (EXTRA_DIST): Update to the latest version. - + 2001-04-14 Hans Breuer <hans@breuer.org> * pango/pangowin32-fontmap.c : instead of simply adding one diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt index 4e99aaa0..7591cbc5 100644 --- a/docs/pango-sections.txt +++ b/docs/pango-sections.txt @@ -44,7 +44,6 @@ pango_default_break PangoLogAttr <SUBSECTION> pango_shape -pango_justify <SUBSECTION Private> pango_direction_get_type @@ -221,10 +220,10 @@ pango_attr_iterator_get pango_attr_iterator_get_font pango_attr_iterator_destroy <SUBSECTION Private> -pango_attr_list_get_type pango_attr_type_get_type -pango_color_get_type +pango_attr_list_get_type pango_underline_get_type +pango_color_get_type </SECTION> <SECTION> @@ -339,8 +338,8 @@ PANGO_IS_LAYOUT PANGO_LAYOUT_CLASS PANGO_IS_LAYOUT_CLASS PANGO_LAYOUT_GET_CLASS -pango_wrap_mode_get_type pango_alignment_get_type +pango_wrap_mode_get_type </SECTION> <SECTION> diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml index c746f137..b4512b60 100644 --- a/docs/tmpl/main.sgml +++ b/docs/tmpl/main.sgml @@ -412,13 +412,3 @@ about the attributes of a single character. @font: -<!-- ##### FUNCTION pango_justify ##### --> -<para> - -</para> - -@glyphs: -@new_line_width: -@min_kashida_width: - - 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, |