texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: update gnulib in base directory


From: Patrice Dumas
Subject: branch master updated: update gnulib in base directory
Date: Tue, 01 Oct 2024 13:20:24 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 7b7a0b51b0 update gnulib in base directory
7b7a0b51b0 is described below

commit 7b7a0b51b03a644a890197c69e68f1f8c89878db
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Oct 1 19:20:25 2024 +0200

    update gnulib in base directory
---
 tp/Texinfo/XS/gnulib/lib/Makefile.am               |    3 +-
 tp/Texinfo/XS/gnulib/lib/acl.h                     |   56 +
 tp/Texinfo/XS/gnulib/lib/c++defs.h                 |   27 +-
 tp/Texinfo/XS/gnulib/lib/fcntl.in.h                |    4 +-
 tp/Texinfo/XS/gnulib/lib/inttypes.in.h             |    8 +-
 tp/Texinfo/XS/gnulib/lib/locale.in.h               |    4 +-
 tp/Texinfo/XS/gnulib/lib/signal.in.h               |   20 +-
 tp/Texinfo/XS/gnulib/lib/stdio.in.h                |   12 +-
 tp/Texinfo/XS/gnulib/lib/stdlib.in.h               |   42 +-
 tp/Texinfo/XS/gnulib/lib/string.in.h               |   20 +-
 tp/Texinfo/XS/gnulib/lib/sys_stat.in.h             |    8 +-
 tp/Texinfo/XS/gnulib/lib/time.in.h                 |    8 +-
 tp/Texinfo/XS/gnulib/lib/uchar.in.h                |   46 +-
 tp/Texinfo/XS/gnulib/lib/unicase/cased.h           |   10 +-
 tp/Texinfo/XS/gnulib/lib/unicase/ignorable.h       |   52 +-
 .../gnulib/lib/unicase/special-casing-table.gperf  |    2 +-
 tp/Texinfo/XS/gnulib/lib/unicase/tolower.h         |   34 +-
 tp/Texinfo/XS/gnulib/lib/unicase/toupper.h         |   54 +-
 tp/Texinfo/XS/gnulib/lib/unictype.in.h             |    6 +-
 tp/Texinfo/XS/gnulib/lib/unictype/categ_L.h        |  104 +-
 tp/Texinfo/XS/gnulib/lib/unictype/categ_M.h        |   38 +-
 tp/Texinfo/XS/gnulib/lib/unictype/categ_Mn.h       |   40 +-
 tp/Texinfo/XS/gnulib/lib/unictype/categ_Nd.h       |   44 +-
 tp/Texinfo/XS/gnulib/lib/unictype/combiningclass.h |   80 +-
 tp/Texinfo/XS/gnulib/lib/unictype/ctype_print.h    |  138 +-
 tp/Texinfo/XS/gnulib/lib/unictype/ctype_upper.h    |    8 +-
 tp/Texinfo/XS/gnulib/lib/unictype/pr_alphabetic.h  |  112 +-
 .../XS/gnulib/lib/unictype/pr_join_control.h       |    2 +-
 tp/Texinfo/XS/gnulib/lib/unictype/pr_soft_dotted.h |    2 +-
 ...osition-table1.h => composition-table-bounds.h} |   28 +-
 .../XS/gnulib/lib/uninorm/composition-table.gperf  |   22 +-
 .../XS/gnulib/lib/uninorm/composition-table.h      | 2296 ++++++++++----------
 tp/Texinfo/XS/gnulib/lib/uninorm/composition.c     |    3 +-
 .../XS/gnulib/lib/uninorm/decomposition-table1.h   |    6 +-
 .../XS/gnulib/lib/uninorm/decomposition-table2.h   |  675 +++---
 tp/Texinfo/XS/gnulib/lib/unistd.in.h               |   54 +-
 tp/Texinfo/XS/gnulib/lib/uniwidth/width0.h         |   39 +-
 tp/Texinfo/XS/gnulib/lib/uniwidth/width2.h         |    2 +-
 tp/Texinfo/XS/gnulib/lib/utimens.c                 |   64 +-
 tp/Texinfo/XS/gnulib/lib/utimens.h                 |   12 +
 tp/Texinfo/XS/gnulib/lib/wchar.in.h                |   48 +-
 tp/Texinfo/XS/gnulib/lib/wctype.in.h               |   18 +-
 tp/Texinfo/XS/gnulib/m4/acl.m4                     |   39 +-
 tp/Texinfo/XS/gnulib/m4/gnulib-common.m4           |   31 +-
 tp/Texinfo/XS/gnulib/m4/gnulib-comp.m4             |   47 +-
 tp/Texinfo/XS/gnulib/m4/unictype_h.m4              |    3 +-
 tp/Texinfo/XS/gnulib/m4/utimens.m4                 |    3 +-
 47 files changed, 2408 insertions(+), 1966 deletions(-)

diff --git a/tp/Texinfo/XS/gnulib/lib/Makefile.am 
b/tp/Texinfo/XS/gnulib/lib/Makefile.am
index 8b1f76b5b5..a41ae14ff2 100644
--- a/tp/Texinfo/XS/gnulib/lib/Makefile.am
+++ b/tp/Texinfo/XS/gnulib/lib/Makefile.am
@@ -2227,6 +2227,7 @@ unictype.h: unictype.in.h
              -e 
's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE)/g'
 \
              -e 
's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE)/g'
 \
              -e 
's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE)/g'
 \
+             -e 
's/@''GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE)/g'
 \
              -e 
's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE)/g'
 \
              -e 
's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE)/g'
 \
              -e 
's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE)/g'
 \
@@ -2467,7 +2468,7 @@ MOSTLYCLEANFILES     += uninorm/composition-table.h-t1 
uninorm/composition-table
 MAINTAINERCLEANFILES += uninorm/composition-table.h
 EXTRA_DIST           += uninorm/composition-table.h
 
-EXTRA_DIST += uninorm/composition-table.gperf
+EXTRA_DIST += uninorm/composition-table-bounds.h 
uninorm/composition-table.gperf
 
 ## end   gnulib module uninorm/composition
 
diff --git a/tp/Texinfo/XS/gnulib/lib/acl.h b/tp/Texinfo/XS/gnulib/lib/acl.h
index 475231c2db..1a627323ec 100644
--- a/tp/Texinfo/XS/gnulib/lib/acl.h
+++ b/tp/Texinfo/XS/gnulib/lib/acl.h
@@ -32,9 +32,65 @@
 extern "C" {
 #endif
 
+/* Follow symlinks when getting an ACL.  */
+enum { ACL_SYMLINK_FOLLOW = 1 };
+
+/* Information about an ACL.  */
+struct aclinfo
+{
+  /* If 'size' is nonnegative, a buffer holding the concatenation
+     of extended attribute names, each terminated by NUL
+     (either u.__gl_acl_ch, or heap-allocated).  */
+  char *buf;
+
+  /* The number of useful bytes at the start of buf, counting trailing NULs.
+     If negative, there was an error in getting the ACL info,
+     and u.err is the corresponding errno.  */
+  ssize_t size;
+
+  /* The allocated size of buf.  This is sizeof u.__gl_acl_ch if the
+     buffer is not heap-allocated, and is larger otherwise.
+     For internal use only.  */
+  ssize_t __gl_acl_alloc;
+
+  /* Security context string.  Do not modify its contents.  */
+  char *scontext;
+  /* Security context errno value.  It is zero if there was no
+     error getting the security context.  When nonzero, scontext is "?".  */
+  int scontext_err;
+
+  union
+  {
+    /* An errno value, when there was an error getting the ACL info.  */
+    int err;
+
+    /* A small array of char, big enough for most listxattr results.
+       The size is somewhat arbitrary; it equals the max length of a
+       trivial NFSv4 ACL (a size used by file-has-acl.c in 2023-2024
+       but no longer relevant now), and a different value might be
+       better once experience is gained.  For internal use only.  */
+    char __gl_acl_ch[152];
+  } u;
+};
 
 bool acl_errno_valid (int) _GL_ATTRIBUTE_CONST;
 int file_has_acl (char const *, struct stat const *);
+int file_has_aclinfo (char const *, struct stat const *, struct aclinfo *, 
int);
+
+#if USE_ACL && HAVE_LINUX_XATTR_H && HAVE_LISTXATTR
+bool aclinfo_has_xattr (struct aclinfo const *, char const *)
+  _GL_ATTRIBUTE_PURE;
+void aclinfo_free (struct aclinfo *);
+#else
+# define aclinfo_has_xattr(ai, xattr) false
+# define aclinfo_free(ai) ((void) 0)
+#endif
+#if (USE_ACL && HAVE_LINUX_XATTR_H && HAVE_LISTXATTR \
+     && (HAVE_SMACK || USE_SELINUX_SELINUX_H))
+void aclinfo_scontext_free (char *);
+#else
+# define aclinfo_scontext_free(s) ((void) 0)
+#endif
 
 int qset_acl (char const *, int, mode_t);
 int xset_acl (char const *, int, mode_t);
diff --git a/tp/Texinfo/XS/gnulib/lib/c++defs.h 
b/tp/Texinfo/XS/gnulib/lib/c++defs.h
index 7082af3fc2..7843359caa 100644
--- a/tp/Texinfo/XS/gnulib/lib/c++defs.h
+++ b/tp/Texinfo/XS/gnulib/lib/c++defs.h
@@ -104,10 +104,15 @@
 # define _GL_EXTERN_C_FUNC
 #endif
 
-/* _GL_FUNCDECL_RPL (func, rettype, parameters[, attributes]);
+/* _GL_FUNCDECL_RPL (func, rettype, parameters, [attributes]);
    declares a replacement function, named rpl_func, with the given prototype,
    consisting of return type, parameters, and attributes.
-   Example:
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW;
      _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...),
                                   _GL_ARG_NONNULL ((1)));
 
@@ -116,24 +121,22 @@
    because
      [[...]] extern "C" <declaration>;
    is invalid syntax in C++.)
-
-   Note: The attribute _GL_ATTRIBUTE_NOTHROW, if needed, must be placed outside
-   of the _GL_FUNCDECL_RPL invocation, at the end of the declaration.
  */
 #define _GL_FUNCDECL_RPL(func,rettype,parameters,...) \
   _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters, __VA_ARGS__)
 #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
 
-/* _GL_FUNCDECL_SYS (func, rettype, parameters[, attributes]);
+/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
    declares the system function, named func, with the given prototype,
    consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...),
-                                  _GL_ARG_NONNULL ((1)));
-
-   Note: The attribute _GL_ATTRIBUTE_NOTHROW, if needed, must be placed outside
-   of the _GL_FUNCDECL_SYS invocation, at the end of the declaration.
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), 
_GL_ATTRIBUTE_NODISCARD);
  */
 #define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
   _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
diff --git a/tp/Texinfo/XS/gnulib/lib/fcntl.in.h 
b/tp/Texinfo/XS/gnulib/lib/fcntl.in.h
index 8b8274295a..fc65d40bc0 100644
--- a/tp/Texinfo/XS/gnulib/lib/fcntl.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/fcntl.in.h
@@ -141,14 +141,14 @@ _GL_CXXALIASWARN (creat);
 #   undef fcntl
 #   define fcntl rpl_fcntl
 #  endif
-_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...));
+_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...), );
 _GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...));
 #  if !GNULIB_defined_rpl_fcntl
 #   define GNULIB_defined_rpl_fcntl 1
 #  endif
 # else
 #  if !@HAVE_FCNTL@
-_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...));
+_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...), );
 #   if !GNULIB_defined_fcntl
 #    define GNULIB_defined_fcntl 1
 #   endif
diff --git a/tp/Texinfo/XS/gnulib/lib/inttypes.in.h 
b/tp/Texinfo/XS/gnulib/lib/inttypes.in.h
index e9c80f3dca..747f1bb787 100644
--- a/tp/Texinfo/XS/gnulib/lib/inttypes.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/inttypes.in.h
@@ -913,11 +913,11 @@ extern "C" {
 #   undef imaxabs
 #   define imaxabs rpl_imaxabs
 #  endif
-_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x));
+_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x), );
 _GL_CXXALIAS_RPL (imaxabs, intmax_t, (intmax_t x));
 # else
 #  if !@HAVE_DECL_IMAXABS@
-_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x));
+_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x), );
 #  endif
 _GL_CXXALIAS_SYS (imaxabs, intmax_t, (intmax_t x));
 # endif
@@ -944,11 +944,11 @@ typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t;
 #   undef imaxdiv
 #   define imaxdiv rpl_imaxdiv
 #  endif
-_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom), );
 _GL_CXXALIAS_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
 # else
 #  if !@HAVE_DECL_IMAXDIV@
-_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom), );
 #  endif
 _GL_CXXALIAS_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
 # endif
diff --git a/tp/Texinfo/XS/gnulib/lib/locale.in.h 
b/tp/Texinfo/XS/gnulib/lib/locale.in.h
index d025ef53ca..c3d34085de 100644
--- a/tp/Texinfo/XS/gnulib/lib/locale.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/locale.in.h
@@ -168,7 +168,7 @@ struct lconv
 #   undef localeconv
 #   define localeconv rpl_localeconv
 #  endif
-_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void));
+_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void), );
 _GL_CXXALIAS_RPL (localeconv, struct lconv *, (void));
 # else
 _GL_CXXALIAS_SYS (localeconv, struct lconv *, (void));
@@ -197,7 +197,7 @@ _GL_WARN_ON_USE (localeconv,
 #   define setlocale rpl_setlocale
 #   define GNULIB_defined_setlocale 1
 #  endif
-_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale));
+_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale), );
 _GL_CXXALIAS_RPL (setlocale, char *, (int category, const char *locale));
 # else
 _GL_CXXALIAS_SYS (setlocale, char *, (int category, const char *locale));
diff --git a/tp/Texinfo/XS/gnulib/lib/signal.in.h 
b/tp/Texinfo/XS/gnulib/lib/signal.in.h
index a0effa21ba..6239b90adf 100644
--- a/tp/Texinfo/XS/gnulib/lib/signal.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/signal.in.h
@@ -149,7 +149,7 @@ typedef void (*sighandler_t) (int);
 
 #if @GNULIB_SIG2STR@
 # if !@HAVE_SIG2STR@
-_GL_FUNCDECL_SYS (sig2str, int, (int signo, char *str));
+_GL_FUNCDECL_SYS (sig2str, int, (int signo, char *str), );
 # endif
 _GL_CXXALIAS_SYS (sig2str, int, (int signo, char *str));
 # if __GLIBC__ >= 2
@@ -165,7 +165,7 @@ _GL_WARN_ON_USE (sig2str, "sig2str is not portable - "
 
 #if @GNULIB_SIG2STR@
 # if !@HAVE_STR2SIG@
-_GL_FUNCDECL_SYS (str2sig, int, (char const *str, int *signo_p));
+_GL_FUNCDECL_SYS (str2sig, int, (char const *str, int *signo_p), );
 # endif
 _GL_CXXALIAS_SYS (str2sig, int, (char const *str, int *signo_p));
 # if __GLIBC__ >= 2
@@ -189,7 +189,7 @@ _GL_WARN_ON_USE (str2sig, "str2sig is not portable - "
 _GL_FUNCDECL_RPL (pthread_sigmask, int,
                   (int how,
                    const sigset_t *restrict new_mask,
-                   sigset_t *restrict old_mask));
+                   sigset_t *restrict old_mask), );
 _GL_CXXALIAS_RPL (pthread_sigmask, int,
                   (int how,
                    const sigset_t *restrict new_mask,
@@ -199,7 +199,7 @@ _GL_CXXALIAS_RPL (pthread_sigmask, int,
 _GL_FUNCDECL_SYS (pthread_sigmask, int,
                   (int how,
                    const sigset_t *restrict new_mask,
-                   sigset_t *restrict old_mask));
+                   sigset_t *restrict old_mask), );
 #  endif
 _GL_CXXALIAS_SYS (pthread_sigmask, int,
                   (int how,
@@ -224,11 +224,11 @@ _GL_WARN_ON_USE (pthread_sigmask, "pthread_sigmask is not 
portable - "
 #   undef raise
 #   define raise rpl_raise
 #  endif
-_GL_FUNCDECL_RPL (raise, int, (int sig));
+_GL_FUNCDECL_RPL (raise, int, (int sig), );
 _GL_CXXALIAS_RPL (raise, int, (int sig));
 # else
 #  if !@HAVE_RAISE@
-_GL_FUNCDECL_SYS (raise, int, (int sig));
+_GL_FUNCDECL_SYS (raise, int, (int sig), );
 #  endif
 _GL_CXXALIAS_SYS (raise, int, (int sig));
 # endif
@@ -359,7 +359,7 @@ _GL_CXXALIASWARN (sigpending);
 _GL_FUNCDECL_SYS (sigprocmask, int,
                   (int operation,
                    const sigset_t *restrict set,
-                   sigset_t *restrict old_set));
+                   sigset_t *restrict old_set), );
 # endif
 _GL_CXXALIAS_SYS (sigprocmask, int,
                   (int operation,
@@ -384,7 +384,7 @@ typedef void (*_gl_function_taking_int_returning_void_t) 
(int);
 #   define signal rpl_signal
 #  endif
 _GL_FUNCDECL_RPL (signal, _gl_function_taking_int_returning_void_t,
-                  (int sig, _gl_function_taking_int_returning_void_t func));
+                  (int sig, _gl_function_taking_int_returning_void_t func), );
 _GL_CXXALIAS_RPL (signal, _gl_function_taking_int_returning_void_t,
                   (int sig, _gl_function_taking_int_returning_void_t func));
 # else
@@ -392,7 +392,7 @@ _GL_CXXALIAS_RPL (signal, 
_gl_function_taking_int_returning_void_t,
    because it occurs in <sys/signal.h>, not <signal.h> directly.  */
 #  if defined __OpenBSD__
 _GL_FUNCDECL_SYS (signal, _gl_function_taking_int_returning_void_t,
-                  (int sig, _gl_function_taking_int_returning_void_t func));
+                  (int sig, _gl_function_taking_int_returning_void_t func), );
 #  endif
 _GL_CXXALIAS_SYS (signal, _gl_function_taking_int_returning_void_t,
                   (int sig, _gl_function_taking_int_returning_void_t func));
@@ -510,7 +510,7 @@ struct sigaction
 #  endif
 
 _GL_FUNCDECL_SYS (sigaction, int, (int, const struct sigaction *restrict,
-                                   struct sigaction *restrict));
+                                   struct sigaction *restrict), );
 
 # elif !@HAVE_STRUCT_SIGACTION_SA_SIGACTION@
 
diff --git a/tp/Texinfo/XS/gnulib/lib/stdio.in.h 
b/tp/Texinfo/XS/gnulib/lib/stdio.in.h
index 36fd6a72ce..e77798d9b2 100644
--- a/tp/Texinfo/XS/gnulib/lib/stdio.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/stdio.in.h
@@ -461,7 +461,7 @@ _GL_CXXALIASWARN (fdopen);
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define fflush rpl_fflush
 #  endif
-_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream));
+_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream), );
 _GL_CXXALIAS_RPL (fflush, int, (FILE *gl_stream));
 # else
 _GL_CXXALIAS_SYS (fflush, int, (FILE *gl_stream));
@@ -994,7 +994,7 @@ _GL_CXXALIASWARN (getc);
 #   undef getchar
 #   define getchar rpl_getchar
 #  endif
-_GL_FUNCDECL_RPL (getchar, int, (void));
+_GL_FUNCDECL_RPL (getchar, int, (void), );
 _GL_CXXALIAS_RPL (getchar, int, (void));
 # else
 _GL_CXXALIAS_SYS (getchar, int, (void));
@@ -1112,7 +1112,7 @@ _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream));
 #  if @HAVE_DECL_GETW@
 #   if defined __APPLE__ && defined __MACH__
 /* The presence of the declaration depends on _POSIX_C_SOURCE.  */
-_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream));
+_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream), );
 #   endif
 _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream));
 #  endif
@@ -1221,7 +1221,7 @@ _GL_WARN_ON_USE (pclose, "pclose is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define perror rpl_perror
 #  endif
-_GL_FUNCDECL_RPL (perror, void, (const char *string));
+_GL_FUNCDECL_RPL (perror, void, (const char *string), );
 _GL_CXXALIAS_RPL (perror, void, (const char *string));
 # else
 _GL_CXXALIAS_SYS (perror, void, (const char *string));
@@ -1366,7 +1366,7 @@ _GL_CXXALIASWARN (putc);
 #   undef putchar
 #   define putchar rpl_putchar
 #  endif
-_GL_FUNCDECL_RPL (putchar, int, (int c));
+_GL_FUNCDECL_RPL (putchar, int, (int c), );
 _GL_CXXALIAS_RPL (putchar, int, (int c));
 # else
 _GL_CXXALIAS_SYS (putchar, int, (int c));
@@ -1406,7 +1406,7 @@ _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict 
stream));
 #  if @HAVE_DECL_PUTW@
 #   if defined __APPLE__ && defined __MACH__
 /* The presence of the declaration depends on _POSIX_C_SOURCE.  */
-_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream));
+_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream), );
 #   endif
 _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream));
 #  endif
diff --git a/tp/Texinfo/XS/gnulib/lib/stdlib.in.h 
b/tp/Texinfo/XS/gnulib/lib/stdlib.in.h
index 1ec96c8b24..6667f426ad 100644
--- a/tp/Texinfo/XS/gnulib/lib/stdlib.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/stdlib.in.h
@@ -20,7 +20,9 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if (defined __need_system_stdlib_h && !defined _GLIBCXX_STDLIB_H) || defined 
__need_malloc_and_calloc
+#if ((defined __need_system_stdlib_h && !defined _GLIBCXX_STDLIB_H) \
+     || defined __need_malloc_and_calloc) \
+    && !defined __SUNPRO_CC
 /* Special invocation conventions inside some gnulib header files,
    and inside some glibc header files, respectively.
    Do not recognize this special invocation convention when GCC's
@@ -220,11 +222,11 @@ struct random_data
 #   undef _Exit
 #   define _Exit rpl__Exit
 #  endif
-_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status));
+_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status), );
 _GL_CXXALIAS_RPL (_Exit, void, (int status));
 # else
 #  if !@HAVE__EXIT@
-_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
+_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status), );
 #  endif
 _GL_CXXALIAS_SYS (_Exit, void, (int status));
 # endif
@@ -249,7 +251,7 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
 #   undef abort
 #   define abort rpl_abort
 #  endif
-_GL_FUNCDECL_RPL (abort, _Noreturn void, (void));
+_GL_FUNCDECL_RPL (abort, _Noreturn void, (void), );
 _GL_CXXALIAS_RPL (abort, void, (void));
 # else
 _GL_CXXALIAS_SYS (abort, void, (void));
@@ -267,9 +269,9 @@ _GL_CXXALIASWARN (abort);
 #   define free rpl_free
 #  endif
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_FUNCDECL_RPL (free, void, (void *ptr)) _GL_ATTRIBUTE_NOTHROW;
+_GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW;
 #  else
-_GL_FUNCDECL_RPL (free, void, (void *ptr));
+_GL_FUNCDECL_RPL (free, void, (void *ptr), );
 #  endif
 _GL_CXXALIAS_RPL (free, void, (void *ptr));
 # else
@@ -592,7 +594,7 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - "
 #  if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
 _GL_FUNCDECL_RPL (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE);
 #  else
-_GL_FUNCDECL_RPL (getprogname, const char *, (void));
+_GL_FUNCDECL_RPL (getprogname, const char *, (void), );
 #  endif
 _GL_CXXALIAS_RPL (getprogname, const char *, (void));
 # else
@@ -600,7 +602,7 @@ _GL_CXXALIAS_RPL (getprogname, const char *, (void));
 #   if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
 _GL_FUNCDECL_SYS (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE);
 #   else
-_GL_FUNCDECL_SYS (getprogname, const char *, (void));
+_GL_FUNCDECL_SYS (getprogname, const char *, (void), );
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (getprogname, const char *, (void));
@@ -662,7 +664,7 @@ _GL_WARN_ON_USE (getsubopt, "getsubopt is unportable - "
 /* Change the ownership and access permission of the slave side of the
    pseudo-terminal whose master side is specified by FD.  */
 # if !@HAVE_GRANTPT@
-_GL_FUNCDECL_SYS (grantpt, int, (int fd));
+_GL_FUNCDECL_SYS (grantpt, int, (int fd), );
 # endif
 _GL_CXXALIAS_SYS (grantpt, int, (int fd));
 _GL_CXXALIASWARN (grantpt);
@@ -788,13 +790,13 @@ _GL_WARN_ON_USE (mbstowcs, "mbstowcs is unportable - "
 #   define mbtowc rpl_mbtowc
 #  endif
 _GL_FUNCDECL_RPL (mbtowc, int,
-                  (wchar_t *restrict pwc, const char *restrict s, size_t n));
+                  (wchar_t *restrict pwc, const char *restrict s, size_t n), );
 _GL_CXXALIAS_RPL (mbtowc, int,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n));
 # else
 #  if !@HAVE_MBTOWC@
 _GL_FUNCDECL_SYS (mbtowc, int,
-                  (wchar_t *restrict pwc, const char *restrict s, size_t n));
+                  (wchar_t *restrict pwc, const char *restrict s, size_t n), );
 #  endif
 _GL_CXXALIAS_SYS (mbtowc, int,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n));
@@ -1078,11 +1080,11 @@ _GL_WARN_ON_USE (ptsname, "ptsname is not portable - "
 #   undef ptsname_r
 #   define ptsname_r rpl_ptsname_r
 #  endif
-_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
+_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len), );
 _GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
 # else
 #  if !@HAVE_PTSNAME_R@
-_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
+_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len), );
 #  endif
 _GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
 # endif
@@ -1204,7 +1206,7 @@ _GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - "
 #   undef rand
 #   define rand rpl_rand
 #  endif
-_GL_FUNCDECL_RPL (rand, int, (void));
+_GL_FUNCDECL_RPL (rand, int, (void), );
 _GL_CXXALIAS_RPL (rand, int, (void));
 # else
 _GL_CXXALIAS_SYS (rand, int, (void));
@@ -1221,11 +1223,11 @@ _GL_CXXALIASWARN (rand);
 #   undef random
 #   define random rpl_random
 #  endif
-_GL_FUNCDECL_RPL (random, long, (void));
+_GL_FUNCDECL_RPL (random, long, (void), );
 _GL_CXXALIAS_RPL (random, long, (void));
 # else
 #  if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (random, long, (void));
+_GL_FUNCDECL_SYS (random, long, (void), );
 #  endif
 /* Need to cast, because on Haiku, the return type is
                                int.  */
@@ -1248,11 +1250,11 @@ _GL_WARN_ON_USE (random, "random is unportable - "
 #   undef srandom
 #   define srandom rpl_srandom
 #  endif
-_GL_FUNCDECL_RPL (srandom, void, (unsigned int seed));
+_GL_FUNCDECL_RPL (srandom, void, (unsigned int seed), );
 _GL_CXXALIAS_RPL (srandom, void, (unsigned int seed));
 # else
 #  if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
+_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed), );
 #  endif
 /* Need to cast, because on FreeBSD, the first parameter is
                                        unsigned long seed.  */
@@ -1910,7 +1912,7 @@ _GL_WARN_ON_USE (strtoull, "strtoull is unportable - "
 /* Unlock the slave side of the pseudo-terminal whose master side is specified
    by FD, so that it can be opened.  */
 # if !@HAVE_UNLOCKPT@
-_GL_FUNCDECL_SYS (unlockpt, int, (int fd));
+_GL_FUNCDECL_SYS (unlockpt, int, (int fd), );
 # endif
 _GL_CXXALIAS_SYS (unlockpt, int, (int fd));
 _GL_CXXALIASWARN (unlockpt);
@@ -1955,7 +1957,7 @@ _GL_WARN_ON_USE (unsetenv, "unsetenv is unportable - "
 #   undef wctomb
 #   define wctomb rpl_wctomb
 #  endif
-_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc));
+_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc), );
 _GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc));
 # else
 _GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc));
diff --git a/tp/Texinfo/XS/gnulib/lib/string.in.h 
b/tp/Texinfo/XS/gnulib/lib/string.in.h
index a588e7e2c2..f5a6d8b326 100644
--- a/tp/Texinfo/XS/gnulib/lib/string.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/string.in.h
@@ -213,7 +213,7 @@ _GL_WARN_ON_USE (explicit_bzero, "explicit_bzero is 
unportable - "
 /* Find the index of the least-significant set bit.  */
 #if @GNULIB_FFSL@
 # if !@HAVE_FFSL@
-_GL_FUNCDECL_SYS (ffsl, int, (long int i));
+_GL_FUNCDECL_SYS (ffsl, int, (long int i), );
 # endif
 _GL_CXXALIAS_SYS (ffsl, int, (long int i));
 _GL_CXXALIASWARN (ffsl);
@@ -231,11 +231,11 @@ _GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the 
ffsl module");
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define ffsll rpl_ffsll
 #  endif
-_GL_FUNCDECL_RPL (ffsll, int, (long long int i));
+_GL_FUNCDECL_RPL (ffsll, int, (long long int i), );
 _GL_CXXALIAS_RPL (ffsll, int, (long long int i));
 # else
 #  if !@HAVE_FFSLL@
-_GL_FUNCDECL_SYS (ffsll, int, (long long int i));
+_GL_FUNCDECL_SYS (ffsll, int, (long long int i), );
 #  endif
 _GL_CXXALIAS_SYS (ffsll, int, (long long int i));
 # endif
@@ -1308,7 +1308,7 @@ _GL_EXTERN_C char * mbstok_r (char *restrict string, 
const char *delim,
 #   undef strerror
 #   define strerror rpl_strerror
 #  endif
-_GL_FUNCDECL_RPL (strerror, char *, (int));
+_GL_FUNCDECL_RPL (strerror, char *, (int), );
 _GL_CXXALIAS_RPL (strerror, char *, (int));
 # else
 _GL_CXXALIAS_SYS (strerror, char *, (int));
@@ -1359,11 +1359,11 @@ _GL_WARN_ON_USE (strerror_r, "strerror_r is unportable 
- "
 #   undef strerrorname_np
 #   define strerrorname_np rpl_strerrorname_np
 #  endif
-_GL_FUNCDECL_RPL (strerrorname_np, const char *, (int errnum));
+_GL_FUNCDECL_RPL (strerrorname_np, const char *, (int errnum), );
 _GL_CXXALIAS_RPL (strerrorname_np, const char *, (int errnum));
 # else
 #  if !@HAVE_STRERRORNAME_NP@
-_GL_FUNCDECL_SYS (strerrorname_np, const char *, (int errnum));
+_GL_FUNCDECL_SYS (strerrorname_np, const char *, (int errnum), );
 #  endif
 _GL_CXXALIAS_SYS (strerrorname_np, const char *, (int errnum));
 # endif
@@ -1379,7 +1379,7 @@ _GL_WARN_ON_USE (strerrorname_np, "strerrorname_np is 
unportable - "
 /* Return an abbreviation string for the signal number SIG.  */
 #if @GNULIB_SIGABBREV_NP@
 # if ! @HAVE_SIGABBREV_NP@
-_GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig));
+_GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig), );
 # endif
 _GL_CXXALIAS_SYS (sigabbrev_np, const char *, (int sig));
 _GL_CXXALIASWARN (sigabbrev_np);
@@ -1394,7 +1394,7 @@ _GL_WARN_ON_USE (sigabbrev_np, "sigabbrev_np is 
unportable - "
 /* Return an English description string for the signal number SIG.  */
 #if @GNULIB_SIGDESCR_NP@
 # if ! @HAVE_SIGDESCR_NP@
-_GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig));
+_GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig), );
 # endif
 _GL_CXXALIAS_SYS (sigdescr_np, const char *, (int sig));
 _GL_CXXALIASWARN (sigdescr_np);
@@ -1411,11 +1411,11 @@ _GL_WARN_ON_USE (sigdescr_np, "sigdescr_np is 
unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define strsignal rpl_strsignal
 #  endif
-_GL_FUNCDECL_RPL (strsignal, char *, (int __sig));
+_GL_FUNCDECL_RPL (strsignal, char *, (int __sig), );
 _GL_CXXALIAS_RPL (strsignal, char *, (int __sig));
 # else
 #  if ! @HAVE_DECL_STRSIGNAL@
-_GL_FUNCDECL_SYS (strsignal, char *, (int __sig));
+_GL_FUNCDECL_SYS (strsignal, char *, (int __sig), );
 #  endif
 /* Need to cast, because on Cygwin 1.5.x systems, the return type is
    'const char *'.  */
diff --git a/tp/Texinfo/XS/gnulib/lib/sys_stat.in.h 
b/tp/Texinfo/XS/gnulib/lib/sys_stat.in.h
index d2ecdb9da9..81138bce25 100644
--- a/tp/Texinfo/XS/gnulib/lib/sys_stat.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/sys_stat.in.h
@@ -585,11 +585,11 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - "
 #   undef futimens
 #   define futimens rpl_futimens
 #  endif
-_GL_FUNCDECL_RPL (futimens, int, (int fd, struct timespec const times[2]));
+_GL_FUNCDECL_RPL (futimens, int, (int fd, struct timespec const times[2]), );
 _GL_CXXALIAS_RPL (futimens, int, (int fd, struct timespec const times[2]));
 # else
 #  if !@HAVE_FUTIMENS@
-_GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2]));
+_GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2]), );
 #  endif
 _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2]));
 # endif
@@ -608,9 +608,9 @@ _GL_WARN_ON_USE (futimens, "futimens is not portable - "
 #if @GNULIB_GETUMASK@
 # if !@HAVE_GETUMASK@
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
-_GL_FUNCDECL_SYS (getumask, mode_t, (void)) _GL_ATTRIBUTE_NOTHROW;
+_GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW;
 #  else
-_GL_FUNCDECL_SYS (getumask, mode_t, (void));
+_GL_FUNCDECL_SYS (getumask, mode_t, (void), );
 #  endif
 # endif
 _GL_CXXALIAS_SYS (getumask, mode_t, (void));
diff --git a/tp/Texinfo/XS/gnulib/lib/time.in.h 
b/tp/Texinfo/XS/gnulib/lib/time.in.h
index 097c509d3c..5dc03c892a 100644
--- a/tp/Texinfo/XS/gnulib/lib/time.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/time.in.h
@@ -201,7 +201,7 @@ _GL_WARN_ON_USE (timespec_getres, "timespec_getres is 
unportable - "
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    define time rpl_time
 #   endif
-_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp));
+_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp), );
 _GL_CXXALIAS_RPL (time, time_t, (time_t *__tp));
 #  else
 _GL_CXXALIAS_SYS (time, time_t, (time_t *__tp));
@@ -255,7 +255,7 @@ _GL_WARN_ON_USE (nanosleep, "nanosleep is unportable - "
 #    undef tzset
 #    define tzset rpl_tzset
 #   endif
-_GL_FUNCDECL_RPL (tzset, void, (void));
+_GL_FUNCDECL_RPL (tzset, void, (void), );
 _GL_CXXALIAS_RPL (tzset, void, (void));
 #  elif defined _WIN32 && !defined __CYGWIN__
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -516,7 +516,7 @@ typedef struct tm_zone *rpl_timezone_t;
    May return NULL if NAME is invalid (this is platform dependent) or
    upon memory allocation failure.  */
 #  if !@HAVE_TZALLOC@
-_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name));
+_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name), );
 _GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name));
 #  endif
 
@@ -524,7 +524,7 @@ _GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const 
*__name));
    Frees a time zone object.
    The argument must have been returned by tzalloc().  */
 #  if !@HAVE_TZALLOC@
-_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz));
+_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz), );
 _GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz));
 #  endif
 
diff --git a/tp/Texinfo/XS/gnulib/lib/uchar.in.h 
b/tp/Texinfo/XS/gnulib/lib/uchar.in.h
index 9f2360471e..1b9487e39f 100644
--- a/tp/Texinfo/XS/gnulib/lib/uchar.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/uchar.in.h
@@ -192,7 +192,7 @@ c32isalnum (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isalnum, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isalnum, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isalnum, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isalnum);
@@ -211,7 +211,7 @@ c32isalpha (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isalpha, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isalpha, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isalpha, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isalpha);
@@ -230,7 +230,7 @@ c32isblank (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isblank, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isblank, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isblank, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isblank);
@@ -249,7 +249,7 @@ c32iscntrl (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32iscntrl, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32iscntrl, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32iscntrl, int, (wint_t wc));
 _GL_CXXALIASWARN (c32iscntrl);
@@ -268,7 +268,7 @@ c32isdigit (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isdigit, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isdigit, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isdigit, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isdigit);
@@ -287,7 +287,7 @@ c32isgraph (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isgraph, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isgraph, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isgraph, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isgraph);
@@ -306,7 +306,7 @@ c32islower (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32islower, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32islower, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32islower, int, (wint_t wc));
 _GL_CXXALIASWARN (c32islower);
@@ -325,7 +325,7 @@ c32isprint (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isprint, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isprint, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isprint, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isprint);
@@ -344,7 +344,7 @@ c32ispunct (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32ispunct, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32ispunct, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32ispunct, int, (wint_t wc));
 _GL_CXXALIASWARN (c32ispunct);
@@ -363,7 +363,7 @@ c32isspace (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isspace, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isspace, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isspace, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isspace);
@@ -382,7 +382,7 @@ c32isupper (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isupper, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isupper, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isupper, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isupper);
@@ -401,7 +401,7 @@ c32isxdigit (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32isxdigit, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32isxdigit, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32isxdigit, int, (wint_t wc));
 _GL_CXXALIASWARN (c32isxdigit);
@@ -423,7 +423,7 @@ c32tolower (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc));
+_GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32tolower, wint_t, (wint_t wc));
 _GL_CXXALIASWARN (c32tolower);
@@ -442,7 +442,7 @@ c32toupper (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc));
+_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32toupper, wint_t, (wint_t wc));
 _GL_CXXALIASWARN (c32toupper);
@@ -464,7 +464,7 @@ c32width (char32_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32width, int, (char32_t wc));
+_GL_FUNCDECL_SYS (c32width, int, (char32_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32width, int, (char32_t wc));
 _GL_CXXALIASWARN (c32width);
@@ -478,11 +478,11 @@ _GL_CXXALIASWARN (c32width);
 #   undef c32rtomb
 #   define c32rtomb rpl_c32rtomb
 #  endif
-_GL_FUNCDECL_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
+_GL_FUNCDECL_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), );
 _GL_CXXALIAS_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
 # else
 #  if !@HAVE_C32RTOMB@
-_GL_FUNCDECL_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
+_GL_FUNCDECL_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), );
 #  endif
 _GL_CXXALIAS_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
 # endif
@@ -617,7 +617,7 @@ c32tob (wint_t wc)
 }
 _GL_END_C_LINKAGE
 # else
-_GL_FUNCDECL_SYS (c32tob, int, (wint_t wc));
+_GL_FUNCDECL_SYS (c32tob, int, (wint_t wc), );
 # endif
 _GL_CXXALIAS_SYS (c32tob, int, (wint_t wc));
 _GL_CXXALIASWARN (c32tob);
@@ -632,13 +632,13 @@ _GL_CXXALIASWARN (c32tob);
 #   define mbrtoc32 rpl_mbrtoc32
 #  endif
 _GL_FUNCDECL_RPL (mbrtoc32, size_t,
-                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps), );
 _GL_CXXALIAS_RPL (mbrtoc32, size_t,
                   (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
 # else
 #  if !@HAVE_MBRTOC32@
 _GL_FUNCDECL_SYS (mbrtoc32, size_t,
-                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps), );
 #  endif
 _GL_CXXALIAS_SYS (mbrtoc32, size_t,
                   (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
@@ -664,13 +664,13 @@ _GL_WARN_ON_USE (mbrtoc32, "mbrtoc32 is not portable - "
 #   define mbrtoc16 rpl_mbrtoc16
 #  endif
 _GL_FUNCDECL_RPL (mbrtoc16, size_t,
-                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps), );
 _GL_CXXALIAS_RPL (mbrtoc16, size_t,
                   (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
 # else
 #  if !@HAVE_MBRTOC16@
 _GL_FUNCDECL_SYS (mbrtoc16, size_t,
-                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps), );
 #  endif
 _GL_CXXALIAS_SYS (mbrtoc16, size_t,
                   (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
@@ -826,7 +826,7 @@ c32_apply_type_test (wint_t wc, c32_type_test_t property)
 _GL_END_C_LINKAGE
 #  else
 _GL_FUNCDECL_SYS (c32_apply_type_test, int,
-                  (wint_t wc, c32_type_test_t property));
+                  (wint_t wc, c32_type_test_t property), );
 #  endif
 # else
 _GL_FUNCDECL_SYS (c32_apply_type_test, int,
diff --git a/tp/Texinfo/XS/gnulib/lib/unicase/cased.h 
b/tp/Texinfo/XS/gnulib/lib/unicase/cased.h
index dca12035de..16e548e32f 100644
--- a/tp/Texinfo/XS/gnulib/lib/unicase/cased.h
+++ b/tp/Texinfo/XS/gnulib/lib/unicase/cased.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Casing Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -324,7 +324,7 @@ u_casing_property_cased =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFF01FFU, 0xE7FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -346,7 +346,7 @@ u_casing_property_cased =
     0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00003FFFU,
     0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFF78FFU, 0xFFFFFFFFU, 0x03EB07FFU, 0x077C0000U,
+    0xFFFF78FFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0x077C0000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFF0000U, 0xF7FFFFFFU, 0xFFFF03FFU,
@@ -369,8 +369,8 @@ u_casing_property_cased =
     0xFFFFFFB9U, 0x07FDFFFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0xFFFF003FU,
+    0x0000003FU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/tp/Texinfo/XS/gnulib/lib/unicase/ignorable.h 
b/tp/Texinfo/XS/gnulib/lib/unicase/ignorable.h
index bf41d94e4b..c59ceab16d 100644
--- a/tp/Texinfo/XS/gnulib/lib/unicase/ignorable.h
+++ b/tp/Texinfo/XS/gnulib/lib/unicase/ignorable.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Casing Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[55 << 4];
+    unsigned int level3[57 << 4];
   }
 u_casing_property_case_ignorable =
 {
@@ -234,14 +234,14 @@ u_casing_property_case_ignorable =
        -1,
        -1,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   656,
        -1,
        -1,
        -1,
        -1,
-       -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   656,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   672,
+       16 +   384 * sizeof (short) / sizeof (int) +   688,
+       16 +   384 * sizeof (short) / sizeof (int) +   704,
        -1,
        -1,
        -1,
@@ -273,14 +273,14 @@ u_casing_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   688,
+       16 +   384 * sizeof (short) / sizeof (int) +   720,
        -1,
        -1,
        -1,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   704,
+       16 +   384 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
        -1,
@@ -289,32 +289,32 @@ u_casing_property_case_ignorable =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   720,
-       16 +   384 * sizeof (short) / sizeof (int) +   736,
        16 +   384 * sizeof (short) / sizeof (int) +   752,
+       16 +   384 * sizeof (short) / sizeof (int) +   768,
+       16 +   384 * sizeof (short) / sizeof (int) +   784,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   768,
+       16 +   384 * sizeof (short) / sizeof (int) +   800,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   784,
-       16 +   384 * sizeof (short) / sizeof (int) +   800,
        16 +   384 * sizeof (short) / sizeof (int) +   816,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   832,
+       16 +   384 * sizeof (short) / sizeof (int) +   848,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   848,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   880,
        -1,
        -1,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   864,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   896,
        -1,
        -1,
        -1,
@@ -461,7 +461,7 @@ u_casing_property_case_ignorable =
     0x00028000U, 0xFFFF0000U, 0x000007FFU, 0x00000000U,
     0x00000000U, 0x0001FFC0U, 0x00000000U, 0x243FF800U,
     0xFFC00000U, 0x00003FFFU, 0x0E000000U, 0x00000000U,
-    0xFF030100U, 0x00000000U, 0xFFFFFE00U, 0xFFFFFFFFU,
+    0xFF830100U, 0x00000000U, 0xFFFFFE00U, 0xFFFFFFFFU,
     0x00000007U, 0x14000000U, 0x00FE21FEU, 0x0002000CU,
     0x00000002U, 0x10000000U, 0x0000201EU, 0x4000000CU,
     0x00000006U, 0x10000000U, 0x00023986U, 0x00230000U,
@@ -566,10 +566,10 @@ u_casing_property_case_ignorable =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x000000F0U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x000000F0U, 0x00004000U, 0x0000BE00U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00001800U, 0x00000000U, 0xE0000000U,
+    0x00000000U, 0x00001800U, 0x00000000U, 0xF0000000U,
     0x00000000U, 0x00000000U, 0x0001FFC0U, 0x00000000U,
     0x0000003CU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000002U, 0xFF000000U, 0x0000007FU, 0x80190000U,
@@ -579,14 +579,14 @@ u_casing_property_case_ignorable =
     0x00000000U, 0x40D38000U, 0x00000002U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x80000000U, 0x000007F8U,
     0x00000003U, 0x18000000U, 0x00000001U, 0x001F1FC0U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xF8000000U, 0x00054001U, 0x00000006U,
     0x00000000U, 0xFF000000U, 0x4000005CU, 0x00000000U,
     0x00000000U, 0x85F80000U, 0x0000000DU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xB03C0000U, 0x30000001U, 0x00000000U,
     0x00000000U, 0xA7F80000U, 0x00000001U, 0x00000000U,
     0x00000000U, 0x00BF2800U, 0x00000000U, 0x00000000U,
-    0xE0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
+    0xA0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x06FF8000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -602,18 +602,26 @@ u_casing_property_case_ignorable =
     0x00A30000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00180000U,
-    0x00000003U, 0x07C00000U, 0x00000005U, 0x00000000U,
+    0x00000003U, 0x07C00000U, 0x04000005U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFF0000U, 0x003FFF81U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xC0000000U, 0x0000E3FFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
     0x00000000U, 0x007F0000U, 0x0000000FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000007U, 0x00001800U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00008000U, 0x00000000U,
     0xFFFF8000U, 0x00000000U, 0x00000000U, 0x0000001BU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -651,7 +659,7 @@ u_casing_property_case_ignorable =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x0000F800U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000C000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x007F0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000FF0U, 0x00000000U,
diff --git a/tp/Texinfo/XS/gnulib/lib/unicase/special-casing-table.gperf 
b/tp/Texinfo/XS/gnulib/lib/unicase/special-casing-table.gperf
index 39e1f5d6d7..f4b82c35b7 100644
--- a/tp/Texinfo/XS/gnulib/lib/unicase/special-casing-table.gperf
+++ b/tp/Texinfo/XS/gnulib/lib/unicase/special-casing-table.gperf
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Special casing rules of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
diff --git a/tp/Texinfo/XS/gnulib/lib/unicase/tolower.h 
b/tp/Texinfo/XS/gnulib/lib/unicase/tolower.h
index 9c125f5054..794f4c0ca0 100644
--- a/tp/Texinfo/XS/gnulib/lib/unicase/tolower.h
+++ b/tp/Texinfo/XS/gnulib/lib/unicase/tolower.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
   {
     int level1[2];
     short level2[2 << 9];
-    int level3[35 << 7];
+    int level3[36 << 7];
   }
 u_mapping =
 {
@@ -100,10 +100,10 @@ u_mapping =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      3456,  3584,  3712,  3840,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  3968,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  3968,  4096,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  4096,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  4224,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -124,7 +124,7 @@ u_mapping =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,  4224,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  4352,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -155,7 +155,7 @@ u_mapping =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  4352,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  4480,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -356,7 +356,7 @@ u_mapping =
         8,     8,     8,     8,     8,     8,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     1,     0,     0,     0,     0,     0,     0,
     -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
     -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
     -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
@@ -572,9 +572,9 @@ u_mapping =
     -42258, -42282, -42261,   928,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,   -48, -42307, -35384,     1,
-        0,     1,     0,     0,     0,     0,     0,     0,
+        0,     1,     0, -42343,     1,     0,     0,     0,
         1,     0,     0,     0,     0,     0,     1,     0,
-        1,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0, -42561,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     1,     0,     0,
@@ -679,6 +679,22 @@ u_mapping =
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
        32,    32,    32,    32,    32,    32,    32,    32,
        32,    32,    32,    32,    32,    32,    32,    32,
        32,    32,    32,    32,    32,    32,    32,    32,
diff --git a/tp/Texinfo/XS/gnulib/lib/unicase/toupper.h 
b/tp/Texinfo/XS/gnulib/lib/unicase/toupper.h
index 4df2f32c17..ff117e05a3 100644
--- a/tp/Texinfo/XS/gnulib/lib/unicase/toupper.h
+++ b/tp/Texinfo/XS/gnulib/lib/unicase/toupper.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
   {
     int level1[2];
     short level2[2 << 9];
-    int level3[41 << 7];
+    int level3[43 << 7];
   }
 u_mapping =
 {
@@ -100,10 +100,10 @@ u_mapping =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
      4352,  4480,    -1,  4608,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  4736,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  4736,  4864,  4992,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  4864,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  5120,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -124,7 +124,7 @@ u_mapping =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,  4992,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  5248,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -155,7 +155,7 @@ u_mapping =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  5120,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  5376,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -214,7 +214,7 @@ u_mapping =
       195,     0,     0,    -1,     0,    -1,     0,     0,
        -1,     0,     0,     0,    -1,     0,     0,     0,
         0,     0,    -1,     0,     0,    97,     0,     0,
-        0,    -1,   163,     0,     0,     0,   130,     0,
+        0,    -1,   163, 42561,     0,     0,   130,     0,
         0,    -1,     0,    -1,     0,    -1,     0,     0,
        -1,     0,     0,     0,     0,    -1,     0,     0,
        -1,     0,     0,     0,    -1,     0,    -1,     0,
@@ -239,7 +239,7 @@ u_mapping =
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
     10783, 10780, 10782,  -210,  -206,     0,  -205,  -205,
         0,  -202,     0,  -203, 42319,     0,     0,     0,
-     -205, 42315,     0,  -207,     0, 42280, 42308,     0,
+     -205, 42315,     0,  -207, 42343, 42280, 42308,     0,
      -209,  -211, 42308, 10743, 42305,     0,     0,  -211,
         0, 10749,  -213,     0,     0,  -214,     0,     0,
         0,     0,     0,     0,     0, 10727,     0,     0,
@@ -388,7 +388,7 @@ u_mapping =
         0,     0,     0,     0,     0,     0,     0,     0,
        -8,    -8,    -8,    -8,    -8,    -8,     0,     0,
     -6254, -6253, -6244, -6242, -6242, -6243, -6236, -6181,
-    35266,     0,     0,     0,     0,     0,     0,     0,
+    35266,     0,    -1,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
@@ -652,9 +652,9 @@ u_mapping =
         0,     0,     0,     0,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,     0,     0,     0,
-       -1,     0,    -1,     0,     0,     0,     0,     0,
+       -1,     0,    -1,     0,     0,    -1,     0,     0,
         0,    -1,     0,     0,     0,     0,     0,    -1,
-        0,    -1,     0,     0,     0,     0,     0,     0,
+        0,    -1,     0,    -1,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,    -1,     0,
@@ -779,6 +779,38 @@ u_mapping =
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+      -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,
+      -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,
+      -32,   -32,   -32,   -32,   -32,   -32,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
       -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,
       -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,
       -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype.in.h 
b/tp/Texinfo/XS/gnulib/lib/unictype.in.h
index fdd2cd1cec..8ad2e5410d 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype.in.h
@@ -575,7 +575,8 @@ enum
   UC_JOINING_GROUP_HANIFI_ROHINGYA_PA,       /* Hanifi_Rohingya_Pa */
   UC_JOINING_GROUP_HANIFI_ROHINGYA_KINNA_YA, /* Hanifi_Rohingya_Kinna_Ya */
   UC_JOINING_GROUP_THIN_YEH,                 /* Thin_Yeh */
-  UC_JOINING_GROUP_VERTICAL_TAIL             /* Vertical_Tail */
+  UC_JOINING_GROUP_VERTICAL_TAIL,            /* Vertical_Tail */
+  UC_JOINING_GROUP_KASHMIRI_YEH              /* Kashmiri_Yeh */
 };
 
 /* Return the name of a joining group.  */
@@ -650,6 +651,7 @@ extern 
@GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@ const uc_property_t
 extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@ const 
uc_property_t UC_PROPERTY_GRAPHEME_EXTEND;
 extern @GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@ const 
uc_property_t UC_PROPERTY_OTHER_GRAPHEME_EXTEND;
 extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@ const 
uc_property_t UC_PROPERTY_GRAPHEME_LINK;
+extern @GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE@ const 
uc_property_t UC_PROPERTY_MODIFIER_COMBINING_MARK;
 /* Bidi.  */
 extern @GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@ const 
uc_property_t UC_PROPERTY_BIDI_CONTROL;
 extern @GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@ const 
uc_property_t UC_PROPERTY_BIDI_LEFT_TO_RIGHT;
@@ -802,6 +804,8 @@ extern bool uc_is_property_other_grapheme_extend (ucs4_t uc)
        _UC_ATTRIBUTE_CONST;
 extern bool uc_is_property_grapheme_link (ucs4_t uc)
        _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_modifier_combining_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
 extern bool uc_is_property_bidi_control (ucs4_t uc)
        _UC_ATTRIBUTE_CONST;
 extern bool uc_is_property_bidi_left_to_right (ucs4_t uc)
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/categ_L.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/categ_L.h
index a1b12ad2fe..573a54e03f 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/categ_L.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/categ_L.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[4];
     short level2[4 << 7];
-    unsigned int level3[78 << 4];
+    unsigned int level3[81 << 4];
   }
 u_categ_L =
 {
@@ -202,15 +202,15 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   800,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   816,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
+        5 +   512 * sizeof (short) / sizeof (int) +   832,
        -1,
        -1,
        -1,
@@ -223,14 +223,14 @@ u_categ_L =
        -1,
        -1,
        -1,
-       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   848,
        -1,
        -1,
        -1,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +   832,
-       -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   848,
+        5 +   512 * sizeof (short) / sizeof (int) +   864,
+        5 +   512 * sizeof (short) / sizeof (int) +   880,
+        5 +   512 * sizeof (short) / sizeof (int) +   896,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
@@ -242,10 +242,10 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +   864,
+        5 +   512 * sizeof (short) / sizeof (int) +   912,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +   880,
+        5 +   512 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
        -1,
@@ -262,14 +262,14 @@ u_categ_L =
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   896,
-        5 +   512 * sizeof (short) / sizeof (int) +   912,
-        5 +   512 * sizeof (short) / sizeof (int) +   928,
+        5 +   512 * sizeof (short) / sizeof (int) +   944,
+        5 +   512 * sizeof (short) / sizeof (int) +   960,
+        5 +   512 * sizeof (short) / sizeof (int) +   976,
        -1,
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   944,
+        5 +   512 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
        -1,
@@ -281,20 +281,20 @@ u_categ_L =
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   960,
-        5 +   512 * sizeof (short) / sizeof (int) +   976,
+        5 +   512 * sizeof (short) / sizeof (int) +  1008,
+        5 +   512 * sizeof (short) / sizeof (int) +  1024,
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   992,
-        5 +   512 * sizeof (short) / sizeof (int) +  1008,
-        5 +   512 * sizeof (short) / sizeof (int) +  1024,
         5 +   512 * sizeof (short) / sizeof (int) +  1040,
         5 +   512 * sizeof (short) / sizeof (int) +  1056,
         5 +   512 * sizeof (short) / sizeof (int) +  1072,
+        5 +   512 * sizeof (short) / sizeof (int) +  1088,
+        5 +   512 * sizeof (short) / sizeof (int) +  1104,
+        5 +   512 * sizeof (short) / sizeof (int) +  1120,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +  1088,
+        5 +   512 * sizeof (short) / sizeof (int) +  1136,
        -1,
        -1,
        -1,
@@ -386,7 +386,7 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1104,
+        5 +   512 * sizeof (short) / sizeof (int) +  1152,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
@@ -394,8 +394,8 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1120,
-        5 +   512 * sizeof (short) / sizeof (int) +  1136,
+        5 +   512 * sizeof (short) / sizeof (int) +  1168,
+        5 +   512 * sizeof (short) / sizeof (int) +  1184,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
@@ -406,7 +406,7 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1152,
+        5 +   512 * sizeof (short) / sizeof (int) +  1200,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
@@ -420,15 +420,15 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1168,
+        5 +   512 * sizeof (short) / sizeof (int) +  1216,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1184,
+        5 +   512 * sizeof (short) / sizeof (int) +  1232,
        -1,
        -1,
        -1,
        -1,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1200,
+        5 +   512 * sizeof (short) / sizeof (int) +  1248,
        -1,
        -1,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
@@ -440,7 +440,7 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1216,
+        5 +   512 * sizeof (short) / sizeof (int) +  1264,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
@@ -448,7 +448,7 @@ u_categ_L =
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
         5 +   512 * sizeof (short) / sizeof (int) +   320,
-        5 +   512 * sizeof (short) / sizeof (int) +  1232,
+        5 +   512 * sizeof (short) / sizeof (int) +  1280,
        -1,
        -1,
        -1,
@@ -618,7 +618,7 @@ u_categ_L =
     0xFFFFFFE0U, 0x000FFFFFU, 0x00001FE0U, 0x00000000U,
     0xFFFFFFF8U, 0xFC00C001U, 0xFFFFFFFFU, 0x0000003FU,
     0xFFFFFFFFU, 0x0000000FU, 0xFC00E000U, 0x3FFFFFFFU,
-    0xFFFF01FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -656,7 +656,7 @@ u_categ_L =
     0xFFFF1FFFU, 0x00000C00U, 0xFFFFFFFFU, 0x80007FFFU,
     0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU,
     0xFF800000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFF9FFU, 0xFFFFFFFFU, 0x03EB07FFU, 0xFFFC0000U,
+    0xFFFFF9FFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0xFFFC0000U,
     0xFFFFF7BBU, 0x00000007U, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFCU, 0x000FFFFFU, 0x00000000U, 0x68FC0000U,
     0xFFFFFC00U, 0xFFFF003FU, 0x0000007FU, 0x1FFFFFFFU,
@@ -696,7 +696,7 @@ u_categ_L =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF0000U, 0xFF0FFFFFU, 0x0FFFFFFFU,
     0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF000FU,
-    0xFFB7F7FFU, 0x1BFBFFFBU, 0x00000000U, 0x00000000U,
+    0xFFB7F7FFU, 0x1BFBFFFBU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU,
@@ -711,10 +711,10 @@ u_categ_L =
     0x0003FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U,
     0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
-    0xFFFFFFFFU, 0x0000000FU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x0000000FU, 0xFFFFFC00U, 0xFFFF803FU,
+    0x0000003FU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0x000303FFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x000303FFU, 0x0000001CU, 0x00000000U,
     0x1FFFFFFFU, 0xFFFF0080U, 0x0000003FU, 0xFFFF0000U,
     0x00000003U, 0xFFFF0000U, 0x0000001FU, 0x007FFFFFU,
     0xFFFFFFF8U, 0x00FFFFFFU, 0x00000000U, 0x00260000U,
@@ -724,7 +724,7 @@ u_categ_L =
     0xFFFBFFFFU, 0x80000FFFU, 0x00000001U, 0x00000000U,
     0xBFFFBD7FU, 0xFFFF01FFU, 0x7FFFFFFFU, 0x00000000U,
     0xFFF99FE0U, 0x23EDFDFFU, 0xE0010000U, 0x00000003U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF4BFFU, 0x00BFFFFFU, 0x000A0000U, 0x00000000U,
     0xFFFFFFFFU, 0x001FFFFFU, 0x80000780U, 0x00000003U,
     0xFFFFFFFFU, 0x0000FFFFU, 0x000000B0U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -740,7 +740,7 @@ u_categ_L =
     0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
     0x200003FFU, 0xFFFF0000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00000001U,
     0xFFFFFDFFU, 0x00007FFFU, 0x00000001U, 0xFFFC0000U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFB7FU, 0x0001FFFFU, 0x00000040U, 0xFFFFFDBFU,
@@ -761,18 +761,30 @@ u_categ_L =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU,
-    0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0x00000000U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFF0000U,
     0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF0000U, 0x00003FFFU,
     0xFFFFFFFFU, 0x0000FFFFU, 0x0000000FU, 0xE0FFFFF8U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00001FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x000107FFU, 0x00000000U,
@@ -782,7 +794,7 @@ u_categ_L =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x80000000U,
     0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -824,7 +836,7 @@ u_categ_L =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x00000FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x00013FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/categ_M.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/categ_M.h
index b316a2d8d0..98a7538731 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/categ_M.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/categ_M.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[47 << 4];
+    unsigned int level3[48 << 4];
   }
 u_categ_M =
 {
@@ -226,15 +226,14 @@ u_categ_M =
        -1,
        -1,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
        -1,
        -1,
-       -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   560,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -272,7 +271,8 @@ u_categ_M =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -281,21 +281,20 @@ u_categ_M =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   608,
        16 +   384 * sizeof (short) / sizeof (int) +   624,
        16 +   384 * sizeof (short) / sizeof (int) +   640,
+       16 +   384 * sizeof (short) / sizeof (int) +   656,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   656,
+       16 +   384 * sizeof (short) / sizeof (int) +   672,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   672,
        16 +   384 * sizeof (short) / sizeof (int) +   688,
        16 +   384 * sizeof (short) / sizeof (int) +   704,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   720,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
        -1,
@@ -306,7 +305,8 @@ u_categ_M =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   736,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   752,
        -1,
        -1,
        -1,
@@ -449,7 +449,7 @@ u_categ_M =
     0x00020000U, 0xFFFF0000U, 0x000007FFU, 0x00000000U,
     0x00000000U, 0x0001FFC0U, 0x00000000U, 0x200FF800U,
     0xFBC00000U, 0x00003EEFU, 0x0E000000U, 0x00000000U,
-    0xFF000000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFBU,
+    0xFF800000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFBU,
     0x0000000FU, 0xDC000000U, 0x00FEFFFFU, 0x0000000CU,
     0x0000000EU, 0xD0000000U, 0x0080399FU, 0x4000000CU,
     0x0000000EU, 0xD0000000U, 0x00023987U, 0x00230000U,
@@ -534,10 +534,10 @@ u_categ_M =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x000000F0U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x000000F0U, 0x00000000U, 0x00003E00U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00001800U, 0x00000000U, 0xE0000000U,
+    0x00000000U, 0x00001800U, 0x00000000U, 0xF0000000U,
     0x00000000U, 0x00000000U, 0x0001FFC0U, 0x00000000U,
     0x0000003CU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000007U, 0xFF000000U, 0x0000007FU, 0x80190000U,
@@ -547,7 +547,7 @@ u_categ_M =
     0x00000000U, 0x40FFF000U, 0x00000002U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x80000000U, 0x000007FFU,
     0x0000000FU, 0xD8000000U, 0x0080399FU, 0x001F1FCCU,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFF000000U, 0x0005F7A5U, 0x00000006U,
     0x00000000U, 0xFFE00000U, 0x4000007FU, 0x00000000U,
     0x00000000U, 0xFFFF0000U, 0x0000000FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -570,13 +570,17 @@ u_categ_M =
     0x00FB7C00U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00780000U,
-    0x0000000BU, 0xC7F00000U, 0x00000007U, 0x00000000U,
+    0x0000000BU, 0xC7F00000U, 0x04000007U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x003FFF81U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xC0000000U, 0x0000FFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
     0x00000000U, 0x007F0000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -615,7 +619,7 @@ u_categ_M =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x0000F000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000C000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x007F0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x000007F0U, 0x00000000U,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/categ_Mn.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/categ_Mn.h
index c24a8f618c..ef128fd174 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/categ_Mn.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/categ_Mn.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    unsigned int level3[47 << 4];
+    unsigned int level3[48 << 4];
   }
 u_categ_Mn =
 {
@@ -234,15 +234,14 @@ u_categ_Mn =
        -1,
        -1,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   560,
        -1,
        -1,
        -1,
        -1,
-       -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   560,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   576,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   592,
        -1,
        -1,
        -1,
@@ -280,7 +279,8 @@ u_categ_Mn =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   592,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   608,
        -1,
        -1,
        -1,
@@ -289,21 +289,20 @@ u_categ_Mn =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   608,
        16 +   384 * sizeof (short) / sizeof (int) +   624,
        16 +   384 * sizeof (short) / sizeof (int) +   640,
+       16 +   384 * sizeof (short) / sizeof (int) +   656,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   656,
+       16 +   384 * sizeof (short) / sizeof (int) +   672,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   672,
        16 +   384 * sizeof (short) / sizeof (int) +   688,
        16 +   384 * sizeof (short) / sizeof (int) +   704,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   720,
        -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   736,
        -1,
        -1,
        -1,
@@ -314,7 +313,8 @@ u_categ_Mn =
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   736,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   752,
        -1,
        -1,
        -1,
@@ -457,7 +457,7 @@ u_categ_Mn =
     0x00020000U, 0xFFFF0000U, 0x000007FFU, 0x00000000U,
     0x00000000U, 0x0001FFC0U, 0x00000000U, 0x200FF800U,
     0xFBC00000U, 0x00003EEFU, 0x0E000000U, 0x00000000U,
-    0xFF000000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFBU,
+    0xFF800000U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFBU,
     0x00000007U, 0x14000000U, 0x00FE21FEU, 0x0000000CU,
     0x00000002U, 0x10000000U, 0x0000201EU, 0x4000000CU,
     0x00000006U, 0x10000000U, 0x00023986U, 0x00230000U,
@@ -542,10 +542,10 @@ u_categ_Mn =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x000000F0U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x000000F0U, 0x00000000U, 0x00003E00U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00001800U, 0x00000000U, 0xE0000000U,
+    0x00000000U, 0x00001800U, 0x00000000U, 0xF0000000U,
     0x00000000U, 0x00000000U, 0x0001FFC0U, 0x00000000U,
     0x0000003CU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000002U, 0xFF000000U, 0x0000007FU, 0x80190000U,
@@ -555,14 +555,14 @@ u_categ_Mn =
     0x00000000U, 0x40D38000U, 0x00000002U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x80000000U, 0x000007F8U,
     0x00000003U, 0x18000000U, 0x00000001U, 0x001F1FC0U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xF8000000U, 0x00054001U, 0x00000006U,
     0x00000000U, 0xFF000000U, 0x4000005CU, 0x00000000U,
     0x00000000U, 0x85F80000U, 0x0000000DU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xB03C0000U, 0x30000001U, 0x00000000U,
     0x00000000U, 0xA7F80000U, 0x00000001U, 0x00000000U,
     0x00000000U, 0x00BF2800U, 0x00000000U, 0x00000000U,
-    0xE0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
+    0xA0000000U, 0x00000FBCU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x06FF8000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -578,13 +578,17 @@ u_categ_Mn =
     0x00A30000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00180000U,
-    0x00000003U, 0x07C00000U, 0x00000005U, 0x00000000U,
+    0x00000003U, 0x07C00000U, 0x04000005U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x003FFF81U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xC0000000U, 0x0000E3FFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
     0x00000000U, 0x007F0000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -623,7 +627,7 @@ u_categ_Mn =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x0000F000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000C000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x007F0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x000007F0U, 0x00000000U,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/categ_Nd.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/categ_Nd.h
index 9d3a21f3aa..112790e8bf 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/categ_Nd.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/categ_Nd.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Categories of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[2];
     short level2[2 << 7];
-    unsigned int level3[27 << 4];
+    unsigned int level3[30 << 4];
   }
 u_categ_Nd =
 {
@@ -186,9 +186,9 @@ u_categ_Nd =
         3 +   256 * sizeof (short) / sizeof (int) +   288,
         3 +   256 * sizeof (short) / sizeof (int) +   304,
         3 +   256 * sizeof (short) / sizeof (int) +   320,
-       -1,
         3 +   256 * sizeof (short) / sizeof (int) +   336,
         3 +   256 * sizeof (short) / sizeof (int) +   352,
+        3 +   256 * sizeof (short) / sizeof (int) +   368,
        -1,
        -1,
        -1,
@@ -221,14 +221,13 @@ u_categ_Nd =
        -1,
        -1,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   384,
        -1,
        -1,
        -1,
        -1,
-       -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   368,
-       -1,
-       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   400,
+        3 +   256 * sizeof (short) / sizeof (int) +   416,
        -1,
        -1,
        -1,
@@ -276,20 +275,21 @@ u_categ_Nd =
        -1,
        -1,
        -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   272,
        -1,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   384,
+        3 +   256 * sizeof (short) / sizeof (int) +   432,
        -1,
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   400,
-        3 +   256 * sizeof (short) / sizeof (int) +   272,
+        3 +   256 * sizeof (short) / sizeof (int) +   448,
         3 +   256 * sizeof (short) / sizeof (int) +   272,
+        3 +   256 * sizeof (short) / sizeof (int) +   464,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   352,
+        3 +   256 * sizeof (short) / sizeof (int) +   368,
        -1,
        -1,
        -1,
@@ -298,7 +298,7 @@ u_categ_Nd =
        -1,
        -1,
        -1,
-        3 +   256 * sizeof (short) / sizeof (int) +   416,
+        3 +   256 * sizeof (short) / sizeof (int) +   336,
        -1,
        -1
   },
@@ -365,7 +365,7 @@ u_categ_Nd =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x03FF0000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x03FF0000U, 0x000003FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x0000FFC0U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U,
@@ -380,13 +380,17 @@ u_categ_Nd =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x000003FFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF03FFU, 0x0000000FU,
     0x00000000U, 0x03FF0000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000003FFU,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
@@ -395,12 +399,20 @@ u_categ_Nd =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x03FF0000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x000003FFU,
     0x00000000U, 0x00000000U, 0x000003FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x03FF0000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFFC000U, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -408,8 +420,8 @@ u_categ_Nd =
     0x00000000U, 0x00000000U, 0x000003FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U
+    0x00000000U, 0x00000000U, 0x00000000U, 0x07FE0000U
   }
 };
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/combiningclass.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/combiningclass.h
index 4b114e6dfd..50d89e308c 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/combiningclass.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/combiningclass.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Combining class of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
   {
     int level1[2];
     short level2[2 << 9];
-    unsigned char level3[92 << 7];
+    unsigned char level3[95 << 7];
   }
 u_combclass =
 {
@@ -101,10 +101,10 @@ u_combclass =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,  6784,  6912,    -1,    -1,
        -1,    -1,  7040,    -1,    -1,  7168,  7296,  7424,
-     7552,  7680,  7808,  7936,  8064,  8192,  8320,    -1,
-     8448,  8576,    -1,  8704,  8832,  8960,  9088,    -1,
-     7680,    -1,  9216,  9344,  9472,  9600,    -1,    -1,
-     8832,    -1,  9728,  9856,    -1,    -1,  9984,    -1,
+     7552,  7680,  7808,  7936,  8064,  8192,  8320,  8448,
+     8576,  8704,    -1,  8832,  8960,  9088,  9216,    -1,
+     7680,    -1,  9344,  9472,  9600,  9728,    -1,    -1,
+     8960,    -1,  9856,  9984,    -1,    -1, 10112,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -121,10 +121,11 @@ u_combclass =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1, 10240,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1, 10368, 10496,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1, 10624,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1, 10112, 10240,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 10368,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -143,19 +144,18 @@ u_combclass =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1, 10752,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 10496,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1, 10880, 11008, 11136,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1, 10624, 10752, 10880,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    11008, 11136, 10240,    -1,    -1, 11264,    -1,    -1,
-       -1, 11392,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 11520, 11648,    -1,    -1,    -1,    -1,    -1,
+    11264, 11392, 10496,    -1,    -1, 11520,    -1,    -1,
+       -1, 11648,    -1, 11776,    -1,    -1,    -1,    -1,
+       -1, 11904, 12032,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -293,7 +293,7 @@ u_combclass =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0, 230,
     230, 220, 220, 220, 230, 230, 230, 230,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -1056,7 +1056,7 @@ u_combclass =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
+      0, 230, 230, 230, 230, 230,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -1218,6 +1218,22 @@ u_combclass =
       0,   0,   0,   0,   0,   0, 230, 230,
     230, 230, 230, 230, 230,   0,   0,   0,
     230, 230, 230, 230, 230,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   9,   9,
+      9,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -1432,6 +1448,22 @@ u_combclass =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   9,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -1613,6 +1645,22 @@ u_combclass =
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0, 230, 220,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
     220, 220, 220, 220, 220, 220, 220,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/ctype_print.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/ctype_print.h
index d5d6a2a7a8..b700782887 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/ctype_print.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/ctype_print.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -27,7 +27,7 @@ struct
     int header[1];
     int level1[17];
     short level2[6 << 7];
-    unsigned int level3[90 << 4];
+    unsigned int level3[94 << 4];
   }
 u_is_print =
 {
@@ -207,15 +207,15 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   800,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   816,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   832,
        -1,
        -1,
        -1,
@@ -228,14 +228,14 @@ u_is_print =
        -1,
        -1,
        -1,
-       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   848,
        -1,
        -1,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +   832,
-       -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   848,
+       18 +   768 * sizeof (short) / sizeof (int) +   864,
+       18 +   768 * sizeof (short) / sizeof (int) +   880,
+       18 +   768 * sizeof (short) / sizeof (int) +   896,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
@@ -247,10 +247,10 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +   864,
+       18 +   768 * sizeof (short) / sizeof (int) +   912,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +   880,
+       18 +   768 * sizeof (short) / sizeof (int) +   928,
        -1,
        -1,
        -1,
@@ -267,15 +267,14 @@ u_is_print =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   896,
-       18 +   768 * sizeof (short) / sizeof (int) +   912,
-       18 +   768 * sizeof (short) / sizeof (int) +   928,
-       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   944,
+       18 +   768 * sizeof (short) / sizeof (int) +   960,
+       18 +   768 * sizeof (short) / sizeof (int) +   976,
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   944,
        -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
        -1,
@@ -283,29 +282,30 @@ u_is_print =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +   960,
-       18 +   768 * sizeof (short) / sizeof (int) +   976,
-       18 +   768 * sizeof (short) / sizeof (int) +   992,
        18 +   768 * sizeof (short) / sizeof (int) +  1008,
        18 +   768 * sizeof (short) / sizeof (int) +  1024,
-       18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +  1040,
-       -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1056,
        18 +   768 * sizeof (short) / sizeof (int) +  1072,
        18 +   768 * sizeof (short) / sizeof (int) +  1088,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +  1104,
+       -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1120,
        18 +   768 * sizeof (short) / sizeof (int) +  1136,
-       -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1152,
        18 +   768 * sizeof (short) / sizeof (int) +  1168,
        18 +   768 * sizeof (short) / sizeof (int) +  1184,
        18 +   768 * sizeof (short) / sizeof (int) +  1200,
-       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       -1,
        18 +   768 * sizeof (short) / sizeof (int) +  1216,
        18 +   768 * sizeof (short) / sizeof (int) +  1232,
        18 +   768 * sizeof (short) / sizeof (int) +  1248,
+       18 +   768 * sizeof (short) / sizeof (int) +  1264,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1280,
+       18 +   768 * sizeof (short) / sizeof (int) +  1296,
+       18 +   768 * sizeof (short) / sizeof (int) +  1312,
        -1,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
@@ -391,7 +391,7 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1264,
+       18 +   768 * sizeof (short) / sizeof (int) +  1328,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
@@ -399,8 +399,8 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1280,
-       18 +   768 * sizeof (short) / sizeof (int) +  1296,
+       18 +   768 * sizeof (short) / sizeof (int) +  1344,
+       18 +   768 * sizeof (short) / sizeof (int) +  1360,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
@@ -411,7 +411,7 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1312,
+       18 +   768 * sizeof (short) / sizeof (int) +  1376,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
@@ -425,15 +425,15 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1328,
+       18 +   768 * sizeof (short) / sizeof (int) +  1392,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1344,
+       18 +   768 * sizeof (short) / sizeof (int) +  1408,
        -1,
        -1,
        -1,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1360,
+       18 +   768 * sizeof (short) / sizeof (int) +  1424,
        -1,
        -1,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
@@ -445,7 +445,7 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1376,
+       18 +   768 * sizeof (short) / sizeof (int) +  1440,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
@@ -453,7 +453,7 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1392,
+       18 +   768 * sizeof (short) / sizeof (int) +  1456,
        -1,
        -1,
        -1,
@@ -564,7 +564,7 @@ u_is_print =
        -1,
        -1,
        -1,
-       18 +   768 * sizeof (short) / sizeof (int) +  1408,
+       18 +   768 * sizeof (short) / sizeof (int) +  1472,
        -1,
        -1,
        -1,
@@ -819,7 +819,7 @@ u_is_print =
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
        18 +   768 * sizeof (short) / sizeof (int) +   160,
-       18 +   768 * sizeof (short) / sizeof (int) +  1424
+       18 +   768 * sizeof (short) / sizeof (int) +  1488
   },
   {
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
@@ -839,7 +839,7 @@ u_is_print =
     0xFFFFBFFFU, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU,
     0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0xFFFF07FFU,
-    0xFF037FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFF837FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x7FFFFFCFU,
     0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x007FFFC0U,
@@ -876,10 +876,10 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFF0FFFU, 0xC7FF03FFU, 0xFFFFFFFFU,
     0xCFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU, 0x9FFFFFFFU,
     0x03FF03FFU, 0xFFFF3FFFU, 0x00007FFFU, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF1FFFU, 0x7FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFDFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF00FFFFFU,
     0xFFFFFFFFU, 0xF8FFFFFFU, 0xFFFFE3FFU, 0xFFFFFFFFU,
-    0xFFFF01FFU, 0xE7FFFFFFU, 0xFFFF00FFU, 0x07FFFFFFU,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0xFFFF00FFU, 0x07FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -890,7 +890,7 @@ u_is_print =
     0x1FFF7FFFU, 0xFFFFFFFFU, 0xFFFF0001U, 0x0001FFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0x0000007FU, 0x000007FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000003FFU, 0x000007FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -909,7 +909,7 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
     0xFE7FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF800FU,
+    0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF803FU,
     0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -921,7 +921,7 @@ u_is_print =
     0xFFFFFFFFU, 0x00000FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03EB07FFU, 0xFFFC0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0xFFFC0000U,
     0xFFFFFFFFU, 0x03FF1FFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFC03FU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x800FFFFFU, 0x1FFFFFFFU,
@@ -957,7 +957,7 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
     0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF800FU,
-    0xFFB7F7FFU, 0x1BFBFFFBU, 0x00000000U, 0x00000000U,
+    0xFFB7F7FFU, 0x1BFBFFFBU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU,
@@ -972,10 +972,10 @@ u_is_print =
     0x1E03FFFFU, 0x0000FE00U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U,
     0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0xFC07FFFFU,
-    0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU, 0xFFFFFE3FU,
+    0x0000C03FU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x7FFFFFFFU,
-    0xFFFFFFFFU, 0x00033BFFU, 0x00000000U, 0xE0000000U,
+    0xFFFFFFFFU, 0x00033BFFU, 0x0000001CU, 0xF0000000U,
     0xFFFFFFFFU, 0xFFFF00FFU, 0x03FFFFFFU, 0xFFFF0000U,
     0x000003FFU, 0xFFFF0000U, 0x00000FFFU, 0x007FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFC3FFFU, 0x803FFFFFU,
@@ -985,13 +985,13 @@ u_is_print =
     0xFFFBFFFFU, 0xFFFFFFFFU, 0x00000003U, 0x00000000U,
     0xBFFFBD7FU, 0xFFFF03FFU, 0xFFFFFFFFU, 0x03FF07FFU,
     0xFFF99FEFU, 0xFBEDFDFFU, 0xE081399FU, 0x001F1FCFU,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF4BFFU, 0xFFBFFFFFU, 0x01BFF7A5U, 0x00000006U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xEFFFFFFFU, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFF3FFFFFU, 0x3FFFFFFFU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF001FU, 0x00001FFFU,
-    0xFFFFFFFFU, 0x03FFFFFFU, 0x000003FFU, 0x00000000U,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFF03FFU, 0x0000000FU,
     0xE7FFFFFFU, 0xFFFF0FFFU, 0x0000007FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0x0FFFFFFFU, 0x00000000U, 0x00000000U,
@@ -1001,14 +1001,14 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFF0007U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x000003FFU, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FF0003U,
     0xFFFFFDFFU, 0xFF7FFFFFU, 0xFFFF003FU, 0xFFFF1FFFU,
     0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
     0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0xFFFFFDBFU,
     0x01FB7FFFU, 0x000003FFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x01FFFFFFU,
-    0xFFFDFFFFU, 0xC7FFFFFFU, 0x03FFFFFFU, 0x00000000U,
+    0xFFFDFFFFU, 0xC7FFFFFFU, 0x07FFFFFFU, 0x00000000U,
     0x00000000U, 0x00010000U, 0xFFFFFFFFU, 0x8003FFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -1022,18 +1022,30 @@ u_is_print =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFFC3FFU,
     0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x003F3FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFF003FU, 0xE0FFFFFBU,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x07FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF87FFU, 0xFFFFFFFFU,
@@ -1043,7 +1055,7 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x80000000U,
     0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -1062,8 +1074,12 @@ u_is_print =
     0xF3FF01FFU, 0x0000000FU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000FFFFFU, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFF3FFFU, 0xFFFF007FU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -1101,7 +1117,7 @@ u_is_print =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x87FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -1131,13 +1147,13 @@ u_is_print =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF87FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00010FFFU,
     0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
-    0xFFFF00FFU, 0x00033FFFU, 0x00000000U, 0x00000000U,
+    0xFFFF00FFU, 0x0FFF3FFFU, 0x00000003U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, 0x1FFF3FFFU,
-    0xFFFF01FFU, 0xBFFFFFFFU, 0x0FFFC03FU, 0x01FF01FFU,
+    0xFFFF83FFU, 0xFFFFFFFFU, 0x9FFFC07FU, 0x01FF03FFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFF7FFFFU, 0xFFFFFFFFU, 0x000007FFU, 0x03FF0000U,
+    0xFFF7FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/ctype_upper.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/ctype_upper.h
index d9259bf80d..ef52780987 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/ctype_upper.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/ctype_upper.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* ISO C <ctype.h> like properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -316,7 +316,7 @@ u_is_upper =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFF0000U, 0xE7FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFF0200U, 0xE7FFFFFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x55555555U, 0x55555555U, 0x55555555U, 0x55555555U,
@@ -338,7 +338,7 @@ u_is_upper =
     0x00000000U, 0x00000000U, 0x55555555U, 0x00001555U,
     0x05555555U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x55545554U, 0x55555555U, 0x6A005555U,
-    0x55452855U, 0x555F7D55U, 0x014102F5U, 0x00200000U,
+    0x55452855U, 0x555F7D55U, 0x15411AF5U, 0x00200000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x07FFFFFEU, 0x00000000U, 0x00000000U,
@@ -349,7 +349,7 @@ u_is_upper =
     0x0037F7FFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0x0007FFFFU, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x0000003FU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/pr_alphabetic.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/pr_alphabetic.h
index a5560326ec..3170631442 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/pr_alphabetic.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/pr_alphabetic.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ struct
     int header[1];
     int level1[4];
     short level2[4 << 7];
-    unsigned int level3[80 << 4];
+    unsigned int level3[83 << 4];
   }
 u_property_alphabetic =
 {
@@ -202,15 +202,15 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   816,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
-       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   832,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   848,
        -1,
        -1,
        -1,
@@ -223,14 +223,14 @@ u_property_alphabetic =
        -1,
        -1,
        -1,
-       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   864,
        -1,
        -1,
        -1,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +   848,
-       -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   864,
+        5 +   512 * sizeof (short) / sizeof (int) +   880,
+        5 +   512 * sizeof (short) / sizeof (int) +   896,
+        5 +   512 * sizeof (short) / sizeof (int) +   912,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
@@ -242,10 +242,10 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +   880,
+        5 +   512 * sizeof (short) / sizeof (int) +   928,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +   896,
+        5 +   512 * sizeof (short) / sizeof (int) +   944,
        -1,
        -1,
        -1,
@@ -262,14 +262,14 @@ u_property_alphabetic =
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   912,
-        5 +   512 * sizeof (short) / sizeof (int) +   928,
-        5 +   512 * sizeof (short) / sizeof (int) +   944,
+        5 +   512 * sizeof (short) / sizeof (int) +   960,
+        5 +   512 * sizeof (short) / sizeof (int) +   976,
+        5 +   512 * sizeof (short) / sizeof (int) +   992,
        -1,
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   960,
+        5 +   512 * sizeof (short) / sizeof (int) +  1008,
        -1,
        -1,
        -1,
@@ -281,21 +281,21 @@ u_property_alphabetic =
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +   976,
-        5 +   512 * sizeof (short) / sizeof (int) +   992,
+        5 +   512 * sizeof (short) / sizeof (int) +  1024,
+        5 +   512 * sizeof (short) / sizeof (int) +  1040,
        -1,
        -1,
        -1,
-        5 +   512 * sizeof (short) / sizeof (int) +  1008,
-        5 +   512 * sizeof (short) / sizeof (int) +  1024,
-        5 +   512 * sizeof (short) / sizeof (int) +  1040,
         5 +   512 * sizeof (short) / sizeof (int) +  1056,
         5 +   512 * sizeof (short) / sizeof (int) +  1072,
         5 +   512 * sizeof (short) / sizeof (int) +  1088,
-       -1,
-       -1,
         5 +   512 * sizeof (short) / sizeof (int) +  1104,
         5 +   512 * sizeof (short) / sizeof (int) +  1120,
+        5 +   512 * sizeof (short) / sizeof (int) +  1136,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1152,
+        5 +   512 * sizeof (short) / sizeof (int) +  1168,
        -1,
        -1,
        -1,
@@ -386,7 +386,7 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1136,
+        5 +   512 * sizeof (short) / sizeof (int) +  1184,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
@@ -394,8 +394,8 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1152,
-        5 +   512 * sizeof (short) / sizeof (int) +  1168,
+        5 +   512 * sizeof (short) / sizeof (int) +  1200,
+        5 +   512 * sizeof (short) / sizeof (int) +  1216,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
@@ -406,7 +406,7 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1184,
+        5 +   512 * sizeof (short) / sizeof (int) +  1232,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
@@ -420,15 +420,15 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1200,
+        5 +   512 * sizeof (short) / sizeof (int) +  1248,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1216,
+        5 +   512 * sizeof (short) / sizeof (int) +  1264,
        -1,
        -1,
        -1,
        -1,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1232,
+        5 +   512 * sizeof (short) / sizeof (int) +  1280,
        -1,
        -1,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
@@ -440,7 +440,7 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1248,
+        5 +   512 * sizeof (short) / sizeof (int) +  1296,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
@@ -448,7 +448,7 @@ u_property_alphabetic =
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
         5 +   512 * sizeof (short) / sizeof (int) +   336,
-        5 +   512 * sizeof (short) / sizeof (int) +  1264,
+        5 +   512 * sizeof (short) / sizeof (int) +  1312,
        -1,
        -1,
        -1,
@@ -567,7 +567,7 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0003FFC3U, 0x0000501FU,
-    0x00000000U, 0x00000000U, 0x00000020U, 0xBCDF0000U,
+    0x00000000U, 0x00000000U, 0x00000020U, 0xBCDFFFF8U,
     0xFFFFD740U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFBFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFC03U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
@@ -578,7 +578,7 @@ u_property_alphabetic =
     0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFC00U, 0x043007FFU,
     0xFCFFFFFFU, 0x00001FFFU, 0x01FFFFFFU, 0xFFFF07FFU,
-    0x00007EFFU, 0xFFFFFFFFU, 0xFFF003FFU, 0xFFFF03F8U,
+    0x00807EFFU, 0xFFFFFFFFU, 0xFFF003FFU, 0xFFFF03F8U,
     0xFFFFFFFFU, 0xEFFFFFFFU, 0xFFE1DFFFU, 0xFFFE000FU,
     0xFFF99FEFU, 0xE3C5FDFFU, 0xB080599FU, 0x1003000FU,
     0xFFF987EEU, 0xC36DFDFFU, 0x5E021987U, 0x003F0000U,
@@ -618,9 +618,9 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFEFFFFFU, 0x00001FEFU, 0x00000000U,
     0xFFFFFFFFU, 0xFC00F3FFU, 0xFFFFFFFFU, 0x0003FFBFU,
     0xFFFFFFFFU, 0x007FFFFFU, 0xFC00E000U, 0x3FFFFFFFU,
-    0xFFFF01FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x001FFF80U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFF80000U, 0x001FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
@@ -660,7 +660,7 @@ u_property_alphabetic =
     0xFFFF1FFFU, 0x00000C00U, 0xFFFFFFFFU, 0x8FF07FFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
     0xFF800000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFF9FFU, 0xFFFFFFFFU, 0x03EB07FFU, 0xFFFC0000U,
+    0xFFFFF9FFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0xFFFC0000U,
     0xFFFFFFBFU, 0x000000FFU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000002FU, 0xE8FC0000U,
     0xFFFFFC00U, 0xFFFF07FFU, 0x0007FFFFU, 0x1FFFFFFFU,
@@ -700,7 +700,7 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x3FFFFFFFU, 0xFFFF0000U, 0xFF0FFFFFU, 0x0FFFFFFFU,
     0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF000FU,
-    0xFFB7F7FFU, 0x1BFBFFFBU, 0x00000000U, 0x00000000U,
+    0xFFB7F7FFU, 0x1BFBFFFBU, 0xFFFFFFFFU, 0x000FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU,
@@ -715,10 +715,10 @@ u_property_alphabetic =
     0x0003FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U,
     0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
-    0xFFFFFFFFU, 0x000000FFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x000000FFU, 0xFFFFFC00U, 0xFFFF823FU,
+    0x0000003FU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0x00031BFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x00031BFFU, 0x0000001CU, 0x10000000U,
     0x1FFFFFFFU, 0xFFFF0080U, 0x0000003FU, 0xFFFF0000U,
     0x00000003U, 0xFFFF0000U, 0x0000001FU, 0x007FFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU, 0x003E0000U,
@@ -728,7 +728,7 @@ u_property_alphabetic =
     0xFFFBFFFFU, 0xC09FFFFFU, 0x00000003U, 0x00000000U,
     0xBFFFBD7FU, 0xFFFF01FFU, 0xFFFFFFFFU, 0x000001FFU,
     0xFFF99FEFU, 0xE3EDFDFFU, 0xE081199FU, 0x0000000FU,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF4BFFU, 0xFFBFFFFFU, 0x000A37A5U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x800007BBU, 0x00000003U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0x000000B3U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -744,7 +744,7 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0x7FE7FFFFU, 0xFFFF0000U, 0xFFFFFFFFU,
     0x20FFFFFFU, 0xFFFF0000U, 0xFFFFFFFFU, 0x01FFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00000001U,
     0xFFFFFDFFU, 0x7F7FFFFFU, 0x00000001U, 0xFFFC0000U,
     0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
     0xFFFFFB7FU, 0xB47FFFFFU, 0x000000CBU, 0xFFFFFDBFU,
@@ -765,18 +765,30 @@ u_property_alphabetic =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU,
-    0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0x00000000U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x00007FFFU, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFF0000U,
     0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF0000U, 0x00003FFFU,
     0xFFFFFFFFU, 0x0000FFFFU, 0x0000000FU, 0xE0FFFFF8U,
     0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00001FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF87FFU, 0xFFFFFFFFU,
@@ -786,7 +798,7 @@ u_property_alphabetic =
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
     0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
-    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x80000000U,
     0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
@@ -828,7 +840,7 @@ u_property_alphabetic =
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0xFFFF0000U, 0x00000FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x00013FFFU,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
     0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/pr_join_control.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/pr_join_control.h
index 37e303b823..85465f8781 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/pr_join_control.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/pr_join_control.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
diff --git a/tp/Texinfo/XS/gnulib/lib/unictype/pr_soft_dotted.h 
b/tp/Texinfo/XS/gnulib/lib/unictype/pr_soft_dotted.h
index 5239a99de9..9ef24968a9 100644
--- a/tp/Texinfo/XS/gnulib/lib/unictype/pr_soft_dotted.h
+++ b/tp/Texinfo/XS/gnulib/lib/unictype/pr_soft_dotted.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Properties of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
diff --git a/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table1.h 
b/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table-bounds.h
similarity index 56%
copy from tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table1.h
copy to tp/Texinfo/XS/gnulib/lib/uninorm/composition-table-bounds.h
index ee245ce45d..ed90bf32b3 100644
--- a/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table1.h
+++ b/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table-bounds.h
@@ -1,8 +1,8 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-/* Decomposition of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Canonical composition of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
-/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -17,19 +17,9 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-extern const unsigned char gl_uninorm_decomp_chars_table[];
-
-#define decomp_header_0 10
-#define decomp_header_1 191
-#define decomp_header_2 5
-#define decomp_header_3 31
-#define decomp_header_4 31
-
-typedef struct
-  {
-    int level1[191];
-    int level2[27 << 5];
-    unsigned short level3[285 << 5];
-  }
-decomp_index_table_t;
-extern const decomp_index_table_t gl_uninorm_decomp_index_table;
+/* Maximum value of the first argument for which gl_uninorm_compose_lookup
+   can return a non-NULL value.  */
+#define UNINORM_COMPOSE_MAX_ARG1 0x16d69
+/* Maximum value of the second argument for which gl_uninorm_compose_lookup
+   can return a non-NULL value.  */
+#define UNINORM_COMPOSE_MAX_ARG2 0x16d67
diff --git a/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.gperf 
b/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.gperf
index b66b80e521..db4c7519ed 100644
--- a/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.gperf
+++ b/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.gperf
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Canonical composition of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2009-2024 Free Software Foundation, Inc.
 
@@ -956,6 +956,8 @@ struct composition_rule { char codes[6]; };
 "\x00\x30\xf1\x00\x30\x99", 0x30f9
 "\x00\x30\xf2\x00\x30\x99", 0x30fa
 "\x00\x30\xfd\x00\x30\x99", 0x30fe
+"\x01\x05\xd2\x00\x03\x07", 0x105c9
+"\x01\x05\xda\x00\x03\x07", 0x105e4
 "\x01\x10\x99\x01\x10\xba", 0x1109a
 "\x01\x10\x9b\x01\x10\xba", 0x1109c
 "\x01\x10\xa5\x01\x10\xba", 0x110ab
@@ -963,9 +965,27 @@ struct composition_rule { char codes[6]; };
 "\x01\x11\x32\x01\x11\x27", 0x1112f
 "\x01\x13\x47\x01\x13\x3e", 0x1134b
 "\x01\x13\x47\x01\x13\x57", 0x1134c
+"\x01\x13\x82\x01\x13\xc9", 0x11383
+"\x01\x13\x84\x01\x13\xbb", 0x11385
+"\x01\x13\x8b\x01\x13\xc2", 0x1138e
+"\x01\x13\x90\x01\x13\xc9", 0x11391
+"\x01\x13\xc2\x01\x13\xc2", 0x113c5
+"\x01\x13\xc2\x01\x13\xb8", 0x113c7
+"\x01\x13\xc2\x01\x13\xc9", 0x113c8
 "\x01\x14\xb9\x01\x14\xba", 0x114bb
 "\x01\x14\xb9\x01\x14\xb0", 0x114bc
 "\x01\x14\xb9\x01\x14\xbd", 0x114be
 "\x01\x15\xb8\x01\x15\xaf", 0x115ba
 "\x01\x15\xb9\x01\x15\xaf", 0x115bb
 "\x01\x19\x35\x01\x19\x30", 0x11938
+"\x01\x61\x1e\x01\x61\x1e", 0x16121
+"\x01\x61\x1e\x01\x61\x29", 0x16122
+"\x01\x61\x1e\x01\x61\x1f", 0x16123
+"\x01\x61\x29\x01\x61\x1f", 0x16124
+"\x01\x61\x1e\x01\x61\x20", 0x16125
+"\x01\x61\x21\x01\x61\x1f", 0x16126
+"\x01\x61\x22\x01\x61\x1f", 0x16127
+"\x01\x61\x21\x01\x61\x20", 0x16128
+"\x01\x6d\x67\x01\x6d\x67", 0x16d68
+"\x01\x6d\x63\x01\x6d\x67", 0x16d69
+"\x01\x6d\x69\x01\x6d\x67", 0x16d6a
diff --git a/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.h 
b/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.h
index 6ff6e2c7da..de0c1edba6 100644
--- a/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.h
+++ b/tp/Texinfo/XS/gnulib/lib/uninorm/composition-table.h
@@ -3,12 +3,12 @@
 /* Computed positions: -k'2-3,6' */
 
 
-#define TOTAL_KEYWORDS 941
+#define TOTAL_KEYWORDS 961
 #define MIN_WORD_LENGTH 6
 #define MAX_WORD_LENGTH 6
 #define MIN_HASH_VALUE 1
-#define MAX_HASH_VALUE 1565
-/* maximum key range = 1565, duplicates = 0 */
+#define MAX_HASH_VALUE 1462
+/* maximum key range = 1462, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -23,32 +23,32 @@ gl_uninorm_compose_hash (register const char *str, register 
size_t len)
 {
   static const unsigned short asso_values[] =
     {
-         7,    1,    0,    3,   58,  132,  531,   62,    4,   33,
-       117,  268,  476,  135,  560,  509,  103,  265,  249,  495,
-        61,  124,  336,  415,  703,   75,  437,  462,  738, 1566,
-        48,   13,  901,  766,  322,  635,  192,  621,  846,   13,
-       337,   65,  103,  147,   99,  130,  255,  640,  133,  342,
-       172,   52, 1566,  409,  201,   34,  695,   50,  238, 1566,
-        16,   35,  706,  139,   63,   89,  272,    2,  588,  167,
-        12,  375,  289,   61,   44,  548,  431,  452,  395,  180,
-       794,  853,  362,  561,  456,  202,  677,  360,  195,  300,
-       572,  715, 1566,  301, 1566,  291,  814,   26,  634,  579,
-       270,   98,  423,  415,  323,   42,  862,  657,  559,  324,
-       262,  124,  863, 1566,  251,  538,  236,  133,   47,  406,
-       691,  219,  590,    5,   56,   83, 1566,    1, 1566, 1566,
-        65,   39, 1566, 1566,   37,   35, 1566, 1566, 1566, 1566,
-      1566, 1566, 1566, 1566,    4,  527,   18, 1566,    0,  849,
-      1566,  781, 1566,  572,   59,   73, 1566,  204, 1566,  417,
-       618,  511,   20, 1566, 1566,  708,  167, 1566,  855,  685,
-      1566,  333,   71,  136,   55,  625,  611,  523,   12,  311,
-        11,  649,   10,  505,   68,  482, 1566,  113, 1566,  126,
-         7,  476, 1566,  614,  853,    1,   41,  560,  553,  261,
-        93,  719,  668,  854,   10,    2,    9,  728,   31, 1566,
-       442, 1566,  749,  313,   12,    0,  659,    3, 1566,  329,
-        37, 1566, 1566, 1566,   48, 1566,  847, 1566,   43,    4,
-        23,    1,   24,   22,  757,    4, 1566, 1566, 1566,    3,
-        73,   72,   63, 1566,  824,   20,   17, 1566,    0, 1566,
-      1566, 1566,   77,   62,  460, 1566, 1566
+         7,    1,    0,    3,   58,  132,  363,   62,    4,   33,
+       117,  268,  485,  135,  703,  684,  103,  169,  249,   52,
+        49,  337,  376,  616,  774,  709,   30,  630,  760, 1463,
+       120,   13,  535,  574,  322,  584,  192,  678,  859,  147,
+       337,   65,  334,  144,   61,   95,  255,  578,  133,  342,
+       210,   57, 1463,   60,   33,  251,  656,   50,  272, 1463,
+       226,   35,  365,  383,   63,   89,   16,    2,  531,  167,
+        12,  375,  289,   61,   25,  585,  431,  444,  395,  180,
+       857,  867,  362,  600,  429,  202,  749,  360,  278,  300,
+       518,   76, 1463,  495, 1463,  412,  838,   26,  790,  559,
+       310,   98,  267,  402,  323,   42,   79,  622,  607,  501,
+       262,  124,  423, 1463,  251,  590,  236,  133,   97,  409,
+       545,  219,  624,  539,   35,  221, 1463,    1, 1463, 1463,
+       133,  210,   11, 1463,  206,  205, 1463, 1463, 1463,    9,
+      1463, 1463, 1463, 1463,  161,  411,  349, 1463,   28,  874,
+      1463,  775, 1463,  659,   59,  240, 1463,  371, 1463,  857,
+       618,  473,  171, 1463, 1463,  661,  301, 1463,  681,  730,
+      1463,  366,   46,  286,   27,  712,  643,  516,  101,    5,
+        49,  646,   13,  486,    5,  482, 1463,  219,   10,  189,
+         5,  561, 1463,  429,  376,    9,  200,  550,  488,  149,
+       161,  752,  634,  804,  226,  208,   15,  526,  148, 1463,
+       650, 1463,  755,  652,    6,    1,  476,    3,  169,   89,
+        37, 1463, 1463, 1463,  157, 1463,  851, 1463,  126,   17,
+         0,    4,   64,   21,  752,    4, 1463, 1463, 1463,    3,
+        72,   54,   52, 1463,  821,  848,  181, 1463,    1, 1463,
+      1463, 1463,   77,   22,  241, 1463, 1463
     };
   return asso_values[(unsigned char)str[5]+1] + asso_values[(unsigned 
char)str[2]] + asso_values[(unsigned char)str[1]];
 }
@@ -100,76 +100,69 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  0,  6,  6,  6,  6,  6,  6,  6,  6,
-       0,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,
-       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,
-       6,  6,  6,  0,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,  6,  0,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  0,  6,  6,  6,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  0,  6,  6,  0,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,
-       0,  6,  0,  6,  0,  6,  6,  6,  6,  0,  6,  6,  6,  6,
        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
-       6,  6,  6,  6,  6,  6,  6,  0,  6,  0,  6,  6,  0,  6,
-       6,  6,  0,  6,  0,  6,  6,  6,  6,  0,  6,  6,  0,  6,
-       6,  6,  0,  6,  0,  6,  0,  6,  0,  6,  0,  6,  6,  0,
-       6,  0,  6,  6,  6,  6,  6,  0,  6,  0,  6,  0,  0,  6,
-       6,  6,  6,  0,  6,  0,  0,  6,  6,  0,  6,  6,  6,  0,
-       0,  0,  0,  0,  6,  0,  6,  6,  0,  6,  6,  0,  0,  0,
-       0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  6,  0,
-       0,  0,  0,  0,  6,  6,  0,  0,  0,  0,  6,  6,  6,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  6,
-       0,  0,  0,  0,  0,  0,  6,  6,  0,  6,  6,  6,  0,  6,
-       0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,
-       6,  0,  0,  0,  6,  0,  0,  6,  6,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  6,  0,  0,  0,  6,  6,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,
-       0,  6,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+       6,  0,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,
+       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,  6,
+       6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,  0,  6,
+       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,  6,
+       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,
+       6,  6,  6,  6,  6,  0,  6,  0,  6,  6,  6,  6,  6,  6,
+       0,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,
+       6,  6,  6,  6,  6,  0,  6,  6,  0,  0,  6,  0,  6,  6,
+       6,  6,  6,  6,  6,  0,  6,  6,  6,  6,  0,  6,  6,  6,
+       6,  6,  6,  6,  6,  6,  6,  6,  0,  6,  6,  6,  6,  0,
+       6,  6,  6,  6,  6,  0,  6,  6,  6,  6,  6,  6,  6,  6,
+       6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  0,
+       0,  0,  0,  6,  6,  6,  0,  6,  6,  6,  0,  0,  6,  6,
+       6,  6,  6,  0,  6,  0,  6,  0,  6,  0,  0,  6,  0,  0,
+       0,  0,  6,  0,  0,  6,  0,  6,  0,  0,  6,  6,  0,  0,
+       0,  6,  0,  0,  6,  0,  6,  6,  0,  6,  6,  0,  0,  6,
+       0,  0,  0,  6,  6,  0,  0,  0,  0,  0,  6,  0,  6,  0,
+       6,  0,  0,  6,  0,  0,  0,  6,  6,  6,  6,  0,  6,  6,
+       0,  6,  6,  6,  0,  6,  6,  6,  0,  6,  0,  6,  0,  0,
+       6,  0,  6,  0,  0,  6,  0,  6,  0,  6,  0,  0,  0,  6,
+       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
+       0,  6,  0,  6,  6,  0,  6,  0,  0,  0,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  6,  0,  0,
+       6,  0,  6,  6,  0,  0,  0,  0,  0,  6,  0,  0,  6,  0,
+       0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       6,  6,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
+       0,  0,  0,  0,  0,  6,  0,  0,  0,  6,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  6,  0,  6,  0,  0,  0,  0,  0,  0,
+       0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  6,  0,  6,
        0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  0,  6,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,
-       0,  0,  0,  6,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  0,  6,  0,  0,
+       6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,
+       0,  6,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  6,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-       0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6
+       0,  0,  0,  0,  0,  0,  6
     };
   static const struct composition_rule wordlist[] =
     {
@@ -185,16 +178,16 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\001\003\000\003\000", 0x1eb1},
 #line 557 "uninorm/composition-table.gperf"
       {"\000\001\177\000\003\007", 0x1e9b},
+#line 236 "uninorm/composition-table.gperf"
+      {"\000\000\346\000\003\001", 0x01fd},
 #line 238 "uninorm/composition-table.gperf"
       {"\000\000\370\000\003\001", 0x01ff},
-#line 412 "uninorm/composition-table.gperf"
-      {"\000\000\347\000\003\001", 0x1e09},
 #line 90 "uninorm/composition-table.gperf"
       {"\000\000C\000\003\001", 0x0106},
 #line 450 "uninorm/composition-table.gperf"
       {"\000\000\357\000\003\001", 0x1e2f},
-#line 234 "uninorm/composition-table.gperf"
-      {"\000\000\345\000\003\001", 0x01fb},
+#line 412 "uninorm/composition-table.gperf"
+      {"\000\000\347\000\003\001", 0x1e09},
 #line 92 "uninorm/composition-table.gperf"
       {"\000\000C\000\003\002", 0x0108},
 #line 94 "uninorm/composition-table.gperf"
@@ -219,20 +212,20 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037\000\000\003B", 0x1f06},
 #line 433 "uninorm/composition-table.gperf"
       {"\000\000F\000\003\007", 0x1e1e},
-#line 851 "uninorm/composition-table.gperf"
-      {"\000\003\316\000\003E", 0x1ff4},
+#line 234 "uninorm/composition-table.gperf"
+      {"\000\000\345\000\003\001", 0x01fb},
 #line 757 "uninorm/composition-table.gperf"
       {"\000\037\002\000\003E", 0x1f82},
 #line 756 "uninorm/composition-table.gperf"
       {"\000\037\001\000\003E", 0x1f81},
-#line 480 "uninorm/composition-table.gperf"
-      {"\000\000\365\000\003\001", 0x1e4d},
+#line 405 "uninorm/composition-table.gperf"
+      {"\000\000B\000\003\007", 0x1e02},
 #line 758 "uninorm/composition-table.gperf"
       {"\000\037\003\000\003E", 0x1f83},
 #line 763 "uninorm/composition-table.gperf"
       {"\000\037\010\000\003E", 0x1f88},
-#line 236 "uninorm/composition-table.gperf"
-      {"\000\000\346\000\003\001", 0x01fd},
+#line 851 "uninorm/composition-table.gperf"
+      {"\000\003\316\000\003E", 0x1ff4},
 #line 506 "uninorm/composition-table.gperf"
       {"\000\001a\000\003\007", 0x1e67},
 #line 755 "uninorm/composition-table.gperf"
@@ -241,22 +234,22 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000a\000\003\001", 0x00e1},
 #line 57 "uninorm/composition-table.gperf"
       {"\000\000a\000\003\000", 0x00e0},
-#line 809 "uninorm/composition-table.gperf"
-      {"\000\037\266\000\003E", 0x1fb7},
+#line 129 "uninorm/composition-table.gperf"
+      {"\000\000J\000\003\002", 0x0134},
 #line 59 "uninorm/composition-table.gperf"
       {"\000\000a\000\003\002", 0x00e2},
 #line 270 "uninorm/composition-table.gperf"
       {"\000\000a\000\003\007", 0x0227},
-#line 778 "uninorm/composition-table.gperf"
-      {"\000\037'\000\003E", 0x1f97},
+#line 809 "uninorm/composition-table.gperf"
+      {"\000\037\266\000\003E", 0x1fb7},
 #line 737 "uninorm/composition-table.gperf"
       {"\000\037a\000\003\001", 0x1f65},
 #line 735 "uninorm/composition-table.gperf"
       {"\000\037a\000\003\000", 0x1f63},
 #line 739 "uninorm/composition-table.gperf"
       {"\000\037a\000\003B", 0x1f67},
-#line 853 "uninorm/composition-table.gperf"
-      {"\000\037\366\000\003E", 0x1ff7},
+#line 817 "uninorm/composition-table.gperf"
+      {"\000\003\256\000\003E", 0x1fc4},
 #line 524 "uninorm/composition-table.gperf"
       {"\000\001i\000\003\001", 0x1e79},
 #line 206 "uninorm/composition-table.gperf"
@@ -277,10 +270,10 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037a\000\003E", 0x1fa1},
 #line 70 "uninorm/composition-table.gperf"
       {"\000\000i\000\003\002", 0x00ee},
-#line 615 "uninorm/composition-table.gperf"
-      {"\000\036\315\000\003\002", 0x1ed9},
-#line 129 "uninorm/composition-table.gperf"
-      {"\000\000J\000\003\002", 0x0134},
+#line 426 "uninorm/composition-table.gperf"
+      {"\000\001\023\000\003\001", 0x1e17},
+#line 424 "uninorm/composition-table.gperf"
+      {"\000\001\023\000\003\000", 0x1e15},
 #line 745 "uninorm/composition-table.gperf"
       {"\000\037i\000\003\001", 0x1f6d},
 #line 743 "uninorm/composition-table.gperf"
@@ -291,10 +284,10 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037\011\000\003E", 0x1f89},
 #line 578 "uninorm/composition-table.gperf"
       {"\000\001\002\000\003\003", 0x1eb4},
-#line 482 "uninorm/composition-table.gperf"
-      {"\000\000\365\000\003\010", 0x1e4f},
-#line 614 "uninorm/composition-table.gperf"
-      {"\000\036\314\000\003\002", 0x1ed8},
+#line 849 "uninorm/composition-table.gperf"
+      {"\000\037|\000\003E", 0x1ff2},
+#line 807 "uninorm/composition-table.gperf"
+      {"\000\003\254\000\003E", 0x1fb4},
 #line 579 "uninorm/composition-table.gperf"
       {"\000\001\003\000\003\003", 0x1eb5},
 #line 705 "uninorm/composition-table.gperf"
@@ -311,14 +304,14 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000I\000\003\001", 0x00cd},
 #line 42 "uninorm/composition-table.gperf"
       {"\000\000I\000\003\000", 0x00cc},
-#line 817 "uninorm/composition-table.gperf"
-      {"\000\003\256\000\003E", 0x1fc4},
+#line 970 "uninorm/composition-table.gperf"
+      {"\001\023\213\001\023\302", 0x1138e},
 #line 44 "uninorm/composition-table.gperf"
       {"\000\000I\000\003\002", 0x00ce},
 #line 128 "uninorm/composition-table.gperf"
       {"\000\000I\000\003\007", 0x0130},
-#line 875 "uninorm/composition-table.gperf"
-      {"\000\000<\000\0038", 0x226e},
+#line 969 "uninorm/composition-table.gperf"
+      {"\001\023\204\001\023\273", 0x11385},
 #line 719 "uninorm/composition-table.gperf"
       {"\000\037I\000\003\001", 0x1f4d},
 #line 717 "uninorm/composition-table.gperf"
@@ -333,8 +326,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037)\000\003\000", 0x1f2b},
 #line 691 "uninorm/composition-table.gperf"
       {"\000\037)\000\003B", 0x1f2f},
-#line 849 "uninorm/composition-table.gperf"
-      {"\000\037|\000\003E", 0x1ff2},
+#line 504 "uninorm/composition-table.gperf"
+      {"\000\001[\000\003\007", 0x1e65},
 #line 71 "uninorm/composition-table.gperf"
       {"\000\000i\000\003\010", 0x00ef},
 #line 759 "uninorm/composition-table.gperf"
@@ -343,14 +336,14 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000\374\000\003\001", 0x01d8},
 #line 211 "uninorm/composition-table.gperf"
       {"\000\000\374\000\003\000", 0x01dc},
-#line 807 "uninorm/composition-table.gperf"
-      {"\000\003\254\000\003E", 0x1fb4},
+#line 783 "uninorm/composition-table.gperf"
+      {"\000\037,\000\003E", 0x1f9c},
 #line 762 "uninorm/composition-table.gperf"
       {"\000\037\007\000\003E", 0x1f87},
-#line 675 "uninorm/composition-table.gperf"
-      {"\000\037\031\000\003\001", 0x1f1d},
-#line 673 "uninorm/composition-table.gperf"
-      {"\000\037\031\000\003\000", 0x1f1b},
+#line 310 "uninorm/composition-table.gperf"
+      {"\000\004\032\000\003\001", 0x040c},
+#line 130 "uninorm/composition-table.gperf"
+      {"\000\000j\000\003\002", 0x0135},
 #line 780 "uninorm/composition-table.gperf"
       {"\000\037)\000\003E", 0x1f99},
 #line 60 "uninorm/composition-table.gperf"
@@ -379,8 +372,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037A\000\003\001", 0x1f45},
 #line 711 "uninorm/composition-table.gperf"
       {"\000\037A\000\003\000", 0x1f43},
-#line 354 "uninorm/composition-table.gperf"
-      {"\000\004'\000\003\010", 0x04f4},
+#line 797 "uninorm/composition-table.gperf"
+      {"\000\037j\000\003E", 0x1faa},
 #line 65 "uninorm/composition-table.gperf"
       {"\000\000e\000\003\001", 0x00e9},
 #line 64 "uninorm/composition-table.gperf"
@@ -391,44 +384,44 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000e\000\003\002", 0x00ea},
 #line 105 "uninorm/composition-table.gperf"
       {"\000\000e\000\003\007", 0x0117},
-#line 317 "uninorm/composition-table.gperf"
-      {"\000\0043\000\003\001", 0x0453},
+#line 308 "uninorm/composition-table.gperf"
+      {"\000\004\023\000\003\001", 0x0403},
 #line 125 "uninorm/composition-table.gperf"
       {"\000\000i\000\003\006", 0x012d},
-#line 528 "uninorm/composition-table.gperf"
-      {"\000\000v\000\003\003", 0x1e7d},
 #line 345 "uninorm/composition-table.gperf"
       {"\000\004\351\000\003\010", 0x04eb},
+#line 525 "uninorm/composition-table.gperf"
+      {"\000\001j\000\003\010", 0x1e7a},
 #line 127 "uninorm/composition-table.gperf"
       {"\000\000i\000\003(", 0x012f},
-#line 344 "uninorm/composition-table.gperf"
-      {"\000\004\350\000\003\010", 0x04ea},
+#line 317 "uninorm/composition-table.gperf"
+      {"\000\0043\000\003\001", 0x0453},
 #line 668 "uninorm/composition-table.gperf"
       {"\000\037\020\000\003\001", 0x1f14},
 #line 666 "uninorm/composition-table.gperf"
       {"\000\037\020\000\003\000", 0x1f12},
 #line 576 "uninorm/composition-table.gperf"
       {"\000\001\002\000\003\011", 0x1eb2},
-#line 596 "uninorm/composition-table.gperf"
-      {"\000\036\270\000\003\002", 0x1ec6},
-#line 368 "uninorm/composition-table.gperf"
-      {"\000\0113\000\011<", 0x0934},
+#line 315 "uninorm/composition-table.gperf"
+      {"\000\0045\000\003\000", 0x0450},
+#line 784 "uninorm/composition-table.gperf"
+      {"\000\037-\000\003E", 0x1f9d},
 #line 577 "uninorm/composition-table.gperf"
       {"\000\001\003\000\003\011", 0x1eb3},
 #line 321 "uninorm/composition-table.gperf"
       {"\000\004C\000\003\006", 0x045e},
 #line 792 "uninorm/composition-table.gperf"
       {"\000\037e\000\003E", 0x1fa5},
-#line 783 "uninorm/composition-table.gperf"
-      {"\000\037,\000\003E", 0x1f9c},
-#line 337 "uninorm/composition-table.gperf"
-      {"\000\0047\000\003\010", 0x04df},
+#line 335 "uninorm/composition-table.gperf"
+      {"\000\0046\000\003\010", 0x04dd},
+#line 368 "uninorm/composition-table.gperf"
+      {"\000\0113\000\011<", 0x0934},
 #line 120 "uninorm/composition-table.gperf"
       {"\000\000I\000\003\003", 0x0128},
 #line 432 "uninorm/composition-table.gperf"
       {"\000\002)\000\003\006", 0x1e1d},
-#line 781 "uninorm/composition-table.gperf"
-      {"\000\037*\000\003E", 0x1f9a},
+#line 596 "uninorm/composition-table.gperf"
+      {"\000\036\270\000\003\002", 0x1ec6},
 #line 35 "uninorm/composition-table.gperf"
       {"\000\000A\000\003\010", 0x00c4},
 #line 124 "uninorm/composition-table.gperf"
@@ -449,8 +442,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\001\353\000\003\004", 0x01ed},
 #line 67 "uninorm/composition-table.gperf"
       {"\000\000e\000\003\010", 0x00eb},
-#line 342 "uninorm/composition-table.gperf"
-      {"\000\004\036\000\003\010", 0x04e6},
+#line 217 "uninorm/composition-table.gperf"
+      {"\000\000\346\000\003\004", 0x01e3},
 #line 79 "uninorm/composition-table.gperf"
       {"\000\000u\000\003\001", 0x00fa},
 #line 78 "uninorm/composition-table.gperf"
@@ -461,8 +454,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000u\000\003\002", 0x00fb},
 #line 96 "uninorm/composition-table.gperf"
       {"\000\000C\000\003\014", 0x010c},
-#line 215 "uninorm/composition-table.gperf"
-      {"\000\002'\000\003\004", 0x01e1},
+#line 273 "uninorm/composition-table.gperf"
+      {"\000\000\326\000\003\004", 0x022a},
 #line 696 "uninorm/composition-table.gperf"
       {"\000\0370\000\003\001", 0x1f34},
 #line 694 "uninorm/composition-table.gperf"
@@ -473,30 +466,30 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037o\000\003E", 0x1faf},
 #line 561 "uninorm/composition-table.gperf"
       {"\000\000a\000\003\011", 0x1ea3},
-#line 273 "uninorm/composition-table.gperf"
-      {"\000\000\326\000\003\004", 0x022a},
+#line 316 "uninorm/composition-table.gperf"
+      {"\000\0045\000\003\010", 0x0451},
 #line 248 "uninorm/composition-table.gperf"
       {"\000\000i\000\003\017", 0x0209},
-#line 227 "uninorm/composition-table.gperf"
-      {"\000\002\222\000\003\014", 0x01ef},
+#line 325 "uninorm/composition-table.gperf"
+      {"\000\0046\000\003\006", 0x04c2},
 #line 34 "uninorm/composition-table.gperf"
       {"\000\000A\000\003\003", 0x00c3},
-#line 784 "uninorm/composition-table.gperf"
-      {"\000\037-\000\003E", 0x1f9d},
-#line 274 "uninorm/composition-table.gperf"
-      {"\000\000\366\000\003\004", 0x022b},
+#line 344 "uninorm/composition-table.gperf"
+      {"\000\004\350\000\003\010", 0x04ea},
+#line 411 "uninorm/composition-table.gperf"
+      {"\000\000\307\000\003\001", 0x1e08},
 #line 760 "uninorm/composition-table.gperf"
       {"\000\037\005\000\003E", 0x1f85},
 #line 86 "uninorm/composition-table.gperf"
       {"\000\000A\000\003\006", 0x0102},
-#line 276 "uninorm/composition-table.gperf"
-      {"\000\000\365\000\003\004", 0x022d},
+#line 981 "uninorm/composition-table.gperf"
+      {"\001a\036\001a\036", 0x16121},
 #line 768 "uninorm/composition-table.gperf"
       {"\000\037\015\000\003E", 0x1f8d},
 #line 88 "uninorm/composition-table.gperf"
       {"\000\000A\000\003(", 0x0104},
-#line 217 "uninorm/composition-table.gperf"
-      {"\000\000\346\000\003\004", 0x01e3},
+#line 528 "uninorm/composition-table.gperf"
+      {"\000\000v\000\003\003", 0x1e7d},
 #line 587 "uninorm/composition-table.gperf"
       {"\000\000e\000\003\003", 0x1ebd},
 #line 77 "uninorm/composition-table.gperf"
@@ -509,14 +502,14 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000e\000\003\006", 0x0115},
 #line 197 "uninorm/composition-table.gperf"
       {"\000\000a\000\003\014", 0x01ce},
-#line 388 "uninorm/composition-table.gperf"
-      {"\000\015\331\000\015\317", 0x0ddc},
+#line 782 "uninorm/composition-table.gperf"
+      {"\000\037+\000\003E", 0x1f9b},
 #line 107 "uninorm/composition-table.gperf"
       {"\000\000e\000\003(", 0x0119},
 #line 247 "uninorm/composition-table.gperf"
       {"\000\000I\000\003\017", 0x0208},
-#line 782 "uninorm/composition-table.gperf"
-      {"\000\037+\000\003E", 0x1f9b},
+#line 778 "uninorm/composition-table.gperf"
+      {"\000\037'\000\003E", 0x1f97},
 #line 81 "uninorm/composition-table.gperf"
       {"\000\000u\000\003\010", 0x00fc},
 #line 39 "uninorm/composition-table.gperf"
@@ -531,20 +524,20 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000E\000\003\007", 0x0116},
 #line 208 "uninorm/composition-table.gperf"
       {"\000\000\334\000\003\014", 0x01d9},
-#line 212 "uninorm/composition-table.gperf"
-      {"\000\000\304\000\003\004", 0x01de},
+#line 331 "uninorm/composition-table.gperf"
+      {"\000\0045\000\003\006", 0x04d7},
 #line 123 "uninorm/composition-table.gperf"
       {"\000\000i\000\003\004", 0x012b},
-#line 213 "uninorm/composition-table.gperf"
-      {"\000\000\344\000\003\004", 0x01df},
-#line 306 "uninorm/composition-table.gperf"
-      {"\000\004\025\000\003\000", 0x0400},
+#line 669 "uninorm/composition-table.gperf"
+      {"\000\037\021\000\003\001", 0x1f15},
+#line 667 "uninorm/composition-table.gperf"
+      {"\000\037\021\000\003\000", 0x1f13},
 #line 199 "uninorm/composition-table.gperf"
       {"\000\000i\000\003\014", 0x01d0},
 #line 598 "uninorm/composition-table.gperf"
       {"\000\000I\000\003\011", 0x1ec8},
-#line 390 "uninorm/composition-table.gperf"
-      {"\000\015\331\000\015\337", 0x0dde},
+#line 346 "uninorm/composition-table.gperf"
+      {"\000\004-\000\003\010", 0x04ec},
 #line 48 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\001", 0x00d3},
 #line 47 "uninorm/composition-table.gperf"
@@ -565,8 +558,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\0000\357\0000\231", 0x30f7},
 #line 223 "uninorm/composition-table.gperf"
       {"\000\000o\000\003(", 0x01eb},
-#line 924 "uninorm/composition-table.gperf"
-      {"\0000{\0000\231", 0x307c},
+#line 932 "uninorm/composition-table.gperf"
+      {"\0000\263\0000\231", 0x30b4},
 #line 170 "uninorm/composition-table.gperf"
       {"\000\000u\000\003\003", 0x0169},
 #line 239 "uninorm/composition-table.gperf"
@@ -583,8 +576,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\0000F\0000\231", 0x3094},
 #line 180 "uninorm/composition-table.gperf"
       {"\000\000u\000\003(", 0x0173},
-#line 541 "uninorm/composition-table.gperf"
-      {"\000\000X\000\003\007", 0x1e8a},
+#line 853 "uninorm/composition-table.gperf"
+      {"\000\037\366\000\003E", 0x1ff7},
 #line 41 "uninorm/composition-table.gperf"
       {"\000\000E\000\003\010", 0x00cb},
 #line 244 "uninorm/composition-table.gperf"
@@ -593,16 +586,16 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000U\000\003\001", 0x00da},
 #line 52 "uninorm/composition-table.gperf"
       {"\000\000U\000\003\000", 0x00d9},
-#line 925 "uninorm/composition-table.gperf"
-      {"\0000{\0000\232", 0x307d},
+#line 342 "uninorm/composition-table.gperf"
+      {"\000\004\036\000\003\010", 0x04e6},
 #line 54 "uninorm/composition-table.gperf"
       {"\000\000U\000\003\002", 0x00db},
 #line 560 "uninorm/composition-table.gperf"
       {"\000\000A\000\003\011", 0x1ea2},
-#line 460 "uninorm/composition-table.gperf"
-      {"\000\0367\000\003\004", 0x1e39},
-#line 307 "uninorm/composition-table.gperf"
-      {"\000\004\025\000\003\010", 0x0401},
+#line 958 "uninorm/composition-table.gperf"
+      {"\0000\375\0000\231", 0x30fe},
+#line 407 "uninorm/composition-table.gperf"
+      {"\000\000B\000\003#", 0x1e04},
 #line 205 "uninorm/composition-table.gperf"
       {"\000\000\374\000\003\004", 0x01d6},
 #line 775 "uninorm/composition-table.gperf"
@@ -613,8 +606,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000\374\000\003\014", 0x01da},
 #line 51 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\010", 0x00d6},
-#line 346 "uninorm/composition-table.gperf"
-      {"\000\004-\000\003\010", 0x04ec},
+#line 228 "uninorm/composition-table.gperf"
+      {"\000\000j\000\003\014", 0x01f0},
 #line 585 "uninorm/composition-table.gperf"
       {"\000\000e\000\003\011", 0x1ebb},
 #line 326 "uninorm/composition-table.gperf"
@@ -637,18 +630,18 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000A\000\003\014", 0x01cd},
 #line 586 "uninorm/composition-table.gperf"
       {"\000\000E\000\003\003", 0x1ebc},
-#line 940 "uninorm/composition-table.gperf"
-      {"\0000\304\0000\231", 0x30c5},
+#line 409 "uninorm/composition-table.gperf"
+      {"\000\000B\000\0031", 0x1e06},
 #line 252 "uninorm/composition-table.gperf"
       {"\000\000o\000\003\017", 0x020d},
-#line 543 "uninorm/composition-table.gperf"
-      {"\000\000X\000\003\010", 0x1e8c},
+#line 356 "uninorm/composition-table.gperf"
+      {"\000\004+\000\003\010", 0x04f8},
 #line 102 "uninorm/composition-table.gperf"
       {"\000\000E\000\003\006", 0x0114},
 #line 101 "uninorm/composition-table.gperf"
       {"\000\000e\000\003\004", 0x0113},
-#line 356 "uninorm/composition-table.gperf"
-      {"\000\004+\000\003\010", 0x04f8},
+#line 354 "uninorm/composition-table.gperf"
+      {"\000\004'\000\003\010", 0x04f4},
 #line 106 "uninorm/composition-table.gperf"
       {"\000\000E\000\003(", 0x0118},
 #line 109 "uninorm/composition-table.gperf"
@@ -659,12 +652,12 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000U\000\003\010", 0x00dc},
 #line 260 "uninorm/composition-table.gperf"
       {"\000\000u\000\003\017", 0x0215},
-#line 330 "uninorm/composition-table.gperf"
-      {"\000\004\025\000\003\006", 0x04d6},
+#line 957 "uninorm/composition-table.gperf"
+      {"\0000\362\0000\231", 0x30fa},
 #line 50 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\003", 0x00d5},
-#line 530 "uninorm/composition-table.gperf"
-      {"\000\000v\000\003#", 0x1e7f},
+#line 956 "uninorm/composition-table.gperf"
+      {"\0000\361\0000\231", 0x30f9},
 #line 510 "uninorm/composition-table.gperf"
       {"\000\000t\000\003\007", 0x1e6b},
 #line 605 "uninorm/composition-table.gperf"
@@ -679,12 +672,12 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000O\000\003(", 0x01ea},
 #line 327 "uninorm/composition-table.gperf"
       {"\000\0040\000\003\006", 0x04d1},
-#line 958 "uninorm/composition-table.gperf"
-      {"\0000\375\0000\231", 0x30fe},
-#line 957 "uninorm/composition-table.gperf"
-      {"\0000\362\0000\231", 0x30fa},
-#line 266 "uninorm/composition-table.gperf"
-      {"\000\000t\000\003&", 0x021b},
+#line 835 "uninorm/composition-table.gperf"
+      {"\000\037\376\000\003\001", 0x1fde},
+#line 834 "uninorm/composition-table.gperf"
+      {"\000\037\376\000\003\000", 0x1fdd},
+#line 836 "uninorm/composition-table.gperf"
+      {"\000\037\376\000\003B", 0x1fdf},
 #line 629 "uninorm/composition-table.gperf"
       {"\000\000u\000\003\011", 0x1ee7},
 #line 152 "uninorm/composition-table.gperf"
@@ -699,16 +692,16 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000r\000\003\007", 0x1e59},
 #line 146 "uninorm/composition-table.gperf"
       {"\000\000o\000\003\004", 0x014d},
-#line 956 "uninorm/composition-table.gperf"
-      {"\0000\361\0000\231", 0x30f9},
 #line 955 "uninorm/composition-table.gperf"
       {"\0000\360\0000\231", 0x30f8},
+#line 213 "uninorm/composition-table.gperf"
+      {"\000\000\344\000\003\004", 0x01df},
 #line 201 "uninorm/composition-table.gperf"
       {"\000\000o\000\003\014", 0x01d2},
 #line 169 "uninorm/composition-table.gperf"
       {"\000\000U\000\003\003", 0x0168},
-#line 411 "uninorm/composition-table.gperf"
-      {"\000\000\307\000\003\001", 0x1e08},
+#line 909 "uninorm/composition-table.gperf"
+      {"\0000[\0000\231", 0x305c},
 #line 140 "uninorm/composition-table.gperf"
       {"\000\000n\000\003\001", 0x0144},
 #line 232 "uninorm/composition-table.gperf"
@@ -727,44 +720,44 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000t\000\003\010", 0x1e97},
 #line 243 "uninorm/composition-table.gperf"
       {"\000\000E\000\003\017", 0x0204},
-#line 669 "uninorm/composition-table.gperf"
-      {"\000\037\021\000\003\001", 0x1f15},
-#line 667 "uninorm/composition-table.gperf"
-      {"\000\037\021\000\003\000", 0x1f13},
+#line 434 "uninorm/composition-table.gperf"
+      {"\000\000f\000\003\007", 0x1e1f},
+#line 215 "uninorm/composition-table.gperf"
+      {"\000\002'\000\003\004", 0x01e1},
 #line 785 "uninorm/composition-table.gperf"
       {"\000\037.\000\003E", 0x1f9e},
-#line 414 "uninorm/composition-table.gperf"
-      {"\000\000d\000\003\007", 0x1e0b},
+#line 951 "uninorm/composition-table.gperf"
+      {"\0000\333\0000\231", 0x30dc},
 #line 242 "uninorm/composition-table.gperf"
       {"\000\000a\000\003\021", 0x0203},
-#line 405 "uninorm/composition-table.gperf"
-      {"\000\000B\000\003\007", 0x1e02},
+#line 875 "uninorm/composition-table.gperf"
+      {"\000\000<\000\0038", 0x226e},
 #line 647 "uninorm/composition-table.gperf"
       {"\000\000y\000\003\003", 0x1ef9},
-#line 942 "uninorm/composition-table.gperf"
-      {"\0000\310\0000\231", 0x30c9},
-#line 384 "uninorm/composition-table.gperf"
-      {"\000\015F\000\015>", 0x0d4a},
+#line 459 "uninorm/composition-table.gperf"
+      {"\000\0366\000\003\004", 0x1e38},
+#line 388 "uninorm/composition-table.gperf"
+      {"\000\015\331\000\015\317", 0x0ddc},
 #line 801 "uninorm/composition-table.gperf"
       {"\000\037n\000\003E", 0x1fae},
 #line 558 "uninorm/composition-table.gperf"
       {"\000\000A\000\003#", 0x1ea0},
-#line 960 "uninorm/composition-table.gperf"
-      {"\001\020\233\001\020\272", 0x1109c},
+#line 541 "uninorm/composition-table.gperf"
+      {"\000\000X\000\003\007", 0x1e8a},
 #line 251 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\017", 0x020c},
 #line 584 "uninorm/composition-table.gperf"
       {"\000\000E\000\003\011", 0x1eba},
-#line 335 "uninorm/composition-table.gperf"
-      {"\000\0046\000\003\010", 0x04dd},
+#line 793 "uninorm/composition-table.gperf"
+      {"\000\037f\000\003E", 0x1fa6},
 #line 766 "uninorm/composition-table.gperf"
       {"\000\037\013\000\003E", 0x1f8b},
 #line 323 "uninorm/composition-table.gperf"
       {"\000\004u\000\003\017", 0x0477},
-#line 791 "uninorm/composition-table.gperf"
-      {"\000\037d\000\003E", 0x1fa4},
-#line 319 "uninorm/composition-table.gperf"
-      {"\000\004:\000\003\001", 0x045c},
+#line 390 "uninorm/composition-table.gperf"
+      {"\000\015\331\000\015\337", 0x0dde},
+#line 530 "uninorm/composition-table.gperf"
+      {"\000\000v\000\003#", 0x1e7f},
 #line 583 "uninorm/composition-table.gperf"
       {"\000\000e\000\003#", 0x1eb9},
 #line 250 "uninorm/composition-table.gperf"
@@ -781,8 +774,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037H\000\003\000", 0x1f4a},
 #line 604 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\011", 0x1ece},
-#line 936 "uninorm/composition-table.gperf"
-      {"\0000\273\0000\231", 0x30bc},
+#line 960 "uninorm/composition-table.gperf"
+      {"\001\005\332\000\003\007", 0x105e4},
 #line 100 "uninorm/composition-table.gperf"
       {"\000\000E\000\003\004", 0x0112},
 #line 56 "uninorm/composition-table.gperf"
@@ -807,14 +800,14 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\0000o\0000\231", 0x3070},
 #line 249 "uninorm/composition-table.gperf"
       {"\000\000I\000\003\021", 0x020a},
-#line 937 "uninorm/composition-table.gperf"
-      {"\0000\275\0000\231", 0x30be},
+#line 543 "uninorm/composition-table.gperf"
+      {"\000\000X\000\003\010", 0x1e8c},
 #line 145 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\004", 0x014c},
-#line 479 "uninorm/composition-table.gperf"
-      {"\000\000\325\000\003\001", 0x1e4c},
-#line 325 "uninorm/composition-table.gperf"
-      {"\000\0046\000\003\006", 0x04c2},
+#line 274 "uninorm/composition-table.gperf"
+      {"\000\000\366\000\003\004", 0x022b},
+#line 414 "uninorm/composition-table.gperf"
+      {"\000\000d\000\003\007", 0x1e0b},
 #line 200 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\014", 0x01d1},
 #line 603 "uninorm/composition-table.gperf"
@@ -827,36 +820,36 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000U\000\003\011", 0x1ee6},
 #line 72 "uninorm/composition-table.gperf"
       {"\000\000n\000\003\003", 0x00f1},
-#line 929 "uninorm/composition-table.gperf"
-      {"\0000\255\0000\231", 0x30ae},
+#line 496 "uninorm/composition-table.gperf"
+      {"\000\036[\000\003\004", 0x1e5d},
 #line 441 "uninorm/composition-table.gperf"
       {"\000\000H\000\003\010", 0x1e26},
-#line 917 "uninorm/composition-table.gperf"
-      {"\0000o\0000\232", 0x3071},
-#line 466 "uninorm/composition-table.gperf"
-      {"\000\000m\000\003\001", 0x1e3f},
+#line 319 "uninorm/composition-table.gperf"
+      {"\000\004:\000\003\001", 0x045c},
+#line 615 "uninorm/composition-table.gperf"
+      {"\000\036\315\000\003\002", 0x1ed9},
 #line 627 "uninorm/composition-table.gperf"
       {"\000\000u\000\003#", 0x1ee5},
 #line 119 "uninorm/composition-table.gperf"
       {"\000\000h\000\003\002", 0x0125},
 #line 438 "uninorm/composition-table.gperf"
       {"\000\000h\000\003\007", 0x1e23},
-#line 468 "uninorm/composition-table.gperf"
-      {"\000\000m\000\003\007", 0x1e41},
+#line 791 "uninorm/composition-table.gperf"
+      {"\000\037d\000\003E", 0x1fa4},
 #line 744 "uninorm/composition-table.gperf"
       {"\000\037h\000\003\001", 0x1f6c},
 #line 742 "uninorm/composition-table.gperf"
       {"\000\037h\000\003\000", 0x1f6a},
 #line 746 "uninorm/composition-table.gperf"
       {"\000\037h\000\003B", 0x1f6e},
-#line 921 "uninorm/composition-table.gperf"
-      {"\0000u\0000\232", 0x3077},
+#line 212 "uninorm/composition-table.gperf"
+      {"\000\000\304\000\003\004", 0x01de},
 #line 185 "uninorm/composition-table.gperf"
       {"\000\000Y\000\003\010", 0x0178},
 #line 171 "uninorm/composition-table.gperf"
       {"\000\000U\000\003\004", 0x016a},
-#line 386 "uninorm/composition-table.gperf"
-      {"\000\015F\000\015W", 0x0d4c},
+#line 337 "uninorm/composition-table.gperf"
+      {"\000\0047\000\003\010", 0x04df},
 #line 645 "uninorm/composition-table.gperf"
       {"\000\000y\000\003\011", 0x1ef7},
 #line 202 "uninorm/composition-table.gperf"
@@ -869,16 +862,16 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\037\"\000\003E", 0x1f92},
 #line 795 "uninorm/composition-table.gperf"
       {"\000\037h\000\003E", 0x1fa8},
-#line 800 "uninorm/composition-table.gperf"
-      {"\000\037m\000\003E", 0x1fad},
+#line 614 "uninorm/composition-table.gperf"
+      {"\000\036\314\000\003\002", 0x1ed8},
 #line 688 "uninorm/composition-table.gperf"
       {"\000\037(\000\003\001", 0x1f2c},
 #line 686 "uninorm/composition-table.gperf"
       {"\000\037(\000\003\000", 0x1f2a},
 #line 690 "uninorm/composition-table.gperf"
       {"\000\037(\000\003B", 0x1f2e},
-#line 481 "uninorm/composition-table.gperf"
-      {"\000\000\325\000\003\010", 0x1e4e},
+#line 942 "uninorm/composition-table.gperf"
+      {"\0000\310\0000\231", 0x30c9},
 #line 246 "uninorm/composition-table.gperf"
       {"\000\000e\000\003\021", 0x0207},
 #line 697 "uninorm/composition-table.gperf"
@@ -889,8 +882,8 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\0371\000\003B", 0x1f37},
 #line 282 "uninorm/composition-table.gperf"
       {"\000\000y\000\003\004", 0x0233},
-#line 953 "uninorm/composition-table.gperf"
-      {"\0000\246\0000\231", 0x30f4},
+#line 781 "uninorm/composition-table.gperf"
+      {"\000\037*\000\003E", 0x1f9a},
 #line 428 "uninorm/composition-table.gperf"
       {"\000\000e\000\003-", 0x1e19},
 #line 256 "uninorm/composition-table.gperf"
@@ -925,46 +918,46 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\"\003\000\0038", 0x2204},
 #line 864 "uninorm/composition-table.gperf"
       {"\000\"\010\000\0038", 0x2209},
-#line 884 "uninorm/composition-table.gperf"
-      {"\000\"{\000\0038", 0x2281},
+#line 898 "uninorm/composition-table.gperf"
+      {"\000\"\263\000\0038", 0x22eb},
 #line 168 "uninorm/composition-table.gperf"
       {"\000\000t\000\003\014", 0x0165},
 #line 602 "uninorm/composition-table.gperf"
       {"\000\000O\000\003#", 0x1ecc},
 #line 254 "uninorm/composition-table.gperf"
       {"\000\000o\000\003\021", 0x020f},
-#line 459 "uninorm/composition-table.gperf"
-      {"\000\0366\000\003\004", 0x1e38},
+#line 937 "uninorm/composition-table.gperf"
+      {"\0000\275\0000\231", 0x30be},
 #line 229 "uninorm/composition-table.gperf"
       {"\000\000G\000\003\001", 0x01f4},
-#line 899 "uninorm/composition-table.gperf"
-      {"\000\"\264\000\0038", 0x22ec},
-#line 897 "uninorm/composition-table.gperf"
-      {"\000\"\262\000\0038", 0x22ea},
+#line 562 "uninorm/composition-table.gperf"
+      {"\000\000\302\000\003\001", 0x1ea4},
+#line 564 "uninorm/composition-table.gperf"
+      {"\000\000\302\000\003\000", 0x1ea6},
 #line 110 "uninorm/composition-table.gperf"
       {"\000\000G\000\003\002", 0x011c},
 #line 114 "uninorm/composition-table.gperf"
       {"\000\000G\000\003\007", 0x0120},
 #line 279 "uninorm/composition-table.gperf"
       {"\000\002.\000\003\004", 0x0230},
-#line 868 "uninorm/composition-table.gperf"
-      {"\000\"<\000\0038", 0x2241},
+#line 761 "uninorm/composition-table.gperf"
+      {"\000\037\006\000\003E", 0x1f86},
 #line 262 "uninorm/composition-table.gperf"
       {"\000\000u\000\003\021", 0x0217},
-#line 896 "uninorm/composition-table.gperf"
-      {"\000\"\222\000\0038", 0x22e3},
+#line 266 "uninorm/composition-table.gperf"
+      {"\000\000t\000\003&", 0x021b},
 #line 448 "uninorm/composition-table.gperf"
       {"\000\000i\000\0030", 0x1e2d},
-#line 889 "uninorm/composition-table.gperf"
-      {"\000\"\242\000\0038", 0x22ac},
+#line 940 "uninorm/composition-table.gperf"
+      {"\0000\304\0000\231", 0x30c5},
 #line 156 "uninorm/composition-table.gperf"
       {"\000\000r\000\003\014", 0x0159},
 #line 906 "uninorm/composition-table.gperf"
       {"\0000U\0000\231", 0x3056},
 #line 522 "uninorm/composition-table.gperf"
       {"\000\000u\000\003-", 0x1e77},
-#line 927 "uninorm/composition-table.gperf"
-      {"\0000\235\0000\231", 0x309e},
+#line 306 "uninorm/composition-table.gperf"
+      {"\000\004\025\000\003\000", 0x0400},
 #line 322 "uninorm/composition-table.gperf"
       {"\000\004t\000\003\017", 0x0476},
 #line 873 "uninorm/composition-table.gperf"
@@ -985,162 +978,162 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\011(\000\011<", 0x0929},
 #line 471 "uninorm/composition-table.gperf"
       {"\000\000N\000\003\007", 0x1e44},
-#line 888 "uninorm/composition-table.gperf"
-      {"\000\"\207\000\0038", 0x2289},
+#line 893 "uninorm/composition-table.gperf"
+      {"\000\"|\000\0038", 0x22e0},
 #line 176 "uninorm/composition-table.gperf"
       {"\000\000u\000\003\012", 0x016f},
-#line 887 "uninorm/composition-table.gperf"
-      {"\000\"\206\000\0038", 0x2288},
+#line 230 "uninorm/composition-table.gperf"
+      {"\000\000g\000\003\001", 0x01f5},
 #line 447 "uninorm/composition-table.gperf"
       {"\000\000I\000\0030", 0x1e2c},
-#line 886 "uninorm/composition-table.gperf"
-      {"\000\"\203\000\0038", 0x2285},
-#line 99 "uninorm/composition-table.gperf"
-      {"\000\000d\000\003\014", 0x010f},
+#line 936 "uninorm/composition-table.gperf"
+      {"\0000\273\0000\231", 0x30bc},
+#line 111 "uninorm/composition-table.gperf"
+      {"\000\000g\000\003\002", 0x011d},
+#line 115 "uninorm/composition-table.gperf"
+      {"\000\000g\000\003\007", 0x0121},
+#line 284 "uninorm/composition-table.gperf"
+      {"\000\003\221\000\003\001", 0x0386},
+#line 812 "uninorm/composition-table.gperf"
+      {"\000\003\221\000\003\000", 0x1fba},
 #line 534 "uninorm/composition-table.gperf"
       {"\000\000w\000\003\001", 0x1e83},
 #line 532 "uninorm/composition-table.gperf"
       {"\000\000w\000\003\000", 0x1e81},
-#line 514 "uninorm/composition-table.gperf"
-      {"\000\000t\000\0031", 0x1e6f},
+#line 643 "uninorm/composition-table.gperf"
+      {"\000\000y\000\003#", 0x1ef5},
 #line 182 "uninorm/composition-table.gperf"
       {"\000\000w\000\003\002", 0x0175},
 #line 538 "uninorm/composition-table.gperf"
       {"\000\000w\000\003\007", 0x1e87},
-#line 643 "uninorm/composition-table.gperf"
-      {"\000\000y\000\003#", 0x1ef5},
-#line 881 "uninorm/composition-table.gperf"
-      {"\000\"v\000\0038", 0x2278},
-#line 288 "uninorm/composition-table.gperf"
-      {"\000\003\237\000\003\001", 0x038c},
-#line 854 "uninorm/composition-table.gperf"
-      {"\000\003\237\000\003\000", 0x1ff8},
-#line 230 "uninorm/composition-table.gperf"
-      {"\000\000g\000\003\001", 0x01f5},
+#line 899 "uninorm/composition-table.gperf"
+      {"\000\"\264\000\0038", 0x22ec},
+#line 876 "uninorm/composition-table.gperf"
+      {"\000\000>\000\0038", 0x226f},
 #line 245 "uninorm/composition-table.gperf"
       {"\000\000E\000\003\021", 0x0206},
 #line 644 "uninorm/composition-table.gperf"
       {"\000\000Y\000\003\011", 0x1ef6},
-#line 111 "uninorm/composition-table.gperf"
-      {"\000\000g\000\003\002", 0x011d},
-#line 115 "uninorm/composition-table.gperf"
-      {"\000\000g\000\003\007", 0x0121},
-#line 334 "uninorm/composition-table.gperf"
-      {"\000\004\026\000\003\010", 0x04dc},
-#line 893 "uninorm/composition-table.gperf"
-      {"\000\"|\000\0038", 0x22e0},
+#line 386 "uninorm/composition-table.gperf"
+      {"\000\015F\000\015W", 0x0d4c},
+#line 813 "uninorm/composition-table.gperf"
+      {"\000\003\221\000\003E", 0x1fbc},
+#line 794 "uninorm/composition-table.gperf"
+      {"\000\037g\000\003E", 0x1fa7},
+#line 307 "uninorm/composition-table.gperf"
+      {"\000\004\025\000\003\010", 0x0401},
 #line 427 "uninorm/composition-table.gperf"
       {"\000\000E\000\003-", 0x1e18},
-#line 498 "uninorm/composition-table.gperf"
-      {"\000\000r\000\0031", 0x1e5f},
+#line 488 "uninorm/composition-table.gperf"
+      {"\000\000p\000\003\001", 0x1e55},
 #line 267 "uninorm/composition-table.gperf"
       {"\000\000H\000\003\014", 0x021e},
 #line 485 "uninorm/composition-table.gperf"
       {"\000\001L\000\003\001", 0x1e52},
 #line 483 "uninorm/composition-table.gperf"
       {"\000\001L\000\003\000", 0x1e50},
-#line 434 "uninorm/composition-table.gperf"
-      {"\000\000f\000\003\007", 0x1e1f},
+#line 490 "uninorm/composition-table.gperf"
+      {"\000\000p\000\003\007", 0x1e57},
 #line 512 "uninorm/composition-table.gperf"
       {"\000\000t\000\003#", 0x1e6d},
 #line 253 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\021", 0x020e},
-#line 885 "uninorm/composition-table.gperf"
-      {"\000\"\202\000\0038", 0x2284},
+#line 972 "uninorm/composition-table.gperf"
+      {"\001\023\302\001\023\302", 0x113c5},
 #line 133 "uninorm/composition-table.gperf"
       {"\000\000L\000\003\001", 0x0139},
 #line 281 "uninorm/composition-table.gperf"
       {"\000\000Y\000\003\004", 0x0232},
-#line 794 "uninorm/composition-table.gperf"
-      {"\000\037g\000\003E", 0x1fa7},
-#line 476 "uninorm/composition-table.gperf"
-      {"\000\000n\000\0031", 0x1e49},
+#line 509 "uninorm/composition-table.gperf"
+      {"\000\000T\000\003\007", 0x1e6a},
+#line 568 "uninorm/composition-table.gperf"
+      {"\000\000\302\000\003\003", 0x1eaa},
 #line 272 "uninorm/composition-table.gperf"
       {"\000\000e\000\003'", 0x0229},
 #line 918 "uninorm/composition-table.gperf"
       {"\0000r\0000\231", 0x3073},
 #line 112 "uninorm/composition-table.gperf"
       {"\000\000G\000\003\006", 0x011e},
-#line 304 "uninorm/composition-table.gperf"
-      {"\000\003\322\000\003\001", 0x03d3},
-#line 536 "uninorm/composition-table.gperf"
-      {"\000\000w\000\003\010", 0x1e85},
-#line 430 "uninorm/composition-table.gperf"
-      {"\000\000e\000\0030", 0x1e1b},
-#line 793 "uninorm/composition-table.gperf"
-      {"\000\037f\000\003E", 0x1fa6},
-#line 418 "uninorm/composition-table.gperf"
-      {"\000\000d\000\0031", 0x1e0f},
-#line 494 "uninorm/composition-table.gperf"
-      {"\000\000r\000\003#", 0x1e5b},
-#line 409 "uninorm/composition-table.gperf"
-      {"\000\000B\000\0031", 0x1e06},
-#line 275 "uninorm/composition-table.gperf"
-      {"\000\000\325\000\003\004", 0x022c},
 #line 486 "uninorm/composition-table.gperf"
       {"\000\001M\000\003\001", 0x1e53},
 #line 484 "uninorm/composition-table.gperf"
       {"\000\001M\000\003\000", 0x1e51},
-#line 894 "uninorm/composition-table.gperf"
-      {"\000\"}\000\0038", 0x22e1},
-#line 324 "uninorm/composition-table.gperf"
-      {"\000\004\026\000\003\006", 0x04c1},
-#line 919 "uninorm/composition-table.gperf"
-      {"\0000r\0000\232", 0x3074},
-#line 261 "uninorm/composition-table.gperf"
-      {"\000\000U\000\003\021", 0x0216},
+#line 430 "uninorm/composition-table.gperf"
+      {"\000\000e\000\0030", 0x1e1b},
+#line 805 "uninorm/composition-table.gperf"
+      {"\000\037p\000\003E", 0x1fb2},
+#line 536 "uninorm/composition-table.gperf"
+      {"\000\000w\000\003\010", 0x1e85},
+#line 494 "uninorm/composition-table.gperf"
+      {"\000\000r\000\003#", 0x1e5b},
 #line 465 "uninorm/composition-table.gperf"
       {"\000\000M\000\003\001", 0x1e3e},
+#line 99 "uninorm/composition-table.gperf"
+      {"\000\000d\000\003\014", 0x010f},
+#line 514 "uninorm/composition-table.gperf"
+      {"\000\000t\000\0031", 0x1e6f},
+#line 309 "uninorm/composition-table.gperf"
+      {"\000\004\006\000\003\010", 0x0407},
+#line 467 "uninorm/composition-table.gperf"
+      {"\000\000M\000\003\007", 0x1e40},
+#line 343 "uninorm/composition-table.gperf"
+      {"\000\004>\000\003\010", 0x04e7},
+#line 330 "uninorm/composition-table.gperf"
+      {"\000\004\025\000\003\006", 0x04d6},
+#line 261 "uninorm/composition-table.gperf"
+      {"\000\000U\000\003\021", 0x0216},
+#line 914 "uninorm/composition-table.gperf"
+      {"\0000f\0000\231", 0x3067},
 #line 46 "uninorm/composition-table.gperf"
       {"\000\000N\000\003\003", 0x00d1},
 #line 474 "uninorm/composition-table.gperf"
       {"\000\000n\000\003#", 0x1e47},
-#line 913 "uninorm/composition-table.gperf"
-      {"\0000d\0000\231", 0x3065},
-#line 467 "uninorm/composition-table.gperf"
-      {"\000\000M\000\003\007", 0x1e40},
+#line 952 "uninorm/composition-table.gperf"
+      {"\0000\333\0000\232", 0x30dd},
+#line 656 "uninorm/composition-table.gperf"
+      {"\000\003\221\000\003\023", 0x1f08},
 #line 521 "uninorm/composition-table.gperf"
       {"\000\000U\000\003-", 0x1e76},
 #line 268 "uninorm/composition-table.gperf"
       {"\000\000h\000\003\014", 0x021f},
 #line 355 "uninorm/composition-table.gperf"
       {"\000\004G\000\003\010", 0x04f5},
-#line 509 "uninorm/composition-table.gperf"
-      {"\000\000T\000\003\007", 0x1e6a},
-#line 315 "uninorm/composition-table.gperf"
-      {"\000\0045\000\003\000", 0x0450},
-#line 416 "uninorm/composition-table.gperf"
-      {"\000\000d\000\003#", 0x1e0d},
-#line 878 "uninorm/composition-table.gperf"
+#line 334 "uninorm/composition-table.gperf"
+      {"\000\004\026\000\003\010", 0x04dc},
+#line 498 "uninorm/composition-table.gperf"
+      {"\000\000r\000\0031", 0x1e5f},
+#line 881 "uninorm/composition-table.gperf"
+      {"\000\"v\000\0038", 0x2278},
+#line 878 "uninorm/composition-table.gperf"
       {"\000\"e\000\0038", 0x2271},
-#line 407 "uninorm/composition-table.gperf"
-      {"\000\000B\000\003#", 0x1e04},
+#line 113 "uninorm/composition-table.gperf"
+      {"\000\000g\000\003\006", 0x011f},
 #line 255 "uninorm/composition-table.gperf"
       {"\000\000R\000\003\017", 0x0210},
-#line 835 "uninorm/composition-table.gperf"
-      {"\000\037\376\000\003\001", 0x1fde},
-#line 834 "uninorm/composition-table.gperf"
-      {"\000\037\376\000\003\000", 0x1fdd},
-#line 836 "uninorm/composition-table.gperf"
-      {"\000\037\376\000\003B", 0x1fdf},
-#line 265 "uninorm/composition-table.gperf"
-      {"\000\000T\000\003&", 0x021a},
+#line 897 "uninorm/composition-table.gperf"
+      {"\000\"\262\000\0038", 0x22ea},
+#line 617 "uninorm/composition-table.gperf"
+      {"\000\001\241\000\003\001", 0x1edb},
+#line 619 "uninorm/composition-table.gperf"
+      {"\000\001\241\000\003\000", 0x1edd},
+#line 810 "uninorm/composition-table.gperf"
+      {"\000\003\221\000\003\006", 0x1fb8},
 #line 175 "uninorm/composition-table.gperf"
       {"\000\000U\000\003\012", 0x016e},
-#line 305 "uninorm/composition-table.gperf"
-      {"\000\003\322\000\003\010", 0x03d4},
-#line 301 "uninorm/composition-table.gperf"
-      {"\000\003\277\000\003\001", 0x03cc},
-#line 752 "uninorm/composition-table.gperf"
-      {"\000\003\277\000\003\000", 0x1f78},
-#line 714 "uninorm/composition-table.gperf"
-      {"\000\003\237\000\003\023", 0x1f48},
+#line 929 "uninorm/composition-table.gperf"
+      {"\0000\255\0000\231", 0x30ae},
+#line 476 "uninorm/composition-table.gperf"
+      {"\000\000n\000\0031", 0x1e49},
+#line 982 "uninorm/composition-table.gperf"
+      {"\001a\036\001a)", 0x16122},
+#line 840 "uninorm/composition-table.gperf"
+      {"\000\003\301\000\003\023", 0x1fe4},
 #line 520 "uninorm/composition-table.gperf"
       {"\000\000u\000\0030", 0x1e75},
-#line 911 "uninorm/composition-table.gperf"
-      {"\0000_\0000\231", 0x3060},
-#line 113 "uninorm/composition-table.gperf"
-      {"\000\000g\000\003\006", 0x011f},
+#line 237 "uninorm/composition-table.gperf"
+      {"\000\000\330\000\003\001", 0x01fe},
+#line 227 "uninorm/composition-table.gperf"
+      {"\000\002\222\000\003\014", 0x01ef},
 #line 297 "uninorm/composition-table.gperf"
       {"\000\003\271\000\003\001", 0x03af},
 #line 751 "uninorm/composition-table.gperf"
@@ -1149,56 +1142,56 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\003\271\000\003B", 0x1fd6},
 #line 439 "uninorm/composition-table.gperf"
       {"\000\000H\000\003#", 0x1e24},
-#line 824 "uninorm/composition-table.gperf"
-      {"\000\037\277\000\003\001", 0x1fce},
-#line 823 "uninorm/composition-table.gperf"
-      {"\000\037\277\000\003\000", 0x1fcd},
-#line 825 "uninorm/composition-table.gperf"
-      {"\000\037\277\000\003B", 0x1fcf},
+#line 296 "uninorm/composition-table.gperf"
+      {"\000\003\267\000\003\001", 0x03ae},
+#line 750 "uninorm/composition-table.gperf"
+      {"\000\003\267\000\003\000", 0x1f74},
+#line 818 "uninorm/composition-table.gperf"
+      {"\000\003\267\000\003B", 0x1fc6},
 #line 908 "uninorm/composition-table.gperf"
       {"\0000Y\0000\231", 0x305a},
-#line 910 "uninorm/composition-table.gperf"
-      {"\0000]\0000\231", 0x305e},
+#line 953 "uninorm/composition-table.gperf"
+      {"\0000\246\0000\231", 0x30f4},
 #line 556 "uninorm/composition-table.gperf"
       {"\000\000y\000\003\012", 0x1e99},
-#line 310 "uninorm/composition-table.gperf"
-      {"\000\004\032\000\003\001", 0x040c},
-#line 426 "uninorm/composition-table.gperf"
-      {"\000\001\023\000\003\001", 0x1e17},
-#line 424 "uninorm/composition-table.gperf"
-      {"\000\001\023\000\003\000", 0x1e15},
+#line 235 "uninorm/composition-table.gperf"
+      {"\000\000\306\000\003\001", 0x01fc},
+#line 324 "uninorm/composition-table.gperf"
+      {"\000\004\026\000\003\006", 0x04c1},
+#line 917 "uninorm/composition-table.gperf"
+      {"\0000o\0000\232", 0x3071},
 #line 516 "uninorm/composition-table.gperf"
       {"\000\000t\000\003-", 0x1e71},
 #line 642 "uninorm/composition-table.gperf"
       {"\000\000Y\000\003#", 0x1ef4},
-#line 316 "uninorm/composition-table.gperf"
-      {"\000\0045\000\003\010", 0x0451},
-#line 767 "uninorm/composition-table.gperf"
-      {"\000\037\014\000\003E", 0x1f8c},
-#line 553 "uninorm/composition-table.gperf"
-      {"\000\000h\000\0031", 0x1e96},
-#line 932 "uninorm/composition-table.gperf"
-      {"\0000\263\0000\231", 0x30b4},
+#line 566 "uninorm/composition-table.gperf"
+      {"\000\000\302\000\003\011", 0x1ea8},
+#line 816 "uninorm/composition-table.gperf"
+      {"\000\003\267\000\003E", 0x1fc3},
+#line 913 "uninorm/composition-table.gperf"
+      {"\0000d\0000\231", 0x3065},
+#line 460 "uninorm/composition-table.gperf"
+      {"\000\0367\000\003\004", 0x1e39},
 #line 155 "uninorm/composition-table.gperf"
       {"\000\000R\000\003\014", 0x0158},
-#line 947 "uninorm/composition-table.gperf"
-      {"\0000\325\0000\231", 0x30d6},
-#line 336 "uninorm/composition-table.gperf"
-      {"\000\004\027\000\003\010", 0x04de},
+#line 885 "uninorm/composition-table.gperf"
+      {"\000\"\202\000\0038", 0x2284},
+#line 921 "uninorm/composition-table.gperf"
+      {"\0000u\0000\232", 0x3077},
 #line 258 "uninorm/composition-table.gperf"
       {"\000\000r\000\003\021", 0x0213},
-#line 296 "uninorm/composition-table.gperf"
-      {"\000\003\267\000\003\001", 0x03ae},
-#line 750 "uninorm/composition-table.gperf"
-      {"\000\003\267\000\003\000", 0x1f74},
-#line 818 "uninorm/composition-table.gperf"
-      {"\000\003\267\000\003B", 0x1fc6},
+#line 466 "uninorm/composition-table.gperf"
+      {"\000\000m\000\003\001", 0x1e3f},
+#line 416 "uninorm/composition-table.gperf"
+      {"\000\000d\000\003#", 0x1e0d},
+#line 767 "uninorm/composition-table.gperf"
+      {"\000\037\014\000\003E", 0x1f8c},
 #line 271 "uninorm/composition-table.gperf"
       {"\000\000E\000\003'", 0x0228},
-#line 617 "uninorm/composition-table.gperf"
-      {"\000\001\241\000\003\001", 0x1edb},
-#line 619 "uninorm/composition-table.gperf"
-      {"\000\001\241\000\003\000", 0x1edd},
+#line 468 "uninorm/composition-table.gperf"
+      {"\000\000m\000\003\007", 0x1e41},
+#line 819 "uninorm/composition-table.gperf"
+      {"\000\037\306\000\003E", 0x1fc7},
 #line 435 "uninorm/composition-table.gperf"
       {"\000\000G\000\003\004", 0x1e20},
 #line 915 "uninorm/composition-table.gperf"
@@ -1209,199 +1202,202 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\000G\000\003\014", 0x01e6},
 #line 299 "uninorm/composition-table.gperf"
       {"\000\003\271\000\003\010", 0x03ca},
-#line 948 "uninorm/composition-table.gperf"
-      {"\0000\325\0000\232", 0x30d7},
-#line 816 "uninorm/composition-table.gperf"
-      {"\000\003\267\000\003E", 0x1fc3},
-#line 951 "uninorm/composition-table.gperf"
-      {"\0000\333\0000\231", 0x30dc},
-#line 440 "uninorm/composition-table.gperf"
-      {"\000\000h\000\003#", 0x1e25},
-#line 470 "uninorm/composition-table.gperf"
-      {"\000\000m\000\003#", 0x1e43},
-#line 478 "uninorm/composition-table.gperf"
-      {"\000\000n\000\003-", 0x1e4b},
-#line 928 "uninorm/composition-table.gperf"
-      {"\0000\253\0000\231", 0x30ac},
 #line 294 "uninorm/composition-table.gperf"
       {"\000\003\261\000\003\001", 0x03ac},
 #line 748 "uninorm/composition-table.gperf"
       {"\000\003\261\000\003\000", 0x1f70},
 #line 808 "uninorm/composition-table.gperf"
       {"\000\003\261\000\003B", 0x1fb6},
-#line 331 "uninorm/composition-table.gperf"
-      {"\000\0045\000\003\006", 0x04d7},
-#line 284 "uninorm/composition-table.gperf"
-      {"\000\003\221\000\003\001", 0x0386},
-#line 812 "uninorm/composition-table.gperf"
-      {"\000\003\221\000\003\000", 0x1fba},
-#line 422 "uninorm/composition-table.gperf"
-      {"\000\000d\000\003-", 0x1e13},
-#line 597 "uninorm/composition-table.gperf"
-      {"\000\036\271\000\003\002", 0x1ec7},
-#line 770 "uninorm/composition-table.gperf"
-      {"\000\037\017\000\003E", 0x1f8f},
-#line 952 "uninorm/composition-table.gperf"
-      {"\0000\333\0000\232", 0x30dd},
-#line 353 "uninorm/composition-table.gperf"
-      {"\000\004C\000\003\013", 0x04f3},
-#line 143 "uninorm/composition-table.gperf"
-      {"\000\000N\000\003\014", 0x0147},
+#line 440 "uninorm/composition-table.gperf"
+      {"\000\000h\000\003#", 0x1e25},
+#line 503 "uninorm/composition-table.gperf"
+      {"\000\001Z\000\003\007", 0x1e64},
+#line 478 "uninorm/composition-table.gperf"
+      {"\000\000n\000\003-", 0x1e4b},
+#line 186 "uninorm/composition-table.gperf"
+      {"\000\000Z\000\003\001", 0x0179},
+#line 800 "uninorm/composition-table.gperf"
+      {"\000\037m\000\003E", 0x1fad},
+#line 418 "uninorm/composition-table.gperf"
+      {"\000\000d\000\0031", 0x1e0f},
+#line 547 "uninorm/composition-table.gperf"
+      {"\000\000Z\000\003\002", 0x1e90},
+#line 188 "uninorm/composition-table.gperf"
+      {"\000\000Z\000\003\007", 0x017b},
+#line 384 "uninorm/composition-table.gperf"
+      {"\000\015F\000\015>", 0x0d4a},
 #line 806 "uninorm/composition-table.gperf"
       {"\000\003\261\000\003E", 0x1fb3},
-#line 870 "uninorm/composition-table.gperf"
-      {"\000\"E\000\0038", 0x2247},
-#line 708 "uninorm/composition-table.gperf"
-      {"\000\003\277\000\003\023", 0x1f40},
-#line 497 "uninorm/composition-table.gperf"
-      {"\000\000R\000\0031", 0x1e5e},
-#line 813 "uninorm/composition-table.gperf"
-      {"\000\003\221\000\003E", 0x1fbc},
-#line 347 "uninorm/composition-table.gperf"
-      {"\000\004M\000\003\010", 0x04ed},
-#line 715 "uninorm/composition-table.gperf"
-      {"\000\003\237\000\003\024", 0x1f49},
-#line 158 "uninorm/composition-table.gperf"
-      {"\000\000s\000\003\001", 0x015b},
+#line 623 "uninorm/composition-table.gperf"
+      {"\000\001\241\000\003\003", 0x1ee1},
+#line 449 "uninorm/composition-table.gperf"
+      {"\000\000\317\000\003\001", 0x1e2e},
 #line 692 "uninorm/composition-table.gperf"
       {"\000\003\271\000\003\023", 0x1f30},
+#line 347 "uninorm/composition-table.gperf"
+      {"\000\004M\000\003\010", 0x04ed},
+#line 977 "uninorm/composition-table.gperf"
+      {"\001\024\271\001\024\275", 0x114be},
+#line 143 "uninorm/composition-table.gperf"
+      {"\000\000N\000\003\014", 0x0147},
+#line 676 "uninorm/composition-table.gperf"
+      {"\000\003\267\000\003\023", 0x1f20},
+#line 870 "uninorm/composition-table.gperf"
+      {"\000\"E\000\0038", 0x2247},
+#line 553 "uninorm/composition-table.gperf"
+      {"\000\000h\000\0031", 0x1e96},
+#line 436 "uninorm/composition-table.gperf"
+      {"\000\000g\000\003\004", 0x1e21},
+#line 413 "uninorm/composition-table.gperf"
+      {"\000\000D\000\003\007", 0x1e0a},
+#line 889 "uninorm/composition-table.gperf"
+      {"\000\"\242\000\0038", 0x22ac},
+#line 219 "uninorm/composition-table.gperf"
+      {"\000\000g\000\003\014", 0x01e7},
+#line 353 "uninorm/composition-table.gperf"
+      {"\000\004C\000\003\013", 0x04f3},
+#line 811 "uninorm/composition-table.gperf"
+      {"\000\003\221\000\003\004", 0x1fb9},
 #line 826 "uninorm/composition-table.gperf"
       {"\000\003\271\000\003\006", 0x1fd0},
-#line 160 "uninorm/composition-table.gperf"
-      {"\000\000s\000\003\002", 0x015d},
-#line 500 "uninorm/composition-table.gperf"
-      {"\000\000s\000\003\007", 0x1e61},
-#line 968 "uninorm/composition-table.gperf"
-      {"\001\024\271\001\024\275", 0x114be},
+#line 680 "uninorm/composition-table.gperf"
+      {"\000\037 \000\003\001", 0x1f24},
+#line 678 "uninorm/composition-table.gperf"
+      {"\000\037 \000\003\000", 0x1f22},
+#line 682 "uninorm/composition-table.gperf"
+      {"\000\037 \000\003B", 0x1f26},
 #line 519 "uninorm/composition-table.gperf"
       {"\000\000U\000\0030", 0x1e74},
 #line 907 "uninorm/composition-table.gperf"
       {"\0000W\0000\231", 0x3058},
-#line 308 "uninorm/composition-table.gperf"
-      {"\000\004\023\000\003\001", 0x0403},
-#line 436 "uninorm/composition-table.gperf"
-      {"\000\000g\000\003\004", 0x1e21},
-#line 451 "uninorm/composition-table.gperf"
-      {"\000\000K\000\003\001", 0x1e30},
-#line 761 "uninorm/composition-table.gperf"
-      {"\000\037\006\000\003E", 0x1f86},
-#line 219 "uninorm/composition-table.gperf"
-      {"\000\000g\000\003\014", 0x01e7},
-#line 264 "uninorm/composition-table.gperf"
-      {"\000\000s\000\003&", 0x0219},
-#line 539 "uninorm/composition-table.gperf"
-      {"\000\000W\000\003#", 0x1e88},
-#line 235 "uninorm/composition-table.gperf"
-      {"\000\000\306\000\003\001", 0x01fc},
-#line 493 "uninorm/composition-table.gperf"
-      {"\000\000R\000\003#", 0x1e5a},
-#line 571 "uninorm/composition-table.gperf"
-      {"\000\036\241\000\003\002", 0x1ead},
 #line 302 "uninorm/composition-table.gperf"
       {"\000\003\305\000\003\001", 0x03cd},
 #line 753 "uninorm/composition-table.gperf"
       {"\000\003\305\000\003\000", 0x1f7a},
 #line 842 "uninorm/composition-table.gperf"
       {"\000\003\305\000\003B", 0x1fe6},
-#line 134 "uninorm/composition-table.gperf"
-      {"\000\000l\000\003\001", 0x013a},
+#line 542 "uninorm/composition-table.gperf"
+      {"\000\000x\000\003\007", 0x1e8b},
 #line 233 "uninorm/composition-table.gperf"
       {"\000\000\305\000\003\001", 0x01fa},
-#line 157 "uninorm/composition-table.gperf"
-      {"\000\000S\000\003\001", 0x015a},
-#line 676 "uninorm/composition-table.gperf"
-      {"\000\003\267\000\003\023", 0x1f20},
-#line 623 "uninorm/composition-table.gperf"
-      {"\000\001\241\000\003\003", 0x1ee1},
-#line 159 "uninorm/composition-table.gperf"
-      {"\000\000S\000\003\002", 0x015c},
-#line 499 "uninorm/composition-table.gperf"
-      {"\000\000S\000\003\007", 0x1e60},
-#line 137 "uninorm/composition-table.gperf"
-      {"\000\000L\000\003\014", 0x013d},
-#line 475 "uninorm/composition-table.gperf"
-      {"\000\000N\000\0031", 0x1e48},
-#line 287 "uninorm/composition-table.gperf"
-      {"\000\003\231\000\003\001", 0x038a},
-#line 833 "uninorm/composition-table.gperf"
-      {"\000\003\231\000\003\000", 0x1fda},
-#line 503 "uninorm/composition-table.gperf"
-      {"\000\001Z\000\003\007", 0x1e64},
-#line 819 "uninorm/composition-table.gperf"
-      {"\000\037\306\000\003E", 0x1fc7},
-#line 186 "uninorm/composition-table.gperf"
-      {"\000\000Z\000\003\001", 0x0179},
-#line 166 "uninorm/composition-table.gperf"
-      {"\000\000t\000\003'", 0x0163},
-#line 263 "uninorm/composition-table.gperf"
-      {"\000\000S\000\003&", 0x0218},
-#line 547 "uninorm/composition-table.gperf"
-      {"\000\000Z\000\003\002", 0x1e90},
-#line 188 "uninorm/composition-table.gperf"
-      {"\000\000Z\000\003\007", 0x017b},
-#line 799 "uninorm/composition-table.gperf"
-      {"\000\037l\000\003E", 0x1fac},
-#line 769 "uninorm/composition-table.gperf"
-      {"\000\037\016\000\003E", 0x1f8e},
+#line 928 "uninorm/composition-table.gperf"
+      {"\0000\253\0000\231", 0x30ac},
+#line 539 "uninorm/composition-table.gperf"
+      {"\000\000W\000\003#", 0x1e88},
+#line 771 "uninorm/composition-table.gperf"
+      {"\000\037 \000\003E", 0x1f90},
+#line 493 "uninorm/composition-table.gperf"
+      {"\000\000R\000\003#", 0x1e5a},
+#line 962 "uninorm/composition-table.gperf"
+      {"\001\020\233\001\020\272", 0x1109c},
+#line 927 "uninorm/composition-table.gperf"
+      {"\0000\235\0000\231", 0x309e},
+#line 301 "uninorm/composition-table.gperf"
+      {"\000\003\277\000\003\001", 0x03cc},
+#line 752 "uninorm/composition-table.gperf"
+      {"\000\003\277\000\003\000", 0x1f78},
 #line 91 "uninorm/composition-table.gperf"
       {"\000\000c\000\003\001", 0x0107},
+#line 332 "uninorm/composition-table.gperf"
+      {"\000\004\330\000\003\010", 0x04da},
 #line 648 "uninorm/composition-table.gperf"
       {"\000\003\261\000\003\023", 0x1f00},
-#line 803 "uninorm/composition-table.gperf"
-      {"\000\003\261\000\003\006", 0x1fb0},
 #line 93 "uninorm/composition-table.gperf"
       {"\000\000c\000\003\002", 0x0109},
 #line 95 "uninorm/composition-table.gperf"
       {"\000\000c\000\003\007", 0x010b},
-#line 656 "uninorm/composition-table.gperf"
-      {"\000\003\221\000\003\023", 0x1f08},
-#line 810 "uninorm/composition-table.gperf"
-      {"\000\003\221\000\003\006", 0x1fb8},
-      {""},
-#line 473 "uninorm/composition-table.gperf"
-      {"\000\000N\000\003#", 0x1e46},
-#line 154 "uninorm/composition-table.gperf"
-      {"\000\000r\000\003'", 0x0157},
-#line 300 "uninorm/composition-table.gperf"
-      {"\000\003\305\000\003\010", 0x03cb},
-#line 187 "uninorm/composition-table.gperf"
-      {"\000\000z\000\003\001", 0x017a},
 #line 167 "uninorm/composition-table.gperf"
       {"\000\000T\000\003\014", 0x0164},
-#line 413 "uninorm/composition-table.gperf"
-      {"\000\000D\000\003\007", 0x1e0a},
-#line 548 "uninorm/composition-table.gperf"
-      {"\000\000z\000\003\002", 0x1e91},
-#line 189 "uninorm/composition-table.gperf"
-      {"\000\000z\000\003\007", 0x017c},
-      {""},
-#line 709 "uninorm/composition-table.gperf"
-      {"\000\003\277\000\003\024", 0x1f41},
+#line 422 "uninorm/composition-table.gperf"
+      {"\000\000d\000\003-", 0x1e13},
+#line 137 "uninorm/composition-table.gperf"
+      {"\000\000L\000\003\014", 0x013d},
+#line 824 "uninorm/composition-table.gperf"
+      {"\000\037\277\000\003\001", 0x1fce},
+#line 823 "uninorm/composition-table.gperf"
+      {"\000\037\277\000\003\000", 0x1fcd},
+#line 825 "uninorm/composition-table.gperf"
+      {"\000\037\277\000\003B", 0x1fcf},
+#line 888 "uninorm/composition-table.gperf"
+      {"\000\"\207\000\0038", 0x2289},
+#line 887 "uninorm/composition-table.gperf"
+      {"\000\"\206\000\0038", 0x2288},
+#line 497 "uninorm/composition-table.gperf"
+      {"\000\000R\000\0031", 0x1e5e},
+#line 166 "uninorm/composition-table.gperf"
+      {"\000\000t\000\003'", 0x0163},
+#line 803 "uninorm/composition-table.gperf"
+      {"\000\003\261\000\003\006", 0x1fb0},
+#line 886 "uninorm/composition-table.gperf"
+      {"\000\"\203\000\0038", 0x2285},
+#line 265 "uninorm/composition-table.gperf"
+      {"\000\000T\000\003&", 0x021a},
 #line 790 "uninorm/composition-table.gperf"
       {"\000\037c\000\003E", 0x1fa3},
-#line 540 "uninorm/composition-table.gperf"
-      {"\000\000w\000\003#", 0x1e89},
+#line 544 "uninorm/composition-table.gperf"
+      {"\000\000x\000\003\010", 0x1e8d},
+#line 300 "uninorm/composition-table.gperf"
+      {"\000\003\305\000\003\010", 0x03cb},
+#line 681 "uninorm/composition-table.gperf"
+      {"\000\037!\000\003\001", 0x1f25},
+#line 679 "uninorm/composition-table.gperf"
+      {"\000\037!\000\003\000", 0x1f23},
+#line 683 "uninorm/composition-table.gperf"
+      {"\000\037!\000\003B", 0x1f27},
+#line 362 "uninorm/composition-table.gperf"
+      {"\000\006J\000\006T", 0x0626},
+#line 621 "uninorm/composition-table.gperf"
+      {"\000\001\241\000\003\011", 0x1edf},
+#line 451 "uninorm/composition-table.gperf"
+      {"\000\000K\000\003\001", 0x1e30},
+#line 894 "uninorm/composition-table.gperf"
+      {"\000\"}\000\0038", 0x22e1},
+#line 473 "uninorm/composition-table.gperf"
+      {"\000\000N\000\003#", 0x1e46},
+#line 154 "uninorm/composition-table.gperf"
+      {"\000\000r\000\003'", 0x0157},
+#line 571 "uninorm/composition-table.gperf"
+      {"\000\036\241\000\003\002", 0x1ead},
+#line 158 "uninorm/composition-table.gperf"
+      {"\000\000s\000\003\001", 0x015b},
+#line 868 "uninorm/composition-table.gperf"
+      {"\000\"<\000\0038", 0x2241},
+#line 772 "uninorm/composition-table.gperf"
+      {"\000\037!\000\003E", 0x1f91},
+#line 160 "uninorm/composition-table.gperf"
+      {"\000\000s\000\003\002", 0x015d},
+#line 500 "uninorm/composition-table.gperf"
+      {"\000\000s\000\003\007", 0x1e61},
+#line 720 "uninorm/composition-table.gperf"
+      {"\000\003\305\000\003\023", 0x1f50},
+#line 786 "uninorm/composition-table.gperf"
+      {"\000\037/\000\003E", 0x1f9f},
+#line 911 "uninorm/composition-table.gperf"
+      {"\0000_\0000\231", 0x3060},
+#line 597 "uninorm/composition-table.gperf"
+      {"\000\036\271\000\003\002", 0x1ec7},
 #line 142 "uninorm/composition-table.gperf"
       {"\000\000n\000\003'", 0x0146},
+#line 157 "uninorm/composition-table.gperf"
+      {"\000\000S\000\003\001", 0x015a},
+#line 540 "uninorm/composition-table.gperf"
+      {"\000\000w\000\003#", 0x1e89},
+#line 774 "uninorm/composition-table.gperf"
+      {"\000\037#\000\003E", 0x1f93},
+#line 159 "uninorm/composition-table.gperf"
+      {"\000\000S\000\003\002", 0x015c},
+#line 499 "uninorm/composition-table.gperf"
+      {"\000\000S\000\003\007", 0x1e60},
+#line 475 "uninorm/composition-table.gperf"
+      {"\000\000N\000\0031", 0x1e48},
+#line 708 "uninorm/composition-table.gperf"
+      {"\000\003\277\000\003\023", 0x1f40},
+#line 134 "uninorm/composition-table.gperf"
+      {"\000\000l\000\003\001", 0x013a},
+#line 837 "uninorm/composition-table.gperf"
+      {"\000\003\305\000\003\006", 0x1fe0},
 #line 150 "uninorm/composition-table.gperf"
       {"\000\000o\000\003\013", 0x0151},
-#line 292 "uninorm/composition-table.gperf"
-      {"\000\003\231\000\003\010", 0x03aa},
-#line 693 "uninorm/composition-table.gperf"
-      {"\000\003\271\000\003\024", 0x1f31},
-#line 461 "uninorm/composition-table.gperf"
-      {"\000\000L\000\0031", 0x1e3a},
-      {""},
-#line 631 "uninorm/composition-table.gperf"
-      {"\000\001\260\000\003\001", 0x1ee9},
-#line 633 "uninorm/composition-table.gperf"
-      {"\000\001\260\000\003\000", 0x1eeb},
-#line 420 "uninorm/composition-table.gperf"
-      {"\000\000d\000\003'", 0x1e11},
-#line 914 "uninorm/composition-table.gperf"
-      {"\0000f\0000\231", 0x3067},
-#line 178 "uninorm/composition-table.gperf"
-      {"\000\000u\000\003\013", 0x0171},
 #line 827 "uninorm/composition-table.gperf"
       {"\000\003\271\000\003\004", 0x1fd1},
 #line 257 "uninorm/composition-table.gperf"
@@ -1410,765 +1406,793 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {"\000\001\240\000\003\001", 0x1eda},
 #line 618 "uninorm/composition-table.gperf"
       {"\000\001\240\000\003\000", 0x1edc},
-#line 581 "uninorm/composition-table.gperf"
-      {"\000\036\241\000\003\006", 0x1eb7},
-#line 309 "uninorm/composition-table.gperf"
-      {"\000\004\006\000\003\010", 0x0407},
+#line 939 "uninorm/composition-table.gperf"
+      {"\0000\301\0000\231", 0x30c2},
+#line 226 "uninorm/composition-table.gperf"
+      {"\000\001\267\000\003\014", 0x01ee},
 #line 879 "uninorm/composition-table.gperf"
       {"\000\"r\000\0038", 0x2274},
-#line 720 "uninorm/composition-table.gperf"
-      {"\000\003\305\000\003\023", 0x1f50},
-#line 837 "uninorm/composition-table.gperf"
-      {"\000\003\305\000\003\006", 0x1fe0},
-#line 630 "uninorm/composition-table.gperf"
-      {"\000\001\257\000\003\001", 0x1ee8},
-#line 632 "uninorm/composition-table.gperf"
-      {"\000\001\257\000\003\000", 0x1eea},
-      {""},
-#line 621 "uninorm/composition-table.gperf"
-      {"\000\001\241\000\003\011", 0x1edf},
+#line 919 "uninorm/composition-table.gperf"
+      {"\0000r\0000\232", 0x3074},
+#line 178 "uninorm/composition-table.gperf"
+      {"\000\000u\000\003\013", 0x0171},
+#line 984 "uninorm/composition-table.gperf"
+      {"\001a)\001a\037", 0x16124},
+#line 216 "uninorm/composition-table.gperf"
+      {"\000\000\306\000\003\004", 0x01e2},
+#line 511 "uninorm/composition-table.gperf"
+      {"\000\000T\000\003#", 0x1e6c},
+#line 452 "uninorm/composition-table.gperf"
+      {"\000\000k\000\003\001", 0x1e31},
 #line 457 "uninorm/composition-table.gperf"
       {"\000\000L\000\003#", 0x1e36},
-#line 508 "uninorm/composition-table.gperf"
-      {"\000\036c\000\003\007", 0x1e69},
-#line 677 "uninorm/composition-table.gperf"
-      {"\000\003\267\000\003\024", 0x1f21},
+#line 187 "uninorm/composition-table.gperf"
+      {"\000\000z\000\003\001", 0x017a},
+#line 799 "uninorm/composition-table.gperf"
+      {"\000\037l\000\003E", 0x1fac},
 #line 443 "uninorm/composition-table.gperf"
       {"\000\000H\000\003'", 0x1e28},
-#line 945 "uninorm/composition-table.gperf"
-      {"\0000\322\0000\231", 0x30d3},
-#line 513 "uninorm/composition-table.gperf"
-      {"\000\000T\000\0031", 0x1e6e},
-#line 700 "uninorm/composition-table.gperf"
-      {"\000\003\231\000\003\023", 0x1f38},
-#line 831 "uninorm/composition-table.gperf"
-      {"\000\003\231\000\003\006", 0x1fd8},
-#line 847 "uninorm/composition-table.gperf"
-      {"\000\003\241\000\003\024", 0x1fec},
-#line 357 "uninorm/composition-table.gperf"
-      {"\000\004K\000\003\010", 0x04f9},
-#line 865 "uninorm/composition-table.gperf"
-      {"\000\"\013\000\0038", 0x220c},
-#line 226 "uninorm/composition-table.gperf"
-      {"\000\001\267\000\003\014", 0x01ee},
-#line 877 "uninorm/composition-table.gperf"
-      {"\000\"d\000\0038", 0x2270},
-      {""},
+#line 548 "uninorm/composition-table.gperf"
+      {"\000\000z\000\003\002", 0x1e91},
+#line 189 "uninorm/composition-table.gperf"
+      {"\000\000z\000\003\007", 0x017c},
 #line 902 "uninorm/composition-table.gperf"
       {"\0000M\0000\231", 0x304e},
-#line 406 "uninorm/composition-table.gperf"
-      {"\000\000b\000\003\007", 0x1e03},
-#line 776 "uninorm/composition-table.gperf"
-      {"\000\037%\000\003E", 0x1f95},
-      {""},
-#line 946 "uninorm/composition-table.gperf"
-      {"\0000\322\0000\232", 0x30d4},
-#line 385 "uninorm/composition-table.gperf"
-      {"\000\015G\000\015>", 0x0d4b},
-#line 649 "uninorm/composition-table.gperf"
-      {"\000\003\261\000\003\024", 0x1f01},
+#line 291 "uninorm/composition-table.gperf"
+      {"\000\003\312\000\003\001", 0x0390},
+#line 828 "uninorm/composition-table.gperf"
+      {"\000\003\312\000\003\000", 0x1fd2},
+#line 830 "uninorm/composition-table.gperf"
+      {"\000\003\312\000\003B", 0x1fd7},
+#line 865 "uninorm/composition-table.gperf"
+      {"\000\"\013\000\0038", 0x220c},
+#line 588 "uninorm/composition-table.gperf"
+      {"\000\000\312\000\003\001", 0x1ebe},
+#line 590 "uninorm/composition-table.gperf"
+      {"\000\000\312\000\003\000", 0x1ec0},
 #line 469 "uninorm/composition-table.gperf"
       {"\000\000M\000\003#", 0x1e42},
+#line 631 "uninorm/composition-table.gperf"
+      {"\000\001\260\000\003\001", 0x1ee9},
+#line 633 "uninorm/composition-table.gperf"
+      {"\000\001\260\000\003\000", 0x1eeb},
+#line 513 "uninorm/composition-table.gperf"
+      {"\000\000T\000\0031", 0x1e6e},
+#line 798 "uninorm/composition-table.gperf"
+      {"\000\037k\000\003E", 0x1fab},
+#line 461 "uninorm/composition-table.gperf"
+      {"\000\000L\000\0031", 0x1e3a},
 #line 295 "uninorm/composition-table.gperf"
       {"\000\003\265\000\003\001", 0x03ad},
 #line 749 "uninorm/composition-table.gperf"
       {"\000\003\265\000\003\000", 0x1f72},
-#line 657 "uninorm/composition-table.gperf"
-      {"\000\003\221\000\003\024", 0x1f09},
-#line 511 "uninorm/composition-table.gperf"
-      {"\000\000T\000\003#", 0x1e6c},
-#line 966 "uninorm/composition-table.gperf"
-      {"\001\024\271\001\024\272", 0x114bb},
-#line 477 "uninorm/composition-table.gperf"
-      {"\000\000N\000\003-", 0x1e4a},
 #line 804 "uninorm/composition-table.gperf"
       {"\000\003\261\000\003\004", 0x1fb1},
-#line 789 "uninorm/composition-table.gperf"
-      {"\000\037b\000\003E", 0x1fa2},
-#line 774 "uninorm/composition-table.gperf"
-      {"\000\037#\000\003E", 0x1f93},
+#line 859 "uninorm/composition-table.gperf"
+      {"\000!\224\000\0038", 0x21ae},
+#line 304 "uninorm/composition-table.gperf"
+      {"\000\003\322\000\003\001", 0x03d3},
+#line 420 "uninorm/composition-table.gperf"
+      {"\000\000d\000\003'", 0x1e11},
+#line 581 "uninorm/composition-table.gperf"
+      {"\000\036\241\000\003\006", 0x1eb7},
+#line 526 "uninorm/composition-table.gperf"
+      {"\000\001k\000\003\010", 0x1e7b},
+#line 477 "uninorm/composition-table.gperf"
+      {"\000\000N\000\003-", 0x1e4a},
+#line 370 "uninorm/composition-table.gperf"
+      {"\000\011\307\000\011\327", 0x09cc},
+#line 479 "uninorm/composition-table.gperf"
+      {"\000\000\325\000\003\001", 0x1e4c},
+#line 190 "uninorm/composition-table.gperf"
+      {"\000\000Z\000\003\014", 0x017d},
 #line 871 "uninorm/composition-table.gperf"
       {"\000\"H\000\0038", 0x2249},
-#line 811 "uninorm/composition-table.gperf"
-      {"\000\003\221\000\003\004", 0x1fb9},
-#line 149 "uninorm/composition-table.gperf"
-      {"\000\000O\000\003\013", 0x0150},
-#line 452 "uninorm/composition-table.gperf"
-      {"\000\000k\000\003\001", 0x1e31},
-#line 786 "uninorm/composition-table.gperf"
-      {"\000\037/\000\003E", 0x1f9f},
-#line 237 "uninorm/composition-table.gperf"
-      {"\000\000\330\000\003\001", 0x01fe},
+#line 287 "uninorm/composition-table.gperf"
+      {"\000\003\231\000\003\001", 0x038a},
+#line 833 "uninorm/composition-table.gperf"
+      {"\000\003\231\000\003\000", 0x1fda},
+#line 289 "uninorm/composition-table.gperf"
+      {"\000\003\245\000\003\001", 0x038e},
+#line 846 "uninorm/composition-table.gperf"
+      {"\000\003\245\000\003\000", 0x1fea},
+#line 625 "uninorm/composition-table.gperf"
+      {"\000\001\241\000\003#", 0x1ee3},
 #line 444 "uninorm/composition-table.gperf"
       {"\000\000h\000\003'", 0x1e29},
-#line 938 "uninorm/composition-table.gperf"
-      {"\0000\277\0000\231", 0x30c0},
-#line 570 "uninorm/composition-table.gperf"
-      {"\000\036\240\000\003\002", 0x1eac},
-#line 637 "uninorm/composition-table.gperf"
-      {"\000\001\260\000\003\003", 0x1eef},
-#line 291 "uninorm/composition-table.gperf"
-      {"\000\003\312\000\003\001", 0x0390},
-#line 828 "uninorm/composition-table.gperf"
-      {"\000\003\312\000\003\000", 0x1fd2},
-#line 830 "uninorm/composition-table.gperf"
-      {"\000\003\312\000\003B", 0x1fd7},
+#line 949 "uninorm/composition-table.gperf"
+      {"\0000\330\0000\231", 0x30d9},
+#line 704 "uninorm/composition-table.gperf"
+      {"\000\0378\000\003\001", 0x1f3c},
+#line 702 "uninorm/composition-table.gperf"
+      {"\000\0378\000\003\000", 0x1f3a},
+#line 706 "uninorm/composition-table.gperf"
+      {"\000\0378\000\003B", 0x1f3e},
+#line 149 "uninorm/composition-table.gperf"
+      {"\000\000O\000\003\013", 0x0150},
+#line 98 "uninorm/composition-table.gperf"
+      {"\000\000D\000\003\014", 0x010e},
 #line 935 "uninorm/composition-table.gperf"
       {"\0000\271\0000\231", 0x30ba},
-#line 588 "uninorm/composition-table.gperf"
-      {"\000\000\312\000\003\001", 0x1ebe},
-#line 590 "uninorm/composition-table.gperf"
-      {"\000\000\312\000\003\000", 0x1ec0},
+#line 350 "uninorm/composition-table.gperf"
+      {"\000\004#\000\003\010", 0x04f0},
+#line 357 "uninorm/composition-table.gperf"
+      {"\000\004K\000\003\010", 0x04f9},
 #line 622 "uninorm/composition-table.gperf"
       {"\000\001\240\000\003\003", 0x1ee0},
-#line 840 "uninorm/composition-table.gperf"
-      {"\000\003\301\000\003\023", 0x1fe4},
-#line 399 "uninorm/composition-table.gperf"
-      {"\000\033<\000\0335", 0x1b3d},
-#line 164 "uninorm/composition-table.gperf"
-      {"\000\000s\000\003\014", 0x0161},
+#line 934 "uninorm/composition-table.gperf"
+      {"\0000\267\0000\231", 0x30b8},
+#line 402 "uninorm/composition-table.gperf"
+      {"\000\033B\000\0335", 0x1b43},
+#line 941 "uninorm/composition-table.gperf"
+      {"\0000\306\0000\231", 0x30c7},
+#line 983 "uninorm/composition-table.gperf"
+      {"\001a\036\001a\037", 0x16123},
+#line 877 "uninorm/composition-table.gperf"
+      {"\000\"d\000\0038", 0x2270},
+#line 508 "uninorm/composition-table.gperf"
+      {"\000\036c\000\003\007", 0x1e69},
 #line 555 "uninorm/composition-table.gperf"
       {"\000\000w\000\003\012", 0x1e98},
-#line 798 "uninorm/composition-table.gperf"
-      {"\000\037k\000\003E", 0x1fab},
-#line 898 "uninorm/composition-table.gperf"
-      {"\000\"\263\000\0038", 0x22eb},
-#line 636 "uninorm/composition-table.gperf"
-      {"\000\001\257\000\003\003", 0x1eee},
-#line 177 "uninorm/composition-table.gperf"
-      {"\000\000U\000\003\013", 0x0170},
-#line 507 "uninorm/composition-table.gperf"
-      {"\000\036b\000\003\007", 0x1e68},
-#line 721 "uninorm/composition-table.gperf"
-      {"\000\003\305\000\003\024", 0x1f51},
-#line 290 "uninorm/composition-table.gperf"
-      {"\000\003\251\000\003\001", 0x038f},
-#line 855 "uninorm/composition-table.gperf"
-      {"\000\003\251\000\003\000", 0x1ffa},
-#line 220 "uninorm/composition-table.gperf"
-      {"\000\000K\000\003\014", 0x01e8},
-#line 526 "uninorm/composition-table.gperf"
-      {"\000\001k\000\003\010", 0x1e7b},
-#line 216 "uninorm/composition-table.gperf"
-      {"\000\000\306\000\003\004", 0x01e2},
-#line 463 "uninorm/composition-table.gperf"
-      {"\000\000L\000\003-", 0x1e3c},
-      {""},
 #line 838 "uninorm/composition-table.gperf"
       {"\000\003\305\000\003\004", 0x1fe1},
+#line 305 "uninorm/composition-table.gperf"
+      {"\000\003\322\000\003\010", 0x03d4},
+#line 910 "uninorm/composition-table.gperf"
+      {"\0000]\0000\231", 0x305e},
+#line 283 "uninorm/composition-table.gperf"
+      {"\000\000\250\000\003\001", 0x0385},
+#line 848 "uninorm/composition-table.gperf"
+      {"\000\000\250\000\003\000", 0x1fed},
+#line 814 "uninorm/composition-table.gperf"
+      {"\000\000\250\000\003B", 0x1fc1},
+#line 515 "uninorm/composition-table.gperf"
+      {"\000\000T\000\003-", 0x1e70},
+#line 481 "uninorm/composition-table.gperf"
+      {"\000\000\325\000\003\010", 0x1e4e},
+#line 463 "uninorm/composition-table.gperf"
+      {"\000\000L\000\003-", 0x1e3c},
+#line 177 "uninorm/composition-table.gperf"
+      {"\000\000U\000\003\013", 0x0170},
+#line 292 "uninorm/composition-table.gperf"
+      {"\000\003\231\000\003\010", 0x03aa},
 #line 394 "uninorm/composition-table.gperf"
       {"\000\033\011\000\0335", 0x1b0a},
-#line 934 "uninorm/composition-table.gperf"
-      {"\0000\267\0000\231", 0x30b8},
-      {""},
-#line 701 "uninorm/composition-table.gperf"
-      {"\000\003\231\000\003\024", 0x1f39},
-#line 856 "uninorm/composition-table.gperf"
-      {"\000\003\251\000\003E", 0x1ffc},
-#line 138 "uninorm/composition-table.gperf"
-      {"\000\000l\000\003\014", 0x013e},
-#line 542 "uninorm/composition-table.gperf"
-      {"\000\000x\000\003\007", 0x1e8b},
-#line 163 "uninorm/composition-table.gperf"
-      {"\000\000S\000\003\014", 0x0160},
-#line 625 "uninorm/composition-table.gperf"
-      {"\000\001\241\000\003#", 0x1ee3},
-#line 892 "uninorm/composition-table.gperf"
-      {"\000\"\253\000\0038", 0x22af},
-#line 153 "uninorm/composition-table.gperf"
-      {"\000\000R\000\003'", 0x0156},
-#line 832 "uninorm/composition-table.gperf"
-      {"\000\003\231\000\003\004", 0x1fd9},
-#line 704 "uninorm/composition-table.gperf"
-      {"\000\0378\000\003\001", 0x1f3c},
-#line 702 "uninorm/composition-table.gperf"
-      {"\000\0378\000\003\000", 0x1f3a},
-#line 706 "uninorm/composition-table.gperf"
-      {"\000\0378\000\003B", 0x1f3e},
-#line 289 "uninorm/composition-table.gperf"
-      {"\000\003\245\000\003\001", 0x038e},
-#line 846 "uninorm/composition-table.gperf"
-      {"\000\003\245\000\003\000", 0x1fea},
+#line 293 "uninorm/composition-table.gperf"
+      {"\000\003\245\000\003\010", 0x03ab},
 #line 664 "uninorm/composition-table.gperf"
       {"\000\003\265\000\003\023", 0x1f10},
-#line 190 "uninorm/composition-table.gperf"
-      {"\000\000Z\000\003\014", 0x017d},
+#line 594 "uninorm/composition-table.gperf"
+      {"\000\000\312\000\003\003", 0x1ec4},
+#line 470 "uninorm/composition-table.gperf"
+      {"\000\000m\000\003#", 0x1e43},
+#line 97 "uninorm/composition-table.gperf"
+      {"\000\000c\000\003\014", 0x010d},
+#line 637 "uninorm/composition-table.gperf"
+      {"\000\001\260\000\003\003", 0x1eef},
+#line 776 "uninorm/composition-table.gperf"
+      {"\000\037%\000\003E", 0x1f95},
+#line 312 "uninorm/composition-table.gperf"
+      {"\000\004#\000\003\006", 0x040e},
+#line 967 "uninorm/composition-table.gperf"
+      {"\001\023G\001\023W", 0x1134c},
+#line 153 "uninorm/composition-table.gperf"
+      {"\000\000R\000\003'", 0x0156},
+#line 336 "uninorm/composition-table.gperf"
+      {"\000\004\027\000\003\010", 0x04de},
 #line 931 "uninorm/composition-table.gperf"
       {"\0000\261\0000\231", 0x30b2},
-#line 674 "uninorm/composition-table.gperf"
-      {"\000\037\030\000\003\001", 0x1f1c},
-#line 672 "uninorm/composition-table.gperf"
-      {"\000\037\030\000\003\000", 0x1f1a},
-#line 515 "uninorm/composition-table.gperf"
-      {"\000\000T\000\003-", 0x1e70},
+#line 770 "uninorm/composition-table.gperf"
+      {"\000\037\017\000\003E", 0x1f8f},
+#line 280 "uninorm/composition-table.gperf"
+      {"\000\002/\000\003\004", 0x0231},
+#line 700 "uninorm/composition-table.gperf"
+      {"\000\003\231\000\003\023", 0x1f38},
+#line 359 "uninorm/composition-table.gperf"
+      {"\000\006'\000\006T", 0x0623},
+#line 630 "uninorm/composition-table.gperf"
+      {"\000\001\257\000\003\001", 0x1ee8},
+#line 632 "uninorm/composition-table.gperf"
+      {"\000\001\257\000\003\000", 0x1eea},
+#line 320 "uninorm/composition-table.gperf"
+      {"\000\0048\000\003\000", 0x045d},
+#line 965 "uninorm/composition-table.gperf"
+      {"\001\0212\001\021'", 0x1112f},
+#line 549 "uninorm/composition-table.gperf"
+      {"\000\000Z\000\003#", 0x1e92},
+#line 943 "uninorm/composition-table.gperf"
+      {"\0000\317\0000\231", 0x30d0},
 #line 116 "uninorm/composition-table.gperf"
       {"\000\000G\000\003'", 0x0122},
-#line 504 "uninorm/composition-table.gperf"
-      {"\000\001[\000\003\007", 0x1e65},
-#line 97 "uninorm/composition-table.gperf"
-      {"\000\000c\000\003\014", 0x010d},
-#line 303 "uninorm/composition-table.gperf"
-      {"\000\003\311\000\003\001", 0x03ce},
-#line 754 "uninorm/composition-table.gperf"
-      {"\000\003\311\000\003\000", 0x1f7c},
-#line 852 "uninorm/composition-table.gperf"
-      {"\000\003\311\000\003B", 0x1ff6},
+#line 985 "uninorm/composition-table.gperf"
+      {"\001a\036\001a ", 0x16125},
+#line 896 "uninorm/composition-table.gperf"
+      {"\000\"\222\000\0038", 0x22e3},
+#line 675 "uninorm/composition-table.gperf"
+      {"\000\037\031\000\003\001", 0x1f1d},
+#line 673 "uninorm/composition-table.gperf"
+      {"\000\037\031\000\003\000", 0x1f1b},
+#line 831 "uninorm/composition-table.gperf"
+      {"\000\003\231\000\003\006", 0x1fd8},
 #line 393 "uninorm/composition-table.gperf"
       {"\000\033\007\000\0335", 0x1b08},
-#line 350 "uninorm/composition-table.gperf"
-      {"\000\004#\000\003\010", 0x04f0},
-#line 455 "uninorm/composition-table.gperf"
-      {"\000\000K\000\0031", 0x1e34},
-#line 580 "uninorm/composition-table.gperf"
-      {"\000\036\240\000\003\006", 0x1eb6},
-#line 635 "uninorm/composition-table.gperf"
-      {"\000\001\260\000\003\011", 0x1eed},
-#line 98 "uninorm/composition-table.gperf"
-      {"\000\000D\000\003\014", 0x010e},
-#line 544 "uninorm/composition-table.gperf"
-      {"\000\000x\000\003\010", 0x1e8d},
-#line 191 "uninorm/composition-table.gperf"
-      {"\000\000z\000\003\014", 0x017e},
-#line 594 "uninorm/composition-table.gperf"
-      {"\000\000\312\000\003\003", 0x1ec4},
-#line 850 "uninorm/composition-table.gperf"
-      {"\000\003\311\000\003E", 0x1ff3},
-#line 449 "uninorm/composition-table.gperf"
-      {"\000\000\317\000\003\001", 0x1e2e},
+#line 844 "uninorm/composition-table.gperf"
+      {"\000\003\245\000\003\006", 0x1fe8},
+#line 220 "uninorm/composition-table.gperf"
+      {"\000\000K\000\003\014", 0x01e8},
+#line 769 "uninorm/composition-table.gperf"
+      {"\000\037\016\000\003E", 0x1f8e},
+      {""},
+#line 415 "uninorm/composition-table.gperf"
+      {"\000\000D\000\003#", 0x1e0c},
+#line 924 "uninorm/composition-table.gperf"
+      {"\0000{\0000\231", 0x307c},
+#line 164 "uninorm/composition-table.gperf"
+      {"\000\000s\000\003\014", 0x0161},
+#line 290 "uninorm/composition-table.gperf"
+      {"\000\003\251\000\003\001", 0x038f},
+#line 855 "uninorm/composition-table.gperf"
+      {"\000\003\251\000\003\000", 0x1ffa},
+#line 551 "uninorm/composition-table.gperf"
+      {"\000\000Z\000\0031", 0x1e94},
 #line 620 "uninorm/composition-table.gperf"
       {"\000\001\240\000\003\011", 0x1ede},
-#line 502 "uninorm/composition-table.gperf"
-      {"\000\000s\000\003#", 0x1e63},
-#line 462 "uninorm/composition-table.gperf"
-      {"\000\000l\000\0031", 0x1e3b},
+#line 922 "uninorm/composition-table.gperf"
+      {"\0000x\0000\231", 0x3079},
+#line 892 "uninorm/composition-table.gperf"
+      {"\000\"\253\000\0038", 0x22af},
 #line 141 "uninorm/composition-table.gperf"
       {"\000\000N\000\003'", 0x0145},
-#line 901 "uninorm/composition-table.gperf"
-      {"\0000K\0000\231", 0x304c},
-#line 841 "uninorm/composition-table.gperf"
-      {"\000\003\301\000\003\024", 0x1fe5},
-#line 527 "uninorm/composition-table.gperf"
-      {"\000\000V\000\003\003", 0x1e7c},
-#line 634 "uninorm/composition-table.gperf"
-      {"\000\001\257\000\003\011", 0x1eec},
-#line 293 "uninorm/composition-table.gperf"
-      {"\000\003\245\000\003\010", 0x03ab},
-#line 941 "uninorm/composition-table.gperf"
-      {"\0000\306\0000\231", 0x30c7},
-#line 359 "uninorm/composition-table.gperf"
-      {"\000\006'\000\006T", 0x0623},
-#line 453 "uninorm/composition-table.gperf"
-      {"\000\000K\000\003#", 0x1e32},
       {""},
-#line 740 "uninorm/composition-table.gperf"
-      {"\000\003\251\000\003\023", 0x1f68},
-#line 332 "uninorm/composition-table.gperf"
-      {"\000\004\330\000\003\010", 0x04da},
-#line 551 "uninorm/composition-table.gperf"
-      {"\000\000Z\000\0031", 0x1e94},
-#line 495 "uninorm/composition-table.gperf"
-      {"\000\036Z\000\003\004", 0x1e5c},
-#line 905 "uninorm/composition-table.gperf"
-      {"\0000S\0000\231", 0x3054},
-#line 320 "uninorm/composition-table.gperf"
-      {"\000\0048\000\003\000", 0x045d},
-#line 312 "uninorm/composition-table.gperf"
-      {"\000\004#\000\003\006", 0x040e},
-#line 606 "uninorm/composition-table.gperf"
-      {"\000\000\324\000\003\001", 0x1ed0},
-#line 608 "uninorm/composition-table.gperf"
-      {"\000\000\324\000\003\000", 0x1ed2},
-#line 458 "uninorm/composition-table.gperf"
-      {"\000\000l\000\003#", 0x1e37},
+#line 570 "uninorm/composition-table.gperf"
+      {"\000\036\240\000\003\002", 0x1eac},
+#line 163 "uninorm/composition-table.gperf"
+      {"\000\000S\000\003\014", 0x0160},
+#line 369 "uninorm/composition-table.gperf"
+      {"\000\011\307\000\011\276", 0x09cb},
+#line 264 "uninorm/composition-table.gperf"
+      {"\000\000s\000\003&", 0x0219},
+#line 856 "uninorm/composition-table.gperf"
+      {"\000\003\251\000\003E", 0x1ffc},
 #line 117 "uninorm/composition-table.gperf"
       {"\000\000g\000\003'", 0x0123},
-#line 501 "uninorm/composition-table.gperf"
-      {"\000\000S\000\003#", 0x1e62},
-#line 518 "uninorm/composition-table.gperf"
-      {"\000\000u\000\003$", 0x1e73},
-#line 311 "uninorm/composition-table.gperf"
-      {"\000\004\030\000\003\000", 0x040d},
-#line 876 "uninorm/composition-table.gperf"
-      {"\000\000>\000\0038", 0x226f},
+#line 341 "uninorm/composition-table.gperf"
+      {"\000\0048\000\003\010", 0x04e5},
+#line 417 "uninorm/composition-table.gperf"
+      {"\000\000D\000\0031", 0x1e0e},
+#line 138 "uninorm/composition-table.gperf"
+      {"\000\000l\000\003\014", 0x013e},
+#line 975 "uninorm/composition-table.gperf"
+      {"\001\024\271\001\024\272", 0x114bb},
+#line 657 "uninorm/composition-table.gperf"
+      {"\000\003\221\000\003\024", 0x1f09},
+      {""},
+#line 938 "uninorm/composition-table.gperf"
+      {"\0000\277\0000\231", 0x30c0},
+#line 263 "uninorm/composition-table.gperf"
+      {"\000\000S\000\003&", 0x0218},
+#line 303 "uninorm/composition-table.gperf"
+      {"\000\003\311\000\003\001", 0x03ce},
+#line 754 "uninorm/composition-table.gperf"
+      {"\000\003\311\000\003\000", 0x1f7c},
+#line 852 "uninorm/composition-table.gperf"
+      {"\000\003\311\000\003B", 0x1ff6},
+#line 592 "uninorm/composition-table.gperf"
+      {"\000\000\312\000\003\011", 0x1ec2},
 #line 589 "uninorm/composition-table.gperf"
       {"\000\000\352\000\003\001", 0x1ebf},
 #line 591 "uninorm/composition-table.gperf"
       {"\000\000\352\000\003\000", 0x1ec1},
+#line 635 "uninorm/composition-table.gperf"
+      {"\000\001\260\000\003\011", 0x1eed},
+#line 606 "uninorm/composition-table.gperf"
+      {"\000\000\324\000\003\001", 0x1ed0},
+#line 608 "uninorm/composition-table.gperf"
+      {"\000\000\324\000\003\000", 0x1ed2},
+#line 221 "uninorm/composition-table.gperf"
+      {"\000\000k\000\003\014", 0x01e9},
       {""},
-#line 417 "uninorm/composition-table.gperf"
-      {"\000\000D\000\0031", 0x1e0e},
-#line 318 "uninorm/composition-table.gperf"
-      {"\000\004V\000\003\010", 0x0457},
-#line 552 "uninorm/composition-table.gperf"
-      {"\000\000z\000\0031", 0x1e95},
-#line 369 "uninorm/composition-table.gperf"
-      {"\000\011\307\000\011\276", 0x09cb},
-#line 549 "uninorm/composition-table.gperf"
-      {"\000\000Z\000\003#", 0x1e92},
-#line 280 "uninorm/composition-table.gperf"
-      {"\000\002/\000\003\004", 0x0231},
-#line 844 "uninorm/composition-table.gperf"
-      {"\000\003\245\000\003\006", 0x1fe8},
-#line 963 "uninorm/composition-table.gperf"
-      {"\001\0212\001\021'", 0x1112f},
+#line 191 "uninorm/composition-table.gperf"
+      {"\000\000z\000\003\014", 0x017e},
+#line 850 "uninorm/composition-table.gperf"
+      {"\000\003\311\000\003E", 0x1ff3},
+      {""},
+#line 841 "uninorm/composition-table.gperf"
+      {"\000\003\301\000\003\024", 0x1fe5},
+#line 495 "uninorm/composition-table.gperf"
+      {"\000\036Z\000\003\004", 0x1e5c},
+#line 636 "uninorm/composition-table.gperf"
+      {"\000\001\257\000\003\003", 0x1eee},
+#line 860 "uninorm/composition-table.gperf"
+      {"\000!\320\000\0038", 0x21cd},
+#line 165 "uninorm/composition-table.gperf"
+      {"\000\000T\000\003'", 0x0162},
+#line 348 "uninorm/composition-table.gperf"
+      {"\000\004#\000\003\004", 0x04ee},
 #line 135 "uninorm/composition-table.gperf"
       {"\000\000L\000\003'", 0x013b},
-#line 665 "uninorm/composition-table.gperf"
-      {"\000\003\265\000\003\024", 0x1f11},
-#line 362 "uninorm/composition-table.gperf"
-      {"\000\006J\000\006T", 0x0626},
-#line 882 "uninorm/composition-table.gperf"
-      {"\000\"w\000\0038", 0x2279},
-#line 681 "uninorm/composition-table.gperf"
-      {"\000\037!\000\003\001", 0x1f25},
-#line 679 "uninorm/composition-table.gperf"
-      {"\000\037!\000\003\000", 0x1f23},
-#line 683 "uninorm/composition-table.gperf"
-      {"\000\037!\000\003B", 0x1f27},
-#line 372 "uninorm/composition-table.gperf"
-      {"\000\013G\000\013>", 0x0b4b},
-#line 732 "uninorm/composition-table.gperf"
-      {"\000\003\311\000\003\023", 0x1f60},
+#line 314 "uninorm/composition-table.gperf"
+      {"\000\0048\000\003\006", 0x0439},
+#line 901 "uninorm/composition-table.gperf"
+      {"\0000K\0000\231", 0x304c},
 #line 286 "uninorm/composition-table.gperf"
       {"\000\003\227\000\003\001", 0x0389},
 #line 821 "uninorm/composition-table.gperf"
       {"\000\003\227\000\003\000", 0x1fca},
-#line 341 "uninorm/composition-table.gperf"
-      {"\000\0048\000\003\010", 0x04e5},
-#line 415 "uninorm/composition-table.gperf"
-      {"\000\000D\000\003#", 0x1e0c},
-#line 959 "uninorm/composition-table.gperf"
-      {"\001\020\231\001\020\272", 0x1109a},
-#line 550 "uninorm/composition-table.gperf"
-      {"\000\000z\000\003#", 0x1e93},
       {""},
-#line 772 "uninorm/composition-table.gperf"
-      {"\000\037!\000\003E", 0x1f91},
-#line 592 "uninorm/composition-table.gperf"
-      {"\000\000\312\000\003\011", 0x1ec2},
-      {""},
-#line 340 "uninorm/composition-table.gperf"
-      {"\000\004\030\000\003\010", 0x04e4},
-#line 392 "uninorm/composition-table.gperf"
-      {"\000\033\005\000\0335", 0x1b06},
+#line 882 "uninorm/composition-table.gperf"
+      {"\000\"w\000\0038", 0x2279},
+#line 740 "uninorm/composition-table.gperf"
+      {"\000\003\251\000\003\023", 0x1f68},
+#line 895 "uninorm/composition-table.gperf"
+      {"\000\"\221\000\0038", 0x22e2},
+#line 453 "uninorm/composition-table.gperf"
+      {"\000\000K\000\003#", 0x1e32},
+#line 857 "uninorm/composition-table.gperf"
+      {"\000!\220\000\0038", 0x219a},
+#line 959 "uninorm/composition-table.gperf"
+      {"\001\005\322\000\003\007", 0x105c9},
+#line 674 "uninorm/composition-table.gperf"
+      {"\000\037\030\000\003\001", 0x1f1c},
+#line 672 "uninorm/composition-table.gperf"
+      {"\000\037\030\000\003\000", 0x1f1a},
+#line 502 "uninorm/composition-table.gperf"
+      {"\000\000s\000\003#", 0x1e63},
 #line 822 "uninorm/composition-table.gperf"
       {"\000\003\227\000\003E", 0x1fcc},
-#line 343 "uninorm/composition-table.gperf"
-      {"\000\004>\000\003\010", 0x04e7},
+#line 275 "uninorm/composition-table.gperf"
+      {"\000\000\325\000\003\004", 0x022c},
+#line 905 "uninorm/composition-table.gperf"
+      {"\0000S\0000\231", 0x3054},
+#line 421 "uninorm/composition-table.gperf"
+      {"\000\000D\000\003-", 0x1e12},
+#line 832 "uninorm/composition-table.gperf"
+      {"\000\003\231\000\003\004", 0x1fd9},
+#line 392 "uninorm/composition-table.gperf"
+      {"\000\033\005\000\0335", 0x1b06},
+#line 845 "uninorm/composition-table.gperf"
+      {"\000\003\245\000\003\004", 0x1fe9},
+      {""},
 #line 396 "uninorm/composition-table.gperf"
       {"\000\033\015\000\0335", 0x1b0e},
-#line 221 "uninorm/composition-table.gperf"
-      {"\000\000k\000\003\014", 0x01e9},
-#line 165 "uninorm/composition-table.gperf"
-      {"\000\000T\000\003'", 0x0162},
-#line 487 "uninorm/composition-table.gperf"
-      {"\000\000P\000\003\001", 0x1e54},
-#line 401 "uninorm/composition-table.gperf"
-      {"\000\033?\000\0335", 0x1b41},
-#line 969 "uninorm/composition-table.gperf"
-      {"\001\025\270\001\025\257", 0x115ba},
-#line 639 "uninorm/composition-table.gperf"
-      {"\000\001\260\000\003#", 0x1ef1},
-#line 489 "uninorm/composition-table.gperf"
-      {"\000\000P\000\003\007", 0x1e56},
-#line 939 "uninorm/composition-table.gperf"
-      {"\0000\301\0000\231", 0x30c2},
-#line 724 "uninorm/composition-table.gperf"
-      {"\000\037P\000\003\001", 0x1f54},
-#line 722 "uninorm/composition-table.gperf"
-      {"\000\037P\000\003\000", 0x1f52},
-#line 726 "uninorm/composition-table.gperf"
-      {"\000\037P\000\003B", 0x1f56},
+#line 501 "uninorm/composition-table.gperf"
+      {"\000\000S\000\003#", 0x1e62},
+#line 580 "uninorm/composition-table.gperf"
+      {"\000\036\240\000\003\006", 0x1eb6},
+#line 406 "uninorm/composition-table.gperf"
+      {"\000\000b\000\003\007", 0x1e03},
+#line 455 "uninorm/composition-table.gperf"
+      {"\000\000K\000\0031", 0x1e34},
       {""},
+#line 732 "uninorm/composition-table.gperf"
+      {"\000\003\311\000\003\023", 0x1f60},
+      {""},
+#line 458 "uninorm/composition-table.gperf"
+      {"\000\000l\000\003#", 0x1e37},
+#line 298 "uninorm/composition-table.gperf"
+      {"\000\003\313\000\003\001", 0x03b0},
+#line 839 "uninorm/composition-table.gperf"
+      {"\000\003\313\000\003\000", 0x1fe2},
+#line 843 "uninorm/composition-table.gperf"
+      {"\000\003\313\000\003B", 0x1fe7},
+#line 966 "uninorm/composition-table.gperf"
+      {"\001\023G\001\023>", 0x1134b},
 #line 624 "uninorm/composition-table.gperf"
       {"\000\001\240\000\003#", 0x1ee2},
-#line 741 "uninorm/composition-table.gperf"
-      {"\000\003\251\000\003\024", 0x1f69},
-#line 410 "uninorm/composition-table.gperf"
-      {"\000\000b\000\0031", 0x1e07},
-#line 612 "uninorm/composition-table.gperf"
-      {"\000\000\324\000\003\003", 0x1ed6},
-#line 314 "uninorm/composition-table.gperf"
-      {"\000\0048\000\003\006", 0x0439},
-#line 859 "uninorm/composition-table.gperf"
-      {"\000!\224\000\0038", 0x21ae},
-#line 930 "uninorm/composition-table.gperf"
-      {"\0000\257\0000\231", 0x30b0},
-#line 638 "uninorm/composition-table.gperf"
-      {"\000\001\257\000\003#", 0x1ef0},
-#line 505 "uninorm/composition-table.gperf"
-      {"\000\001`\000\003\007", 0x1e66},
-#line 857 "uninorm/composition-table.gperf"
-      {"\000!\220\000\0038", 0x219a},
-#line 464 "uninorm/composition-table.gperf"
-      {"\000\000l\000\003-", 0x1e3d},
-#line 595 "uninorm/composition-table.gperf"
-      {"\000\000\352\000\003\003", 0x1ec5},
-#line 313 "uninorm/composition-table.gperf"
-      {"\000\004\030\000\003\006", 0x0419},
+      {""},
+#line 847 "uninorm/composition-table.gperf"
+      {"\000\003\241\000\003\024", 0x1fec},
+#line 527 "uninorm/composition-table.gperf"
+      {"\000\000V\000\003\003", 0x1e7c},
+#line 789 "uninorm/composition-table.gperf"
+      {"\000\037b\000\003E", 0x1fa2},
 #line 874 "uninorm/composition-table.gperf"
       {"\000\"M\000\0038", 0x226d},
-#line 348 "uninorm/composition-table.gperf"
-      {"\000\004#\000\003\004", 0x04ee},
+#line 595 "uninorm/composition-table.gperf"
+      {"\000\000\352\000\003\003", 0x1ec5},
+#line 518 "uninorm/composition-table.gperf"
+      {"\000\000u\000\003$", 0x1e73},
+#line 968 "uninorm/composition-table.gperf"
+      {"\001\023\202\001\023\311", 0x11383},
+#line 612 "uninorm/composition-table.gperf"
+      {"\000\000\324\000\003\003", 0x1ed6},
+#line 454 "uninorm/composition-table.gperf"
+      {"\000\000k\000\003#", 0x1e33},
+#line 693 "uninorm/composition-table.gperf"
+      {"\000\003\271\000\003\024", 0x1f31},
+#line 550 "uninorm/composition-table.gperf"
+      {"\000\000z\000\003#", 0x1e93},
+#line 462 "uninorm/composition-table.gperf"
+      {"\000\000l\000\0031", 0x1e3b},
+      {""},
+#line 677 "uninorm/composition-table.gperf"
+      {"\000\003\267\000\003\024", 0x1f21},
+#line 684 "uninorm/composition-table.gperf"
+      {"\000\003\227\000\003\023", 0x1f28},
+#line 607 "uninorm/composition-table.gperf"
+      {"\000\000\364\000\003\001", 0x1ed1},
+#line 609 "uninorm/composition-table.gperf"
+      {"\000\000\364\000\003\000", 0x1ed3},
+#line 634 "uninorm/composition-table.gperf"
+      {"\000\001\257\000\003\011", 0x1eec},
+      {""},
+#line 397 "uninorm/composition-table.gperf"
+      {"\000\033\021\000\0335", 0x1b12},
+#line 311 "uninorm/composition-table.gperf"
+      {"\000\004\030\000\003\000", 0x040d},
+      {""}, {""},
+#line 639 "uninorm/composition-table.gperf"
+      {"\000\001\260\000\003#", 0x1ef1},
+      {""},
+#line 933 "uninorm/composition-table.gperf"
+      {"\0000\265\0000\231", 0x30b6},
+#line 456 "uninorm/composition-table.gperf"
+      {"\000\000k\000\0031", 0x1e35},
+#line 318 "uninorm/composition-table.gperf"
+      {"\000\004V\000\003\010", 0x0457},
+#line 552 "uninorm/composition-table.gperf"
+      {"\000\000z\000\0031", 0x1e95},
+#line 945 "uninorm/composition-table.gperf"
+      {"\0000\322\0000\231", 0x30d3},
+#line 505 "uninorm/composition-table.gperf"
+      {"\000\001`\000\003\007", 0x1e66},
+#line 947 "uninorm/composition-table.gperf"
+      {"\0000\325\0000\231", 0x30d6},
+      {""},
+#line 339 "uninorm/composition-table.gperf"
+      {"\000\0048\000\003\004", 0x04e3},
 #line 971 "uninorm/composition-table.gperf"
-      {"\001\0315\001\0310", 0x11938},
+      {"\001\023\220\001\023\311", 0x11391},
+#line 964 "uninorm/composition-table.gperf"
+      {"\001\0211\001\021'", 0x1112e},
+#line 950 "uninorm/composition-table.gperf"
+      {"\0000\330\0000\232", 0x30da},
+      {""},
 #line 736 "uninorm/composition-table.gperf"
       {"\000\037`\000\003\001", 0x1f64},
 #line 734 "uninorm/composition-table.gperf"
       {"\000\037`\000\003\000", 0x1f62},
 #line 738 "uninorm/composition-table.gperf"
       {"\000\037`\000\003B", 0x1f66},
-#line 517 "uninorm/composition-table.gperf"
-      {"\000\000U\000\003$", 0x1e72},
-#line 607 "uninorm/composition-table.gperf"
-      {"\000\000\364\000\003\001", 0x1ed1},
-#line 609 "uninorm/composition-table.gperf"
-      {"\000\000\364\000\003\000", 0x1ed3},
-#line 408 "uninorm/composition-table.gperf"
-      {"\000\000b\000\003#", 0x1e05},
-#line 858 "uninorm/composition-table.gperf"
-      {"\000!\222\000\0038", 0x219b},
-#line 728 "uninorm/composition-table.gperf"
-      {"\000\003\245\000\003\024", 0x1f59},
-#line 456 "uninorm/composition-table.gperf"
-      {"\000\000k\000\0031", 0x1e35},
+#line 360 "uninorm/composition-table.gperf"
+      {"\000\006H\000\006T", 0x0624},
+#line 480 "uninorm/composition-table.gperf"
+      {"\000\000\365\000\003\001", 0x1e4d},
+#line 649 "uninorm/composition-table.gperf"
+      {"\000\003\261\000\003\024", 0x1f01},
+#line 378 "uninorm/composition-table.gperf"
+      {"\000\014F\000\014V", 0x0c48},
+#line 563 "uninorm/composition-table.gperf"
+      {"\000\000\342\000\003\001", 0x1ea5},
+#line 565 "uninorm/composition-table.gperf"
+      {"\000\000\342\000\003\000", 0x1ea7},
+#line 288 "uninorm/composition-table.gperf"
+      {"\000\003\237\000\003\001", 0x038c},
+#line 854 "uninorm/composition-table.gperf"
+      {"\000\003\237\000\003\000", 0x1ff8},
       {""},
-#line 373 "uninorm/composition-table.gperf"
-      {"\000\013G\000\013W", 0x0b4c},
 #line 787 "uninorm/composition-table.gperf"
       {"\000\037`\000\003E", 0x1fa0},
+#line 487 "uninorm/composition-table.gperf"
+      {"\000\000P\000\003\001", 0x1e54},
+#line 340 "uninorm/composition-table.gperf"
+      {"\000\004\030\000\003\010", 0x04e4},
+#line 991 "uninorm/composition-table.gperf"
+      {"\001mi\001mg", 0x16d6a},
       {""},
-#line 933 "uninorm/composition-table.gperf"
-      {"\0000\265\0000\231", 0x30b6},
-      {""},
-#line 845 "uninorm/composition-table.gperf"
-      {"\000\003\245\000\003\004", 0x1fe9},
-      {""},
-#line 684 "uninorm/composition-table.gperf"
-      {"\000\003\227\000\003\023", 0x1f28},
-#line 733 "uninorm/composition-table.gperf"
-      {"\000\003\311\000\003\024", 0x1f61},
-#line 860 "uninorm/composition-table.gperf"
-      {"\000!\320\000\0038", 0x21cd},
-#line 378 "uninorm/composition-table.gperf"
-      {"\000\014F\000\014V", 0x0c48},
+#line 489 "uninorm/composition-table.gperf"
+      {"\000\000P\000\003\007", 0x1e56},
+#line 464 "uninorm/composition-table.gperf"
+      {"\000\000l\000\003-", 0x1e3d},
+#line 724 "uninorm/composition-table.gperf"
+      {"\000\037P\000\003\001", 0x1f54},
+#line 722 "uninorm/composition-table.gperf"
+      {"\000\037P\000\003\000", 0x1f52},
+#line 726 "uninorm/composition-table.gperf"
+      {"\000\037P\000\003B", 0x1f56},
       {""},
-#line 421 "uninorm/composition-table.gperf"
-      {"\000\000D\000\003-", 0x1e12},
-#line 949 "uninorm/composition-table.gperf"
-      {"\0000\330\0000\231", 0x30d9},
+#line 445 "uninorm/composition-table.gperf"
+      {"\000\000H\000\003.", 0x1e2a},
+#line 419 "uninorm/composition-table.gperf"
+      {"\000\000D\000\003'", 0x1e10},
+#line 593 "uninorm/composition-table.gperf"
+      {"\000\000\352\000\003\011", 0x1ec3},
 #line 285 "uninorm/composition-table.gperf"
       {"\000\003\225\000\003\001", 0x0388},
 #line 820 "uninorm/composition-table.gperf"
       {"\000\003\225\000\003\000", 0x1fc8},
-#line 563 "uninorm/composition-table.gperf"
-      {"\000\000\342\000\003\001", 0x1ea5},
-#line 565 "uninorm/composition-table.gperf"
-      {"\000\000\342\000\003\000", 0x1ea7},
-#line 454 "uninorm/composition-table.gperf"
-      {"\000\000k\000\003#", 0x1e33},
-#line 298 "uninorm/composition-table.gperf"
-      {"\000\003\313\000\003\001", 0x03b0},
-#line 839 "uninorm/composition-table.gperf"
-      {"\000\003\313\000\003\000", 0x1fe2},
-#line 843 "uninorm/composition-table.gperf"
-      {"\000\003\313\000\003B", 0x1fe7},
-#line 562 "uninorm/composition-table.gperf"
-      {"\000\000\302\000\003\001", 0x1ea4},
-#line 564 "uninorm/composition-table.gperf"
-      {"\000\000\302\000\003\000", 0x1ea6},
-#line 283 "uninorm/composition-table.gperf"
-      {"\000\000\250\000\003\001", 0x0385},
-#line 848 "uninorm/composition-table.gperf"
-      {"\000\000\250\000\003\000", 0x1fed},
-#line 814 "uninorm/composition-table.gperf"
-      {"\000\000\250\000\003B", 0x1fc1},
-#line 950 "uninorm/composition-table.gperf"
-      {"\0000\330\0000\232", 0x30da},
+#line 610 "uninorm/composition-table.gperf"
+      {"\000\000\324\000\003\011", 0x1ed4},
 #line 725 "uninorm/composition-table.gperf"
       {"\000\037Q\000\003\001", 0x1f55},
 #line 723 "uninorm/composition-table.gperf"
       {"\000\037Q\000\003\000", 0x1f53},
 #line 727 "uninorm/composition-table.gperf"
       {"\000\037Q\000\003B", 0x1f57},
-#line 193 "uninorm/composition-table.gperf"
-      {"\000\000o\000\003\033", 0x01a1},
-#line 488 "uninorm/composition-table.gperf"
-      {"\000\000p\000\003\001", 0x1e55},
+#line 987 "uninorm/composition-table.gperf"
+      {"\001a\"\001a\037", 0x16127},
 #line 777 "uninorm/composition-table.gperf"
       {"\000\037&\000\003E", 0x1f96},
-#line 130 "uninorm/composition-table.gperf"
-      {"\000\000j\000\003\002", 0x0135},
-#line 610 "uninorm/composition-table.gperf"
-      {"\000\000\324\000\003\011", 0x1ed4},
-#line 490 "uninorm/composition-table.gperf"
-      {"\000\000p\000\003\007", 0x1e57},
-      {""},
-#line 529 "uninorm/composition-table.gperf"
-      {"\000\000V\000\003#", 0x1e7e},
-      {""},
-#line 195 "uninorm/composition-table.gperf"
-      {"\000\000u\000\003\033", 0x01b0},
+#line 224 "uninorm/composition-table.gperf"
+      {"\000\001\352\000\003\004", 0x01ec},
+#line 613 "uninorm/composition-table.gperf"
+      {"\000\000\364\000\003\003", 0x1ed7},
+#line 517 "uninorm/composition-table.gperf"
+      {"\000\000U\000\003$", 0x1e72},
+#line 482 "uninorm/composition-table.gperf"
+      {"\000\000\365\000\003\010", 0x1e4f},
+#line 399 "uninorm/composition-table.gperf"
+      {"\000\033<\000\0335", 0x1b3d},
+#line 721 "uninorm/composition-table.gperf"
+      {"\000\003\305\000\003\024", 0x1f51},
+#line 193 "uninorm/composition-table.gperf"
+      {"\000\000o\000\003\033", 0x01a1},
 #line 404 "uninorm/composition-table.gperf"
       {"\000\000a\000\003%", 0x1e01},
+#line 385 "uninorm/composition-table.gperf"
+      {"\000\015G\000\015>", 0x0d4b},
+#line 313 "uninorm/composition-table.gperf"
+      {"\000\004\030\000\003\006", 0x0419},
+      {""}, {""}, {""}, {""},
+#line 944 "uninorm/composition-table.gperf"
+      {"\0000\317\0000\232", 0x30d1},
+#line 195 "uninorm/composition-table.gperf"
+      {"\000\000u\000\003\033", 0x01b0},
+#line 709 "uninorm/composition-table.gperf"
+      {"\000\003\277\000\003\024", 0x1f41},
       {""},
-#line 593 "uninorm/composition-table.gperf"
-      {"\000\000\352\000\003\011", 0x1ec3},
-#line 162 "uninorm/composition-table.gperf"
-      {"\000\000s\000\003'", 0x015f},
-#line 922 "uninorm/composition-table.gperf"
-      {"\0000x\0000\231", 0x3079},
-      {""},
-#line 339 "uninorm/composition-table.gperf"
-      {"\000\0048\000\003\004", 0x04e3},
+#line 63 "uninorm/composition-table.gperf"
+      {"\000\000c\000\003'", 0x00e7},
+#line 930 "uninorm/composition-table.gperf"
+      {"\0000\257\0000\231", 0x30b0},
+#line 638 "uninorm/composition-table.gperf"
+      {"\000\001\257\000\003#", 0x1ef0},
+      {""}, {""},
+#line 446 "uninorm/composition-table.gperf"
+      {"\000\000h\000\003.", 0x1e2b},
+#line 714 "uninorm/composition-table.gperf"
+      {"\000\003\237\000\003\023", 0x1f48},
+#line 973 "uninorm/composition-table.gperf"
+      {"\001\023\302\001\023\270", 0x113c7},
+#line 884 "uninorm/composition-table.gperf"
+      {"\000\"{\000\0038", 0x2281},
+#line 925 "uninorm/composition-table.gperf"
+      {"\0000{\0000\232", 0x307d},
       {""},
-#line 797 "uninorm/composition-table.gperf"
-      {"\000\037j\000\003E", 0x1faa},
-#line 805 "uninorm/composition-table.gperf"
-      {"\000\037p\000\003E", 0x1fb2},
-#line 613 "uninorm/composition-table.gperf"
-      {"\000\000\364\000\003\003", 0x1ed7},
-#line 224 "uninorm/composition-table.gperf"
-      {"\000\001\352\000\003\004", 0x01ec},
+#line 507 "uninorm/composition-table.gperf"
+      {"\000\036b\000\003\007", 0x1e68},
       {""},
-#line 131 "uninorm/composition-table.gperf"
-      {"\000\000K\000\003'", 0x0136},
-#line 338 "uninorm/composition-table.gperf"
-      {"\000\004\030\000\003\004", 0x04e2},
+#line 569 "uninorm/composition-table.gperf"
+      {"\000\000\342\000\003\003", 0x1eab},
       {""},
-#line 496 "uninorm/composition-table.gperf"
-      {"\000\036[\000\003\004", 0x1e5d},
-#line 525 "uninorm/composition-table.gperf"
-      {"\000\001j\000\003\010", 0x1e7a},
 #line 923 "uninorm/composition-table.gperf"
       {"\0000x\0000\232", 0x307a},
+      {""}, {""},
+#line 373 "uninorm/composition-table.gperf"
+      {"\000\013G\000\013W", 0x0b4c},
+      {""}, {""}, {""}, {""},
+#line 670 "uninorm/composition-table.gperf"
+      {"\000\003\225\000\003\023", 0x1f18},
+      {""}, {""},
+#line 131 "uninorm/composition-table.gperf"
+      {"\000\000K\000\003'", 0x0136},
       {""},
-#line 895 "uninorm/composition-table.gperf"
-      {"\000\"\221\000\0038", 0x22e2},
-      {""},
+#line 395 "uninorm/composition-table.gperf"
+      {"\000\033\013\000\0335", 0x1b0c},
+      {""}, {""},
+#line 162 "uninorm/composition-table.gperf"
+      {"\000\000s\000\003'", 0x015f},
 #line 398 "uninorm/composition-table.gperf"
       {"\000\033:\000\0335", 0x1b3b},
-      {""},
-#line 136 "uninorm/composition-table.gperf"
-      {"\000\000l\000\003'", 0x013c},
+      {""}, {""}, {""},
+#line 358 "uninorm/composition-table.gperf"
+      {"\000\006'\000\006S", 0x0622},
+      {""}, {""},
+#line 387 "uninorm/composition-table.gperf"
+      {"\000\015\331\000\015\312", 0x0dda},
       {""},
 #line 161 "uninorm/composition-table.gperf"
       {"\000\000S\000\003'", 0x015e},
+#line 611 "uninorm/composition-table.gperf"
+      {"\000\000\364\000\003\011", 0x1ed5},
       {""},
-#line 909 "uninorm/composition-table.gperf"
-      {"\0000[\0000\231", 0x305c},
-#line 685 "uninorm/composition-table.gperf"
-      {"\000\003\227\000\003\024", 0x1f29},
-      {""},
-#line 880 "uninorm/composition-table.gperf"
-      {"\000\"s\000\0038", 0x2275},
-      {""},
-#line 569 "uninorm/composition-table.gperf"
-      {"\000\000\342\000\003\003", 0x1eab},
-#line 670 "uninorm/composition-table.gperf"
-      {"\000\003\225\000\003\023", 0x1f18},
-#line 680 "uninorm/composition-table.gperf"
-      {"\000\037 \000\003\001", 0x1f24},
-#line 678 "uninorm/composition-table.gperf"
-      {"\000\037 \000\003\000", 0x1f22},
-#line 682 "uninorm/composition-table.gperf"
-      {"\000\037 \000\003B", 0x1f26},
-      {""},
-#line 568 "uninorm/composition-table.gperf"
-      {"\000\000\302\000\003\003", 0x1eaa},
-      {""},
-#line 943 "uninorm/composition-table.gperf"
-      {"\0000\317\0000\231", 0x30d0},
-      {""}, {""},
-#line 63 "uninorm/composition-table.gperf"
-      {"\000\000c\000\003'", 0x00e7},
-#line 961 "uninorm/composition-table.gperf"
-      {"\001\020\245\001\020\272", 0x110ab},
 #line 192 "uninorm/composition-table.gperf"
       {"\000\000O\000\003\033", 0x01a0},
-#line 771 "uninorm/composition-table.gperf"
-      {"\000\037 \000\003E", 0x1f90},
-      {""},
-#line 397 "uninorm/composition-table.gperf"
-      {"\000\033\021\000\0335", 0x1b12},
+#line 529 "uninorm/composition-table.gperf"
+      {"\000\000V\000\003#", 0x1e7e},
       {""}, {""},
-#line 395 "uninorm/composition-table.gperf"
-      {"\000\033\013\000\0335", 0x1b0c},
-#line 419 "uninorm/composition-table.gperf"
-      {"\000\000D\000\003'", 0x1e10},
-      {""},
-#line 944 "uninorm/composition-table.gperf"
-      {"\0000\317\0000\232", 0x30d1},
-#line 402 "uninorm/composition-table.gperf"
-      {"\000\033B\000\0335", 0x1b43},
-#line 445 "uninorm/composition-table.gperf"
-      {"\000\000H\000\003.", 0x1e2a},
-      {""}, {""}, {""}, {""}, {""},
+#line 136 "uninorm/composition-table.gperf"
+      {"\000\000l\000\003'", 0x013c},
+      {""}, {""}, {""},
 #line 403 "uninorm/composition-table.gperf"
       {"\000\000A\000\003%", 0x1e00},
+#line 866 "uninorm/composition-table.gperf"
+      {"\000\"#\000\0038", 0x2224},
+      {""}, {""}, {""}, {""}, {""},
+#line 880 "uninorm/composition-table.gperf"
+      {"\000\"s\000\0038", 0x2275},
       {""},
-#line 962 "uninorm/composition-table.gperf"
-      {"\001\0211\001\021'", 0x1112e},
-#line 374 "uninorm/composition-table.gperf"
-      {"\000\013\222\000\013\327", 0x0b94},
+#line 338 "uninorm/composition-table.gperf"
+      {"\000\004\030\000\003\004", 0x04e2},
       {""},
+#line 132 "uninorm/composition-table.gperf"
+      {"\000\000k\000\003'", 0x0137},
+      {""}, {""},
 #line 194 "uninorm/composition-table.gperf"
       {"\000\000U\000\003\033", 0x01af},
-#line 611 "uninorm/composition-table.gperf"
-      {"\000\000\364\000\003\011", 0x1ed5},
-      {""}, {""}, {""}, {""},
-#line 370 "uninorm/composition-table.gperf"
-      {"\000\011\307\000\011\327", 0x09cc},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 883 "uninorm/composition-table.gperf"
-      {"\000\"z\000\0038", 0x2280},
-      {""},
-#line 379 "uninorm/composition-table.gperf"
-      {"\000\014\277\000\014\325", 0x0cc0},
-      {""}, {""}, {""}, {""}, {""},
-#line 446 "uninorm/composition-table.gperf"
-      {"\000\000h\000\003.", 0x1e2b},
+      {""}, {""}, {""},
+#line 858 "uninorm/composition-table.gperf"
+      {"\000!\222\000\0038", 0x219b},
+#line 381 "uninorm/composition-table.gperf"
+      {"\000\014\306\000\014\326", 0x0cc8},
 #line 567 "uninorm/composition-table.gperf"
       {"\000\000\342\000\003\011", 0x1ea9},
-      {""}, {""}, {""}, {""},
-#line 671 "uninorm/composition-table.gperf"
-      {"\000\003\225\000\003\024", 0x1f19},
-#line 566 "uninorm/composition-table.gperf"
-      {"\000\000\302\000\003\011", 0x1ea8},
-#line 214 "uninorm/composition-table.gperf"
-      {"\000\002&\000\003\004", 0x01e0},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""},
-#line 387 "uninorm/composition-table.gperf"
-      {"\000\015\331\000\015\312", 0x0dda},
-#line 867 "uninorm/composition-table.gperf"
-      {"\000\"%\000\0038", 0x2226},
-      {""}, {""}, {""}, {""}, {""}, {""},
-#line 358 "uninorm/composition-table.gperf"
-      {"\000\006'\000\006S", 0x0622},
-#line 132 "uninorm/composition-table.gperf"
-      {"\000\000k\000\003'", 0x0137},
+#line 389 "uninorm/composition-table.gperf"
+      {"\000\015\334\000\015\312", 0x0ddd},
       {""},
-#line 371 "uninorm/composition-table.gperf"
-      {"\000\013G\000\013V", 0x0b48},
-#line 228 "uninorm/composition-table.gperf"
-      {"\000\000j\000\003\014", 0x01f0},
 #line 376 "uninorm/composition-table.gperf"
       {"\000\013\307\000\013\276", 0x0bcb},
+#line 380 "uninorm/composition-table.gperf"
+      {"\000\014\306\000\014\325", 0x0cc7},
       {""},
-#line 866 "uninorm/composition-table.gperf"
-      {"\000\"#\000\0038", 0x2224},
+#line 961 "uninorm/composition-table.gperf"
+      {"\001\020\231\001\020\272", 0x1109a},
+#line 382 "uninorm/composition-table.gperf"
+      {"\000\014\306\000\014\302", 0x0cca},
+#line 963 "uninorm/composition-table.gperf"
+      {"\001\020\245\001\020\272", 0x110ab},
       {""},
-#line 964 "uninorm/composition-table.gperf"
-      {"\001\023G\001\023>", 0x1134b},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 978 "uninorm/composition-table.gperf"
+      {"\001\025\270\001\025\257", 0x115ba},
+#line 665 "uninorm/composition-table.gperf"
+      {"\000\003\265\000\003\024", 0x1f11},
+#line 276 "uninorm/composition-table.gperf"
+      {"\000\000\365\000\003\004", 0x022d},
+      {""},
+#line 408 "uninorm/composition-table.gperf"
+      {"\000\000b\000\003#", 0x1e05},
+      {""},
+#line 214 "uninorm/composition-table.gperf"
+      {"\000\002&\000\003\004", 0x01e0},
+      {""}, {""},
+#line 364 "uninorm/composition-table.gperf"
+      {"\000\006\301\000\006T", 0x06c2},
+      {""},
+#line 883 "uninorm/composition-table.gperf"
+      {"\000\"z\000\0038", 0x2280},
       {""}, {""},
+#line 701 "uninorm/composition-table.gperf"
+      {"\000\003\231\000\003\024", 0x1f39},
+      {""},
+#line 728 "uninorm/composition-table.gperf"
+      {"\000\003\245\000\003\024", 0x1f59},
+      {""},
+#line 371 "uninorm/composition-table.gperf"
+      {"\000\013G\000\013V", 0x0b48},
+      {""}, {""}, {""},
+#line 410 "uninorm/composition-table.gperf"
+      {"\000\000b\000\0031", 0x1e07},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
 #line 900 "uninorm/composition-table.gperf"
       {"\000\"\265\000\0038", 0x22ed},
-#line 360 "uninorm/composition-table.gperf"
-      {"\000\006H\000\006T", 0x0624},
-      {""}, {""}, {""},
-#line 389 "uninorm/composition-table.gperf"
-      {"\000\015\334\000\015\312", 0x0ddd},
-      {""}, {""},
-#line 381 "uninorm/composition-table.gperf"
-      {"\000\014\306\000\014\326", 0x0cc8},
-#line 382 "uninorm/composition-table.gperf"
-      {"\000\014\306\000\014\302", 0x0cca},
+      {""}, {""}, {""}, {""},
+#line 946 "uninorm/composition-table.gperf"
+      {"\0000\322\0000\232", 0x30d4},
+      {""},
+#line 948 "uninorm/composition-table.gperf"
+      {"\0000\325\0000\232", 0x30d7},
+#line 372 "uninorm/composition-table.gperf"
+      {"\000\013G\000\013>", 0x0b4b},
+      {""},
+#line 400 "uninorm/composition-table.gperf"
+      {"\000\033>\000\0335", 0x1b40},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 401 "uninorm/composition-table.gperf"
+      {"\000\033?\000\0335", 0x1b41},
+#line 976 "uninorm/composition-table.gperf"
+      {"\001\024\271\001\024\260", 0x114bc},
+      {""}, {""},
+#line 867 "uninorm/composition-table.gperf"
+      {"\000\"%\000\0038", 0x2226},
       {""},
-#line 380 "uninorm/composition-table.gperf"
-      {"\000\014\306\000\014\325", 0x0cc7},
-      {""}, {""}, {""},
+#line 379 "uninorm/composition-table.gperf"
+      {"\000\014\277\000\014\325", 0x0cc0},
+#line 890 "uninorm/composition-table.gperf"
+      {"\000\"\250\000\0038", 0x22ad},
+      {""}, {""}, {""}, {""}, {""},
 #line 904 "uninorm/composition-table.gperf"
       {"\0000Q\0000\231", 0x3052},
-#line 363 "uninorm/composition-table.gperf"
-      {"\000\006\325\000\006T", 0x06c0},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""},
-#line 891 "uninorm/composition-table.gperf"
-      {"\000\"\251\000\0038", 0x22ae},
+      {""}, {""},
+#line 974 "uninorm/composition-table.gperf"
+      {"\001\023\302\001\023\311", 0x113c8},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 965 "uninorm/composition-table.gperf"
-      {"\001\023G\001\023W", 0x1134c},
-#line 967 "uninorm/composition-table.gperf"
-      {"\001\024\271\001\024\260", 0x114bc},
+#line 741 "uninorm/composition-table.gperf"
+      {"\000\003\251\000\003\024", 0x1f69},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""},
+#line 733 "uninorm/composition-table.gperf"
+      {"\000\003\311\000\003\024", 0x1f61},
+#line 374 "uninorm/composition-table.gperf"
+      {"\000\013\222\000\013\327", 0x0b94},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 891 "uninorm/composition-table.gperf"
+      {"\000\"\251\000\0038", 0x22ae},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 980 "uninorm/composition-table.gperf"
+      {"\001\0315\001\0310", 0x11938},
+      {""}, {""}, {""},
+#line 685 "uninorm/composition-table.gperf"
+      {"\000\003\227\000\003\024", 0x1f29},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 383 "uninorm/composition-table.gperf"
+      {"\000\014\312\000\014\325", 0x0ccb},
+      {""},
+#line 352 "uninorm/composition-table.gperf"
+      {"\000\004#\000\003\013", 0x04f2},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 986 "uninorm/composition-table.gperf"
+      {"\001a!\001a\037", 0x16126},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""},
+#line 988 "uninorm/composition-table.gperf"
+      {"\001a!\001a ", 0x16128},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 383 "uninorm/composition-table.gperf"
-      {"\000\014\312\000\014\325", 0x0ccb},
+      {""}, {""}, {""}, {""},
+#line 715 "uninorm/composition-table.gperf"
+      {"\000\003\237\000\003\024", 0x1f49},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""},
-#line 352 "uninorm/composition-table.gperf"
-      {"\000\004#\000\003\013", 0x04f2},
-      {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 671 "uninorm/composition-table.gperf"
+      {"\000\003\225\000\003\024", 0x1f19},
 #line 365 "uninorm/composition-table.gperf"
       {"\000\006\322\000\006T", 0x06d3},
+      {""},
+#line 363 "uninorm/composition-table.gperf"
+      {"\000\006\325\000\006T", 0x06c0},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 989 "uninorm/composition-table.gperf"
+      {"\001mg\001mg", 0x16d68},
+      {""}, {""}, {""}, {""}, {""},
+#line 377 "uninorm/composition-table.gperf"
+      {"\000\013\306\000\013\327", 0x0bcc},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""},
-#line 970 "uninorm/composition-table.gperf"
-      {"\001\025\271\001\025\257", 0x115bb},
-      {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
 #line 361 "uninorm/composition-table.gperf"
       {"\000\006'\000\006U", 0x0625},
-      {""}, {""}, {""}, {""}, {""},
-#line 890 "uninorm/composition-table.gperf"
-      {"\000\"\250\000\0038", 0x22ad},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""},
 #line 862 "uninorm/composition-table.gperf"
       {"\000!\322\000\0038", 0x21cf},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""},
 #line 375 "uninorm/composition-table.gperf"
       {"\000\013\306\000\013\276", 0x0bca},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""},
-#line 364 "uninorm/composition-table.gperf"
-      {"\000\006\301\000\006T", 0x06c2},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""},
 #line 391 "uninorm/composition-table.gperf"
       {"\000\020%\000\020.", 0x1026},
-      {""}, {""}, {""}, {""},
-#line 400 "uninorm/composition-table.gperf"
-      {"\000\033>\000\0335", 0x1b40},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""},
-#line 377 "uninorm/composition-table.gperf"
-      {"\000\013\306\000\013\327", 0x0bcc},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
+#line 861 "uninorm/composition-table.gperf"
+      {"\000!\324\000\0038", 0x21ce},
+      {""}, {""}, {""},
+#line 990 "uninorm/composition-table.gperf"
+      {"\001mc\001mg", 0x16d69},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -2177,9 +2201,9 @@ gl_uninorm_compose_lookup (register const char *str, 
register size_t len)
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""},
-#line 861 "uninorm/composition-table.gperf"
-      {"\000!\324\000\0038", 0x21ce}
+      {""}, {""}, {""}, {""}, {""}, {""},
+#line 979 "uninorm/composition-table.gperf"
+      {"\001\025\271\001\025\257", 0x115bb}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/tp/Texinfo/XS/gnulib/lib/uninorm/composition.c 
b/tp/Texinfo/XS/gnulib/lib/uninorm/composition.c
index df662895df..ecc4ed21e0 100644
--- a/tp/Texinfo/XS/gnulib/lib/uninorm/composition.c
+++ b/tp/Texinfo/XS/gnulib/lib/uninorm/composition.c
@@ -25,11 +25,12 @@
 struct composition_rule { char codes[6]; unsigned int combined; };
 
 #include "composition-table.h"
+#include "composition-table-bounds.h"
 
 ucs4_t
 uc_composition (ucs4_t uc1, ucs4_t uc2)
 {
-  if (uc1 < 0x12000 && uc2 < 0x12000)
+  if (uc1 <= UNINORM_COMPOSE_MAX_ARG1 && uc2 <= UNINORM_COMPOSE_MAX_ARG2)
     {
       if (uc2 >= 0x1161 && uc2 < 0x1161 + 21
           && uc1 >= 0x1100 && uc1 < 0x1100 + 19)
diff --git a/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table1.h 
b/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table1.h
index ee245ce45d..c6ee5ab59f 100644
--- a/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table1.h
+++ b/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table1.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Decomposition of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -28,8 +28,8 @@ extern const unsigned char gl_uninorm_decomp_chars_table[];
 typedef struct
   {
     int level1[191];
-    int level2[27 << 5];
-    unsigned short level3[285 << 5];
+    int level2[30 << 5];
+    unsigned short level3[293 << 5];
   }
 decomp_index_table_t;
 extern const decomp_index_table_t gl_uninorm_decomp_index_table;
diff --git a/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table2.h 
b/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table2.h
index 667ce47498..3a8e5403f8 100644
--- a/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table2.h
+++ b/tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table2.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Decomposition of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -1661,7 +1661,8 @@ const unsigned char gl_uninorm_decomp_chars_table[] =
   0x2C, 0x00, 0xA2, 0x2C, 0x00, 0xA3, 0x2C, 0x00, 0xAC, 0x2C, 0x00, 0xAF,
   0x2C, 0x00, 0xA6, 0x2C, 0x00, 0xA5, 0x2C, 0x20, 0xA9, 0x30, 0x25, 0x02,
   0x30, 0x21, 0x90, 0x30, 0x21, 0x91, 0x30, 0x21, 0x92, 0x30, 0x21, 0x93,
-  0x30, 0x25, 0xA0, 0x30, 0x25, 0xCB, 0x20, 0x02, 0xD0, 0x20, 0x02, 0xD1,
+  0x30, 0x25, 0xA0, 0x30, 0x25, 0xCB, 0x81, 0x05, 0xD2, 0x00, 0x03, 0x07,
+  0x81, 0x05, 0xDA, 0x00, 0x03, 0x07, 0x20, 0x02, 0xD0, 0x20, 0x02, 0xD1,
   0x20, 0x00, 0xE6, 0x20, 0x02, 0x99, 0x20, 0x02, 0x53, 0x20, 0x02, 0xA3,
   0x20, 0xAB, 0x66, 0x20, 0x02, 0xA5, 0x20, 0x02, 0xA4, 0x20, 0x02, 0x56,
   0x20, 0x02, 0x57, 0x20, 0x1D, 0x91, 0x20, 0x02, 0x58, 0x20, 0x02, 0x5E,
@@ -1679,9 +1680,27 @@ const unsigned char gl_uninorm_decomp_chars_table[] =
   0x81, 0x10, 0x9B, 0x01, 0x10, 0xBA, 0x81, 0x10, 0xA5, 0x01, 0x10, 0xBA,
   0x81, 0x11, 0x31, 0x01, 0x11, 0x27, 0x81, 0x11, 0x32, 0x01, 0x11, 0x27,
   0x81, 0x13, 0x47, 0x01, 0x13, 0x3E, 0x81, 0x13, 0x47, 0x01, 0x13, 0x57,
-  0x81, 0x14, 0xB9, 0x01, 0x14, 0xBA, 0x81, 0x14, 0xB9, 0x01, 0x14, 0xB0,
-  0x81, 0x14, 0xB9, 0x01, 0x14, 0xBD, 0x81, 0x15, 0xB8, 0x01, 0x15, 0xAF,
-  0x81, 0x15, 0xB9, 0x01, 0x15, 0xAF, 0x81, 0x19, 0x35, 0x01, 0x19, 0x30,
+  0x81, 0x13, 0x82, 0x01, 0x13, 0xC9, 0x81, 0x13, 0x84, 0x01, 0x13, 0xBB,
+  0x81, 0x13, 0x8B, 0x01, 0x13, 0xC2, 0x81, 0x13, 0x90, 0x01, 0x13, 0xC9,
+  0x81, 0x13, 0xC2, 0x01, 0x13, 0xC2, 0x81, 0x13, 0xC2, 0x01, 0x13, 0xB8,
+  0x81, 0x13, 0xC2, 0x01, 0x13, 0xC9, 0x81, 0x14, 0xB9, 0x01, 0x14, 0xBA,
+  0x81, 0x14, 0xB9, 0x01, 0x14, 0xB0, 0x81, 0x14, 0xB9, 0x01, 0x14, 0xBD,
+  0x81, 0x15, 0xB8, 0x01, 0x15, 0xAF, 0x81, 0x15, 0xB9, 0x01, 0x15, 0xAF,
+  0x81, 0x19, 0x35, 0x01, 0x19, 0x30, 0x81, 0x61, 0x1E, 0x01, 0x61, 0x1E,
+  0x81, 0x61, 0x1E, 0x01, 0x61, 0x29, 0x81, 0x61, 0x1E, 0x01, 0x61, 0x1F,
+  0x81, 0x61, 0x29, 0x01, 0x61, 0x1F, 0x81, 0x61, 0x1E, 0x01, 0x61, 0x20,
+  0x81, 0x61, 0x21, 0x01, 0x61, 0x1F, 0x81, 0x61, 0x22, 0x01, 0x61, 0x1F,
+  0x81, 0x61, 0x21, 0x01, 0x61, 0x20, 0x81, 0x6D, 0x67, 0x01, 0x6D, 0x67,
+  0x81, 0x6D, 0x63, 0x01, 0x6D, 0x67, 0x81, 0x6D, 0x69, 0x01, 0x6D, 0x67,
+  0x04, 0x00, 0x41, 0x04, 0x00, 0x42, 0x04, 0x00, 0x43, 0x04, 0x00, 0x44,
+  0x04, 0x00, 0x45, 0x04, 0x00, 0x46, 0x04, 0x00, 0x47, 0x04, 0x00, 0x48,
+  0x04, 0x00, 0x49, 0x04, 0x00, 0x4A, 0x04, 0x00, 0x4B, 0x04, 0x00, 0x4C,
+  0x04, 0x00, 0x4D, 0x04, 0x00, 0x4E, 0x04, 0x00, 0x4F, 0x04, 0x00, 0x50,
+  0x04, 0x00, 0x51, 0x04, 0x00, 0x52, 0x04, 0x00, 0x53, 0x04, 0x00, 0x54,
+  0x04, 0x00, 0x55, 0x04, 0x00, 0x56, 0x04, 0x00, 0x57, 0x04, 0x00, 0x58,
+  0x04, 0x00, 0x59, 0x04, 0x00, 0x5A, 0x04, 0x00, 0x30, 0x04, 0x00, 0x31,
+  0x04, 0x00, 0x32, 0x04, 0x00, 0x33, 0x04, 0x00, 0x34, 0x04, 0x00, 0x35,
+  0x04, 0x00, 0x36, 0x04, 0x00, 0x37, 0x04, 0x00, 0x38, 0x04, 0x00, 0x39,
   0x81, 0xD1, 0x57, 0x01, 0xD1, 0x65, 0x81, 0xD1, 0x58, 0x01, 0xD1, 0x65,
   0x81, 0xD1, 0x5F, 0x01, 0xD1, 0x6E, 0x81, 0xD1, 0x5F, 0x01, 0xD1, 0x6F,
   0x81, 0xD1, 0x5F, 0x01, 0xD1, 0x70, 0x81, 0xD1, 0x5F, 0x01, 0xD1, 0x71,
@@ -2201,11 +2220,11 @@ const decomp_index_table_t 
gl_uninorm_decomp_index_table =
        -1,   512,    -1,    -1,   544,   576,   608,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      640,    -1,    -1,   672,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,   640,   672,    -1,    -1,
-      704,    -1,    -1,   736,   768,    -1,   800,    -1,
+       -1,    -1,    -1,   704,   736,   768,    -1,    -1,
+      800,    -1,    -1,   832,   864,    -1,   896,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -2213,7 +2232,7 @@ const decomp_index_table_t gl_uninorm_decomp_index_table =
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,   832
+       -1,    -1,    -1,    -1,    -1,    -1,   928
   },
   {
        -1,    -1,    -1,    -1,    -1,     0,    32,    64,
@@ -2281,48 +2300,60 @@ const decomp_index_table_t 
gl_uninorm_decomp_index_table =
      6048,  6080,  6112,  6144,  6176,  6208,  6240,  6272,
      6304,  6336,  6368,  6400,  6432,  6464,  6496,  6528,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  6560,  6592,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,  6560,  6592,    -1,    -1,
        -1,    -1,    -1,    -1,  6624,  6656,    -1,    -1,
-       -1,  6688,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  6688,  6720,    -1,    -1,
+       -1,  6752,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  6784,    -1,  6816,    -1,  6848,    -1,
+       -1,    -1,    -1,    -1,    -1,  6880,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,  6912,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  6944,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  6720,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,  6752,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,  6784,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  6976,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  6816,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  7008,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  6848,  6880,    -1,  6912,  6944,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  7040,  7072,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  7104,  7136,    -1,  7168,  7200,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     6976,  7008,  7040,  7072,  7104,  7136,  7168,  7200,
      7232,  7264,  7296,  7328,  7360,  7392,  7424,  7456,
      7488,  7520,  7552,  7584,  7616,  7648,  7680,  7712,
      7744,  7776,  7808,  7840,  7872,  7904,  7936,  7968,
-       -1,  8000,  8032,  8064,    -1,    -1,    -1,    -1,
+     8000,  8032,  8064,  8096,  8128,  8160,  8192,  8224,
+       -1,  8256,  8288,  8320,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     8096,  8128,  8160,  8192,  8224,  8256,    -1,    -1,
+     8352,  8384,  8416,  8448,  8480,  8512,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     8288,  8320,  8352,  8384,  8416,    -1,    -1,    -1,
-     8448,  8480,  8512,    -1,    -1,    -1,    -1,    -1,
+     8544,  8576,  8608,  8640,  8672,    -1,    -1,    -1,
+     8704,  8736,  8768,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,  8544,
-     8576,  8608,  8640,  8672,  8704,  8736,  8768,  8800,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,  8800,
      8832,  8864,  8896,  8928,  8960,  8992,  9024,  9056,
-     9088,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     9088,  9120,  9152,  9184,  9216,  9248,  9280,  9312,
+     9344,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1
   },
   {
@@ -3146,325 +3177,357 @@ const decomp_index_table_t 
gl_uninorm_decomp_index_table =
     39331, 39332, 39333, 39334, 39335, 39336, 39337,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1, 39338, 39339, 39340, 39341, 39342,    -1, 39343,
-    39344, 39345, 39346, 39347, 39348, 39349, 39350, 39351,
-    39352, 39353, 39354, 39355, 39356, 39357, 39358, 39359,
-    39360, 39361, 39362, 39363, 39364, 39365, 39366, 39367,
-    39368, 39369, 39370, 39371, 39372, 39373, 39374, 39375,
-    39376, 39377, 39378, 39379, 39380, 39381, 39382, 39383,
-    39384,    -1, 39385, 39386, 39387, 39388, 39389, 39390,
-    39391, 39392, 39393,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  6570,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  6572,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1, 39342, 39343, 39344, 39345, 39346,    -1, 39347,
+    39348, 39349, 39350, 39351, 39352, 39353, 39354, 39355,
+    39356, 39357, 39358, 39359, 39360, 39361, 39362, 39363,
+    39364, 39365, 39366, 39367, 39368, 39369, 39370, 39371,
+    39372, 39373, 39374, 39375, 39376, 39377, 39378, 39379,
+    39380, 39381, 39382, 39383, 39384, 39385, 39386, 39387,
+    39388,    -1, 39389, 39390, 39391, 39392, 39393, 39394,
+    39395, 39396, 39397,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  6626,    -1,  6628,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,  6630,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  6630,    -1,  6632,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  6634,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,  6632,  6634,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  6636,  6638,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,  6636,  6638,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  6640,  6642,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  6644,    -1,  6646,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  6648,    -1,
+       -1,  6650,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,  6640,  6642,    -1,  6644,    -1,
+       -1,    -1,    -1,    -1,    -1,  6652,    -1,  6654,
+     6656,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,  6646,  6648,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  6658,  6660,    -1,  6662,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     6650,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  6664,  6666,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,  6652,  6654,
-     6656,  6658,  6660,  6662,  6664,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     6668,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  6670,  6672,  6674,  6676,  6678,  6680,  6682,
+     6684,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     6686,  6688,  6690,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,  6666,  6668,  6670,  6672,  6674,
-     6676,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    39446, 39447, 39448, 39449, 39450, 39451, 39452, 39453,
-    39454, 39455, 39456, 39457, 39458, 39459, 39460, 39461,
+       -1,    -1,    -1,    -1,    -1,    -1, 39460, 39461,
     39462, 39463, 39464, 39465, 39466, 39467, 39468, 39469,
     39470, 39471, 39472, 39473, 39474, 39475, 39476, 39477,
     39478, 39479, 39480, 39481, 39482, 39483, 39484, 39485,
     39486, 39487, 39488, 39489, 39490, 39491, 39492, 39493,
-    39494, 39495, 39496, 39497, 39498, 39499, 39500, 39501,
-    39502, 39503, 39504, 39505, 39506, 39507, 39508, 39509,
-    39510, 39511, 39512, 39513, 39514, 39515, 39516, 39517,
-    39518, 39519, 39520, 39521, 39522, 39523, 39524, 39525,
-    39526, 39527, 39528, 39529, 39530,    -1, 39531, 39532,
-    39533, 39534, 39535, 39536, 39537, 39538, 39539, 39540,
-    39541, 39542, 39543, 39544, 39545, 39546, 39547, 39548,
-    39549, 39550, 39551, 39552, 39553, 39554, 39555, 39556,
-    39557, 39558, 39559, 39560, 39561, 39562, 39563, 39564,
-    39565, 39566, 39567, 39568, 39569, 39570, 39571, 39572,
-    39573, 39574, 39575, 39576, 39577, 39578, 39579, 39580,
-    39581, 39582, 39583, 39584, 39585, 39586, 39587, 39588,
-    39589, 39590, 39591, 39592, 39593, 39594, 39595, 39596,
-    39597, 39598, 39599, 39600, 39601,    -1, 39602, 39603,
-       -1,    -1, 39604,    -1,    -1, 39605, 39606,    -1,
-       -1, 39607, 39608, 39609, 39610,    -1, 39611, 39612,
-    39613, 39614, 39615, 39616, 39617, 39618, 39619, 39620,
-    39621, 39622,    -1, 39623,    -1, 39624, 39625, 39626,
-    39627, 39628, 39629, 39630,    -1, 39631, 39632, 39633,
-    39634, 39635, 39636, 39637, 39638, 39639, 39640, 39641,
-    39642, 39643, 39644, 39645, 39646, 39647, 39648, 39649,
-    39650, 39651, 39652, 39653, 39654, 39655, 39656, 39657,
-    39658, 39659, 39660, 39661, 39662, 39663, 39664, 39665,
-    39666, 39667, 39668, 39669, 39670, 39671, 39672, 39673,
-    39674, 39675, 39676, 39677, 39678, 39679, 39680, 39681,
-    39682, 39683, 39684, 39685, 39686, 39687, 39688, 39689,
-    39690, 39691, 39692, 39693, 39694, 39695,    -1, 39696,
-    39697, 39698, 39699,    -1,    -1, 39700, 39701, 39702,
-    39703, 39704, 39705, 39706, 39707,    -1, 39708, 39709,
-    39710, 39711, 39712, 39713, 39714,    -1, 39715, 39716,
-    39717, 39718, 39719, 39720, 39721, 39722, 39723, 39724,
-    39725, 39726, 39727, 39728, 39729, 39730, 39731, 39732,
-    39733, 39734, 39735, 39736, 39737, 39738, 39739, 39740,
-    39741, 39742,    -1, 39743, 39744, 39745, 39746,    -1,
-    39747, 39748, 39749, 39750, 39751,    -1, 39752,    -1,
-       -1,    -1, 39753, 39754, 39755, 39756, 39757, 39758,
-    39759,    -1, 39760, 39761, 39762, 39763, 39764, 39765,
-    39766, 39767, 39768, 39769, 39770, 39771, 39772, 39773,
-    39774, 39775, 39776, 39777, 39778, 39779, 39780, 39781,
-    39782, 39783, 39784, 39785, 39786, 39787, 39788, 39789,
-    39790, 39791, 39792, 39793, 39794, 39795, 39796, 39797,
-    39798, 39799, 39800, 39801, 39802, 39803, 39804, 39805,
-    39806, 39807, 39808, 39809, 39810, 39811, 39812, 39813,
-    39814, 39815, 39816, 39817, 39818, 39819, 39820, 39821,
-    39822, 39823, 39824, 39825, 39826, 39827, 39828, 39829,
-    39830, 39831, 39832, 39833, 39834, 39835, 39836, 39837,
-    39838, 39839, 39840, 39841, 39842, 39843, 39844, 39845,
-    39846, 39847, 39848, 39849, 39850, 39851, 39852, 39853,
-    39854, 39855, 39856, 39857, 39858, 39859, 39860, 39861,
-    39862, 39863, 39864, 39865, 39866, 39867, 39868, 39869,
-    39870, 39871, 39872, 39873, 39874, 39875, 39876, 39877,
-    39878, 39879, 39880, 39881, 39882, 39883, 39884, 39885,
-    39886, 39887, 39888, 39889, 39890, 39891, 39892, 39893,
-    39894, 39895, 39896, 39897, 39898, 39899, 39900, 39901,
-    39902, 39903, 39904, 39905, 39906, 39907, 39908, 39909,
-    39910, 39911, 39912, 39913, 39914, 39915, 39916, 39917,
-    39918, 39919, 39920, 39921, 39922, 39923, 39924, 39925,
-    39926, 39927, 39928, 39929, 39930, 39931, 39932, 39933,
-    39934, 39935, 39936, 39937, 39938, 39939, 39940, 39941,
-    39942, 39943, 39944, 39945, 39946, 39947, 39948, 39949,
-    39950, 39951, 39952, 39953, 39954, 39955, 39956, 39957,
-    39958, 39959, 39960, 39961, 39962, 39963, 39964, 39965,
-    39966, 39967, 39968, 39969, 39970, 39971, 39972, 39973,
-    39974, 39975, 39976, 39977, 39978, 39979, 39980, 39981,
-    39982, 39983, 39984, 39985, 39986, 39987, 39988, 39989,
-    39990, 39991, 39992, 39993, 39994, 39995, 39996, 39997,
-    39998, 39999, 40000, 40001, 40002, 40003, 40004, 40005,
-    40006, 40007, 40008, 40009, 40010, 40011, 40012, 40013,
-    40014, 40015, 40016, 40017, 40018, 40019, 40020, 40021,
-    40022, 40023, 40024, 40025, 40026, 40027, 40028, 40029,
-    40030, 40031, 40032, 40033, 40034, 40035, 40036, 40037,
-    40038, 40039, 40040, 40041, 40042, 40043, 40044, 40045,
-    40046, 40047, 40048, 40049, 40050, 40051, 40052, 40053,
-    40054, 40055, 40056, 40057, 40058, 40059, 40060, 40061,
-    40062, 40063, 40064, 40065, 40066, 40067, 40068, 40069,
-    40070, 40071, 40072, 40073, 40074, 40075, 40076, 40077,
-    40078, 40079, 40080, 40081, 40082, 40083, 40084, 40085,
-    40086, 40087, 40088, 40089, 40090, 40091, 40092, 40093,
-    40094, 40095, 40096, 40097, 40098, 40099,    -1,    -1,
-    40100, 40101, 40102, 40103, 40104, 40105, 40106, 40107,
-    40108, 40109, 40110, 40111, 40112, 40113, 40114, 40115,
-    40116, 40117, 40118, 40119, 40120, 40121, 40122, 40123,
-    40124, 40125, 40126, 40127, 40128, 40129, 40130, 40131,
-    40132, 40133, 40134, 40135, 40136, 40137, 40138, 40139,
-    40140, 40141, 40142, 40143, 40144, 40145, 40146, 40147,
-    40148, 40149, 40150, 40151, 40152, 40153, 40154, 40155,
-    40156, 40157, 40158, 40159, 40160, 40161, 40162, 40163,
-    40164, 40165, 40166, 40167, 40168, 40169, 40170, 40171,
-    40172, 40173, 40174, 40175, 40176, 40177, 40178, 40179,
-    40180, 40181, 40182, 40183, 40184, 40185, 40186, 40187,
-    40188, 40189, 40190, 40191, 40192, 40193, 40194, 40195,
-    40196, 40197, 40198, 40199, 40200, 40201, 40202, 40203,
-    40204, 40205, 40206, 40207, 40208, 40209, 40210, 40211,
-    40212, 40213, 40214, 40215, 40216, 40217, 40218, 40219,
-    40220, 40221, 40222, 40223, 40224, 40225, 40226, 40227,
-    40228, 40229, 40230, 40231, 40232, 40233, 40234, 40235,
-    40236, 40237, 40238, 40239, 40240, 40241, 40242, 40243,
-    40244, 40245, 40246, 40247, 40248, 40249, 40250, 40251,
-    40252, 40253, 40254, 40255, 40256, 40257, 40258, 40259,
-    40260, 40261, 40262, 40263, 40264, 40265, 40266, 40267,
-    40268, 40269, 40270, 40271, 40272, 40273, 40274, 40275,
-    40276, 40277, 40278, 40279, 40280, 40281, 40282, 40283,
-    40284, 40285, 40286, 40287, 40288, 40289, 40290, 40291,
-    40292, 40293, 40294, 40295, 40296, 40297, 40298, 40299,
-    40300, 40301, 40302, 40303, 40304, 40305, 40306, 40307,
-    40308, 40309, 40310, 40311, 40312, 40313, 40314, 40315,
-    40316, 40317, 40318, 40319, 40320, 40321, 40322, 40323,
-    40324, 40325, 40326, 40327, 40328, 40329, 40330, 40331,
-    40332, 40333, 40334, 40335, 40336, 40337, 40338, 40339,
-    40340, 40341, 40342, 40343, 40344, 40345, 40346, 40347,
-    40348, 40349, 40350, 40351, 40352, 40353, 40354, 40355,
-    40356, 40357, 40358, 40359, 40360, 40361, 40362, 40363,
-    40364, 40365, 40366, 40367, 40368, 40369, 40370, 40371,
-    40372, 40373, 40374, 40375, 40376, 40377, 40378, 40379,
-    40380, 40381, 40382, 40383, 40384, 40385, 40386, 40387,
-    40388, 40389, 40390, 40391,    -1,    -1, 40392, 40393,
-    40394, 40395, 40396, 40397, 40398, 40399, 40400, 40401,
-    40402, 40403, 40404, 40405, 40406, 40407, 40408, 40409,
-    40410, 40411, 40412, 40413, 40414, 40415, 40416, 40417,
-    40418, 40419, 40420, 40421, 40422, 40423, 40424, 40425,
-    40426, 40427, 40428, 40429, 40430, 40431, 40432, 40433,
-    40434, 40435, 40436, 40437, 40438, 40439, 40440, 40441,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40442, 40443, 40444, 40445, 40446, 40447, 40448, 40449,
-    40450, 40451, 40452, 40453, 40454, 40455, 40456, 40457,
-    40458, 40459, 40460, 40461, 40462, 40463, 40464, 40465,
-    40466, 40467, 40468, 40469, 40470, 40471, 40472, 40473,
-    40474, 40475, 40476, 40477, 40478, 40479, 40480, 40481,
-    40482, 40483, 40484, 40485, 40486, 40487, 40488, 40489,
-    40490, 40491, 40492, 40493, 40494, 40495, 40496, 40497,
-    40498, 40499, 40500, 40501, 40502, 40503,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40504, 40505, 40506, 40507,    -1, 40508, 40509, 40510,
-    40511, 40512, 40513, 40514, 40515, 40516, 40517, 40518,
-    40519, 40520, 40521, 40522, 40523, 40524, 40525, 40526,
-    40527, 40528, 40529, 40530, 40531, 40532, 40533, 40534,
-       -1, 40535, 40536,    -1, 40537,    -1,    -1, 40538,
-       -1, 40539, 40540, 40541, 40542, 40543, 40544, 40545,
-    40546, 40547, 40548,    -1, 40549, 40550, 40551, 40552,
-       -1, 40553,    -1, 40554,    -1,    -1,    -1,    -1,
-       -1,    -1, 40555,    -1,    -1,    -1,    -1, 40556,
-       -1, 40557,    -1, 40558,    -1, 40559, 40560, 40561,
-       -1, 40562, 40563,    -1, 40564,    -1,    -1, 40565,
-       -1, 40566,    -1, 40567,    -1, 40568,    -1, 40569,
-       -1, 40570, 40571,    -1, 40572,    -1,    -1, 40573,
-    40574, 40575, 40576,    -1, 40577, 40578, 40579, 40580,
-    40581, 40582, 40583,    -1, 40584, 40585, 40586, 40587,
-       -1, 40588, 40589, 40590, 40591,    -1, 40592,    -1,
-    40593, 40594, 40595, 40596, 40597, 40598, 40599, 40600,
-    40601, 40602,    -1, 40603, 40604, 40605, 40606, 40607,
-    40608, 40609, 40610, 40611, 40612, 40613, 40614, 40615,
-    40616, 40617, 40618, 40619,    -1,    -1,    -1,    -1,
-       -1, 40620, 40621, 40622,    -1, 40623, 40624, 40625,
-    40626, 40627,    -1, 40628, 40629, 40630, 40631, 40632,
-    40633, 40634, 40635, 40636, 40637, 40638, 40639, 40640,
-    40641, 40642, 40643, 40644,    -1,    -1,    -1,    -1,
-    40645, 40647, 40649, 40651, 40653, 40655, 40657, 40659,
-    40661, 40663, 40665,    -1,    -1,    -1,    -1,    -1,
-    40667, 40670, 40673, 40676, 40679, 40682, 40685, 40688,
-    40691, 40694, 40697, 40700, 40703, 40706, 40709, 40712,
-    40715, 40718, 40721, 40724, 40727, 40730, 40733, 40736,
-    40739, 40742, 40745, 40748, 40749, 40750, 40752,    -1,
-    40754, 40755, 40756, 40757, 40758, 40759, 40760, 40761,
-    40762, 40763, 40764, 40765, 40766, 40767, 40768, 40769,
-    40770, 40771, 40772, 40773, 40774, 40775, 40776, 40777,
-    40778, 40779, 40780, 40782, 40784, 40786, 40788, 40791,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1, 40793, 40795, 40797,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40799,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40801, 40803, 40805,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40806, 40807, 40808, 40809, 40810, 40811, 40812, 40813,
-    40814, 40815, 40816, 40817, 40818, 40819, 40820, 40821,
-    40822, 40823, 40824, 40825, 40826, 40827, 40828, 40829,
+    39494, 39495,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  6728,  6730,
+     6732,  6734,  6736,  6738,  6740,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  6742,  6744,  6746,  6748,  6750,
+     6752,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    39522, 39523, 39524, 39525, 39526, 39527, 39528, 39529,
+    39530, 39531, 39532, 39533, 39534, 39535, 39536, 39537,
+    39538, 39539, 39540, 39541, 39542, 39543, 39544, 39545,
+    39546, 39547, 39548, 39549, 39550, 39551, 39552, 39553,
+    39554, 39555, 39556, 39557, 39558, 39559, 39560, 39561,
+    39562, 39563, 39564, 39565, 39566, 39567, 39568, 39569,
+    39570, 39571, 39572, 39573, 39574, 39575, 39576, 39577,
+    39578, 39579, 39580, 39581, 39582, 39583, 39584, 39585,
+    39586, 39587, 39588, 39589, 39590, 39591, 39592, 39593,
+    39594, 39595, 39596, 39597, 39598, 39599, 39600, 39601,
+    39602, 39603, 39604, 39605, 39606,    -1, 39607, 39608,
+    39609, 39610, 39611, 39612, 39613, 39614, 39615, 39616,
+    39617, 39618, 39619, 39620, 39621, 39622, 39623, 39624,
+    39625, 39626, 39627, 39628, 39629, 39630, 39631, 39632,
+    39633, 39634, 39635, 39636, 39637, 39638, 39639, 39640,
+    39641, 39642, 39643, 39644, 39645, 39646, 39647, 39648,
+    39649, 39650, 39651, 39652, 39653, 39654, 39655, 39656,
+    39657, 39658, 39659, 39660, 39661, 39662, 39663, 39664,
+    39665, 39666, 39667, 39668, 39669, 39670, 39671, 39672,
+    39673, 39674, 39675, 39676, 39677,    -1, 39678, 39679,
+       -1,    -1, 39680,    -1,    -1, 39681, 39682,    -1,
+       -1, 39683, 39684, 39685, 39686,    -1, 39687, 39688,
+    39689, 39690, 39691, 39692, 39693, 39694, 39695, 39696,
+    39697, 39698,    -1, 39699,    -1, 39700, 39701, 39702,
+    39703, 39704, 39705, 39706,    -1, 39707, 39708, 39709,
+    39710, 39711, 39712, 39713, 39714, 39715, 39716, 39717,
+    39718, 39719, 39720, 39721, 39722, 39723, 39724, 39725,
+    39726, 39727, 39728, 39729, 39730, 39731, 39732, 39733,
+    39734, 39735, 39736, 39737, 39738, 39739, 39740, 39741,
+    39742, 39743, 39744, 39745, 39746, 39747, 39748, 39749,
+    39750, 39751, 39752, 39753, 39754, 39755, 39756, 39757,
+    39758, 39759, 39760, 39761, 39762, 39763, 39764, 39765,
+    39766, 39767, 39768, 39769, 39770, 39771,    -1, 39772,
+    39773, 39774, 39775,    -1,    -1, 39776, 39777, 39778,
+    39779, 39780, 39781, 39782, 39783,    -1, 39784, 39785,
+    39786, 39787, 39788, 39789, 39790,    -1, 39791, 39792,
+    39793, 39794, 39795, 39796, 39797, 39798, 39799, 39800,
+    39801, 39802, 39803, 39804, 39805, 39806, 39807, 39808,
+    39809, 39810, 39811, 39812, 39813, 39814, 39815, 39816,
+    39817, 39818,    -1, 39819, 39820, 39821, 39822,    -1,
+    39823, 39824, 39825, 39826, 39827,    -1, 39828,    -1,
+       -1,    -1, 39829, 39830, 39831, 39832, 39833, 39834,
+    39835,    -1, 39836, 39837, 39838, 39839, 39840, 39841,
+    39842, 39843, 39844, 39845, 39846, 39847, 39848, 39849,
+    39850, 39851, 39852, 39853, 39854, 39855, 39856, 39857,
+    39858, 39859, 39860, 39861, 39862, 39863, 39864, 39865,
+    39866, 39867, 39868, 39869, 39870, 39871, 39872, 39873,
+    39874, 39875, 39876, 39877, 39878, 39879, 39880, 39881,
+    39882, 39883, 39884, 39885, 39886, 39887, 39888, 39889,
+    39890, 39891, 39892, 39893, 39894, 39895, 39896, 39897,
+    39898, 39899, 39900, 39901, 39902, 39903, 39904, 39905,
+    39906, 39907, 39908, 39909, 39910, 39911, 39912, 39913,
+    39914, 39915, 39916, 39917, 39918, 39919, 39920, 39921,
+    39922, 39923, 39924, 39925, 39926, 39927, 39928, 39929,
+    39930, 39931, 39932, 39933, 39934, 39935, 39936, 39937,
+    39938, 39939, 39940, 39941, 39942, 39943, 39944, 39945,
+    39946, 39947, 39948, 39949, 39950, 39951, 39952, 39953,
+    39954, 39955, 39956, 39957, 39958, 39959, 39960, 39961,
+    39962, 39963, 39964, 39965, 39966, 39967, 39968, 39969,
+    39970, 39971, 39972, 39973, 39974, 39975, 39976, 39977,
+    39978, 39979, 39980, 39981, 39982, 39983, 39984, 39985,
+    39986, 39987, 39988, 39989, 39990, 39991, 39992, 39993,
+    39994, 39995, 39996, 39997, 39998, 39999, 40000, 40001,
+    40002, 40003, 40004, 40005, 40006, 40007, 40008, 40009,
+    40010, 40011, 40012, 40013, 40014, 40015, 40016, 40017,
+    40018, 40019, 40020, 40021, 40022, 40023, 40024, 40025,
+    40026, 40027, 40028, 40029, 40030, 40031, 40032, 40033,
+    40034, 40035, 40036, 40037, 40038, 40039, 40040, 40041,
+    40042, 40043, 40044, 40045, 40046, 40047, 40048, 40049,
+    40050, 40051, 40052, 40053, 40054, 40055, 40056, 40057,
+    40058, 40059, 40060, 40061, 40062, 40063, 40064, 40065,
+    40066, 40067, 40068, 40069, 40070, 40071, 40072, 40073,
+    40074, 40075, 40076, 40077, 40078, 40079, 40080, 40081,
+    40082, 40083, 40084, 40085, 40086, 40087, 40088, 40089,
+    40090, 40091, 40092, 40093, 40094, 40095, 40096, 40097,
+    40098, 40099, 40100, 40101, 40102, 40103, 40104, 40105,
+    40106, 40107, 40108, 40109, 40110, 40111, 40112, 40113,
+    40114, 40115, 40116, 40117, 40118, 40119, 40120, 40121,
+    40122, 40123, 40124, 40125, 40126, 40127, 40128, 40129,
+    40130, 40131, 40132, 40133, 40134, 40135, 40136, 40137,
+    40138, 40139, 40140, 40141, 40142, 40143, 40144, 40145,
+    40146, 40147, 40148, 40149, 40150, 40151, 40152, 40153,
+    40154, 40155, 40156, 40157, 40158, 40159, 40160, 40161,
+    40162, 40163, 40164, 40165, 40166, 40167, 40168, 40169,
+    40170, 40171, 40172, 40173, 40174, 40175,    -1,    -1,
+    40176, 40177, 40178, 40179, 40180, 40181, 40182, 40183,
+    40184, 40185, 40186, 40187, 40188, 40189, 40190, 40191,
+    40192, 40193, 40194, 40195, 40196, 40197, 40198, 40199,
+    40200, 40201, 40202, 40203, 40204, 40205, 40206, 40207,
+    40208, 40209, 40210, 40211, 40212, 40213, 40214, 40215,
+    40216, 40217, 40218, 40219, 40220, 40221, 40222, 40223,
+    40224, 40225, 40226, 40227, 40228, 40229, 40230, 40231,
+    40232, 40233, 40234, 40235, 40236, 40237, 40238, 40239,
+    40240, 40241, 40242, 40243, 40244, 40245, 40246, 40247,
+    40248, 40249, 40250, 40251, 40252, 40253, 40254, 40255,
+    40256, 40257, 40258, 40259, 40260, 40261, 40262, 40263,
+    40264, 40265, 40266, 40267, 40268, 40269, 40270, 40271,
+    40272, 40273, 40274, 40275, 40276, 40277, 40278, 40279,
+    40280, 40281, 40282, 40283, 40284, 40285, 40286, 40287,
+    40288, 40289, 40290, 40291, 40292, 40293, 40294, 40295,
+    40296, 40297, 40298, 40299, 40300, 40301, 40302, 40303,
+    40304, 40305, 40306, 40307, 40308, 40309, 40310, 40311,
+    40312, 40313, 40314, 40315, 40316, 40317, 40318, 40319,
+    40320, 40321, 40322, 40323, 40324, 40325, 40326, 40327,
+    40328, 40329, 40330, 40331, 40332, 40333, 40334, 40335,
+    40336, 40337, 40338, 40339, 40340, 40341, 40342, 40343,
+    40344, 40345, 40346, 40347, 40348, 40349, 40350, 40351,
+    40352, 40353, 40354, 40355, 40356, 40357, 40358, 40359,
+    40360, 40361, 40362, 40363, 40364, 40365, 40366, 40367,
+    40368, 40369, 40370, 40371, 40372, 40373, 40374, 40375,
+    40376, 40377, 40378, 40379, 40380, 40381, 40382, 40383,
+    40384, 40385, 40386, 40387, 40388, 40389, 40390, 40391,
+    40392, 40393, 40394, 40395, 40396, 40397, 40398, 40399,
+    40400, 40401, 40402, 40403, 40404, 40405, 40406, 40407,
+    40408, 40409, 40410, 40411, 40412, 40413, 40414, 40415,
+    40416, 40417, 40418, 40419, 40420, 40421, 40422, 40423,
+    40424, 40425, 40426, 40427, 40428, 40429, 40430, 40431,
+    40432, 40433, 40434, 40435, 40436, 40437, 40438, 40439,
+    40440, 40441, 40442, 40443, 40444, 40445, 40446, 40447,
+    40448, 40449, 40450, 40451, 40452, 40453, 40454, 40455,
+    40456, 40457, 40458, 40459, 40460, 40461, 40462, 40463,
+    40464, 40465, 40466, 40467,    -1,    -1, 40468, 40469,
+    40470, 40471, 40472, 40473, 40474, 40475, 40476, 40477,
+    40478, 40479, 40480, 40481, 40482, 40483, 40484, 40485,
+    40486, 40487, 40488, 40489, 40490, 40491, 40492, 40493,
+    40494, 40495, 40496, 40497, 40498, 40499, 40500, 40501,
+    40502, 40503, 40504, 40505, 40506, 40507, 40508, 40509,
+    40510, 40511, 40512, 40513, 40514, 40515, 40516, 40517,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    40518, 40519, 40520, 40521, 40522, 40523, 40524, 40525,
+    40526, 40527, 40528, 40529, 40530, 40531, 40532, 40533,
+    40534, 40535, 40536, 40537, 40538, 40539, 40540, 40541,
+    40542, 40543, 40544, 40545, 40546, 40547, 40548, 40549,
+    40550, 40551, 40552, 40553, 40554, 40555, 40556, 40557,
+    40558, 40559, 40560, 40561, 40562, 40563, 40564, 40565,
+    40566, 40567, 40568, 40569, 40570, 40571, 40572, 40573,
+    40574, 40575, 40576, 40577, 40578, 40579,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    40580, 40581, 40582, 40583,    -1, 40584, 40585, 40586,
+    40587, 40588, 40589, 40590, 40591, 40592, 40593, 40594,
+    40595, 40596, 40597, 40598, 40599, 40600, 40601, 40602,
+    40603, 40604, 40605, 40606, 40607, 40608, 40609, 40610,
+       -1, 40611, 40612,    -1, 40613,    -1,    -1, 40614,
+       -1, 40615, 40616, 40617, 40618, 40619, 40620, 40621,
+    40622, 40623, 40624,    -1, 40625, 40626, 40627, 40628,
+       -1, 40629,    -1, 40630,    -1,    -1,    -1,    -1,
+       -1,    -1, 40631,    -1,    -1,    -1,    -1, 40632,
+       -1, 40633,    -1, 40634,    -1, 40635, 40636, 40637,
+       -1, 40638, 40639,    -1, 40640,    -1,    -1, 40641,
+       -1, 40642,    -1, 40643,    -1, 40644,    -1, 40645,
+       -1, 40646, 40647,    -1, 40648,    -1,    -1, 40649,
+    40650, 40651, 40652,    -1, 40653, 40654, 40655, 40656,
+    40657, 40658, 40659,    -1, 40660, 40661, 40662, 40663,
+       -1, 40664, 40665, 40666, 40667,    -1, 40668,    -1,
+    40669, 40670, 40671, 40672, 40673, 40674, 40675, 40676,
+    40677, 40678,    -1, 40679, 40680, 40681, 40682, 40683,
+    40684, 40685, 40686, 40687, 40688, 40689, 40690, 40691,
+    40692, 40693, 40694, 40695,    -1,    -1,    -1,    -1,
+       -1, 40696, 40697, 40698,    -1, 40699, 40700, 40701,
+    40702, 40703,    -1, 40704, 40705, 40706, 40707, 40708,
+    40709, 40710, 40711, 40712, 40713, 40714, 40715, 40716,
+    40717, 40718, 40719, 40720,    -1,    -1,    -1,    -1,
+    40721, 40723, 40725, 40727, 40729, 40731, 40733, 40735,
+    40737, 40739, 40741,    -1,    -1,    -1,    -1,    -1,
+    40743, 40746, 40749, 40752, 40755, 40758, 40761, 40764,
+    40767, 40770, 40773, 40776, 40779, 40782, 40785, 40788,
+    40791, 40794, 40797, 40800, 40803, 40806, 40809, 40812,
+    40815, 40818, 40821, 40824, 40825, 40826, 40828,    -1,
     40830, 40831, 40832, 40833, 40834, 40835, 40836, 40837,
     40838, 40839, 40840, 40841, 40842, 40843, 40844, 40845,
-    40846, 40847, 40848, 40849,    -1,    -1,    -1,    -1,
-    40850, 40853, 40856, 40859, 40862, 40865, 40868, 40871,
-    40874,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40877, 40878,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40879, 40880, 40881, 40882, 40883, 40884, 40885, 40886,
-    40887, 40888,    -1,    -1,    -1,    -1,    -1,    -1,
-     8121,  8122,  8123,  8124,  8125,  8126,  8127,  8128,
-     8129,  8130,  8131,  8132,  8133,  8134,  8135,  8136,
-     8137,  8138,  8139,  8140,  8141,  8142,  8143,  8144,
-     8145,  8146,  8147,  8148,  8149,  8150,  8151,  8152,
-     8153,  8154,  8155,  8156,  8157,  8158,  8159,  8160,
-     8161,  8162,  8163,  8164,  8165,  8166,  8167,  8168,
-     8169,  8170,  8171,  8172,  8173,  8174,  8175,  8176,
-     8177,  8178,  8179,  8180,  8181,  8182,  8183,  8184,
-     8185,  8186,  8187,  8188,  8189,  8190,  8191,  8192,
-     8193,  8194,  8195,  8196,  8197,  8198,  8199,  8200,
-     8201,  8202,  8203,  8204,  8205,  8206,  8207,  8208,
-     8209,  8210,  8211,  8212,  8213,  8214,  8215,  8216,
-     8217,  8218,  8219,  8220,  8221,  8222,  8223,  8224,
-     8225,  8226,  8227,  8228,  8229,  8230,  8231,  8232,
-     8233,  8234,  8235,  8236,  8237,  8238,  8239,  8240,
-     8241,  8242,  8243,  8244,  8245,  8246,  8247,  8248,
-     8249,  8250,  8251,  8252,  8253,  8254,  8255,  8256,
-     8257,  8258,  8259,  8260,  8261,  8262,  8263,  8264,
-     8265,  8266,  8267,  8268,  8269,  8270,  8271,  8272,
-     8273,  8274,  8275,  8276,  8277,  8278,  8279,  8280,
-     8281,  8282,  8283,  8284,  8285,  8286,  8287,  8288,
-     8289,  8290,  8291,  8292,  8293,  8294,  8295,  8296,
-     8297,  8298,  8299,  8300,  8301,  8302,  8303,  8304,
-     8305,  8306,  8307,  8308,  8309,  8310,  8311,  8312,
-     8313,  8314,  8315,  8316,  8317,  8318,  8319,  8320,
-     8321,  8322,  8323,  8324,  8325,  8326,  8327,  8328,
-     8329,  8330,  8331,  8332,  8333,  8334,  8335,  8336,
-     8337,  8338,  8339,  8340,  8341,  8342,  8343,  8344,
-     8345,  8346,  8347,  8348,  8349,  8350,  8351,  8352,
-     8353,  8354,  8355,  8356,  8357,  8358,  8359,  8360,
-     8361,  8362,  8363,  8364,  8365,  8366,  8367,  8368,
-     8369,  8370,  8371,  8372,  8373,  8374,  8375,  8376,
-     8377,  8378,  8379,  8380,  8381,  8382,  8383,  8384,
-     8385,  8386,  8387,  8388,  8389,  8390,  8391,  8392,
-     8393,  8394,  8395,  8396,  8397,  8398,  8399,  8400,
-     8401,  8402,  8403,  8404,  8405,  8406,  8407,  8408,
-     8409,  8410,  8411,  8412,  8413,  8414,  8415,  8416,
-     8417,  8418,  8419,  8420,  8421,  8422,  8423,  8424,
-     8425,  8426,  8427,  8428,  8429,  8430,  8431,  8432,
-     8433,  8434,  8435,  8436,  8437,  8438,  8439,  8440,
-     8441,  8442,  8443,  8444,  8445,  8446,  8447,  8448,
-     8449,  8450,  8451,  8452,  8453,  8454,  8455,  8456,
-     8457,  8458,  8459,  8460,  8461,  8462,  8463,  8464,
-     8465,  8466,  8467,  8468,  8469,  8470,  8471,  8472,
-     8473,  8474,  8475,  8476,  8477,  8478,  8479,  8480,
-     8481,  8482,  8483,  8484,  8485,  8486,  8487,  8488,
-     8489,  8490,  8491,  8492,  8493,  8494,  8495,  8496,
-     8497,  8498,  8499,  8500,  8501,  8502,  8503,  8504,
-     8505,  8506,  8507,  8508,  8509,  8510,  8511,  8512,
-     8513,  8514,  8515,  8516,  8517,  8518,  8519,  8520,
-     8521,  8522,  8523,  8524,  8525,  8526,  8527,  8528,
-     8529,  8530,  8531,  8532,  8533,  8534,  8535,  8536,
-     8537,  8538,  8539,  8540,  8541,  8542,  8543,  8544,
-     8545,  8546,  8547,  8548,  8549,  8550,  8551,  8552,
-     8553,  8554,  8555,  8556,  8557,  8558,  8559,  8560,
-     8561,  8562,  8563,  8564,  8565,  8566,  8567,  8568,
-     8569,  8570,  8571,  8572,  8573,  8574,  8575,  8576,
-     8577,  8578,  8579,  8580,  8581,  8582,  8583,  8584,
-     8585,  8586,  8587,  8588,  8589,  8590,  8591,  8592,
-     8593,  8594,  8595,  8596,  8597,  8598,  8599,  8600,
-     8601,  8602,  8603,  8604,  8605,  8606,  8607,  8608,
-     8609,  8610,  8611,  8612,  8613,  8614,  8615,  8616,
-     8617,  8618,  8619,  8620,  8621,  8622,  8623,  8624,
-     8625,  8626,  8627,  8628,  8629,  8630,  8631,  8632,
-     8633,  8634,  8635,  8636,  8637,  8638,  8639,  8640,
-     8641,  8642,  8643,  8644,  8645,  8646,  8647,  8648,
-     8649,  8650,  8651,  8652,  8653,  8654,  8655,  8656,
-     8657,  8658,  8659,  8660,  8661,  8662,    -1,    -1
+    40846, 40847, 40848, 40849, 40850, 40851, 40852, 40853,
+    40854, 40855, 40856, 40858, 40860, 40862, 40864, 40867,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1, 40869, 40871, 40873,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    40875,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    40877, 40879, 40881,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    40882, 40883, 40884, 40885, 40886, 40887, 40888, 40889,
+    40890, 40891, 40892, 40893, 40894, 40895, 40896, 40897,
+    40898, 40899, 40900, 40901, 40902, 40903, 40904, 40905,
+    40906, 40907, 40908, 40909, 40910, 40911, 40912, 40913,
+    40914, 40915, 40916, 40917, 40918, 40919, 40920, 40921,
+    40922, 40923, 40924, 40925,    -1,    -1,    -1,    -1,
+    40926, 40929, 40932, 40935, 40938, 40941, 40944, 40947,
+    40950,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    40953, 40954,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    40955, 40956, 40957, 40958, 40959, 40960, 40961, 40962,
+    40963, 40964,    -1,    -1,    -1,    -1,    -1,    -1,
+     8197,  8198,  8199,  8200,  8201,  8202,  8203,  8204,
+     8205,  8206,  8207,  8208,  8209,  8210,  8211,  8212,
+     8213,  8214,  8215,  8216,  8217,  8218,  8219,  8220,
+     8221,  8222,  8223,  8224,  8225,  8226,  8227,  8228,
+     8229,  8230,  8231,  8232,  8233,  8234,  8235,  8236,
+     8237,  8238,  8239,  8240,  8241,  8242,  8243,  8244,
+     8245,  8246,  8247,  8248,  8249,  8250,  8251,  8252,
+     8253,  8254,  8255,  8256,  8257,  8258,  8259,  8260,
+     8261,  8262,  8263,  8264,  8265,  8266,  8267,  8268,
+     8269,  8270,  8271,  8272,  8273,  8274,  8275,  8276,
+     8277,  8278,  8279,  8280,  8281,  8282,  8283,  8284,
+     8285,  8286,  8287,  8288,  8289,  8290,  8291,  8292,
+     8293,  8294,  8295,  8296,  8297,  8298,  8299,  8300,
+     8301,  8302,  8303,  8304,  8305,  8306,  8307,  8308,
+     8309,  8310,  8311,  8312,  8313,  8314,  8315,  8316,
+     8317,  8318,  8319,  8320,  8321,  8322,  8323,  8324,
+     8325,  8326,  8327,  8328,  8329,  8330,  8331,  8332,
+     8333,  8334,  8335,  8336,  8337,  8338,  8339,  8340,
+     8341,  8342,  8343,  8344,  8345,  8346,  8347,  8348,
+     8349,  8350,  8351,  8352,  8353,  8354,  8355,  8356,
+     8357,  8358,  8359,  8360,  8361,  8362,  8363,  8364,
+     8365,  8366,  8367,  8368,  8369,  8370,  8371,  8372,
+     8373,  8374,  8375,  8376,  8377,  8378,  8379,  8380,
+     8381,  8382,  8383,  8384,  8385,  8386,  8387,  8388,
+     8389,  8390,  8391,  8392,  8393,  8394,  8395,  8396,
+     8397,  8398,  8399,  8400,  8401,  8402,  8403,  8404,
+     8405,  8406,  8407,  8408,  8409,  8410,  8411,  8412,
+     8413,  8414,  8415,  8416,  8417,  8418,  8419,  8420,
+     8421,  8422,  8423,  8424,  8425,  8426,  8427,  8428,
+     8429,  8430,  8431,  8432,  8433,  8434,  8435,  8436,
+     8437,  8438,  8439,  8440,  8441,  8442,  8443,  8444,
+     8445,  8446,  8447,  8448,  8449,  8450,  8451,  8452,
+     8453,  8454,  8455,  8456,  8457,  8458,  8459,  8460,
+     8461,  8462,  8463,  8464,  8465,  8466,  8467,  8468,
+     8469,  8470,  8471,  8472,  8473,  8474,  8475,  8476,
+     8477,  8478,  8479,  8480,  8481,  8482,  8483,  8484,
+     8485,  8486,  8487,  8488,  8489,  8490,  8491,  8492,
+     8493,  8494,  8495,  8496,  8497,  8498,  8499,  8500,
+     8501,  8502,  8503,  8504,  8505,  8506,  8507,  8508,
+     8509,  8510,  8511,  8512,  8513,  8514,  8515,  8516,
+     8517,  8518,  8519,  8520,  8521,  8522,  8523,  8524,
+     8525,  8526,  8527,  8528,  8529,  8530,  8531,  8532,
+     8533,  8534,  8535,  8536,  8537,  8538,  8539,  8540,
+     8541,  8542,  8543,  8544,  8545,  8546,  8547,  8548,
+     8549,  8550,  8551,  8552,  8553,  8554,  8555,  8556,
+     8557,  8558,  8559,  8560,  8561,  8562,  8563,  8564,
+     8565,  8566,  8567,  8568,  8569,  8570,  8571,  8572,
+     8573,  8574,  8575,  8576,  8577,  8578,  8579,  8580,
+     8581,  8582,  8583,  8584,  8585,  8586,  8587,  8588,
+     8589,  8590,  8591,  8592,  8593,  8594,  8595,  8596,
+     8597,  8598,  8599,  8600,  8601,  8602,  8603,  8604,
+     8605,  8606,  8607,  8608,  8609,  8610,  8611,  8612,
+     8613,  8614,  8615,  8616,  8617,  8618,  8619,  8620,
+     8621,  8622,  8623,  8624,  8625,  8626,  8627,  8628,
+     8629,  8630,  8631,  8632,  8633,  8634,  8635,  8636,
+     8637,  8638,  8639,  8640,  8641,  8642,  8643,  8644,
+     8645,  8646,  8647,  8648,  8649,  8650,  8651,  8652,
+     8653,  8654,  8655,  8656,  8657,  8658,  8659,  8660,
+     8661,  8662,  8663,  8664,  8665,  8666,  8667,  8668,
+     8669,  8670,  8671,  8672,  8673,  8674,  8675,  8676,
+     8677,  8678,  8679,  8680,  8681,  8682,  8683,  8684,
+     8685,  8686,  8687,  8688,  8689,  8690,  8691,  8692,
+     8693,  8694,  8695,  8696,  8697,  8698,  8699,  8700,
+     8701,  8702,  8703,  8704,  8705,  8706,  8707,  8708,
+     8709,  8710,  8711,  8712,  8713,  8714,  8715,  8716,
+     8717,  8718,  8719,  8720,  8721,  8722,  8723,  8724,
+     8725,  8726,  8727,  8728,  8729,  8730,  8731,  8732,
+     8733,  8734,  8735,  8736,  8737,  8738,    -1,    -1
   }
 };
diff --git a/tp/Texinfo/XS/gnulib/lib/unistd.in.h 
b/tp/Texinfo/XS/gnulib/lib/unistd.in.h
index 3222f5a568..20b1356fd3 100644
--- a/tp/Texinfo/XS/gnulib/lib/unistd.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/unistd.in.h
@@ -399,7 +399,7 @@ _GL_WARN_ON_USE (chown, "chown fails to follow symlinks on 
some systems and "
 #   undef close
 #   define close rpl_close
 #  endif
-_GL_FUNCDECL_RPL (close, int, (int fd));
+_GL_FUNCDECL_RPL (close, int, (int fd), );
 _GL_CXXALIAS_RPL (close, int, (int fd));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -446,7 +446,7 @@ _GL_CXXALIASWARN (close);
 #  endif
 _GL_FUNCDECL_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
-                                             size_t len, unsigned flags));
+                                             size_t len, unsigned flags), );
 _GL_CXXALIAS_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
                                              size_t len, unsigned flags));
@@ -454,7 +454,7 @@ _GL_CXXALIAS_RPL (copy_file_range, ssize_t, (int ifd, off_t 
*ipos,
 #  if !@HAVE_COPY_FILE_RANGE@
 _GL_FUNCDECL_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
-                                             size_t len, unsigned flags));
+                                             size_t len, unsigned flags), );
 #  endif
 _GL_CXXALIAS_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
@@ -521,7 +521,7 @@ _GL_CXXALIASWARN (dup);
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup2 rpl_dup2
 #  endif
-_GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd));
+_GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd), );
 _GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -570,11 +570,11 @@ _GL_CXXALIASWARN (dup2);
 #   undef dup3
 #   define dup3 rpl_dup3
 #  endif
-_GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags));
+_GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags), );
 _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags));
 # else
 #  if !@HAVE_DUP3@
-_GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags));
+_GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags), );
 #  endif
 _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags));
 # endif
@@ -1045,11 +1045,11 @@ _GL_WARN_ON_USE (fchownat, "fchownat is not portable - "
 #   undef fdatasync
 #   define fdatasync rpl_fdatasync
 #  endif
-_GL_FUNCDECL_RPL (fdatasync, int, (int fd));
+_GL_FUNCDECL_RPL (fdatasync, int, (int fd), );
 _GL_CXXALIAS_RPL (fdatasync, int, (int fd));
 # else
 #  if !@HAVE_FDATASYNC@|| !@HAVE_DECL_FDATASYNC@
-_GL_FUNCDECL_SYS (fdatasync, int, (int fd));
+_GL_FUNCDECL_SYS (fdatasync, int, (int fd), );
 #  endif
 _GL_CXXALIAS_SYS (fdatasync, int, (int fd));
 # endif
@@ -1071,7 +1071,7 @@ _GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - "
    See POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html>.  */
 # if !@HAVE_FSYNC@
-_GL_FUNCDECL_SYS (fsync, int, (int fd));
+_GL_FUNCDECL_SYS (fsync, int, (int fd), );
 # endif
 _GL_CXXALIAS_SYS (fsync, int, (int fd));
 _GL_CXXALIASWARN (fsync);
@@ -1223,11 +1223,11 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is 
unportable - "
 #   undef getdtablesize
 #   define getdtablesize rpl_getdtablesize
 #  endif
-_GL_FUNCDECL_RPL (getdtablesize, int, (void));
+_GL_FUNCDECL_RPL (getdtablesize, int, (void), );
 _GL_CXXALIAS_RPL (getdtablesize, int, (void));
 # else
 #  if !@HAVE_GETDTABLESIZE@
-_GL_FUNCDECL_SYS (getdtablesize, int, (void));
+_GL_FUNCDECL_SYS (getdtablesize, int, (void), );
 #  endif
 /* Need to cast, because on AIX, the parameter list is
                                            (...).  */
@@ -1360,7 +1360,7 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable 
- "
      $USERNAME               on native Windows platforms.
  */
 # if !@HAVE_DECL_GETLOGIN@
-_GL_FUNCDECL_SYS (getlogin, char *, (void));
+_GL_FUNCDECL_SYS (getlogin, char *, (void), );
 # endif
 _GL_CXXALIAS_SYS (getlogin, char *, (void));
 _GL_CXXALIASWARN (getlogin);
@@ -1421,13 +1421,13 @@ _GL_WARN_ON_USE (getlogin_r, "getlogin_r is unportable 
- "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getpagesize rpl_getpagesize
 #  endif
-_GL_FUNCDECL_RPL (getpagesize, int, (void));
+_GL_FUNCDECL_RPL (getpagesize, int, (void), );
 _GL_CXXALIAS_RPL (getpagesize, int, (void));
 # else
 /* On HP-UX, getpagesize exists, but it is not declared in <unistd.h> even if
    the compiler options -D_HPUX_SOURCE -D_XOPEN_SOURCE=600 are used.  */
 #  if defined __hpux
-_GL_FUNCDECL_SYS (getpagesize, int, (void));
+_GL_FUNCDECL_SYS (getpagesize, int, (void), );
 #  endif
 #  if !@HAVE_GETPAGESIZE@
 #   if !defined getpagesize
@@ -1559,11 +1559,11 @@ _GL_CXXALIASWARN (getpid);
 #    undef getusershell
 #    define getusershell rpl_getusershell
 #  endif
-_GL_FUNCDECL_RPL (getusershell, char *, (void));
+_GL_FUNCDECL_RPL (getusershell, char *, (void), );
 _GL_CXXALIAS_RPL (getusershell, char *, (void));
 # else
 #  if !@HAVE_DECL_GETUSERSHELL@
-_GL_FUNCDECL_SYS (getusershell, char *, (void));
+_GL_FUNCDECL_SYS (getusershell, char *, (void), );
 #  endif
 _GL_CXXALIAS_SYS (getusershell, char *, (void));
 # endif
@@ -1583,11 +1583,11 @@ _GL_WARN_ON_USE (getusershell, "getusershell is 
unportable - "
 #    undef setusershell
 #    define setusershell rpl_setusershell
 #  endif
-_GL_FUNCDECL_RPL (setusershell, void, (void));
+_GL_FUNCDECL_RPL (setusershell, void, (void), );
 _GL_CXXALIAS_RPL (setusershell, void, (void));
 # else
 #  if !@HAVE_DECL_GETUSERSHELL@
-_GL_FUNCDECL_SYS (setusershell, void, (void));
+_GL_FUNCDECL_SYS (setusershell, void, (void), );
 #  endif
 _GL_CXXALIAS_SYS (setusershell, void, (void));
 # endif
@@ -1608,11 +1608,11 @@ _GL_WARN_ON_USE (setusershell, "setusershell is 
unportable - "
 #    undef endusershell
 #    define endusershell rpl_endusershell
 #  endif
-_GL_FUNCDECL_RPL (endusershell, void, (void));
+_GL_FUNCDECL_RPL (endusershell, void, (void), );
 _GL_CXXALIAS_RPL (endusershell, void, (void));
 # else
 #  if !@HAVE_DECL_GETUSERSHELL@
-_GL_FUNCDECL_SYS (endusershell, void, (void));
+_GL_FUNCDECL_SYS (endusershell, void, (void), );
 #  endif
 _GL_CXXALIAS_SYS (endusershell, void, (void));
 # endif
@@ -1629,7 +1629,7 @@ _GL_WARN_ON_USE (endusershell, "endusershell is 
unportable - "
 #if @GNULIB_GROUP_MEMBER@
 /* Determine whether group id is in calling user's group list.  */
 # if !@HAVE_GROUP_MEMBER@
-_GL_FUNCDECL_SYS (group_member, int, (gid_t gid));
+_GL_FUNCDECL_SYS (group_member, int, (gid_t gid), );
 # endif
 _GL_CXXALIAS_SYS (group_member, int, (gid_t gid));
 _GL_CXXALIASWARN (group_member);
@@ -1649,7 +1649,7 @@ _GL_WARN_ON_USE (group_member, "group_member is 
unportable - "
 #   define isatty rpl_isatty
 #  endif
 #  define GNULIB_defined_isatty 1
-_GL_FUNCDECL_RPL (isatty, int, (int fd));
+_GL_FUNCDECL_RPL (isatty, int, (int fd), );
 _GL_CXXALIAS_RPL (isatty, int, (int fd));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1792,7 +1792,7 @@ _GL_WARN_ON_USE (linkat, "linkat is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define lseek rpl_lseek
 #  endif
-_GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence));
+_GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence), );
 _GL_CXXALIAS_RPL (lseek, off_t, (int fd, off_t offset, int whence));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -2161,11 +2161,11 @@ _GL_WARN_ON_USE (sethostname, "sethostname is 
unportable - "
 #   undef sleep
 #   define sleep rpl_sleep
 #  endif
-_GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n));
+_GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n), );
 _GL_CXXALIAS_RPL (sleep, unsigned int, (unsigned int n));
 # else
 #  if !@HAVE_SLEEP@
-_GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n));
+_GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n), );
 #  endif
 _GL_CXXALIAS_SYS (sleep, unsigned int, (unsigned int n));
 # endif
@@ -2409,11 +2409,11 @@ _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - "
 #   undef usleep
 #   define usleep rpl_usleep
 #  endif
-_GL_FUNCDECL_RPL (usleep, int, (useconds_t n));
+_GL_FUNCDECL_RPL (usleep, int, (useconds_t n), );
 _GL_CXXALIAS_RPL (usleep, int, (useconds_t n));
 # else
 #  if !@HAVE_USLEEP@
-_GL_FUNCDECL_SYS (usleep, int, (useconds_t n));
+_GL_FUNCDECL_SYS (usleep, int, (useconds_t n), );
 #  endif
 /* Need to cast, because on Haiku, the first parameter is
                                      unsigned int n.  */
diff --git a/tp/Texinfo/XS/gnulib/lib/uniwidth/width0.h 
b/tp/Texinfo/XS/gnulib/lib/uniwidth/width0.h
index 6cc35536ad..2edbe2403e 100644
--- a/tp/Texinfo/XS/gnulib/lib/uniwidth/width0.h
+++ b/tp/Texinfo/XS/gnulib/lib/uniwidth/width0.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Table of non-spacing or control characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-static const unsigned char nonspacing_table_data[48*64] = {
+static const unsigned char nonspacing_table_data[49*64] = {
   /* 0x0000-0x01ff */
   0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
@@ -57,7 +57,7 @@ static const unsigned char nonspacing_table_data[48*64] = {
   /* 0x0800-0x09ff */
   0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */
   0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
-  0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
+  0x00, 0x00, 0x80, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
   0x00, 0xfc, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */
   0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */
   0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
@@ -258,14 +258,14 @@ static const unsigned char nonspacing_table_data[48*64] = 
{
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c80-0x10cbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10cc0-0x10cff */
   0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, /* 0x10d00-0x10d3f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10d40-0x10d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, /* 0x10d40-0x10d7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10d80-0x10dbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10dc0-0x10dff */
   /* 0x10e00-0x10fff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10e00-0x10e3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10e40-0x10e7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, /* 0x10e80-0x10ebf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, /* 0x10ec0-0x10eff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, /* 0x10ec0-0x10eff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10f00-0x10f3f */
   0xc0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10f40-0x10f7f */
   0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10f80-0x10fbf */
@@ -286,8 +286,8 @@ static const unsigned char nonspacing_table_data[48*64] = {
   0x00, 0x00, 0x00, 0x80, 0xf8, 0x07, 0x00, 0x00, /* 0x112c0-0x112ff */
   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, /* 0x11300-0x1133f */
   0x01, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x1f, 0x00, /* 0x11340-0x1137f */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11380-0x113bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x113c0-0x113ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, /* 0x11380-0x113bf */
+  0x01, 0x40, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, /* 0x113c0-0x113ff */
   /* 0x11400-0x115ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11400-0x1143f */
   0x5c, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0x11440-0x1147f */
@@ -302,7 +302,7 @@ static const unsigned char nonspacing_table_data[48*64] = {
   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11640-0x1167f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xbf, 0x00, /* 0x11680-0x116bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x116c0-0x116ff */
-  0x00, 0x00, 0x00, 0xe0, 0xbc, 0x0f, 0x00, 0x00, /* 0x11700-0x1173f */
+  0x00, 0x00, 0x00, 0xa0, 0xbc, 0x0f, 0x00, 0x00, /* 0x11700-0x1173f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11740-0x1177f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11780-0x117bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x117c0-0x117ff */
@@ -339,7 +339,7 @@ static const unsigned char nonspacing_table_data[48*64] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11e80-0x11ebf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, /* 0x11ec0-0x11eff */
   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07, /* 0x11f00-0x11f3f */
-  0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11f40-0x11f7f */
+  0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, /* 0x11f40-0x11f7f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11f80-0x11fbf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11fc0-0x11fff */
   /* 0x13400-0x135ff */
@@ -351,6 +351,15 @@ static const unsigned char nonspacing_table_data[48*64] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13540-0x1357f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13580-0x135bf */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x135c0-0x135ff */
+  /* 0x16000-0x161ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16000-0x1603f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16040-0x1607f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16080-0x160bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x160c0-0x160ff */
+  0x00, 0x00, 0x00, 0xc0, 0xff, 0xe3, 0x00, 0x00, /* 0x16100-0x1613f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16140-0x1617f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16180-0x161bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x161c0-0x161ff */
   /* 0x16a00-0x16bff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a00-0x16a3f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a40-0x16a7f */
@@ -440,7 +449,7 @@ static const unsigned char nonspacing_table_data[48*64] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e500-0x1e53f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e540-0x1e57f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e580-0x1e5bf */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e5c0-0x1e5ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, /* 0x1e5c0-0x1e5ff */
   /* 0x1e800-0x1e9ff */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e800-0x1e83f */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e840-0x1e87f */
@@ -474,13 +483,13 @@ static const signed char nonspacing_table_ind[248] = {
   -1, -1, 36, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */
-  -1, -1, -1, -1, -1, 37, -1, 38, /* 0x16000-0x16fff */
+  37, -1, -1, -1, -1, 38, -1, 39, /* 0x16000-0x16fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */
   -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
-  -1, -1, -1, -1, -1, -1, 39, -1, /* 0x1b000-0x1bfff */
-  -1, -1, -1, -1, -1, -1, -1, 40, /* 0x1c000-0x1cfff */
-  41, 42, -1, -1, -1, 43, -1, -1, /* 0x1d000-0x1dfff */
-  44, 45, 46, -1, 47, -1, -1, -1  /* 0x1e000-0x1efff */
+  -1, -1, -1, -1, -1, -1, 40, -1, /* 0x1b000-0x1bfff */
+  -1, -1, -1, -1, -1, -1, -1, 41, /* 0x1c000-0x1cfff */
+  42, 43, -1, -1, -1, 44, -1, -1, /* 0x1d000-0x1dfff */
+  45, 46, 47, -1, 48, -1, -1, -1  /* 0x1e000-0x1efff */
 };
diff --git a/tp/Texinfo/XS/gnulib/lib/uniwidth/width2.h 
b/tp/Texinfo/XS/gnulib/lib/uniwidth/width2.h
index 47979b5d7e..f919989b3e 100644
--- a/tp/Texinfo/XS/gnulib/lib/uniwidth/width2.h
+++ b/tp/Texinfo/XS/gnulib/lib/uniwidth/width2.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Width 2 property of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 15.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
 
 /* Copyright (C) 2000-2024 Free Software Foundation, Inc.
 
diff --git a/tp/Texinfo/XS/gnulib/lib/utimens.c 
b/tp/Texinfo/XS/gnulib/lib/utimens.c
index 6b9f62a53c..3c81b5c349 100644
--- a/tp/Texinfo/XS/gnulib/lib/utimens.c
+++ b/tp/Texinfo/XS/gnulib/lib/utimens.c
@@ -78,6 +78,21 @@ static int utimensat_works_really;
 static int lutimensat_works_really;
 #endif /* HAVE_UTIMENSAT || HAVE_FUTIMENS */
 
+static bool
+is_valid_timespec (struct timespec const *timespec)
+{
+  return (timespec->tv_nsec == UTIME_NOW
+          || timespec->tv_nsec == UTIME_OMIT
+          || (0 <= timespec->tv_nsec && timespec->tv_nsec < TIMESPEC_HZ));
+}
+
+static bool
+is_valid_timespecs (struct timespec const timespec[2])
+{
+  return (is_valid_timespec (&timespec[0])
+          && is_valid_timespec (&timespec[1]));
+}
+
 /* Validate the requested timestamps.  Return 0 if the resulting
    timespec can be used for utimensat (after possibly modifying it to
    work around bugs in utimensat).  Return a positive value if the
@@ -90,14 +105,7 @@ validate_timespec (struct timespec timespec[2])
 {
   int result = 0;
   int utime_omit_count = 0;
-  if ((timespec[0].tv_nsec != UTIME_NOW
-       && timespec[0].tv_nsec != UTIME_OMIT
-       && ! (0 <= timespec[0].tv_nsec
-             && timespec[0].tv_nsec < TIMESPEC_HZ))
-      || (timespec[1].tv_nsec != UTIME_NOW
-          && timespec[1].tv_nsec != UTIME_OMIT
-          && ! (0 <= timespec[1].tv_nsec
-                && timespec[1].tv_nsec < TIMESPEC_HZ)))
+  if (!is_valid_timespecs (timespec))
     {
       errno = EINVAL;
       return -1;
@@ -520,8 +528,20 @@ fdutimens (int fd, char const *file, struct timespec const 
timespec[2])
    TIMESPEC[0] and TIMESPEC[1], respectively.  */
 int
 utimens (char const *file, struct timespec const timespec[2])
+#undef utimens
 {
+#if HAVE_UTIMENS
+  /* NetBSD's native utimens() does not fulfil the Gnulib expectations:
+     At least in NetBSD 10.0, it does not validate the timespec argument.  */
+  if (timespec != NULL && !is_valid_timespecs (timespec))
+    {
+      errno = EINVAL;
+      return -1;
+    }
+  return utimens (file, timespec);
+#else
   return fdutimens (-1, file, timespec);
+#endif
 }
 
 /* Set the access and modification timestamps of FILE to be
@@ -530,7 +550,18 @@ utimens (char const *file, struct timespec const 
timespec[2])
    changing symlink timestamps, but FILE was a symlink.  */
 int
 lutimens (char const *file, struct timespec const timespec[2])
+#undef lutimens
 {
+#if HAVE_LUTIMENS
+  /* NetBSD's native lutimens() does not fulfil the Gnulib expectations:
+     At least in NetBSD 10.0, it does not validate the timespec argument.  */
+  if (timespec != NULL && !is_valid_timespecs (timespec))
+    {
+      errno = EINVAL;
+      return -1;
+    }
+  return lutimens (file, timespec);
+#else
   struct timespec adjusted_timespec[2];
   struct timespec *ts = timespec ? adjusted_timespec : NULL;
   int adjustment_needed = 0;
@@ -550,11 +581,11 @@ lutimens (char const *file, struct timespec const 
timespec[2])
      fdutimens' worry about buggy NFS clients.  But we do have to
      worry about bogus return values.  */
 
-#if HAVE_UTIMENSAT
+# if HAVE_UTIMENSAT
   if (0 <= lutimensat_works_really)
     {
       int result;
-# if defined __linux__ || defined __sun || defined __NetBSD__
+#  if defined __linux__ || defined __sun || defined __NetBSD__
       /* As recently as Linux kernel 2.6.32 (Dec 2009), several file
          systems (xfs, ntfs-3g) have bugs with a single UTIME_OMIT,
          but work if both times are either explicitly specified or
@@ -579,9 +610,9 @@ lutimens (char const *file, struct timespec const 
timespec[2])
           /* Note that st is good, in case utimensat gives ENOSYS.  */
           adjustment_needed++;
         }
-# endif
+#  endif
       result = utimensat (AT_FDCWD, file, ts, AT_SYMLINK_NOFOLLOW);
-# ifdef __linux__
+#  ifdef __linux__
       /* Work around a kernel bug:
          https://bugzilla.redhat.com/show_bug.cgi?id=442352
          https://bugzilla.redhat.com/show_bug.cgi?id=449910
@@ -591,7 +622,7 @@ lutimens (char const *file, struct timespec const 
timespec[2])
          are no longer in common use.  */
       if (0 < result)
         errno = ENOSYS;
-# endif
+#  endif
       if (result == 0 || errno != ENOSYS)
         {
           utimensat_works_really = 1;
@@ -600,7 +631,7 @@ lutimens (char const *file, struct timespec const 
timespec[2])
         }
     }
   lutimensat_works_really = -1;
-#endif /* HAVE_UTIMENSAT */
+# endif /* HAVE_UTIMENSAT */
 
   /* The platform lacks an interface to set file timestamps with
      nanosecond resolution, so do the best we can, discarding any
@@ -616,7 +647,7 @@ lutimens (char const *file, struct timespec const 
timespec[2])
 
   /* On Linux, lutimes is a thin wrapper around utimensat, so there is
      no point trying lutimes if utimensat failed with ENOSYS.  */
-#if HAVE_LUTIMES && !HAVE_UTIMENSAT
+# if HAVE_LUTIMES && !HAVE_UTIMENSAT
   {
     struct timeval timeval[2];
     struct timeval *t;
@@ -636,7 +667,7 @@ lutimens (char const *file, struct timespec const 
timespec[2])
     if (result == 0 || errno != ENOSYS)
       return result;
   }
-#endif /* HAVE_LUTIMES && !HAVE_UTIMENSAT */
+# endif /* HAVE_LUTIMES && !HAVE_UTIMENSAT */
 
   /* Out of luck for symlinks, but we still handle regular files.  */
   if (!(adjustment_needed || REPLACE_FUNC_STAT_FILE) && lstat (file, &st))
@@ -645,4 +676,5 @@ lutimens (char const *file, struct timespec const 
timespec[2])
     return fdutimens (-1, file, ts);
   errno = ENOSYS;
   return -1;
+#endif
 }
diff --git a/tp/Texinfo/XS/gnulib/lib/utimens.h 
b/tp/Texinfo/XS/gnulib/lib/utimens.h
index b20d4f4f7e..762c3f9a85 100644
--- a/tp/Texinfo/XS/gnulib/lib/utimens.h
+++ b/tp/Texinfo/XS/gnulib/lib/utimens.h
@@ -24,12 +24,24 @@
 
 #include <time.h>
 
+#if HAVE_UTIMENS || HAVE_LUTIMENS
+# include <sys/time.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 int fdutimens (int, char const *, struct timespec const [2]);
+
+#if HAVE_UTIMENS
+# define utimens rpl_utimens
+#endif
 int utimens (char const *, struct timespec const [2]);
+
+#if HAVE_LUTIMENS
+# define lutimens rpl_lutimens
+#endif
 int lutimens (char const *, struct timespec const [2]);
 
 #ifdef __cplusplus
diff --git a/tp/Texinfo/XS/gnulib/lib/wchar.in.h 
b/tp/Texinfo/XS/gnulib/lib/wchar.in.h
index ac7cb00fc7..54354559ef 100644
--- a/tp/Texinfo/XS/gnulib/lib/wchar.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/wchar.in.h
@@ -325,11 +325,11 @@ _GL_WARN_ON_USE (wctob, "wctob is unportable - "
 #   undef mbsinit
 #   define mbsinit rpl_mbsinit
 #  endif
-_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps));
+_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps), );
 _GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps));
 # else
 #  if !@HAVE_MBSINIT@
-_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps));
+_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps), );
 #  endif
 _GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps));
 # endif
@@ -556,7 +556,7 @@ _GL_CXXALIASWARN (mbszero);
 #  endif
 _GL_FUNCDECL_RPL (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
-                   mbstate_t *restrict ps));
+                   mbstate_t *restrict ps), );
 _GL_CXXALIAS_RPL (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
                    mbstate_t *restrict ps));
@@ -564,7 +564,7 @@ _GL_CXXALIAS_RPL (mbrtowc, size_t,
 #  if !@HAVE_MBRTOWC@
 _GL_FUNCDECL_SYS (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
-                   mbstate_t *restrict ps));
+                   mbstate_t *restrict ps), );
 #  endif
 _GL_CXXALIAS_SYS (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
@@ -590,13 +590,13 @@ _GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - "
 #   define mbrlen rpl_mbrlen
 #  endif
 _GL_FUNCDECL_RPL (mbrlen, size_t,
-                  (const char *restrict s, size_t n, mbstate_t *restrict ps));
+                  (const char *restrict s, size_t n, mbstate_t *restrict ps), 
);
 _GL_CXXALIAS_RPL (mbrlen, size_t,
                   (const char *restrict s, size_t n, mbstate_t *restrict ps));
 # else
 #  if !@HAVE_MBRLEN@
 _GL_FUNCDECL_SYS (mbrlen, size_t,
-                  (const char *restrict s, size_t n, mbstate_t *restrict ps));
+                  (const char *restrict s, size_t n, mbstate_t *restrict ps), 
);
 #  endif
 _GL_CXXALIAS_SYS (mbrlen, size_t,
                   (const char *restrict s, size_t n, mbstate_t *restrict ps));
@@ -703,13 +703,13 @@ _GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - "
 #   define wcrtomb rpl_wcrtomb
 #  endif
 _GL_FUNCDECL_RPL (wcrtomb, size_t,
-                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
+                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps), );
 _GL_CXXALIAS_RPL (wcrtomb, size_t,
                   (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
 # else
 #  if !@HAVE_WCRTOMB@
 _GL_FUNCDECL_SYS (wcrtomb, size_t,
-                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
+                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps), );
 #  endif
 _GL_CXXALIAS_SYS (wcrtomb, size_t,
                   (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
@@ -910,7 +910,7 @@ _GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - "
 # if !@HAVE_WMEMCPY@
 _GL_FUNCDECL_SYS (wmemcpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wmemcpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -932,7 +932,7 @@ _GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - "
 #if @GNULIB_WMEMMOVE@
 # if !@HAVE_WMEMMOVE@
 _GL_FUNCDECL_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
+                  (wchar_t *dest, const wchar_t *src, size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wmemmove, wchar_t *,
                   (wchar_t *dest, const wchar_t *src, size_t n));
@@ -958,7 +958,7 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 _GL_CXXALIAS_RPL (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
                    const wchar_t *restrict src, size_t n));
@@ -966,7 +966,7 @@ _GL_CXXALIAS_RPL (wmempcpy, wchar_t *,
 #  if !@HAVE_WMEMPCPY@
 _GL_FUNCDECL_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 #  endif
 _GL_CXXALIAS_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -987,7 +987,7 @@ _GL_WARN_ON_USE (wmempcpy, "wmempcpy is unportable - "
 /* Set N wide characters of S to C.  */
 #if @GNULIB_WMEMSET@
 # if !@HAVE_WMEMSET@
-_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
+_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
 # if __GLIBC__ >= 2
@@ -1044,7 +1044,7 @@ _GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - "
 #if @GNULIB_WCSCPY@
 # if !@HAVE_WCSCPY@
 _GL_FUNCDECL_SYS (wcscpy, wchar_t *,
-                  (wchar_t *restrict dest, const wchar_t *restrict src));
+                  (wchar_t *restrict dest, const wchar_t *restrict src), );
 # endif
 _GL_CXXALIAS_SYS (wcscpy, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src));
@@ -1067,7 +1067,7 @@ _GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - "
    the global namespace.  */
 # if !@HAVE_WCPCPY@ || (defined __sun && defined __cplusplus)
 _GL_FUNCDECL_SYS (wcpcpy, wchar_t *,
-                  (wchar_t *restrict dest, const wchar_t *restrict src));
+                  (wchar_t *restrict dest, const wchar_t *restrict src), );
 # endif
 _GL_CXXALIAS_SYS (wcpcpy, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src));
@@ -1086,7 +1086,7 @@ _GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - "
 # if !@HAVE_WCSNCPY@
 _GL_FUNCDECL_SYS (wcsncpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wcsncpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -1112,7 +1112,7 @@ _GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - "
 # if !@HAVE_WCPNCPY@ || (defined __sun && defined __cplusplus)
 _GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wcpncpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -1131,7 +1131,7 @@ _GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
 #if @GNULIB_WCSCAT@
 # if !@HAVE_WCSCAT@
 _GL_FUNCDECL_SYS (wcscat, wchar_t *,
-                  (wchar_t *restrict dest, const wchar_t *restrict src));
+                  (wchar_t *restrict dest, const wchar_t *restrict src), );
 # endif
 _GL_CXXALIAS_SYS (wcscat, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src));
@@ -1152,7 +1152,7 @@ _GL_WARN_ON_USE (wcscat, "wcscat is unportable - "
 # if !@HAVE_WCSNCAT@
 _GL_FUNCDECL_SYS (wcsncat, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src,
-                   size_t n));
+                   size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wcsncat, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src,
@@ -1277,7 +1277,7 @@ _GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable 
- "
    category of the current locale.  */
 #if @GNULIB_WCSCOLL@
 # if !@HAVE_WCSCOLL@
-_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
+_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2), );
 # endif
 _GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
 # if __GLIBC__ >= 2
@@ -1298,7 +1298,7 @@ _GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - "
 #if @GNULIB_WCSXFRM@
 # if !@HAVE_WCSXFRM@
 _GL_FUNCDECL_SYS (wcsxfrm, size_t,
-                  (wchar_t *restrict s1, const wchar_t *restrict s2, size_t 
n));
+                  (wchar_t *restrict s1, const wchar_t *restrict s2, size_t 
n), );
 # endif
 _GL_CXXALIAS_SYS (wcsxfrm, size_t,
                   (wchar_t *restrict s1, const wchar_t *restrict s2, size_t 
n));
@@ -1592,7 +1592,7 @@ _GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
-                   wchar_t **restrict ptr));
+                   wchar_t **restrict ptr), );
 _GL_CXXALIAS_RPL (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
                    wchar_t **restrict ptr));
@@ -1600,7 +1600,7 @@ _GL_CXXALIAS_RPL (wcstok, wchar_t *,
 #  if !@HAVE_WCSTOK@
 _GL_FUNCDECL_SYS (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
-                   wchar_t **restrict ptr));
+                   wchar_t **restrict ptr), );
 #  endif
 _GL_CXXALIAS_SYS (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
@@ -1704,7 +1704,7 @@ _GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - "
    Possible errno values include:
      - ERANGE if SIZE is too small.
      - ENOMEM if the memory could no be allocated.  */
-_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size));
+_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size), );
 #endif
 
 
diff --git a/tp/Texinfo/XS/gnulib/lib/wctype.in.h 
b/tp/Texinfo/XS/gnulib/lib/wctype.in.h
index efa77594d5..3cb2e55c83 100644
--- a/tp/Texinfo/XS/gnulib/lib/wctype.in.h
+++ b/tp/Texinfo/XS/gnulib/lib/wctype.in.h
@@ -478,9 +478,9 @@ towupper
 #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #     define iswblank rpl_iswblank
 #    endif
-_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc), );
 #   else
-_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
+_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -490,7 +490,7 @@ _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
 #     undef iswdigit
 #     define iswdigit rpl_iswdigit
 #    endif
-_GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -500,7 +500,7 @@ _GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc));
 #     undef iswpunct
 #     define iswpunct rpl_iswpunct
 #    endif
-_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -510,7 +510,7 @@ _GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc));
 #     undef iswxdigit
 #     define iswxdigit rpl_iswxdigit
 #    endif
-_GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -689,11 +689,11 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - "
 #   undef iswctype
 #   define iswctype rpl_iswctype
 #  endif
-_GL_FUNCDECL_RPL (iswctype, int, (wint_t wc, wctype_t desc));
+_GL_FUNCDECL_RPL (iswctype, int, (wint_t wc, wctype_t desc), );
 _GL_CXXALIAS_RPL (iswctype, int, (wint_t wc, wctype_t desc));
 # else
 #  if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc));
+_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc), );
 #  endif
 _GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc));
 # endif
@@ -771,11 +771,11 @@ _GL_WARN_ON_USE (wctrans, "wctrans is unportable - "
 #   undef towctrans
 #   define towctrans rpl_towctrans
 #  endif
-_GL_FUNCDECL_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc));
+_GL_FUNCDECL_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc), );
 _GL_CXXALIAS_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc));
 # else
 #  if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
+_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc), );
 #  endif
 _GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
 # endif
diff --git a/tp/Texinfo/XS/gnulib/m4/acl.m4 b/tp/Texinfo/XS/gnulib/m4/acl.m4
index be88f1b831..69135f9884 100644
--- a/tp/Texinfo/XS/gnulib/m4/acl.m4
+++ b/tp/Texinfo/XS/gnulib/m4/acl.m4
@@ -1,5 +1,5 @@
 # acl.m4
-# serial 31
+# serial 33
 dnl Copyright (C) 2002, 2004-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,9 +15,12 @@ AC_DEFUN([gl_FUNC_ACL_ARG],
   AC_ARG_ENABLE([acl],
     AS_HELP_STRING([[--disable-acl]], [do not support ACLs]),
     , [enable_acl=auto])
+  AC_ARG_WITH([libsmack],
+    [AS_HELP_STRING([--without-libsmack],
+       [do not use libsmack, even on systems that have it])]
+    [], [with_libsmack=maybe])
 ])
 
-
 AC_DEFUN_ONCE([gl_FUNC_ACL],
 [
   AC_REQUIRE([gl_FUNC_ACL_ARG])
@@ -189,9 +192,35 @@ AC_DEFUN([gl_FILE_HAS_ACL],
   AC_CHECK_HEADERS_ONCE([linux/xattr.h])
   AC_CHECK_FUNCS_ONCE([listxattr])
   FILE_HAS_ACL_LIB=
-  AS_CASE([$enable_acl,$ac_cv_header_linux_xattr_h,$ac_cv_func_listxattr],
-    [no,*,*], [],
-    [*,yes,yes], [],
+
+  gl_file_has_acl_uses_smack=no
+  
AS_CASE([$enable_acl,$with_libsmack,$ac_cv_header_linux_xattr_h,$ac_cv_func_listxattr],
+    [no,* | *,no,*], [],
+    [*,*,yes,yes],
+      [AC_CHECK_HEADER([sys/smack.h],
+         [gl_saved_LIBS=$LIBS
+          AC_SEARCH_LIBS([smack_new_label_from_path], [smack],
+            [AC_DEFINE([HAVE_SMACK], [1],
+               [Define to 1 if libsmack is usable.])
+             AS_CASE([$ac_cv_search_smack_new_label_from_path],
+               ["none required"], [],
+               [FILE_HAS_ACL_LIB=$ac_cv_search_new_label_from_path])
+             gl_file_has_acl_uses_smack=yes],
+            [AS_CASE([$with_libsmack],
+               [yes], [AC_MSG_ERROR([libsmack not found or unusable])])])
+          LIBS=$gl_saved_LIBS])])
+
+  gl_file_has_acl_uses_selinux=no
+  
AS_CASE([$enable_acl,$with_selinux,$ac_cv_header_linux_xattr_h,$ac_cv_func_listxattr],
+    [no,* | *,no,*], [],
+    [*,*,yes,yes],
+      [AC_REQUIRE([gl_CHECK_HEADER_SELINUX_SELINUX_H])
+       AS_IF([test $USE_SELINUX_SELINUX_H = 1],
+         [FILE_HAS_ACL_LIB="$FILE_HAS_ACL_LIB $LIB_SELINUX"
+          gl_file_has_acl_uses_selinux=yes])])
+
+  
AS_CASE([$enable_acl,$gl_file_has_acl_uses_selinux,$gl_file_has_acl_uses_smack],
+    [no,* | *,yes,* | *,yes], [],
     [*],
       [dnl Set gl_need_lib_has_acl to a nonempty value, so that any
        dnl later gl_FUNC_ACL call will set FILE_HAS_ACL_LIB=$LIB_ACL.
diff --git a/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4 
b/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4
index d985522893..e40bb9ddc4 100644
--- a/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4
+++ b/tp/Texinfo/XS/gnulib/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4
-# serial 103
+# serial 104
 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -842,6 +842,35 @@ AC_DEFUN([gl_COMMON_BODY], [
 #  define _GL_UNUSED_LABEL
 # endif
 #endif
+
+/* The following attributes enable detection of multithread-safety problems
+   and resource leaks at compile-time, by clang ≥ 15, when the warning option
+   -Wthread-safety is enabled.  For usage, see
+   <https://clang.llvm.org/docs/ThreadSafetyAnalysis.html>.  */
+#ifndef _GL_ATTRIBUTE_CAPABILITY_TYPE
+# if __clang_major__ >= 15
+#  define _GL_ATTRIBUTE_CAPABILITY_TYPE(concept) \
+     __attribute__ ((__capability__ (concept)))
+#else
+#  define _GL_ATTRIBUTE_CAPABILITY_TYPE(concept)
+# endif
+#endif
+#ifndef _GL_ATTRIBUTE_ACQUIRE_CAPABILITY
+# if __clang_major__ >= 15
+#  define _GL_ATTRIBUTE_ACQUIRE_CAPABILITY(resource) \
+     __attribute__ ((__acquire_capability__ (resource)))
+# else
+#  define _GL_ATTRIBUTE_ACQUIRE_CAPABILITY(resource)
+# endif
+#endif
+#ifndef _GL_ATTRIBUTE_RELEASE_CAPABILITY
+# if __clang_major__ >= 15
+#  define _GL_ATTRIBUTE_RELEASE_CAPABILITY(resource) \
+     __attribute__ ((__release_capability__ (resource)))
+# else
+#  define _GL_ATTRIBUTE_RELEASE_CAPABILITY(resource)
+# endif
+#endif
 ])
   AH_VERBATIM([c_linkage],
 [/* In C++, there is the concept of "language linkage", that encompasses
diff --git a/tp/Texinfo/XS/gnulib/m4/gnulib-comp.m4 
b/tp/Texinfo/XS/gnulib/m4/gnulib-comp.m4
index 728b2c1f84..62832f7e1b 100644
--- a/tp/Texinfo/XS/gnulib/m4/gnulib-comp.m4
+++ b/tp/Texinfo/XS/gnulib/m4/gnulib-comp.m4
@@ -676,32 +676,32 @@ AC_DEFUN([gl_INIT],
   gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.11], 
[unicase/empty-suffix-context])
   AC_REQUIRE([AC_C_INLINE])
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/tolower])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/toupper])
-  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-tolower])
-  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-toupper])
-  gl_LIBUNISTRING_LIBHEADER([1.2], [unictype.h])
+  gl_LIBUNISTRING_MODULE([1.3], [unicase/tolower])
+  gl_LIBUNISTRING_MODULE([1.3], [unicase/toupper])
+  gl_LIBUNISTRING_MODULE([1.3], [unicase/u8-tolower])
+  gl_LIBUNISTRING_MODULE([1.3], [unicase/u8-toupper])
+  gl_LIBUNISTRING_LIBHEADER([1.3], [unictype.h])
   gl_UNICTYPE_H
   gl_UNICTYPE_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_UNICTYPE_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.2], [unictype/category-L])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [unictype/category-L])
   gl_UNICTYPE_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-M])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [unictype/category-M])
   gl_UNICTYPE_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Mn])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [unictype/category-Mn])
   gl_UNICTYPE_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [unictype/category-Nd])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [unictype/category-Nd])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-test])
-  gl_LIBUNISTRING_MODULE([1.1], [unictype/combining-class])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/combining-class])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([1.2], [unictype/ctype-print])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-print])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-upper])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-upper])
   AC_REQUIRE([AC_C_INLINE])
   gl_UNICTYPE_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.2], [unictype/property-alphabetic])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [unictype/property-alphabetic])
   AC_REQUIRE([AC_C_INLINE])
   gl_UNICTYPE_H_REQUIRE_DEFAULTS
   gl_LIBUNISTRING_MODULE_WITH_VARIABLE([0.9.8], 
[unictype/property-join-control])
@@ -713,18 +713,18 @@ AC_DEFUN([gl_INIT],
   gl_UNINORM_H
   gl_UNINORM_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_MODULE([1.1], [uninorm/canonical-decomposition])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/composition])
-  gl_LIBUNISTRING_MODULE([1.1], [uninorm/decomposition])
+  gl_LIBUNISTRING_MODULE([1.3], [uninorm/canonical-decomposition])
+  gl_LIBUNISTRING_MODULE([1.3], [uninorm/composition])
+  gl_LIBUNISTRING_MODULE([1.3], [uninorm/decomposition])
   AC_REQUIRE([AC_C_INLINE])
   gl_UNINORM_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfc])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [uninorm/nfc])
   gl_UNINORM_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfd])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [uninorm/nfd])
   gl_UNINORM_H_REQUIRE_DEFAULTS
-  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.1], [uninorm/nfkd])
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE([1.3], [uninorm/nfkd])
   gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize])
-  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normalize])
+  gl_LIBUNISTRING_MODULE([1.3], [uninorm/u8-normalize])
   gl_UNISTD_H
   gl_UNISTD_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
@@ -764,9 +764,9 @@ AC_DEFUN([gl_INIT],
   ])
   gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h])
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_MODULE([1.2], [uniwidth/u8-strwidth])
-  gl_LIBUNISTRING_MODULE([1.2], [uniwidth/u8-width])
-  gl_LIBUNISTRING_MODULE([1.2], [uniwidth/width])
+  gl_LIBUNISTRING_MODULE([1.3], [uniwidth/u8-strwidth])
+  gl_LIBUNISTRING_MODULE([1.3], [uniwidth/u8-width])
+  gl_LIBUNISTRING_MODULE([1.3], [uniwidth/width])
   gl_FUNC_UNSETENV
   gl_CONDITIONAL([GL_COND_OBJ_UNSETENV],
                  [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1])
@@ -1183,6 +1183,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/uninorm.in.h
   lib/uninorm/canonical-decomposition.c
   lib/uninorm/compat-decomposition.c
+  lib/uninorm/composition-table-bounds.h
   lib/uninorm/composition-table.gperf
   lib/uninorm/composition.c
   lib/uninorm/decompose-internal.c
diff --git a/tp/Texinfo/XS/gnulib/m4/unictype_h.m4 
b/tp/Texinfo/XS/gnulib/m4/unictype_h.m4
index 477fec995d..f36204a8c9 100644
--- a/tp/Texinfo/XS/gnulib/m4/unictype_h.m4
+++ b/tp/Texinfo/XS/gnulib/m4/unictype_h.m4
@@ -1,5 +1,5 @@
 # unictype_h.m4
-# serial 3
+# serial 4
 dnl Copyright (C) 2023-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -108,6 +108,7 @@ AC_DEFUN([gl_UNICTYPE_H_REQUIRE_DEFAULTS],
     
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE],
 ['LIBUNISTRING_DLL_VARIABLE'])
     
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE],
 ['LIBUNISTRING_DLL_VARIABLE'])
     
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE],
 ['LIBUNISTRING_DLL_VARIABLE'])
+    
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE],
 ['LIBUNISTRING_DLL_VARIABLE'])
     
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE],
 ['LIBUNISTRING_DLL_VARIABLE'])
     
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE],
 ['LIBUNISTRING_DLL_VARIABLE'])
     
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE],
 ['LIBUNISTRING_DLL_VARIABLE'])
diff --git a/tp/Texinfo/XS/gnulib/m4/utimens.m4 
b/tp/Texinfo/XS/gnulib/m4/utimens.m4
index 9996e3ef33..b8200deaa2 100644
--- a/tp/Texinfo/XS/gnulib/m4/utimens.m4
+++ b/tp/Texinfo/XS/gnulib/m4/utimens.m4
@@ -1,5 +1,5 @@
 # utimens.m4
-# serial 16
+# serial 17
 dnl Copyright (C) 2003-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -16,6 +16,7 @@ AC_DEFUN([gl_UTIMENS],
   gl_CHECK_FUNCS_ANDROID([lutimes], [[#include <sys/time.h>]])
   gl_CHECK_FUNCS_ANDROID([futimens], [[#include <sys/stat.h>]])
   gl_CHECK_FUNCS_ANDROID([utimensat], [[#include <sys/stat.h>]])
+  AC_CHECK_FUNCS_ONCE([utimens lutimens])
 
   if test $ac_cv_func_futimens = no && test $ac_cv_func_futimesat = yes; then
     dnl FreeBSD 8.0-rc2 mishandles futimesat(fd,NULL,time).  It is not



reply via email to

[Prev in Thread] Current Thread [Next in Thread]