From: Yasushi SHOJI <yashi@atmark-techno.com>
To: emacs-orgmode@gnu.org
Subject: Re: [PATCH] org: Fix tag width calculation for multi-column chars
Date: Thu, 02 Jun 2016 20:13:01 +0900 [thread overview]
Message-ID: <87oa7jaloi.wl@dns1.atmark-techno.com> (raw)
In-Reply-To: <87lh2oiziw.fsf@saiph.selenimh>
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
Hi,
On Thu, 02 Jun 2016 02:34:31 +0900,
Nicolas Goaziou wrote:
>
> > Would you remove the extra section marker (";;; Tags") thing when
> > merge to master? It merges cleanly from maint to master but leaves
> > the marker.
>
> I'll take care of the merging back to master.
Thank you.
> > please pull from:
> >
> > https://github.com/yashi/org-mode tag-width-fix
>
> I'd rather have the patch with the commit message as an attachment, if
> you don't mind.
Sure. Attached.
Thanks,
--
yashi
[-- Attachment #2: 0001-org-Fix-tag-width-calculation-for-multi-column-chars.patch --]
[-- Type: text/plain, Size: 1459 bytes --]
From b57dee1c44d8dd6979c5a6953ad12fdb487d5092 Mon Sep 17 00:00:00 2001
From: Yasushi SHOJI <yashi@atmark-techno.com>
Date: Tue, 31 May 2016 16:25:42 +0900
Subject: [PATCH 1/2] org: Fix tag width calculation for multi-column chars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some characters have multiple column width. Calculating string width
with points gives a wrong value than actual display width. Use
`string-width' instead.
Here is an ECM for this problem. `M-x org-update-statistics-cookies` or
`C-c #` on bar moves the tag on the headline.
* foo [0/0] :abc:
** child
* bar [0/0] :日本語:
** child
12345678901234567890123456789012345678901234567890123456789012345678901234567890
1 2 3 4 5 6 7 8
---
lisp/org.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/org.el b/lisp/org.el
index a9412ea..15f851d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14923,7 +14923,7 @@ If ONOFF is `on' or `off', don't toggle but set to this state."
(if (and (looking-at (org-re ".*?\\([ \t]+\\)\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$"))
(< pos (match-beginning 2)))
(progn
- (setq tags-l (- (match-end 2) (match-beginning 2)))
+ (setq tags-l (string-width (match-string 2)))
(goto-char (match-beginning 1))
(insert " ")
(delete-region (point) (1+ (match-beginning 2)))
--
2.8.1
[-- Attachment #3: 0002-org-Add-test-for-tag-width-calculation.patch --]
[-- Type: text/plain, Size: 1319 bytes --]
From 4cbd72931e7982878334c92abb08272f11ae0f32 Mon Sep 17 00:00:00 2001
From: Yasushi SHOJI <yashi@atmark-techno.com>
Date: Tue, 31 May 2016 16:25:42 +0900
Subject: [PATCH 2/2] org: Add test for tag width calculation
This is a simple unit test case for the previous fix.
---
testing/lisp/test-org.el | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index db7e525..4873fc2 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -4132,6 +4132,28 @@ Paragraph<point>"
(org-occur "A" nil (lambda () (equal (org-get-heading) "H2")))))))
\f
+;;; Tags
+
+(ert-deftest test-org/tag-align ()
+ "Test `org-align-tags-here' with different display width."
+ (should
+ ;; 12345678901234567890
+ (equal "* Test :abc:"
+ (org-test-with-temp-text "* Test :abc:"
+ (let ((org-tags-column -20)
+ (indent-tabs-mode nil))
+ (org-fix-tags-on-the-fly))
+ (buffer-string))))
+ (should
+ ;; 12345678901234567890
+ (equal "* Test :日本語:"
+ (org-test-with-temp-text "* Test :日本語:"
+ (let ((org-tags-column -20)
+ (indent-tabs-mode nil))
+ (org-fix-tags-on-the-fly))
+ (buffer-string)))))
+
+\f
;;; Timestamps API
(ert-deftest test-org/time-stamp ()
--
2.8.1
next prev parent reply other threads:[~2016-06-02 11:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 7:25 [PATCH] org: Fix tag width calculation for multi-column chars Yasushi SHOJI
2016-05-31 20:02 ` Nicolas Goaziou
2016-05-31 21:06 ` Samuel Wales
2016-06-01 5:57 ` Georgiy Tugai
2016-06-02 11:29 ` Yasushi SHOJI
2016-06-01 13:00 ` [PATCH] " Yasushi SHOJI
2016-06-01 14:27 ` Rasmus
2016-06-01 12:52 ` Yasushi SHOJI
2016-06-01 17:34 ` Nicolas Goaziou
2016-06-02 11:13 ` Yasushi SHOJI [this message]
2016-06-02 11:34 ` Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87oa7jaloi.wl@dns1.atmark-techno.com \
--to=yashi@atmark-techno.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).