emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Björn Bidar" <bjorn.bidar@thaodan.de>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: Karthik Chikmagalur <karthikchikmagalur@gmail.com>,
	emacs-orgmode@gnu.org
Subject: Re: Link preview generation with new link preview property
Date: Fri, 20 Dec 2024 01:20:46 +0200	[thread overview]
Message-ID: <87msgrqmy9.fsf@> (raw)
In-Reply-To: <874j328aym.fsf@localhost> (Ihor Radchenko's message of "Tue, 17 Dec 2024 17:40:17 +0000")

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

Ihor Radchenko <yantar92@posteo.net> writes:

> Karthik Chikmagalur <karthikchikmagalur@gmail.com> writes:
>
>> ...
>> Considering this, it might be better to just split
>> `org-link-preview-file' into two public functions, where the "inside"
>> function accepts an image instead of a file.
>
> Agree.
> Would you be interested to create a patch?

Did you think of something like this?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-link-Split-link-preview-into-two-functions.patch --]
[-- Type: text/x-patch, Size: 2817 bytes --]

From a3c682a7d730b0ae9492407d080ba8549a19e02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= <bjorn.bidar@thaodan.de>
Date: Fri, 20 Dec 2024 01:00:46 +0200
Subject: [PATCH] org-link: Split link preview into two functions

* lisp/ol.el (org-link-preview-file,
org-link-preview-image-data): Split up the actual preview part into
a separate function.  The new preview function can be called by
:preview handler to display the image according to the correct alignment
for the link to be previewed.
---
 lisp/ol.el | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/lisp/ol.el b/lisp/ol.el
index 032610bad..dd6b07152 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -2177,27 +2177,34 @@ (defun org-link-preview-file (ov path link)
                 ((string-match-p (image-file-name-regexp) file))
                 ((file-exists-p file)))
       (let* ((width (org-display-inline-image--width link))
-	     (align (org-image--align link))
-             (image (org--create-inline-image file width)))
-        (when image            ; Add image to overlay
-	  ;; See bug#59902.  We cannot rely
-          ;; on Emacs to update image if the file
-          ;; has changed.
-          (image-flush image)
-	  (overlay-put ov 'display image)
-	  (overlay-put ov 'face 'default)
-	  (overlay-put ov 'keymap image-map)
-          (when align
-            (overlay-put
-             ov 'before-string
-             (propertize
-              " " 'face 'default
-              'display
-              (pcase align
-                ("center" `(space :align-to (- center (0.5 . ,image))))
-                ("right"  `(space :align-to (- right ,image)))))))
+             (image-data (org--create-inline-image file width)))
+        (when image-data
+	  (org-link-preview-image-data ov image-data link)
           t)))))
 
+(defun org-link-preview-image-data (ov image-data link)
+  "Display image data IMAGE-DATA in overlay OV for link.
+
+This intended to be used by functions which provide the :preview link property
+of links such as in `org-link-preview-file'"
+  (let ((align (org-image--align link)))
+    ;; See bug#59902.  We cannot rely
+    ;; on Emacs to update image if the file
+    ;; has changed.
+    (image-flush image-data)
+    (overlay-put ov 'display image-data)
+    (overlay-put ov 'face 'default)
+    (overlay-put ov 'keymap image-map)
+    (when align
+      (overlay-put
+       ov 'before-string
+       (propertize
+        " " 'face 'default
+        'display
+        (pcase align
+          ("center" `(space :align-to (- center (0.5 . ,image-data))))
+          ("right"  `(space :align-to (- right ,image-data)))))))))
+
 ;;;; "help" link type
 (defun org-link--open-help (path _)
   "Open a \"help\" type link.
-- 
2.45.2


  reply	other threads:[~2024-12-19 23:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <6755f138.0c0a0220.40388.51fbSMTPIN_ADDED_BROKEN@mx.google.com>
2024-12-13  5:49 ` Link preview generation with new link preview property Karthik Chikmagalur
2024-12-14  0:03   ` Björn Bidar
2024-12-14  7:04     ` Ihor Radchenko
2024-12-17  2:46       ` Björn Bidar
2024-12-17 17:39         ` Ihor Radchenko
2024-12-19 21:55           ` Björn Bidar
2024-12-17  3:42       ` Karthik Chikmagalur
2024-12-17 17:40         ` Ihor Radchenko
2024-12-19 23:20           ` Björn Bidar [this message]
2024-12-20  0:45           ` Karthik Chikmagalur
2024-12-18  6:21         ` stardiviner
2024-12-18  6:33           ` Karthik Chikmagalur
2024-12-19 23:26             ` Björn Bidar
2024-12-08 19:18 Björn Bidar

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=87msgrqmy9.fsf@ \
    --to=bjorn.bidar@thaodan.de \
    --cc=emacs-orgmode@gnu.org \
    --cc=karthikchikmagalur@gmail.com \
    --cc=yantar92@posteo.net \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public 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).