--- a/ChangeLog	Sat Jul 07 16:19:55 2007 +0000
+++ b/ChangeLog	Sat Jul 07 16:20:40 2007 +0000
@@ -1,5 +1,8 @@
 2007-07-07  Bruno Haible  <bruno@clisp.org>
 
+	* lib/uniwidth/u16-width.c: New file.
+	* modules/uniwidth/u16-width: New file.
+
 	* tests/uniwidth/test-u8-width.c: New file.
 	* modules/uniwidth/u8-width-tests: New file.
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/uniwidth/u16-width.c	Sat Jul 07 16:20:40 2007 +0000
@@ -0,0 +1,49 @@
+/* Determine display width of UTF-16 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
+u16_width (const uint16_t *s, size_t n, const char *encoding)
+{
+  const uint16_t *s_end = s + n;
+  int width = 0;
+
+  while (s < s_end)
+    {
+      ucs4_t uc;
+      int w;
+
+      s += u16_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;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/uniwidth/u16-width	Sat Jul 07 16:20:40 2007 +0000
@@ -0,0 +1,25 @@
+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:
+
+Makefile.am:
+lib_SOURCES += uniwidth/u16-width.c
+
+Include:
+"uniwidth.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+