From: Karthik Chikmagalur <karthikchikmagalur@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Justify/align image previews in org-mode
Date: Sun, 17 Dec 2023 13:19:00 -0800 [thread overview]
Message-ID: <877clc34u3.fsf@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1023 bytes --]
Hi,
This patch allows image link previews in Org to be left-aligned, centered or right-aligned in the Emacs window. "Inline" images that are surrounded by text are unaffected. Here is an example of what this looks like:
Image: https://abode.karthinks.com/share/org-image-align.png
The alignment is persistent as the window (or frame) is resized:
Video demo: https://abode.karthinks.com/share/org-image-align-demo.mp4
Alignment can be set globally for all image previews using the (new) user option `org-image-align'. It can be set locally for each image link using the `:align' parameter of the `#+attr_org' affiliated keyword, for example:
#+attr_org: :width 400px :align center
Allowed values for both settings are `center', `justify' and `right'. Center and justify have the same effect, and a value of `left', while not an error, does nothing since this is the default behavior.
This patch does not update org-manual.org since it is a work in progress. Please let me know if you have suggestions.
Karthik
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-image-align.patch --]
[-- Type: text/x-patch, Size: 4413 bytes --]
diff --git a/lisp/org.el b/lisp/org.el
index 30a4e7aef..2b82277a7 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15673,6 +15673,25 @@ cache Display remote images, and open them in separate buffers
(const :tag "Display and silently update remote images" cache))
:safe #'symbolp)
+(defcustom org-image-align nil
+ "How to align images previewed using `org-display-inline-images'.
+
+Only stand-alone image links are affected by this setting. These
+are links without surrounding text.
+
+Possible values of this option are:
+
+nil Insert image at specified position (same as left-alignment).
+center Center image previews.
+right Right-align image previews."
+ :group 'org-appearance
+ :package-version '(Org . "9.7")
+ :type '(choice
+ (const :tag "Don\\='t align image previews" nil)
+ (const :tag "Center image previews" center)
+ (const :tag "Right align image previews" right))
+ :safe #'symbolp)
+
(defun org--create-inline-image (file width)
"Create image located at FILE, or return nil.
WIDTH is the width of the image. The image may not be created
@@ -15807,7 +15826,8 @@ buffer boundaries with possible narrowing."
(when file (setq file (substitute-in-file-name file)))
(when (and file (file-exists-p file))
(let ((width (org-display-inline-image--width link))
- (old (get-char-property-and-overlay
+ (align (org-image--align link))
+ (old (get-char-property-and-overlay
(org-element-begin link)
'org-image-overlay)))
(if (and (car-safe old) refresh)
@@ -15833,6 +15853,16 @@ buffer boundaries with possible narrowing."
(list 'org-display-inline-remove-overlay))
(when (boundp 'image-map)
(overlay-put ov 'keymap image-map))
+ (when align
+ (overlay-put
+ ov 'before-string
+ (propertize
+ " " 'face 'default
+ 'display
+ (pcase align
+ ((or 'center 'justify)
+ `(space :align-to (- center (0.5 . (,width)))))
+ ('right `(space :align-to (- right (,width))))))))
(push ov org-inline-image-overlays))))))))))))))))
(defvar visual-fill-column-width) ; Silence compiler warning
@@ -15894,6 +15924,37 @@ buffer boundaries with possible narrowing."
org-image-actual-width)
(t nil))))
+(defun org-image--align (link)
+ "Determine the alignment of the image link.
+
+This is controlled globally by the option `org-image-align', and
+per image by the value of `:align' in the affiliated keyword
+`#+attr_org'.
+
+The result is one of the symbols center, justify or right. The
+first two will cause the image preview to be centered, the last
+will cause it to be right-aligned. A return value of nil implies
+no special alignment -- the image preview is overlaid on the link
+exactly where it appears in the buffer."
+ (let ((par (org-element-lineage link 'paragraph)))
+ ;; Only apply when image is not surrounded by paragraph text:
+ (when (and (= (org-element-property :begin link)
+ (org-element-property :contents-begin par))
+ (<= (- (org-element-property :contents-end par)
+ (org-element-property :end link))
+ 1)) ;account for trailing newline
+ (save-match-data
+ ;; Look for a valid :align keyword (left, center, justify or right)
+ (if-let* ((attr-org (car-safe (org-element-property :attr_org par)))
+ (_ (string-match ":align[[:space:]]+\\(\\w+\\)" attr-org))
+ (attr-align (car-safe
+ (memq (intern (match-string 1 attr-org))
+ '(left center justify right)))))
+ (unless (eq attr-align 'left) attr-align)
+ ;; No image-specific keyword, check global alignment property
+ (when (memq org-image-align '(center justify right))
+ org-image-align))))))
+
(defun org-display-inline-remove-overlay (ov after _beg _end &optional _len)
"Remove inline-display overlay if a corresponding region is modified."
(when (and ov after)
next reply other threads:[~2023-12-17 21:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-17 21:19 Karthik Chikmagalur [this message]
2023-12-18 9:19 ` [PATCH] Justify/align image previews in org-mode Karthik Chikmagalur
2023-12-18 12:47 ` Ihor Radchenko
2023-12-18 16:49 ` Karthik Chikmagalur
2023-12-18 17:07 ` Ihor Radchenko
2023-12-18 20:18 ` Karthik Chikmagalur
2023-12-19 2:25 ` Karthik Chikmagalur
2023-12-19 11:44 ` Ihor Radchenko
2023-12-19 19:05 ` Karthik Chikmagalur
2023-12-21 13:42 ` Ihor Radchenko
2023-12-19 11:56 ` Ihor Radchenko
2023-12-25 8:38 ` Bastien Guerry
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=877clc34u3.fsf@gmail.com \
--to=karthikchikmagalur@gmail.com \
--cc=emacs-orgmode@gnu.org \
/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).