16 files changed, 324 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 443bc5ffcf7429e557f4a371b0661abe98ddbc1
diff --git a/gnulib/modules/uniwidth/base b/gnulib/modules/uniwidth/base
new file mode 100644
index 0000000..4d0cb08
--- /dev/null
+++ b/gnulib/modules/uniwidth/base
@@ -0,0 +1,34 @@
+Description:
+Base layer for Unicode string width.
+
+Files:
+lib/uniwidth.in.h
+lib/localcharset.h
+m4/libunistring-base.m4
+
+Depends-on:
+unitypes
+
+configure.ac:
+gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
+
+Makefile.am:
+BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)
+
+uniwidth.h: uniwidth.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  cat $(srcdir)/uniwidth.in.h; \
+	} > $@-t && \
+	mv -f $@-t $@
+MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/u16-strwidth b/gnulib/modules/uniwidth/u16-strwidth
new file mode 100644
index 0000000..6c1db2f
--- /dev/null
+++ b/gnulib/modules/uniwidth/u16-strwidth
@@ -0,0 +1,28 @@
+Description:
+Determine display width of UTF-16 string.
+
+Files:
+lib/uniwidth/u16-strwidth.c
+
+Depends-on:
+uniwidth/base
+uniwidth/u16-width
+unistr/u16-strlen
+
+configure.ac:
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/u16-strwidth])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNIWIDTH_U16_STRWIDTH
+lib_SOURCES += uniwidth/u16-strwidth.c
+endif
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/u16-strwidth-tests b/gnulib/modules/uniwidth/u16-strwidth-tests
new file mode 100644
index 0000000..17998aa
--- /dev/null
+++ b/gnulib/modules/uniwidth/u16-strwidth-tests
@@ -0,0 +1,13 @@
+Files:
+tests/uniwidth/test-u16-strwidth.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-u16-strwidth
+check_PROGRAMS += test-u16-strwidth
+test_u16_strwidth_SOURCES = uniwidth/test-u16-strwidth.c
+test_u16_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/gnulib/modules/uniwidth/u16-width b/gnulib/modules/uniwidth/u16-width
new file mode 100644
index 0000000..50121de
--- /dev/null
+++ b/gnulib/modules/uniwidth/u16-width
@@ -0,0 +1,28 @@
+Description:
+Determine display width of UTF-16 string.
+
+Files:
+lib/uniwidth/u16-width.c
+
+Depends-on:
+uniwidth/base
+uniwidth/width
+unistr/u16-mbtouc-unsafe
+
+configure.ac:
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/u16-width])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNIWIDTH_U16_WIDTH
+lib_SOURCES += uniwidth/u16-width.c
+endif
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/u16-width-tests b/gnulib/modules/uniwidth/u16-width-tests
new file mode 100644
index 0000000..cea7ca7
--- /dev/null
+++ b/gnulib/modules/uniwidth/u16-width-tests
@@ -0,0 +1,13 @@
+Files:
+tests/uniwidth/test-u16-width.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-u16-width
+check_PROGRAMS += test-u16-width
+test_u16_width_SOURCES = uniwidth/test-u16-width.c
+test_u16_width_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/gnulib/modules/uniwidth/u32-strwidth b/gnulib/modules/uniwidth/u32-strwidth
new file mode 100644
index 0000000..73615e6
--- /dev/null
+++ b/gnulib/modules/uniwidth/u32-strwidth
@@ -0,0 +1,28 @@
+Description:
+Determine display width of UTF-32 string.
+
+Files:
+lib/uniwidth/u32-strwidth.c
+
+Depends-on:
+uniwidth/base
+uniwidth/u32-width
+unistr/u32-strlen
+
+configure.ac:
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/u32-strwidth])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNIWIDTH_U32_STRWIDTH
+lib_SOURCES += uniwidth/u32-strwidth.c
+endif
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/u32-strwidth-tests b/gnulib/modules/uniwidth/u32-strwidth-tests
new file mode 100644
index 0000000..51006b7
--- /dev/null
+++ b/gnulib/modules/uniwidth/u32-strwidth-tests
@@ -0,0 +1,13 @@
+Files:
+tests/uniwidth/test-u32-strwidth.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-u32-strwidth
+check_PROGRAMS += test-u32-strwidth
+test_u32_strwidth_SOURCES = uniwidth/test-u32-strwidth.c
+test_u32_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/gnulib/modules/uniwidth/u32-width b/gnulib/modules/uniwidth/u32-width
new file mode 100644
index 0000000..11455c6
--- /dev/null
+++ b/gnulib/modules/uniwidth/u32-width
@@ -0,0 +1,27 @@
+Description:
+Determine display width of UTF-32 string.
+
+Files:
+lib/uniwidth/u32-width.c
+
+Depends-on:
+uniwidth/base
+uniwidth/width
+
+configure.ac:
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/u32-width])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNIWIDTH_U32_WIDTH
+lib_SOURCES += uniwidth/u32-width.c
+endif
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/u32-width-tests b/gnulib/modules/uniwidth/u32-width-tests
new file mode 100644
index 0000000..349d190
--- /dev/null
+++ b/gnulib/modules/uniwidth/u32-width-tests
@@ -0,0 +1,13 @@
+Files:
+tests/uniwidth/test-u32-width.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-u32-width
+check_PROGRAMS += test-u32-width
+test_u32_width_SOURCES = uniwidth/test-u32-width.c
+test_u32_width_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/gnulib/modules/uniwidth/u8-strwidth b/gnulib/modules/uniwidth/u8-strwidth
new file mode 100644
index 0000000..5edec5d
--- /dev/null
+++ b/gnulib/modules/uniwidth/u8-strwidth
@@ -0,0 +1,28 @@
+Description:
+Determine display width of UTF-8 string.
+
+Files:
+lib/uniwidth/u8-strwidth.c
+
+Depends-on:
+uniwidth/base
+uniwidth/u8-width
+unistr/u8-strlen
+
+configure.ac:
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/u8-strwidth])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNIWIDTH_U8_STRWIDTH
+lib_SOURCES += uniwidth/u8-strwidth.c
+endif
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/u8-strwidth-tests b/gnulib/modules/uniwidth/u8-strwidth-tests
new file mode 100644
index 0000000..ee95db9
--- /dev/null
+++ b/gnulib/modules/uniwidth/u8-strwidth-tests
@@ -0,0 +1,13 @@
+Files:
+tests/uniwidth/test-u8-strwidth.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-u8-strwidth
+check_PROGRAMS += test-u8-strwidth
+test_u8_strwidth_SOURCES = uniwidth/test-u8-strwidth.c
+test_u8_strwidth_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/gnulib/modules/uniwidth/u8-width b/gnulib/modules/uniwidth/u8-width
new file mode 100644
index 0000000..1961376
--- /dev/null
+++ b/gnulib/modules/uniwidth/u8-width
@@ -0,0 +1,28 @@
+Description:
+Determine display width of UTF-8 string.
+
+Files:
+lib/uniwidth/u8-width.c
+
+Depends-on:
+uniwidth/base
+uniwidth/width
+unistr/u8-mbtouc-unsafe
+
+configure.ac:
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/u8-width])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNIWIDTH_U8_WIDTH
+lib_SOURCES += uniwidth/u8-width.c
+endif
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/u8-width-tests b/gnulib/modules/uniwidth/u8-width-tests
new file mode 100644
index 0000000..f334af1
--- /dev/null
+++ b/gnulib/modules/uniwidth/u8-width-tests
@@ -0,0 +1,13 @@
+Files:
+tests/uniwidth/test-u8-width.c
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-u8-width
+check_PROGRAMS += test-u8-width
+test_u8_width_SOURCES = uniwidth/test-u8-width.c
+test_u8_width_LDADD = $(LDADD) $(LIBUNISTRING)
diff --git a/gnulib/modules/uniwidth/width b/gnulib/modules/uniwidth/width
new file mode 100644
index 0000000..1901557
--- /dev/null
+++ b/gnulib/modules/uniwidth/width
@@ -0,0 +1,28 @@
+Description:
+Determine display width of Unicode character.
+
+Files:
+lib/uniwidth/width.c
+lib/uniwidth/cjk.h
+
+Depends-on:
+uniwidth/base
+streq
+
+configure.ac:
+gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width])
+
+Makefile.am:
+if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH
+lib_SOURCES += uniwidth/width.c
+endif
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+
diff --git a/gnulib/modules/uniwidth/width-tests b/gnulib/modules/uniwidth/width-tests
new file mode 100644
index 0000000..9549760
--- /dev/null
+++ b/gnulib/modules/uniwidth/width-tests
@@ -0,0 +1,17 @@
+Files:
+tests/uniwidth/test-uc_width.c
+tests/uniwidth/test-uc_width2.c
+tests/uniwidth/test-uc_width2.sh
+tests/macros.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-uc_width uniwidth/test-uc_width2.sh
+check_PROGRAMS += test-uc_width test-uc_width2
+test_uc_width_SOURCES = uniwidth/test-uc_width.c
+test_uc_width_LDADD = $(LDADD) $(LIBUNISTRING)
+test_uc_width2_SOURCES = uniwidth/test-uc_width2.c
+test_uc_width2_LDADD = $(LDADD) $(LIBUNISTRING)