* [PATCH] org.el: inline display of attached images in link descriptions
@ 2023-06-01 19:13 Steven Allen
2023-06-02 7:48 ` Ihor Radchenko
0 siblings, 1 reply; 3+ messages in thread
From: Steven Allen @ 2023-06-01 19:13 UTC (permalink / raw)
To: emacs-orgmode
* lisp/org.el (org-display-inline-images): inline display of attached
images in link descriptions.
Previously, `org-display-inline-images' only inlined images in link
descriptions when they were explicit "file:" links. This change adds
support for "attachment:" links. E.g.:
[[https://orgmode.org][attachment:emacs-screenshot.png]]
---
lisp/org.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 0e5740412..3e1b757c4 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16301,7 +16301,8 @@ defun org-create-formula-image
2. Its description consists in a single link of the previous
type. In this case, that link must be a well-formed plain
- or angle link, i.e., it must have an explicit \"file\" type.
+ or angle link, i.e., it must have an explicit \"file\" or
+ \"attachment\" type.
Equip each image with the key-map `image-map'.
@@ -16332,7 +16333,7 @@ defun org-create-formula-image
;; "file:" links. Also check link abbreviations since
;; some might expand to "file" links.
(file-types-re
- (format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?file:\\)"
+ (format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?\\(?:file\\|attachment\\):\\)"
(if (not link-abbrevs) ""
(concat "\\|" (regexp-opt link-abbrevs))))))
(while (re-search-forward file-types-re end t)
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] org.el: inline display of attached images in link descriptions
2023-06-01 19:13 [PATCH] org.el: inline display of attached images in link descriptions Steven Allen
@ 2023-06-02 7:48 ` Ihor Radchenko
2023-06-02 15:33 ` Steven Allen
0 siblings, 1 reply; 3+ messages in thread
From: Ihor Radchenko @ 2023-06-02 7:48 UTC (permalink / raw)
To: Steven Allen; +Cc: emacs-orgmode
Steven Allen <steven@stebalien.com> writes:
> * lisp/org.el (org-display-inline-images): inline display of attached
> images in link descriptions.
>
> Previously, `org-display-inline-images' only inlined images in link
> descriptions when they were explicit "file:" links. This change adds
> support for "attachment:" links. E.g.:
>
> [[https://orgmode.org][attachment:emacs-screenshot.png]]
Thanks for the patch, but it does not actually make Org display the
example link from the commit message.
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] org.el: inline display of attached images in link descriptions
2023-06-02 7:48 ` Ihor Radchenko
@ 2023-06-02 15:33 ` Steven Allen
0 siblings, 0 replies; 3+ messages in thread
From: Steven Allen @ 2023-06-02 15:33 UTC (permalink / raw)
To: Ihor Radchenko
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
You're right.... and now I have no idea what I was testing. I'm
apologize for that.
The attached patch should actually work this time. It's not great (setq
in a let), but anything else would likely be a much larger change.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: inline-image-attachement.patch --]
[-- Type: text/x-patch, Size: 2118 bytes --]
From 6ca24ca705fc3856c68957cfa50dfce77c9148c9 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Thu, 1 Jun 2023 11:49:19 -0700
Subject: [PATCH] org.el: inline display of attached images in link
descriptions
* lisp/org.el (org-display-inline-images): inline display of attached
images in link descriptions.
Previously, `org-display-inline-images' only inlined images in link
descriptions when they were explicit "file:" links. This change adds
support for "attachment:" links. E.g.:
[[https://orgmode.org][attachment:emacs-screenshot.png]]
---
lisp/org.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 0e5740412..405cae9a5 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16301,7 +16301,8 @@ defun org-create-formula-image
2. Its description consists in a single link of the previous
type. In this case, that link must be a well-formed plain
- or angle link, i.e., it must have an explicit \"file\" type.
+ or angle link, i.e., it must have an explicit \"file\" or
+ \"attachment\" type.
Equip each image with the key-map `image-map'.
@@ -16332,7 +16333,7 @@ defun org-create-formula-image
;; "file:" links. Also check link abbreviations since
;; some might expand to "file" links.
(file-types-re
- (format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?file:\\)"
+ (format "\\[\\[\\(?:file%s:\\|attachment:\\|[./~]\\)\\|\\]\\[\\(<?\\(?:file\\|attachment\\):\\)"
(if (not link-abbrevs) ""
(concat "\\|" (regexp-opt link-abbrevs))))))
(while (re-search-forward file-types-re end t)
@@ -16371,7 +16372,9 @@ defun org-create-formula-image
;; description.
(= (org-element-property :contents-end link)
(match-end 0))
- (match-string 2)))))))
+ (progn
+ (setq linktype (match-string 1))
+ (match-string 2))))))))
(when (and path (string-match-p file-extension-re path))
(let ((file (if (equal "attachment" linktype)
(progn
--
2.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-02 15:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-01 19:13 [PATCH] org.el: inline display of attached images in link descriptions Steven Allen
2023-06-02 7:48 ` Ihor Radchenko
2023-06-02 15:33 ` Steven Allen
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).