Eric Abrahamsen <e...@ericabrahamsen.net> writes:
> Achim Gratz <strom...@nexgo.de> writes:
>
>> Eric Abrahamsen writes:
>>> Yes, org-string-width eventually calls string-width, so that behaves
>>> "correctly" as far as it goes
[...]
And more, this time to prevent errors when using column-narrowing
cookies on columns containing peculiar-width strings. It's still going
to look weird, often as not, but this will at least prevent blowups.
I'm providing two possible patches. One is a one-liner that does the
trick but produces ugly results. The other goes a wee bit overboard, but
looks a little better. I offer either, or neither, for consideration.
Eric
>From ccf294f9dad0b81240b8f1a0051cecfddd47d1c4 Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <e...@ericabrahamsen.net>
Date: Wed, 13 Feb 2013 16:46:33 +0800
Subject: [PATCH] Make table column narrowing play nice with variable-width
strings
---
lisp/org-table.el | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 3f276f8..d79b650 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -765,7 +765,7 @@ When nil, simply write \"#ERROR\" in corrupted fields.")
(hfmt1 (concat
(make-string sp2 ?-) "%s" (make-string sp1 ?-) "+"))
emptystrings links dates emph raise narrow
- falign falign1 fmax f1 len c e space)
+ falign falign1 fmax f1 f2 len c e space)
(untabify beg end)
(remove-text-properties beg end '(org-cwidth t org-dwidth t display t))
;; Check if we have links or dates
@@ -850,10 +850,19 @@ When nil, simply write \"#ERROR\" in corrupted fields.")
(unless (> f1 1)
(error "Cannot narrow field starting with wide link \"%s\""
(match-string 0 xx)))
- (add-text-properties f1 (length xx) (list 'org-cwidth t) xx)
- (add-text-properties (- f1 2) f1
- (list 'display org-narrow-column-arrow)
- xx)))))
+ (setq f2 (length xx))
+ (if (= (org-string-width xx)
+ f2)
+ (setq f2 f1)
+ (setq f2 1)
+ (while (< (org-string-width (substring xx 0 f2))
+ f1)
+ (setq f2 (1+ f2))))
+ (add-text-properties f2 (length xx) (list 'org-cwidth t) xx)
+ (add-text-properties (if (>= (string-width (substring xx (1- f2) f2)) 2)
+ (1- f2) (- f2 2)) f2
+ (list 'display org-narrow-column-arrow)
+ xx)))))
;; Get the maximum width for each column
(push (apply 'max (or fmax 1) 1 (mapcar 'org-string-width column))
lengths)
--
1.8.1.3
>From 319931ba76fc3ce5b8157f131d7c71c18f4c5d60 Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <e...@ericabrahamsen.net>
Date: Wed, 13 Feb 2013 15:07:59 +0800
Subject: [PATCH] Prevent errors with table column narrowing and variable-width
strings
---
lisp/org-table.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 3f276f8..6fbff7a 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -850,6 +850,7 @@ When nil, simply write \"#ERROR\" in corrupted fields.")
(unless (> f1 1)
(error "Cannot narrow field starting with wide link \"%s\""
(match-string 0 xx)))
+ (setq f1 (round (* (/ (float (length xx)) (org-string-width xx)) f1)))
(add-text-properties f1 (length xx) (list 'org-cwidth t) xx)
(add-text-properties (- f1 2) f1
(list 'display org-narrow-column-arrow)
--
1.8.1.3
