From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Abrahamsen Subject: Re: mis-alignment in org-tables with Tibetan characters Date: Sun, 25 May 2014 13:14:06 +0800 Message-ID: <87a9a6cue9.fsf@ericabrahamsen.net> References: <87a9e8y2ky.fsf@bzg.ath.cx> <8738jzc66w.fsf@ericabrahamsen.net> <87zjm6n8dh.fsf@bzg.ath.cx> <87d2ivpq1b.fsf@ericabrahamsen.net> <8738fzbim2.fsf@bzg.ath.cx> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoQiS-00059q-55 for emacs-orgmode@gnu.org; Sun, 25 May 2014 01:11:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WoQiL-0003Aj-GO for emacs-orgmode@gnu.org; Sun, 25 May 2014 01:11:24 -0400 Received: from plane.gmane.org ([80.91.229.3]:51634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoQiL-0003AQ-6Z for emacs-orgmode@gnu.org; Sun, 25 May 2014 01:11:17 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WoQiH-0001wk-3i for emacs-orgmode@gnu.org; Sun, 25 May 2014 07:11:13 +0200 Received: from 50.56.99.223 ([50.56.99.223]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 25 May 2014 07:11:13 +0200 Received: from eric by 50.56.99.223 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 25 May 2014 07:11:13 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Bastien writes: > Hi Eric, > > Eric Abrahamsen writes: > >> Sorry this took a while to get to... >> >> I think it was a little simpler than I thought -- at least I hope that's >> true, and I'm not missing something really obvious. There are two >> patches attached, a simple one that handles re-justification of table >> fields during field movement, and another that allows for narrowing of >> columns with double-width strings. The second patch is uglier, and >> doesn't work 100% well (you get misalignment if you try to narrow a >> double-wide to an odd number of single-width characters), but it's >> better than nothing. > > I want to apply the patches on master -- can you give them a commit > message with an Emacs changelog? Also, the first one (0001-...) does > not apply on master anymore. > > Thanks in advance! The patch series that would not die! I'm not a git wizard, but I think I was able to apply both these patches to master with no problem: they're now sitting on top of 56b47fb and nothing is going wrong (I think). Can you try again? Here they are with better commit messages. E --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Use-string-width-in-table-field-justification.patch >From 3e6fd0e2790156a9bd68401bdabbf1b170408ba6 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Wed, 13 Feb 2013 11:56:18 +0800 Subject: [PATCH 1/2] Use string width in table field justification lisp/org-table.el (org-table-justify-field-maybe): Use org-string-width instead of length to calculate the visual width of table cells -- helps with double-width charsets, etc. --- lisp/org-table.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/org-table.el b/lisp/org-table.el index 6a7935e..5e0177f 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -981,13 +981,16 @@ Optional argument NEW may specify text to replace the current field content." (progn (setq s (match-string 1) o (match-string 0) - l (max 1 (- (match-end 0) (match-beginning 0) 3)) + l (max 1 + (- (org-string-width + (buffer-substring-no-properties + (match-end 0) (match-beginning 0))) 3)) e (not (= (match-beginning 2) (match-end 2)))) (setq f (format (if num " %%%ds %s" " %%-%ds %s") l (if e "|" (setq org-table-may-need-update t) "")) n (format f s)) (if new - (if (<= (length new) l) ;; FIXME: length -> str-width? + (if (<= (org-string-width new) l) (setq n (format f new)) (setq n (concat new "|") org-table-may-need-update t))) (if (equal (string-to-char n) ?-) (setq n (concat " " n))) -- 1.9.3 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Improve-table-column-narrowing-with-variable-width-s.patch >From 7850f739a6ef21bcc92763150861a67798282f12 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Wed, 13 Feb 2013 16:46:33 +0800 Subject: [PATCH 2/2] Improve table column narrowing with variable-width strings lisp/org-table.el (org-table-align): Use org-string-width to make a better guess as to how wide a narrowed table column should actually be. This won't work perfectly with variable-width scripts, as it still only narrows in full-column increments, but it's better than before. --- 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 5e0177f..d1f9686 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 @@ -851,10 +851,19 @@ When nil, simply write \"#ERROR\" in corrupted fields.") (unless (> f1 1) (user-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.9.3 --=-=-=--