diff -pruN 20211114-1/.appveyor.yml 20220701-1/.appveyor.yml
--- 20211114-1/.appveyor.yml	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/.appveyor.yml	2022-07-02 02:05:04.000000000 +0000
@@ -16,6 +16,7 @@ matrix:
 
 install:
   - call %MBASH% "pacman --noconfirm -S --needed base-devel"
+  - call %MBASH% "pacman --noconfirm -S autoconf automake libtool"
   - call %MBASH% "python -m ensurepip --default-pip"
   - call %MBASH% "python -m pip install setuptools wheel"
 build_script:
diff -pruN 20211114-1/AUTHORS 20220701-1/AUTHORS
--- 20211114-1/AUTHORS	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/AUTHORS	2022-07-02 02:05:04.000000000 +0000
@@ -13,8 +13,9 @@ David Corbett	  <dscorbett>
 genisysram	  <genisysram>
 orbea		  <orbea>
 Naohiro Aota	  gentoo.org
+Biswapriyo Nath	  <Biswa96>
 
-French Nameslist:
+Contributions à la version en langue française :
 	Jacques André, France
 	Patrick Andries, Canada (Québec)
 	Bernard Chauvois, France
diff -pruN 20211114-1/buildnameslist.c 20220701-1/buildnameslist.c
--- 20211114-1/buildnameslist.c	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/buildnameslist.c	2022-07-02 02:05:04.000000000 +0000
@@ -42,13 +42,23 @@ static const char *lgv[2] = { NL_VERSION
 
 
 static int printcopyright2credits(FILE *out) {
-    fprintf( out, "; Ces noms français sont utilisés pour confectionner\n");
-    fprintf( out, ";\tles commentaires documentant chacun des caractères\n");
+    fprintf( out, "; Liste des noms des caractères (version en langue française)\n\n");
+    fprintf( out, "; Le Consortium Unicode entretient une collaboration étroite\n");
+    fprintf( out, ";\tet une liaison officielle avec le groupe de travail qui élabore\n");
+    fprintf( out, ";\tla norme internationale ISO/CEI 10646. Le standard Unicode, version %s,\n", NFR_VERSION);
+    fprintf( out, ";\tintègre 838 nouveaux caractères, dont neuf idéogrammes unifiés CJC.\n\n");
+    fprintf( out, "; Le présent fichier peut être utilisé librement. Toutefois, aucune\n");
+    fprintf( out, ";\tmodification n’y est autorisée ; toutes les copies doivent être\n");
+    fprintf( out, ";\trigoureusement identiques au fichier original.\n\n");
+    fprintf( out, "; Le Consortium Unicode n’est pas responsable des erreurs ou omissions\n");
+    fprintf( out, ";\tdans ce fichier.\n\n");
+    fprintf( out, "; Les noms en langue française des caractères codés sont utilisés, notamment,\n");
+    fprintf( out, ";\tpour produire les commentaires documentant chacun des caractères\n");
     fprintf( out, ";\tdont les poids de tri sont déterminés dans la table commune\n");
-    fprintf( out, ";\tde la norme internationale ISO/CEI 14651. Cette dernière table\n");
-    fprintf( out, ";\test normative. La présente liste est informative, jusqu’à ce que\n");
-    fprintf( out, ";\tl’ISO/CEI 10646 ait été remise à niveau en français.\n;\n");
-    fprintf( out, "; Contributions à la version %s française des noms de caractère :\n", NFR_VERSION);
+    fprintf( out, ";\tde la norme internationale ISO/CEI 14651. Ladite table est normative ;\n");
+    fprintf( out, ";\tla présente liste est informative, jusqu’à ce que la norme\n");
+    fprintf( out, ";\tISO/CEI 10646 ait été remise à niveau en français.\n\n");
+    fprintf( out, "; Contributions à la version en langue française : %s\n", NFR_VERSION);
     fprintf( out, ";\tJacques André, France\n");
     fprintf( out, ";\tPatrick Andries, Canada (Québec)\n");
     fprintf( out, ";\tBernard Chauvois, France\n");
@@ -165,8 +175,8 @@ static int ReadNamesList(void) {
     int i, j;
     static char *nameslistfiles[] = { "NamesList.txt", "ListeDesNoms.txt", NULL };
     static char *nameslistlocs[] = {
-	"http://www.unicode.org/Public/UNIDATA/NamesList.txt",
-	"http://hapax.qc.ca/ListeNoms-14.0.0.txt (latin base char set)"
+	"http://www.unicode.org/Public/15.0.0/ucd/NamesList-15.0.0d5.txt",
+	"http://hapax.qc.ca/ListeNoms-14.0.0.txt (charset=UTF-8)"
     };
 
     buffer[sizeof(buffer)-1]=0;
@@ -494,12 +504,12 @@ static int dumpinit(FILE *out, FILE *hea
 	fprintf( out, "\t\telse if ( lang==0 )\n\t\t\t*bn1=*bn0;\n\t}\n\treturn( error );\n}\n\n\n" );
     }
 
-    fprintf( out, "static const struct unicode_nameannot nullarray%s[] = {\n", lg[l] );
+    fprintf( out, "UN_DLL_LOCAL\nstatic const struct unicode_nameannot nullarray%s[] = {\n", lg[l] );
     for ( i=0; i<256/4 ; ++i )
 	fprintf( out, "\t{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },\n" );
     fprintf( out, "\t{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }\n" );
     fprintf( out, "};\n\n" );
-    fprintf( out, "static const struct unicode_nameannot nullarray2%s[] = {\n", lg[l] );
+    fprintf( out, "UN_DLL_LOCAL\nstatic const struct unicode_nameannot nullarray2%s[] = {\n", lg[l] );
     for ( i=0; i<256/4 ; ++i )
 	fprintf( out, "\t{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },\n" );
     fprintf( out, "\t{ NULL, NULL }, { NULL, NULL },\n" );
@@ -511,7 +521,7 @@ static int dumpinit(FILE *out, FILE *hea
 	fprintf( out, "\t{ NULL, \"\t* the value ?FFFF is guaranteed not to be a Unicode character at all\" },\n" );
     }
     fprintf( out, "};\n\n" );
-    fprintf( out, "static const struct unicode_nameannot * const nullnullarray%s[] = {\n", lg[l] );
+    fprintf( out, "UN_DLL_LOCAL\nstatic const struct unicode_nameannot * const nullnullarray%s[] = {\n", lg[l] );
     for ( i=0; i<256/8 ; ++i )
 	fprintf( out, "\tnullarray%s, nullarray%s, nullarray%s, nullarray%s, nullarray%s, nullarray%s, nullarray%s, nullarray%s,\n", \
 			lg[l], lg[l], lg[l], lg[l], lg[l], lg[l], lg[l], lg[l] );
@@ -691,7 +701,7 @@ static int dumparrays(FILE *out, FILE *h
 	    }
 	    if ( t==256 || (j==0xff && t==0xfe -1))
 	continue;	/* Empty sub-plane */
-	    fprintf( out, "static const struct unicode_nameannot %s%s_%02X_%02X[] = {\n", prefix, lg[l], i, j );
+	    fprintf( out, "UN_DLL_LOCAL\nstatic const struct unicode_nameannot %s%s_%02X_%02X[] = {\n", prefix, lg[l], i, j );
 	    for ( k=0; k<256; ++k ) {
 		fprintf( out, "/* %04X */ { ", (i<<16) + (j<<8) + k );
 		if ( uninames[is_fr][(i<<16) + (j<<8) + k]==NULL )
@@ -715,7 +725,7 @@ static int dumparrays(FILE *out, FILE *h
 	break;
 	if ( t==0xFFFE )
     continue;		/* Empty plane */
-	fprintf( out, "static const struct unicode_nameannot * const %s%s_%02X[] = {\n", prefix, lg[l], i );
+	fprintf( out, "UN_DLL_LOCAL\nstatic const struct unicode_nameannot * const %s%s_%02X[] = {\n", prefix, lg[l], i );
 	for ( j=0; j<256; ++j ) {
 	    for ( t=0; t<256; ++t ) {
 		if ( uninames[is_fr][(i<<16) + (j<<8) + t]!=NULL || uniannot[is_fr][(i<<16) + (j<<8) + t]!=NULL )
diff -pruN 20211114-1/ChangeLog 20220701-1/ChangeLog
--- 20211114-1/ChangeLog	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/ChangeLog	2022-07-02 02:05:04.000000000 +0000
@@ -1,3 +1,9 @@
+- 2022-Jul-01
+    * Unicode 15.0_Beta (Nameslist.txt 15_Beta for review until Jul12).
+    * Biswapriyo Nath added Windows MSYS2 build (used by github tests),
+      this also helped identify some more nameslist-dll.h clang fixes.
+    * orbea fixed Makefile.am bug fixing Gentoo Bugs 779670 and 792474.
+
 - 2021-Nov-14
     * Version 1.10, Unicode 14.0 and French version 1.5 now is at 14.0.
     * Gentoo Bug 781716 & Debian Bug 989173, -O0 patch by Naohiro Aota.
diff -pruN 20211114-1/configure.ac 20220701-1/configure.ac
--- 20211114-1/configure.ac	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/configure.ac	2022-07-02 02:05:04.000000000 +0000
@@ -4,13 +4,13 @@ AC_PREREQ([2.64])
 #-------------------------------------------
 # PackageTimestamp, major version, minor version, and Nameslist.txt version
 # Libraries have a "package" version of the form major.minor.micro.
-m4_define([uninameslist_package_stamp], [20211114]) dnl yyyymmdd
+m4_define([uninameslist_package_stamp], [20220701]) dnl yyyymmdd
 m4_define([uninameslist_major_version], [14]) dnl Nameslist.txt
-m4_define([uninameslist_minor_version], [0])
+m4_define([uninameslist_minor_version], [9])
 m4_define([uninameslist_nameslist_ver], [uninameslist_major_version.uninameslist_minor_version])
 # Libraries have a "libtool" version of the form current:revision:age.
 m4_define([uninameslist_current], [1])
-m4_define([uninameslist_revision],[10])
+m4_define([uninameslist_revision],[11])
 m4_define([uninameslist_age],     [0])
 m4_define([uninameslist_libver],
           [uninameslist_current:uninameslist_revision:uninameslist_age])
@@ -78,6 +78,7 @@ AC_PROG_MAKE_SET
 AC_PROG_SED
 AC_CHECK_TOOL([WGET],[wget],[:])
 AC_CHECK_TOOL([STRIP],[strip],[:])
+AC_CHECK_TOOL([TOUCH],[touch],[:])
 AC_PROG_INSTALL
 
 #-------------------------------------------
@@ -177,6 +178,7 @@ AX_CHECK_COMPILE_FLAG([-Wpointer-arith],
 AX_CHECK_COMPILE_FLAG([-Wcast-qual],[WCFLAGS="$WCFLAGS -Wcast-qual"])
 AX_CHECK_COMPILE_FLAG([-Wcast-align],[WCFLAGS="$WCFLAGS -Wcast-align"])
 AX_CHECK_COMPILE_FLAG([-Wpadded],[WCFLAGS="$WCFLAGS -Wpadded"])
+AX_CHECK_COMPILE_FLAG([-Wno-attributes],[WCFLAGS="$WCFLAGS -Wno-attributes"])
 
 dnl currently for extra testing
 dnl   AX_CHECK_COMPILE_FLAG([-fPIC],[WCFLAGS="$WCFLAGS -fPIC"])
@@ -225,10 +227,18 @@ AC_SUBST([WUNLIB])
 
 #-------------------------------------------
 # Ensure fresh timestamps if run ./configure
-echo 'const char NL_VERSION[[]] = "uninameslist_nameslist_ver";' > buildnameslist.h
-echo 'const char NFR_VERSION[[]] = "uninameslist_fr_nameslist_ver";' >> buildnameslist.h
-echo 'const char NL_VERSION[[]] = "Nameslist-Version: uninameslist_nameslist_ver";' > tests/call-test.h
-echo 'const char NFR_VERSION[[]] = "Nameslist-Version: uninameslist_fr_nameslist_ver";' >> tests/call-test.h
+echo 'const char NL_VERSION[[]] = "uninameslist_nameslist_ver";' > $(srcdir)/buildnameslist.h
+echo 'const char NFR_VERSION[[]] = "uninameslist_fr_nameslist_ver";' >> $(srcdir)/buildnameslist.h
+echo 'const char NL_VERSION[[]] = "Nameslist-Version: uninameslist_nameslist_ver";' > $(srcdir)/tests/call-test.h
+echo 'const char NFR_VERSION[[]] = "Nameslist-Version: uninameslist_fr_nameslist_ver";' >> $(srcdir)/tests/call-test.h
+
+#-------------------------------------------
+# We need to ensure the libuninameslist core
+# library is always built whenever we modify
+# parameters by running ./configure anything
+# Example: with/without "--enable-frenchlib"
+# So we touch nameslist.c to make it recent.
+${TOUCH} $(srcdir)/nameslist.c
 
 #-------------------------------------------
 AC_PROG_LIBTOOL
diff -pruN 20211114-1/debian/changelog 20220701-1/debian/changelog
--- 20211114-1/debian/changelog	2021-11-19 15:46:12.000000000 +0000
+++ 20220701-1/debian/changelog	2022-07-31 11:43:39.000000000 +0000
@@ -1,3 +1,11 @@
+libuninameslist (20220701-1) unstable; urgency=medium
+
+  * New upstream release 20220701
+  * debian/control
+    - Set Standards-Version: 4.6.1 with no changes
+
+ -- Hideki Yamane <henrich@debian.org>  Sun, 31 Jul 2022 20:43:39 +0900
+
 libuninameslist (20211114-1) unstable; urgency=medium
 
   * New upstream release 20211114
diff -pruN 20211114-1/debian/control 20220701-1/debian/control
--- 20211114-1/debian/control	2021-11-19 15:46:12.000000000 +0000
+++ 20220701-1/debian/control	2022-07-31 11:43:39.000000000 +0000
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Fonts Task Force <debian-fonts@lists.debian.org>
 Uploaders: Hideki Yamane <henrich@debian.org>
 Build-Depends: debhelper-compat (= 13),
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Section: libs
 Homepage: https://github.com/fontforge/libuninameslist
 Vcs-Git: https://salsa.debian.org/fonts-team/libuninameslist.git
diff -pruN 20211114-1/.github/workflows/main.yml 20220701-1/.github/workflows/main.yml
--- 20211114-1/.github/workflows/main.yml	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/.github/workflows/main.yml	2022-07-02 02:05:04.000000000 +0000
@@ -46,3 +46,34 @@ jobs:
         run: make
       - name: Test library
         run: make check
+  windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        include: [
+          { msystem: MINGW64, toolchain: mingw-w64-x86_64-toolchain },
+          { msystem: MINGW32, toolchain: mingw-w64-i686-toolchain },
+          { msystem: UCRT64, toolchain: mingw-w64-ucrt-x86_64-toolchain },
+          { msystem: CLANG64, toolchain: mingw-w64-clang-x86_64-toolchain },
+      ]
+    name: ${{ matrix.msystem }}
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.msystem }}
+          update: true
+          install: autotools base-devel git ${{ matrix.toolchain }}
+      - name: Create configure
+        run: |
+          autoreconf -i
+          automake
+      - name: Choose configure
+        run: ./configure
+      - name: Make library
+        run: make
+      - name: Test library
+        run: make check
diff -pruN 20211114-1/Makefile.am 20220701-1/Makefile.am
--- 20211114-1/Makefile.am	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/Makefile.am	2022-07-02 02:05:04.000000000 +0000
@@ -44,25 +44,21 @@ lib_LTLIBRARIES += libuninameslist.la
 
 include_HEADERS = uninameslist.h
 libuninameslist_la_LIBADD =
-EXTRA_libuninameslist_la_DEPENDENCIES =
 man_MANS = libuninameslist.3
 noinst_HEADERS = nameslist-dll.h
-LIBADD =
 
 if WANTLIBOFR
 include_HEADERS += uninameslist-fr.h
 libuninameslist_fr_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(FR_VERSION)
 libuninameslist_fr_la_SOURCES = nameslist-fr.c
 libuninameslist_fr_la.$(OBJEXT): uninameslist-fr.h nameslist-dll.h buildnameslist.h
-libuninameslist_la_LIBADD += -luninameslist-fr
-EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la
+libuninameslist_la_LIBADD += libuninameslist-fr.la
 man_MANS += libuninameslist-fr.3
-LIBADD += -luninameslist-fr
 else
 EXTRA_DIST += nameslist-fr.c uninameslist-fr.h libuninameslist-fr.3
 endif
 
-libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) $(LIBADD) -version-info $(UN_VERSION)
+libuninameslist_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(UN_VERSION)
 libuninameslist_la_SOURCES = nameslist.c
 libuninameslist_la.$(OBJEXT): uninameslist.h nameslist-dll.h buildnameslist.h
 
diff -pruN 20211114-1/nameslist.c 20220701-1/nameslist.c
--- 20211114-1/nameslist.c	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/nameslist.c	2022-07-02 02:05:04.000000000 +0000
@@ -123,27 +123,27 @@ const char * uniNamesList_blockName(int
 /* Return count of how many names2 are found in this version of library */
 UN_DLL_EXPORT
 int uniNamesList_names2cnt(void) {
-	return( 30 );
+	return( 31 );
 }
 
 static const unsigned long unicode_name2code[] = {
 	0x01A2, 0x01A3, 0x0709, 0x0CDE, 0x0E9D, 0x0E9F, 0x0EA3, 0x0EA5,
-	0x0FD0, 0x11EC, 0x11ED, 0x11EE, 0x11EF, 0x2118, 0x2448, 0x2449,
-	0x2B7A, 0x2B7C, 0xA015, 0xAA6E, 0xFE18, 0xFEFF, 74452, 74453,
-	93782, 93783, 93814, 93815, 110593, 118981
+	0x0FD0, 0x11EC, 0x11ED, 0x11EE, 0x11EF, 0x1BBD, 0x2118, 0x2448,
+	0x2449, 0x2B7A, 0x2B7C, 0xA015, 0xAA6E, 0xFE18, 0xFEFF, 74452,
+	74453, 93782, 93783, 93814, 93815, 110593, 118981
 };
 
 static const char unicode_name2vals[] = {
 	3,24, 3,22, 3,34, 3,19, 3,17, 3,17, 3,13, 3,13,
-	3,35, 3,32, 3,37, 3,30, 3,33, 3,29, 3,17, 3,16,
-	3,59, 3,60, 3,26, 3,25, 3,61, 3,15, 3,24, 3,42,
-	3,28, 3,29, 3,26, 3,27, 3,21, 3,52
+	3,35, 3,32, 3,37, 3,30, 3,33, 3,26, 3,29, 3,17,
+	3,16, 3,59, 3,60, 3,26, 3,25, 3,61, 3,15, 3,24,
+	3,42, 3,28, 3,29, 3,26, 3,27, 3,21, 3,52
 };
 
 /* Return unicode value with names2 (0<=count<uniNamesList_names2cnt(). */
 UN_DLL_EXPORT
 long uniNamesList_names2val(int count) {
-	if ( count<0 || count>=30 ) return( -1 );
+	if ( count<0 || count>=31 ) return( -1 );
 	return( (long)(unicode_name2code[count]) );
 }
 
@@ -152,7 +152,7 @@ UN_DLL_EXPORT
 int uniNamesList_names2getU(unsigned long uni) {
 	int i;
 
-	if ( uni<0x110000 ) for ( i=0; i<30; ++i ) {
+	if ( uni<0x110000 ) for ( i=0; i<31; ++i ) {
 		if ( uni==unicode_name2code[i] ) return( i );
 		if ( uni<unicode_name2code[i] ) break;
 	}
@@ -162,7 +162,7 @@ int uniNamesList_names2getU(unsigned lon
 /* Stringlength of names2. Use this if you want to truncate annotations */
 UN_DLL_EXPORT
 int uniNamesList_names2lnC(int count) {
-	if ( count<0 || count>=30 ) return( -1 );
+	if ( count<0 || count>=31 ) return( -1 );
 	return( (int)(unicode_name2vals[(count<<1)+1]) );
 }
 
@@ -177,7 +177,7 @@ const char *uniNamesList_names2anC(int c
 	int c;
 	const char *pt;
 
-	if ( count<0 || count>=30 ) return( NULL );
+	if ( count<0 || count>=31 ) return( NULL );
 	c = unicode_name2vals[count<<1];
 	pt = uniNamesList_annot((unsigned long)(uniNamesList_names2val(count)));
 	while ( --c>=0 ) ++pt;
@@ -355,6 +355,7 @@ int uniNamesList_blockNumberBoth(unsigne
 }
 
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot nullarray[] = {
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
@@ -423,6 +424,7 @@ static const struct unicode_nameannot nu
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot nullarray2[] = {
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
@@ -493,6 +495,7 @@ static const struct unicode_nameannot nu
 	{ NULL, "	* the value ?FFFF is guaranteed not to be a Unicode character at all" },
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const nullnullarray[] = {
 	nullarray, nullarray, nullarray, nullarray, nullarray, nullarray, nullarray, nullarray,
 	nullarray, nullarray, nullarray, nullarray, nullarray, nullarray, nullarray, nullarray,
@@ -740,6 +743,7 @@ const struct unicode_block UnicodeBlock[
 	{ 0x10d00, 0x10d3f, "Hanifi Rohingya" },
 	{ 0x10e60, 0x10e7f, "Rumi Numeral Symbols" },
 	{ 0x10e80, 0x10ebf, "Yezidi" },
+	{ 0x10ec0, 0x10eff, "Arabic Extended-C" },
 	{ 0x10f00, 0x10f2f, "Old Sogdian" },
 	{ 0x10f30, 0x10f6f, "Sogdian" },
 	{ 0x10f70, 0x10faf, "Old Uyghur" },
@@ -771,11 +775,13 @@ const struct unicode_block UnicodeBlock[
 	{ 0x11a50, 0x11aaf, "Soyombo" },
 	{ 0x11ab0, 0x11abf, "Unified Canadian Aboriginal Syllabics Extended-A" },
 	{ 0x11ac0, 0x11aff, "Pau Cin Hau" },
+	{ 0x11b00, 0x11b5f, "Devanagari Extended-A" },
 	{ 0x11c00, 0x11c6f, "Bhaiksuki" },
 	{ 0x11c70, 0x11cbf, "Marchen" },
 	{ 0x11d00, 0x11d5f, "Masaram Gondi" },
 	{ 0x11d60, 0x11daf, "Gunjala Gondi" },
 	{ 0x11ee0, 0x11eff, "Makasar" },
+	{ 0x11f00, 0x11f5f, "Kawi" },
 	{ 0x11fb0, 0x11fbf, "Lisu Supplement" },
 	{ 0x11fc0, 0x11fff, "Tamil Supplement" },
 	{ 0x12000, 0x123ff, "Cuneiform" },
@@ -783,7 +789,7 @@ const struct unicode_block UnicodeBlock[
 	{ 0x12480, 0x1254f, "Early Dynastic Cuneiform" },
 	{ 0x12f90, 0x12fff, "Cypro-Minoan" },
 	{ 0x13000, 0x1342f, "Egyptian Hieroglyphs" },
-	{ 0x13430, 0x1343f, "Egyptian Hieroglyph Format Controls" },
+	{ 0x13430, 0x1345f, "Egyptian Hieroglyph Format Controls" },
 	{ 0x14400, 0x1467f, "Anatolian Hieroglyphs" },
 	{ 0x16800, 0x16a3f, "Bamum Supplement" },
 	{ 0x16a40, 0x16a6f, "Mro" },
@@ -808,6 +814,7 @@ const struct unicode_block UnicodeBlock[
 	{ 0x1d000, 0x1d0ff, "Byzantine Musical Symbols" },
 	{ 0x1d100, 0x1d1ff, "Musical Symbols" },
 	{ 0x1d200, 0x1d24f, "Ancient Greek Musical Notation" },
+	{ 0x1d2c0, 0x1d2df, "Kaktovik Numerals" },
 	{ 0x1d2e0, 0x1d2ff, "Mayan Numerals" },
 	{ 0x1d300, 0x1d35f, "Tai Xuan Jing Symbols" },
 	{ 0x1d360, 0x1d37f, "Counting Rod Numerals" },
@@ -815,9 +822,11 @@ const struct unicode_block UnicodeBlock[
 	{ 0x1d800, 0x1daaf, "Sutton SignWriting" },
 	{ 0x1df00, 0x1dfff, "Latin Extended-G" },
 	{ 0x1e000, 0x1e02f, "Glagolitic Supplement" },
+	{ 0x1e030, 0x1e08f, "Cyrillic Extended-D" },
 	{ 0x1e100, 0x1e14f, "Nyiakeng Puachue Hmong" },
 	{ 0x1e290, 0x1e2bf, "Toto" },
 	{ 0x1e2c0, 0x1e2ff, "Wancho" },
+	{ 0x1e4d0, 0x1e4ff, "Nag Mundari" },
 	{ 0x1e7e0, 0x1e7ff, "Ethiopic Extended-B" },
 	{ 0x1e800, 0x1e8df, "Mende Kikakui" },
 	{ 0x1e900, 0x1e95f, "Adlam" },
@@ -842,13 +851,14 @@ const struct unicode_block UnicodeBlock[
 	{ 0x1fb00, 0x1fbff, "Symbols for Legacy Computing" },
 	{ 0x1ff80, 0x1ffff, "Unassigned" },
 	{ 0x20000, 0x2a6df, "CJK Unified Ideographs Extension B" },
-	{ 0x2a700, 0x2b738, "CJK Unified Ideographs Extension C" },
+	{ 0x2a700, 0x2b739, "CJK Unified Ideographs Extension C" },
 	{ 0x2b740, 0x2b81d, "CJK Unified Ideographs Extension D" },
 	{ 0x2b820, 0x2cea1, "CJK Unified Ideographs Extension E" },
 	{ 0x2ceb0, 0x2ebe0, "CJK Unified Ideographs Extension F" },
 	{ 0x2f800, 0x2fa1f, "CJK Compatibility Ideographs Supplement" },
 	{ 0x2ff80, 0x2ffff, "Unassigned" },
 	{ 0x30000, 0x3134a, "CJK Unified Ideographs Extension G" },
+	{ 0x31350, 0x323af, "CJK Unified Ideographs Extension H" },
 	{ 0x3ff80, 0x3ffff, "Unassigned" },
 	{ 0x4ff80, 0x4ffff, "Unassigned" },
 	{ 0x5ff80, 0x5ffff, "Unassigned" },
@@ -867,6 +877,7 @@ const struct unicode_block UnicodeBlock[
 	{ 0x10ff80, 0x10ffff, "Supplementary Private Use Area-B" }
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_00[] = {
 /* 0000 */ { NULL,"	= NULL"},
 /* 0001 */ { NULL,"	= START OF HEADING"},
@@ -1040,7 +1051,7 @@ static const struct unicode_nameannot un
 	"	x (raised dot - 2E33)\n"
 	"	x (stenographic full stop - 2E3C)\n"
 	"	x (ideographic full stop - 3002)"},
-/* 002F */ { "SOLIDUS","	= slash,forward slash, virgule\n"
+/* 002F */ { "SOLIDUS","	= slash, forward slash, virgule\n"
 	"	x (combining long solidus overlay - 0338)\n"
 	"	x (fraction slash - 2044)\n"
 	"	x (division slash - 2215)\n"
@@ -1530,6 +1541,7 @@ static const struct unicode_nameannot un
 	"	: 0079 0308"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_01[] = {
 /* 0100 */ { "LATIN CAPITAL LETTER A WITH MACRON","	: 0041 0304"},
 /* 0101 */ { "LATIN SMALL LETTER A WITH MACRON","	* Latvian, Latin, ...\n"
@@ -2026,6 +2038,7 @@ static const struct unicode_nameannot un
 /* 01FF */ { "LATIN SMALL LETTER O WITH STROKE AND ACUTE","	: 00F8 0301"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_02[] = {
 /* 0200 */ { "LATIN CAPITAL LETTER A WITH DOUBLE GRAVE","	: 0041 030F"},
 /* 0201 */ { "LATIN SMALL LETTER A WITH DOUBLE GRAVE","	: 0061 030F"},
@@ -2547,6 +2560,7 @@ static const struct unicode_nameannot un
 /* 02FF */ { "MODIFIER LETTER LOW LEFT ARROW",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_03[] = {
 /* 0300 */ { "COMBINING GRAVE ACCENT","	= Greek varia\n"
 	"	* Pinyin: marks Mandarin Chinese fourth tone\n"
@@ -2970,6 +2984,7 @@ static const struct unicode_nameannot un
 /* 03FF */ { "GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL","	= antisigma periestigmenon"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_04[] = {
 /* 0400 */ { "CYRILLIC CAPITAL LETTER IE WITH GRAVE","	: 0415 0300"},
 /* 0401 */ { "CYRILLIC CAPITAL LETTER IO","	: 0415 0308"},
@@ -3283,6 +3298,7 @@ static const struct unicode_nameannot un
 /* 04FF */ { "CYRILLIC SMALL LETTER HA WITH STROKE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_05[] = {
 /* 0500 */ { "CYRILLIC CAPITAL LETTER KOMI DE",NULL},
 /* 0501 */ { "CYRILLIC SMALL LETTER KOMI DE",NULL},
@@ -3568,6 +3584,7 @@ static const struct unicode_nameannot un
 /* 05FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_06[] = {
 /* 0600 */ { "ARABIC NUMBER SIGN",NULL},
 /* 0601 */ { "ARABIC SIGN SANAH",NULL},
@@ -3722,10 +3739,14 @@ static const struct unicode_nameannot un
 	"	* use the sequence 0627 065F instead"},
 /* 0674 */ { "ARABIC LETTER HIGH HAMZA","	* Kazakh, Jawi\n"
 	"	* forms digraphs"},
-/* 0675 */ { "ARABIC LETTER HIGH HAMZA ALEF","	# 0627 0674"},
-/* 0676 */ { "ARABIC LETTER HIGH HAMZA WAW","	# 0648 0674"},
-/* 0677 */ { "ARABIC LETTER U WITH HAMZA ABOVE","	# 06C7 0674"},
-/* 0678 */ { "ARABIC LETTER HIGH HAMZA YEH","	# 064A 0674"},
+/* 0675 */ { "ARABIC LETTER HIGH HAMZA ALEF","	* preferred spelling is 0674 0627\n"
+	"	# 0627 0674"},
+/* 0676 */ { "ARABIC LETTER HIGH HAMZA WAW","	* preferred spelling is 0674 0648\n"
+	"	# 0648 0674"},
+/* 0677 */ { "ARABIC LETTER U WITH HAMZA ABOVE","	* preferred spelling is 0674 06C7\n"
+	"	# 06C7 0674"},
+/* 0678 */ { "ARABIC LETTER HIGH HAMZA YEH","	* preferred spelling is 0674 0649\n"
+	"	# 064A 0674"},
 /* 0679 */ { "ARABIC LETTER TTEH","	* Urdu"},
 /* 067A */ { "ARABIC LETTER TTEHEH","	* Sindhi"},
 /* 067B */ { "ARABIC LETTER BEEH","	* Sindhi"},
@@ -3890,6 +3911,7 @@ static const struct unicode_nameannot un
 /* 06FF */ { "ARABIC LETTER HEH WITH INVERTED V",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_07[] = {
 /* 0700 */ { "SYRIAC END OF PARAGRAPH","	* marks the end of a paragraph"},
 /* 0701 */ { "SYRIAC SUPRALINEAR FULL STOP","	* marks interrogations, imperatives, and pauses, especially in Biblical texts"},
@@ -4164,6 +4186,7 @@ static const struct unicode_nameannot un
 /* 07FF */ { "NKO TAMAN SIGN","	x (nko letter ta - 07D5)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_08[] = {
 /* 0800 */ { "SAMARITAN LETTER ALAF",NULL},
 /* 0801 */ { "SAMARITAN LETTER BIT",NULL},
@@ -4402,7 +4425,7 @@ static const struct unicode_nameannot un
 /* 08DA */ { "ARABIC SMALL HIGH WORD ATH-THALATHA",NULL},
 /* 08DB */ { "ARABIC SMALL HIGH WORD AS-SAJDA",NULL},
 /* 08DC */ { "ARABIC SMALL HIGH WORD AN-NISF",NULL},
-/* 08DD */ { "ARABIC SMALL HIGH WORD SAKTA",NULL},
+/* 08DD */ { "ARABIC SMALL HIGH WORD SAKTA","	x (arabic small low word sakta - 10EFD)"},
 /* 08DE */ { "ARABIC SMALL HIGH WORD QIF",NULL},
 /* 08DF */ { "ARABIC SMALL HIGH WORD WAQFA",NULL},
 /* 08E0 */ { "ARABIC SMALL HIGH FOOTNOTE MARKER",NULL},
@@ -4439,6 +4462,7 @@ static const struct unicode_nameannot un
 /* 08FF */ { "ARABIC MARK SIDEWAYS NOON GHUNNA",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_09[] = {
 /* 0900 */ { "DEVANAGARI SIGN INVERTED CANDRABINDU","	= vaidika adhomukha candrabindu"},
 /* 0901 */ { "DEVANAGARI SIGN CANDRABINDU","	= anunasika\n"
@@ -4727,6 +4751,7 @@ static const struct unicode_nameannot un
 /* 09FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_0A[] = {
 /* 0A00 */ { NULL,NULL},
 /* 0A01 */ { "GURMUKHI SIGN ADAK BINDI",NULL},
@@ -4991,6 +5016,7 @@ static const struct unicode_nameannot un
 /* 0AFF */ { "GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_0B[] = {
 /* 0B00 */ { NULL,NULL},
 /* 0B01 */ { "ORIYA SIGN CANDRABINDU",NULL},
@@ -5270,6 +5296,7 @@ static const struct unicode_nameannot un
 /* 0BFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_0C[] = {
 /* 0C00 */ { "TELUGU SIGN COMBINING CANDRABINDU ABOVE",NULL},
 /* 0C01 */ { "TELUGU SIGN CANDRABINDU","	= arasunna\n"
@@ -5409,7 +5436,7 @@ static const struct unicode_nameannot un
 /* 0C7F */ { "TELUGU SIGN TUUMU",NULL},
 /* 0C80 */ { "KANNADA SIGN SPACING CANDRABINDU",NULL},
 /* 0C81 */ { "KANNADA SIGN CANDRABINDU",NULL},
-/* 0C82 */ { "KANNADA SIGN ANUSVARA",NULL},
+/* 0C82 */ { "KANNADA SIGN ANUSVARA","	* used in Konkani, Havyaka Kannada (Havigannada) and Awadhi texts to indicate regular anusvara"},
 /* 0C83 */ { "KANNADA SIGN VISARGA",NULL},
 /* 0C84 */ { "KANNADA SIGN SIDDHAM","	= siddhirastu\n"
 	"	* used at the beginning of texts as an invocation\n"
@@ -5529,7 +5556,7 @@ static const struct unicode_nameannot un
 /* 0CF0 */ { NULL,NULL},
 /* 0CF1 */ { "KANNADA SIGN JIHVAMULIYA","	x (vedic sign jihvamuliya - 1CF5)"},
 /* 0CF2 */ { "KANNADA SIGN UPADHMANIYA","	x (vedic sign upadhmaniya - 1CF6)"},
-/* 0CF3 */ { NULL,NULL},
+/* 0CF3 */ { "KANNADA SIGN COMBINING ANUSVARA ABOVE RIGHT","	* used in Konkani, Havyaka Kannada (Havigannada) and Awadhi texts to indicate anunāsikā"},
 /* 0CF4 */ { NULL,NULL},
 /* 0CF5 */ { NULL,NULL},
 /* 0CF6 */ { NULL,NULL},
@@ -5544,6 +5571,7 @@ static const struct unicode_nameannot un
 /* 0CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_0D[] = {
 /* 0D00 */ { "MALAYALAM SIGN COMBINING ANUSVARA ABOVE",NULL},
 /* 0D01 */ { "MALAYALAM SIGN CANDRABINDU",NULL},
@@ -5820,6 +5848,7 @@ static const struct unicode_nameannot un
 /* 0DFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_0E[] = {
 /* 0E00 */ { NULL,NULL},
 /* 0E01 */ { "THAI CHARACTER KO KAI",NULL},
@@ -5905,7 +5934,7 @@ static const struct unicode_nameannot un
 	"	x (khmer sign toandakhiat - 17CD)"},
 /* 0E4D */ { "THAI CHARACTER NIKHAHIT","	= nikkhahit\n"
 	"	* final nasal"},
-/* 0E4E */ { "THAI CHARACTER YAMAKKAN",NULL},
+/* 0E4E */ { "THAI CHARACTER YAMAKKAN","	x (lao yamakkan - 0ECE)"},
 /* 0E4F */ { "THAI CHARACTER FONGMAN","	* used as a bullet\n"
 	"	x (khmer sign phnaek muan - 17D9)"},
 /* 0E50 */ { "THAI DIGIT ZERO",NULL},
@@ -6043,7 +6072,8 @@ static const struct unicode_nameannot un
 /* 0ECB */ { "LAO TONE MAI CATAWA",NULL},
 /* 0ECC */ { "LAO CANCELLATION MARK",NULL},
 /* 0ECD */ { "LAO NIGGAHITA","	* final nasal or long o vowel"},
-/* 0ECE */ { NULL,NULL},
+/* 0ECE */ { "LAO YAMAKKAN","	* marks a consonant that is simultaneously a part of two consonant clusters in Pali text\n"
+	"	x (thai character yamakkan - 0E4E)"},
 /* 0ECF */ { NULL,NULL},
 /* 0ED0 */ { "LAO DIGIT ZERO",NULL},
 /* 0ED1 */ { "LAO DIGIT ONE",NULL},
@@ -6095,6 +6125,7 @@ static const struct unicode_nameannot un
 /* 0EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_0F[] = {
 /* 0F00 */ { "TIBETAN SYLLABLE OM",NULL},
 /* 0F01 */ { "TIBETAN MARK GTER YIG MGO TRUNCATED A",NULL},
@@ -6391,6 +6422,7 @@ static const struct unicode_nameannot un
 /* 0FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_10[] = {
 /* 1000 */ { "MYANMAR LETTER KA","	~ 1000 FE00 dotted form"},
 /* 1001 */ { "MYANMAR LETTER KHA",NULL},
@@ -6652,6 +6684,7 @@ static const struct unicode_nameannot un
 /* 10FF */ { "GEORGIAN LETTER LABIAL SIGN",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_11[] = {
 /* 1100 */ { "HANGUL CHOSEONG KIYEOK","	= G"},
 /* 1101 */ { "HANGUL CHOSEONG SSANGKIYEOK","	= GG"},
@@ -6918,6 +6951,7 @@ static const struct unicode_nameannot un
 /* 11FF */ { "HANGUL JONGSEONG SSANGNIEUN",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_12[] = {
 /* 1200 */ { "ETHIOPIC SYLLABLE HA",NULL},
 /* 1201 */ { "ETHIOPIC SYLLABLE HU",NULL},
@@ -7177,6 +7211,7 @@ static const struct unicode_nameannot un
 /* 12FF */ { "ETHIOPIC SYLLABLE DDWA",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_13[] = {
 /* 1300 */ { "ETHIOPIC SYLLABLE JA",NULL},
 /* 1301 */ { "ETHIOPIC SYLLABLE JU",NULL},
@@ -7436,6 +7471,7 @@ static const struct unicode_nameannot un
 /* 13FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_14[] = {
 /* 1400 */ { "CANADIAN SYLLABICS HYPHEN",NULL},
 /* 1401 */ { "CANADIAN SYLLABICS E","	* Inuktitut (AI), Carrier (U)"},
@@ -7697,6 +7733,7 @@ static const struct unicode_nameannot un
 /* 14FF */ { "CANADIAN SYLLABICS WEST-CREE SWOO",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_15[] = {
 /* 1500 */ { "CANADIAN SYLLABICS SWA",NULL},
 /* 1501 */ { "CANADIAN SYLLABICS WEST-CREE SWA",NULL},
@@ -7957,6 +7994,7 @@ static const struct unicode_nameannot un
 /* 15FF */ { "CANADIAN SYLLABICS CARRIER KKI",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_16[] = {
 /* 1600 */ { "CANADIAN SYLLABICS CARRIER KKA",NULL},
 /* 1601 */ { "CANADIAN SYLLABICS CARRIER KK",NULL},
@@ -8219,6 +8257,7 @@ static const struct unicode_nameannot un
 /* 16FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_17[] = {
 /* 1700 */ { "TAGALOG LETTER A",NULL},
 /* 1701 */ { "TAGALOG LETTER I",NULL},
@@ -8517,6 +8556,7 @@ static const struct unicode_nameannot un
 /* 17FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_18[] = {
 /* 1800 */ { "MONGOLIAN BIRGA","	x (tibetan mark initial yig mgo mdun ma - 0F04)"},
 /* 1801 */ { "MONGOLIAN ELLIPSIS",NULL},
@@ -8778,6 +8818,7 @@ static const struct unicode_nameannot un
 /* 18FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_19[] = {
 /* 1900 */ { "LIMBU VOWEL-CARRIER LETTER",NULL},
 /* 1901 */ { "LIMBU LETTER KA",NULL},
@@ -9039,6 +9080,7 @@ static const struct unicode_nameannot un
 /* 19FF */ { "KHMER SYMBOL DAP-PRAM ROC",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_1A[] = {
 /* 1A00 */ { "BUGINESE LETTER KA",NULL},
 /* 1A01 */ { "BUGINESE LETTER GA",NULL},
@@ -9306,6 +9348,7 @@ static const struct unicode_nameannot un
 /* 1AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_1B[] = {
 /* 1B00 */ { "BALINESE SIGN ULU RICEM","	= ardhacandra"},
 /* 1B01 */ { "BALINESE SIGN ULU CANDRA","	= candrabindu"},
@@ -9510,12 +9553,14 @@ static const struct unicode_nameannot un
 /* 1BB7 */ { "SUNDANESE DIGIT SEVEN",NULL},
 /* 1BB8 */ { "SUNDANESE DIGIT EIGHT",NULL},
 /* 1BB9 */ { "SUNDANESE DIGIT NINE",NULL},
-/* 1BBA */ { "SUNDANESE AVAGRAHA",NULL},
+/* 1BBA */ { "SUNDANESE AVAGRAHA","	= gemination mark"},
 /* 1BBB */ { "SUNDANESE LETTER REU","	* vocalic r"},
 /* 1BBC */ { "SUNDANESE LETTER LEU","	* vocalic l"},
-/* 1BBD */ { "SUNDANESE LETTER BHA",NULL},
+/* 1BBD */ { "SUNDANESE LETTER BHA","	% SUNDANESE LETTER ARCHAIC I\n"
+	"	* character was originally misidentified, so its name is a misnomer"},
 /* 1BBE */ { "SUNDANESE LETTER FINAL K",NULL},
-/* 1BBF */ { "SUNDANESE LETTER FINAL M",NULL},
+/* 1BBF */ { "SUNDANESE LETTER FINAL M","	* used in a 21st century document\n"
+	"	* for actual final m, use the sequence 1B99 1BAA"},
 /* 1BC0 */ { "BATAK LETTER A","	* letter a or ha for Karo and Pakpak"},
 /* 1BC1 */ { "BATAK LETTER SIMALUNGUN A",NULL},
 /* 1BC2 */ { "BATAK LETTER HA","	* Toba letter ha or ka\n"
@@ -9584,6 +9629,7 @@ static const struct unicode_nameannot un
 /* 1BFF */ { "BATAK SYMBOL BINDU PANGOLAT",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_1C[] = {
 /* 1C00 */ { "LEPCHA LETTER KA",NULL},
 /* 1C01 */ { "LEPCHA LETTER KLA",NULL},
@@ -9861,6 +9907,7 @@ static const struct unicode_nameannot un
 /* 1CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_1D[] = {
 /* 1D00 */ { "LATIN LETTER SMALL CAPITAL A",NULL},
 /* 1D01 */ { "LATIN LETTER SMALL CAPITAL AE",NULL},
@@ -10155,6 +10202,7 @@ static const struct unicode_nameannot un
 /* 1DFF */ { "COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_1E[] = {
 /* 1E00 */ { "LATIN CAPITAL LETTER A WITH RING BELOW","	: 0041 0325"},
 /* 1E01 */ { "LATIN SMALL LETTER A WITH RING BELOW","	: 0061 0325"},
@@ -10458,6 +10506,7 @@ static const struct unicode_nameannot un
 /* 1EFF */ { "LATIN SMALL LETTER Y WITH LOOP",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_1F[] = {
 /* 1F00 */ { "GREEK SMALL LETTER ALPHA WITH PSILI","	: 03B1 0313"},
 /* 1F01 */ { "GREEK SMALL LETTER ALPHA WITH DASIA","	: 03B1 0314"},
@@ -10719,6 +10768,7 @@ static const struct unicode_nameannot un
 /* 1FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_20[] = {
 /* 2000 */ { "EN QUAD","	: 2002 en space"},
 /* 2001 */ { "EM QUAD","	= mutton quad\n"
@@ -11131,7 +11181,10 @@ static const struct unicode_nameannot un
 /* 20E4 */ { "COMBINING ENCLOSING UPWARD POINTING TRIANGLE","	x (white up-pointing triangle - 25B3)"},
 /* 20E5 */ { "COMBINING REVERSE SOLIDUS OVERLAY","	x (reverse solidus - 005C)"},
 /* 20E6 */ { "COMBINING DOUBLE VERTICAL STROKE OVERLAY","	= z notation finite function diacritic\n"
-	"	x (double vertical line - 2016)"},
+	"	x (double vertical line - 2016)\n"
+	"	x (rightwards arrow with double vertical stroke - 21FB)\n"
+	"	x (rightwards two-headed arrow with double vertical stroke - 2901)\n"
+	"	x (rightwards arrow with tail with double vertical stroke - 2915)"},
 /* 20E7 */ { "COMBINING ANNUITY SYMBOL","	= actuarial bend\n"
 	"	x (right ceiling - 2309)"},
 /* 20E8 */ { "COMBINING TRIPLE UNDERDOT",NULL},
@@ -11162,6 +11215,7 @@ static const struct unicode_nameannot un
 /* 20FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_21[] = {
 /* 2100 */ { "ACCOUNT OF","	# 0061 002F 0063"},
 /* 2101 */ { "ADDRESSED TO THE SUBJECT","	= aux soins (de)\n"
@@ -11546,6 +11600,7 @@ static const struct unicode_nameannot un
 /* 21FF */ { "LEFT RIGHT OPEN-HEADED ARROW",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_22[] = {
 /* 2200 */ { "FOR ALL","	= universal quantifier"},
 /* 2201 */ { "COMPLEMENT","	x (latin letter stretched c - 0297)"},
@@ -11780,6 +11835,7 @@ static const struct unicode_nameannot un
 	"	x (circled crossing lanes - 26D2)\n"
 	"	x (n-ary circled times operator - 2A02)\n"
 	"	x (circled x - 2BBE)\n"
+	"	x (lot of fortune - 1F774)\n"
 	"	~ 2297 FE00 with white rim"},
 /* 2298 */ { "CIRCLED DIVISION SLASH",NULL},
 /* 2299 */ { "CIRCLED DOT OPERATOR","	= direct product\n"
@@ -11920,6 +11976,7 @@ static const struct unicode_nameannot un
 /* 22FF */ { "Z NOTATION BAG MEMBERSHIP",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_23[] = {
 /* 2300 */ { "DIAMETER SIGN","	x (latin small letter o with stroke - 00F8)\n"
 	"	x (empty set - 2205)"},
@@ -12251,6 +12308,7 @@ static const struct unicode_nameannot un
 /* 23FF */ { "OBSERVER EYE SYMBOL",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_24[] = {
 /* 2400 */ { "SYMBOL FOR NULL",NULL},
 /* 2401 */ { "SYMBOL FOR START OF HEADING",NULL},
@@ -12521,6 +12579,7 @@ static const struct unicode_nameannot un
 /* 24FF */ { "NEGATIVE CIRCLED DIGIT ZERO","	x (dingbat negative circled digit one - 2776)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_25[] = {
 /* 2500 */ { "BOX DRAWINGS LIGHT HORIZONTAL","	= Videotex Mosaic DG 15\n"
 	"	x (box drawings light horizontal with vertical stroke - 1FBAF)"},
@@ -12849,6 +12908,7 @@ static const struct unicode_nameannot un
 /* 25FF */ { "LOWER RIGHT TRIANGLE","	x (right triangle - 22BF)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_26[] = {
 /* 2600 */ { "BLACK SUN WITH RAYS","	= clear weather\n"
 	"	x (sun - 2609)\n"
@@ -12877,8 +12937,9 @@ static const struct unicode_nameannot un
 	"	x (alchemical symbol for sublimation - 1F75E)"},
 /* 260B */ { "DESCENDING NODE","	= alchemical symbol for purify\n"
 	"	x (alchemical symbol for purify - 1F763)"},
-/* 260C */ { "CONJUNCTION","	= alchemical symbol for day"},
-/* 260D */ { "OPPOSITION",NULL},
+/* 260C */ { "CONJUNCTION","	= alchemical symbol for day\n"
+	"	x (occultation - 1F775)"},
+/* 260D */ { "OPPOSITION","	x (lunar eclipse - 1F776)"},
 /* 260E */ { "BLACK TELEPHONE","	x (telephone sign - 2121)\n"
 	"	x (telephone location sign - 2706)\n"
 	"	x (telephone receiver - 1F4DE)\n"
@@ -12934,7 +12995,8 @@ static const struct unicode_nameannot un
 /* 262A */ { "STAR AND CRESCENT",NULL},
 /* 262B */ { "FARSI SYMBOL","	= symbol of iran (1.0)"},
 /* 262C */ { "ADI SHAKTI","	= khanda\n"
-	"	* Sikh religious symbol"},
+	"	* Sikh religious symbol\n"
+	"	x (khanda - 1FAAF)"},
 /* 262D */ { "HAMMER AND SICKLE",NULL},
 /* 262E */ { "PEACE SYMBOL",NULL},
 /* 262F */ { "YIN YANG","	x (tibetan symbol nor bu nyis -khyil - 0FCA)"},
@@ -13110,7 +13172,7 @@ static const struct unicode_nameannot un
 /* 26A4 */ { "INTERLOCKED FEMALE AND MALE SIGN","	* a glyph variant has the two circles on the same line\n"
 	"	= heterosexuality"},
 /* 26A5 */ { "MALE AND FEMALE SIGN","	= intersex, androgynous\n"
-	"	= hermaphrodite (in entomology)"},
+	"	= hermaphroditic (in botany)"},
 /* 26A6 */ { "MALE WITH STROKE SIGN","	= transgender\n"
 	"	= alchemical symbol for iron or crocus of iron"},
 /* 26A7 */ { "MALE WITH STROKE AND MALE AND FEMALE SIGN","	= transgender"},
@@ -13245,6 +13307,7 @@ static const struct unicode_nameannot un
 /* 26FF */ { "WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE","	= Japanese self-defence force site"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_27[] = {
 /* 2700 */ { "BLACK SAFETY SCISSORS","	* forms a pair with 2704 white scissors"},
 /* 2701 */ { "UPPER BLADE SCISSORS",NULL},
@@ -13582,6 +13645,7 @@ static const struct unicode_nameannot un
 	"	x (long leftwards squiggle arrow - 2B33)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_28[] = {
 /* 2800 */ { "BRAILLE PATTERN BLANK","	* while this character is imaged as a fixed-width blank in many fonts, it does not act as a space"},
 /* 2801 */ { "BRAILLE PATTERN DOTS-1",NULL},
@@ -13841,6 +13905,7 @@ static const struct unicode_nameannot un
 /* 28FF */ { "BRAILLE PATTERN DOTS-12345678",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_29[] = {
 /* 2900 */ { "RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE","	= z notation partial surjection\n"
 	"	x (leftwards two-headed arrow with vertical stroke - 2B34)"},
@@ -14144,6 +14209,7 @@ static const struct unicode_nameannot un
 /* 29FF */ { "MINY","	x (minus sign - 2212)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_2A[] = {
 /* 2A00 */ { "N-ARY CIRCLED DOT OPERATOR","	x (circled dot operator - 2299)\n"
 	"	x (fisheye - 25C9)"},
@@ -14436,6 +14502,7 @@ static const struct unicode_nameannot un
 /* 2AFF */ { "N-ARY WHITE VERTICAL BAR","	= n-ary Dijkstra choice"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_2B[] = {
 /* 2B00 */ { "NORTH EAST WHITE ARROW",NULL},
 /* 2B01 */ { "NORTH WEST WHITE ARROW",NULL},
@@ -14740,6 +14807,7 @@ static const struct unicode_nameannot un
 /* 2BFF */ { "HELLSCHREIBER PAUSE SYMBOL",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_2C[] = {
 /* 2C00 */ { "GLAGOLITIC CAPITAL LETTER AZU",NULL},
 /* 2C01 */ { "GLAGOLITIC CAPITAL LETTER BUKY",NULL},
@@ -15004,6 +15072,7 @@ static const struct unicode_nameannot un
 /* 2CFF */ { "COPTIC MORPHOLOGICAL DIVIDER",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_2D[] = {
 /* 2D00 */ { "GEORGIAN SMALL LETTER AN","	x (georgian capital letter an - 10A0)"},
 /* 2D01 */ { "GEORGIAN SMALL LETTER BAN",NULL},
@@ -15266,6 +15335,7 @@ static const struct unicode_nameannot un
 /* 2DFF */ { "COMBINING CYRILLIC LETTER IOTIFIED BIG YUS",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_2E[] = {
 /* 2E00 */ { "RIGHT ANGLE SUBSTITUTION MARKER","	x (top left corner - 231C)"},
 /* 2E01 */ { "RIGHT ANGLE DOTTED SUBSTITUTION MARKER",NULL},
@@ -15478,7 +15548,9 @@ static const struct unicode_nameannot un
 /* 2E92 */ { "CJK RADICAL SNAKE","	x 5DF3"},
 /* 2E93 */ { "CJK RADICAL THREAD","	x 5E7A"},
 /* 2E94 */ { "CJK RADICAL SNOUT ONE","	x 5F51"},
-/* 2E95 */ { "CJK RADICAL SNOUT TWO","	x 5F50"},
+/* 2E95 */ { "CJK RADICAL SNOUT TWO","	* actually a form of the radical for hand, despite its resemblance in shape to the radical for snout\n"
+	"	x 5F50\n"
+	"	x 2B739"},
 /* 2E96 */ { "CJK RADICAL HEART ONE","	* form used on left side\n"
 	"	x 5FC4"},
 /* 2E97 */ { "CJK RADICAL HEART TWO","	* form used at bottom\n"
@@ -15634,6 +15706,7 @@ static const struct unicode_nameannot un
 /* 2EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_2F[] = {
 /* 2F00 */ { "KANGXI RADICAL ONE","	# 4E00"},
 /* 2F01 */ { "KANGXI RADICAL LINE","	# 4E28"},
@@ -15894,6 +15967,7 @@ static const struct unicode_nameannot un
 /* 2FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_30[] = {
 /* 3000 */ { "IDEOGRAPHIC SPACE","	x (space - 0020)\n"
 	"	# <wide> 0020"},
@@ -16202,6 +16276,7 @@ static const struct unicode_nameannot un
 	"	# <vertical> 30B3 30C8"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_31[] = {
 /* 3100 */ { NULL,NULL},
 /* 3101 */ { NULL,NULL},
@@ -16485,6 +16560,7 @@ static const struct unicode_nameannot un
 /* 31FF */ { "KATAKANA LETTER SMALL RO",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_32[] = {
 /* 3200 */ { "PARENTHESIZED HANGUL KIYEOK","	# 0028 1100 0029"},
 /* 3201 */ { "PARENTHESIZED HANGUL NIEUN","	# 0028 1102 0029"},
@@ -16771,6 +16847,7 @@ static const struct unicode_nameannot un
 /* 32FF */ { "SQUARE ERA NAME REIWA","	# <square> 4EE4 548C"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_33[] = {
 /* 3300 */ { "SQUARE APAATO","	* apartment\n"
 	"	# <square> 30A2 30D1 30FC 30C8"},
@@ -17079,7 +17156,8 @@ static const struct unicode_nameannot un
 /* 33D4 */ { "SQUARE MB SMALL","	# <square> 006D 0062"},
 /* 33D5 */ { "SQUARE MIL","	# <square> 006D 0069 006C"},
 /* 33D6 */ { "SQUARE MOL","	# <square> 006D 006F 006C"},
-/* 33D7 */ { "SQUARE PH","	# <square> 0050 0048"},
+/* 33D7 */ { "SQUARE PH","	* casing inconsistency in the compatibility decomposition is a known anomaly dating from glyph presentations in very early versions of the standard\n"
+	"	# <square> 0050 0048"},
 /* 33D8 */ { "SQUARE PM","	# <square> 0070 002E 006D 002E"},
 /* 33D9 */ { "SQUARE PPM","	# <square> 0050 0050 004D"},
 /* 33DA */ { "SQUARE PR","	# <square> 0050 0052"},
@@ -17122,6 +17200,7 @@ static const struct unicode_nameannot un
 /* 33FF */ { "SQUARE GAL","	# <square> 0067 0061 006C"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_4D[] = {
 /* 4D00 */ { NULL,NULL},
 /* 4D01 */ { NULL,NULL},
@@ -17381,6 +17460,7 @@ static const struct unicode_nameannot un
 /* 4DFF */ { "HEXAGRAM FOR BEFORE COMPLETION",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A0[] = {
 /* A000 */ { "YI SYLLABLE IT",NULL},
 /* A001 */ { "YI SYLLABLE IX",NULL},
@@ -17641,6 +17721,7 @@ static const struct unicode_nameannot un
 /* A0FF */ { "YI SYLLABLE VYR",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A1[] = {
 /* A100 */ { "YI SYLLABLE DIT",NULL},
 /* A101 */ { "YI SYLLABLE DIX",NULL},
@@ -17900,6 +17981,7 @@ static const struct unicode_nameannot un
 /* A1FF */ { "YI SYLLABLE KAT",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A2[] = {
 /* A200 */ { "YI SYLLABLE KAX",NULL},
 /* A201 */ { "YI SYLLABLE KA",NULL},
@@ -18159,6 +18241,7 @@ static const struct unicode_nameannot un
 /* A2FF */ { "YI SYLLABLE NZU",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A3[] = {
 /* A300 */ { "YI SYLLABLE NZUP",NULL},
 /* A301 */ { "YI SYLLABLE NZURX",NULL},
@@ -18418,6 +18501,7 @@ static const struct unicode_nameannot un
 /* A3FF */ { "YI SYLLABLE QIP",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A4[] = {
 /* A400 */ { "YI SYLLABLE QIET",NULL},
 /* A401 */ { "YI SYLLABLE QIEX",NULL},
@@ -18677,6 +18761,7 @@ static const struct unicode_nameannot un
 /* A4FF */ { "LISU PUNCTUATION FULL STOP",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A5[] = {
 /* A500 */ { "VAI SYLLABLE EE",NULL},
 /* A501 */ { "VAI SYLLABLE EEN",NULL},
@@ -18938,6 +19023,7 @@ static const struct unicode_nameannot un
 /* A5FF */ { "VAI SYLLABLE CE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A6[] = {
 /* A600 */ { "VAI SYLLABLE JE",NULL},
 /* A601 */ { "VAI SYLLABLE NJE",NULL},
@@ -19212,6 +19298,7 @@ static const struct unicode_nameannot un
 /* A6FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A7[] = {
 /* A700 */ { "MODIFIER LETTER CHINESE TONE YIN PING",NULL},
 /* A701 */ { "MODIFIER LETTER CHINESE TONE YANG PING",NULL},
@@ -19509,6 +19596,7 @@ static const struct unicode_nameannot un
 /* A7FF */ { "LATIN EPIGRAPHIC LETTER ARCHAIC M",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A8[] = {
 /* A800 */ { "SYLOTI NAGRI LETTER A",NULL},
 /* A801 */ { "SYLOTI NAGRI LETTER I",NULL},
@@ -19828,6 +19916,7 @@ static const struct unicode_nameannot un
 /* A8FF */ { "DEVANAGARI VOWEL SIGN AY",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_A9[] = {
 /* A900 */ { "KAYAH LI DIGIT ZERO",NULL},
 /* A901 */ { "KAYAH LI DIGIT ONE",NULL},
@@ -19863,8 +19952,8 @@ static const struct unicode_nameannot un
 /* A91F */ { "KAYAH LI LETTER HA",NULL},
 /* A920 */ { "KAYAH LI LETTER VA",NULL},
 /* A921 */ { "KAYAH LI LETTER CA",NULL},
-/* A922 */ { "KAYAH LI LETTER A",NULL},
-/* A923 */ { "KAYAH LI LETTER OE",NULL},
+/* A922 */ { "KAYAH LI LETTER A","	* serves as a vowel carrier for vowels indicated with combining marks"},
+/* A923 */ { "KAYAH LI LETTER OE","	* also serves as a vowel carrier"},
 /* A924 */ { "KAYAH LI LETTER I",NULL},
 /* A925 */ { "KAYAH LI LETTER OO",NULL},
 /* A926 */ { "KAYAH LI VOWEL UE",NULL},
@@ -20096,6 +20185,7 @@ static const struct unicode_nameannot un
 /* A9FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_AA[] = {
 /* AA00 */ { "CHAM LETTER A",NULL},
 /* AA01 */ { "CHAM LETTER I",NULL},
@@ -20357,6 +20447,7 @@ static const struct unicode_nameannot un
 /* AAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_AB[] = {
 /* AB00 */ { NULL,NULL},
 /* AB01 */ { "ETHIOPIC SYLLABLE TTHU",NULL},
@@ -20633,6 +20724,7 @@ static const struct unicode_nameannot un
 /* ABFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_D7[] = {
 /* D700 */ { NULL,NULL},
 /* D701 */ { NULL,NULL},
@@ -20892,6 +20984,7 @@ static const struct unicode_nameannot un
 /* D7FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_F9[] = {
 /* F900 */ { "CJK COMPATIBILITY IDEOGRAPH-F900","	: 8C48"},
 /* F901 */ { "CJK COMPATIBILITY IDEOGRAPH-F901","	: 66F4"},
@@ -21157,6 +21250,7 @@ static const struct unicode_nameannot un
 /* F9FF */ { "CJK COMPATIBILITY IDEOGRAPH-F9FF","	: 523A"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_FA[] = {
 /* FA00 */ { "CJK COMPATIBILITY IDEOGRAPH-FA00","	: 5207"},
 /* FA01 */ { "CJK COMPATIBILITY IDEOGRAPH-FA01","	: 5EA6"},
@@ -21418,6 +21512,7 @@ static const struct unicode_nameannot un
 /* FAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_FB[] = {
 /* FB00 */ { "LATIN SMALL LIGATURE FF","	# 0066 0066"},
 /* FB01 */ { "LATIN SMALL LIGATURE FI","	# 0066 0069"},
@@ -21678,6 +21773,7 @@ static const struct unicode_nameannot un
 /* FBFF */ { "ARABIC LETTER FARSI YEH MEDIAL FORM","	# <medial> 06CC"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_FC[] = {
 /* FC00 */ { "ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM","	# <isolated> 0626 062C"},
 /* FC01 */ { "ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM","	# <isolated> 0626 062D"},
@@ -21937,6 +22033,7 @@ static const struct unicode_nameannot un
 /* FCFF */ { "ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM","	# <isolated> 062D 0649"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_FD[] = {
 /* FD00 */ { "ARABIC LIGATURE HAH WITH YEH ISOLATED FORM","	# <isolated> 062D 064A"},
 /* FD01 */ { "ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM","	# <isolated> 062C 0649"},
@@ -22200,6 +22297,7 @@ static const struct unicode_nameannot un
 /* FDFF */ { "ARABIC LIGATURE AZZA WA JALL",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_FE[] = {
 /* FE00 */ { "VARIATION SELECTOR-1","	* these are abbreviated VS1, and so on"},
 /* FE01 */ { "VARIATION SELECTOR-2",NULL},
@@ -22490,6 +22588,7 @@ static const struct unicode_nameannot un
 	"	x (<not a character> - FFFE)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_00_FF[] = {
 /* FF00 */ { NULL,NULL},
 /* FF01 */ { "FULLWIDTH EXCLAMATION MARK","	~ FF01 FE00 corner-justified form\n"
@@ -22773,6 +22872,7 @@ static const struct unicode_nameannot un
 /* FFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_00[] = {
 /* 10000 */ { "LINEAR B SYLLABLE B008 A",NULL},
 /* 10001 */ { "LINEAR B SYLLABLE B038 E",NULL},
@@ -23032,6 +23132,7 @@ static const struct unicode_nameannot un
 /* 100FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_01[] = {
 /* 10100 */ { "AEGEAN WORD SEPARATOR LINE",NULL},
 /* 10101 */ { "AEGEAN WORD SEPARATOR DOT",NULL},
@@ -23294,6 +23395,7 @@ static const struct unicode_nameannot un
 /* 101FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_02[] = {
 /* 10200 */ { NULL,NULL},
 /* 10201 */ { NULL,NULL},
@@ -23553,6 +23655,7 @@ static const struct unicode_nameannot un
 /* 102FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_03[] = {
 /* 10300 */ { "OLD ITALIC LETTER A",NULL},
 /* 10301 */ { "OLD ITALIC LETTER BE",NULL},
@@ -23812,6 +23915,7 @@ static const struct unicode_nameannot un
 /* 103FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_04[] = {
 /* 10400 */ { "DESERET CAPITAL LETTER LONG I",NULL},
 /* 10401 */ { "DESERET CAPITAL LETTER LONG E",NULL},
@@ -24071,6 +24175,7 @@ static const struct unicode_nameannot un
 /* 104FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_05[] = {
 /* 10500 */ { "ELBASAN LETTER A",NULL},
 /* 10501 */ { "ELBASAN LETTER BE",NULL},
@@ -24330,6 +24435,7 @@ static const struct unicode_nameannot un
 /* 105FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_06[] = {
 /* 10600 */ { "LINEAR A SIGN AB001",NULL},
 /* 10601 */ { "LINEAR A SIGN AB002",NULL},
@@ -24607,6 +24713,7 @@ static const struct unicode_nameannot un
 /* 106FF */ { "LINEAR A SIGN A594","	* 1064D ab131a, 10634 ab060"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_07[] = {
 /* 10700 */ { "LINEAR A SIGN A595","	* 1064D ab131a, 10634 ab060"},
 /* 10701 */ { "LINEAR A SIGN A596","	* 1064D ab131a, 1063E ab077"},
@@ -24869,6 +24976,7 @@ static const struct unicode_nameannot un
 /* 107FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_08[] = {
 /* 10800 */ { "CYPRIOT SYLLABLE A",NULL},
 /* 10801 */ { "CYPRIOT SYLLABLE E",NULL},
@@ -25128,6 +25236,7 @@ static const struct unicode_nameannot un
 /* 108FF */ { "HATRAN NUMBER ONE HUNDRED",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_09[] = {
 /* 10900 */ { "PHOENICIAN LETTER ALF","	x (hebrew letter alef - 05D0)"},
 /* 10901 */ { "PHOENICIAN LETTER BET","	x (hebrew letter bet - 05D1)"},
@@ -25392,6 +25501,7 @@ static const struct unicode_nameannot un
 /* 109FF */ { "MEROITIC CURSIVE FRACTION TEN TWELFTHS",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_0A[] = {
 /* 10A00 */ { "KHAROSHTHI LETTER A",NULL},
 /* 10A01 */ { "KHAROSHTHI VOWEL SIGN I",NULL},
@@ -25758,6 +25868,7 @@ static const struct unicode_nameannot un
 /* 10AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_0B[] = {
 /* 10B00 */ { "AVESTAN LETTER A",NULL},
 /* 10B01 */ { "AVESTAN LETTER AA",NULL},
@@ -26019,6 +26130,7 @@ static const struct unicode_nameannot un
 /* 10BFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_0C[] = {
 /* 10C00 */ { "OLD TURKIC LETTER ORKHON A",NULL},
 /* 10C01 */ { "OLD TURKIC LETTER YENISEI A",NULL},
@@ -26285,6 +26397,7 @@ static const struct unicode_nameannot un
 /* 10CFF */ { "OLD HUNGARIAN NUMBER ONE THOUSAND",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_0D[] = {
 /* 10D00 */ { "HANIFI ROHINGYA LETTER A",NULL},
 /* 10D01 */ { "HANIFI ROHINGYA LETTER BA",NULL},
@@ -26544,6 +26657,7 @@ static const struct unicode_nameannot un
 /* 10DFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_0E[] = {
 /* 10E00 */ { NULL,NULL},
 /* 10E01 */ { NULL,NULL},
@@ -26798,11 +26912,12 @@ static const struct unicode_nameannot un
 /* 10EFA */ { NULL,NULL},
 /* 10EFB */ { NULL,NULL},
 /* 10EFC */ { NULL,NULL},
-/* 10EFD */ { NULL,NULL},
-/* 10EFE */ { NULL,NULL},
-/* 10EFF */ { NULL,NULL}
+/* 10EFD */ { "ARABIC SMALL LOW WORD SAKTA","	x (arabic small high word sakta - 08DD)"},
+/* 10EFE */ { "ARABIC SMALL LOW WORD QASR",NULL},
+/* 10EFF */ { "ARABIC SMALL LOW WORD MADDA",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_0F[] = {
 /* 10F00 */ { "OLD SOGDIAN LETTER ALEPH",NULL},
 /* 10F01 */ { "OLD SOGDIAN LETTER FINAL ALEPH",NULL},
@@ -27064,6 +27179,7 @@ static const struct unicode_nameannot un
 /* 10FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_10[] = {
 /* 11000 */ { "BRAHMI SIGN CANDRABINDU",NULL},
 /* 11001 */ { "BRAHMI SIGN ANUSVARA",NULL},
@@ -27325,6 +27441,7 @@ static const struct unicode_nameannot un
 /* 110FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_11[] = {
 /* 11100 */ { "CHAKMA SIGN CANDRABINDU",NULL},
 /* 11101 */ { "CHAKMA SIGN ANUSVARA",NULL},
@@ -27593,6 +27710,7 @@ static const struct unicode_nameannot un
 /* 111FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_12[] = {
 /* 11200 */ { "KHOJKI LETTER A",NULL},
 /* 11201 */ { "KHOJKI LETTER AA",NULL},
@@ -27659,9 +27777,9 @@ static const struct unicode_nameannot un
 	"	x (kaithi double section mark - 110BF)"},
 /* 1123D */ { "KHOJKI ABBREVIATION SIGN",NULL},
 /* 1123E */ { "KHOJKI SIGN SUKUN","	* used for Arabic transliteration"},
-/* 1123F */ { NULL,NULL},
-/* 11240 */ { NULL,NULL},
-/* 11241 */ { NULL,NULL},
+/* 1123F */ { "KHOJKI LETTER QA",NULL},
+/* 11240 */ { "KHOJKI LETTER SHORT I",NULL},
+/* 11241 */ { "KHOJKI VOWEL SIGN VOCALIC R",NULL},
 /* 11242 */ { NULL,NULL},
 /* 11243 */ { NULL,NULL},
 /* 11244 */ { NULL,NULL},
@@ -27854,6 +27972,7 @@ static const struct unicode_nameannot un
 /* 112FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_13[] = {
 /* 11300 */ { "GRANTHA SIGN COMBINING ANUSVARA ABOVE","	* used in Prakrit language Jain texts for the linguistic anusvara"},
 /* 11301 */ { "GRANTHA SIGN CANDRABINDU",NULL},
@@ -28114,6 +28233,7 @@ static const struct unicode_nameannot un
 /* 113FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_14[] = {
 /* 11400 */ { "NEWA LETTER A",NULL},
 /* 11401 */ { "NEWA LETTER AA",NULL},
@@ -28374,6 +28494,7 @@ static const struct unicode_nameannot un
 /* 114FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_15[] = {
 /* 11500 */ { NULL,NULL},
 /* 11501 */ { NULL,NULL},
@@ -28634,6 +28755,7 @@ static const struct unicode_nameannot un
 /* 115FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_16[] = {
 /* 11600 */ { "MODI LETTER A",NULL},
 /* 11601 */ { "MODI LETTER AA",NULL},
@@ -28894,6 +29016,7 @@ static const struct unicode_nameannot un
 /* 116FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_17[] = {
 /* 11700 */ { "AHOM LETTER KA",NULL},
 /* 11701 */ { "AHOM LETTER KHA",NULL},
@@ -29153,6 +29276,7 @@ static const struct unicode_nameannot un
 /* 117FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_18[] = {
 /* 11800 */ { "DOGRA LETTER A",NULL},
 /* 11801 */ { "DOGRA LETTER AA",NULL},
@@ -29412,6 +29536,7 @@ static const struct unicode_nameannot un
 /* 118FF */ { "WARANG CITI OM",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_19[] = {
 /* 11900 */ { "DIVES AKURU LETTER A",NULL},
 /* 11901 */ { "DIVES AKURU LETTER AA",NULL},
@@ -29674,6 +29799,7 @@ static const struct unicode_nameannot un
 /* 119FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_1A[] = {
 /* 11A00 */ { "ZANABAZAR SQUARE LETTER A","	* used for representing independent vowels in combination with vowel signs"},
 /* 11A01 */ { "ZANABAZAR SQUARE VOWEL SIGN I",NULL},
@@ -29946,6 +30072,267 @@ static const struct unicode_nameannot un
 /* 11AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
+static const struct unicode_nameannot una_01_1B[] = {
+/* 11B00 */ { "DEVANAGARI HEAD MARK","	x (devanagari double danda - 0965)"},
+/* 11B01 */ { "DEVANAGARI HEAD MARK WITH HEADSTROKE",NULL},
+/* 11B02 */ { "DEVANAGARI SIGN BHALE",NULL},
+/* 11B03 */ { "DEVANAGARI SIGN BHALE WITH HOOK",NULL},
+/* 11B04 */ { "DEVANAGARI SIGN EXTENDED BHALE",NULL},
+/* 11B05 */ { "DEVANAGARI SIGN EXTENDED BHALE WITH HOOK",NULL},
+/* 11B06 */ { "DEVANAGARI SIGN WESTERN FIVE-LIKE BHALE",NULL},
+/* 11B07 */ { "DEVANAGARI SIGN WESTERN NINE-LIKE BHALE",NULL},
+/* 11B08 */ { "DEVANAGARI SIGN REVERSED NINE-LIKE BHALE",NULL},
+/* 11B09 */ { "DEVANAGARI SIGN MINDU","	x (devanagari digit zero - 0966)"},
+/* 11B0A */ { NULL,NULL},
+/* 11B0B */ { NULL,NULL},
+/* 11B0C */ { NULL,NULL},
+/* 11B0D */ { NULL,NULL},
+/* 11B0E */ { NULL,NULL},
+/* 11B0F */ { NULL,NULL},
+/* 11B10 */ { NULL,NULL},
+/* 11B11 */ { NULL,NULL},
+/* 11B12 */ { NULL,NULL},
+/* 11B13 */ { NULL,NULL},
+/* 11B14 */ { NULL,NULL},
+/* 11B15 */ { NULL,NULL},
+/* 11B16 */ { NULL,NULL},
+/* 11B17 */ { NULL,NULL},
+/* 11B18 */ { NULL,NULL},
+/* 11B19 */ { NULL,NULL},
+/* 11B1A */ { NULL,NULL},
+/* 11B1B */ { NULL,NULL},
+/* 11B1C */ { NULL,NULL},
+/* 11B1D */ { NULL,NULL},
+/* 11B1E */ { NULL,NULL},
+/* 11B1F */ { NULL,NULL},
+/* 11B20 */ { NULL,NULL},
+/* 11B21 */ { NULL,NULL},
+/* 11B22 */ { NULL,NULL},
+/* 11B23 */ { NULL,NULL},
+/* 11B24 */ { NULL,NULL},
+/* 11B25 */ { NULL,NULL},
+/* 11B26 */ { NULL,NULL},
+/* 11B27 */ { NULL,NULL},
+/* 11B28 */ { NULL,NULL},
+/* 11B29 */ { NULL,NULL},
+/* 11B2A */ { NULL,NULL},
+/* 11B2B */ { NULL,NULL},
+/* 11B2C */ { NULL,NULL},
+/* 11B2D */ { NULL,NULL},
+/* 11B2E */ { NULL,NULL},
+/* 11B2F */ { NULL,NULL},
+/* 11B30 */ { NULL,NULL},
+/* 11B31 */ { NULL,NULL},
+/* 11B32 */ { NULL,NULL},
+/* 11B33 */ { NULL,NULL},
+/* 11B34 */ { NULL,NULL},
+/* 11B35 */ { NULL,NULL},
+/* 11B36 */ { NULL,NULL},
+/* 11B37 */ { NULL,NULL},
+/* 11B38 */ { NULL,NULL},
+/* 11B39 */ { NULL,NULL},
+/* 11B3A */ { NULL,NULL},
+/* 11B3B */ { NULL,NULL},
+/* 11B3C */ { NULL,NULL},
+/* 11B3D */ { NULL,NULL},
+/* 11B3E */ { NULL,NULL},
+/* 11B3F */ { NULL,NULL},
+/* 11B40 */ { NULL,NULL},
+/* 11B41 */ { NULL,NULL},
+/* 11B42 */ { NULL,NULL},
+/* 11B43 */ { NULL,NULL},
+/* 11B44 */ { NULL,NULL},
+/* 11B45 */ { NULL,NULL},
+/* 11B46 */ { NULL,NULL},
+/* 11B47 */ { NULL,NULL},
+/* 11B48 */ { NULL,NULL},
+/* 11B49 */ { NULL,NULL},
+/* 11B4A */ { NULL,NULL},
+/* 11B4B */ { NULL,NULL},
+/* 11B4C */ { NULL,NULL},
+/* 11B4D */ { NULL,NULL},
+/* 11B4E */ { NULL,NULL},
+/* 11B4F */ { NULL,NULL},
+/* 11B50 */ { NULL,NULL},
+/* 11B51 */ { NULL,NULL},
+/* 11B52 */ { NULL,NULL},
+/* 11B53 */ { NULL,NULL},
+/* 11B54 */ { NULL,NULL},
+/* 11B55 */ { NULL,NULL},
+/* 11B56 */ { NULL,NULL},
+/* 11B57 */ { NULL,NULL},
+/* 11B58 */ { NULL,NULL},
+/* 11B59 */ { NULL,NULL},
+/* 11B5A */ { NULL,NULL},
+/* 11B5B */ { NULL,NULL},
+/* 11B5C */ { NULL,NULL},
+/* 11B5D */ { NULL,NULL},
+/* 11B5E */ { NULL,NULL},
+/* 11B5F */ { NULL,NULL},
+/* 11B60 */ { NULL,NULL},
+/* 11B61 */ { NULL,NULL},
+/* 11B62 */ { NULL,NULL},
+/* 11B63 */ { NULL,NULL},
+/* 11B64 */ { NULL,NULL},
+/* 11B65 */ { NULL,NULL},
+/* 11B66 */ { NULL,NULL},
+/* 11B67 */ { NULL,NULL},
+/* 11B68 */ { NULL,NULL},
+/* 11B69 */ { NULL,NULL},
+/* 11B6A */ { NULL,NULL},
+/* 11B6B */ { NULL,NULL},
+/* 11B6C */ { NULL,NULL},
+/* 11B6D */ { NULL,NULL},
+/* 11B6E */ { NULL,NULL},
+/* 11B6F */ { NULL,NULL},
+/* 11B70 */ { NULL,NULL},
+/* 11B71 */ { NULL,NULL},
+/* 11B72 */ { NULL,NULL},
+/* 11B73 */ { NULL,NULL},
+/* 11B74 */ { NULL,NULL},
+/* 11B75 */ { NULL,NULL},
+/* 11B76 */ { NULL,NULL},
+/* 11B77 */ { NULL,NULL},
+/* 11B78 */ { NULL,NULL},
+/* 11B79 */ { NULL,NULL},
+/* 11B7A */ { NULL,NULL},
+/* 11B7B */ { NULL,NULL},
+/* 11B7C */ { NULL,NULL},
+/* 11B7D */ { NULL,NULL},
+/* 11B7E */ { NULL,NULL},
+/* 11B7F */ { NULL,NULL},
+/* 11B80 */ { NULL,NULL},
+/* 11B81 */ { NULL,NULL},
+/* 11B82 */ { NULL,NULL},
+/* 11B83 */ { NULL,NULL},
+/* 11B84 */ { NULL,NULL},
+/* 11B85 */ { NULL,NULL},
+/* 11B86 */ { NULL,NULL},
+/* 11B87 */ { NULL,NULL},
+/* 11B88 */ { NULL,NULL},
+/* 11B89 */ { NULL,NULL},
+/* 11B8A */ { NULL,NULL},
+/* 11B8B */ { NULL,NULL},
+/* 11B8C */ { NULL,NULL},
+/* 11B8D */ { NULL,NULL},
+/* 11B8E */ { NULL,NULL},
+/* 11B8F */ { NULL,NULL},
+/* 11B90 */ { NULL,NULL},
+/* 11B91 */ { NULL,NULL},
+/* 11B92 */ { NULL,NULL},
+/* 11B93 */ { NULL,NULL},
+/* 11B94 */ { NULL,NULL},
+/* 11B95 */ { NULL,NULL},
+/* 11B96 */ { NULL,NULL},
+/* 11B97 */ { NULL,NULL},
+/* 11B98 */ { NULL,NULL},
+/* 11B99 */ { NULL,NULL},
+/* 11B9A */ { NULL,NULL},
+/* 11B9B */ { NULL,NULL},
+/* 11B9C */ { NULL,NULL},
+/* 11B9D */ { NULL,NULL},
+/* 11B9E */ { NULL,NULL},
+/* 11B9F */ { NULL,NULL},
+/* 11BA0 */ { NULL,NULL},
+/* 11BA1 */ { NULL,NULL},
+/* 11BA2 */ { NULL,NULL},
+/* 11BA3 */ { NULL,NULL},
+/* 11BA4 */ { NULL,NULL},
+/* 11BA5 */ { NULL,NULL},
+/* 11BA6 */ { NULL,NULL},
+/* 11BA7 */ { NULL,NULL},
+/* 11BA8 */ { NULL,NULL},
+/* 11BA9 */ { NULL,NULL},
+/* 11BAA */ { NULL,NULL},
+/* 11BAB */ { NULL,NULL},
+/* 11BAC */ { NULL,NULL},
+/* 11BAD */ { NULL,NULL},
+/* 11BAE */ { NULL,NULL},
+/* 11BAF */ { NULL,NULL},
+/* 11BB0 */ { NULL,NULL},
+/* 11BB1 */ { NULL,NULL},
+/* 11BB2 */ { NULL,NULL},
+/* 11BB3 */ { NULL,NULL},
+/* 11BB4 */ { NULL,NULL},
+/* 11BB5 */ { NULL,NULL},
+/* 11BB6 */ { NULL,NULL},
+/* 11BB7 */ { NULL,NULL},
+/* 11BB8 */ { NULL,NULL},
+/* 11BB9 */ { NULL,NULL},
+/* 11BBA */ { NULL,NULL},
+/* 11BBB */ { NULL,NULL},
+/* 11BBC */ { NULL,NULL},
+/* 11BBD */ { NULL,NULL},
+/* 11BBE */ { NULL,NULL},
+/* 11BBF */ { NULL,NULL},
+/* 11BC0 */ { NULL,NULL},
+/* 11BC1 */ { NULL,NULL},
+/* 11BC2 */ { NULL,NULL},
+/* 11BC3 */ { NULL,NULL},
+/* 11BC4 */ { NULL,NULL},
+/* 11BC5 */ { NULL,NULL},
+/* 11BC6 */ { NULL,NULL},
+/* 11BC7 */ { NULL,NULL},
+/* 11BC8 */ { NULL,NULL},
+/* 11BC9 */ { NULL,NULL},
+/* 11BCA */ { NULL,NULL},
+/* 11BCB */ { NULL,NULL},
+/* 11BCC */ { NULL,NULL},
+/* 11BCD */ { NULL,NULL},
+/* 11BCE */ { NULL,NULL},
+/* 11BCF */ { NULL,NULL},
+/* 11BD0 */ { NULL,NULL},
+/* 11BD1 */ { NULL,NULL},
+/* 11BD2 */ { NULL,NULL},
+/* 11BD3 */ { NULL,NULL},
+/* 11BD4 */ { NULL,NULL},
+/* 11BD5 */ { NULL,NULL},
+/* 11BD6 */ { NULL,NULL},
+/* 11BD7 */ { NULL,NULL},
+/* 11BD8 */ { NULL,NULL},
+/* 11BD9 */ { NULL,NULL},
+/* 11BDA */ { NULL,NULL},
+/* 11BDB */ { NULL,NULL},
+/* 11BDC */ { NULL,NULL},
+/* 11BDD */ { NULL,NULL},
+/* 11BDE */ { NULL,NULL},
+/* 11BDF */ { NULL,NULL},
+/* 11BE0 */ { NULL,NULL},
+/* 11BE1 */ { NULL,NULL},
+/* 11BE2 */ { NULL,NULL},
+/* 11BE3 */ { NULL,NULL},
+/* 11BE4 */ { NULL,NULL},
+/* 11BE5 */ { NULL,NULL},
+/* 11BE6 */ { NULL,NULL},
+/* 11BE7 */ { NULL,NULL},
+/* 11BE8 */ { NULL,NULL},
+/* 11BE9 */ { NULL,NULL},
+/* 11BEA */ { NULL,NULL},
+/* 11BEB */ { NULL,NULL},
+/* 11BEC */ { NULL,NULL},
+/* 11BED */ { NULL,NULL},
+/* 11BEE */ { NULL,NULL},
+/* 11BEF */ { NULL,NULL},
+/* 11BF0 */ { NULL,NULL},
+/* 11BF1 */ { NULL,NULL},
+/* 11BF2 */ { NULL,NULL},
+/* 11BF3 */ { NULL,NULL},
+/* 11BF4 */ { NULL,NULL},
+/* 11BF5 */ { NULL,NULL},
+/* 11BF6 */ { NULL,NULL},
+/* 11BF7 */ { NULL,NULL},
+/* 11BF8 */ { NULL,NULL},
+/* 11BF9 */ { NULL,NULL},
+/* 11BFA */ { NULL,NULL},
+/* 11BFB */ { NULL,NULL},
+/* 11BFC */ { NULL,NULL},
+/* 11BFD */ { NULL,NULL},
+/* 11BFE */ { NULL,NULL},
+/* 11BFF */ { NULL,NULL}
+};
+
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_1C[] = {
 /* 11C00 */ { "BHAIKSUKI LETTER A",NULL},
 /* 11C01 */ { "BHAIKSUKI LETTER AA",NULL},
@@ -30205,6 +30592,7 @@ static const struct unicode_nameannot un
 /* 11CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_1D[] = {
 /* 11D00 */ { "MASARAM GONDI LETTER A",NULL},
 /* 11D01 */ { "MASARAM GONDI LETTER AA",NULL},
@@ -30464,6 +30852,7 @@ static const struct unicode_nameannot un
 /* 11DFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_1E[] = {
 /* 11E00 */ { NULL,NULL},
 /* 11E01 */ { NULL,NULL},
@@ -30723,97 +31112,99 @@ static const struct unicode_nameannot un
 /* 11EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_1F[] = {
-/* 11F00 */ { NULL,NULL},
-/* 11F01 */ { NULL,NULL},
-/* 11F02 */ { NULL,NULL},
-/* 11F03 */ { NULL,NULL},
-/* 11F04 */ { NULL,NULL},
-/* 11F05 */ { NULL,NULL},
-/* 11F06 */ { NULL,NULL},
-/* 11F07 */ { NULL,NULL},
-/* 11F08 */ { NULL,NULL},
-/* 11F09 */ { NULL,NULL},
-/* 11F0A */ { NULL,NULL},
-/* 11F0B */ { NULL,NULL},
-/* 11F0C */ { NULL,NULL},
-/* 11F0D */ { NULL,NULL},
-/* 11F0E */ { NULL,NULL},
-/* 11F0F */ { NULL,NULL},
-/* 11F10 */ { NULL,NULL},
+/* 11F00 */ { "KAWI SIGN CANDRABINDU",NULL},
+/* 11F01 */ { "KAWI SIGN ANUSVARA",NULL},
+/* 11F02 */ { "KAWI SIGN REPHA","	* cluster-initial form of 11F2C\n"
+	"	* also used as final r"},
+/* 11F03 */ { "KAWI SIGN VISARGA",NULL},
+/* 11F04 */ { "KAWI LETTER A",NULL},
+/* 11F05 */ { "KAWI LETTER AA",NULL},
+/* 11F06 */ { "KAWI LETTER I",NULL},
+/* 11F07 */ { "KAWI LETTER II",NULL},
+/* 11F08 */ { "KAWI LETTER U",NULL},
+/* 11F09 */ { "KAWI LETTER UU",NULL},
+/* 11F0A */ { "KAWI LETTER VOCALIC R",NULL},
+/* 11F0B */ { "KAWI LETTER VOCALIC RR",NULL},
+/* 11F0C */ { "KAWI LETTER VOCALIC L",NULL},
+/* 11F0D */ { "KAWI LETTER VOCALIC LL",NULL},
+/* 11F0E */ { "KAWI LETTER E",NULL},
+/* 11F0F */ { "KAWI LETTER AI",NULL},
+/* 11F10 */ { "KAWI LETTER O",NULL},
 /* 11F11 */ { NULL,NULL},
-/* 11F12 */ { NULL,NULL},
-/* 11F13 */ { NULL,NULL},
-/* 11F14 */ { NULL,NULL},
-/* 11F15 */ { NULL,NULL},
-/* 11F16 */ { NULL,NULL},
-/* 11F17 */ { NULL,NULL},
-/* 11F18 */ { NULL,NULL},
-/* 11F19 */ { NULL,NULL},
-/* 11F1A */ { NULL,NULL},
-/* 11F1B */ { NULL,NULL},
-/* 11F1C */ { NULL,NULL},
-/* 11F1D */ { NULL,NULL},
-/* 11F1E */ { NULL,NULL},
-/* 11F1F */ { NULL,NULL},
-/* 11F20 */ { NULL,NULL},
-/* 11F21 */ { NULL,NULL},
-/* 11F22 */ { NULL,NULL},
-/* 11F23 */ { NULL,NULL},
-/* 11F24 */ { NULL,NULL},
-/* 11F25 */ { NULL,NULL},
-/* 11F26 */ { NULL,NULL},
-/* 11F27 */ { NULL,NULL},
-/* 11F28 */ { NULL,NULL},
-/* 11F29 */ { NULL,NULL},
-/* 11F2A */ { NULL,NULL},
-/* 11F2B */ { NULL,NULL},
-/* 11F2C */ { NULL,NULL},
-/* 11F2D */ { NULL,NULL},
-/* 11F2E */ { NULL,NULL},
-/* 11F2F */ { NULL,NULL},
-/* 11F30 */ { NULL,NULL},
-/* 11F31 */ { NULL,NULL},
-/* 11F32 */ { NULL,NULL},
-/* 11F33 */ { NULL,NULL},
-/* 11F34 */ { NULL,NULL},
-/* 11F35 */ { NULL,NULL},
-/* 11F36 */ { NULL,NULL},
-/* 11F37 */ { NULL,NULL},
-/* 11F38 */ { NULL,NULL},
-/* 11F39 */ { NULL,NULL},
-/* 11F3A */ { NULL,NULL},
+/* 11F12 */ { "KAWI LETTER KA",NULL},
+/* 11F13 */ { "KAWI LETTER KHA",NULL},
+/* 11F14 */ { "KAWI LETTER GA",NULL},
+/* 11F15 */ { "KAWI LETTER GHA",NULL},
+/* 11F16 */ { "KAWI LETTER NGA",NULL},
+/* 11F17 */ { "KAWI LETTER CA",NULL},
+/* 11F18 */ { "KAWI LETTER CHA",NULL},
+/* 11F19 */ { "KAWI LETTER JA",NULL},
+/* 11F1A */ { "KAWI LETTER JHA",NULL},
+/* 11F1B */ { "KAWI LETTER NYA",NULL},
+/* 11F1C */ { "KAWI LETTER TTA",NULL},
+/* 11F1D */ { "KAWI LETTER TTHA",NULL},
+/* 11F1E */ { "KAWI LETTER DDA",NULL},
+/* 11F1F */ { "KAWI LETTER DDHA",NULL},
+/* 11F20 */ { "KAWI LETTER NNA",NULL},
+/* 11F21 */ { "KAWI LETTER TA",NULL},
+/* 11F22 */ { "KAWI LETTER THA",NULL},
+/* 11F23 */ { "KAWI LETTER DA",NULL},
+/* 11F24 */ { "KAWI LETTER DHA",NULL},
+/* 11F25 */ { "KAWI LETTER NA",NULL},
+/* 11F26 */ { "KAWI LETTER PA",NULL},
+/* 11F27 */ { "KAWI LETTER PHA",NULL},
+/* 11F28 */ { "KAWI LETTER BA",NULL},
+/* 11F29 */ { "KAWI LETTER BHA",NULL},
+/* 11F2A */ { "KAWI LETTER MA",NULL},
+/* 11F2B */ { "KAWI LETTER YA",NULL},
+/* 11F2C */ { "KAWI LETTER RA",NULL},
+/* 11F2D */ { "KAWI LETTER LA",NULL},
+/* 11F2E */ { "KAWI LETTER WA",NULL},
+/* 11F2F */ { "KAWI LETTER SHA",NULL},
+/* 11F30 */ { "KAWI LETTER SSA",NULL},
+/* 11F31 */ { "KAWI LETTER SA",NULL},
+/* 11F32 */ { "KAWI LETTER HA",NULL},
+/* 11F33 */ { "KAWI LETTER JNYA",NULL},
+/* 11F34 */ { "KAWI VOWEL SIGN AA",NULL},
+/* 11F35 */ { "KAWI VOWEL SIGN ALTERNATE AA",NULL},
+/* 11F36 */ { "KAWI VOWEL SIGN I",NULL},
+/* 11F37 */ { "KAWI VOWEL SIGN II",NULL},
+/* 11F38 */ { "KAWI VOWEL SIGN U",NULL},
+/* 11F39 */ { "KAWI VOWEL SIGN UU",NULL},
+/* 11F3A */ { "KAWI VOWEL SIGN VOCALIC R",NULL},
 /* 11F3B */ { NULL,NULL},
 /* 11F3C */ { NULL,NULL},
 /* 11F3D */ { NULL,NULL},
-/* 11F3E */ { NULL,NULL},
-/* 11F3F */ { NULL,NULL},
-/* 11F40 */ { NULL,NULL},
-/* 11F41 */ { NULL,NULL},
-/* 11F42 */ { NULL,NULL},
-/* 11F43 */ { NULL,NULL},
-/* 11F44 */ { NULL,NULL},
-/* 11F45 */ { NULL,NULL},
-/* 11F46 */ { NULL,NULL},
-/* 11F47 */ { NULL,NULL},
-/* 11F48 */ { NULL,NULL},
-/* 11F49 */ { NULL,NULL},
-/* 11F4A */ { NULL,NULL},
-/* 11F4B */ { NULL,NULL},
-/* 11F4C */ { NULL,NULL},
-/* 11F4D */ { NULL,NULL},
-/* 11F4E */ { NULL,NULL},
-/* 11F4F */ { NULL,NULL},
-/* 11F50 */ { NULL,NULL},
-/* 11F51 */ { NULL,NULL},
-/* 11F52 */ { NULL,NULL},
-/* 11F53 */ { NULL,NULL},
-/* 11F54 */ { NULL,NULL},
-/* 11F55 */ { NULL,NULL},
-/* 11F56 */ { NULL,NULL},
-/* 11F57 */ { NULL,NULL},
-/* 11F58 */ { NULL,NULL},
-/* 11F59 */ { NULL,NULL},
+/* 11F3E */ { "KAWI VOWEL SIGN E",NULL},
+/* 11F3F */ { "KAWI VOWEL SIGN AI",NULL},
+/* 11F40 */ { "KAWI VOWEL SIGN EU","	* represents schwa [ǝ]"},
+/* 11F41 */ { "KAWI SIGN KILLER","	* vowel killer, always rendered visibly"},
+/* 11F42 */ { "KAWI CONJOINER","	* used for producing below-base and post-base conjunct forms"},
+/* 11F43 */ { "KAWI DANDA",NULL},
+/* 11F44 */ { "KAWI DOUBLE DANDA",NULL},
+/* 11F45 */ { "KAWI PUNCTUATION SECTION MARKER",NULL},
+/* 11F46 */ { "KAWI PUNCTUATION ALTERNATE SECTION MARKER",NULL},
+/* 11F47 */ { "KAWI PUNCTUATION FLOWER",NULL},
+/* 11F48 */ { "KAWI PUNCTUATION SPACE FILLER",NULL},
+/* 11F49 */ { "KAWI PUNCTUATION DOT",NULL},
+/* 11F4A */ { "KAWI PUNCTUATION DOUBLE DOT",NULL},
+/* 11F4B */ { "KAWI PUNCTUATION TRIPLE DOT",NULL},
+/* 11F4C */ { "KAWI PUNCTUATION CIRCLE",NULL},
+/* 11F4D */ { "KAWI PUNCTUATION FILLED CIRCLE",NULL},
+/* 11F4E */ { "KAWI PUNCTUATION SPIRAL",NULL},
+/* 11F4F */ { "KAWI PUNCTUATION CLOSING SPIRAL",NULL},
+/* 11F50 */ { "KAWI DIGIT ZERO",NULL},
+/* 11F51 */ { "KAWI DIGIT ONE",NULL},
+/* 11F52 */ { "KAWI DIGIT TWO","	* also used as letter ro"},
+/* 11F53 */ { "KAWI DIGIT THREE",NULL},
+/* 11F54 */ { "KAWI DIGIT FOUR",NULL},
+/* 11F55 */ { "KAWI DIGIT FIVE",NULL},
+/* 11F56 */ { "KAWI DIGIT SIX",NULL},
+/* 11F57 */ { "KAWI DIGIT SEVEN",NULL},
+/* 11F58 */ { "KAWI DIGIT EIGHT",NULL},
+/* 11F59 */ { "KAWI DIGIT NINE",NULL},
 /* 11F5A */ { NULL,NULL},
 /* 11F5B */ { NULL,NULL},
 /* 11F5C */ { NULL,NULL},
@@ -31004,6 +31395,7 @@ static const struct unicode_nameannot un
 /* 11FFF */ { "TAMIL PUNCTUATION END OF TEXT","	x (sinhala punctuation kunddaliya - 0DF4)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_20[] = {
 /* 12000 */ { "CUNEIFORM SIGN A",NULL},
 /* 12001 */ { "CUNEIFORM SIGN A TIMES A",NULL},
@@ -31263,6 +31655,7 @@ static const struct unicode_nameannot un
 /* 120FF */ { "CUNEIFORM SIGN GESHTIN TIMES KUR",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_21[] = {
 /* 12100 */ { "CUNEIFORM SIGN GI",NULL},
 /* 12101 */ { "CUNEIFORM SIGN GI TIMES E",NULL},
@@ -31522,6 +31915,7 @@ static const struct unicode_nameannot un
 /* 121FF */ { "CUNEIFORM SIGN LU2 TIMES BAD",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_22[] = {
 /* 12200 */ { "CUNEIFORM SIGN LU2 TIMES ESH2",NULL},
 /* 12201 */ { "CUNEIFORM SIGN LU2 TIMES ESH2 TENU",NULL},
@@ -31781,6 +32175,7 @@ static const struct unicode_nameannot un
 /* 122FF */ { "CUNEIFORM SIGN TI TENU",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_23[] = {
 /* 12300 */ { "CUNEIFORM SIGN TIL",NULL},
 /* 12301 */ { "CUNEIFORM SIGN TIR",NULL},
@@ -32040,6 +32435,7 @@ static const struct unicode_nameannot un
 /* 123FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_24[] = {
 /* 12400 */ { "CUNEIFORM NUMERIC SIGN TWO ASH",NULL},
 /* 12401 */ { "CUNEIFORM NUMERIC SIGN THREE ASH",NULL},
@@ -32300,6 +32696,7 @@ static const struct unicode_nameannot un
 /* 124FF */ { "CUNEIFORM SIGN LAK-550",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_25[] = {
 /* 12500 */ { "CUNEIFORM SIGN LAK-608",NULL},
 /* 12501 */ { "CUNEIFORM SIGN LAK-617",NULL},
@@ -32559,6 +32956,7 @@ static const struct unicode_nameannot un
 /* 125FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_2F[] = {
 /* 12F00 */ { NULL,NULL},
 /* 12F01 */ { NULL,NULL},
@@ -32818,6 +33216,7 @@ static const struct unicode_nameannot un
 /* 12FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_30[] = {
 /* 13000 */ { "EGYPTIAN HIEROGLYPH A001",NULL},
 /* 13001 */ { "EGYPTIAN HIEROGLYPH A002",NULL},
@@ -32968,9 +33367,9 @@ static const struct unicode_nameannot un
 /* 1308E */ { "EGYPTIAN HIEROGLYPH D024",NULL},
 /* 1308F */ { "EGYPTIAN HIEROGLYPH D025",NULL},
 /* 13090 */ { "EGYPTIAN HIEROGLYPH D026",NULL},
-/* 13091 */ { "EGYPTIAN HIEROGLYPH D027",NULL},
-/* 13092 */ { "EGYPTIAN HIEROGLYPH D027A",NULL},
-/* 13093 */ { "EGYPTIAN HIEROGLYPH D028",NULL},
+/* 13091 */ { "EGYPTIAN HIEROGLYPH D027","	~ 13091 FE00 rotated 90 degrees"},
+/* 13092 */ { "EGYPTIAN HIEROGLYPH D027A","	~ 13092 FE00 rotated 90 degrees"},
+/* 13093 */ { "EGYPTIAN HIEROGLYPH D028","	~ 13093 FE01 rotated 180 degrees"},
 /* 13094 */ { "EGYPTIAN HIEROGLYPH D029",NULL},
 /* 13095 */ { "EGYPTIAN HIEROGLYPH D030",NULL},
 /* 13096 */ { "EGYPTIAN HIEROGLYPH D031",NULL},
@@ -32994,7 +33393,7 @@ static const struct unicode_nameannot un
 /* 130A6 */ { "EGYPTIAN HIEROGLYPH D045",NULL},
 /* 130A7 */ { "EGYPTIAN HIEROGLYPH D046","	* transliterated as d"},
 /* 130A8 */ { "EGYPTIAN HIEROGLYPH D046A",NULL},
-/* 130A9 */ { "EGYPTIAN HIEROGLYPH D047",NULL},
+/* 130A9 */ { "EGYPTIAN HIEROGLYPH D047","	~ 130A9 FE01 rotated 180 degrees"},
 /* 130AA */ { "EGYPTIAN HIEROGLYPH D048",NULL},
 /* 130AB */ { "EGYPTIAN HIEROGLYPH D048A",NULL},
 /* 130AC */ { "EGYPTIAN HIEROGLYPH D049",NULL},
@@ -33089,6 +33488,7 @@ static const struct unicode_nameannot un
 /* 130FF */ { "EGYPTIAN HIEROGLYPH F001A",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_31[] = {
 /* 13100 */ { "EGYPTIAN HIEROGLYPH F002",NULL},
 /* 13101 */ { "EGYPTIAN HIEROGLYPH F003",NULL},
@@ -33105,7 +33505,7 @@ static const struct unicode_nameannot un
 /* 1310C */ { "EGYPTIAN HIEROGLYPH F013A","	* stylistic variant, use of 1310B is preferred"},
 /* 1310D */ { "EGYPTIAN HIEROGLYPH F014",NULL},
 /* 1310E */ { "EGYPTIAN HIEROGLYPH F015",NULL},
-/* 1310F */ { "EGYPTIAN HIEROGLYPH F016",NULL},
+/* 1310F */ { "EGYPTIAN HIEROGLYPH F016","	~ 1310F FE00 rotated 90 degrees"},
 /* 13110 */ { "EGYPTIAN HIEROGLYPH F017",NULL},
 /* 13111 */ { "EGYPTIAN HIEROGLYPH F018",NULL},
 /* 13112 */ { "EGYPTIAN HIEROGLYPH F019",NULL},
@@ -33113,23 +33513,24 @@ static const struct unicode_nameannot un
 /* 13114 */ { "EGYPTIAN HIEROGLYPH F021",NULL},
 /* 13115 */ { "EGYPTIAN HIEROGLYPH F021A","	* from hieratic"},
 /* 13116 */ { "EGYPTIAN HIEROGLYPH F022",NULL},
-/* 13117 */ { "EGYPTIAN HIEROGLYPH F023",NULL},
+/* 13117 */ { "EGYPTIAN HIEROGLYPH F023","	~ 13117 FE02 rotated 270 degrees"},
 /* 13118 */ { "EGYPTIAN HIEROGLYPH F024","	* mirrored version of 13117"},
 /* 13119 */ { "EGYPTIAN HIEROGLYPH F025",NULL},
 /* 1311A */ { "EGYPTIAN HIEROGLYPH F026",NULL},
 /* 1311B */ { "EGYPTIAN HIEROGLYPH F027",NULL},
-/* 1311C */ { "EGYPTIAN HIEROGLYPH F028",NULL},
+/* 1311C */ { "EGYPTIAN HIEROGLYPH F028","	~ 1311C FE00 rotated 90 degrees"},
 /* 1311D */ { "EGYPTIAN HIEROGLYPH F029",NULL},
 /* 1311E */ { "EGYPTIAN HIEROGLYPH F030",NULL},
 /* 1311F */ { "EGYPTIAN HIEROGLYPH F031",NULL},
 /* 13120 */ { "EGYPTIAN HIEROGLYPH F031A","	* cursive variant of 1311F"},
-/* 13121 */ { "EGYPTIAN HIEROGLYPH F032","	* transliterated as 1E96"},
+/* 13121 */ { "EGYPTIAN HIEROGLYPH F032","	* transliterated as 1E96\n"
+	"	~ 13121 FE00 rotated 90 degrees"},
 /* 13122 */ { "EGYPTIAN HIEROGLYPH F033",NULL},
 /* 13123 */ { "EGYPTIAN HIEROGLYPH F034",NULL},
 /* 13124 */ { "EGYPTIAN HIEROGLYPH F035",NULL},
 /* 13125 */ { "EGYPTIAN HIEROGLYPH F036",NULL},
 /* 13126 */ { "EGYPTIAN HIEROGLYPH F037",NULL},
-/* 13127 */ { "EGYPTIAN HIEROGLYPH F037A",NULL},
+/* 13127 */ { "EGYPTIAN HIEROGLYPH F037A","	~ 13127 FE00 rotated 90 degrees"},
 /* 13128 */ { "EGYPTIAN HIEROGLYPH F038",NULL},
 /* 13129 */ { "EGYPTIAN HIEROGLYPH F038A",NULL},
 /* 1312A */ { "EGYPTIAN HIEROGLYPH F039",NULL},
@@ -33147,7 +33548,8 @@ static const struct unicode_nameannot un
 /* 13136 */ { "EGYPTIAN HIEROGLYPH F048",NULL},
 /* 13137 */ { "EGYPTIAN HIEROGLYPH F049","	* mirrored version of 13136"},
 /* 13138 */ { "EGYPTIAN HIEROGLYPH F050",NULL},
-/* 13139 */ { "EGYPTIAN HIEROGLYPH F051",NULL},
+/* 13139 */ { "EGYPTIAN HIEROGLYPH F051","	~ 13139 FE00 rotated 90 degrees\n"
+	"	~ 13139 FE02 rotated 270 degrees"},
 /* 1313A */ { "EGYPTIAN HIEROGLYPH F051A",NULL},
 /* 1313B */ { "EGYPTIAN HIEROGLYPH F051B","	* variant of 1313A"},
 /* 1313C */ { "EGYPTIAN HIEROGLYPH F051C","	* rotated version of 13139"},
@@ -33226,11 +33628,11 @@ static const struct unicode_nameannot un
 /* 13180 */ { "EGYPTIAN HIEROGLYPH H002",NULL},
 /* 13181 */ { "EGYPTIAN HIEROGLYPH H003",NULL},
 /* 13182 */ { "EGYPTIAN HIEROGLYPH H004",NULL},
-/* 13183 */ { "EGYPTIAN HIEROGLYPH H005",NULL},
+/* 13183 */ { "EGYPTIAN HIEROGLYPH H005","	~ 13183 FE02 rotated 270 degrees"},
 /* 13184 */ { "EGYPTIAN HIEROGLYPH H006",NULL},
 /* 13185 */ { "EGYPTIAN HIEROGLYPH H006A","	* from hieratic"},
 /* 13186 */ { "EGYPTIAN HIEROGLYPH H007",NULL},
-/* 13187 */ { "EGYPTIAN HIEROGLYPH H008",NULL},
+/* 13187 */ { "EGYPTIAN HIEROGLYPH H008","	~ 13187 FE01 rotated 180 degrees"},
 /* 13188 */ { "EGYPTIAN HIEROGLYPH I001",NULL},
 /* 13189 */ { "EGYPTIAN HIEROGLYPH I002",NULL},
 /* 1318A */ { "EGYPTIAN HIEROGLYPH I003",NULL},
@@ -33255,7 +33657,8 @@ static const struct unicode_nameannot un
 /* 1319D */ { "EGYPTIAN HIEROGLYPH K003",NULL},
 /* 1319E */ { "EGYPTIAN HIEROGLYPH K004",NULL},
 /* 1319F */ { "EGYPTIAN HIEROGLYPH K005",NULL},
-/* 131A0 */ { "EGYPTIAN HIEROGLYPH K006",NULL},
+/* 131A0 */ { "EGYPTIAN HIEROGLYPH K006","	~ 131A0 FE00 rotated 90 degrees\n"
+	"	~ 131A0 FE02 rotated 270 degrees"},
 /* 131A1 */ { "EGYPTIAN HIEROGLYPH K007",NULL},
 /* 131A2 */ { "EGYPTIAN HIEROGLYPH K008",NULL},
 /* 131A3 */ { "EGYPTIAN HIEROGLYPH L001",NULL},
@@ -33272,16 +33675,17 @@ static const struct unicode_nameannot un
 /* 131AE */ { "EGYPTIAN HIEROGLYPH M001A",NULL},
 /* 131AF */ { "EGYPTIAN HIEROGLYPH M001B",NULL},
 /* 131B0 */ { "EGYPTIAN HIEROGLYPH M002",NULL},
-/* 131B1 */ { "EGYPTIAN HIEROGLYPH M003",NULL},
+/* 131B1 */ { "EGYPTIAN HIEROGLYPH M003","	~ 131B1 FE00 rotated 90 degrees\n"
+	"	~ 131B1 FE01 rotated 180 degrees"},
 /* 131B2 */ { "EGYPTIAN HIEROGLYPH M003A",NULL},
 /* 131B3 */ { "EGYPTIAN HIEROGLYPH M004",NULL},
 /* 131B4 */ { "EGYPTIAN HIEROGLYPH M005",NULL},
 /* 131B5 */ { "EGYPTIAN HIEROGLYPH M006",NULL},
 /* 131B6 */ { "EGYPTIAN HIEROGLYPH M007",NULL},
 /* 131B7 */ { "EGYPTIAN HIEROGLYPH M008",NULL},
-/* 131B8 */ { "EGYPTIAN HIEROGLYPH M009",NULL},
-/* 131B9 */ { "EGYPTIAN HIEROGLYPH M010",NULL},
-/* 131BA */ { "EGYPTIAN HIEROGLYPH M010A",NULL},
+/* 131B8 */ { "EGYPTIAN HIEROGLYPH M009","	~ 131B8 FE00 rotated 90 degrees"},
+/* 131B9 */ { "EGYPTIAN HIEROGLYPH M010","	~ 131B9 FE00 rotated 90 degrees"},
+/* 131BA */ { "EGYPTIAN HIEROGLYPH M010A","	~ 131BA FE02 rotated 270 degrees"},
 /* 131BB */ { "EGYPTIAN HIEROGLYPH M011",NULL},
 /* 131BC */ { "EGYPTIAN HIEROGLYPH M012","	* 1,000"},
 /* 131BD */ { "EGYPTIAN HIEROGLYPH M012A","	* 2,000"},
@@ -33301,7 +33705,8 @@ static const struct unicode_nameannot un
 /* 131CB */ { "EGYPTIAN HIEROGLYPH M017","	* egyptological yod\n"
 	"	* transliterated as A7BD\n"
 	"	x (hebrew letter yod - 05D9)\n"
-	"	x (arabic letter yeh - 064A)"},
+	"	x (arabic letter yeh - 064A)\n"
+	"	~ 131CB FE00 rotated 90 degrees"},
 /* 131CC */ { "EGYPTIAN HIEROGLYPH M017A","	* phonogram 'y'\n"
 	"	x (egyptian hieroglyph z004 - 133ED)"},
 /* 131CD */ { "EGYPTIAN HIEROGLYPH M018",NULL},
@@ -33339,7 +33744,9 @@ static const struct unicode_nameannot un
 /* 131EC */ { "EGYPTIAN HIEROGLYPH M042",NULL},
 /* 131ED */ { "EGYPTIAN HIEROGLYPH M043",NULL},
 /* 131EE */ { "EGYPTIAN HIEROGLYPH M044","	* thorn\n"
-	"	* not to be confused with 133DA"},
+	"	* not to be confused with 133DA\n"
+	"	~ 131EE FE01 rotated 180 degrees\n"
+	"	~ 131EE FE02 rotated 270 degrees"},
 /* 131EF */ { "EGYPTIAN HIEROGLYPH N001",NULL},
 /* 131F0 */ { "EGYPTIAN HIEROGLYPH N002",NULL},
 /* 131F1 */ { "EGYPTIAN HIEROGLYPH N003","	* older variant of 131F0"},
@@ -33350,9 +33757,12 @@ static const struct unicode_nameannot un
 /* 131F5 */ { "EGYPTIAN HIEROGLYPH N007",NULL},
 /* 131F6 */ { "EGYPTIAN HIEROGLYPH N008",NULL},
 /* 131F7 */ { "EGYPTIAN HIEROGLYPH N009","	* variant of 131F8"},
-/* 131F8 */ { "EGYPTIAN HIEROGLYPH N010","	* variant of 131F7"},
-/* 131F9 */ { "EGYPTIAN HIEROGLYPH N011",NULL},
-/* 131FA */ { "EGYPTIAN HIEROGLYPH N012",NULL},
+/* 131F8 */ { "EGYPTIAN HIEROGLYPH N010","	* variant of 131F7\n"
+	"	~ 131F8 FE01 rotated 180 degrees"},
+/* 131F9 */ { "EGYPTIAN HIEROGLYPH N011","	~ 131F9 FE00 rotated 90 degrees\n"
+	"	~ 131F9 FE01 rotated 180 degrees"},
+/* 131FA */ { "EGYPTIAN HIEROGLYPH N012","	~ 131FA FE00 rotated 90 degrees\n"
+	"	~ 131FA FE01 rotated 180 degrees"},
 /* 131FB */ { "EGYPTIAN HIEROGLYPH N013",NULL},
 /* 131FC */ { "EGYPTIAN HIEROGLYPH N014",NULL},
 /* 131FD */ { "EGYPTIAN HIEROGLYPH N015",NULL},
@@ -33361,6 +33771,7 @@ static const struct unicode_nameannot un
 	"	* variant of 131FE"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_32[] = {
 /* 13200 */ { "EGYPTIAN HIEROGLYPH N018","	* island\n"
 	"	* not to be confused with 132F0, 133D4, or 133F3"},
@@ -33391,7 +33802,8 @@ static const struct unicode_nameannot un
 	"	* not to be confused with 133E7"},
 /* 13214 */ { "EGYPTIAN HIEROGLYPH N034",NULL},
 /* 13215 */ { "EGYPTIAN HIEROGLYPH N034A","	* stylistic variant, use of 13214 is preferred"},
-/* 13216 */ { "EGYPTIAN HIEROGLYPH N035","	* transliterated as n"},
+/* 13216 */ { "EGYPTIAN HIEROGLYPH N035","	* transliterated as n\n"
+	"	~ 13216 FE02 rotated 270 degrees"},
 /* 13217 */ { "EGYPTIAN HIEROGLYPH N035A","	* classifier 'liquid'"},
 /* 13218 */ { "EGYPTIAN HIEROGLYPH N036",NULL},
 /* 13219 */ { "EGYPTIAN HIEROGLYPH N037","	* lake\n"
@@ -33460,7 +33872,7 @@ static const struct unicode_nameannot un
 	"	x (arabic letter heh - 0647)"},
 /* 13255 */ { "EGYPTIAN HIEROGLYPH O005",NULL},
 /* 13256 */ { "EGYPTIAN HIEROGLYPH O005A","	* mirrored version of 13255"},
-/* 13257 */ { "EGYPTIAN HIEROGLYPH O006",NULL},
+/* 13257 */ { "EGYPTIAN HIEROGLYPH O006","	~ 13257 FE01 rotated 180 degrees"},
 /* 13258 */ { "EGYPTIAN HIEROGLYPH O006A","	* beginning of hwt or serekh enclosure\n"
 	"	x (egyptian hieroglyph o033a - 13282)"},
 /* 13259 */ { "EGYPTIAN HIEROGLYPH O006B","	* beginning of low hwt enclosure"},
@@ -33497,12 +33909,13 @@ static const struct unicode_nameannot un
 /* 13278 */ { "EGYPTIAN HIEROGLYPH O026",NULL},
 /* 13279 */ { "EGYPTIAN HIEROGLYPH O027",NULL},
 /* 1327A */ { "EGYPTIAN HIEROGLYPH O028",NULL},
-/* 1327B */ { "EGYPTIAN HIEROGLYPH O029",NULL},
+/* 1327B */ { "EGYPTIAN HIEROGLYPH O029","	~ 1327B FE02 rotated 270 degrees"},
 /* 1327C */ { "EGYPTIAN HIEROGLYPH O029A","	* rotated variant of 1327B"},
 /* 1327D */ { "EGYPTIAN HIEROGLYPH O030","	* supporting pole\n"
 	"	* not to be confused with 13361"},
 /* 1327E */ { "EGYPTIAN HIEROGLYPH O030A",NULL},
-/* 1327F */ { "EGYPTIAN HIEROGLYPH O031",NULL},
+/* 1327F */ { "EGYPTIAN HIEROGLYPH O031","	~ 1327F FE00 rotated 90 degrees\n"
+	"	~ 1327F FE01 rotated 180 degrees"},
 /* 13280 */ { "EGYPTIAN HIEROGLYPH O032",NULL},
 /* 13281 */ { "EGYPTIAN HIEROGLYPH O033","	* classifier 'serekh'"},
 /* 13282 */ { "EGYPTIAN HIEROGLYPH O033A","	* end of serekh enclosure\n"
@@ -33510,7 +33923,7 @@ static const struct unicode_nameannot un
 /* 13283 */ { "EGYPTIAN HIEROGLYPH O034","	* transliterated as s or as z\n"
 	"	x (egyptian hieroglyph s029 - 132F4)"},
 /* 13284 */ { "EGYPTIAN HIEROGLYPH O035",NULL},
-/* 13285 */ { "EGYPTIAN HIEROGLYPH O036",NULL},
+/* 13285 */ { "EGYPTIAN HIEROGLYPH O036","	~ 13285 FE00 rotated 90 degrees"},
 /* 13286 */ { "EGYPTIAN HIEROGLYPH O036A","	* beginning of fortified wall cartouche"},
 /* 13287 */ { "EGYPTIAN HIEROGLYPH O036B","	* end of fortified wall cartouche"},
 /* 13288 */ { "EGYPTIAN HIEROGLYPH O036C","	* beginning of fortified wall enclosure"},
@@ -33518,7 +33931,8 @@ static const struct unicode_nameannot un
 /* 1328A */ { "EGYPTIAN HIEROGLYPH O037",NULL},
 /* 1328B */ { "EGYPTIAN HIEROGLYPH O038",NULL},
 /* 1328C */ { "EGYPTIAN HIEROGLYPH O039","	* stone, brick\n"
-	"	* not to be confused with 13219"},
+	"	* not to be confused with 13219\n"
+	"	~ 1328C FE00 rotated 90 degrees"},
 /* 1328D */ { "EGYPTIAN HIEROGLYPH O040",NULL},
 /* 1328E */ { "EGYPTIAN HIEROGLYPH O041",NULL},
 /* 1328F */ { "EGYPTIAN HIEROGLYPH O042",NULL},
@@ -33542,14 +33956,16 @@ static const struct unicode_nameannot un
 /* 132A1 */ { "EGYPTIAN HIEROGLYPH P005",NULL},
 /* 132A2 */ { "EGYPTIAN HIEROGLYPH P006",NULL},
 /* 132A3 */ { "EGYPTIAN HIEROGLYPH P007",NULL},
-/* 132A4 */ { "EGYPTIAN HIEROGLYPH P008",NULL},
+/* 132A4 */ { "EGYPTIAN HIEROGLYPH P008","	~ 132A4 FE01 rotated 180 degrees\n"
+	"	~ 132A4 FE02 rotated 270 degrees"},
 /* 132A5 */ { "EGYPTIAN HIEROGLYPH P009",NULL},
 /* 132A6 */ { "EGYPTIAN HIEROGLYPH P010",NULL},
 /* 132A7 */ { "EGYPTIAN HIEROGLYPH P011","	* mooring post\n"
 	"	* not to be confused with 131E9 or 1342A"},
 /* 132A8 */ { "EGYPTIAN HIEROGLYPH Q001",NULL},
 /* 132A9 */ { "EGYPTIAN HIEROGLYPH Q002",NULL},
-/* 132AA */ { "EGYPTIAN HIEROGLYPH Q003","	* transliterated as p"},
+/* 132AA */ { "EGYPTIAN HIEROGLYPH Q003","	* transliterated as p\n"
+	"	~ 132AA FE00 rotated 90 degrees"},
 /* 132AB */ { "EGYPTIAN HIEROGLYPH Q004",NULL},
 /* 132AC */ { "EGYPTIAN HIEROGLYPH Q005",NULL},
 /* 132AD */ { "EGYPTIAN HIEROGLYPH Q006",NULL},
@@ -33582,7 +33998,7 @@ static const struct unicode_nameannot un
 /* 132C8 */ { "EGYPTIAN HIEROGLYPH R021",NULL},
 /* 132C9 */ { "EGYPTIAN HIEROGLYPH R022",NULL},
 /* 132CA */ { "EGYPTIAN HIEROGLYPH R023",NULL},
-/* 132CB */ { "EGYPTIAN HIEROGLYPH R024",NULL},
+/* 132CB */ { "EGYPTIAN HIEROGLYPH R024","	~ 132CB FE00 rotated 90 degrees"},
 /* 132CC */ { "EGYPTIAN HIEROGLYPH R025",NULL},
 /* 132CD */ { "EGYPTIAN HIEROGLYPH R026",NULL},
 /* 132CE */ { "EGYPTIAN HIEROGLYPH R027",NULL},
@@ -33599,7 +34015,7 @@ static const struct unicode_nameannot un
 /* 132D9 */ { "EGYPTIAN HIEROGLYPH S007",NULL},
 /* 132DA */ { "EGYPTIAN HIEROGLYPH S008",NULL},
 /* 132DB */ { "EGYPTIAN HIEROGLYPH S009",NULL},
-/* 132DC */ { "EGYPTIAN HIEROGLYPH S010",NULL},
+/* 132DC */ { "EGYPTIAN HIEROGLYPH S010","	~ 132DC FE00 rotated 90 degrees"},
 /* 132DD */ { "EGYPTIAN HIEROGLYPH S011",NULL},
 /* 132DE */ { "EGYPTIAN HIEROGLYPH S012",NULL},
 /* 132DF */ { "EGYPTIAN HIEROGLYPH S013",NULL},
@@ -33610,9 +34026,10 @@ static const struct unicode_nameannot un
 /* 132E4 */ { "EGYPTIAN HIEROGLYPH S016",NULL},
 /* 132E5 */ { "EGYPTIAN HIEROGLYPH S017",NULL},
 /* 132E6 */ { "EGYPTIAN HIEROGLYPH S017A",NULL},
-/* 132E7 */ { "EGYPTIAN HIEROGLYPH S018",NULL},
+/* 132E7 */ { "EGYPTIAN HIEROGLYPH S018","	~ 132E7 FE00 rotated 90 degrees\n"
+	"	~ 132E7 FE02 rotated 270 degrees"},
 /* 132E8 */ { "EGYPTIAN HIEROGLYPH S019",NULL},
-/* 132E9 */ { "EGYPTIAN HIEROGLYPH S020",NULL},
+/* 132E9 */ { "EGYPTIAN HIEROGLYPH S020","	~ 132E9 FE02 rotated 270 degrees"},
 /* 132EA */ { "EGYPTIAN HIEROGLYPH S021",NULL},
 /* 132EB */ { "EGYPTIAN HIEROGLYPH S022",NULL},
 /* 132EC */ { "EGYPTIAN HIEROGLYPH S023",NULL},
@@ -33629,26 +34046,28 @@ static const struct unicode_nameannot un
 /* 132F5 */ { "EGYPTIAN HIEROGLYPH S030",NULL},
 /* 132F6 */ { "EGYPTIAN HIEROGLYPH S031",NULL},
 /* 132F7 */ { "EGYPTIAN HIEROGLYPH S032",NULL},
-/* 132F8 */ { "EGYPTIAN HIEROGLYPH S033",NULL},
+/* 132F8 */ { "EGYPTIAN HIEROGLYPH S033","	~ 132F8 FE02 rotated 270 degrees"},
 /* 132F9 */ { "EGYPTIAN HIEROGLYPH S034",NULL},
 /* 132FA */ { "EGYPTIAN HIEROGLYPH S035",NULL},
 /* 132FB */ { "EGYPTIAN HIEROGLYPH S035A","	* variant of 132FA"},
 /* 132FC */ { "EGYPTIAN HIEROGLYPH S036","	* older variant of 132FA"},
-/* 132FD */ { "EGYPTIAN HIEROGLYPH S037",NULL},
+/* 132FD */ { "EGYPTIAN HIEROGLYPH S037","	~ 132FD FE02 rotated 270 degrees"},
 /* 132FE */ { "EGYPTIAN HIEROGLYPH S038",NULL},
 /* 132FF */ { "EGYPTIAN HIEROGLYPH S039",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_33[] = {
 /* 13300 */ { "EGYPTIAN HIEROGLYPH S040","	* phonogram 'wꜣs'"},
 /* 13301 */ { "EGYPTIAN HIEROGLYPH S041","	* phonogram 'ḏꜣm'"},
-/* 13302 */ { "EGYPTIAN HIEROGLYPH S042",NULL},
-/* 13303 */ { "EGYPTIAN HIEROGLYPH S043",NULL},
+/* 13302 */ { "EGYPTIAN HIEROGLYPH S042","	~ 13302 FE02 rotated 270 degrees"},
+/* 13303 */ { "EGYPTIAN HIEROGLYPH S043","	~ 13303 FE02 rotated 270 degrees"},
 /* 13304 */ { "EGYPTIAN HIEROGLYPH S044",NULL},
 /* 13305 */ { "EGYPTIAN HIEROGLYPH S045",NULL},
 /* 13306 */ { "EGYPTIAN HIEROGLYPH S046",NULL},
-/* 13307 */ { "EGYPTIAN HIEROGLYPH T001",NULL},
-/* 13308 */ { "EGYPTIAN HIEROGLYPH T002","	* classifier 'striking, hitting'"},
+/* 13307 */ { "EGYPTIAN HIEROGLYPH T001","	~ 13307 FE00 rotated 90 degrees"},
+/* 13308 */ { "EGYPTIAN HIEROGLYPH T002","	* classifier 'striking, hitting'\n"
+	"	~ 13308 FE01 rotated 180 degrees"},
 /* 13309 */ { "EGYPTIAN HIEROGLYPH T003","	* classifier 'mace'"},
 /* 1330A */ { "EGYPTIAN HIEROGLYPH T003A",NULL},
 /* 1330B */ { "EGYPTIAN HIEROGLYPH T004",NULL},
@@ -33656,25 +34075,33 @@ static const struct unicode_nameannot un
 /* 1330D */ { "EGYPTIAN HIEROGLYPH T006",NULL},
 /* 1330E */ { "EGYPTIAN HIEROGLYPH T007",NULL},
 /* 1330F */ { "EGYPTIAN HIEROGLYPH T007A",NULL},
-/* 13310 */ { "EGYPTIAN HIEROGLYPH T008","	* older variant of 13311"},
-/* 13311 */ { "EGYPTIAN HIEROGLYPH T008A",NULL},
-/* 13312 */ { "EGYPTIAN HIEROGLYPH T009",NULL},
-/* 13313 */ { "EGYPTIAN HIEROGLYPH T009A","	* older variant of 13312"},
-/* 13314 */ { "EGYPTIAN HIEROGLYPH T010",NULL},
+/* 13310 */ { "EGYPTIAN HIEROGLYPH T008","	* older variant of 13311\n"
+	"	~ 13310 FE02 rotated 270 degrees"},
+/* 13311 */ { "EGYPTIAN HIEROGLYPH T008A","	~ 13311 FE02 rotated 270 degrees"},
+/* 13312 */ { "EGYPTIAN HIEROGLYPH T009","	~ 13312 FE01 rotated 180 degrees\n"
+	"	~ 13312 FE02 rotated 270 degrees"},
+/* 13313 */ { "EGYPTIAN HIEROGLYPH T009A","	* older variant of 13312\n"
+	"	~ 13313 FE01 rotated 180 degrees\n"
+	"	~ 13313 FE02 rotated 270 degrees"},
+/* 13314 */ { "EGYPTIAN HIEROGLYPH T010","	~ 13314 FE01 rotated 180 degrees\n"
+	"	~ 13314 FE02 rotated 270 degrees"},
 /* 13315 */ { "EGYPTIAN HIEROGLYPH T011",NULL},
 /* 13316 */ { "EGYPTIAN HIEROGLYPH T011A",NULL},
 /* 13317 */ { "EGYPTIAN HIEROGLYPH T012",NULL},
 /* 13318 */ { "EGYPTIAN HIEROGLYPH T013",NULL},
 /* 13319 */ { "EGYPTIAN HIEROGLYPH T014",NULL},
 /* 1331A */ { "EGYPTIAN HIEROGLYPH T015","	* older variant of 13319"},
-/* 1331B */ { "EGYPTIAN HIEROGLYPH T016",NULL},
-/* 1331C */ { "EGYPTIAN HIEROGLYPH T016A",NULL},
+/* 1331B */ { "EGYPTIAN HIEROGLYPH T016","	~ 1331B FE00 rotated 90 degrees\n"
+	"	~ 1331B FE01 rotated 180 degrees"},
+/* 1331C */ { "EGYPTIAN HIEROGLYPH T016A","	~ 1331C FE02 rotated 270 degrees"},
 /* 1331D */ { "EGYPTIAN HIEROGLYPH T017",NULL},
 /* 1331E */ { "EGYPTIAN HIEROGLYPH T018",NULL},
 /* 1331F */ { "EGYPTIAN HIEROGLYPH T019",NULL},
 /* 13320 */ { "EGYPTIAN HIEROGLYPH T020","	* older variant of 1331F"},
-/* 13321 */ { "EGYPTIAN HIEROGLYPH T021",NULL},
-/* 13322 */ { "EGYPTIAN HIEROGLYPH T022",NULL},
+/* 13321 */ { "EGYPTIAN HIEROGLYPH T021","	~ 13321 FE01 rotated 180 degrees\n"
+	"	~ 13321 FE02 rotated 270 degrees"},
+/* 13322 */ { "EGYPTIAN HIEROGLYPH T022","	~ 13322 FE00 rotated 90 degrees\n"
+	"	~ 13322 FE01 rotated 180 degrees"},
 /* 13323 */ { "EGYPTIAN HIEROGLYPH T023","	* more recent variant of 13322"},
 /* 13324 */ { "EGYPTIAN HIEROGLYPH T024",NULL},
 /* 13325 */ { "EGYPTIAN HIEROGLYPH T025",NULL},
@@ -33689,7 +34116,9 @@ static const struct unicode_nameannot un
 /* 1332E */ { "EGYPTIAN HIEROGLYPH T033","	* older variant of 13326"},
 /* 1332F */ { "EGYPTIAN HIEROGLYPH T033A",NULL},
 /* 13330 */ { "EGYPTIAN HIEROGLYPH T034",NULL},
-/* 13331 */ { "EGYPTIAN HIEROGLYPH T035","	* variant of 13330"},
+/* 13331 */ { "EGYPTIAN HIEROGLYPH T035","	* variant of 13330\n"
+	"	~ 13331 FE01 rotated 180 degrees\n"
+	"	~ 13331 FE02 rotated 270 degrees"},
 /* 13332 */ { "EGYPTIAN HIEROGLYPH T036",NULL},
 /* 13333 */ { "EGYPTIAN HIEROGLYPH U001",NULL},
 /* 13334 */ { "EGYPTIAN HIEROGLYPH U002","	* stylistic variant of 13333"},
@@ -33699,8 +34128,10 @@ static const struct unicode_nameannot un
 /* 13338 */ { "EGYPTIAN HIEROGLYPH U006",NULL},
 /* 13339 */ { "EGYPTIAN HIEROGLYPH U006A","	* stylistic variant of 13338"},
 /* 1333A */ { "EGYPTIAN HIEROGLYPH U006B","	* mirrored version of 13339"},
-/* 1333B */ { "EGYPTIAN HIEROGLYPH U007","	* variant of 13338"},
-/* 1333C */ { "EGYPTIAN HIEROGLYPH U008","	* variant of 1333B"},
+/* 1333B */ { "EGYPTIAN HIEROGLYPH U007","	* variant of 13338\n"
+	"	~ 1333B FE00 rotated 90 degrees"},
+/* 1333C */ { "EGYPTIAN HIEROGLYPH U008","	* variant of 1333B\n"
+	"	~ 1333C FE00 rotated 90 degrees"},
 /* 1333D */ { "EGYPTIAN HIEROGLYPH U009",NULL},
 /* 1333E */ { "EGYPTIAN HIEROGLYPH U010",NULL},
 /* 1333F */ { "EGYPTIAN HIEROGLYPH U011",NULL},
@@ -33714,7 +34145,7 @@ static const struct unicode_nameannot un
 /* 13347 */ { "EGYPTIAN HIEROGLYPH U019",NULL},
 /* 13348 */ { "EGYPTIAN HIEROGLYPH U020","	* older variant of 13347"},
 /* 13349 */ { "EGYPTIAN HIEROGLYPH U021",NULL},
-/* 1334A */ { "EGYPTIAN HIEROGLYPH U022",NULL},
+/* 1334A */ { "EGYPTIAN HIEROGLYPH U022","	~ 1334A FE02 rotated 270 degrees"},
 /* 1334B */ { "EGYPTIAN HIEROGLYPH U023",NULL},
 /* 1334C */ { "EGYPTIAN HIEROGLYPH U023A","	* stylistic variant of 1334B"},
 /* 1334D */ { "EGYPTIAN HIEROGLYPH U024",NULL},
@@ -33738,7 +34169,8 @@ static const struct unicode_nameannot un
 /* 1335F */ { "EGYPTIAN HIEROGLYPH U040","	* cursive variant of 1335E"},
 /* 13360 */ { "EGYPTIAN HIEROGLYPH U041",NULL},
 /* 13361 */ { "EGYPTIAN HIEROGLYPH U042","	* pitchfork\n"
-	"	* not to be confused with 1327D"},
+	"	* not to be confused with 1327D\n"
+	"	~ 13361 FE02 rotated 270 degrees"},
 /* 13362 */ { "EGYPTIAN HIEROGLYPH V001","	* 100\n"
 	"	* classifier 'cord, rope'\n"
 	"	* not to be confused with 133F2"},
@@ -33758,17 +34190,20 @@ static const struct unicode_nameannot un
 /* 13370 */ { "EGYPTIAN HIEROGLYPH V005",NULL},
 /* 13371 */ { "EGYPTIAN HIEROGLYPH V006","	* phonogram 'šs'"},
 /* 13372 */ { "EGYPTIAN HIEROGLYPH V007","	* phonogram 'šn'"},
-/* 13373 */ { "EGYPTIAN HIEROGLYPH V007A",NULL},
+/* 13373 */ { "EGYPTIAN HIEROGLYPH V007A","	~ 13373 FE02 rotated 270 degrees"},
 /* 13374 */ { "EGYPTIAN HIEROGLYPH V007B",NULL},
 /* 13375 */ { "EGYPTIAN HIEROGLYPH V008",NULL},
 /* 13376 */ { "EGYPTIAN HIEROGLYPH V009",NULL},
-/* 13377 */ { "EGYPTIAN HIEROGLYPH V010","	* logogram 'name'"},
-/* 13378 */ { "EGYPTIAN HIEROGLYPH V011","	* classifier 'restrain, split'"},
+/* 13377 */ { "EGYPTIAN HIEROGLYPH V010","	* logogram 'name'\n"
+	"	~ 13377 FE00 rotated 90 degrees"},
+/* 13378 */ { "EGYPTIAN HIEROGLYPH V011","	* classifier 'restrain, split'\n"
+	"	x (egyptian hieroglyph v011d - 1342F)\n"
+	"	~ 13378 FE00 rotated 90 degrees"},
 /* 13379 */ { "EGYPTIAN HIEROGLYPH V011A","	* beginning of cartouche"},
 /* 1337A */ { "EGYPTIAN HIEROGLYPH V011B","	* end of cartouche"},
 /* 1337B */ { "EGYPTIAN HIEROGLYPH V011C","	* end of knotless cartouche"},
 /* 1337C */ { "EGYPTIAN HIEROGLYPH V012",NULL},
-/* 1337D */ { "EGYPTIAN HIEROGLYPH V012A",NULL},
+/* 1337D */ { "EGYPTIAN HIEROGLYPH V012A","	~ 1337D FE02 rotated 270 degrees"},
 /* 1337E */ { "EGYPTIAN HIEROGLYPH V012B",NULL},
 /* 1337F */ { "EGYPTIAN HIEROGLYPH V013","	* transliterated as 1E6F"},
 /* 13380 */ { "EGYPTIAN HIEROGLYPH V014","	* variant of 1337F"},
@@ -33776,7 +34211,7 @@ static const struct unicode_nameannot un
 /* 13382 */ { "EGYPTIAN HIEROGLYPH V016",NULL},
 /* 13383 */ { "EGYPTIAN HIEROGLYPH V017",NULL},
 /* 13384 */ { "EGYPTIAN HIEROGLYPH V018","	* older variant of 13383"},
-/* 13385 */ { "EGYPTIAN HIEROGLYPH V019",NULL},
+/* 13385 */ { "EGYPTIAN HIEROGLYPH V019","	~ 13385 FE02 rotated 270 degrees"},
 /* 13386 */ { "EGYPTIAN HIEROGLYPH V020","	* 10\n"
 	"	* not to be confused with 133AD"},
 /* 13387 */ { "EGYPTIAN HIEROGLYPH V020A","	* 20\n"
@@ -33802,8 +34237,9 @@ static const struct unicode_nameannot un
 /* 13396 */ { "EGYPTIAN HIEROGLYPH V023A",NULL},
 /* 13397 */ { "EGYPTIAN HIEROGLYPH V024",NULL},
 /* 13398 */ { "EGYPTIAN HIEROGLYPH V025","	* more recent variant of 13397"},
-/* 13399 */ { "EGYPTIAN HIEROGLYPH V026",NULL},
-/* 1339A */ { "EGYPTIAN HIEROGLYPH V027","	* older variant of 13399"},
+/* 13399 */ { "EGYPTIAN HIEROGLYPH V026","	~ 13399 FE00 rotated 90 degrees"},
+/* 1339A */ { "EGYPTIAN HIEROGLYPH V027","	* older variant of 13399\n"
+	"	~ 1339A FE00 rotated 90 degrees"},
 /* 1339B */ { "EGYPTIAN HIEROGLYPH V028","	* transliterated as 1E25\n"
 	"	x (arabic letter hah - 062D)"},
 /* 1339C */ { "EGYPTIAN HIEROGLYPH V028A",NULL},
@@ -33830,8 +34266,8 @@ static const struct unicode_nameannot un
 	"	* not to be confused with 13386"},
 /* 133AE */ { "EGYPTIAN HIEROGLYPH V040A","	* 20 in dates\n"
 	"	* not to be confused with 13387"},
-/* 133AF */ { "EGYPTIAN HIEROGLYPH W001",NULL},
-/* 133B0 */ { "EGYPTIAN HIEROGLYPH W002",NULL},
+/* 133AF */ { "EGYPTIAN HIEROGLYPH W001","	~ 133AF FE02 rotated 270 degrees"},
+/* 133B0 */ { "EGYPTIAN HIEROGLYPH W002","	~ 133B0 FE02 rotated 270 degrees"},
 /* 133B1 */ { "EGYPTIAN HIEROGLYPH W003",NULL},
 /* 133B2 */ { "EGYPTIAN HIEROGLYPH W003A","	* stylistic variant, use of 133B1 is preferred"},
 /* 133B3 */ { "EGYPTIAN HIEROGLYPH W004",NULL},
@@ -33846,7 +34282,7 @@ static const struct unicode_nameannot un
 /* 133BC */ { "EGYPTIAN HIEROGLYPH W011","	* transliterated as g"},
 /* 133BD */ { "EGYPTIAN HIEROGLYPH W012","	* older variant of 133BC"},
 /* 133BE */ { "EGYPTIAN HIEROGLYPH W013",NULL},
-/* 133BF */ { "EGYPTIAN HIEROGLYPH W014",NULL},
+/* 133BF */ { "EGYPTIAN HIEROGLYPH W014","	~ 133BF FE02 rotated 270 degrees"},
 /* 133C0 */ { "EGYPTIAN HIEROGLYPH W014A",NULL},
 /* 133C1 */ { "EGYPTIAN HIEROGLYPH W015",NULL},
 /* 133C2 */ { "EGYPTIAN HIEROGLYPH W016",NULL},
@@ -33859,14 +34295,15 @@ static const struct unicode_nameannot un
 /* 133C9 */ { "EGYPTIAN HIEROGLYPH W021",NULL},
 /* 133CA */ { "EGYPTIAN HIEROGLYPH W022",NULL},
 /* 133CB */ { "EGYPTIAN HIEROGLYPH W023",NULL},
-/* 133CC */ { "EGYPTIAN HIEROGLYPH W024","	* phonogramm 'nw'"},
-/* 133CD */ { "EGYPTIAN HIEROGLYPH W024A","	* monogramm 'nw(n)' or 'nww'"},
+/* 133CC */ { "EGYPTIAN HIEROGLYPH W024","	* phonogram 'nw'"},
+/* 133CD */ { "EGYPTIAN HIEROGLYPH W024A","	* monogram 'nw(n)' or 'nww'"},
 /* 133CE */ { "EGYPTIAN HIEROGLYPH W025",NULL},
 /* 133CF */ { "EGYPTIAN HIEROGLYPH X001","	* transliterated as t"},
 /* 133D0 */ { "EGYPTIAN HIEROGLYPH X002",NULL},
 /* 133D1 */ { "EGYPTIAN HIEROGLYPH X003","	* variant of 133D0"},
 /* 133D2 */ { "EGYPTIAN HIEROGLYPH X004",NULL},
-/* 133D3 */ { "EGYPTIAN HIEROGLYPH X004A","	* variant of 133D2"},
+/* 133D3 */ { "EGYPTIAN HIEROGLYPH X004A","	* variant of 133D2\n"
+	"	~ 133D3 FE00 rotated 90 degrees"},
 /* 133D4 */ { "EGYPTIAN HIEROGLYPH X004B","	* cake\n"
 	"	* variant of 133D2\n"
 	"	* not to be confused with 13200, 132F0, or 133F3"},
@@ -33882,7 +34319,8 @@ static const struct unicode_nameannot un
 	"	* not to be confused with 131EE"},
 /* 133DB */ { "EGYPTIAN HIEROGLYPH Y001",NULL},
 /* 133DC */ { "EGYPTIAN HIEROGLYPH Y001A","	* rotated variant of 133DB"},
-/* 133DD */ { "EGYPTIAN HIEROGLYPH Y002","	* older variant of 133DB"},
+/* 133DD */ { "EGYPTIAN HIEROGLYPH Y002","	* older variant of 133DB\n"
+	"	~ 133DD FE02 rotated 270 degrees"},
 /* 133DE */ { "EGYPTIAN HIEROGLYPH Y003",NULL},
 /* 133DF */ { "EGYPTIAN HIEROGLYPH Y004","	* mirrored version of 133DE"},
 /* 133E0 */ { "EGYPTIAN HIEROGLYPH Y005",NULL},
@@ -33891,7 +34329,7 @@ static const struct unicode_nameannot un
 /* 133E3 */ { "EGYPTIAN HIEROGLYPH Y008",NULL},
 /* 133E4 */ { "EGYPTIAN HIEROGLYPH Z001","	* semogram index\n"
 	"	* classifier 'single'\n"
-	"	* not to be confuse with 133FA"},
+	"	* not to be confused with 133FA"},
 /* 133E5 */ { "EGYPTIAN HIEROGLYPH Z002","	* classifier 'plural'\n"
 	"	* not to be confused with 133FC"},
 /* 133E6 */ { "EGYPTIAN HIEROGLYPH Z002A","	* stylistic variant of 133E5"},
@@ -33913,12 +34351,14 @@ static const struct unicode_nameannot un
 /* 133F0 */ { "EGYPTIAN HIEROGLYPH Z005A","	* variant of 133EF"},
 /* 133F1 */ { "EGYPTIAN HIEROGLYPH Z006",NULL},
 /* 133F2 */ { "EGYPTIAN HIEROGLYPH Z007","	* phonogram 'w'\n"
-	"	* not to be confused with 13362"},
+	"	* not to be confused with 13362\n"
+	"	~ 133F2 FE00 rotated 90 degrees"},
 /* 133F3 */ { "EGYPTIAN HIEROGLYPH Z008","	* oval\n"
 	"	* not to be confused with 13200, 132F0, or 133D4"},
 /* 133F4 */ { "EGYPTIAN HIEROGLYPH Z009",NULL},
-/* 133F5 */ { "EGYPTIAN HIEROGLYPH Z010","	* older variant of 133F4"},
-/* 133F6 */ { "EGYPTIAN HIEROGLYPH Z011",NULL},
+/* 133F5 */ { "EGYPTIAN HIEROGLYPH Z010","	* older variant of 133F4\n"
+	"	~ 133F5 FE00 rotated 90 degrees"},
+/* 133F6 */ { "EGYPTIAN HIEROGLYPH Z011","	~ 133F6 FE00 rotated 90 degrees"},
 /* 133F7 */ { "EGYPTIAN HIEROGLYPH Z012","	* hieratic"},
 /* 133F8 */ { "EGYPTIAN HIEROGLYPH Z013","	* circle, unmarked round sign\n"
 	"	* not to be confused with 13082 or 131F3"},
@@ -33935,11 +34375,13 @@ static const struct unicode_nameannot un
 /* 133FF */ { "EGYPTIAN HIEROGLYPH Z015E","	* 6"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_34[] = {
 /* 13400 */ { "EGYPTIAN HIEROGLYPH Z015F","	* 7"},
 /* 13401 */ { "EGYPTIAN HIEROGLYPH Z015G","	* 8"},
 /* 13402 */ { "EGYPTIAN HIEROGLYPH Z015H","	* 9"},
-/* 13403 */ { "EGYPTIAN HIEROGLYPH Z015I","	* 5"},
+/* 13403 */ { "EGYPTIAN HIEROGLYPH Z015I","	* 5\n"
+	"	~ 13403 FE00 rotated 90 degrees"},
 /* 13404 */ { "EGYPTIAN HIEROGLYPH Z016","	* 1 in dates"},
 /* 13405 */ { "EGYPTIAN HIEROGLYPH Z016A","	* 2 in dates"},
 /* 13406 */ { "EGYPTIAN HIEROGLYPH Z016B","	* 3 in dates"},
@@ -33959,11 +34401,14 @@ static const struct unicode_nameannot un
 /* 13413 */ { "EGYPTIAN HIEROGLYPH AA007",NULL},
 /* 13414 */ { "EGYPTIAN HIEROGLYPH AA007A","	* mirrored version of 13413"},
 /* 13415 */ { "EGYPTIAN HIEROGLYPH AA007B",NULL},
-/* 13416 */ { "EGYPTIAN HIEROGLYPH AA008",NULL},
+/* 13416 */ { "EGYPTIAN HIEROGLYPH AA008","	~ 13416 FE00 rotated 90 degrees"},
 /* 13417 */ { "EGYPTIAN HIEROGLYPH AA009",NULL},
 /* 13418 */ { "EGYPTIAN HIEROGLYPH AA010",NULL},
-/* 13419 */ { "EGYPTIAN HIEROGLYPH AA011",NULL},
-/* 1341A */ { "EGYPTIAN HIEROGLYPH AA012","	* older variant of 13419"},
+/* 13419 */ { "EGYPTIAN HIEROGLYPH AA011","	~ 13419 FE00 rotated 90 degrees\n"
+	"	~ 13419 FE01 rotated 180 degrees\n"
+	"	~ 13419 FE02 rotated 270 degrees"},
+/* 1341A */ { "EGYPTIAN HIEROGLYPH AA012","	* older variant of 13419\n"
+	"	~ 1341A FE00 rotated 90 degrees"},
 /* 1341B */ { "EGYPTIAN HIEROGLYPH AA013",NULL},
 /* 1341C */ { "EGYPTIAN HIEROGLYPH AA014","	* older variant of 1341B"},
 /* 1341D */ { "EGYPTIAN HIEROGLYPH AA015",NULL},
@@ -33972,7 +34417,7 @@ static const struct unicode_nameannot un
 /* 13420 */ { "EGYPTIAN HIEROGLYPH AA018","	* more recent variant of 1341F"},
 /* 13421 */ { "EGYPTIAN HIEROGLYPH AA019",NULL},
 /* 13422 */ { "EGYPTIAN HIEROGLYPH AA020",NULL},
-/* 13423 */ { "EGYPTIAN HIEROGLYPH AA021",NULL},
+/* 13423 */ { "EGYPTIAN HIEROGLYPH AA021","	~ 13423 FE00 rotated 90 degrees"},
 /* 13424 */ { "EGYPTIAN HIEROGLYPH AA022",NULL},
 /* 13425 */ { "EGYPTIAN HIEROGLYPH AA023",NULL},
 /* 13426 */ { "EGYPTIAN HIEROGLYPH AA024","	* older variant of 13425"},
@@ -33982,10 +34427,11 @@ static const struct unicode_nameannot un
 /* 1342A */ { "EGYPTIAN HIEROGLYPH AA028","	* phonogram 'qd'\n"
 	"	* not to be confused with 131E9 and 132A7"},
 /* 1342B */ { "EGYPTIAN HIEROGLYPH AA029","	* older variant of 1342A"},
-/* 1342C */ { "EGYPTIAN HIEROGLYPH AA030",NULL},
+/* 1342C */ { "EGYPTIAN HIEROGLYPH AA030","	~ 1342C FE02 rotated 270 degrees"},
 /* 1342D */ { "EGYPTIAN HIEROGLYPH AA031","	* older variant of 1342C"},
-/* 1342E */ { "EGYPTIAN HIEROGLYPH AA032",NULL},
-/* 1342F */ { NULL,NULL},
+/* 1342E */ { "EGYPTIAN HIEROGLYPH AA032","	~ 1342E FE02 rotated 270 degrees"},
+/* 1342F */ { "EGYPTIAN HIEROGLYPH V011D","	* knotted beginning of cartouche\n"
+	"	* not to be confused with 13378"},
 /* 13430 */ { "EGYPTIAN HIEROGLYPH VERTICAL JOINER","	= sign separator: subordination (Manuel de Codage)"},
 /* 13431 */ { "EGYPTIAN HIEROGLYPH HORIZONTAL JOINER","	= sign separator: juxtaposition (Manuel de Codage)"},
 /* 13432 */ { "EGYPTIAN HIEROGLYPH INSERT AT TOP START",NULL},
@@ -33995,35 +34441,35 @@ static const struct unicode_nameannot un
 /* 13436 */ { "EGYPTIAN HIEROGLYPH OVERLAY MIDDLE",NULL},
 /* 13437 */ { "EGYPTIAN HIEROGLYPH BEGIN SEGMENT",NULL},
 /* 13438 */ { "EGYPTIAN HIEROGLYPH END SEGMENT",NULL},
-/* 13439 */ { NULL,NULL},
-/* 1343A */ { NULL,NULL},
-/* 1343B */ { NULL,NULL},
-/* 1343C */ { NULL,NULL},
-/* 1343D */ { NULL,NULL},
-/* 1343E */ { NULL,NULL},
-/* 1343F */ { NULL,NULL},
-/* 13440 */ { NULL,NULL},
-/* 13441 */ { NULL,NULL},
-/* 13442 */ { NULL,NULL},
-/* 13443 */ { NULL,NULL},
-/* 13444 */ { NULL,NULL},
-/* 13445 */ { NULL,NULL},
-/* 13446 */ { NULL,NULL},
-/* 13447 */ { NULL,NULL},
-/* 13448 */ { NULL,NULL},
-/* 13449 */ { NULL,NULL},
-/* 1344A */ { NULL,NULL},
-/* 1344B */ { NULL,NULL},
-/* 1344C */ { NULL,NULL},
-/* 1344D */ { NULL,NULL},
-/* 1344E */ { NULL,NULL},
-/* 1344F */ { NULL,NULL},
-/* 13450 */ { NULL,NULL},
-/* 13451 */ { NULL,NULL},
-/* 13452 */ { NULL,NULL},
-/* 13453 */ { NULL,NULL},
-/* 13454 */ { NULL,NULL},
-/* 13455 */ { NULL,NULL},
+/* 13439 */ { "EGYPTIAN HIEROGLYPH INSERT AT MIDDLE",NULL},
+/* 1343A */ { "EGYPTIAN HIEROGLYPH INSERT AT TOP",NULL},
+/* 1343B */ { "EGYPTIAN HIEROGLYPH INSERT AT BOTTOM",NULL},
+/* 1343C */ { "EGYPTIAN HIEROGLYPH BEGIN ENCLOSURE",NULL},
+/* 1343D */ { "EGYPTIAN HIEROGLYPH END ENCLOSURE",NULL},
+/* 1343E */ { "EGYPTIAN HIEROGLYPH BEGIN WALLED ENCLOSURE",NULL},
+/* 1343F */ { "EGYPTIAN HIEROGLYPH END WALLED ENCLOSURE",NULL},
+/* 13440 */ { "EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY",NULL},
+/* 13441 */ { "EGYPTIAN HIEROGLYPH FULL BLANK",NULL},
+/* 13442 */ { "EGYPTIAN HIEROGLYPH HALF BLANK",NULL},
+/* 13443 */ { "EGYPTIAN HIEROGLYPH LOST SIGN","	~ 13443 FE00 expanded "},
+/* 13444 */ { "EGYPTIAN HIEROGLYPH HALF LOST SIGN","	~ 13444 FE00 expanded "},
+/* 13445 */ { "EGYPTIAN HIEROGLYPH TALL LOST SIGN","	~ 13445 FE00 expanded "},
+/* 13446 */ { "EGYPTIAN HIEROGLYPH WIDE LOST SIGN","	~ 13446 FE00 expanded "},
+/* 13447 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START",NULL},
+/* 13448 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START",NULL},
+/* 13449 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START",NULL},
+/* 1344A */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP END",NULL},
+/* 1344B */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP",NULL},
+/* 1344C */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM START AND TOP END",NULL},
+/* 1344D */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND TOP",NULL},
+/* 1344E */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM END",NULL},
+/* 1344F */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START AND BOTTOM END",NULL},
+/* 13450 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM",NULL},
+/* 13451 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT START AND BOTTOM",NULL},
+/* 13452 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT END",NULL},
+/* 13453 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP AND END",NULL},
+/* 13454 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM AND END",NULL},
+/* 13455 */ { "EGYPTIAN HIEROGLYPH MODIFIER DAMAGED",NULL},
 /* 13456 */ { NULL,NULL},
 /* 13457 */ { NULL,NULL},
 /* 13458 */ { NULL,NULL},
@@ -34196,6 +34642,7 @@ static const struct unicode_nameannot un
 /* 134FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_44[] = {
 /* 14400 */ { "ANATOLIAN HIEROGLYPH A001","	= ego"},
 /* 14401 */ { "ANATOLIAN HIEROGLYPH A002","	= ego2"},
@@ -34503,6 +34950,7 @@ static const struct unicode_nameannot un
 /* 144FF */ { "ANATOLIAN HIEROGLYPH A222",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_45[] = {
 /* 14500 */ { "ANATOLIAN HIEROGLYPH A223","	= syllabic sa6"},
 /* 14501 */ { "ANATOLIAN HIEROGLYPH A224","	= syllabic ha? pa?"},
@@ -34807,6 +35255,7 @@ static const struct unicode_nameannot un
 /* 145FF */ { "ANATOLIAN HIEROGLYPH A457",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_46[] = {
 /* 14600 */ { "ANATOLIAN HIEROGLYPH A457A",NULL},
 /* 14601 */ { "ANATOLIAN HIEROGLYPH A458",NULL},
@@ -35067,6 +35516,7 @@ static const struct unicode_nameannot un
 /* 146FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_68[] = {
 /* 16800 */ { "BAMUM LETTER PHASE-A NGKUE MFON",NULL},
 /* 16801 */ { "BAMUM LETTER PHASE-A GBIEE FON",NULL},
@@ -35326,6 +35776,7 @@ static const struct unicode_nameannot un
 /* 168FF */ { "BAMUM LETTER PHASE-D KEUAETMEUN",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_69[] = {
 /* 16900 */ { "BAMUM LETTER PHASE-D TEUT",NULL},
 /* 16901 */ { "BAMUM LETTER PHASE-D SHEUAE",NULL},
@@ -35586,6 +36037,7 @@ static const struct unicode_nameannot un
 /* 169FF */ { "BAMUM LETTER PHASE-E MON",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_6A[] = {
 /* 16A00 */ { "BAMUM LETTER PHASE-E TEN",NULL},
 /* 16A01 */ { "BAMUM LETTER PHASE-E FAQ",NULL},
@@ -35845,6 +36297,7 @@ static const struct unicode_nameannot un
 /* 16AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_6B[] = {
 /* 16B00 */ { "PAHAWH HMONG VOWEL KEEB","	= keem"},
 /* 16B01 */ { "PAHAWH HMONG VOWEL KEEV","	= kee"},
@@ -36107,6 +36560,7 @@ static const struct unicode_nameannot un
 /* 16BFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_6E[] = {
 /* 16E00 */ { NULL,NULL},
 /* 16E01 */ { NULL,NULL},
@@ -36366,6 +36820,7 @@ static const struct unicode_nameannot un
 /* 16EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_6F[] = {
 /* 16F00 */ { "MIAO LETTER PA","	* used for ba in Gan Yi"},
 /* 16F01 */ { "MIAO LETTER BA",NULL},
@@ -36628,6 +37083,7 @@ static const struct unicode_nameannot un
 /* 16FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_88[] = {
 /* 18800 */ { "TANGUT COMPONENT-001",NULL},
 /* 18801 */ { "TANGUT COMPONENT-002",NULL},
@@ -36887,6 +37343,7 @@ static const struct unicode_nameannot un
 /* 188FF */ { "TANGUT COMPONENT-256",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_89[] = {
 /* 18900 */ { "TANGUT COMPONENT-257",NULL},
 /* 18901 */ { "TANGUT COMPONENT-258",NULL},
@@ -37146,6 +37603,7 @@ static const struct unicode_nameannot un
 /* 189FF */ { "TANGUT COMPONENT-512",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_8A[] = {
 /* 18A00 */ { "TANGUT COMPONENT-513",NULL},
 /* 18A01 */ { "TANGUT COMPONENT-514",NULL},
@@ -37405,6 +37863,7 @@ static const struct unicode_nameannot un
 /* 18AFF */ { "TANGUT COMPONENT-768","	* four strokes"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_8B[] = {
 /* 18B00 */ { "KHITAN SMALL SCRIPT CHARACTER-18B00",NULL},
 /* 18B01 */ { "KHITAN SMALL SCRIPT CHARACTER-18B01",NULL},
@@ -37628,7 +38087,7 @@ static const struct unicode_nameannot un
 /* 18BDB */ { "KHITAN SMALL SCRIPT CHARACTER-18BDB",NULL},
 /* 18BDC */ { "KHITAN SMALL SCRIPT CHARACTER-18BDC",NULL},
 /* 18BDD */ { "KHITAN SMALL SCRIPT CHARACTER-18BDD",NULL},
-/* 18BDE */ { "KHITAN SMALL SCRIPT CHARACTER-18BDE",NULL},
+/* 18BDE */ { "KHITAN SMALL SCRIPT CHARACTER-18BDE","	x (khitan small script character-18cca - 18CCA)"},
 /* 18BDF */ { "KHITAN SMALL SCRIPT CHARACTER-18BDF",NULL},
 /* 18BE0 */ { "KHITAN SMALL SCRIPT CHARACTER-18BE0",NULL},
 /* 18BE1 */ { "KHITAN SMALL SCRIPT CHARACTER-18BE1",NULL},
@@ -37664,6 +38123,7 @@ static const struct unicode_nameannot un
 /* 18BFF */ { "KHITAN SMALL SCRIPT CHARACTER-18BFF",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_8C[] = {
 /* 18C00 */ { "KHITAN SMALL SCRIPT CHARACTER-18C00",NULL},
 /* 18C01 */ { "KHITAN SMALL SCRIPT CHARACTER-18C01",NULL},
@@ -37867,7 +38327,7 @@ static const struct unicode_nameannot un
 /* 18CC7 */ { "KHITAN SMALL SCRIPT CHARACTER-18CC7",NULL},
 /* 18CC8 */ { "KHITAN SMALL SCRIPT CHARACTER-18CC8",NULL},
 /* 18CC9 */ { "KHITAN SMALL SCRIPT CHARACTER-18CC9",NULL},
-/* 18CCA */ { "KHITAN SMALL SCRIPT CHARACTER-18CCA",NULL},
+/* 18CCA */ { "KHITAN SMALL SCRIPT CHARACTER-18CCA","	x (khitan small script character-18bde - 18BDE)"},
 /* 18CCB */ { "KHITAN SMALL SCRIPT CHARACTER-18CCB",NULL},
 /* 18CCC */ { "KHITAN SMALL SCRIPT CHARACTER-18CCC",NULL},
 /* 18CCD */ { "KHITAN SMALL SCRIPT CHARACTER-18CCD",NULL},
@@ -37923,6 +38383,7 @@ static const struct unicode_nameannot un
 /* 18CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_AF[] = {
 /* 1AF00 */ { NULL,NULL},
 /* 1AF01 */ { NULL,NULL},
@@ -38182,6 +38643,7 @@ static const struct unicode_nameannot un
 /* 1AFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_B0[] = {
 /* 1B000 */ { "KATAKANA LETTER ARCHAIC E",NULL},
 /* 1B001 */ { "HIRAGANA LETTER ARCHAIC YE","	% HENTAIGANA LETTER E-1\n"
@@ -38442,6 +38904,7 @@ static const struct unicode_nameannot un
 /* 1B0FF */ { "HENTAIGANA LETTER RE-2","	* derived from 79AE"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_B1[] = {
 /* 1B100 */ { "HENTAIGANA LETTER RE-3","	* derived from 9023"},
 /* 1B101 */ { "HENTAIGANA LETTER RE-4","	* derived from 9E97"},
@@ -38493,7 +38956,7 @@ static const struct unicode_nameannot un
 /* 1B12F */ { NULL,NULL},
 /* 1B130 */ { NULL,NULL},
 /* 1B131 */ { NULL,NULL},
-/* 1B132 */ { NULL,NULL},
+/* 1B132 */ { "HIRAGANA LETTER SMALL KO",NULL},
 /* 1B133 */ { NULL,NULL},
 /* 1B134 */ { NULL,NULL},
 /* 1B135 */ { NULL,NULL},
@@ -38528,7 +38991,7 @@ static const struct unicode_nameannot un
 /* 1B152 */ { "HIRAGANA LETTER SMALL WO",NULL},
 /* 1B153 */ { NULL,NULL},
 /* 1B154 */ { NULL,NULL},
-/* 1B155 */ { NULL,NULL},
+/* 1B155 */ { "KATAKANA LETTER SMALL KO",NULL},
 /* 1B156 */ { NULL,NULL},
 /* 1B157 */ { NULL,NULL},
 /* 1B158 */ { NULL,NULL},
@@ -38701,6 +39164,7 @@ static const struct unicode_nameannot un
 /* 1B1FF */ { "NUSHU CHARACTER-1B1FF",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_B2[] = {
 /* 1B200 */ { "NUSHU CHARACTER-1B200",NULL},
 /* 1B201 */ { "NUSHU CHARACTER-1B201","	x 591A"},
@@ -38960,6 +39424,7 @@ static const struct unicode_nameannot un
 /* 1B2FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_BC[] = {
 /* 1BC00 */ { "DUPLOYAN LETTER H","	* Chinook, Pernin, Sloan, Perrault"},
 /* 1BC01 */ { "DUPLOYAN LETTER X","	* Salishan"},
@@ -39381,6 +39846,7 @@ static const struct unicode_nameannot un
 /* 1BCFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_CF[] = {
 /* 1CF00 */ { "ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT",NULL},
 /* 1CF01 */ { "ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT",NULL},
@@ -39640,6 +40106,7 @@ static const struct unicode_nameannot un
 /* 1CFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D0[] = {
 /* 1D000 */ { "BYZANTINE MUSICAL SYMBOL PSILI",NULL},
 /* 1D001 */ { "BYZANTINE MUSICAL SYMBOL DASEIA",NULL},
@@ -39902,6 +40369,7 @@ static const struct unicode_nameannot un
 /* 1D0FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D1[] = {
 /* 1D100 */ { "MUSICAL SYMBOL SINGLE BARLINE",NULL},
 /* 1D101 */ { "MUSICAL SYMBOL DOUBLE BARLINE",NULL},
@@ -40172,6 +40640,7 @@ static const struct unicode_nameannot un
 /* 1D1FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D2[] = {
 /* 1D200 */ { "GREEK VOCAL NOTATION SYMBOL-1","	* vocal E"},
 /* 1D201 */ { "GREEK VOCAL NOTATION SYMBOL-2","	* vocal first sharp of E"},
@@ -40389,26 +40858,26 @@ static const struct unicode_nameannot un
 /* 1D2BD */ { NULL,NULL},
 /* 1D2BE */ { NULL,NULL},
 /* 1D2BF */ { NULL,NULL},
-/* 1D2C0 */ { NULL,NULL},
-/* 1D2C1 */ { NULL,NULL},
-/* 1D2C2 */ { NULL,NULL},
-/* 1D2C3 */ { NULL,NULL},
-/* 1D2C4 */ { NULL,NULL},
-/* 1D2C5 */ { NULL,NULL},
-/* 1D2C6 */ { NULL,NULL},
-/* 1D2C7 */ { NULL,NULL},
-/* 1D2C8 */ { NULL,NULL},
-/* 1D2C9 */ { NULL,NULL},
-/* 1D2CA */ { NULL,NULL},
-/* 1D2CB */ { NULL,NULL},
-/* 1D2CC */ { NULL,NULL},
-/* 1D2CD */ { NULL,NULL},
-/* 1D2CE */ { NULL,NULL},
-/* 1D2CF */ { NULL,NULL},
-/* 1D2D0 */ { NULL,NULL},
-/* 1D2D1 */ { NULL,NULL},
-/* 1D2D2 */ { NULL,NULL},
-/* 1D2D3 */ { NULL,NULL},
+/* 1D2C0 */ { "KAKTOVIK NUMERAL ZERO",NULL},
+/* 1D2C1 */ { "KAKTOVIK NUMERAL ONE",NULL},
+/* 1D2C2 */ { "KAKTOVIK NUMERAL TWO",NULL},
+/* 1D2C3 */ { "KAKTOVIK NUMERAL THREE",NULL},
+/* 1D2C4 */ { "KAKTOVIK NUMERAL FOUR",NULL},
+/* 1D2C5 */ { "KAKTOVIK NUMERAL FIVE",NULL},
+/* 1D2C6 */ { "KAKTOVIK NUMERAL SIX",NULL},
+/* 1D2C7 */ { "KAKTOVIK NUMERAL SEVEN",NULL},
+/* 1D2C8 */ { "KAKTOVIK NUMERAL EIGHT",NULL},
+/* 1D2C9 */ { "KAKTOVIK NUMERAL NINE",NULL},
+/* 1D2CA */ { "KAKTOVIK NUMERAL TEN",NULL},
+/* 1D2CB */ { "KAKTOVIK NUMERAL ELEVEN",NULL},
+/* 1D2CC */ { "KAKTOVIK NUMERAL TWELVE",NULL},
+/* 1D2CD */ { "KAKTOVIK NUMERAL THIRTEEN",NULL},
+/* 1D2CE */ { "KAKTOVIK NUMERAL FOURTEEN",NULL},
+/* 1D2CF */ { "KAKTOVIK NUMERAL FIFTEEN",NULL},
+/* 1D2D0 */ { "KAKTOVIK NUMERAL SIXTEEN",NULL},
+/* 1D2D1 */ { "KAKTOVIK NUMERAL SEVENTEEN",NULL},
+/* 1D2D2 */ { "KAKTOVIK NUMERAL EIGHTEEN",NULL},
+/* 1D2D3 */ { "KAKTOVIK NUMERAL NINETEEN",NULL},
 /* 1D2D4 */ { NULL,NULL},
 /* 1D2D5 */ { NULL,NULL},
 /* 1D2D6 */ { NULL,NULL},
@@ -40455,6 +40924,7 @@ static const struct unicode_nameannot un
 /* 1D2FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D3[] = {
 /* 1D300 */ { "MONOGRAM FOR EARTH","	= ren\n"
 	"	* usually associated with human (Chinese rén), rather than earth (Chinese dì)\n"
@@ -40717,6 +41187,7 @@ static const struct unicode_nameannot un
 /* 1D3FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D4[] = {
 /* 1D400 */ { "MATHEMATICAL BOLD CAPITAL A","	# <font> 0041 latin capital letter a"},
 /* 1D401 */ { "MATHEMATICAL BOLD CAPITAL B","	# <font> 0042 latin capital letter b"},
@@ -41014,6 +41485,7 @@ static const struct unicode_nameannot un
 /* 1D4FF */ { "MATHEMATICAL BOLD SCRIPT SMALL V","	# <font> 0076 latin small letter v"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D5[] = {
 /* 1D500 */ { "MATHEMATICAL BOLD SCRIPT SMALL W","	# <font> 0077 latin small letter w"},
 /* 1D501 */ { "MATHEMATICAL BOLD SCRIPT SMALL X","	# <font> 0078 latin small letter x"},
@@ -41276,6 +41748,7 @@ static const struct unicode_nameannot un
 /* 1D5FF */ { "MATHEMATICAL SANS-SERIF BOLD SMALL R","	# <font> 0072 latin small letter r"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D6[] = {
 /* 1D600 */ { "MATHEMATICAL SANS-SERIF BOLD SMALL S","	# <font> 0073 latin small letter s"},
 /* 1D601 */ { "MATHEMATICAL SANS-SERIF BOLD SMALL T","	# <font> 0074 latin small letter t"},
@@ -41541,6 +42014,7 @@ static const struct unicode_nameannot un
 /* 1D6FF */ { "MATHEMATICAL ITALIC SMALL DELTA","	# <font> 03B4 greek small letter delta"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D7[] = {
 /* 1D700 */ { "MATHEMATICAL ITALIC SMALL EPSILON","	# <font> 03B5 greek small letter epsilon"},
 /* 1D701 */ { "MATHEMATICAL ITALIC SMALL ZETA","	# <font> 03B6 greek small letter zeta"},
@@ -41800,6 +42274,7 @@ static const struct unicode_nameannot un
 /* 1D7FF */ { "MATHEMATICAL MONOSPACE DIGIT NINE","	# <font> 0039 digit nine"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D8[] = {
 /* 1D800 */ { "SIGNWRITING HAND-FIST INDEX",NULL},
 /* 1D801 */ { "SIGNWRITING HAND-CIRCLE INDEX",NULL},
@@ -42059,6 +42534,7 @@ static const struct unicode_nameannot un
 /* 1D8FF */ { "SIGNWRITING HAND-FIST THUMB OVER TWO FINGERS",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_D9[] = {
 /* 1D900 */ { "SIGNWRITING HAND-FIST THUMB UNDER THREE FINGERS",NULL},
 /* 1D901 */ { "SIGNWRITING HAND-FIST THUMB UNDER FOUR FINGERS",NULL},
@@ -42318,6 +42794,7 @@ static const struct unicode_nameannot un
 /* 1D9FF */ { "SIGNWRITING HEAD",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_DA[] = {
 /* 1DA00 */ { "SIGNWRITING HEAD RIM",NULL},
 /* 1DA01 */ { "SIGNWRITING HEAD MOVEMENT-WALLPLANE STRAIGHT",NULL},
@@ -42577,6 +43054,7 @@ static const struct unicode_nameannot un
 /* 1DAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_DF[] = {
 /* 1DF00 */ { "LATIN SMALL LETTER FENG DIGRAPH WITH TRILL",NULL},
 /* 1DF01 */ { "LATIN SMALL LETTER REVERSED SCRIPT G",NULL},
@@ -42615,12 +43093,12 @@ static const struct unicode_nameannot un
 /* 1DF22 */ { NULL,NULL},
 /* 1DF23 */ { NULL,NULL},
 /* 1DF24 */ { NULL,NULL},
-/* 1DF25 */ { NULL,NULL},
-/* 1DF26 */ { NULL,NULL},
-/* 1DF27 */ { NULL,NULL},
-/* 1DF28 */ { NULL,NULL},
-/* 1DF29 */ { NULL,NULL},
-/* 1DF2A */ { NULL,NULL},
+/* 1DF25 */ { "LATIN SMALL LETTER D WITH MID-HEIGHT LEFT HOOK",NULL},
+/* 1DF26 */ { "LATIN SMALL LETTER L WITH MID-HEIGHT LEFT HOOK",NULL},
+/* 1DF27 */ { "LATIN SMALL LETTER N WITH MID-HEIGHT LEFT HOOK",NULL},
+/* 1DF28 */ { "LATIN SMALL LETTER R WITH MID-HEIGHT LEFT HOOK",NULL},
+/* 1DF29 */ { "LATIN SMALL LETTER S WITH MID-HEIGHT LEFT HOOK",NULL},
+/* 1DF2A */ { "LATIN SMALL LETTER T WITH MID-HEIGHT LEFT HOOK",NULL},
 /* 1DF2B */ { NULL,NULL},
 /* 1DF2C */ { NULL,NULL},
 /* 1DF2D */ { NULL,NULL},
@@ -42836,6 +43314,7 @@ static const struct unicode_nameannot un
 /* 1DFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_E0[] = {
 /* 1E000 */ { "COMBINING GLAGOLITIC LETTER AZU",NULL},
 /* 1E001 */ { "COMBINING GLAGOLITIC LETTER BUKY",NULL},
@@ -42885,68 +43364,68 @@ static const struct unicode_nameannot un
 /* 1E02D */ { NULL,NULL},
 /* 1E02E */ { NULL,NULL},
 /* 1E02F */ { NULL,NULL},
-/* 1E030 */ { NULL,NULL},
-/* 1E031 */ { NULL,NULL},
-/* 1E032 */ { NULL,NULL},
-/* 1E033 */ { NULL,NULL},
-/* 1E034 */ { NULL,NULL},
-/* 1E035 */ { NULL,NULL},
-/* 1E036 */ { NULL,NULL},
-/* 1E037 */ { NULL,NULL},
-/* 1E038 */ { NULL,NULL},
-/* 1E039 */ { NULL,NULL},
-/* 1E03A */ { NULL,NULL},
-/* 1E03B */ { NULL,NULL},
-/* 1E03C */ { NULL,NULL},
-/* 1E03D */ { NULL,NULL},
-/* 1E03E */ { NULL,NULL},
-/* 1E03F */ { NULL,NULL},
-/* 1E040 */ { NULL,NULL},
-/* 1E041 */ { NULL,NULL},
-/* 1E042 */ { NULL,NULL},
-/* 1E043 */ { NULL,NULL},
-/* 1E044 */ { NULL,NULL},
-/* 1E045 */ { NULL,NULL},
-/* 1E046 */ { NULL,NULL},
-/* 1E047 */ { NULL,NULL},
-/* 1E048 */ { NULL,NULL},
-/* 1E049 */ { NULL,NULL},
-/* 1E04A */ { NULL,NULL},
-/* 1E04B */ { NULL,NULL},
-/* 1E04C */ { NULL,NULL},
-/* 1E04D */ { NULL,NULL},
-/* 1E04E */ { NULL,NULL},
-/* 1E04F */ { NULL,NULL},
-/* 1E050 */ { NULL,NULL},
-/* 1E051 */ { NULL,NULL},
-/* 1E052 */ { NULL,NULL},
-/* 1E053 */ { NULL,NULL},
-/* 1E054 */ { NULL,NULL},
-/* 1E055 */ { NULL,NULL},
-/* 1E056 */ { NULL,NULL},
-/* 1E057 */ { NULL,NULL},
-/* 1E058 */ { NULL,NULL},
-/* 1E059 */ { NULL,NULL},
-/* 1E05A */ { NULL,NULL},
-/* 1E05B */ { NULL,NULL},
-/* 1E05C */ { NULL,NULL},
-/* 1E05D */ { NULL,NULL},
-/* 1E05E */ { NULL,NULL},
-/* 1E05F */ { NULL,NULL},
-/* 1E060 */ { NULL,NULL},
-/* 1E061 */ { NULL,NULL},
-/* 1E062 */ { NULL,NULL},
-/* 1E063 */ { NULL,NULL},
-/* 1E064 */ { NULL,NULL},
-/* 1E065 */ { NULL,NULL},
-/* 1E066 */ { NULL,NULL},
-/* 1E067 */ { NULL,NULL},
-/* 1E068 */ { NULL,NULL},
-/* 1E069 */ { NULL,NULL},
-/* 1E06A */ { NULL,NULL},
-/* 1E06B */ { NULL,NULL},
-/* 1E06C */ { NULL,NULL},
-/* 1E06D */ { NULL,NULL},
+/* 1E030 */ { "MODIFIER LETTER CYRILLIC SMALL A","	# <super> 0430"},
+/* 1E031 */ { "MODIFIER LETTER CYRILLIC SMALL BE","	# <super> 0431"},
+/* 1E032 */ { "MODIFIER LETTER CYRILLIC SMALL VE","	# <super> 0432"},
+/* 1E033 */ { "MODIFIER LETTER CYRILLIC SMALL GHE","	# <super> 0433"},
+/* 1E034 */ { "MODIFIER LETTER CYRILLIC SMALL DE","	# <super> 0434"},
+/* 1E035 */ { "MODIFIER LETTER CYRILLIC SMALL IE","	# <super> 0435"},
+/* 1E036 */ { "MODIFIER LETTER CYRILLIC SMALL ZHE","	# <super> 0436"},
+/* 1E037 */ { "MODIFIER LETTER CYRILLIC SMALL ZE","	# <super> 0437"},
+/* 1E038 */ { "MODIFIER LETTER CYRILLIC SMALL I","	# <super> 0438"},
+/* 1E039 */ { "MODIFIER LETTER CYRILLIC SMALL KA","	# <super> 043A"},
+/* 1E03A */ { "MODIFIER LETTER CYRILLIC SMALL EL","	# <super> 043B"},
+/* 1E03B */ { "MODIFIER LETTER CYRILLIC SMALL EM","	# <super> 043C"},
+/* 1E03C */ { "MODIFIER LETTER CYRILLIC SMALL O","	# <super> 043E"},
+/* 1E03D */ { "MODIFIER LETTER CYRILLIC SMALL PE","	# <super> 043F"},
+/* 1E03E */ { "MODIFIER LETTER CYRILLIC SMALL ER","	# <super> 0440"},
+/* 1E03F */ { "MODIFIER LETTER CYRILLIC SMALL ES","	# <super> 0441"},
+/* 1E040 */ { "MODIFIER LETTER CYRILLIC SMALL TE","	# <super> 0442"},
+/* 1E041 */ { "MODIFIER LETTER CYRILLIC SMALL U","	# <super> 0443"},
+/* 1E042 */ { "MODIFIER LETTER CYRILLIC SMALL EF","	# <super> 0444"},
+/* 1E043 */ { "MODIFIER LETTER CYRILLIC SMALL HA","	# <super> 0445"},
+/* 1E044 */ { "MODIFIER LETTER CYRILLIC SMALL TSE","	# <super> 0446"},
+/* 1E045 */ { "MODIFIER LETTER CYRILLIC SMALL CHE","	# <super> 0447"},
+/* 1E046 */ { "MODIFIER LETTER CYRILLIC SMALL SHA","	# <super> 0448"},
+/* 1E047 */ { "MODIFIER LETTER CYRILLIC SMALL YERU","	# <super> 044B"},
+/* 1E048 */ { "MODIFIER LETTER CYRILLIC SMALL E","	# <super> 044D"},
+/* 1E049 */ { "MODIFIER LETTER CYRILLIC SMALL YU","	# <super> 044E"},
+/* 1E04A */ { "MODIFIER LETTER CYRILLIC SMALL DZZE","	# <super> A689"},
+/* 1E04B */ { "MODIFIER LETTER CYRILLIC SMALL SCHWA","	# <super> 04D9"},
+/* 1E04C */ { "MODIFIER LETTER CYRILLIC SMALL BYELORUSSIAN-UKRAINIAN I","	# <super> 0456"},
+/* 1E04D */ { "MODIFIER LETTER CYRILLIC SMALL JE","	# <super> 0458"},
+/* 1E04E */ { "MODIFIER LETTER CYRILLIC SMALL BARRED O","	# <super> 04E9"},
+/* 1E04F */ { "MODIFIER LETTER CYRILLIC SMALL STRAIGHT U","	# <super> 04AF"},
+/* 1E050 */ { "MODIFIER LETTER CYRILLIC SMALL PALOCHKA","	# <super> 04CF"},
+/* 1E051 */ { "CYRILLIC SUBSCRIPT SMALL LETTER A","	# <sub> 0430"},
+/* 1E052 */ { "CYRILLIC SUBSCRIPT SMALL LETTER BE","	# <sub> 0431"},
+/* 1E053 */ { "CYRILLIC SUBSCRIPT SMALL LETTER VE","	# <sub> 0432"},
+/* 1E054 */ { "CYRILLIC SUBSCRIPT SMALL LETTER GHE","	# <sub> 0433"},
+/* 1E055 */ { "CYRILLIC SUBSCRIPT SMALL LETTER DE","	# <sub> 0434"},
+/* 1E056 */ { "CYRILLIC SUBSCRIPT SMALL LETTER IE","	# <sub> 0435"},
+/* 1E057 */ { "CYRILLIC SUBSCRIPT SMALL LETTER ZHE","	# <sub> 0436"},
+/* 1E058 */ { "CYRILLIC SUBSCRIPT SMALL LETTER ZE","	# <sub> 0437"},
+/* 1E059 */ { "CYRILLIC SUBSCRIPT SMALL LETTER I","	# <sub> 0438"},
+/* 1E05A */ { "CYRILLIC SUBSCRIPT SMALL LETTER KA","	# <sub> 043A"},
+/* 1E05B */ { "CYRILLIC SUBSCRIPT SMALL LETTER EL","	# <sub> 043B"},
+/* 1E05C */ { "CYRILLIC SUBSCRIPT SMALL LETTER O","	# <sub> 043E"},
+/* 1E05D */ { "CYRILLIC SUBSCRIPT SMALL LETTER PE","	# <sub> 043F"},
+/* 1E05E */ { "CYRILLIC SUBSCRIPT SMALL LETTER ES","	# <sub> 0441"},
+/* 1E05F */ { "CYRILLIC SUBSCRIPT SMALL LETTER U","	# <sub> 0443"},
+/* 1E060 */ { "CYRILLIC SUBSCRIPT SMALL LETTER EF","	# <sub> 0444"},
+/* 1E061 */ { "CYRILLIC SUBSCRIPT SMALL LETTER HA","	# <sub> 0445"},
+/* 1E062 */ { "CYRILLIC SUBSCRIPT SMALL LETTER TSE","	# <sub> 0446"},
+/* 1E063 */ { "CYRILLIC SUBSCRIPT SMALL LETTER CHE","	# <sub> 0447"},
+/* 1E064 */ { "CYRILLIC SUBSCRIPT SMALL LETTER SHA","	# <sub> 0448"},
+/* 1E065 */ { "CYRILLIC SUBSCRIPT SMALL LETTER HARD SIGN","	# <sub> 044A"},
+/* 1E066 */ { "CYRILLIC SUBSCRIPT SMALL LETTER YERU","	# <sub> 044B"},
+/* 1E067 */ { "CYRILLIC SUBSCRIPT SMALL LETTER GHE WITH UPTURN","	# <sub> 0491"},
+/* 1E068 */ { "CYRILLIC SUBSCRIPT SMALL LETTER BYELORUSSIAN-UKRAINIAN I","	# <sub> 0456"},
+/* 1E069 */ { "CYRILLIC SUBSCRIPT SMALL LETTER DZE","	# <sub> 0455"},
+/* 1E06A */ { "CYRILLIC SUBSCRIPT SMALL LETTER DZHE","	# <sub> 045F"},
+/* 1E06B */ { "MODIFIER LETTER CYRILLIC SMALL ES WITH DESCENDER","	# <super> 04AB"},
+/* 1E06C */ { "MODIFIER LETTER CYRILLIC SMALL YERU WITH BACK YER","	# <super> A651"},
+/* 1E06D */ { "MODIFIER LETTER CYRILLIC SMALL STRAIGHT U WITH STROKE","	# <super> 04B1"},
 /* 1E06E */ { NULL,NULL},
 /* 1E06F */ { NULL,NULL},
 /* 1E070 */ { NULL,NULL},
@@ -42980,7 +43459,7 @@ static const struct unicode_nameannot un
 /* 1E08C */ { NULL,NULL},
 /* 1E08D */ { NULL,NULL},
 /* 1E08E */ { NULL,NULL},
-/* 1E08F */ { NULL,NULL},
+/* 1E08F */ { "COMBINING CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I",NULL},
 /* 1E090 */ { NULL,NULL},
 /* 1E091 */ { NULL,NULL},
 /* 1E092 */ { NULL,NULL},
@@ -43095,6 +43574,7 @@ static const struct unicode_nameannot un
 /* 1E0FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_E1[] = {
 /* 1E100 */ { "NYIAKENG PUACHUE HMONG LETTER MA","	x (hebrew letter mem - 05DE)"},
 /* 1E101 */ { "NYIAKENG PUACHUE HMONG LETTER TSA",NULL},
@@ -43365,6 +43845,7 @@ static const struct unicode_nameannot un
 /* 1E1FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_E2[] = {
 /* 1E200 */ { NULL,NULL},
 /* 1E201 */ { NULL,NULL},
@@ -43625,6 +44106,268 @@ static const struct unicode_nameannot un
 	"	x (indian rupee sign - 20B9)"}
 };
 
+UN_DLL_LOCAL
+static const struct unicode_nameannot una_01_E4[] = {
+/* 1E400 */ { NULL,NULL},
+/* 1E401 */ { NULL,NULL},
+/* 1E402 */ { NULL,NULL},
+/* 1E403 */ { NULL,NULL},
+/* 1E404 */ { NULL,NULL},
+/* 1E405 */ { NULL,NULL},
+/* 1E406 */ { NULL,NULL},
+/* 1E407 */ { NULL,NULL},
+/* 1E408 */ { NULL,NULL},
+/* 1E409 */ { NULL,NULL},
+/* 1E40A */ { NULL,NULL},
+/* 1E40B */ { NULL,NULL},
+/* 1E40C */ { NULL,NULL},
+/* 1E40D */ { NULL,NULL},
+/* 1E40E */ { NULL,NULL},
+/* 1E40F */ { NULL,NULL},
+/* 1E410 */ { NULL,NULL},
+/* 1E411 */ { NULL,NULL},
+/* 1E412 */ { NULL,NULL},
+/* 1E413 */ { NULL,NULL},
+/* 1E414 */ { NULL,NULL},
+/* 1E415 */ { NULL,NULL},
+/* 1E416 */ { NULL,NULL},
+/* 1E417 */ { NULL,NULL},
+/* 1E418 */ { NULL,NULL},
+/* 1E419 */ { NULL,NULL},
+/* 1E41A */ { NULL,NULL},
+/* 1E41B */ { NULL,NULL},
+/* 1E41C */ { NULL,NULL},
+/* 1E41D */ { NULL,NULL},
+/* 1E41E */ { NULL,NULL},
+/* 1E41F */ { NULL,NULL},
+/* 1E420 */ { NULL,NULL},
+/* 1E421 */ { NULL,NULL},
+/* 1E422 */ { NULL,NULL},
+/* 1E423 */ { NULL,NULL},
+/* 1E424 */ { NULL,NULL},
+/* 1E425 */ { NULL,NULL},
+/* 1E426 */ { NULL,NULL},
+/* 1E427 */ { NULL,NULL},
+/* 1E428 */ { NULL,NULL},
+/* 1E429 */ { NULL,NULL},
+/* 1E42A */ { NULL,NULL},
+/* 1E42B */ { NULL,NULL},
+/* 1E42C */ { NULL,NULL},
+/* 1E42D */ { NULL,NULL},
+/* 1E42E */ { NULL,NULL},
+/* 1E42F */ { NULL,NULL},
+/* 1E430 */ { NULL,NULL},
+/* 1E431 */ { NULL,NULL},
+/* 1E432 */ { NULL,NULL},
+/* 1E433 */ { NULL,NULL},
+/* 1E434 */ { NULL,NULL},
+/* 1E435 */ { NULL,NULL},
+/* 1E436 */ { NULL,NULL},
+/* 1E437 */ { NULL,NULL},
+/* 1E438 */ { NULL,NULL},
+/* 1E439 */ { NULL,NULL},
+/* 1E43A */ { NULL,NULL},
+/* 1E43B */ { NULL,NULL},
+/* 1E43C */ { NULL,NULL},
+/* 1E43D */ { NULL,NULL},
+/* 1E43E */ { NULL,NULL},
+/* 1E43F */ { NULL,NULL},
+/* 1E440 */ { NULL,NULL},
+/* 1E441 */ { NULL,NULL},
+/* 1E442 */ { NULL,NULL},
+/* 1E443 */ { NULL,NULL},
+/* 1E444 */ { NULL,NULL},
+/* 1E445 */ { NULL,NULL},
+/* 1E446 */ { NULL,NULL},
+/* 1E447 */ { NULL,NULL},
+/* 1E448 */ { NULL,NULL},
+/* 1E449 */ { NULL,NULL},
+/* 1E44A */ { NULL,NULL},
+/* 1E44B */ { NULL,NULL},
+/* 1E44C */ { NULL,NULL},
+/* 1E44D */ { NULL,NULL},
+/* 1E44E */ { NULL,NULL},
+/* 1E44F */ { NULL,NULL},
+/* 1E450 */ { NULL,NULL},
+/* 1E451 */ { NULL,NULL},
+/* 1E452 */ { NULL,NULL},
+/* 1E453 */ { NULL,NULL},
+/* 1E454 */ { NULL,NULL},
+/* 1E455 */ { NULL,NULL},
+/* 1E456 */ { NULL,NULL},
+/* 1E457 */ { NULL,NULL},
+/* 1E458 */ { NULL,NULL},
+/* 1E459 */ { NULL,NULL},
+/* 1E45A */ { NULL,NULL},
+/* 1E45B */ { NULL,NULL},
+/* 1E45C */ { NULL,NULL},
+/* 1E45D */ { NULL,NULL},
+/* 1E45E */ { NULL,NULL},
+/* 1E45F */ { NULL,NULL},
+/* 1E460 */ { NULL,NULL},
+/* 1E461 */ { NULL,NULL},
+/* 1E462 */ { NULL,NULL},
+/* 1E463 */ { NULL,NULL},
+/* 1E464 */ { NULL,NULL},
+/* 1E465 */ { NULL,NULL},
+/* 1E466 */ { NULL,NULL},
+/* 1E467 */ { NULL,NULL},
+/* 1E468 */ { NULL,NULL},
+/* 1E469 */ { NULL,NULL},
+/* 1E46A */ { NULL,NULL},
+/* 1E46B */ { NULL,NULL},
+/* 1E46C */ { NULL,NULL},
+/* 1E46D */ { NULL,NULL},
+/* 1E46E */ { NULL,NULL},
+/* 1E46F */ { NULL,NULL},
+/* 1E470 */ { NULL,NULL},
+/* 1E471 */ { NULL,NULL},
+/* 1E472 */ { NULL,NULL},
+/* 1E473 */ { NULL,NULL},
+/* 1E474 */ { NULL,NULL},
+/* 1E475 */ { NULL,NULL},
+/* 1E476 */ { NULL,NULL},
+/* 1E477 */ { NULL,NULL},
+/* 1E478 */ { NULL,NULL},
+/* 1E479 */ { NULL,NULL},
+/* 1E47A */ { NULL,NULL},
+/* 1E47B */ { NULL,NULL},
+/* 1E47C */ { NULL,NULL},
+/* 1E47D */ { NULL,NULL},
+/* 1E47E */ { NULL,NULL},
+/* 1E47F */ { NULL,NULL},
+/* 1E480 */ { NULL,NULL},
+/* 1E481 */ { NULL,NULL},
+/* 1E482 */ { NULL,NULL},
+/* 1E483 */ { NULL,NULL},
+/* 1E484 */ { NULL,NULL},
+/* 1E485 */ { NULL,NULL},
+/* 1E486 */ { NULL,NULL},
+/* 1E487 */ { NULL,NULL},
+/* 1E488 */ { NULL,NULL},
+/* 1E489 */ { NULL,NULL},
+/* 1E48A */ { NULL,NULL},
+/* 1E48B */ { NULL,NULL},
+/* 1E48C */ { NULL,NULL},
+/* 1E48D */ { NULL,NULL},
+/* 1E48E */ { NULL,NULL},
+/* 1E48F */ { NULL,NULL},
+/* 1E490 */ { NULL,NULL},
+/* 1E491 */ { NULL,NULL},
+/* 1E492 */ { NULL,NULL},
+/* 1E493 */ { NULL,NULL},
+/* 1E494 */ { NULL,NULL},
+/* 1E495 */ { NULL,NULL},
+/* 1E496 */ { NULL,NULL},
+/* 1E497 */ { NULL,NULL},
+/* 1E498 */ { NULL,NULL},
+/* 1E499 */ { NULL,NULL},
+/* 1E49A */ { NULL,NULL},
+/* 1E49B */ { NULL,NULL},
+/* 1E49C */ { NULL,NULL},
+/* 1E49D */ { NULL,NULL},
+/* 1E49E */ { NULL,NULL},
+/* 1E49F */ { NULL,NULL},
+/* 1E4A0 */ { NULL,NULL},
+/* 1E4A1 */ { NULL,NULL},
+/* 1E4A2 */ { NULL,NULL},
+/* 1E4A3 */ { NULL,NULL},
+/* 1E4A4 */ { NULL,NULL},
+/* 1E4A5 */ { NULL,NULL},
+/* 1E4A6 */ { NULL,NULL},
+/* 1E4A7 */ { NULL,NULL},
+/* 1E4A8 */ { NULL,NULL},
+/* 1E4A9 */ { NULL,NULL},
+/* 1E4AA */ { NULL,NULL},
+/* 1E4AB */ { NULL,NULL},
+/* 1E4AC */ { NULL,NULL},
+/* 1E4AD */ { NULL,NULL},
+/* 1E4AE */ { NULL,NULL},
+/* 1E4AF */ { NULL,NULL},
+/* 1E4B0 */ { NULL,NULL},
+/* 1E4B1 */ { NULL,NULL},
+/* 1E4B2 */ { NULL,NULL},
+/* 1E4B3 */ { NULL,NULL},
+/* 1E4B4 */ { NULL,NULL},
+/* 1E4B5 */ { NULL,NULL},
+/* 1E4B6 */ { NULL,NULL},
+/* 1E4B7 */ { NULL,NULL},
+/* 1E4B8 */ { NULL,NULL},
+/* 1E4B9 */ { NULL,NULL},
+/* 1E4BA */ { NULL,NULL},
+/* 1E4BB */ { NULL,NULL},
+/* 1E4BC */ { NULL,NULL},
+/* 1E4BD */ { NULL,NULL},
+/* 1E4BE */ { NULL,NULL},
+/* 1E4BF */ { NULL,NULL},
+/* 1E4C0 */ { NULL,NULL},
+/* 1E4C1 */ { NULL,NULL},
+/* 1E4C2 */ { NULL,NULL},
+/* 1E4C3 */ { NULL,NULL},
+/* 1E4C4 */ { NULL,NULL},
+/* 1E4C5 */ { NULL,NULL},
+/* 1E4C6 */ { NULL,NULL},
+/* 1E4C7 */ { NULL,NULL},
+/* 1E4C8 */ { NULL,NULL},
+/* 1E4C9 */ { NULL,NULL},
+/* 1E4CA */ { NULL,NULL},
+/* 1E4CB */ { NULL,NULL},
+/* 1E4CC */ { NULL,NULL},
+/* 1E4CD */ { NULL,NULL},
+/* 1E4CE */ { NULL,NULL},
+/* 1E4CF */ { NULL,NULL},
+/* 1E4D0 */ { "NAG MUNDARI LETTER O",NULL},
+/* 1E4D1 */ { "NAG MUNDARI LETTER OP",NULL},
+/* 1E4D2 */ { "NAG MUNDARI LETTER OL",NULL},
+/* 1E4D3 */ { "NAG MUNDARI LETTER OY",NULL},
+/* 1E4D4 */ { "NAG MUNDARI LETTER ONG",NULL},
+/* 1E4D5 */ { "NAG MUNDARI LETTER A",NULL},
+/* 1E4D6 */ { "NAG MUNDARI LETTER AJ",NULL},
+/* 1E4D7 */ { "NAG MUNDARI LETTER AB",NULL},
+/* 1E4D8 */ { "NAG MUNDARI LETTER ANY",NULL},
+/* 1E4D9 */ { "NAG MUNDARI LETTER AH",NULL},
+/* 1E4DA */ { "NAG MUNDARI LETTER I",NULL},
+/* 1E4DB */ { "NAG MUNDARI LETTER IS",NULL},
+/* 1E4DC */ { "NAG MUNDARI LETTER IDD",NULL},
+/* 1E4DD */ { "NAG MUNDARI LETTER IT",NULL},
+/* 1E4DE */ { "NAG MUNDARI LETTER IH",NULL},
+/* 1E4DF */ { "NAG MUNDARI LETTER U",NULL},
+/* 1E4E0 */ { "NAG MUNDARI LETTER UC",NULL},
+/* 1E4E1 */ { "NAG MUNDARI LETTER UD",NULL},
+/* 1E4E2 */ { "NAG MUNDARI LETTER UK",NULL},
+/* 1E4E3 */ { "NAG MUNDARI LETTER UR",NULL},
+/* 1E4E4 */ { "NAG MUNDARI LETTER E",NULL},
+/* 1E4E5 */ { "NAG MUNDARI LETTER ENN",NULL},
+/* 1E4E6 */ { "NAG MUNDARI LETTER EG",NULL},
+/* 1E4E7 */ { "NAG MUNDARI LETTER EM",NULL},
+/* 1E4E8 */ { "NAG MUNDARI LETTER EN",NULL},
+/* 1E4E9 */ { "NAG MUNDARI LETTER ETT",NULL},
+/* 1E4EA */ { "NAG MUNDARI LETTER ELL",NULL},
+/* 1E4EB */ { "NAG MUNDARI SIGN OJOD","	* precedes modified letters such as AB or UD\n"
+	"	* may indicate consonant gemination"},
+/* 1E4EC */ { "NAG MUNDARI SIGN MUHOR","	* vowel nasalization"},
+/* 1E4ED */ { "NAG MUNDARI SIGN TOYOR","	* indicates a long vowel"},
+/* 1E4EE */ { "NAG MUNDARI SIGN IKIR","	* vowel preceded by the 'w' sound"},
+/* 1E4EF */ { "NAG MUNDARI SIGN SUTUH","	* mostly used for close transliteration of other languages"},
+/* 1E4F0 */ { "NAG MUNDARI DIGIT ZERO",NULL},
+/* 1E4F1 */ { "NAG MUNDARI DIGIT ONE",NULL},
+/* 1E4F2 */ { "NAG MUNDARI DIGIT TWO",NULL},
+/* 1E4F3 */ { "NAG MUNDARI DIGIT THREE",NULL},
+/* 1E4F4 */ { "NAG MUNDARI DIGIT FOUR",NULL},
+/* 1E4F5 */ { "NAG MUNDARI DIGIT FIVE",NULL},
+/* 1E4F6 */ { "NAG MUNDARI DIGIT SIX",NULL},
+/* 1E4F7 */ { "NAG MUNDARI DIGIT SEVEN",NULL},
+/* 1E4F8 */ { "NAG MUNDARI DIGIT EIGHT",NULL},
+/* 1E4F9 */ { "NAG MUNDARI DIGIT NINE",NULL},
+/* 1E4FA */ { NULL,NULL},
+/* 1E4FB */ { NULL,NULL},
+/* 1E4FC */ { NULL,NULL},
+/* 1E4FD */ { NULL,NULL},
+/* 1E4FE */ { NULL,NULL},
+/* 1E4FF */ { NULL,NULL}
+};
+
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_E7[] = {
 /* 1E700 */ { NULL,NULL},
 /* 1E701 */ { NULL,NULL},
@@ -43884,6 +44627,7 @@ static const struct unicode_nameannot un
 /* 1E7FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_E8[] = {
 /* 1E800 */ { "MENDE KIKAKUI SYLLABLE M001 KI",NULL},
 /* 1E801 */ { "MENDE KIKAKUI SYLLABLE M002 KA",NULL},
@@ -44143,6 +44887,7 @@ static const struct unicode_nameannot un
 /* 1E8FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_E9[] = {
 /* 1E900 */ { "ADLAM CAPITAL LETTER ALIF",NULL},
 /* 1E901 */ { "ADLAM CAPITAL LETTER DAALI",NULL},
@@ -44402,6 +45147,7 @@ static const struct unicode_nameannot un
 /* 1E9FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_EC[] = {
 /* 1EC00 */ { NULL,NULL},
 /* 1EC01 */ { NULL,NULL},
@@ -44668,6 +45414,7 @@ static const struct unicode_nameannot un
 /* 1ECFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_ED[] = {
 /* 1ED00 */ { NULL,NULL},
 /* 1ED01 */ { "OTTOMAN SIYAQ NUMBER ONE",NULL},
@@ -44928,6 +45675,7 @@ static const struct unicode_nameannot un
 /* 1EDFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_EE[] = {
 /* 1EE00 */ { "ARABIC MATHEMATICAL ALEF","	x (arabic letter alef isolated form - FE8D)\n"
 	"	# <font> 0627 arabic letter alef"},
@@ -45241,6 +45989,7 @@ static const struct unicode_nameannot un
 /* 1EEFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F0[] = {
 /* 1F000 */ { "MAHJONG TILE EAST WIND",NULL},
 /* 1F001 */ { "MAHJONG TILE SOUTH WIND",NULL},
@@ -45504,6 +46253,7 @@ static const struct unicode_nameannot un
 /* 1F0FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F1[] = {
 /* 1F100 */ { "DIGIT ZERO FULL STOP","	# 0030 002E"},
 /* 1F101 */ { "DIGIT ZERO COMMA","	# 0030 002C"},
@@ -45807,6 +46557,7 @@ static const struct unicode_nameannot un
 /* 1F1FF */ { "REGIONAL INDICATOR SYMBOL LETTER Z",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F2[] = {
 /* 1F200 */ { "SQUARE HIRAGANA HOKA","	= and others\n"
 	"	# <square> 307B 304B"},
@@ -46139,6 +46890,7 @@ static const struct unicode_nameannot un
 /* 1F2FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F3[] = {
 /* 1F300 */ { "CYCLONE","	= typhoon, hurricane"},
 /* 1F301 */ { "FOGGY","	x (fog - 1F32B)"},
@@ -46459,6 +47211,7 @@ static const struct unicode_nameannot un
 /* 1F3FF */ { "EMOJI MODIFIER FITZPATRICK TYPE-6",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F4[] = {
 /* 1F400 */ { "RAT","	* first of the signs of the Asian zodiac"},
 /* 1F401 */ { "MOUSE","	* first of the signs of the Asian zodiac, used in Persia"},
@@ -46638,7 +47391,8 @@ static const struct unicode_nameannot un
 	"	x (black heart suit - 2665)\n"
 	"	x (heavy black heart - 2764)\n"
 	"	x (white heart - 1F90D)\n"
-	"	x (orange heart - 1F9E1)"},
+	"	x (orange heart - 1F9E1)\n"
+	"	x (light blue heart - 1FA75)"},
 /* 1F49A */ { "GREEN HEART",NULL},
 /* 1F49B */ { "YELLOW HEART",NULL},
 /* 1F49C */ { "PURPLE HEART",NULL},
@@ -46761,6 +47515,7 @@ static const struct unicode_nameannot un
 /* 1F4FF */ { "PRAYER BEADS",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F5[] = {
 /* 1F500 */ { "TWISTED RIGHTWARDS ARROWS","	= shuffle"},
 /* 1F501 */ { "CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS","	= repeat\n"
@@ -47089,6 +47844,7 @@ static const struct unicode_nameannot un
 /* 1F5FF */ { "MOYAI","	* Japanese stone statue like Moai on Easter Island"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F6[] = {
 /* 1F600 */ { "GRINNING FACE",NULL},
 /* 1F601 */ { "GRINNING FACE WITH SMILING EYES",NULL},
@@ -47335,7 +48091,7 @@ static const struct unicode_nameannot un
 /* 1F6D9 */ { NULL,NULL},
 /* 1F6DA */ { NULL,NULL},
 /* 1F6DB */ { NULL,NULL},
-/* 1F6DC */ { NULL,NULL},
+/* 1F6DC */ { "WIRELESS",NULL},
 /* 1F6DD */ { "PLAYGROUND SLIDE",NULL},
 /* 1F6DE */ { "WHEEL",NULL},
 /* 1F6DF */ { "RING BUOY",NULL},
@@ -47381,6 +48137,7 @@ static const struct unicode_nameannot un
 /* 1F6FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F7[] = {
 /* 1F700 */ { "ALCHEMICAL SYMBOL FOR QUINTESSENCE",NULL},
 /* 1F701 */ { "ALCHEMICAL SYMBOL FOR AIR",NULL},
@@ -47428,8 +48185,9 @@ static const struct unicode_nameannot un
 /* 1F726 */ { "ALCHEMICAL SYMBOL FOR SALT OF COPPER ANTIMONIATE","	x (alchemical symbol for salt - 1F714)"},
 /* 1F727 */ { "ALCHEMICAL SYMBOL FOR SUBLIMATE OF SALT OF COPPER","	x (alchemical symbol for sal-ammoniac - 1F739)"},
 /* 1F728 */ { "ALCHEMICAL SYMBOL FOR VERDIGRIS","	= aes viride, copper subacetate\n"
-	"	= early astronomical symbol for earth\n"
-	"	x (circled plus - 2295)"},
+	"	= astronomical symbol for earth\n"
+	"	x (circled plus - 2295)\n"
+	"	x (earth - 2641)"},
 /* 1F729 */ { "ALCHEMICAL SYMBOL FOR TIN ORE","	x (jupiter - 2643)"},
 /* 1F72A */ { "ALCHEMICAL SYMBOL FOR LEAD ORE","	x (saturn - 2644)"},
 /* 1F72B */ { "ALCHEMICAL SYMBOL FOR ANTIMONY ORE","	= stibnite\n"
@@ -47518,21 +48276,24 @@ static const struct unicode_nameannot un
 /* 1F771 */ { "ALCHEMICAL SYMBOL FOR MONTH","	= mensis\n"
 	"	x (squared times - 22A0)"},
 /* 1F772 */ { "ALCHEMICAL SYMBOL FOR HALF DRAM","	= drachma semis\n"
+	"	* handwritten ligature of 0292 + 00DF, typically spelled out as ʒss\n"
 	"	x (latin small letter ezh - 0292)"},
 /* 1F773 */ { "ALCHEMICAL SYMBOL FOR HALF OUNCE","	= uncia semis\n"
+	"	* handwritten ligature of 2125 + 00DF, typically spelled out as 2125 ss\n"
 	"	x (ounce sign - 2125)"},
-/* 1F774 */ { NULL,NULL},
-/* 1F775 */ { NULL,NULL},
-/* 1F776 */ { NULL,NULL},
+/* 1F774 */ { "LOT OF FORTUNE","	= pars fortunae\n"
+	"	x (circled times - 2297)"},
+/* 1F775 */ { "OCCULTATION","	x (conjunction - 260C)"},
+/* 1F776 */ { "LUNAR ECLIPSE","	x (opposition - 260D)"},
 /* 1F777 */ { NULL,NULL},
 /* 1F778 */ { NULL,NULL},
 /* 1F779 */ { NULL,NULL},
 /* 1F77A */ { NULL,NULL},
-/* 1F77B */ { NULL,NULL},
-/* 1F77C */ { NULL,NULL},
-/* 1F77D */ { NULL,NULL},
-/* 1F77E */ { NULL,NULL},
-/* 1F77F */ { NULL,NULL},
+/* 1F77B */ { "HAUMEA",NULL},
+/* 1F77C */ { "MAKEMAKE",NULL},
+/* 1F77D */ { "GONGGONG",NULL},
+/* 1F77E */ { "QUAOAR",NULL},
+/* 1F77F */ { "ORCUS",NULL},
 /* 1F780 */ { "BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE","	x (black medium left-pointing triangle - 23F4)"},
 /* 1F781 */ { "BLACK UP-POINTING ISOSCELES RIGHT TRIANGLE","	x (black medium up-pointing triangle - 23F6)"},
 /* 1F782 */ { "BLACK RIGHT-POINTING ISOSCELES RIGHT TRIANGLE","	x (black medium right-pointing triangle - 23F5)"},
@@ -47625,7 +48386,7 @@ static const struct unicode_nameannot un
 /* 1F7D6 */ { "NEGATIVE CIRCLED TRIANGLE",NULL},
 /* 1F7D7 */ { "CIRCLED SQUARE",NULL},
 /* 1F7D8 */ { "NEGATIVE CIRCLED SQUARE",NULL},
-/* 1F7D9 */ { NULL,NULL},
+/* 1F7D9 */ { "NINE POINTED WHITE STAR","	* commonly used by members of the Bahá'í faith"},
 /* 1F7DA */ { NULL,NULL},
 /* 1F7DB */ { NULL,NULL},
 /* 1F7DC */ { NULL,NULL},
@@ -47671,6 +48432,7 @@ static const struct unicode_nameannot un
 /* 1F7FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F8[] = {
 /* 1F800 */ { "LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD",NULL},
 /* 1F801 */ { "UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD",NULL},
@@ -47930,6 +48692,7 @@ static const struct unicode_nameannot un
 /* 1F8FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_F9[] = {
 /* 1F900 */ { "CIRCLED CROSS FORMEE WITH FOUR DOTS",NULL},
 /* 1F901 */ { "CIRCLED CROSS FORMEE WITH TWO DOTS",NULL},
@@ -48208,6 +48971,7 @@ static const struct unicode_nameannot un
 /* 1F9FF */ { "NAZAR AMULET",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_FA[] = {
 /* 1FA00 */ { "NEUTRAL CHESS KING","	x (white chess king - 2654)"},
 /* 1FA01 */ { "NEUTRAL CHESS QUEEN",NULL},
@@ -48351,9 +49115,9 @@ static const struct unicode_nameannot un
 /* 1FA72 */ { "BRIEFS",NULL},
 /* 1FA73 */ { "SHORTS",NULL},
 /* 1FA74 */ { "THONG SANDAL","	= flip flop"},
-/* 1FA75 */ { NULL,NULL},
-/* 1FA76 */ { NULL,NULL},
-/* 1FA77 */ { NULL,NULL},
+/* 1FA75 */ { "LIGHT BLUE HEART",NULL},
+/* 1FA76 */ { "GREY HEART",NULL},
+/* 1FA77 */ { "PINK HEART",NULL},
 /* 1FA78 */ { "DROP OF BLOOD","	x (droplet - 1F4A7)"},
 /* 1FA79 */ { "ADHESIVE BANDAGE",NULL},
 /* 1FA7A */ { "STETHOSCOPE",NULL},
@@ -48369,8 +49133,8 @@ static const struct unicode_nameannot un
 /* 1FA84 */ { "MAGIC WAND",NULL},
 /* 1FA85 */ { "PINATA",NULL},
 /* 1FA86 */ { "NESTING DOLLS",NULL},
-/* 1FA87 */ { NULL,NULL},
-/* 1FA88 */ { NULL,NULL},
+/* 1FA87 */ { "MARACAS",NULL},
+/* 1FA88 */ { "FLUTE",NULL},
 /* 1FA89 */ { NULL,NULL},
 /* 1FA8A */ { NULL,NULL},
 /* 1FA8B */ { NULL,NULL},
@@ -48407,9 +49171,9 @@ static const struct unicode_nameannot un
 /* 1FAAA */ { "IDENTIFICATION CARD","	= ID"},
 /* 1FAAB */ { "LOW BATTERY","	x (battery - 1F50B)"},
 /* 1FAAC */ { "HAMSA",NULL},
-/* 1FAAD */ { NULL,NULL},
-/* 1FAAE */ { NULL,NULL},
-/* 1FAAF */ { NULL,NULL},
+/* 1FAAD */ { "FOLDING HAND FAN",NULL},
+/* 1FAAE */ { "HAIR PICK",NULL},
+/* 1FAAF */ { "KHANDA","	x (adi shakti - 262C)"},
 /* 1FAB0 */ { "FLY",NULL},
 /* 1FAB1 */ { "WORM",NULL},
 /* 1FAB2 */ { "BEETLE",NULL},
@@ -48421,11 +49185,11 @@ static const struct unicode_nameannot un
 /* 1FAB8 */ { "CORAL",NULL},
 /* 1FAB9 */ { "EMPTY NEST",NULL},
 /* 1FABA */ { "NEST WITH EGGS",NULL},
-/* 1FABB */ { NULL,NULL},
-/* 1FABC */ { NULL,NULL},
-/* 1FABD */ { NULL,NULL},
+/* 1FABB */ { "HYACINTH",NULL},
+/* 1FABC */ { "JELLYFISH",NULL},
+/* 1FABD */ { "WING",NULL},
 /* 1FABE */ { NULL,NULL},
-/* 1FABF */ { NULL,NULL},
+/* 1FABF */ { "GOOSE",NULL},
 /* 1FAC0 */ { "ANATOMICAL HEART",NULL},
 /* 1FAC1 */ { "LUNGS",NULL},
 /* 1FAC2 */ { "PEOPLE HUGGING",NULL},
@@ -48440,8 +49204,8 @@ static const struct unicode_nameannot un
 /* 1FACB */ { NULL,NULL},
 /* 1FACC */ { NULL,NULL},
 /* 1FACD */ { NULL,NULL},
-/* 1FACE */ { NULL,NULL},
-/* 1FACF */ { NULL,NULL},
+/* 1FACE */ { "MOOSE",NULL},
+/* 1FACF */ { "DONKEY",NULL},
 /* 1FAD0 */ { "BLUEBERRIES",NULL},
 /* 1FAD1 */ { "BELL PEPPER",NULL},
 /* 1FAD2 */ { "OLIVE",NULL},
@@ -48452,8 +49216,8 @@ static const struct unicode_nameannot un
 /* 1FAD7 */ { "POURING LIQUID","	x (glass of milk - 1F95B)"},
 /* 1FAD8 */ { "BEANS",NULL},
 /* 1FAD9 */ { "JAR",NULL},
-/* 1FADA */ { NULL,NULL},
-/* 1FADB */ { NULL,NULL},
+/* 1FADA */ { "GINGER ROOT",NULL},
+/* 1FADB */ { "PEA POD",NULL},
 /* 1FADC */ { NULL,NULL},
 /* 1FADD */ { NULL,NULL},
 /* 1FADE */ { NULL,NULL},
@@ -48466,7 +49230,7 @@ static const struct unicode_nameannot un
 /* 1FAE5 */ { "DOTTED LINE FACE",NULL},
 /* 1FAE6 */ { "BITING LIP","	x (lips - 1F5E2)"},
 /* 1FAE7 */ { "BUBBLES",NULL},
-/* 1FAE8 */ { NULL,NULL},
+/* 1FAE8 */ { "SHAKING FACE",NULL},
 /* 1FAE9 */ { NULL,NULL},
 /* 1FAEA */ { NULL,NULL},
 /* 1FAEB */ { NULL,NULL},
@@ -48481,8 +49245,8 @@ static const struct unicode_nameannot un
 /* 1FAF4 */ { "PALM UP HAND",NULL},
 /* 1FAF5 */ { "INDEX POINTING AT THE VIEWER",NULL},
 /* 1FAF6 */ { "HEART HANDS",NULL},
-/* 1FAF7 */ { NULL,NULL},
-/* 1FAF8 */ { NULL,NULL},
+/* 1FAF7 */ { "LEFTWARDS PUSHING HAND",NULL},
+/* 1FAF8 */ { "RIGHTWARDS PUSHING HAND",NULL},
 /* 1FAF9 */ { NULL,NULL},
 /* 1FAFA */ { NULL,NULL},
 /* 1FAFB */ { NULL,NULL},
@@ -48492,6 +49256,7 @@ static const struct unicode_nameannot un
 /* 1FAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_01_FB[] = {
 /* 1FB00 */ { "BLOCK SEXTANT-1",NULL},
 /* 1FB01 */ { "BLOCK SEXTANT-2",NULL},
@@ -48773,6 +49538,7 @@ static const struct unicode_nameannot un
 /* 1FBFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_02_F8[] = {
 /* 2F800 */ { "CJK COMPATIBILITY IDEOGRAPH-2F800","	: 4E3D"},
 /* 2F801 */ { "CJK COMPATIBILITY IDEOGRAPH-2F801","	: 4E38"},
@@ -49044,6 +49810,7 @@ static const struct unicode_nameannot un
 /* 2F8FF */ { "CJK COMPATIBILITY IDEOGRAPH-2F8FF","	: 6D16"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_02_F9[] = {
 /* 2F900 */ { "CJK COMPATIBILITY IDEOGRAPH-2F900","	: 6D3E"},
 /* 2F901 */ { "CJK COMPATIBILITY IDEOGRAPH-2F901","	: 6D77"},
@@ -49315,6 +50082,7 @@ static const struct unicode_nameannot un
 /* 2F9FF */ { "CJK COMPATIBILITY IDEOGRAPH-2F9FF","	: 980B"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_02_FA[] = {
 /* 2FA00 */ { "CJK COMPATIBILITY IDEOGRAPH-2FA00","	: 9829"},
 /* 2FA01 */ { "CJK COMPATIBILITY IDEOGRAPH-2FA01","	: 295B6"},
@@ -49574,6 +50342,7 @@ static const struct unicode_nameannot un
 /* 2FAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_0E_00[] = {
 /* E0000 */ { NULL,NULL},
 /* E0001 */ { "LANGUAGE TAG","	* This character is deprecated, and its use is strongly discouraged."},
@@ -49833,6 +50602,7 @@ static const struct unicode_nameannot un
 /* E00FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot una_0E_01[] = {
 /* E0100 */ { "VARIATION SELECTOR-17","	* these are abbreviated VS17, and so on"},
 /* E0101 */ { "VARIATION SELECTOR-18",NULL},
@@ -50092,6 +50862,7 @@ static const struct unicode_nameannot un
 /* E01FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const una_00[] = {
 	una_00_00,
 	una_00_01,
@@ -50351,6 +51122,7 @@ static const struct unicode_nameannot *
 	una_00_FF
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const una_01[] = {
 	una_01_00,
 	una_01_01,
@@ -50379,7 +51151,7 @@ static const struct unicode_nameannot *
 	una_01_18,
 	una_01_19,
 	una_01_1A,
-	nullarray,
+	una_01_1B,
 	una_01_1C,
 	una_01_1D,
 	una_01_1E,
@@ -50580,7 +51352,7 @@ static const struct unicode_nameannot *
 	una_01_E1,
 	una_01_E2,
 	nullarray,
-	nullarray,
+	una_01_E4,
 	nullarray,
 	nullarray,
 	una_01_E7,
@@ -50610,6 +51382,7 @@ static const struct unicode_nameannot *
 	nullarray2
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const una_02[] = {
 	nullarray,
 	nullarray,
@@ -50869,6 +51642,7 @@ static const struct unicode_nameannot *
 	nullarray2
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const una_0E[] = {
 	una_0E_00,
 	una_0E_01,
diff -pruN 20211114-1/nameslist-dll.h 20220701-1/nameslist-dll.h
--- 20211114-1/nameslist-dll.h	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/nameslist-dll.h	2022-07-02 02:05:04.000000000 +0000
@@ -1,9 +1,16 @@
 /* Generic helper definitions for shared library support */
 /* as explained in - https://gcc.gnu.org/wiki/Visibility */
-#if defined _WIN32 || defined __CYGWIN__
-  #define UN_DLL_IMPORT __declspec(dllimport)
-  #define UN_DLL_EXPORT __declspec(dllexport)
-  #define UN_DLL_LOCAL
+#if defined (_WIN32) || defined (__CYGWIN__) || (_WIN64) || defined (__CYGWIN64__)
+  #ifndef __clang__
+    #define UN_DLL_IMPORT __declspec(dllimport)
+    #define UN_DLL_EXPORT __declspec(dllexport)
+    #define UN_DLL_LOCAL
+  #else
+    /* CLANG already appears to add this. Turn this off. */
+    #define UN_DLL_IMPORT
+    #define UN_DLL_EXPORT
+    #define UN_DLL_LOCAL
+  #endif
 #else
   #if __GNUC__ >= 4
     #define UN_DLL_IMPORT __attribute__ ((visibility ("default")))
@@ -20,26 +27,26 @@
 
 #ifdef UNICODE_BLOCK_MAX
 /* Definitions used by nameslist.c for functions{16..21} */
-int uniNamesList_haveFR(unsigned int lang);
+UN_DLL_LOCAL int uniNamesList_haveFR(unsigned int lang);
 #ifdef WANTLIBOFR
 /* make this visible to nameslist.c if adding French lib */
-extern const char *uniNamesList_NamesListVersionFR(void);
-extern const char *uniNamesList_nameFR(unsigned long uni);
-extern const char *uniNamesList_annotFR(unsigned long uni);
-extern int uniNamesList_blockCountFR(void);
-extern int uniNamesList_blockNumberFR(unsigned long uni);
-extern long uniNamesList_blockStartFR(int uniBlock);
-extern long uniNamesList_blockEndFR(int uniBlock);
-extern const char *uniNamesList_blockNameFR(int uniBlock);
+extern UN_DLL_IMPORT const char *uniNamesList_NamesListVersionFR(void);
+extern UN_DLL_IMPORT const char *uniNamesList_nameFR(unsigned long uni);
+extern UN_DLL_IMPORT const char *uniNamesList_annotFR(unsigned long uni);
+extern UN_DLL_IMPORT int uniNamesList_blockCountFR(void);
+extern UN_DLL_IMPORT int uniNamesList_blockNumberFR(unsigned long uni);
+extern UN_DLL_IMPORT long uniNamesList_blockStartFR(int uniBlock);
+extern UN_DLL_IMPORT long uniNamesList_blockEndFR(int uniBlock);
+extern UN_DLL_IMPORT const char *uniNamesList_blockNameFR(int uniBlock);
 #else
 /* make these internal stubs since there's no French lib */
-const char *uniNamesList_NamesListVersionFR(void);
-const char *uniNamesList_nameFR(unsigned long uni);
-const char *uniNamesList_annotFR(unsigned long uni);
-int uniNamesList_blockCountFR(void);
-int uniNamesList_blockNumberFR(unsigned long uni);
-long uniNamesList_blockStartFR(int uniBlock);
-long uniNamesList_blockEndFR(int uniBlock);
-const char *uniNamesList_blockNameFR(int uniBlock);
+UN_DLL_LOCAL const char *uniNamesList_NamesListVersionFR(void);
+UN_DLL_LOCAL const char *uniNamesList_nameFR(unsigned long uni);
+UN_DLL_LOCAL const char *uniNamesList_annotFR(unsigned long uni);
+UN_DLL_LOCAL int uniNamesList_blockCountFR(void);
+UN_DLL_LOCAL int uniNamesList_blockNumberFR(unsigned long uni);
+UN_DLL_LOCAL long uniNamesList_blockStartFR(int uniBlock);
+UN_DLL_LOCAL long uniNamesList_blockEndFR(int uniBlock);
+UN_DLL_LOCAL const char *uniNamesList_blockNameFR(int uniBlock);
+#endif
 #endif
-#endif
\ No newline at end of file
diff -pruN 20211114-1/nameslist-fr.c 20220701-1/nameslist-fr.c
--- 20211114-1/nameslist-fr.c	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/nameslist-fr.c	2022-07-02 02:05:04.000000000 +0000
@@ -143,6 +143,7 @@ const char *uniNamesList_names2anUFR(uns
 	return( NULL );
 }
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot nullarrayFR[] = {
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
@@ -211,6 +212,7 @@ static const struct unicode_nameannot nu
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL }
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot nullarray2FR[] = {
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
 	{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { NULL, NULL },
@@ -281,6 +283,7 @@ static const struct unicode_nameannot nu
 	{ NULL, "	* on est assuré que la valeur ?FFFF n'est en aucune façon un caractère Unicode" },
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const nullnullarrayFR[] = {
 	nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR,
 	nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR, nullarrayFR,
@@ -655,6 +658,7 @@ const struct unicode_block UnicodeBlockF
 	{ 0x10ff80, 0x10ffff, "Zone supplémentaire B à usage privé" }
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_00[] = {
 /* 0000 */ { NULL,"	= NUL"},
 /* 0001 */ { NULL,"	= DÉBUT D'EN-TÊTE"},
@@ -1341,6 +1345,7 @@ static const struct unicode_nameannot un
 	"	: 0079 0308"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_01[] = {
 /* 0100 */ { "LETTRE MAJUSCULE LATINE A MACRON","	: 0041 0304"},
 /* 0101 */ { "LETTRE MINUSCULE LATINE A MACRON","	* letton, latin, etc.\n"
@@ -1859,6 +1864,7 @@ static const struct unicode_nameannot un
 /* 01FF */ { "LETTRE MINUSCULE LATINE O BARRÉ ACCENT AIGU","	: 00F8 0301"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_02[] = {
 /* 0200 */ { "LETTRE MAJUSCULE LATINE A DOUBLE ACCENT GRAVE","	: 0041 030F"},
 /* 0201 */ { "LETTRE MINUSCULE LATINE A DOUBLE ACCENT GRAVE","	: 0061 030F"},
@@ -2389,6 +2395,7 @@ static const struct unicode_nameannot un
 /* 02FF */ { "LETTRE MODIFICATIVE FLÈCHE VERS LA GAUCHE BASSE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_03[] = {
 /* 0300 */ { "DIACRITIQUE ACCENT GRAVE","	= accent grave grec (varia)\n"
 	"	* pinyin : marque le quatrième ton du chinois mandarin\n"
@@ -2830,6 +2837,7 @@ static const struct unicode_nameannot un
 	"	* indique que les lignes qui succèdent à ce symbole doivent être déplacées à l'endroit marqué par 03FE"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_04[] = {
 /* 0400 */ { "LETTRE MAJUSCULE CYRILLIQUE IÉ ACCENT GRAVE","	: 0415 0300"},
 /* 0401 */ { "LETTRE MAJUSCULE CYRILLIQUE IO","	: 0415 0308"},
@@ -3147,6 +3155,7 @@ static const struct unicode_nameannot un
 /* 04FF */ { "LETTRE MINUSCULE CYRILLIQUE KHA BARRÉ",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_05[] = {
 /* 0500 */ { "LETTRE MAJUSCULE CYRILLIQUE DÉ KOMI",NULL},
 /* 0501 */ { "LETTRE MINUSCULE CYRILLIQUE DÉ KOMI",NULL},
@@ -3439,6 +3448,7 @@ static const struct unicode_nameannot un
 /* 05FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_06[] = {
 /* 0600 */ { "SYMBOLE ARABE NUMÉRO",NULL},
 /* 0601 */ { "SIGNE ARABE SANAH",NULL},
@@ -3762,6 +3772,7 @@ static const struct unicode_nameannot un
 /* 06FF */ { "LETTRE ARABE HÉ' V RENVERSÉ",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_07[] = {
 /* 0700 */ { "FIN DE PARAGRAPHE SYRIAQUE","	* marque la fin d'un paragraphe"},
 /* 0701 */ { "POINT SYRIAQUE SUPRALINÉAIRE","	* indique une interrogative, l'impératif et les pauses, particulièrement dans les textes bibliques"},
@@ -4039,6 +4050,7 @@ static const struct unicode_nameannot un
 /* 07FF */ { "SYMBOLE N'KO TAMAN","	x (lettre n'ko ta - 07D5)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_08[] = {
 /* 0800 */ { "LETTRE SAMARITAINE ALAF",NULL},
 /* 0801 */ { "LETTRE SAMARITAINE BIT",NULL},
@@ -4314,6 +4326,7 @@ static const struct unicode_nameannot un
 /* 08FF */ { "DIACRITIQUE ARABE NOÛN GHOUNNA COUCHÉ",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_09[] = {
 /* 0900 */ { "DIACRITIQUE DÉVANÂGARÎ TCHANDRABINDOU RENVERSÉ","	= vaïdika adhomoukha tchandrabindou"},
 /* 0901 */ { "DIACRITIQUE DÉVANÂGARÎ TCHANDRABINDOU","	= anounassika\n"
@@ -4602,6 +4615,7 @@ static const struct unicode_nameannot un
 /* 09FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_0A[] = {
 /* 0A00 */ { NULL,NULL},
 /* 0A01 */ { "DIACRITIQUE GOURMOUKHÎ ADDAK BINDI",NULL},
@@ -4866,6 +4880,7 @@ static const struct unicode_nameannot un
 /* 0AFF */ { "DIACRITIQUE GOUDJARATI NOUKTA SUSCRIT FORMÉ DE DEUX CERCLES",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_0B[] = {
 /* 0B00 */ { NULL,NULL},
 /* 0B01 */ { "DIACRITIQUE ORIYA TCHANDRABINDOU",NULL},
@@ -5147,6 +5162,7 @@ static const struct unicode_nameannot un
 /* 0BFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_0C[] = {
 /* 0C00 */ { "DIACRITIQUE TÉLOUGOU TCHANDRABINDOU SUSCRIT",NULL},
 /* 0C01 */ { "DIACRITIQUE TÉLOUGOU TCHANDRABINDOU","	= arasounna\n"
@@ -5419,6 +5435,7 @@ static const struct unicode_nameannot un
 /* 0CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_0D[] = {
 /* 0D00 */ { "DIACRITIQUE MALAYALAM ANOUSVÂRA SUSCRIT",NULL},
 /* 0D01 */ { "DIACRITIQUE MALAYALAM TCHANDRABINDOU",NULL},
@@ -5696,6 +5713,7 @@ static const struct unicode_nameannot un
 /* 0DFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_0E[] = {
 /* 0E00 */ { NULL,NULL},
 /* 0E01 */ { "CARACTÈRE THAÏ KO KAÏ",NULL},
@@ -5968,6 +5986,7 @@ static const struct unicode_nameannot un
 /* 0EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_0F[] = {
 /* 0F00 */ { "SYLLABE TIBÉTAINE OM",NULL},
 /* 0F01 */ { "SIGNE TIBÉTAIN GTER YIG MGO A TRONQUÉ","	= ter yik go a t'oung"},
@@ -6320,6 +6339,7 @@ static const struct unicode_nameannot un
 /* 0FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_10[] = {
 /* 1000 */ { "LETTRE BIRMANE KA","	~ 1000 FE00 forme pointée"},
 /* 1001 */ { "LETTRE BIRMANE KHA",NULL},
@@ -6583,6 +6603,7 @@ static const struct unicode_nameannot un
 /* 10FF */ { "LETTRE GÉORGIENNE SIGNE LABIAL",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_11[] = {
 /* 1100 */ { "TCH'ÔSONG HANGÛL KIYOK","	= K"},
 /* 1101 */ { "TCH'ÔSONG HANGÛL SSANGKIYOK","	= KK"},
@@ -6849,6 +6870,7 @@ static const struct unicode_nameannot un
 /* 11FF */ { "DJÔNGSONG HANGÛL SSANGNIÛN",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_12[] = {
 /* 1200 */ { "SYLLABE ÉTHIOPIENNE HÄ",NULL},
 /* 1201 */ { "SYLLABE ÉTHIOPIENNE HOU",NULL},
@@ -7109,6 +7131,7 @@ static const struct unicode_nameannot un
 /* 12FF */ { "SYLLABE ÉTHIOPIENNE DDWA",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_13[] = {
 /* 1300 */ { "SYLLABE ÉTHIOPIENNE DJÄ",NULL},
 /* 1301 */ { "SYLLABE ÉTHIOPIENNE DJOU",NULL},
@@ -7369,6 +7392,7 @@ static const struct unicode_nameannot un
 /* 13FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_14[] = {
 /* 1400 */ { "TRAIT D'UNION SYLLABE CANADIENNE",NULL},
 /* 1401 */ { "SYLLABE CANADIENNE É","	* inuktitut (AÏ), porteur (OU)"},
@@ -7630,6 +7654,7 @@ static const struct unicode_nameannot un
 /* 14FF */ { "SYLLABE CANADIENNE SOUÔ CRI DES PLAINES",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_15[] = {
 /* 1500 */ { "SYLLABE CANADIENNE SOUA",NULL},
 /* 1501 */ { "SYLLABE CANADIENNE SOUA CRI DES PLAINES",NULL},
@@ -7890,6 +7915,7 @@ static const struct unicode_nameannot un
 /* 15FF */ { "SYLLABE CANADIENNE KKI PORTEUR",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_16[] = {
 /* 1600 */ { "SYLLABE CANADIENNE KKA PORTEUR",NULL},
 /* 1601 */ { "SYLLABE CANADIENNE KK PORTEUR",NULL},
@@ -8152,6 +8178,7 @@ static const struct unicode_nameannot un
 /* 16FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_17[] = {
 /* 1700 */ { "LETTRE TAGALOG A",NULL},
 /* 1701 */ { "LETTRE TAGALOG I",NULL},
@@ -8447,6 +8474,7 @@ static const struct unicode_nameannot un
 /* 17FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_18[] = {
 /* 1800 */ { "BIRGA MONGOL","	x (signe tibétain yig mgo mdoun ma ouvrant - 0F04)"},
 /* 1801 */ { "POINTS DE SUSPENSION MONGOLS",NULL},
@@ -8712,6 +8740,7 @@ static const struct unicode_nameannot un
 /* 18FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_19[] = {
 /* 1900 */ { "LETTRE LIMBU PORTE-VOYELLE",NULL},
 /* 1901 */ { "LETTRE LIMBU KA",NULL},
@@ -8973,6 +9002,7 @@ static const struct unicode_nameannot un
 /* 19FF */ { "SYMBOLE KHMER QUINZIÈME LUNE DÉCROISSANTE","	= dâp-pram rootch"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_1A[] = {
 /* 1A00 */ { "LETTRE BOUGUIE KA",NULL},
 /* 1A01 */ { "LETTRE BOUGUIE GA",NULL},
@@ -9242,6 +9272,7 @@ static const struct unicode_nameannot un
 /* 1AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_1B[] = {
 /* 1B00 */ { "DIACRITIQUE BALINAIS ULU RICEM","	= ardhatchandra"},
 /* 1B01 */ { "DIACRITIQUE BALINAIS ULU CANDRA","	= tchandrabindou"},
@@ -9519,6 +9550,7 @@ static const struct unicode_nameannot un
 /* 1BFF */ { "SYMBOLE BATAK BINDOU PANGOLAT",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_1C[] = {
 /* 1C00 */ { "LETTRE LEPTCHA KA",NULL},
 /* 1C01 */ { "LETTRE LEPTCHA KLA",NULL},
@@ -9792,6 +9824,7 @@ static const struct unicode_nameannot un
 /* 1CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_1D[] = {
 /* 1D00 */ { "LETTRE LATINE PETITE CAPITALE A",NULL},
 /* 1D01 */ { "LETTRE LATINE PETITE CAPITALE AE",NULL},
@@ -10086,6 +10119,7 @@ static const struct unicode_nameannot un
 /* 1DFF */ { "DIACRITIQUE POINTES DE FLÈCHE VERS LA DROITE ET VERS LE BAS SOUSCRITES",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_1E[] = {
 /* 1E00 */ { "LETTRE MAJUSCULE LATINE A ROND SOUSCRIT","	: 0041 0325"},
 /* 1E01 */ { "LETTRE MINUSCULE LATINE A ROND SOUSCRIT","	: 0061 0325"},
@@ -10389,6 +10423,7 @@ static const struct unicode_nameannot un
 /* 1EFF */ { "LETTRE MINUSCULE LATINE Y BOUCLÉ",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_1F[] = {
 /* 1F00 */ { "LETTRE MINUSCULE GRECQUE ALPHA ESPRIT DOUX","	: 03B1 0313"},
 /* 1F01 */ { "LETTRE MINUSCULE GRECQUE ALPHA ESPRIT RUDE","	: 03B1 0314"},
@@ -10650,6 +10685,7 @@ static const struct unicode_nameannot un
 /* 1FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_20[] = {
 /* 2000 */ { "DEMI-CADRATIN","	* ce caractère est en pratique équivalent à l'espace demi-cadratin\n"
 	"	: 2002 espace demi-cadratin"},
@@ -11090,6 +11126,7 @@ static const struct unicode_nameannot un
 /* 20FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_21[] = {
 /* 2100 */ { "AU COMPTE DE","	# 0061 002F 0063"},
 /* 2101 */ { "AUX BONS SOINS DE","	= aux soins (de)\n"
@@ -11496,6 +11533,7 @@ static const struct unicode_nameannot un
 /* 21FF */ { "FLÈCHE GAUCHE-DROITE À TÊTES CREUSES",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_22[] = {
 /* 2200 */ { "POUR TOUT","	= quel que soit\n"
 	"	= quantificateur universel, quanteur universel"},
@@ -11873,6 +11911,7 @@ static const struct unicode_nameannot un
 /* 22FF */ { "ÉLÉMENT D'UN SAC EN NOTATION Z","	= appartient à un multi-ensemble"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_23[] = {
 /* 2300 */ { "SYMBOLE DIAMÈTRE","	x (lettre minuscule latine o barré obliquement - 00F8)\n"
 	"	x (ensemble vide - 2205)"},
@@ -12205,6 +12244,7 @@ static const struct unicode_nameannot un
 /* 23FF */ { "SYMBOLE DE L'ŒIL OBSERVATEUR",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_24[] = {
 /* 2400 */ { "SYMBOLE POUR NUL",NULL},
 /* 2401 */ { "SYMBOLE POUR DÉBUT D'EN-TÊTE",NULL},
@@ -12472,6 +12512,7 @@ static const struct unicode_nameannot un
 /* 24FF */ { "CHIFFRE ZÉRO CERCLÉ NOIR AU BLANC","	x (vignette chiffre un cerclé noir au blanc - 2776)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_25[] = {
 /* 2500 */ { "FILET FIN HORIZONTAL","	= mosaïque Vidéotex DG 15\n"
 	"	x (filet fin horizontal à barre verticale - 1FBAF)"},
@@ -12804,6 +12845,7 @@ static const struct unicode_nameannot un
 /* 25FF */ { "TRIANGLE RECTANGLE INFÉRIEUR DROIT","	x (triangle rectangle - 22BF)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_26[] = {
 /* 2600 */ { "SOLEIL NOIR AVEC RAYONS","	= temps clair\n"
 	"	x (soleil - 2609)\n"
@@ -13200,6 +13242,7 @@ static const struct unicode_nameannot un
 /* 26FF */ { "DRAPEAU BLANC À BANDE MÉDIANE HORIZONTALE NOIRE","	= site des forces japonaises d'autodéfense"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_27[] = {
 /* 2700 */ { "CISEAUX DE SÉCURITÉ NOIRS","	* forme une paire avec 2704"},
 /* 2701 */ { "CISEAUX À LAME SUPÉRIEURE VISIBLE",NULL},
@@ -13534,6 +13577,7 @@ static const struct unicode_nameannot un
 	"	x (longue flèche vers la gauche en tire-bouchon - 2B33)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_28[] = {
 /* 2800 */ { "COMBINAISON BRAILLE BLANC","	* bien que ce caractère soit représenté par un blanc à chasse fixe dans de nombreuses polices, il ne joue pas le rôle d'une espace"},
 /* 2801 */ { "COMBINAISON BRAILLE POINTS-1",NULL},
@@ -13793,6 +13837,7 @@ static const struct unicode_nameannot un
 /* 28FF */ { "COMBINAISON BRAILLE POINTS-12345678",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_29[] = {
 /* 2900 */ { "FLÈCHE À DEUX POINTES VERS LA DROITE BARRÉE VERTICALEMENT","	= surjection partielle en notation Z\n"
 	"	x (flèche à deux pointes vers la gauche barrée verticalement - 2B34)"},
@@ -14099,6 +14144,7 @@ static const struct unicode_nameannot un
 /* 29FF */ { "MINY","	x (signe moins - 2212)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_2A[] = {
 /* 2A00 */ { "OPÉRATEUR POINT CERCLÉ N-AIRE","	x (opérateur point cerclé - 2299)\n"
 	"	x (cercle blanc évidé - 25C9)"},
@@ -14391,6 +14437,7 @@ static const struct unicode_nameannot un
 /* 2AFF */ { "BARRE VERTICALE BLANCHE N-AIRE","	= choix n-aire de Dijkstra"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_2B[] = {
 /* 2B00 */ { "FLÈCHE BLANCHE NORD-EST",NULL},
 /* 2B01 */ { "FLÈCHE BLANCHE NORD-OUEST",NULL},
@@ -14694,6 +14741,7 @@ static const struct unicode_nameannot un
 /* 2BFF */ { "SYMBOLE PAUSE DE HELLSCHREIBER",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_2C[] = {
 /* 2C00 */ { "LETTRE MAJUSCULE GLAGOLITIQUE AZE",NULL},
 /* 2C01 */ { "LETTRE MAJUSCULE GLAGOLITIQUE BOUKI",NULL},
@@ -14962,6 +15010,7 @@ static const struct unicode_nameannot un
 /* 2CFF */ { "DIVISEUR MORPHOLOGIQUE COPTE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_2D[] = {
 /* 2D00 */ { "LETTRE GÉORGIENNE NOUSKHOURI AN","	x (lettre géorgienne assomtavrouli an - 10A0)"},
 /* 2D01 */ { "LETTRE GÉORGIENNE NOUSKHOURI BAN",NULL},
@@ -15224,6 +15273,7 @@ static const struct unicode_nameannot un
 /* 2DFF */ { "DIACRITIQUE LETTRE CYRILLIQUE GRAND YOUSSE YODISÉ",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_2E[] = {
 /* 2E00 */ { "ANGLET DE SUBSTITUTION","	x (coin nord-ouest - 231C)"},
 /* 2E01 */ { "ANGLET DE SUBSTITUTION POINTÉ",NULL},
@@ -15593,6 +15643,7 @@ static const struct unicode_nameannot un
 /* 2EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_2F[] = {
 /* 2F00 */ { "CLÉ CHINOISE UN","	# 4E00"},
 /* 2F01 */ { "CLÉ CHINOISE TRAIT VERTICAL","	# 4E28"},
@@ -15902,6 +15953,7 @@ static const struct unicode_nameannot un
 /* 2FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_30[] = {
 /* 3000 */ { "ESPACE IDÉOGRAPHIQUE","	x (espace - 0020)\n"
 	"	# <large> 0020"},
@@ -16210,6 +16262,7 @@ static const struct unicode_nameannot un
 	"	# <verticale> 30B3 30C8"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_31[] = {
 /* 3100 */ { NULL,NULL},
 /* 3101 */ { NULL,NULL},
@@ -16490,6 +16543,7 @@ static const struct unicode_nameannot un
 /* 31FF */ { "CARACTÈRE KATAKANA PETIT RO",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_32[] = {
 /* 3200 */ { "KIYOK HANGÛL ENTRE PARENTHÈSES","	# 0028 1100 0029"},
 /* 3201 */ { "NIÛN HANGÛL ENTRE PARENTHÈSES","	# 0028 1102 0029"},
@@ -16777,6 +16831,7 @@ static const struct unicode_nameannot un
 /* 32FF */ { "ÈRE REIWA DISPOSÉ EN CARRÉ","	# <enCarré> 4EE4 548C"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_33[] = {
 /* 3300 */ { "APÂTO DISPOSÉ EN CARRÉ","	* appartement\n"
 	"	# <enCarré> 30A2 30D1 30FC 30C8"},
@@ -17128,6 +17183,7 @@ static const struct unicode_nameannot un
 /* 33FF */ { "GAL DISPOSÉ EN CARRÉ","	# <enCarré> 0067 0061 006C"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_4D[] = {
 /* 4D00 */ { NULL,NULL},
 /* 4D01 */ { NULL,NULL},
@@ -17389,6 +17445,7 @@ static const struct unicode_nameannot un
 /* 4DFF */ { "HEXAGRAMME DE LA MARCHE VERS L'ACCOMPLISSEMENT","	= wei-tsi"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A0[] = {
 /* A000 */ { "SYLLABE YI IT",NULL},
 /* A001 */ { "SYLLABE YI IX",NULL},
@@ -17648,6 +17705,7 @@ static const struct unicode_nameannot un
 /* A0FF */ { "SYLLABE YI VYR",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A1[] = {
 /* A100 */ { "SYLLABE YI DIT",NULL},
 /* A101 */ { "SYLLABE YI DIX",NULL},
@@ -17907,6 +17965,7 @@ static const struct unicode_nameannot un
 /* A1FF */ { "SYLLABE YI KAT",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A2[] = {
 /* A200 */ { "SYLLABE YI KAX",NULL},
 /* A201 */ { "SYLLABE YI KA",NULL},
@@ -18166,6 +18225,7 @@ static const struct unicode_nameannot un
 /* A2FF */ { "SYLLABE YI NZU",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A3[] = {
 /* A300 */ { "SYLLABE YI NZUP",NULL},
 /* A301 */ { "SYLLABE YI NZURX",NULL},
@@ -18425,6 +18485,7 @@ static const struct unicode_nameannot un
 /* A3FF */ { "SYLLABE YI QIP",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A4[] = {
 /* A400 */ { "SYLLABE YI QIET",NULL},
 /* A401 */ { "SYLLABE YI QIEX",NULL},
@@ -18684,6 +18745,7 @@ static const struct unicode_nameannot un
 /* A4FF */ { "PONCTUATION LISSOU POINT",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A5[] = {
 /* A500 */ { "SYLLABE VAÏE É",NULL},
 /* A501 */ { "SYLLABE VAÏE ÉN",NULL},
@@ -18943,6 +19005,7 @@ static const struct unicode_nameannot un
 /* A5FF */ { "SYLLABE VAÏE TCHÊ",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A6[] = {
 /* A600 */ { "SYLLABE VAÏE JÊ",NULL},
 /* A601 */ { "SYLLABE VAÏE NJÊ",NULL},
@@ -19214,6 +19277,7 @@ static const struct unicode_nameannot un
 /* A6FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A7[] = {
 /* A700 */ { "LETTRE MODIFICATIVE CHINOISE TON YIN PING","	* yin p'ing"},
 /* A701 */ { "LETTRE MODIFICATIVE CHINOISE TON YANG PING","	* yang p'ing"},
@@ -19508,6 +19572,7 @@ static const struct unicode_nameannot un
 /* A7FF */ { "LETTRE LATINE ÉPIGRAPHIQUE M ARCHAÏQUE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A8[] = {
 /* A800 */ { "LETTRE SYLOTÎ NÂGRÎ Â",NULL},
 /* A801 */ { "LETTRE SYLOTÎ NÂGRÎ I",NULL},
@@ -19833,6 +19898,7 @@ static const struct unicode_nameannot un
 /* A8FF */ { "DIACRITIQUE VOYELLE DÉVANÂGARÎ AY",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_A9[] = {
 /* A900 */ { "CHIFFRE KAYAH LI ZÉRO",NULL},
 /* A901 */ { "CHIFFRE KAYAH LI UN",NULL},
@@ -20101,6 +20167,7 @@ static const struct unicode_nameannot un
 /* A9FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_AA[] = {
 /* AA00 */ { "LETTRE TCHAME A",NULL},
 /* AA01 */ { "LETTRE TCHAME I",NULL},
@@ -20362,6 +20429,7 @@ static const struct unicode_nameannot un
 /* AAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_AB[] = {
 /* AB00 */ { NULL,NULL},
 /* AB01 */ { "SYLLABE ÉTHIOPIENNE TTHU",NULL},
@@ -20638,6 +20706,7 @@ static const struct unicode_nameannot un
 /* ABFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_D7[] = {
 /* D700 */ { NULL,NULL},
 /* D701 */ { NULL,NULL},
@@ -20897,6 +20966,7 @@ static const struct unicode_nameannot un
 /* D7FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_F9[] = {
 /* F900 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-F900","	: 8C48"},
 /* F901 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-F901","	: 66F4"},
@@ -21160,6 +21230,7 @@ static const struct unicode_nameannot un
 /* F9FF */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-F9FF","	: 523A"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_FA[] = {
 /* FA00 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-FA00","	: 5207"},
 /* FA01 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-FA01","	: 5EA6"},
@@ -21420,6 +21491,7 @@ static const struct unicode_nameannot un
 /* FAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_FB[] = {
 /* FB00 */ { "LIGATURE MINUSCULE LATINE FF","	# 0066 0066"},
 /* FB01 */ { "LIGATURE MINUSCULE LATINE FI","	# 0066 0069"},
@@ -21682,6 +21754,7 @@ static const struct unicode_nameannot un
 /* FBFF */ { "LETTRE ARABE FARSI YA' MÉDIAL","	# <médiale> 06CC"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_FC[] = {
 /* FC00 */ { "LIGATURE ARABE YA' HAMZA EN CHEF DJÎM ISOLÉ","	# <isolée> 0626 062C"},
 /* FC01 */ { "LIGATURE ARABE YA' HAMZA EN CHEF HA' ISOLÉ","	# <isolée> 0626 062D"},
@@ -21941,6 +22014,7 @@ static const struct unicode_nameannot un
 /* FCFF */ { "LIGATURE ARABE HA' ALIF MAKSOURA ISOLÉ","	# <isolée> 062D 0649"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_FD[] = {
 /* FD00 */ { "LIGATURE ARABE HA' YA' ISOLÉ","	# <isolée> 062D 064A"},
 /* FD01 */ { "LIGATURE ARABE DJÎM ALIF MAKSOURA ISOLÉ","	# <isolée> 062C 0649"},
@@ -22204,6 +22278,7 @@ static const struct unicode_nameannot un
 /* FDFF */ { "LIGATURE ARABE AZZA WA DJALL",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_FE[] = {
 /* FE00 */ { "SÉLECTEUR DE VARIANTE-1","	* ces caractères ont pour abréviation VS1, VS2, et ainsi de suite"},
 /* FE01 */ { "SÉLECTEUR DE VARIANTE-2",NULL},
@@ -22493,6 +22568,7 @@ static const struct unicode_nameannot un
 	"	x (<pas un caractère> - FFFE)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_00_FF[] = {
 /* FF00 */ { NULL,NULL},
 /* FF01 */ { "POINT D'EXCLAMATION PLEINE CHASSE","	~ FF01 FE00 forme alignée dans le coin\n"
@@ -22779,6 +22855,7 @@ static const struct unicode_nameannot un
 /* FFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_00[] = {
 /* 10000 */ { "SYLLABE LINÉAIRE B B008 A",NULL},
 /* 10001 */ { "SYLLABE LINÉAIRE B B038 E",NULL},
@@ -23038,6 +23115,7 @@ static const struct unicode_nameannot un
 /* 100FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_01[] = {
 /* 10100 */ { "TRAIT ÉGÉEN SÉPARATEUR DE MOTS",NULL},
 /* 10101 */ { "POINT ÉGÉEN SÉPARATEUR DE MOTS",NULL},
@@ -23300,6 +23378,7 @@ static const struct unicode_nameannot un
 /* 101FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_02[] = {
 /* 10200 */ { NULL,NULL},
 /* 10201 */ { NULL,NULL},
@@ -23559,6 +23638,7 @@ static const struct unicode_nameannot un
 /* 102FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_03[] = {
 /* 10300 */ { "LETTRE VIEIL ITALIQUE A",NULL},
 /* 10301 */ { "LETTRE VIEIL ITALIQUE BÉ",NULL},
@@ -23818,6 +23898,7 @@ static const struct unicode_nameannot un
 /* 103FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_04[] = {
 /* 10400 */ { "LETTRE MAJUSCULE DÉSÉRET I LONG",NULL},
 /* 10401 */ { "LETTRE MAJUSCULE DÉSÉRET E LONG",NULL},
@@ -24077,6 +24158,7 @@ static const struct unicode_nameannot un
 /* 104FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_05[] = {
 /* 10500 */ { "LETTRE ELBASAN A",NULL},
 /* 10501 */ { "LETTRE ELBASAN B",NULL},
@@ -24336,6 +24418,7 @@ static const struct unicode_nameannot un
 /* 105FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_06[] = {
 /* 10600 */ { "SIGNE LINÉAIRE A AB001",NULL},
 /* 10601 */ { "SIGNE LINÉAIRE A AB002",NULL},
@@ -24613,6 +24696,7 @@ static const struct unicode_nameannot un
 /* 106FF */ { "SIGNE LINÉAIRE A A594","	* 1064D ab131a, 10634 ab060"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_07[] = {
 /* 10700 */ { "SIGNE LINÉAIRE A A595","	* 1064D ab131a, 10634 ab060"},
 /* 10701 */ { "SIGNE LINÉAIRE A A596","	* 1064D ab131a, 1063E ab077"},
@@ -24875,6 +24959,7 @@ static const struct unicode_nameannot un
 /* 107FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_08[] = {
 /* 10800 */ { "SYLLABE CHYPRIOTE A",NULL},
 /* 10801 */ { "SYLLABE CHYPRIOTE E",NULL},
@@ -25134,6 +25219,7 @@ static const struct unicode_nameannot un
 /* 108FF */ { "NOMBRE HATRÉEN CENT",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_09[] = {
 /* 10900 */ { "LETTRE PHÉNICIENNE ALF","	x (lettre hébraïque alef - 05D0)"},
 /* 10901 */ { "LETTRE PHÉNICIENNE BÈT","	x (lettre hébraïque bèt - 05D1)"},
@@ -25398,6 +25484,7 @@ static const struct unicode_nameannot un
 /* 109FF */ { "FRACTION CURSIVE MÉROÏTIQUE DIX DOUZIÈMES",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_0A[] = {
 /* 10A00 */ { "LETTRE KHAROCHTHÎ A",NULL},
 /* 10A01 */ { "DIACRITIQUE VOYELLE KHAROCHTHÎ I",NULL},
@@ -25763,6 +25850,7 @@ static const struct unicode_nameannot un
 /* 10AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_0B[] = {
 /* 10B00 */ { "LETTRE AVESTIQUE A",NULL},
 /* 10B01 */ { "LETTRE AVESTIQUE AA",NULL},
@@ -26024,6 +26112,7 @@ static const struct unicode_nameannot un
 /* 10BFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_0C[] = {
 /* 10C00 */ { "LETTRE VIEUX-TURQUE A ORKHON",NULL},
 /* 10C01 */ { "LETTRE VIEUX-TURQUE A IENISSEÏ",NULL},
@@ -26291,6 +26380,7 @@ static const struct unicode_nameannot un
 /* 10CFF */ { "NOMBRE RUNIQUE HONGROIS MILLE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_0D[] = {
 /* 10D00 */ { "LETTRE ROHINGYA HANIFI A",NULL},
 /* 10D01 */ { "LETTRE ROHINGYA HANIFI BA",NULL},
@@ -26550,6 +26640,7 @@ static const struct unicode_nameannot un
 /* 10DFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_0E[] = {
 /* 10E00 */ { NULL,NULL},
 /* 10E01 */ { NULL,NULL},
@@ -26809,6 +26900,7 @@ static const struct unicode_nameannot un
 /* 10EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_0F[] = {
 /* 10F00 */ { "LETTRE VIEUX-SOGDIENNE ALEF",NULL},
 /* 10F01 */ { "LETTRE VIEUX-SOGDIENNE ALEF FINAL",NULL},
@@ -27070,6 +27162,7 @@ static const struct unicode_nameannot un
 /* 10FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_10[] = {
 /* 11000 */ { "DIACRITIQUE BRAHMI TCHANDRABINDOU",NULL},
 /* 11001 */ { "DIACRITIQUE BRAHMI ANOUSVÂRA",NULL},
@@ -27331,6 +27424,7 @@ static const struct unicode_nameannot un
 /* 110FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_11[] = {
 /* 11100 */ { "DIACRITIQUE CHAKMA TCHANDRABINDOU",NULL},
 /* 11101 */ { "DIACRITIQUE CHAKMA ANOUSVÂRA",NULL},
@@ -27600,6 +27694,7 @@ static const struct unicode_nameannot un
 /* 111FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_12[] = {
 /* 11200 */ { "LETTRE KHOJKI A",NULL},
 /* 11201 */ { "LETTRE KHOJKI Â",NULL},
@@ -27861,6 +27956,7 @@ static const struct unicode_nameannot un
 /* 112FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_13[] = {
 /* 11300 */ { "DIACRITIQUE GRANTHA ANOUSVÂRA SUSCRIT","	* utilisé dans des textes jaïniques en langue prâkrit pour l'anousvâra linguistique"},
 /* 11301 */ { "DIACRITIQUE GRANTHA TCHANDRABINDOU",NULL},
@@ -28121,6 +28217,7 @@ static const struct unicode_nameannot un
 /* 113FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_14[] = {
 /* 11400 */ { "LETTRE NÉWAR A",NULL},
 /* 11401 */ { "LETTRE NÉWAR Â",NULL},
@@ -28381,6 +28478,7 @@ static const struct unicode_nameannot un
 /* 114FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_15[] = {
 /* 11500 */ { NULL,NULL},
 /* 11501 */ { NULL,NULL},
@@ -28641,6 +28739,7 @@ static const struct unicode_nameannot un
 /* 115FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_16[] = {
 /* 11600 */ { "LETTRE MODI A",NULL},
 /* 11601 */ { "LETTRE MODI Â",NULL},
@@ -28901,6 +29000,7 @@ static const struct unicode_nameannot un
 /* 116FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_17[] = {
 /* 11700 */ { "LETTRE ÂHOM KA",NULL},
 /* 11701 */ { "LETTRE ÂHOM KHA",NULL},
@@ -29160,6 +29260,7 @@ static const struct unicode_nameannot un
 /* 117FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_18[] = {
 /* 11800 */ { "LETTRE DOGRA A",NULL},
 /* 11801 */ { "LETTRE DOGRA Â",NULL},
@@ -29419,6 +29520,7 @@ static const struct unicode_nameannot un
 /* 118FF */ { "OM VARANG KCHITI",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_19[] = {
 /* 11900 */ { "LETTRE DIVES AKURU A",NULL},
 /* 11901 */ { "LETTRE DIVES AKURU Â",NULL},
@@ -29681,6 +29783,7 @@ static const struct unicode_nameannot un
 /* 119FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_1A[] = {
 /* 11A00 */ { "LETTRE ZANABAZAR CARRÉ A","	* s'utilise pour représenter des voyelles indépendantes en combinaison avec des signes voyelles"},
 /* 11A01 */ { "DIACRITIQUE VOYELLE ZANABAZAR CARRÉ I",NULL},
@@ -29953,6 +30056,7 @@ static const struct unicode_nameannot un
 /* 11AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_1C[] = {
 /* 11C00 */ { "LETTRE BHAIKSUKI A",NULL},
 /* 11C01 */ { "LETTRE BHAIKSUKI Â",NULL},
@@ -30212,6 +30316,7 @@ static const struct unicode_nameannot un
 /* 11CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_1D[] = {
 /* 11D00 */ { "LETTRE GONDI DE MASARAM A",NULL},
 /* 11D01 */ { "LETTRE GONDI DE MASARAM Â",NULL},
@@ -30471,6 +30576,7 @@ static const struct unicode_nameannot un
 /* 11DFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_1E[] = {
 /* 11E00 */ { NULL,NULL},
 /* 11E01 */ { NULL,NULL},
@@ -30730,6 +30836,7 @@ static const struct unicode_nameannot un
 /* 11EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_1F[] = {
 /* 11F00 */ { NULL,NULL},
 /* 11F01 */ { NULL,NULL},
@@ -31013,6 +31120,7 @@ static const struct unicode_nameannot un
 /* 11FFF */ { "PONCTUATION TAMOULE FIN DE TEXTE","	x (ponctuation singhalaise kounddaliya - 0DF4)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_20[] = {
 /* 12000 */ { "SIGNE CUNÉIFORME A",NULL},
 /* 12001 */ { "SIGNE CUNÉIFORME A FOIS A",NULL},
@@ -31272,6 +31380,7 @@ static const struct unicode_nameannot un
 /* 120FF */ { "SIGNE CUNÉIFORME GECHTIN FOIS KOUR",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_21[] = {
 /* 12100 */ { "SIGNE CUNÉIFORME GI",NULL},
 /* 12101 */ { "SIGNE CUNÉIFORME GI FOIS E",NULL},
@@ -31531,6 +31640,7 @@ static const struct unicode_nameannot un
 /* 121FF */ { "SIGNE CUNÉIFORME LOU2 FOIS BAD",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_22[] = {
 /* 12200 */ { "SIGNE CUNÉIFORME LOU2 FOIS ECH2",NULL},
 /* 12201 */ { "SIGNE CUNÉIFORME LOU2 FOIS ECH2 TENOU",NULL},
@@ -31790,6 +31900,7 @@ static const struct unicode_nameannot un
 /* 122FF */ { "SIGNE CUNÉIFORME TI TENOU",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_23[] = {
 /* 12300 */ { "SIGNE CUNÉIFORME TIL",NULL},
 /* 12301 */ { "SIGNE CUNÉIFORME TIR",NULL},
@@ -32049,6 +32160,7 @@ static const struct unicode_nameannot un
 /* 123FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_24[] = {
 /* 12400 */ { "SIGNE NUMÉRAL CUNÉIFORME DEUX ACH",NULL},
 /* 12401 */ { "SIGNE NUMÉRAL CUNÉIFORME TROIS ACH",NULL},
@@ -32309,6 +32421,7 @@ static const struct unicode_nameannot un
 /* 124FF */ { "SIGNE CUNÉIFORME LAK-550",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_25[] = {
 /* 12500 */ { "SIGNE CUNÉIFORME LAK-608",NULL},
 /* 12501 */ { "SIGNE CUNÉIFORME LAK-617",NULL},
@@ -32568,6 +32681,7 @@ static const struct unicode_nameannot un
 /* 125FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_2F[] = {
 /* 12F00 */ { NULL,NULL},
 /* 12F01 */ { NULL,NULL},
@@ -32827,6 +32941,7 @@ static const struct unicode_nameannot un
 /* 12FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_30[] = {
 /* 13000 */ { "HIÉROGLYPHE ÉGYPTIEN A001",NULL},
 /* 13001 */ { "HIÉROGLYPHE ÉGYPTIEN A002",NULL},
@@ -33098,6 +33213,7 @@ static const struct unicode_nameannot un
 /* 130FF */ { "HIÉROGLYPHE ÉGYPTIEN F001A",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_31[] = {
 /* 13100 */ { "HIÉROGLYPHE ÉGYPTIEN F002",NULL},
 /* 13101 */ { "HIÉROGLYPHE ÉGYPTIEN F003",NULL},
@@ -33370,6 +33486,7 @@ static const struct unicode_nameannot un
 	"	* variante de 131FE"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_32[] = {
 /* 13200 */ { "HIÉROGLYPHE ÉGYPTIEN N018","	* île\n"
 	"	* à ne pas confondre avec 132F0, 133D4 ou 133F3"},
@@ -33646,6 +33763,7 @@ static const struct unicode_nameannot un
 /* 132FF */ { "HIÉROGLYPHE ÉGYPTIEN S039",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_33[] = {
 /* 13300 */ { "HIÉROGLYPHE ÉGYPTIEN S040","	* phonogramme « wꜣs »"},
 /* 13301 */ { "HIÉROGLYPHE ÉGYPTIEN S041","	* phonogramme « ḏꜣm »"},
@@ -33942,6 +34060,7 @@ static const struct unicode_nameannot un
 /* 133FF */ { "HIÉROGLYPHE ÉGYPTIEN Z015E","	* 6"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_34[] = {
 /* 13400 */ { "HIÉROGLYPHE ÉGYPTIEN Z015F","	* 7"},
 /* 13401 */ { "HIÉROGLYPHE ÉGYPTIEN Z015G","	* 8"},
@@ -34203,6 +34322,7 @@ static const struct unicode_nameannot un
 /* 134FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_44[] = {
 /* 14400 */ { "HIÉROGLYPHE ANATOLIEN A001","	= ego"},
 /* 14401 */ { "HIÉROGLYPHE ANATOLIEN A002","	= ego2"},
@@ -34510,6 +34630,7 @@ static const struct unicode_nameannot un
 /* 144FF */ { "HIÉROGLYPHE ANATOLIEN A222",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_45[] = {
 /* 14500 */ { "HIÉROGLYPHE ANATOLIEN A223","	= « sa6 » syllabique"},
 /* 14501 */ { "HIÉROGLYPHE ANATOLIEN A224","	= « ha? pa? » syllabique"},
@@ -34812,6 +34933,7 @@ static const struct unicode_nameannot un
 /* 145FF */ { "HIÉROGLYPHE ANATOLIEN A457",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_46[] = {
 /* 14600 */ { "HIÉROGLYPHE ANATOLIEN A457A",NULL},
 /* 14601 */ { "HIÉROGLYPHE ANATOLIEN A458",NULL},
@@ -35072,6 +35194,7 @@ static const struct unicode_nameannot un
 /* 146FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_68[] = {
 /* 16800 */ { "LETTRE BAMOUM DE PHASE 'A' NGKÜ MFON",NULL},
 /* 16801 */ { "LETTRE BAMOUM DE PHASE 'A' GBIÉ FON",NULL},
@@ -35331,6 +35454,7 @@ static const struct unicode_nameannot un
 /* 168FF */ { "LETTRE BAMOUM DE PHASE 'D' KÙETMÙN",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_69[] = {
 /* 16900 */ { "LETTRE BAMOUM DE PHASE 'D' TÙT",NULL},
 /* 16901 */ { "LETTRE BAMOUM DE PHASE 'D' SHÙE",NULL},
@@ -35590,6 +35714,7 @@ static const struct unicode_nameannot un
 /* 169FF */ { "LETTRE BAMOUM DE PHASE 'E' MON",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_6A[] = {
 /* 16A00 */ { "LETTRE BAMOUM DE PHASE 'E' TÈN",NULL},
 /* 16A01 */ { "LETTRE BAMOUM DE PHASE 'E' FA'",NULL},
@@ -35849,6 +35974,7 @@ static const struct unicode_nameannot un
 /* 16AFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_6B[] = {
 /* 16B00 */ { "VOYELLE PAHAWH HMONG KEEB","	= keem"},
 /* 16B01 */ { "VOYELLE PAHAWH HMONG KEEV","	= kee"},
@@ -36111,6 +36237,7 @@ static const struct unicode_nameannot un
 /* 16BFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_6E[] = {
 /* 16E00 */ { NULL,NULL},
 /* 16E01 */ { NULL,NULL},
@@ -36370,6 +36497,7 @@ static const struct unicode_nameannot un
 /* 16EFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_6F[] = {
 /* 16F00 */ { "LETTRE MIAO PA","	* utilisée pour « ba » en yi sec"},
 /* 16F01 */ { "LETTRE MIAO BA",NULL},
@@ -36632,6 +36760,7 @@ static const struct unicode_nameannot un
 /* 16FFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_88[] = {
 /* 18800 */ { "ÉLÉMENT TANGOUTE-001",NULL},
 /* 18801 */ { "ÉLÉMENT TANGOUTE-002",NULL},
@@ -36891,6 +37020,7 @@ static const struct unicode_nameannot un
 /* 188FF */ { "ÉLÉMENT TANGOUTE-256",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_89[] = {
 /* 18900 */ { "ÉLÉMENT TANGOUTE-257",NULL},
 /* 18901 */ { "ÉLÉMENT TANGOUTE-258",NULL},
@@ -37150,6 +37280,7 @@ static const struct unicode_nameannot un
 /* 189FF */ { "ÉLÉMENT TANGOUTE-512",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_8A[] = {
 /* 18A00 */ { "ÉLÉMENT TANGOUTE-513",NULL},
 /* 18A01 */ { "ÉLÉMENT TANGOUTE-514",NULL},
@@ -37409,6 +37540,7 @@ static const struct unicode_nameannot un
 /* 18AFF */ { "ÉLÉMENT TANGOUTE-768","	* quatre traits"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_8B[] = {
 /* 18B00 */ { "CARACTÈRE PETITE ÉCRITURE KHITANE-18B00",NULL},
 /* 18B01 */ { "CARACTÈRE PETITE ÉCRITURE KHITANE-18B01",NULL},
@@ -37668,6 +37800,7 @@ static const struct unicode_nameannot un
 /* 18BFF */ { "CARACTÈRE PETITE ÉCRITURE KHITANE-18BFF",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_8C[] = {
 /* 18C00 */ { "CARACTÈRE PETITE ÉCRITURE KHITANE-18C00",NULL},
 /* 18C01 */ { "CARACTÈRE PETITE ÉCRITURE KHITANE-18C01",NULL},
@@ -37927,6 +38060,7 @@ static const struct unicode_nameannot un
 /* 18CFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_AF[] = {
 /* 1AF00 */ { NULL,NULL},
 /* 1AF01 */ { NULL,NULL},
@@ -38186,6 +38320,7 @@ static const struct unicode_nameannot un
 /* 1AFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_B0[] = {
 /* 1B000 */ { "CARACTÈRE KATAKANA E ARCHAÏQUE",NULL},
 /* 1B001 */ { "CARACTÈRE HENTAIGANA E-1","	* dérivé de 6C5F"},
@@ -38445,6 +38580,7 @@ static const struct unicode_nameannot un
 /* 1B0FF */ { "CARACTÈRE HENTAIGANA RE-2","	* dérivé de 79AE"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_B1[] = {
 /* 1B100 */ { "CARACTÈRE HENTAIGANA RE-3","	* dérivé de 9023"},
 /* 1B101 */ { "CARACTÈRE HENTAIGANA RE-4","	* dérivé de 9E97"},
@@ -38704,6 +38840,7 @@ static const struct unicode_nameannot un
 /* 1B1FF */ { "CARACTÈRE NÜSHU-1B1FF",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_B2[] = {
 /* 1B200 */ { "CARACTÈRE NÜSHU-1B200",NULL},
 /* 1B201 */ { "CARACTÈRE NÜSHU-1B201","	x 591A"},
@@ -38963,6 +39100,7 @@ static const struct unicode_nameannot un
 /* 1B2FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_BC[] = {
 /* 1BC00 */ { "LETTRE DE STÉNO DUPLOYÉ H","	* chinook, Pernin, Sloan, Perrault"},
 /* 1BC01 */ { "LETTRE DE STÉNO DUPLOYÉ X","	* langues salishennes"},
@@ -39384,6 +39522,7 @@ static const struct unicode_nameannot un
 /* 1BCFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_CF[] = {
 /* 1CF00 */ { "DIACRITIQUE ZNAMENNY GORAZDO NIZKO S KRYJEM À GAUCHE",NULL},
 /* 1CF01 */ { "DIACRITIQUE ZNAMENNY NIZKO S KRYJEM À GAUCHE",NULL},
@@ -39643,6 +39782,7 @@ static const struct unicode_nameannot un
 /* 1CFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D0[] = {
 /* 1D000 */ { "SYMBOLE MUSICAL BYZANTIN PSILI",NULL},
 /* 1D001 */ { "SYMBOLE MUSICAL BYZANTIN DASEIA",NULL},
@@ -39904,6 +40044,7 @@ static const struct unicode_nameannot un
 /* 1D0FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D1[] = {
 /* 1D100 */ { "SYMBOLE MUSICAL BARRE DE MESURE SIMPLE",NULL},
 /* 1D101 */ { "SYMBOLE MUSICAL BARRE DE MESURE DOUBLE",NULL},
@@ -40169,6 +40310,7 @@ static const struct unicode_nameannot un
 /* 1D1FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D2[] = {
 /* 1D200 */ { "SYMBOLE NOTATION GRECQUE VOCALE 1","	* mi1 vocal"},
 /* 1D201 */ { "SYMBOLE NOTATION GRECQUE VOCALE 2","	* premier dièse du mi1 vocal"},
@@ -40452,6 +40594,7 @@ static const struct unicode_nameannot un
 /* 1D2FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D3[] = {
 /* 1D300 */ { "MONOGRAMME DE L'HOMME","	= ren, jen\n"
 	"	* l'appellation en anglais de ce caractère est erronée\n"
@@ -40714,6 +40857,7 @@ static const struct unicode_nameannot un
 /* 1D3FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D4[] = {
 /* 1D400 */ { "MAJUSCULE MATHÉMATIQUE GRASSE A","	# <police> 0041 lettre majuscule latine a"},
 /* 1D401 */ { "MAJUSCULE MATHÉMATIQUE GRASSE B","	# <police> 0042 lettre majuscule latine b"},
@@ -41011,6 +41155,7 @@ static const struct unicode_nameannot un
 /* 1D4FF */ { "MINUSCULE MATHÉMATIQUE GRASSE V DE RONDE","	# <police> 0076 lettre minuscule latine v"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D5[] = {
 /* 1D500 */ { "MINUSCULE MATHÉMATIQUE GRASSE W DE RONDE","	# <police> 0077 lettre minuscule latine w"},
 /* 1D501 */ { "MINUSCULE MATHÉMATIQUE GRASSE X DE RONDE","	# <police> 0078 lettre minuscule latine x"},
@@ -41273,6 +41418,7 @@ static const struct unicode_nameannot un
 /* 1D5FF */ { "MINUSCULE MATHÉMATIQUE GRASSE SANS EMPATTEMENT R","	# <police> 0072 lettre minuscule latine r"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D6[] = {
 /* 1D600 */ { "MINUSCULE MATHÉMATIQUE GRASSE SANS EMPATTEMENT S","	# <police> 0073 lettre minuscule latine s"},
 /* 1D601 */ { "MINUSCULE MATHÉMATIQUE GRASSE SANS EMPATTEMENT T","	# <police> 0074 lettre minuscule latine t"},
@@ -41538,6 +41684,7 @@ static const struct unicode_nameannot un
 /* 1D6FF */ { "MINUSCULE MATHÉMATIQUE ITALIQUE DELTA","	# <police> 03B4 lettre minuscule grecque delta"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D7[] = {
 /* 1D700 */ { "MINUSCULE MATHÉMATIQUE ITALIQUE EPSILON","	# <police> 03B5 lettre minuscule grecque epsilon"},
 /* 1D701 */ { "MINUSCULE MATHÉMATIQUE ITALIQUE DZÊTA","	# <police> 03B6 lettre minuscule grecque dzêta"},
@@ -41797,6 +41944,7 @@ static const struct unicode_nameannot un
 /* 1D7FF */ { "CHIFFRE MATHÉMATIQUE À CHASSE FIXE NEUF","	# <police> 0039 chiffre neuf"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D8[] = {
 /* 1D800 */ { "SIGNWRITING MAIN-POING INDEX",NULL},
 /* 1D801 */ { "SIGNWRITING MAIN-CERCLE INDEX",NULL},
@@ -42056,6 +42204,7 @@ static const struct unicode_nameannot un
 /* 1D8FF */ { "SIGNWRITING MAIN-POING POUCE SUR DEUX DOIGTS",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_D9[] = {
 /* 1D900 */ { "SIGNWRITING MAIN-POING POUCE SOUS TROIS DOIGTS",NULL},
 /* 1D901 */ { "SIGNWRITING MAIN-POING POUCE SOUS QUATRE DOIGTS",NULL},
@@ -42315,6 +42464,7 @@ static const struct unicode_nameannot un
 /* 1D9FF */ { "SIGNWRITING TÊTE",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_DA[] = {
 /* 1DA00 */ { "SIGNWRITING TÊTE BORD",NULL},
 /* 1DA01 */ { "SIGNWRITING TÊTE MOUVEMENT-PLAN VERTICAL RECTILIGNE",NULL},
@@ -42574,6 +42724,7 @@ static const struct unicode_nameannot un
 /* 1DAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_DF[] = {
 /* 1DF00 */ { "LETTRE MINUSCULE LATINE DIGRAMME FENG AVEC TRILLE",NULL},
 /* 1DF01 */ { "LETTRE MINUSCULE LATINE G CURSIF RÉFLÉCHI",NULL},
@@ -42833,6 +42984,7 @@ static const struct unicode_nameannot un
 /* 1DFFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_E0[] = {
 /* 1E000 */ { "DIACRITIQUE LETTRE GLAGOLITIQUE AZE",NULL},
 /* 1E001 */ { "DIACRITIQUE LETTRE GLAGOLITIQUE BOUKI",NULL},
@@ -43092,6 +43244,7 @@ static const struct unicode_nameannot un
 /* 1E0FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_E1[] = {
 /* 1E100 */ { "LETTRE NYIAKENG PUACHUE HMONG MA","	x (lettre hébraïque mém - 05DE)"},
 /* 1E101 */ { "LETTRE NYIAKENG PUACHUE HMONG TSA",NULL},
@@ -43362,6 +43515,7 @@ static const struct unicode_nameannot un
 /* 1E1FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_E2[] = {
 /* 1E200 */ { NULL,NULL},
 /* 1E201 */ { NULL,NULL},
@@ -43622,6 +43776,7 @@ static const struct unicode_nameannot un
 	"	x (symbole roupie indienne - 20B9)"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_E7[] = {
 /* 1E700 */ { NULL,NULL},
 /* 1E701 */ { NULL,NULL},
@@ -43881,6 +44036,7 @@ static const struct unicode_nameannot un
 /* 1E7FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_E8[] = {
 /* 1E800 */ { "SYLLABE MENDÉ KIKAKUI M001 KI",NULL},
 /* 1E801 */ { "SYLLABE MENDÉ KIKAKUI M002 KA",NULL},
@@ -44140,6 +44296,7 @@ static const struct unicode_nameannot un
 /* 1E8FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_E9[] = {
 /* 1E900 */ { "LETTRE MAJUSCULE ADLAM ALIF",NULL},
 /* 1E901 */ { "LETTRE MAJUSCULE ADLAM DÂLI",NULL},
@@ -44399,6 +44556,7 @@ static const struct unicode_nameannot un
 /* 1E9FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_EC[] = {
 /* 1EC00 */ { NULL,NULL},
 /* 1EC01 */ { NULL,NULL},
@@ -44665,6 +44823,7 @@ static const struct unicode_nameannot un
 /* 1ECFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_ED[] = {
 /* 1ED00 */ { NULL,NULL},
 /* 1ED01 */ { "NOMBRE SIYAQ OTTOMAN UN",NULL},
@@ -44925,6 +45084,7 @@ static const struct unicode_nameannot un
 /* 1EDFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_EE[] = {
 /* 1EE00 */ { "SYMBOLE MATHÉMATIQUE ARABE ALIF","	x (lettre arabe alif isolé - FE8D)\n"
 	"	# <police> 0627 lettre arabe alif"},
@@ -45238,6 +45398,7 @@ static const struct unicode_nameannot un
 /* 1EEFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F0[] = {
 /* 1F000 */ { "TUILE DE MAJONG VENT D'EST",NULL},
 /* 1F001 */ { "TUILE DE MAJONG VENT DU SUD",NULL},
@@ -45497,6 +45658,7 @@ static const struct unicode_nameannot un
 /* 1F0FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F1[] = {
 /* 1F100 */ { "CHIFFRE ZÉRO POINT","	# 0030 002E"},
 /* 1F101 */ { "CHIFFRE ZÉRO VIRGULE","	# 0030 002C"},
@@ -45800,6 +45962,7 @@ static const struct unicode_nameannot un
 /* 1F1FF */ { "SYMBOLE INDICATEUR RÉGIONAL LETTRE Z",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F2[] = {
 /* 1F200 */ { "HIRAGANA HOKA DISPOSÉ EN CARRÉ","	= et autres\n"
 	"	# <enCarré> 307B 304B"},
@@ -46132,6 +46295,7 @@ static const struct unicode_nameannot un
 /* 1F2FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F3[] = {
 /* 1F300 */ { "CYCLONE","	= typhon, ouragan"},
 /* 1F301 */ { "BRUMEUX","	x (brouillard - 1F32B)"},
@@ -46449,6 +46613,7 @@ static const struct unicode_nameannot un
 /* 1F3FF */ { "MODIFICATEUR D'ÉMOJI PHOTOTYPE-6",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F4[] = {
 /* 1F400 */ { "RAT","	* premier signe du zodiaque asiatique"},
 /* 1F401 */ { "SOURIS","	* premier signe du zodiaque asiatique utilisé en Perse"},
@@ -46744,6 +46909,7 @@ static const struct unicode_nameannot un
 /* 1F4FF */ { "CHAPELET",NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F5[] = {
 /* 1F500 */ { "FLÈCHES VERS LA DROITE S'ENTRECROISANT","	= brouiller"},
 /* 1F501 */ { "FLÈCHES VERS LA DROITE ET VERS LA GAUCHE SENS HORAIRE EN CERCLE OUVERT","	= répéter\n"
@@ -47069,6 +47235,7 @@ static const struct unicode_nameannot un
 /* 1F5FF */ { "MOYAI","	* statue de pierre japonaise, semblable aux statues monumentales (moaï) de l'île de Pâques"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F6[] = {
 /* 1F600 */ { "VISAGE RIEUR",NULL},
 /* 1F601 */ { "VISAGE RIEUR AUX YEUX RÉJOUIS",NULL},
@@ -47361,6 +47528,7 @@ static const struct unicode_nameannot un
 /* 1F6FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F7[] = {
 /* 1F700 */ { "SYMBOLE ALCHIMIQUE DE LA QUINTESSENCE",NULL},
 /* 1F701 */ { "SYMBOLE ALCHIMIQUE DE L'AIR",NULL},
@@ -47650,6 +47818,7 @@ static const struct unicode_nameannot un
 /* 1F7FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F8[] = {
 /* 1F800 */ { "FLÈCHE À PETITE TÊTE TRIANGULAIRE VERS LA GAUCHE",NULL},
 /* 1F801 */ { "FLÈCHE À PETITE TÊTE TRIANGULAIRE VERS LE HAUT",NULL},
@@ -47909,6 +48078,7 @@ static const struct unicode_nameannot un
 /* 1F8FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_F9[] = {
 /* 1F900 */ { "CROIX PATTÉE CERCLÉE AVEC QUATRE POINTS",NULL},
 /* 1F901 */ { "CROIX PATTÉE CERCLÉE AVEC DEUX POINTS",NULL},
@@ -48195,6 +48365,7 @@ static const struct unicode_nameannot un
 	"	= œil turc"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_FA[] = {
 /* 1FA00 */ { "ROI NEUTRE DU JEU D'ÉCHECS","	x (roi blanc du jeu d'échecs - 2654)"},
 /* 1FA01 */ { "DAME NEUTRE DU JEU D'ÉCHECS",NULL},
@@ -48483,6 +48654,7 @@ static const struct unicode_nameannot un
 /* 1FAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_01_FB[] = {
 /* 1FB00 */ { "SIXIÈME DE PAVÉ-1",NULL},
 /* 1FB01 */ { "SIXIÈME DE PAVÉ-2",NULL},
@@ -48766,6 +48938,7 @@ static const struct unicode_nameannot un
 /* 1FBFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_02_F8[] = {
 /* 2F800 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2F800","	: 4E3D"},
 /* 2F801 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2F801","	: 4E38"},
@@ -49037,6 +49210,7 @@ static const struct unicode_nameannot un
 /* 2F8FF */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2F8FF","	: 6D16"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_02_F9[] = {
 /* 2F900 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2F900","	: 6D3E"},
 /* 2F901 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2F901","	: 6D77"},
@@ -49308,6 +49482,7 @@ static const struct unicode_nameannot un
 /* 2F9FF */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2F9FF","	: 980B"}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_02_FA[] = {
 /* 2FA00 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2FA00","	: 9829"},
 /* 2FA01 */ { "IDÉOGRAMME DE COMPATIBILITÉ CJC-2FA01","	: 295B6"},
@@ -49567,6 +49742,7 @@ static const struct unicode_nameannot un
 /* 2FAFF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_0E_00[] = {
 /* E0000 */ { NULL,NULL},
 /* E0001 */ { "ÉTIQUETTE DE LANGUE","	* ce caractère est obsolète et son utilisation est fortement déconseillée"},
@@ -49826,6 +50002,7 @@ static const struct unicode_nameannot un
 /* E00FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot unaFR_0E_01[] = {
 /* E0100 */ { "SÉLECTEUR DE VARIANTE-17","	* ces caractères ont pour abréviation VS17, VS18, et ainsi de suite"},
 /* E0101 */ { "SÉLECTEUR DE VARIANTE-18",NULL},
@@ -50085,6 +50262,7 @@ static const struct unicode_nameannot un
 /* E01FF */ { NULL,NULL}
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const unaFR_00[] = {
 	unaFR_00_00,
 	unaFR_00_01,
@@ -50344,6 +50522,7 @@ static const struct unicode_nameannot *
 	unaFR_00_FF
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const unaFR_01[] = {
 	unaFR_01_00,
 	unaFR_01_01,
@@ -50603,6 +50782,7 @@ static const struct unicode_nameannot *
 	nullarray2FR
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const unaFR_02[] = {
 	nullarrayFR,
 	nullarrayFR,
@@ -50862,6 +51042,7 @@ static const struct unicode_nameannot *
 	nullarray2FR
 };
 
+UN_DLL_LOCAL
 static const struct unicode_nameannot * const unaFR_0E[] = {
 	unaFR_0E_00,
 	unaFR_0E_01,
diff -pruN 20211114-1/tests/call-test.c 20220701-1/tests/call-test.c
--- 20211114-1/tests/call-test.c	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/tests/call-test.c	2022-07-02 02:05:04.000000000 +0000
@@ -51,10 +51,13 @@ static int test(long val, const char *re
 	}
 	printf("  return=NULL value\n");
 	return( 1 );
+    } else if ( expect==NULL ) {
+	printf("\n  ret=\"%s\"\n  exp=NULL.\n",result);
+	return( 0 );
     }
 
     printf("\n  ret=\"%s\"\n  exp=\"%s\"\n",result,expect);
-    return( (int)(strcmp(result,expect)==0 || NOTCMP==expect || NOBLKT==expect ? 1:0) );
+    return( (int)(strcmp(result,expect)==0 || NOTCMP==expect || (NOBLKT==expect ? 1:0)) );
 }
 
 #if defined(DO_CALL_TEST0) || defined(DO_CALL_TEST3)
diff -pruN 20211114-1/uninameslist.h 20220701-1/uninameslist.h
--- 20211114-1/uninameslist.h	2021-11-14 08:36:12.000000000 +0000
+++ 20220701-1/uninameslist.h	2022-07-02 02:05:04.000000000 +0000
@@ -18,9 +18,9 @@ struct unicode_nameannot {
 
 /* NOTE: Build your program to access the functions if using multilanguage. */
 
-#define UNICODE_BLOCK_MAX	334
-#define UNICODE_EN_BLOCK_MAX	334
-extern const struct unicode_block UnicodeBlock[334];
+#define UNICODE_BLOCK_MAX	341
+#define UNICODE_EN_BLOCK_MAX	341
+extern const struct unicode_block UnicodeBlock[341];
 
 /* NOTE: These 4 constants are correct for this version of libuninameslist, */
 /* but can change for later versions of NamesList (use as an example guide) */
