pango r2549 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Tue Jan 22 03:31:40 2008
New Revision: 2549
URL: http://svn.gnome.org/viewvc/pango?rev=2549&view=rev

Log:
2008-01-21  Behdad Esfahbod  <behdad gnome org>

        * pango/pango-layout.c (pango_layout_set_height()): Mark behavior as
        undefined if height is not -1 and ellipsize mode is
        PANGO_ELLIPSIZE_NONE.



Modified:
   trunk/ChangeLog
   trunk/pango/pango-layout.c

Modified: trunk/pango/pango-layout.c
==============================================================================
--- trunk/pango/pango-layout.c	(original)
+++ trunk/pango/pango-layout.c	Tue Jan 22 03:31:40 2008
@@ -392,15 +392,16 @@
  * of how small the height value is.  A value of zero will render exactly one
  * line for the entire layout.
  *
- * If @height if it is negative, it will be the maximum number of lines per
+ * If @height is negative, it will be the (negative of) maximum number of lines per
  * paragraph.  That is, the total number of lines shown may well be more than
  * this value if the layout contains multiple paragraphs of text.
  * The default value of -1 means that first line of each paragraph is ellipsized.
  *
- * Currently the height setting only has effect if a positive width is set on
+ * Height setting only has effect if a positive width is set on
  * @layout and ellipsization mode of @layout is not %PANGO_ELLIPSIZE_NONE.
- * This may change in the future.  To be on the safe side, set height to -1
- * in all cases that it shouldn't have any effect.
+ * The behavior is undefined if a height other than -1 is set and
+ * ellipsization mode is set to %PANGO_ELLIPSIZE_NONE, and may change in the
+ * future.
  *
  * Since: 1.20
  **/