From d36002e99bd8c844a0f1abdc26e66be7f94409b4 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 10 Aug 2015 19:57:35 -0700 Subject: Count East Asian Wide and Full Fidth chars as two columns. * regex.c (create_wide_cs): New static function. (wide_display_char_p): New function. * regex.h (wide_display_char_p): Declared. * stream.c (put_string, put_char): Use wide_display_char_p to determine whether an extra column need be counted. Also bugfix: iswprint evidently cannot be relied to work over the entire Unicode range, at least not in the C locale. Glibc's version and is reporting valid Japanese characters as unprintable on Ubuntu. As a hack we instead check for control characters and invert the result: control chars are unprintable. * tests/009/json.expected: Updated. --- stream.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'stream.c') diff --git a/stream.c b/stream.c index 24620baf..20cf1e14 100644 --- a/stream.c +++ b/stream.c @@ -2584,8 +2584,8 @@ val put_string(val string, val stream_in) col = (col + 1) | 7; break; default: - if (iswprint(*p)) - col++; + if (!iswcntrl(*p)) + col += 1 + wide_display_char_p(*p); break; } } @@ -2621,8 +2621,9 @@ val put_char(val ch, val stream_in) s->column = s->indent_chars; } ops->put_char(stream, ch); - if (iswprint(cch)) - s->column++; + + if (!iswcntrl(cch)) + s->column += 1 + wide_display_char_p(cch); break; } -- cgit v1.2.3