[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/valign ccbcc1c 10/15: Fix alignment for Unicode tables
From: |
Stefan Monnier |
Subject: |
[elpa] externals/valign ccbcc1c 10/15: Fix alignment for Unicode tables |
Date: |
Tue, 16 Mar 2021 00:01:33 -0400 (EDT) |
branch: externals/valign
commit ccbcc1caa275c2849e1a744dc45092a740039f25
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Fix alignment for Unicode tables
* valign.el (valign--separator-line-p): Test org mode table and
table.el table separately.
(valign--at-table-p): Add missing case.
(valign-table-maybe): Don't error even if 'debug-on-error' is on.
---
valign.el | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/valign.el b/valign.el
index c64e4cf..c2ad270 100644
--- a/valign.el
+++ b/valign.el
@@ -395,14 +395,13 @@ Return t if the dimension is correct, nil if not."
"Return t if this line is a separator line.
If the table is a table.el table, you need to specify CHARSET.
Assumes the point is at the beginning of the line."
- (let ((charset (or charset (cdar valign-box-charset-alist))))
- (and (re-search-forward
- (rx-to-string `(or ,(valign-box-char 1 charset)
- ,(valign-box-char 4 charset)
- ,(valign-box-char 7 charset)
- ,(valign-box-char 'v charset)))
- (line-end-position) t)
- (valign--separator-p))))
+ (if charset
+ (let ((charset (or charset (cdar valign-box-charset-alist))))
+ (member (char-to-string (char-after))
+ (list (valign-box-char 1 charset)
+ (valign-box-char 4 charset)
+ (valign-box-char 7 charset))))
+ (valign--separator-p)))
(defun valign--calculate-cell-width (limit &optional charset)
"Return a list of column widths.
@@ -499,6 +498,12 @@ TYPE must be 'org. Start at point, stop at LIMIT."
(valign-box-char 3 charset)
(valign-box-char 'h charset))))
(and (equal char
+ (valign-box-char 4 charset))
+ (member char2
+ (list (valign-box-char 5 charset)
+ (valign-box-char 6 charset)
+ (valign-box-char 'h charset))))
+ (and (equal char
(valign-box-char 7 charset))
(member char2
(list (valign-box-char 8 charset)
@@ -744,7 +749,7 @@ at the end of the table."
'face 'valign-table-fallback))))
(when go-to-end (valign--end-of-table)))
- ((debug valign-parse-error error)
+ ((valign-parse-error error)
(valign--clean-text-property
(save-excursion (valign--beginning-of-table) (point))
(save-excursion (valign--end-of-table) (point)))
- [elpa] externals/valign updated (223407d -> 2035143), Stefan Monnier, 2021/03/16
- [elpa] externals/valign b000cca 02/15: Fix alignment for table.el tables, Stefan Monnier, 2021/03/16
- [elpa] externals/valign 6b0345e 03/15: Make at-table-p testing stricter, Stefan Monnier, 2021/03/16
- [elpa] externals/valign 49209b4 05/15: * README-CN.org: Touch up on phrasing., Stefan Monnier, 2021/03/16
- [elpa] externals/valign 2035143 15/15: * README-CN.org (自定义): Add descriptions for some variables., Stefan Monnier, 2021/03/16
- [elpa] externals/valign acdb551 01/15: Really really fix org-indent and line-number problem, Stefan Monnier, 2021/03/16
- [elpa] externals/valign b6a0dcd 04/15: Add Chinese README, Stefan Monnier, 2021/03/16
- [elpa] externals/valign e8a5ce1 07/15: Remove note about org-indent-mode + line-numbers-mode, Stefan Monnier, 2021/03/16
- [elpa] externals/valign f5db1ef 06/15: ; * README.org: Change link to Chinese README., Stefan Monnier, 2021/03/16
- [elpa] externals/valign db5145a 14/15: * README.org (Customization): Add description for some variables., Stefan Monnier, 2021/03/16
- [elpa] externals/valign ccbcc1c 10/15: Fix alignment for Unicode tables,
Stefan Monnier <=
- [elpa] externals/valign 16ff947 08/15: Patch an outline bug., Stefan Monnier, 2021/03/16
- [elpa] externals/valign bcfb414 13/15: Improve parse error report, Stefan Monnier, 2021/03/16
- [elpa] externals/valign 3fcb173 12/15: Fix 'valign--separator-line-p', Stefan Monnier, 2021/03/16
- [elpa] externals/valign ad8419e 11/15: ; * test.org: Add a test for Unicode tables., Stefan Monnier, 2021/03/16
- [elpa] externals/valign 745889d 09/15: * valign.el (valign--at-table-p): Don't pass "" to 'char-to-string'., Stefan Monnier, 2021/03/16
- Re: [elpa] externals/valign updated (223407d -> 2035143), Yuan Fu, 2021/03/16