From: Timothy <tecosaur@gmail.com> To: Org Mode List <emacs-orgmode@gnu.org> Subject: Re: [PATCH] Date: Sun, 26 Sep 2021 20:14:40 +0800 [thread overview] Message-ID: <877df3edm6.fsf@gmail.com> (raw) In-Reply-To: <87fstreec8.fsf@gmail.com> [-- Attachment #1: Type: text/plain, Size: 222 bytes --] Hello again, > I’ve prepared a patch which implements this logic I've just noticed that I had (when x (if (floatp x) ..)) which is a bit silly, so I've removed the unnecessary when. Here's the updated patch. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-org-Display-proportional-image-widths.patch --] [-- Type: text/x-patch, Size: 4155 bytes --] From 2d8f151bb996e0159793b590baea50c530e3ed11 Mon Sep 17 00:00:00 2001 From: TEC <tec@tecosaur.com> Date: Fri, 24 Sep 2021 01:39:31 +0800 Subject: [PATCH] org: Display proportional image widths * lisp/org.el (org-display-inline-images): When the image width is given as a float less than 2, interpret the value as that portion of the text area width. This works well with cases such as "#+attr_latex: :width 0.6\linewidth" as this will now be interpreted as 60% of the text area width. The upper bound is set to 2 not 1, as more than 100% of the text width can be realistic, e.g. "1.2\linewidth" in LaTeX, but more than 200% seems unrealistic. --- lisp/org.el | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 66ca73d5e..1a1feda78 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16622,22 +16622,36 @@ (defun org-display-inline-images (&optional include-linked refresh beg end) (cond ((eq org-image-actual-width t) nil) ((listp org-image-actual-width) - (or - ;; First try to find a width among - ;; attributes associated to the paragraph - ;; containing link. - (pcase (org-element-lineage link '(paragraph)) - (`nil nil) - (p - (let* ((case-fold-search t) - (end (org-element-property :post-affiliated p)) - (re "^[ \t]*#\\+attr_.*?: +.*?:width +\\(\\S-+\\)")) - (when (org-with-point-at - (org-element-property :begin p) - (re-search-forward re end t)) - (string-to-number (match-string 1)))))) - ;; Otherwise, fall-back to provided number. - (car org-image-actual-width))) + (let ((width + (or + ;; First try to find a width among + ;; attributes associated to the paragraph + ;; containing link. + (pcase (org-element-lineage link '(paragraph)) + (`nil nil) + (par (let* ((case-fold-search t) + (end (org-element-property :post-affiliated par)) + (re "^[ \t]*#\\+attr_.*?: +.*?:width +\\(\\S-+\\)")) + (when (org-with-point-at + (org-element-property :begin par) + (re-search-forward re end t)) + (string-to-number (match-string 1))))))) + ;; Otherwise, fall-back to provided number. + (car org-image-actual-width)))) + (if (and (floatp width) (<= 0 width 2.0)) + ;; A float in [0,2] should be interpereted as this portion of + ;; the text width in the window. This works well with cases like + ;; #+attr_latex: :width 0.X\{line,page,column,etc.}width, + ;; as the "0.X" is pulled out as a float. We use 2 as the upper + ;; bound as cases such as 1.2\linewidth are feasible. + (round (* width + (window-pixel-width) + (/ (or (and (bound-and-true-p visual-fill-column-mode) + (or visual-fill-column-width auto-fill-function)) + (when auto-fill-function fill-column) + (window-text-width)) + (float (window-total-width))))) + width)) ((numberp org-image-actual-width) org-image-actual-width) (t nil))) -- 2.33.0
next prev parent reply other threads:[~2021-09-26 12:18 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-26 11:51 [PATCH] Timothy 2021-09-26 12:01 ` [PATCH] Timothy 2021-09-26 12:14 ` Timothy [this message] 2021-09-27 8:19 ` [PATCH] Bastien 2021-09-27 10:35 ` [PATCH] Timothy 2021-09-27 11:45 ` [PATCH] Bastien 2021-09-27 12:20 ` [PATCH] Timothy 2021-09-27 12:31 ` [PATCH] Bastien 2021-09-27 15:26 ` [PATCH] Bastien 2021-09-27 15:36 ` [PATCH] Timothy 2021-09-27 17:44 ` [PATCH] Bastien 2021-09-27 17:52 ` [PATCH] Timothy 2021-09-27 19:45 ` [PATCH] Bastien 2021-09-28 15:31 ` [PATCH] Bastien Guerry 2021-09-28 15:50 ` [PATCH] Timothy -- strict thread matches above, loose matches on Subject: below -- 2021-01-20 10:46 [PATCH] TEC 2021-04-28 3:38 ` [PATCH] Bastien 2021-04-28 3:53 ` [PATCH] Timothy 2021-04-28 6:36 ` [PATCH] Bastien 2021-04-28 6:33 ` [PATCH] Bastien 2011-07-13 14:13 [PATCH] Evgeny Boykov 2011-07-16 17:10 ` [PATCH] Bastien
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://www.orgmode.org/ * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=877df3edm6.fsf@gmail.com \ --to=tecosaur@gmail.com \ --cc=emacs-orgmode@gnu.org \ --subject='Re: [PATCH]' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).