diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | lib/c32toupper.c | 34 | ||||
| -rw-r--r-- | lib/uchar.in.h | 15 | ||||
| -rw-r--r-- | m4/uchar_h.m4 | 3 | ||||
| -rw-r--r-- | modules/c32toupper | 44 | ||||
| -rw-r--r-- | modules/uchar | 1 |
6 files changed, 106 insertions, 1 deletions
@@ -1,5 +1,15 @@ 2023-04-09 Bruno Haible <bruno@clisp.org> + c32toupper: New module. + * lib/uchar.in.h (c32toupper): New declaration. + * lib/c32toupper.c: New file. + * modules/c32toupper: New file. + * m4/uchar_h.m4 (gl_UCHAR_H_REQUIRE_DEFAULTS): Initialize + GNULIB_C32TOUPPER. + * modules/uchar (Makefile.am): Substitute GNULIB_C32TOUPPER. + +2023-04-09 Bruno Haible <bruno@clisp.org> + c32tolower: Add tests. * tests/test-c32tolower.sh: New file. * tests/test-c32tolower.c: New file, based on tests/test-c32isupper.c. diff --git a/lib/c32toupper.c b/lib/c32toupper.c new file mode 100644 index 0000000000..a3ca5ecf19 --- /dev/null +++ b/lib/c32toupper.c @@ -0,0 +1,34 @@ +/* Map a 32-bit wide character to uppercase. + Copyright (C) 2023 Free Software Foundation, Inc. + + This file is free software. + It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". + You can redistribute it and/or modify it under either + - the terms of the GNU Lesser General Public License as published + by the Free Software Foundation, either version 3, or (at your + option) any later version, or + - the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) + any later version, or + - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". + + This file 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 + Lesser General Public License and the GNU General Public License + for more details. + + You should have received a copy of the GNU Lesser General Public + License and of the GNU General Public License along with this + program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define IN_C32TOUPPER +/* Specification. */ +#include <uchar.h> + +#define FUNC c32toupper +#define WCHAR_FUNC towupper +#define UCS_FUNC uc_toupper +#include "c32to-impl.h" diff --git a/lib/uchar.in.h b/lib/uchar.in.h index c6795f7e91..27b91c5b58 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -359,6 +359,21 @@ _GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc)); _GL_CXXALIAS_SYS (c32tolower, wint_t, (wint_t wc)); _GL_CXXALIASWARN (c32tolower); #endif +#if @GNULIB_C32TOUPPER@ +# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32TOUPPER +_GL_BEGIN_C_LINKAGE +_GL_INLINE wint_t +c32toupper (wint_t wc) +{ + return towupper (wc); +} +_GL_END_C_LINKAGE +# else +_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc)); +# endif +_GL_CXXALIAS_SYS (c32toupper, wint_t, (wint_t wc)); +_GL_CXXALIASWARN (c32toupper); +#endif /* Converts a 32-bit wide character to a multibyte character. */ diff --git a/m4/uchar_h.m4 b/m4/uchar_h.m4 index 6bb83adb6a..2679371716 100644 --- a/m4/uchar_h.m4 +++ b/m4/uchar_h.m4 @@ -1,4 +1,4 @@ -# uchar_h.m4 serial 23 +# uchar_h.m4 serial 24 dnl Copyright (C) 2019-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -215,6 +215,7 @@ AC_DEFUN([gl_UCHAR_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISUPPER]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISXDIGIT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOLOWER]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOUPPER]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32RTOMB]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SNRTOMBS]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SRTOMBS]) diff --git a/modules/c32toupper b/modules/c32toupper new file mode 100644 index 0000000000..364e011818 --- /dev/null +++ b/modules/c32toupper @@ -0,0 +1,44 @@ +Description: +c32toupper() function: map 32-bit wide character to uppercase. + +Files: +lib/c32toupper.c +lib/c32to-impl.h +m4/mbrtoc32.m4 +m4/mbrtowc.m4 +m4/locale-fr.m4 +m4/locale-ja.m4 +m4/locale-zh.m4 +m4/codeset.m4 + +Depends-on: +uchar +wchar +wctype-h +localcharset [test $REPLACE_MBSTATE_T = 1] +streq [test $REPLACE_MBSTATE_T = 1] +unicase/toupper +assert-h + +configure.ac: +AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) +AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) +gl_UCHAR_MODULE_INDICATOR([c32toupper]) + +Makefile.am: +lib_SOURCES += c32toupper.c + +Include: +<uchar.h> + +Link: +$(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise + +License: +LGPLv3+ or GPLv2+ + +Maintainer: +Bruno Haible diff --git a/modules/uchar b/modules/uchar index f49db7d42c..6363d543d9 100644 --- a/modules/uchar +++ b/modules/uchar @@ -52,6 +52,7 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) -e 's/@''GNULIB_C32ISUPPER''@/$(GNULIB_C32ISUPPER)/g' \ -e 's/@''GNULIB_C32ISXDIGIT''@/$(GNULIB_C32ISXDIGIT)/g' \ -e 's/@''GNULIB_C32TOLOWER''@/$(GNULIB_C32TOLOWER)/g' \ + -e 's/@''GNULIB_C32TOUPPER''@/$(GNULIB_C32TOUPPER)/g' \ -e 's/@''GNULIB_C32RTOMB''@/$(GNULIB_C32RTOMB)/g' \ -e 's/@''GNULIB_C32SNRTOMBS''@/$(GNULIB_C32SNRTOMBS)/g' \ -e 's/@''GNULIB_C32SRTOMBS''@/$(GNULIB_C32SRTOMBS)/g' \ |