From 678d2655f946c36557bfd23e68aa65a57b9dead7 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 5 Jan 2005 16:36:19 +0000 Subject: [PATCH] Fix line-height and line-spacing docs. --- etc/NEWS | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index b1f29619a2a..7ecdea1367e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1830,7 +1830,7 @@ c-require-final-newline. That is a list of modes, and only those modes set require-final-newline. By default that's C, C++ and Objective-C. -The specified modes set require-final-newline based on +The specified modes set require-final-newline based on mode-require-final-newline, as usual. *** Format change for syntactic context elements. @@ -2619,7 +2619,7 @@ specified number of evenly sized slices (rows x columns). A newline may now have line-height and line-spacing text or overlay properties that control the height of the corresponding display row. -If the line-height property value is 0, the newline does not +If the line-height property value is t, the newline does not contribute to the height of the display row; instead the height of the newline glyph is reduced. Also, a line-spacing property on this newline is ignored. This can be used to tile small images or image @@ -2633,10 +2633,19 @@ If the line-height property value is a float, the minimum line height is calculated by multiplying the default frame line height by the given value. -If the line-height property value is a cons (RATIO . FACE), the +If the line-height property value is a cons (FACE . RATIO), the minimum line height is calculated as RATIO * height of named FACE. RATIO is int or float. If FACE is t, it specifies the current face. +If the line-height property value is a cons (nil . RATIO), the line +height is calculated as RATIO * actual height of the line's contents. + +If the line-height value is a cons (HEIGHT . TOTAL), HEIGHT specifies +the line height as described above, while TOTAL is any of the forms +described above and specifies the total height of the line, causing a +varying number of pixels to be inserted after the line to make it line +exactly that many pixels high. + If the line-spacing property value is an positive integer, the value is used as additional pixels to insert after the display line; this overrides the default frame line-spacing and any buffer local value of @@ -2645,11 +2654,6 @@ the line-spacing variable. If the line-spacing property may be a float or cons, the line spacing is calculated as specified above for the line-height property. -If the line-spacing value is a cons (total . SPACING) where SPACING is -any of the forms described above, the value of SPACING is used as the -total height of the line, i.e. a varying number of pixels are inserted -after each line to make each line exactly that many pixels high. - ** The buffer local line-spacing variable may now have a float value, which is used as a height relative to the default frame line height. -- 2.11.4.GIT