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#67533: SVG images confound position pixel measurements Date: Thu, 30 Nov 2023 19:32:52 +0200 Message-ID: <83o7fbb0zf.fsf@gnu.org> References: <9B9C683E-B951-406E-98AA-32F4539B3FF7@gmail.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6690"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 67533@debbugs.gnu.org To: JD Smith Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Nov 30 18:34:16 2023 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 1r8kvX-0001TZ-Ug for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 30 Nov 2023 18:34:16 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8kvE-0002pA-TY; Thu, 30 Nov 2023 12:33:56 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8kvD-0002oy-2T for bug-gnu-emacs@gnu.org; Thu, 30 Nov 2023 12:33:55 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8kvC-0000qZ-QK for bug-gnu-emacs@gnu.org; Thu, 30 Nov 2023 12:33:54 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8kvK-00051W-Bx for bug-gnu-emacs@gnu.org; Thu, 30 Nov 2023 12:34: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, 30 Nov 2023 17:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67533 X-GNU-PR-Package: emacs Original-Received: via spool by 67533-submit@debbugs.gnu.org id=B67533.170136559319241 (code B ref 67533); Thu, 30 Nov 2023 17:34:02 +0000 Original-Received: (at 67533) by debbugs.gnu.org; 30 Nov 2023 17:33:13 +0000 Original-Received: from localhost ([127.0.0.1]:54437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8kuX-00050H-7g for submit@debbugs.gnu.org; Thu, 30 Nov 2023 12:33:13 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8kuV-000504-UT for 67533@debbugs.gnu.org; Thu, 30 Nov 2023 12:33:12 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8kuI-0000dE-7H; Thu, 30 Nov 2023 12:32:58 -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=vxIhGJ/0td33H7BwHdTmxayj6c+PxuykNm9IaeLj06Y=; b=kP7O5K2cM1fl pu2mWVPow1P+4owReK0vngUcJw0J/Uqwg1doUYyihvwFW0HQ/URhiJbquyVnRqg3/r0fpsMD0Dnzy dw0SW9lrxttDcJpkueDHaV2f0HV0jNieLpF8OIy3BbIRGNeQpq905Hq0i7dg3F4809YdIo23xtZpn VPtwez9qeCTY2CF4sANbvtJobVYcgVujPcPstjyj3OMpHjKenRJz3f3Hs9h1VR4lNNxzapZUf826U 2SMpNT3MqepWgrpLE5gcNL3mKIfOWU2XTBmbtqIMwufw/iEnYtMIdEAspZZqBkK7fjrMTBOB6Q/cp e/woKEFpHiRalxhZ2Cs0yA==; In-Reply-To: <9B9C683E-B951-406E-98AA-32F4539B3FF7@gmail.com> (message from JD Smith on Wed, 29 Nov 2023 15:31:43 -0500) 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:275290 Archived-At: > From: JD Smith > Date: Wed, 29 Nov 2023 15:31:43 -0500 > > ;;; test-svg-pixel-position --- test pixel position for SVG images > > ;;; This small code creates a buffer with two lines, the first of > ;;; which is long, and the second of which has an SVG image at start. > ;;; Line truncation is turned on. `window-text-pixel-size` returns > ;;; differing results depending on whether truncation is actually in > ;;; effect (alter the frame width to see this). > > ;;; Code: > (require 'svg) > (let ((buf "svg-pixel-demo") > (svg (svg-create 50 25))) > (svg-circle svg 25 25 25 :stroke-color "green") > (with-current-buffer (get-buffer-create buf) > (erase-buffer) > (insert "Pellentesque condimentum, magna ut suscipit hendrerit, ipsum augue ornare nulla, non luctus diam neque sit amet urna.\n") > (insert (propertize "THISISACIRCLE" 'display (svg-image svg))) > (insert " Aliquam posuere.\n") > (pop-to-buffer buf) > (goto-char (point-max)) > (forward-line -1) > (toggle-truncate-lines 1) > (message "PIXEL SIZE OF LINE ABOVE IMAGE: %S" > (window-text-pixel-size nil (cons (point) -1) (point) nil nil nil t)))) Does the patch below fix the issue? (It should fix the recipe you posted, but you hinted that this is just the simplest way of seeing a more general problem, so I wonder whether that more general problem is also fixed.) diff --git a/src/xdisp.c b/src/xdisp.c index eb38ebb..7cf3902 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11487,6 +11487,16 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to, it.max_descent = max (it.max_descent, it.descent); } } + else if (IT_CHARPOS (it) > end + && it.line_wrap == TRUNCATE + && it.current_x - it.first_visible_x >= it.last_visible_x) + { + /* If the display property at END is at the beginning of the + line, and the previous line was truncated, we are at END, + but it.current_y is not yet updated to reflect that. */ + it.current_y += max (it.max_ascent, it.ascent) + + max (it.max_descent, it.descent); + } } else bidi_unshelve_cache (it2data, true);