[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/valign 6a4a91b 159/198: Add a case for empty cells
From: |
Stefan Monnier |
Subject: |
[elpa] externals/valign 6a4a91b 159/198: Add a case for empty cells |
Date: |
Tue, 1 Dec 2020 18:19:39 -0500 (EST) |
branch: externals/valign
commit 6a4a91bb252fce62a78cc6a05c4cd2917e495da8
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Add a case for empty cells
Before:
if (= cell-beg content-beg)
xxx
else
xxx
Now:
(cond (= cell-beg content-beg)
xxx
(empty)
xxx
(other)
xxx)
* valign.el (valign-table-1): Change if to cond.
---
valign.el | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/valign.el b/valign.el
index d7120f2..decef99 100644
--- a/valign.el
+++ b/valign.el
@@ -591,22 +591,31 @@ If FORCE non-nil, force align."
,content-end
,cell-end)
(valign--cell-content-config)))
- (if (= cell-beg content-beg)
- ;; This cell has only one space.
- (valign--put-ov
- cell-beg cell-end
- (+ column-start col-width space-width))
- ;; A normal cell.
- (pcase alignment
- ;; Align a left-aligned cell.
- ('left (valign--put-ov
- content-end cell-end
- (+ column-start col-width space-width)))
- ;; Align a right-aligned cell.
- ('right (valign--put-ov
- cell-beg content-beg
- (+ column-start
- (- col-width cell-width))))))))
+ (cond ((= cell-beg content-beg)
+ ;; This cell has only one space.
+ (valign--put-ov
+ cell-beg cell-end
+ (+ column-start col-width space-width)))
+ ;; Empty cell. Sometimes empty cells are
+ ;; longer than other non-empty cells (see
+ ;; `valign--cell-width'), so we put overlay on
+ ;; all but the first white space.
+ ((valign--cell-empty-p)
+ (valign--put-ov
+ content-beg cell-end
+ (+ column-start col-width space-width)))
+ ;; A normal cell.
+ (t
+ (pcase alignment
+ ;; Align a left-aligned cell.
+ ('left (valign--put-ov
+ content-end cell-end
+ (+ column-start col-width space-width)))
+ ;; Align a right-aligned cell.
+ ('right (valign--put-ov
+ cell-beg content-beg
+ (+ column-start
+ (- col-width cell-width)))))))))
;; Update ‘column-start’ for the next cell.
(setq column-start (+ column-start
col-width
- [elpa] externals/valign 9e1d2f4 152/198: Fix the problem where cells get too much padding, (continued)
- [elpa] externals/valign 9e1d2f4 152/198: Fix the problem where cells get too much padding, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 11f02f5 193/198: Allow non-table lines at the end of the table, Stefan Monnier, 2020/12/01
- [elpa] externals/valign fcb62c4 161/198: * valign.el (valign--glyph-width-of): Fix docstring., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 70c5c91 147/198: * valign.el: Remove obsolete number regexp., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 65859b3 177/198: Refactor out valign--cell, Stefan Monnier, 2020/12/01
- [elpa] externals/valign a0e40c5 197/198: Fix alignment in Markdown mode, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 5b0c557 107/198: * README.org (Customization): Update., Stefan Monnier, 2020/12/01
- [elpa] externals/valign d37ce14 185/198: Add column padding, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 58f5dc8 190/198: * valign.el: Update keywords., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 666e7d7 175/198: * valign.el (valign--end-of-table): Fix infinite loop., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 6a4a91b 159/198: Add a case for empty cells,
Stefan Monnier <=
- [elpa] externals/valign 2054ccf 160/198: Fix fancy bar, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 4f3eccd 166/198: Fix wrong argument nil error when valign-region receives no arguments, Stefan Monnier, 2020/12/01
- [elpa] externals/valign fe1160a 157/198: * valign.el (valign-mode): Remove obsolete code., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 6e3e6ce 158/198: ; Add test file and Makefile, Stefan Monnier, 2020/12/01
- [elpa] externals/valign eb22fae 150/198: Add hooks to org-indent-mode, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 84dc2ce 153/198: Fix misalignment, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 55cde13 162/198: * valign.el (valign-table-1): Add indent., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 6e01d5b 172/198: Update README, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 7c67cf6 186/198: Update documentation, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 762b115 144/198: * valign.el (valign--separator-row-add-overlay): Change 'valign--glyph-width-at-point' to 'valign--pixel-width-from-to'., Stefan Monnier, 2020/12/01