From 4676d6f34d22d9f5575574f76b59a6ba32cd4e1d Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 28 Sep 2004 15:25:12 +0000 Subject: [PATCH] (Special Properties): Clarify line-spacing and line-height. --- lispref/ChangeLog | 6 ++++++ lispref/text.texi | 26 ++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 5fc2af015a4..8c25fe6c531 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,9 @@ +2004-09-28 Richard M. Stallman + + * text.texi (Special Properties): Clarify line-spacing and line-height. + + * searching.texi (Regexp Search): Add looking-back. + 2004-09-25 Luc Teirlinck * display.texi: Correct typos. diff --git a/lispref/text.texi b/lispref/text.texi index 82763db496c..caa3f21b7b1 100644 --- a/lispref/text.texi +++ b/lispref/text.texi @@ -2989,12 +2989,11 @@ for possible pointer shapes. @item line-spacing @kindex line-spacing @r{(text property)} -A newline can have a @code{line-spacing} text or overlay property -that controls the height of the corresponding display line. -@c ??? Which display line is "corresponding"? -The @code{line-spacing} property overrides the default frame line -spacing and the buffer local @code{line-spacing} variable. We will -call the property value @var{line-spacing}. +A newline can have a @code{line-spacing} text or overlay property that +controls the height of the display line ending with that newline. The +property value overrides the default frame line spacing and the buffer +local @code{line-spacing} variable. We will call the property value +@var{line-spacing}. If @var{line-spacing} is a positive integer, the value specifies additional vertical space, below the display line, in pixels. @@ -3012,18 +3011,13 @@ is equivalent to using the @code{line-height} property. @item line-height @kindex line-height @r{(text property)} A newline can have a @code{line-height} text or overlay property that -controls the total height of the corresponding display line. -@c ??? Which display line is "corresponding"? +controls the total height of the display line ending in that newline. We will call the property value @var{line-height}. -If @var{line-height} is 0, the newline does not contribute to the -height of the display row; instead the height of the newline glyph is -reduced. -@c ??? That is not clear. Reduced how much? -In that case, any @code{line-spacing} property on -this newline is ignored. This can be used to tile small images or -image slices without adding blank areas between the images. -@c ??? Precisely which of these features does ``this'' mean? +If @var{line-height} is 0, the height of the line is determined solely +from its contents; nothing is added. Any @code{line-spacing} property +on this newline is ignored. This case is useful for tiling small +images or image slices without adding blank areas between the images. If @var{line-height} is a positive integer, the value specifies the minimum line height in pixels. The line's ascent height is -- 2.39.2