[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lispref/text.texi
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lispref/text.texi |
Date: |
Tue, 28 Sep 2004 11:36:48 -0400 |
Index: emacs/lispref/text.texi
diff -c emacs/lispref/text.texi:1.76 emacs/lispref/text.texi:1.77
*** emacs/lispref/text.texi:1.76 Sat Sep 25 07:19:34 2004
--- emacs/lispref/text.texi Tue Sep 28 15:24:43 2004
***************
*** 2989,3000 ****
@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}.
If @var{line-spacing} is a positive integer, the value specifies
additional vertical space, below the display line, in pixels.
--- 2989,2999 ----
@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 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,3029 ****
@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"?
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 a positive integer, the value specifies the
minimum line height in pixels. The line's ascent height is
--- 3011,3023 ----
@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 display line ending in that newline.
We will call the property value @var{line-height}.
! 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