[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/valign 2054ccf 160/198: Fix fancy bar
From: |
Stefan Monnier |
Subject: |
[elpa] externals/valign 2054ccf 160/198: Fix fancy bar |
Date: |
Tue, 1 Dec 2020 18:19:39 -0500 (EST) |
branch: externals/valign
commit 2054ccf513ec74c8f974d866bcff725a9db8b0c2
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Fix fancy bar
* valign.el (valign--align-separator-row, valign-table-1): Add render-bar.
---
valign.el | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/valign.el b/valign.el
index decef99..f8f3867 100644
--- a/valign.el
+++ b/valign.el
@@ -436,6 +436,8 @@ STYLE is 'single-column. COLUMN-WIDTH-LIST is returned from
;; Position of the right-most bar.
(total-width (+ (apply #'+ column-width-list)
(* bar-width (1+ column-count)))))
+ ;; Render the left bar.
+ (valign--maybe-render-bar (1- (point)))
(when (search-forward "|" nil t)
(valign--put-overlay p (1- (point)) total-width
'face '(:strike-through t))
@@ -479,7 +481,11 @@ COLUMN-WIDTH-LIST is returned from
`valign--calculate-cell-width'."
(col-idx 0)
(pos (valign--pixel-width-from-to
(line-beginning-position) (point) t)))
+ ;; Render the first left bar.
+ (valign--maybe-render-bar (1- (point)))
(while (re-search-forward "[+|]" (line-end-position) t)
+ ;; Render the right bar.
+ (valign--maybe-render-bar (1- (point)))
(let ((column-width (nth col-idx column-width-list)))
(valign--separator-row-add-overlay
column-start (1- (point)) (+ pos column-width space-width))
@@ -571,13 +577,16 @@ If FORCE non-nil, force align."
;; bar.
(setq column-start (valign--pixel-width-from-to
(line-beginning-position) (point) t))
- (valign--maybe-render-bar (1- (point)))
+
(valign--do-column column-idx
(save-excursion
;; We are after the left bar (“|”).
+ ;; Render the left bar.
+ (valign--maybe-render-bar (1- (point)))
;; Start aligning this cell.
- ;; Pixel width of the column
+ ;; Pixel width of the column.
(let* ((col-width (nth column-idx column-width-list))
+ ;; left or right aligned.
(alignment (nth column-idx column-alignment-list))
;; Pixel width of the cell.
(cell-width (valign--cell-content-width)))
@@ -620,7 +629,9 @@ If FORCE non-nil, force align."
(setq column-start (+ column-start
col-width
bar-width
- space-width)))))))))
+ space-width)))))
+ ;; Now we are at the last right bar.
+ (valign--maybe-render-bar (1- (point)))))))
;;; Mode intergration
- [elpa] externals/valign 11f02f5 193/198: Allow non-table lines at the end of the table, (continued)
- [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, 2020/12/01
- [elpa] externals/valign 2054ccf 160/198: Fix fancy bar,
Stefan Monnier <=
- [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
- [elpa] externals/valign 1858260 146/198: * valign.el: Bump version to 2.2.0, Stefan Monnier, 2020/12/01