aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2004-12-10 23:58:55 +0000
committerKim F. Storm2004-12-10 23:58:55 +0000
commita71fe68f4951f9de11d79b41e99c8d7938170cae (patch)
tree4e14ea1b309538fc330ed74c133b7323d47a938c
parentd45f9809f65cc01b8226ef093c357253f3be363f (diff)
downloademacs-a71fe68f4951f9de11d79b41e99c8d7938170cae.tar.gz
emacs-a71fe68f4951f9de11d79b41e99c8d7938170cae.zip
* text.texi (Special Properties): Just mention line-spacing and
line-height here, add xref to new "Line Height" node.
-rw-r--r--lispref/text.texi36
1 files changed, 2 insertions, 34 deletions
diff --git a/lispref/text.texi b/lispref/text.texi
index 55d931699bf..1daad58ee7f 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -3002,45 +3002,13 @@ for possible pointer shapes.
3002A newline can have a @code{line-spacing} text or overlay property that 3002A newline can have a @code{line-spacing} text or overlay property that
3003controls the height of the display line ending with that newline. The 3003controls the height of the display line ending with that newline. The
3004property value overrides the default frame line spacing and the buffer 3004property value overrides the default frame line spacing and the buffer
3005local @code{line-spacing} variable. We will call the property value 3005local @code{line-spacing} variable. @xref{Line Height}.
3006@var{line-spacing}.
3007
3008If @var{line-spacing} is a positive integer, the value specifies
3009additional vertical space, below the display line, in pixels.
3010
3011If @var{line-spacing} is a floating point number or cons, the
3012additional vertical space is the product of @var{line-spacing} and the
3013default frame line height.
3014
3015If the @var{line-spacing} value is a cons @code{(total .
3016@var{spacing})} where @var{spacing} is any of the forms described
3017above, the value of @var{spacing} specifies the total displayed height
3018of the line, regardless of the height of the characters in it. This
3019is equivalent to using the @code{line-height} property.
3020 3006
3021@item line-height 3007@item line-height
3022@kindex line-height @r{(text property)} 3008@kindex line-height @r{(text property)}
3023A newline can have a @code{line-height} text or overlay property that 3009A newline can have a @code{line-height} text or overlay property that
3024controls the total height of the display line ending in that newline. 3010controls the total height of the display line ending in that newline.
3025We will call the property value @var{line-height}. 3011@xref{Line Height}.
3026
3027If @var{line-height} is 0, the height of the line is determined solely
3028from its contents; nothing is added. Any @code{line-spacing} property
3029on this newline is ignored. This case is useful for tiling small
3030images or image slices without adding blank areas between the images.
3031
3032If @var{line-height} is a positive integer, the value specifies the
3033minimum line height in pixels. The line's ascent height is
3034increased as necessary to achieve the specified height.
3035
3036If @var{line-height} is a floating point number, the minimum line
3037height is the product of @var{line-height} and the default frame line
3038height.
3039
3040If @var{line-height} is a cons @code{(@var{ratio} . @var{face})}, the
3041minimum line height is calculated as @var{ratio} times the height of
3042face @var{face}. The @var{ratio} is an integer or a floating point
3043number. If @var{face} is @code{t}, it refers to the current face.
3044 3012
3045@item modification-hooks 3013@item modification-hooks
3046@cindex change hooks for a character 3014@cindex change hooks for a character