replace wcwidth by utf8proc_charwidth (fixes JuliaLang#3721, closes J…

…uliaLang#6939)
stevengj · Mar 28, 2015 · 7d908f9 · 7d908f9
1 parent 49d0aa8
commit 7d908f9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 336 deletions.
diff --git a/Make.inc b/Make.inc
@@ -596,8 +596,10 @@ endif
 
 ifeq ($(USE_SYSTEM_UTF8PROC), 1)
   LIBUTF8PROC = -lutf8proc
+  UTF8PROC_INC = /usr/include
 else
   LIBUTF8PROC = $(build_libdir)/libutf8proc.a
+  UTF8PROC_INC = $(JULIAHOME)/deps/utf8proc
 endif
 
 # OS specific stuff

diff --git a/base/string.jl b/base/string.jl
@@ -541,7 +541,6 @@ startswith(a::Array{UInt8,1}, b::Array{UInt8,1}) =
 
 ## character column width function ##
 
-charwidth(c::Char) = max(0,Int(ccall(:wcwidth, Int32, (UInt32,), c)))
 strwidth(s::AbstractString) = (w=0; for c in s; w += charwidth(c); end; w)
 strwidth(s::ByteString) = Int(ccall(:u8_strwidth, Csize_t, (Ptr{UInt8},), s.data))
 # TODO: implement and use u8_strnwidth that takes a length argument

diff --git a/base/utf8proc.jl b/base/utf8proc.jl
@@ -6,7 +6,7 @@ import Base: show, showcompact, ==, hash, string, symbol, isless, length, eltype
 export isgraphemebreak
 
 # also exported by Base:
-export normalize_string, graphemes, is_valid_char, is_assigned_char,
+export normalize_string, graphemes, is_valid_char, is_assigned_char, charwidth,
    islower, isupper, isalpha, isdigit, isnumber, isalnum,
    iscntrl, ispunct, isspace, isprint, isgraph, isblank
 
@@ -116,6 +116,10 @@ end
 
 ############################################################################
 
+charwidth(c::Char) = Int(ccall(:utf8proc_charwidth, Cint, (UInt32,), c))
+
+############################################################################
+
 # returns UTF8PROC_CATEGORY code in 1:30 giving Unicode category
 function category_code(c)
     UInt32(c) > 0x10FFFF && return 0x0000 # see utf8proc_get_property docs

diff --git a/src/support/Makefile b/src/support/Makefile
@@ -11,7 +11,7 @@ SRCS = hashing timefuncs ptrhash operators \
 	utf8 ios htable bitvector \
 	int2str libsupportinit arraylist strtod
 ifeq ($(OS),WINNT)
-SRCS += asprintf wcwidth
+SRCS += asprintf
 ifeq ($(ARCH),i686)
 SRCS += _setjmp.win32 _longjmp.win32
 else ifeq ($(ARCH),i386)
@@ -26,7 +26,7 @@ HEADERS = $(wildcard *.h) $(LIBUV_INC)/uv.h
 OBJS = $(SRCS:%=$(BUILDDIR)/%.o)
 DOBJS = $(SRCS:%=$(BUILDDIR)/%.dbg.obj)
 
-FLAGS = $(CFLAGS) $(HFILEDIRS:%=-I%) -I$(LIBUV_INC) -DLIBRARY_EXPORTS
+FLAGS = $(CFLAGS) $(HFILEDIRS:%=-I%) -I$(LIBUV_INC) -I$(UTF8PROC_INC) -DLIBRARY_EXPORTS
 ifneq ($(USEMSVC), 1)
 FLAGS += -Wall -Wno-strict-aliasing -fvisibility=hidden
 endif

diff --git a/src/support/utf8.c b/src/support/utf8.c
@@ -33,6 +33,7 @@
 #include <assert.h>
 
 #include "utf8.h"
+#include "utf8proc.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -261,17 +262,10 @@ size_t u8_strlen(const char *s)
     return count;
 }
 
-#if defined(_OS_WINDOWS_)
-extern int wcwidth(uint32_t ch);
-#elif defined(_OS_LINUX_)
-extern int wcwidth(wchar_t ch);
-#endif
-
 size_t u8_strwidth(const char *s)
 {
     uint32_t ch;
     size_t nb, tot=0;
-    int w;
     signed char sc;
 
     while ((sc = (signed char)*s) != 0) {
@@ -293,8 +287,7 @@ size_t u8_strwidth(const char *s)
             case 0: ch += (unsigned char)*s++;
             }
             ch -= offsetsFromUTF8[nb];
-            w = wcwidth(ch);  // might return -1
-            if (w > 0) tot += w;
+            tot += utf8proc_charwidth(ch);
         }
     }
     return tot;