1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-06 05:52:32 -08:00

*** empty log message ***

This commit is contained in:
Gerd Moellmann 2000-05-02 20:12:37 +00:00
parent 1d18bc3a67
commit 576da55d72
3 changed files with 40 additions and 2 deletions

View file

@ -2273,8 +2273,17 @@ The following is a list of properties all image types share.
`:ascent ASCENT'
ASCENT must be a number in the range 0..100, and specifies the percentage
of the image's height to use for its ascent. Default is 50.
ASCENT must be a number in the range 0..100, or the symbol `center'.
If it is a number, it specifies the percentage of the image's height
to use for its ascent.
If not specified, ASCENT defaults to the value 50 which means that the
image will be centered with the base line of the row it appears in.
If ASCENT is `center' the image is vertically centered with text drawn
in the same face as the image. The point the image is aligned with is
the middle of the height of the face's font. That point is usually
different from the font's base line.
`:margin MARGIN'

View file

@ -1,5 +1,8 @@
2000-05-02 Gerd Moellmann <gerd@gnu.org>
* files.el (recover-session): Make directories as necessary
if they don't exist yet.
* calendar/cal-french.el
(french-calendar-multibyte-special-days-array)
(french-calendar-special-days-array): Change French text.

View file

@ -1,5 +1,31 @@
2000-05-02 Gerd Moellmann <gerd@gnu.org>
* xterm.h (struct face): Add forward declaration.
(struct image): Ditto.
(image_ascent): Add prototype.
* xterm.c (x_produce_image_glyph, x_draw_image_foreground)
(x_draw_image_relief, x_draw_image_foreground_1): Call function
image_ascent instead of using IMAGE_ASCENT.
* dispextern.h (DEFAULT_IMAGE_HEIGHT): New macro.
(IMAGE_ASCENT): Removed.
* xfns.c (Qcenter): New variable.
(enum image_value_type): Add IMAGE_ASCENT_VALUE.
(parse_image_spec): Handle IMAGE_ASCENT_VALUE.
(image_ascent): New function.
(lookup_image): Recognize `:ascent center'.
(xbm_format, xpm_format, pbm_format, png_format, jpeg_format)
(tiff_format, gif_format, gs_format): Use IMAGE_ASCENT_VALUE.
(xbm_load): Don't set image's ascent here.
(xbm_image_p, xpm_image_p, pbm_image_p, png_image_p)
(jpeg_image_p, tiff_image_p, gif_image_p, gs_image_p): Don't
check ascent values here.
(Fimagep, Flookup_image [GLYPH_DEBUG]: Removed.
(syms_of_xfns) [GLYPH_DEBUG]: Don't defsubr removed functions.
(syms_of_xfns): Initialize Qcenter.
* eval.c (Fsignal): If lisp_eval_depth or spepdl_size are near
to the limits, increase the limits.