summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--lib/uniwidth/u8-width.c49
-rw-r--r--modules/uniwidth/u8-width25
3 files changed, 77 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 73db413e28..852369cc48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2007-07-07 Bruno Haible <bruno@clisp.org>
+ * lib/uniwidth/u8-width.c: New file.
+ * modules/uniwidth/u8-width: New file.
+
* tests/uniwidth/test-uc_width.c: New file.
* modules/uniwidth/width-tests: New file.
diff --git a/lib/uniwidth/u8-width.c b/lib/uniwidth/u8-width.c
new file mode 100644
index 0000000000..06950a36e1
--- /dev/null
+++ b/lib/uniwidth/u8-width.c
@@ -0,0 +1,49 @@
+/* Determine display width of UTF-8 string.
+ Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc.
+ Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA. */
+
+#include <config.h>
+
+/* Specification. */
+#include "uniwidth.h"
+
+#include "unistr.h"
+
+int
+u8_width (const uint8_t *s, size_t n, const char *encoding)
+{
+ const uint8_t *s_end = s + n;
+ int width = 0;
+
+ while (s < s_end)
+ {
+ ucs4_t uc;
+ int w;
+
+ s += u8_mbtouc_unsafe (&uc, s, s_end - s);
+
+ if (uc == 0)
+ break; /* end of string reached */
+
+ w = uc_width (uc, encoding);
+ if (w >= 0) /* ignore control characters in the string */
+ width += w;
+ }
+
+ return width;
+}
diff --git a/modules/uniwidth/u8-width b/modules/uniwidth/u8-width
new file mode 100644
index 0000000000..e00eb8d994
--- /dev/null
+++ b/modules/uniwidth/u8-width
@@ -0,0 +1,25 @@
+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:
+
+Makefile.am:
+lib_SOURCES += uniwidth/u8-width.c
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+