[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/valign 4af6efd 017/198: Support overlay image
From: |
Stefan Monnier |
Subject: |
[elpa] externals/valign 4af6efd 017/198: Support overlay image |
Date: |
Tue, 1 Dec 2020 18:19:07 -0500 (EST) |
branch: externals/valign
commit 4af6efd757abe0a55728572b88fc31df640cd7d8
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Support overlay image
* valign.el (valign--pixel-width-from-to): Also check for overlay.
---
valign.el | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/valign.el b/valign.el
index d24a83a..4b769d0 100644
--- a/valign.el
+++ b/valign.el
@@ -97,12 +97,23 @@ calculate images pixel width."
(while (< (point) to)
(let ((display (plist-get (text-properties-at (point))
'display)))
- ;; This is an image, add image width.
- (if (and (consp display) (eq (car display) 'image))
- (progn (setq width (+ width (car (image-size display t))))
- (goto-char
- (next-single-property-change (point) 'display)))
- ;; This is a normal character, add glyph width.
+ ;; 1) This is an overlay or text property image, add image
+ ;; width.
+ (if (and (setq ;; Overlay image?
+ display (or (cl-loop for ov in (overlays-at (point) t)
+ if (overlay-get ov 'display)
+ return (overlay-get ov 'display)
+ finally return nil)
+ ;; Text property image?
+ (plist-get (text-properties-at (point))
+ 'display)))
+ (consp display)
+ (eq (car display) 'image))
+ (progn
+ (setq width (+ width (car (image-size display t))))
+ (goto-char
+ (next-single-property-change (point) 'display)))
+ ;; 2) This is a normal character, add glyph width.
(setq width (+ width (valign--glyph-width-at-point)))
(forward-char)))))
width))
- [elpa] externals/valign 4146b5d 005/198: * valign.el (valign-table): Don’t align separator row if don’t exist., (continued)
- [elpa] externals/valign 4146b5d 005/198: * valign.el (valign-table): Don’t align separator row if don’t exist., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 9f2bc32 010/198: Add another separator row style., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 29bf04f 001/198: Init, Stefan Monnier, 2020/12/01
- [elpa] externals/valign a28b966 006/198: * valign.el (valign--cell-width): Fix symbol-not-found, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 8c05580 016/198: * valign.el (valign-table): Fix separator alignment., Stefan Monnier, 2020/12/01
- [elpa] externals/valign f8a4a38 013/198: Fix case for multiple separator rows, Stefan Monnier, 2020/12/01
- [elpa] externals/valign f0c030e 018/198: * valign.el (valign--pixel-width-from-to): Support invisible text., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 1d915f7 024/198: Merge pull request #1 from tumashu/master, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 954906d 028/198: Add more hooks, Stefan Monnier, 2020/12/01
- [elpa] externals/valign eb787e7 008/198: * table.png: Delete file., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 4af6efd 017/198: Support overlay image,
Stefan Monnier <=
- [elpa] externals/valign 25b75fc 015/198: Support Emacs 26, Stefan Monnier, 2020/12/01
- [elpa] externals/valign f4235e7 019/198: Add support for Org Agenda, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 586bba2 020/198: Fix package-lint and checkdoc warns, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 8618a44 021/198: Add valign-mode, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 9a9a4a1 022/198: Merge branch 'master' into master, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 15b1bff 031/198: * valign.el (valign-mode): Change docstring., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 62bfe1a 026/198: Minor change, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 22c6b7c 033/198: Update doc, Stefan Monnier, 2020/12/01
- [elpa] externals/valign fc4c812 044/198: * valign.el (valign-mode): Advice org-table-align instead., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 1e9e16b 045/198: * valign.el (valign--align-separator-row): New implementation for gfm-mode., Stefan Monnier, 2020/12/01