From 0a7bf9475354b4b19c045341af5fc8feb944d985 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 7 Jul 2007 16:22:01 +0000 Subject: [PATCH] New module 'uniwidth/u32-width'. --- ChangeLog | 3 +++ lib/uniwidth/u32-width.c | 45 ++++++++++++++++++++++++++++++++++++++ modules/uniwidth/u32-width | 24 ++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 lib/uniwidth/u32-width.c create mode 100644 modules/uniwidth/u32-width diff --git a/ChangeLog b/ChangeLog index 1d12ce9050..2d6f492c84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-07-07 Bruno Haible + * lib/uniwidth/u32-width.c: New file. + * modules/uniwidth/u32-width: New file. + * tests/uniwidth/test-u16-width.c: New file. * modules/uniwidth/u16-width-tests: New file. diff --git a/lib/uniwidth/u32-width.c b/lib/uniwidth/u32-width.c new file mode 100644 index 0000000000..3d93765159 --- /dev/null +++ b/lib/uniwidth/u32-width.c @@ -0,0 +1,45 @@ +/* Determine display width of UTF-32 string. + Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 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 + +/* Specification. */ +#include "uniwidth.h" + +int +u32_width (const uint32_t *s, size_t n, const char *encoding) +{ + const uint32_t *s_end = s + n; + int width = 0; + + while (s < s_end) + { + ucs4_t uc = *s++; + int w; + + 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/u32-width b/modules/uniwidth/u32-width new file mode 100644 index 0000000000..a5660fcdc6 --- /dev/null +++ b/modules/uniwidth/u32-width @@ -0,0 +1,24 @@ +Description: +Determine display width of UTF-32 string. + +Files: +lib/uniwidth/u32-width.c + +Depends-on: +uniwidth/base +uniwidth/width + +configure.ac: + +Makefile.am: +lib_SOURCES += uniwidth/u32-width.c + +Include: +"uniwidth.h" + +License: +LGPL + +Maintainer: +Bruno Haible + -- 2.30.2