From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#51821: 29.0.50; Suggest add variable or frame parameter: line-height Date: Thu, 18 Nov 2021 20:26:20 +0200 Message-ID: <83v90pwcab.fsf@gnu.org> References: <87bl2nhbyp.fsf@163.com> <83bl2nugao.fsf@gnu.org> <878rxq62qt.fsf@gnus.org> <83k0hatxjl.fsf@gnu.org> <875ysu2d18.fsf@gnus.org> <83y25pshaa.fsf@gnu.org> <874k8c8sg0.fsf@gnus.org> <83ilws16hj.fsf@gnu.org> <87wnl8qg8b.fsf@gnus.org> <83czn0123n.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22916"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 51821@debbugs.gnu.org To: tumashu@163.com, luangruo@yahoo.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Nov 18 19:27:15 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mnm7u-0005j6-4J for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 Nov 2021 19:27:14 +0100 Original-Received: from localhost ([::1]:37174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnm7t-0003e4-1e for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 18 Nov 2021 13:27:13 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:57102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnm7i-0003Xh-Qo for bug-gnu-emacs@gnu.org; Thu, 18 Nov 2021 13:27:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53842) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnm7i-0007X4-Do for bug-gnu-emacs@gnu.org; Thu, 18 Nov 2021 13:27:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnm7i-0001zp-92 for bug-gnu-emacs@gnu.org; Thu, 18 Nov 2021 13:27:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 18 Nov 2021 18:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51821 X-GNU-PR-Package: emacs Original-Received: via spool by 51821-submit@debbugs.gnu.org id=B51821.16372599937620 (code B ref 51821); Thu, 18 Nov 2021 18:27:02 +0000 Original-Received: (at 51821) by debbugs.gnu.org; 18 Nov 2021 18:26:33 +0000 Original-Received: from localhost ([127.0.0.1]:37155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnm7F-0001yq-B3 for submit@debbugs.gnu.org; Thu, 18 Nov 2021 13:26:33 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:56178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnm7A-0001yU-PO for 51821@debbugs.gnu.org; Thu, 18 Nov 2021 13:26:32 -0500 Original-Received: from [2001:470:142:3::e] (port=33462 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnm75-0007Mv-FB; Thu, 18 Nov 2021 13:26:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=+IWmo6RRSCO0mbAjfaHHmSBHAxo7GPoNzBThOvd6i/k=; b=HMFpMb8HrnKU MilTQVCZsIuo+RBzlWBR0uWraTtcwRFLxpecA7qi2Zd99xgVGhqTE7/CAnxC+sm4+nV+PsmbT8TiA m4GBueRGvy9EN8g6CCec1TTH6zhHLrWmXcQuJaQvU1Sk78cLwbbMSEFUNuDCI8Mi83TAfXOWLtmg5 UxcVws81Pm1jTp93Xsysm5Yw5b76opFLIWJXyWcMwoUyILdf40JjmG48sZ+NCPmsf+AGT1jwnX0oE YP6LrL2yButtOTmChpTkEIC1aEgVj7T+Qu+/v5knA03crjAxocitGCI2gNCvNkQIQRvsbmKYb/MlT biXABBoEVisAiJYNyGjT6g==; Original-Received: from [87.69.77.57] (port=1898 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnm75-0000qJ-0w; Thu, 18 Nov 2021 13:26:23 -0500 In-Reply-To: <83czn0123n.fsf@gnu.org> (message from Eli Zaretskii on Tue, 16 Nov 2021 18:45:16 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:220341 Archived-At: > Date: Tue, 16 Nov 2021 18:45:16 +0200 > From: Eli Zaretskii > Cc: tumashu@163.com, 51821@debbugs.gnu.org > > > From: Lars Ingebrigtsen > > Cc: tumashu@163.com, 51821@debbugs.gnu.org > > Date: Tue, 16 Nov 2021 16:20:52 +0100 > > > > > That shouldn't happen, normally. Emacs selects fonts of the same size > > > for a face. > > > > No, not really. Here's a trivial example: > > > > > > Note how the lines with jidanni are taller than the rest. > > OK, let me see what can be done about that. Please try the patch below. I have a very limited number of cases with which I can test it, so I think users of CJK scripts should say what they think. Basically, set the new variable line-height-factor to something like 1.2 (more if you enlarge the non-ASCII font to make double-width characters take close to 2 columns), and see if you get the desired effect. If this is what people want, I will install it and document it. diff --git a/src/window.c b/src/window.c index e801ff8..a368b6d 100644 --- a/src/window.c +++ b/src/window.c @@ -5246,7 +5246,10 @@ grow_mini_window (struct window *w, int delta) { struct frame *f = XFRAME (w->frame); int old_height = window_body_height (w, true); - int min_height = FRAME_LINE_HEIGHT (f); + int min_height = + FLOATP (Vline_height_factor) + ? FRAME_LINE_HEIGHT (f) * XFLOAT_DATA (Vline_height_factor) + : FRAME_LINE_HEIGHT (f); eassert (MINI_WINDOW_P (w)); @@ -5279,7 +5282,11 @@ grow_mini_window (struct window *w, int delta) shrink_mini_window (struct window *w) { struct frame *f = XFRAME (w->frame); - int delta = window_body_height (w, true) - FRAME_LINE_HEIGHT (f); + int min_line_height = + FLOATP (Vline_height_factor) + ? FRAME_LINE_HEIGHT (f) * XFLOAT_DATA (Vline_height_factor) + : FRAME_LINE_HEIGHT (f); + int delta = window_body_height (w, true) - min_line_height; eassert (MINI_WINDOW_P (w)); diff --git a/src/xdisp.c b/src/xdisp.c index ef49297..d1f4043 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22073,6 +22073,18 @@ append_space_for_newline (struct it *it, bool default_face_p) it->descent = it->override_descent; boff = it->override_boff; } + else + { + /* Enlarge the ascent to make the row higher by + line-height-factor if needed. */ + if (face == face->ascii_face && it->voffset == 0 + && FLOATP (Vline_height_factor)) + { + int enlarged_height = ((it->ascent + it->descent) + * XFLOAT_DATA (Vline_height_factor)); + it->ascent = enlarged_height - it->descent; + } + } if (EQ (height, Qt)) extra_line_spacing = 0; else @@ -30587,9 +30599,9 @@ gui_produce_glyphs (struct it *it) /* When no suitable font is found, display this character by the method specified in the first extra slot of Vglyphless_char_display. */ - Lisp_Object acronym = lookup_glyphless_char_display (-1, it); + Lisp_Object acronym = lookup_glyphless_char_display (-1, it); - eassert (it->what == IT_GLYPHLESS); + eassert (it->what == IT_GLYPHLESS); produce_glyphless_glyph (it, true, STRINGP (acronym) ? acronym : Qnil); goto done; @@ -30613,6 +30625,15 @@ gui_produce_glyphs (struct it *it) { it->ascent = FONT_BASE (font) + boff; it->descent = FONT_DESCENT (font) - boff; + /* If this glyph uses the ASCII face, enlarge the ascent + to make the row higher by line-height-factor. */ + if (face == face->ascii_face && it->voffset == 0 + && FLOATP (Vline_height_factor)) + { + int enlarged_height = ((it->ascent + it->descent) + * XFLOAT_DATA (Vline_height_factor)); + it->ascent = enlarged_height - it->descent; + } } if (get_char_glyph_code (it->char_to_display, font, &char2b)) @@ -30763,6 +30784,13 @@ gui_produce_glyphs (struct it *it) { it->ascent = FONT_BASE (font) + boff; it->descent = FONT_DESCENT (font) - boff; + if (face == face->ascii_face && it->voffset == 0 + && FLOATP (Vline_height_factor)) + { + int enlarged_height = ((it->ascent + it->descent) + * XFLOAT_DATA (Vline_height_factor)); + it->ascent = enlarged_height - it->descent; + } } } @@ -30886,6 +30914,13 @@ gui_produce_glyphs (struct it *it) { it->ascent = FONT_BASE (font) + boff; it->descent = FONT_DESCENT (font) - boff; + if (face == face->ascii_face && it->voffset == 0 + && FLOATP (Vline_height_factor)) + { + int enlarged_height = ((it->ascent + it->descent) + * XFLOAT_DATA (Vline_height_factor)); + it->ascent = enlarged_height - it->descent; + } } it->phys_ascent = it->ascent; it->phys_descent = it->descent; @@ -31243,6 +31278,24 @@ gui_produce_glyphs (struct it *it) if (it->glyph_row && (metrics.lbearing < 0 || metrics.rbearing > metrics.width)) it->glyph_row->contains_overlapping_glyphs_p = true; + if (it->voffset == 0 && FLOATP (Vline_height_factor)) + { + Lisp_Object font_object = LGSTRING_FONT (gstring); + struct font *gstring_font = XFONT_OBJECT (font_object); + + /* This is for when the grapheme cluster displays some + ligature using ASCII font: if the height is smaller + than line-height-factor says, enlarge the ascent. */ + if (face == face->ascii_face + && face->ascii_face->font == gstring_font) + { + int enlarged_height = + ((FONT_BASE (gstring_font) + FONT_DESCENT (gstring_font)) + * XFLOAT_DATA (Vline_height_factor)); + if (metrics.ascent + metrics.descent < enlarged_height) + metrics.ascent = enlarged_height - metrics.descent; + } + } it->ascent = it->phys_ascent = metrics.ascent; it->descent = it->phys_descent = metrics.descent; } @@ -35581,6 +35634,16 @@ syms_of_xdisp (void) mini-window frame's default font's height. */); Vmax_mini_window_height = make_float (0.25); + DEFVAR_LISP ("line-height-factor", Vline_height_factor, + doc: /* Factor for enlarging the height of lines that use the default font. +The value should be a float number greater than 1. It determines how +much will Emacs enlarge the height of a screen line that shows only +characters displayed with the default face's font for ASCII characters. +This is to avoid differences in height between lines that use the +ASCII font and those which use non-ASCII (for example, Chinese) +font, which is typically higher than the ASCII one. */); + Vline_height_factor = Qnil; + DEFVAR_LISP ("resize-mini-windows", Vresize_mini_windows, doc: /* How to resize mini-windows (the minibuffer and the echo area). A value of nil means don't automatically resize mini-windows.