Add missing aliases for \p{Present_In}

\p{Present_In} is a Perl extension of the Unicode Age property, added
because knowing the exact Unicode version in which a code point became
assigned is rarely what you want; much more frequently you want to know
if the code point exists in the version or not.  (Since this extension
was added, Unicode changed their language to declare that the Age
property should be interpreted in pattern matching, not as described,
but as Perl's Present_In is.  But  I chose to not change Age, to avoid
backwards compatibility issues, and this way, a coder can choose which
thing s/he wanted.)

Unicode typically has synonyms (aliases) for each value a property can
tak on, so \p{Age=6.1} and \p{Age=V61_1} mean the same thing.

Prior to this commit, neither \p{Present_In=1_1} nor \p{Present_In=NA}
worked.

1 files changed, 1436 insertions, 1513 deletions

diff --git a/charclass_invlists.h b/charclass_invlists.h
index 0f3c91aa5b..27e0ca984a 100644
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -194135,1425 +194135,6 @@ static const UV UNI_AGE__9_invlist[] = {  /* for all charsets */
 	0x1F992
 };
 
-static const UV UNI_AGE__NA_invlist[] = {  /* for all charsets */
-	1412,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x378,
-	0x37A,
-	0x380,
-	0x384,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x58B,
-	0x58D,
-	0x590,
-	0x591,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5EF,
-	0x5F5,
-	0x600,
-	0x70E,
-	0x70F,
-	0x74B,
-	0x74D,
-	0x7B2,
-	0x7C0,
-	0x7FB,
-	0x7FD,
-	0x82E,
-	0x830,
-	0x83F,
-	0x840,
-	0x85C,
-	0x85E,
-	0x85F,
-	0x860,
-	0x86B,
-	0x870,
-	0x88F,
-	0x890,
-	0x892,
-	0x898,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BC,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E4,
-	0x9E6,
-	0x9FF,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3C,
-	0xA3D,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4E,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA66,
-	0xA77,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABC,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE4,
-	0xAE6,
-	0xAF2,
-	0xAF9,
-	0xB00,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3C,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4E,
-	0xB55,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB64,
-	0xB66,
-	0xB78,
-	0xB82,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCE,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xBE6,
-	0xBFB,
-	0xC00,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3C,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4E,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5B,
-	0xC5D,
-	0xC5E,
-	0xC60,
-	0xC64,
-	0xC66,
-	0xC70,
-	0xC77,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBC,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCE,
-	0xCD5,
-	0xCD7,
-	0xCDD,
-	0xCDF,
-	0xCE0,
-	0xCE4,
-	0xCE6,
-	0xCF0,
-	0xCF1,
-	0xCF3,
-	0xD00,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD50,
-	0xD54,
-	0xD64,
-	0xD66,
-	0xD80,
-	0xD81,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCA,
-	0xDCB,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDE6,
-	0xDF0,
-	0xDF2,
-	0xDF5,
-	0xE01,
-	0xE3B,
-	0xE3F,
-	0xE5C,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE86,
-	0xE8B,
-	0xE8C,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xEC8,
-	0xECE,
-	0xED0,
-	0xEDA,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0xFBE,
-	0xFCD,
-	0xFCE,
-	0xFDB,
-	0x1000,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135D,
-	0x137D,
-	0x1380,
-	0x139A,
-	0x13A0,
-	0x13F6,
-	0x13F8,
-	0x13FE,
-	0x1400,
-	0x169D,
-	0x16A0,
-	0x16F9,
-	0x1700,
-	0x1716,
-	0x171F,
-	0x1737,
-	0x1740,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x1780,
-	0x17DE,
-	0x17E0,
-	0x17EA,
-	0x17F0,
-	0x17FA,
-	0x1800,
-	0x181A,
-	0x1820,
-	0x1879,
-	0x1880,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x193C,
-	0x1940,
-	0x1941,
-	0x1944,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19CA,
-	0x19D0,
-	0x19DB,
-	0x19DE,
-	0x1A1C,
-	0x1A1E,
-	0x1A5F,
-	0x1A60,
-	0x1A7D,
-	0x1A7F,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1AA0,
-	0x1AAE,
-	0x1AB0,
-	0x1ACF,
-	0x1B00,
-	0x1B4D,
-	0x1B50,
-	0x1B7F,
-	0x1B80,
-	0x1BF4,
-	0x1BFC,
-	0x1C38,
-	0x1C3B,
-	0x1C4A,
-	0x1C4D,
-	0x1C89,
-	0x1C90,
-	0x1CBB,
-	0x1CBD,
-	0x1CC8,
-	0x1CD0,
-	0x1CFB,
-	0x1D00,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FC5,
-	0x1FC6,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FDD,
-	0x1FF0,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFF,
-	0x2000,
-	0x2065,
-	0x2066,
-	0x2072,
-	0x2074,
-	0x208F,
-	0x2090,
-	0x209D,
-	0x20A0,
-	0x20C1,
-	0x20D0,
-	0x20F1,
-	0x2100,
-	0x218C,
-	0x2190,
-	0x2427,
-	0x2440,
-	0x244B,
-	0x2460,
-	0x2B74,
-	0x2B76,
-	0x2B96,
-	0x2B97,
-	0x2CF4,
-	0x2CF9,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D71,
-	0x2D7F,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E5E,
-	0x2E80,
-	0x2E9A,
-	0x2E9B,
-	0x2EF4,
-	0x2F00,
-	0x2FD6,
-	0x2FF0,
-	0x2FFC,
-	0x3000,
-	0x3040,
-	0x3041,
-	0x3097,
-	0x3099,
-	0x3100,
-	0x3105,
-	0x3130,
-	0x3131,
-	0x318F,
-	0x3190,
-	0x31E4,
-	0x31F0,
-	0x321F,
-	0x3220,
-	0xA48D,
-	0xA490,
-	0xA4C7,
-	0xA4D0,
-	0xA62C,
-	0xA640,
-	0xA6F8,
-	0xA700,
-	0xA7CB,
-	0xA7D0,
-	0xA7D2,
-	0xA7D3,
-	0xA7D4,
-	0xA7D5,
-	0xA7DA,
-	0xA7F2,
-	0xA82D,
-	0xA830,
-	0xA83A,
-	0xA840,
-	0xA878,
-	0xA880,
-	0xA8C6,
-	0xA8CE,
-	0xA8DA,
-	0xA8E0,
-	0xA954,
-	0xA95F,
-	0xA97D,
-	0xA980,
-	0xA9CE,
-	0xA9CF,
-	0xA9DA,
-	0xA9DE,
-	0xA9FF,
-	0xAA00,
-	0xAA37,
-	0xAA40,
-	0xAA4E,
-	0xAA50,
-	0xAA5A,
-	0xAA5C,
-	0xAAC3,
-	0xAADB,
-	0xAAF7,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB6C,
-	0xAB70,
-	0xABEE,
-	0xABF0,
-	0xABFA,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xD800,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBC3,
-	0xFBD3,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDCF,
-	0xFE1A,
-	0xFE20,
-	0xFE53,
-	0xFE54,
-	0xFE67,
-	0xFE68,
-	0xFE6C,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFEFF,
-	0xFF00,
-	0xFF01,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0xFFE0,
-	0xFFE7,
-	0xFFE8,
-	0xFFEF,
-	0xFFF9,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10100,
-	0x10103,
-	0x10107,
-	0x10134,
-	0x10137,
-	0x1018F,
-	0x10190,
-	0x1019D,
-	0x101A0,
-	0x101A1,
-	0x101D0,
-	0x101FE,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x102E0,
-	0x102FC,
-	0x10300,
-	0x10324,
-	0x1032D,
-	0x1034B,
-	0x10350,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x1039F,
-	0x103C4,
-	0x103C8,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x104A0,
-	0x104AA,
-	0x104B0,
-	0x104D4,
-	0x104D8,
-	0x104FC,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x1056F,
-	0x1057B,
-	0x1057C,
-	0x1058B,
-	0x1058C,
-	0x10593,
-	0x10594,
-	0x10596,
-	0x10597,
-	0x105A2,
-	0x105A3,
-	0x105B2,
-	0x105B3,
-	0x105BA,
-	0x105BB,
-	0x105BD,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10780,
-	0x10786,
-	0x10787,
-	0x107B1,
-	0x107B2,
-	0x107BB,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10857,
-	0x1089F,
-	0x108A7,
-	0x108B0,
-	0x108E0,
-	0x108F3,
-	0x108F4,
-	0x108F6,
-	0x108FB,
-	0x1091C,
-	0x1091F,
-	0x1093A,
-	0x1093F,
-	0x10940,
-	0x10980,
-	0x109B8,
-	0x109BC,
-	0x109D0,
-	0x109D2,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A36,
-	0x10A38,
-	0x10A3B,
-	0x10A3F,
-	0x10A49,
-	0x10A50,
-	0x10A59,
-	0x10A60,
-	0x10AA0,
-	0x10AC0,
-	0x10AE7,
-	0x10AEB,
-	0x10AF7,
-	0x10B00,
-	0x10B36,
-	0x10B39,
-	0x10B56,
-	0x10B58,
-	0x10B73,
-	0x10B78,
-	0x10B92,
-	0x10B99,
-	0x10B9D,
-	0x10BA9,
-	0x10BB0,
-	0x10C00,
-	0x10C49,
-	0x10C80,
-	0x10CB3,
-	0x10CC0,
-	0x10CF3,
-	0x10CFA,
-	0x10D28,
-	0x10D30,
-	0x10D3A,
-	0x10E60,
-	0x10E7F,
-	0x10E80,
-	0x10EAA,
-	0x10EAB,
-	0x10EAE,
-	0x10EB0,
-	0x10EB2,
-	0x10F00,
-	0x10F28,
-	0x10F30,
-	0x10F5A,
-	0x10F70,
-	0x10F8A,
-	0x10FB0,
-	0x10FCC,
-	0x10FE0,
-	0x10FF7,
-	0x11000,
-	0x1104E,
-	0x11052,
-	0x11076,
-	0x1107F,
-	0x110C3,
-	0x110CD,
-	0x110CE,
-	0x110D0,
-	0x110E9,
-	0x110F0,
-	0x110FA,
-	0x11100,
-	0x11135,
-	0x11136,
-	0x11148,
-	0x11150,
-	0x11177,
-	0x11180,
-	0x111E0,
-	0x111E1,
-	0x111F5,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x1123F,
-	0x11280,
-	0x11287,
-	0x11288,
-	0x11289,
-	0x1128A,
-	0x1128E,
-	0x1128F,
-	0x1129E,
-	0x1129F,
-	0x112AA,
-	0x112B0,
-	0x112EB,
-	0x112F0,
-	0x112FA,
-	0x11300,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133B,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134E,
-	0x11350,
-	0x11351,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11364,
-	0x11366,
-	0x1136D,
-	0x11370,
-	0x11375,
-	0x11400,
-	0x1145C,
-	0x1145D,
-	0x11462,
-	0x11480,
-	0x114C8,
-	0x114D0,
-	0x114DA,
-	0x11580,
-	0x115B6,
-	0x115B8,
-	0x115DE,
-	0x11600,
-	0x11645,
-	0x11650,
-	0x1165A,
-	0x11660,
-	0x1166D,
-	0x11680,
-	0x116BA,
-	0x116C0,
-	0x116CA,
-	0x11700,
-	0x1171B,
-	0x1171D,
-	0x1172C,
-	0x11730,
-	0x11747,
-	0x11800,
-	0x1183C,
-	0x118A0,
-	0x118F3,
-	0x118FF,
-	0x11907,
-	0x11909,
-	0x1190A,
-	0x1190C,
-	0x11914,
-	0x11915,
-	0x11917,
-	0x11918,
-	0x11936,
-	0x11937,
-	0x11939,
-	0x1193B,
-	0x11947,
-	0x11950,
-	0x1195A,
-	0x119A0,
-	0x119A8,
-	0x119AA,
-	0x119D8,
-	0x119DA,
-	0x119E5,
-	0x11A00,
-	0x11A48,
-	0x11A50,
-	0x11AA3,
-	0x11AB0,
-	0x11AF9,
-	0x11C00,
-	0x11C09,
-	0x11C0A,
-	0x11C37,
-	0x11C38,
-	0x11C46,
-	0x11C50,
-	0x11C6D,
-	0x11C70,
-	0x11C90,
-	0x11C92,
-	0x11CA8,
-	0x11CA9,
-	0x11CB7,
-	0x11D00,
-	0x11D07,
-	0x11D08,
-	0x11D0A,
-	0x11D0B,
-	0x11D37,
-	0x11D3A,
-	0x11D3B,
-	0x11D3C,
-	0x11D3E,
-	0x11D3F,
-	0x11D48,
-	0x11D50,
-	0x11D5A,
-	0x11D60,
-	0x11D66,
-	0x11D67,
-	0x11D69,
-	0x11D6A,
-	0x11D8F,
-	0x11D90,
-	0x11D92,
-	0x11D93,
-	0x11D99,
-	0x11DA0,
-	0x11DAA,
-	0x11EE0,
-	0x11EF9,
-	0x11FB0,
-	0x11FB1,
-	0x11FC0,
-	0x11FF2,
-	0x11FFF,
-	0x1239A,
-	0x12400,
-	0x1246F,
-	0x12470,
-	0x12475,
-	0x12480,
-	0x12544,
-	0x12F90,
-	0x12FF3,
-	0x13000,
-	0x1342F,
-	0x13430,
-	0x13439,
-	0x14400,
-	0x14647,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16A60,
-	0x16A6A,
-	0x16A6E,
-	0x16ABF,
-	0x16AC0,
-	0x16ACA,
-	0x16AD0,
-	0x16AEE,
-	0x16AF0,
-	0x16AF6,
-	0x16B00,
-	0x16B46,
-	0x16B50,
-	0x16B5A,
-	0x16B5B,
-	0x16B62,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16E40,
-	0x16E9B,
-	0x16F00,
-	0x16F4B,
-	0x16F4F,
-	0x16F88,
-	0x16F8F,
-	0x16FA0,
-	0x16FE0,
-	0x16FE5,
-	0x16FF0,
-	0x16FF2,
-	0x17000,
-	0x187F8,
-	0x18800,
-	0x18CD6,
-	0x18D00,
-	0x18D09,
-	0x1AFF0,
-	0x1AFF4,
-	0x1AFF5,
-	0x1AFFC,
-	0x1AFFD,
-	0x1AFFF,
-	0x1B000,
-	0x1B123,
-	0x1B150,
-	0x1B153,
-	0x1B164,
-	0x1B168,
-	0x1B170,
-	0x1B2FC,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9C,
-	0x1BCA4,
-	0x1CF00,
-	0x1CF2E,
-	0x1CF30,
-	0x1CF47,
-	0x1CF50,
-	0x1CFC4,
-	0x1D000,
-	0x1D0F6,
-	0x1D100,
-	0x1D127,
-	0x1D129,
-	0x1D1EB,
-	0x1D200,
-	0x1D246,
-	0x1D2E0,
-	0x1D2F4,
-	0x1D300,
-	0x1D357,
-	0x1D360,
-	0x1D379,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D7CC,
-	0x1D7CE,
-	0x1DA8C,
-	0x1DA9B,
-	0x1DAA0,
-	0x1DAA1,
-	0x1DAB0,
-	0x1DF00,
-	0x1DF1F,
-	0x1E000,
-	0x1E007,
-	0x1E008,
-	0x1E019,
-	0x1E01B,
-	0x1E022,
-	0x1E023,
-	0x1E025,
-	0x1E026,
-	0x1E02B,
-	0x1E100,
-	0x1E12D,
-	0x1E130,
-	0x1E13E,
-	0x1E140,
-	0x1E14A,
-	0x1E14E,
-	0x1E150,
-	0x1E290,
-	0x1E2AF,
-	0x1E2C0,
-	0x1E2FA,
-	0x1E2FF,
-	0x1E300,
-	0x1E7E0,
-	0x1E7E7,
-	0x1E7E8,
-	0x1E7EC,
-	0x1E7ED,
-	0x1E7EF,
-	0x1E7F0,
-	0x1E7FF,
-	0x1E800,
-	0x1E8C5,
-	0x1E8C7,
-	0x1E8D7,
-	0x1E900,
-	0x1E94C,
-	0x1E950,
-	0x1E95A,
-	0x1E95E,
-	0x1E960,
-	0x1EC71,
-	0x1ECB5,
-	0x1ED01,
-	0x1ED3E,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1EEF0,
-	0x1EEF2,
-	0x1F000,
-	0x1F02C,
-	0x1F030,
-	0x1F094,
-	0x1F0A0,
-	0x1F0AF,
-	0x1F0B1,
-	0x1F0C0,
-	0x1F0C1,
-	0x1F0D0,
-	0x1F0D1,
-	0x1F0F6,
-	0x1F100,
-	0x1F1AE,
-	0x1F1E6,
-	0x1F203,
-	0x1F210,
-	0x1F23C,
-	0x1F240,
-	0x1F249,
-	0x1F250,
-	0x1F252,
-	0x1F260,
-	0x1F266,
-	0x1F300,
-	0x1F6D8,
-	0x1F6DD,
-	0x1F6ED,
-	0x1F6F0,
-	0x1F6FD,
-	0x1F700,
-	0x1F774,
-	0x1F780,
-	0x1F7D9,
-	0x1F7E0,
-	0x1F7EC,
-	0x1F7F0,
-	0x1F7F1,
-	0x1F800,
-	0x1F80C,
-	0x1F810,
-	0x1F848,
-	0x1F850,
-	0x1F85A,
-	0x1F860,
-	0x1F888,
-	0x1F890,
-	0x1F8AE,
-	0x1F8B0,
-	0x1F8B2,
-	0x1F900,
-	0x1FA54,
-	0x1FA60,
-	0x1FA6E,
-	0x1FA70,
-	0x1FA75,
-	0x1FA78,
-	0x1FA7D,
-	0x1FA80,
-	0x1FA87,
-	0x1FA90,
-	0x1FAAD,
-	0x1FAB0,
-	0x1FABB,
-	0x1FAC0,
-	0x1FAC6,
-	0x1FAD0,
-	0x1FADA,
-	0x1FAE0,
-	0x1FAE8,
-	0x1FAF0,
-	0x1FAF7,
-	0x1FB00,
-	0x1FB93,
-	0x1FB94,
-	0x1FBCB,
-	0x1FBF0,
-	0x1FBFA,
-	0x1FFFE,
-	0x2A6E0,
-	0x2A700,
-	0x2B739,
-	0x2B740,
-	0x2B81E,
-	0x2B820,
-	0x2CEA2,
-	0x2CEB0,
-	0x2EBE1,
-	0x2F800,
-	0x2FA1E,
-	0x2FFFE,
-	0x3134B,
-	0x3FFFE,
-	0x40000,
-	0x4FFFE,
-	0x50000,
-	0x5FFFE,
-	0x60000,
-	0x6FFFE,
-	0x70000,
-	0x7FFFE,
-	0x80000,
-	0x8FFFE,
-	0x90000,
-	0x9FFFE,
-	0xA0000,
-	0xAFFFE,
-	0xB0000,
-	0xBFFFE,
-	0xC0000,
-	0xCFFFE,
-	0xD0000,
-	0xDFFFE,
-	0xE0000,
-	0xE0001,
-	0xE0002,
-	0xE0020,
-	0xE0080,
-	0xE0100,
-	0xE01F0,
-	0xEFFFE,
-	0x110000
-};
-
 static const UV UNI_AGHB_invlist[] = {  /* for all charsets */
 	5,	/* Number of elements */
 	148565664, /* Version and data structure type */
@@ -310418,6 +308999,1425 @@ static const UV UNI_IN__9_invlist[] = {  /* for all charsets */
 	0x110000
 };
 
+static const UV UNI_IN__NA_invlist[] = {  /* for all charsets */
+	1412,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x378,
+	0x37A,
+	0x380,
+	0x384,
+	0x38B,
+	0x38C,
+	0x38D,
+	0x38E,
+	0x3A2,
+	0x3A3,
+	0x530,
+	0x531,
+	0x557,
+	0x559,
+	0x58B,
+	0x58D,
+	0x590,
+	0x591,
+	0x5C8,
+	0x5D0,
+	0x5EB,
+	0x5EF,
+	0x5F5,
+	0x600,
+	0x70E,
+	0x70F,
+	0x74B,
+	0x74D,
+	0x7B2,
+	0x7C0,
+	0x7FB,
+	0x7FD,
+	0x82E,
+	0x830,
+	0x83F,
+	0x840,
+	0x85C,
+	0x85E,
+	0x85F,
+	0x860,
+	0x86B,
+	0x870,
+	0x88F,
+	0x890,
+	0x892,
+	0x898,
+	0x984,
+	0x985,
+	0x98D,
+	0x98F,
+	0x991,
+	0x993,
+	0x9A9,
+	0x9AA,
+	0x9B1,
+	0x9B2,
+	0x9B3,
+	0x9B6,
+	0x9BA,
+	0x9BC,
+	0x9C5,
+	0x9C7,
+	0x9C9,
+	0x9CB,
+	0x9CF,
+	0x9D7,
+	0x9D8,
+	0x9DC,
+	0x9DE,
+	0x9DF,
+	0x9E4,
+	0x9E6,
+	0x9FF,
+	0xA01,
+	0xA04,
+	0xA05,
+	0xA0B,
+	0xA0F,
+	0xA11,
+	0xA13,
+	0xA29,
+	0xA2A,
+	0xA31,
+	0xA32,
+	0xA34,
+	0xA35,
+	0xA37,
+	0xA38,
+	0xA3A,
+	0xA3C,
+	0xA3D,
+	0xA3E,
+	0xA43,
+	0xA47,
+	0xA49,
+	0xA4B,
+	0xA4E,
+	0xA51,
+	0xA52,
+	0xA59,
+	0xA5D,
+	0xA5E,
+	0xA5F,
+	0xA66,
+	0xA77,
+	0xA81,
+	0xA84,
+	0xA85,
+	0xA8E,
+	0xA8F,
+	0xA92,
+	0xA93,
+	0xAA9,
+	0xAAA,
+	0xAB1,
+	0xAB2,
+	0xAB4,
+	0xAB5,
+	0xABA,
+	0xABC,
+	0xAC6,
+	0xAC7,
+	0xACA,
+	0xACB,
+	0xACE,
+	0xAD0,
+	0xAD1,
+	0xAE0,
+	0xAE4,
+	0xAE6,
+	0xAF2,
+	0xAF9,
+	0xB00,
+	0xB01,
+	0xB04,
+	0xB05,
+	0xB0D,
+	0xB0F,
+	0xB11,
+	0xB13,
+	0xB29,
+	0xB2A,
+	0xB31,
+	0xB32,
+	0xB34,
+	0xB35,
+	0xB3A,
+	0xB3C,
+	0xB45,
+	0xB47,
+	0xB49,
+	0xB4B,
+	0xB4E,
+	0xB55,
+	0xB58,
+	0xB5C,
+	0xB5E,
+	0xB5F,
+	0xB64,
+	0xB66,
+	0xB78,
+	0xB82,
+	0xB84,
+	0xB85,
+	0xB8B,
+	0xB8E,
+	0xB91,
+	0xB92,
+	0xB96,
+	0xB99,
+	0xB9B,
+	0xB9C,
+	0xB9D,
+	0xB9E,
+	0xBA0,
+	0xBA3,
+	0xBA5,
+	0xBA8,
+	0xBAB,
+	0xBAE,
+	0xBBA,
+	0xBBE,
+	0xBC3,
+	0xBC6,
+	0xBC9,
+	0xBCA,
+	0xBCE,
+	0xBD0,
+	0xBD1,
+	0xBD7,
+	0xBD8,
+	0xBE6,
+	0xBFB,
+	0xC00,
+	0xC0D,
+	0xC0E,
+	0xC11,
+	0xC12,
+	0xC29,
+	0xC2A,
+	0xC3A,
+	0xC3C,
+	0xC45,
+	0xC46,
+	0xC49,
+	0xC4A,
+	0xC4E,
+	0xC55,
+	0xC57,
+	0xC58,
+	0xC5B,
+	0xC5D,
+	0xC5E,
+	0xC60,
+	0xC64,
+	0xC66,
+	0xC70,
+	0xC77,
+	0xC8D,
+	0xC8E,
+	0xC91,
+	0xC92,
+	0xCA9,
+	0xCAA,
+	0xCB4,
+	0xCB5,
+	0xCBA,
+	0xCBC,
+	0xCC5,
+	0xCC6,
+	0xCC9,
+	0xCCA,
+	0xCCE,
+	0xCD5,
+	0xCD7,
+	0xCDD,
+	0xCDF,
+	0xCE0,
+	0xCE4,
+	0xCE6,
+	0xCF0,
+	0xCF1,
+	0xCF3,
+	0xD00,
+	0xD0D,
+	0xD0E,
+	0xD11,
+	0xD12,
+	0xD45,
+	0xD46,
+	0xD49,
+	0xD4A,
+	0xD50,
+	0xD54,
+	0xD64,
+	0xD66,
+	0xD80,
+	0xD81,
+	0xD84,
+	0xD85,
+	0xD97,
+	0xD9A,
+	0xDB2,
+	0xDB3,
+	0xDBC,
+	0xDBD,
+	0xDBE,
+	0xDC0,
+	0xDC7,
+	0xDCA,
+	0xDCB,
+	0xDCF,
+	0xDD5,
+	0xDD6,
+	0xDD7,
+	0xDD8,
+	0xDE0,
+	0xDE6,
+	0xDF0,
+	0xDF2,
+	0xDF5,
+	0xE01,
+	0xE3B,
+	0xE3F,
+	0xE5C,
+	0xE81,
+	0xE83,
+	0xE84,
+	0xE85,
+	0xE86,
+	0xE8B,
+	0xE8C,
+	0xEA4,
+	0xEA5,
+	0xEA6,
+	0xEA7,
+	0xEBE,
+	0xEC0,
+	0xEC5,
+	0xEC6,
+	0xEC7,
+	0xEC8,
+	0xECE,
+	0xED0,
+	0xEDA,
+	0xEDC,
+	0xEE0,
+	0xF00,
+	0xF48,
+	0xF49,
+	0xF6D,
+	0xF71,
+	0xF98,
+	0xF99,
+	0xFBD,
+	0xFBE,
+	0xFCD,
+	0xFCE,
+	0xFDB,
+	0x1000,
+	0x10C6,
+	0x10C7,
+	0x10C8,
+	0x10CD,
+	0x10CE,
+	0x10D0,
+	0x1249,
+	0x124A,
+	0x124E,
+	0x1250,
+	0x1257,
+	0x1258,
+	0x1259,
+	0x125A,
+	0x125E,
+	0x1260,
+	0x1289,
+	0x128A,
+	0x128E,
+	0x1290,
+	0x12B1,
+	0x12B2,
+	0x12B6,
+	0x12B8,
+	0x12BF,
+	0x12C0,
+	0x12C1,
+	0x12C2,
+	0x12C6,
+	0x12C8,
+	0x12D7,
+	0x12D8,
+	0x1311,
+	0x1312,
+	0x1316,
+	0x1318,
+	0x135B,
+	0x135D,
+	0x137D,
+	0x1380,
+	0x139A,
+	0x13A0,
+	0x13F6,
+	0x13F8,
+	0x13FE,
+	0x1400,
+	0x169D,
+	0x16A0,
+	0x16F9,
+	0x1700,
+	0x1716,
+	0x171F,
+	0x1737,
+	0x1740,
+	0x1754,
+	0x1760,
+	0x176D,
+	0x176E,
+	0x1771,
+	0x1772,
+	0x1774,
+	0x1780,
+	0x17DE,
+	0x17E0,
+	0x17EA,
+	0x17F0,
+	0x17FA,
+	0x1800,
+	0x181A,
+	0x1820,
+	0x1879,
+	0x1880,
+	0x18AB,
+	0x18B0,
+	0x18F6,
+	0x1900,
+	0x191F,
+	0x1920,
+	0x192C,
+	0x1930,
+	0x193C,
+	0x1940,
+	0x1941,
+	0x1944,
+	0x196E,
+	0x1970,
+	0x1975,
+	0x1980,
+	0x19AC,
+	0x19B0,
+	0x19CA,
+	0x19D0,
+	0x19DB,
+	0x19DE,
+	0x1A1C,
+	0x1A1E,
+	0x1A5F,
+	0x1A60,
+	0x1A7D,
+	0x1A7F,
+	0x1A8A,
+	0x1A90,
+	0x1A9A,
+	0x1AA0,
+	0x1AAE,
+	0x1AB0,
+	0x1ACF,
+	0x1B00,
+	0x1B4D,
+	0x1B50,
+	0x1B7F,
+	0x1B80,
+	0x1BF4,
+	0x1BFC,
+	0x1C38,
+	0x1C3B,
+	0x1C4A,
+	0x1C4D,
+	0x1C89,
+	0x1C90,
+	0x1CBB,
+	0x1CBD,
+	0x1CC8,
+	0x1CD0,
+	0x1CFB,
+	0x1D00,
+	0x1F16,
+	0x1F18,
+	0x1F1E,
+	0x1F20,
+	0x1F46,
+	0x1F48,
+	0x1F4E,
+	0x1F50,
+	0x1F58,
+	0x1F59,
+	0x1F5A,
+	0x1F5B,
+	0x1F5C,
+	0x1F5D,
+	0x1F5E,
+	0x1F5F,
+	0x1F7E,
+	0x1F80,
+	0x1FB5,
+	0x1FB6,
+	0x1FC5,
+	0x1FC6,
+	0x1FD4,
+	0x1FD6,
+	0x1FDC,
+	0x1FDD,
+	0x1FF0,
+	0x1FF2,
+	0x1FF5,
+	0x1FF6,
+	0x1FFF,
+	0x2000,
+	0x2065,
+	0x2066,
+	0x2072,
+	0x2074,
+	0x208F,
+	0x2090,
+	0x209D,
+	0x20A0,
+	0x20C1,
+	0x20D0,
+	0x20F1,
+	0x2100,
+	0x218C,
+	0x2190,
+	0x2427,
+	0x2440,
+	0x244B,
+	0x2460,
+	0x2B74,
+	0x2B76,
+	0x2B96,
+	0x2B97,
+	0x2CF4,
+	0x2CF9,
+	0x2D26,
+	0x2D27,
+	0x2D28,
+	0x2D2D,
+	0x2D2E,
+	0x2D30,
+	0x2D68,
+	0x2D6F,
+	0x2D71,
+	0x2D7F,
+	0x2D97,
+	0x2DA0,
+	0x2DA7,
+	0x2DA8,
+	0x2DAF,
+	0x2DB0,
+	0x2DB7,
+	0x2DB8,
+	0x2DBF,
+	0x2DC0,
+	0x2DC7,
+	0x2DC8,
+	0x2DCF,
+	0x2DD0,
+	0x2DD7,
+	0x2DD8,
+	0x2DDF,
+	0x2DE0,
+	0x2E5E,
+	0x2E80,
+	0x2E9A,
+	0x2E9B,
+	0x2EF4,
+	0x2F00,
+	0x2FD6,
+	0x2FF0,
+	0x2FFC,
+	0x3000,
+	0x3040,
+	0x3041,
+	0x3097,
+	0x3099,
+	0x3100,
+	0x3105,
+	0x3130,
+	0x3131,
+	0x318F,
+	0x3190,
+	0x31E4,
+	0x31F0,
+	0x321F,
+	0x3220,
+	0xA48D,
+	0xA490,
+	0xA4C7,
+	0xA4D0,
+	0xA62C,
+	0xA640,
+	0xA6F8,
+	0xA700,
+	0xA7CB,
+	0xA7D0,
+	0xA7D2,
+	0xA7D3,
+	0xA7D4,
+	0xA7D5,
+	0xA7DA,
+	0xA7F2,
+	0xA82D,
+	0xA830,
+	0xA83A,
+	0xA840,
+	0xA878,
+	0xA880,
+	0xA8C6,
+	0xA8CE,
+	0xA8DA,
+	0xA8E0,
+	0xA954,
+	0xA95F,
+	0xA97D,
+	0xA980,
+	0xA9CE,
+	0xA9CF,
+	0xA9DA,
+	0xA9DE,
+	0xA9FF,
+	0xAA00,
+	0xAA37,
+	0xAA40,
+	0xAA4E,
+	0xAA50,
+	0xAA5A,
+	0xAA5C,
+	0xAAC3,
+	0xAADB,
+	0xAAF7,
+	0xAB01,
+	0xAB07,
+	0xAB09,
+	0xAB0F,
+	0xAB11,
+	0xAB17,
+	0xAB20,
+	0xAB27,
+	0xAB28,
+	0xAB2F,
+	0xAB30,
+	0xAB6C,
+	0xAB70,
+	0xABEE,
+	0xABF0,
+	0xABFA,
+	0xAC00,
+	0xD7A4,
+	0xD7B0,
+	0xD7C7,
+	0xD7CB,
+	0xD7FC,
+	0xD800,
+	0xFA6E,
+	0xFA70,
+	0xFADA,
+	0xFB00,
+	0xFB07,
+	0xFB13,
+	0xFB18,
+	0xFB1D,
+	0xFB37,
+	0xFB38,
+	0xFB3D,
+	0xFB3E,
+	0xFB3F,
+	0xFB40,
+	0xFB42,
+	0xFB43,
+	0xFB45,
+	0xFB46,
+	0xFBC3,
+	0xFBD3,
+	0xFD90,
+	0xFD92,
+	0xFDC8,
+	0xFDCF,
+	0xFE1A,
+	0xFE20,
+	0xFE53,
+	0xFE54,
+	0xFE67,
+	0xFE68,
+	0xFE6C,
+	0xFE70,
+	0xFE75,
+	0xFE76,
+	0xFEFD,
+	0xFEFF,
+	0xFF00,
+	0xFF01,
+	0xFFBF,
+	0xFFC2,
+	0xFFC8,
+	0xFFCA,
+	0xFFD0,
+	0xFFD2,
+	0xFFD8,
+	0xFFDA,
+	0xFFDD,
+	0xFFE0,
+	0xFFE7,
+	0xFFE8,
+	0xFFEF,
+	0xFFF9,
+	0x1000C,
+	0x1000D,
+	0x10027,
+	0x10028,
+	0x1003B,
+	0x1003C,
+	0x1003E,
+	0x1003F,
+	0x1004E,
+	0x10050,
+	0x1005E,
+	0x10080,
+	0x100FB,
+	0x10100,
+	0x10103,
+	0x10107,
+	0x10134,
+	0x10137,
+	0x1018F,
+	0x10190,
+	0x1019D,
+	0x101A0,
+	0x101A1,
+	0x101D0,
+	0x101FE,
+	0x10280,
+	0x1029D,
+	0x102A0,
+	0x102D1,
+	0x102E0,
+	0x102FC,
+	0x10300,
+	0x10324,
+	0x1032D,
+	0x1034B,
+	0x10350,
+	0x1037B,
+	0x10380,
+	0x1039E,
+	0x1039F,
+	0x103C4,
+	0x103C8,
+	0x103D6,
+	0x10400,
+	0x1049E,
+	0x104A0,
+	0x104AA,
+	0x104B0,
+	0x104D4,
+	0x104D8,
+	0x104FC,
+	0x10500,
+	0x10528,
+	0x10530,
+	0x10564,
+	0x1056F,
+	0x1057B,
+	0x1057C,
+	0x1058B,
+	0x1058C,
+	0x10593,
+	0x10594,
+	0x10596,
+	0x10597,
+	0x105A2,
+	0x105A3,
+	0x105B2,
+	0x105B3,
+	0x105BA,
+	0x105BB,
+	0x105BD,
+	0x10600,
+	0x10737,
+	0x10740,
+	0x10756,
+	0x10760,
+	0x10768,
+	0x10780,
+	0x10786,
+	0x10787,
+	0x107B1,
+	0x107B2,
+	0x107BB,
+	0x10800,
+	0x10806,
+	0x10808,
+	0x10809,
+	0x1080A,
+	0x10836,
+	0x10837,
+	0x10839,
+	0x1083C,
+	0x1083D,
+	0x1083F,
+	0x10856,
+	0x10857,
+	0x1089F,
+	0x108A7,
+	0x108B0,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
+	0x108FB,
+	0x1091C,
+	0x1091F,
+	0x1093A,
+	0x1093F,
+	0x10940,
+	0x10980,
+	0x109B8,
+	0x109BC,
+	0x109D0,
+	0x109D2,
+	0x10A04,
+	0x10A05,
+	0x10A07,
+	0x10A0C,
+	0x10A14,
+	0x10A15,
+	0x10A18,
+	0x10A19,
+	0x10A36,
+	0x10A38,
+	0x10A3B,
+	0x10A3F,
+	0x10A49,
+	0x10A50,
+	0x10A59,
+	0x10A60,
+	0x10AA0,
+	0x10AC0,
+	0x10AE7,
+	0x10AEB,
+	0x10AF7,
+	0x10B00,
+	0x10B36,
+	0x10B39,
+	0x10B56,
+	0x10B58,
+	0x10B73,
+	0x10B78,
+	0x10B92,
+	0x10B99,
+	0x10B9D,
+	0x10BA9,
+	0x10BB0,
+	0x10C00,
+	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x10CFA,
+	0x10D28,
+	0x10D30,
+	0x10D3A,
+	0x10E60,
+	0x10E7F,
+	0x10E80,
+	0x10EAA,
+	0x10EAB,
+	0x10EAE,
+	0x10EB0,
+	0x10EB2,
+	0x10F00,
+	0x10F28,
+	0x10F30,
+	0x10F5A,
+	0x10F70,
+	0x10F8A,
+	0x10FB0,
+	0x10FCC,
+	0x10FE0,
+	0x10FF7,
+	0x11000,
+	0x1104E,
+	0x11052,
+	0x11076,
+	0x1107F,
+	0x110C3,
+	0x110CD,
+	0x110CE,
+	0x110D0,
+	0x110E9,
+	0x110F0,
+	0x110FA,
+	0x11100,
+	0x11135,
+	0x11136,
+	0x11148,
+	0x11150,
+	0x11177,
+	0x11180,
+	0x111E0,
+	0x111E1,
+	0x111F5,
+	0x11200,
+	0x11212,
+	0x11213,
+	0x1123F,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112AA,
+	0x112B0,
+	0x112EB,
+	0x112F0,
+	0x112FA,
+	0x11300,
+	0x11304,
+	0x11305,
+	0x1130D,
+	0x1130F,
+	0x11311,
+	0x11313,
+	0x11329,
+	0x1132A,
+	0x11331,
+	0x11332,
+	0x11334,
+	0x11335,
+	0x1133A,
+	0x1133B,
+	0x11345,
+	0x11347,
+	0x11349,
+	0x1134B,
+	0x1134E,
+	0x11350,
+	0x11351,
+	0x11357,
+	0x11358,
+	0x1135D,
+	0x11364,
+	0x11366,
+	0x1136D,
+	0x11370,
+	0x11375,
+	0x11400,
+	0x1145C,
+	0x1145D,
+	0x11462,
+	0x11480,
+	0x114C8,
+	0x114D0,
+	0x114DA,
+	0x11580,
+	0x115B6,
+	0x115B8,
+	0x115DE,
+	0x11600,
+	0x11645,
+	0x11650,
+	0x1165A,
+	0x11660,
+	0x1166D,
+	0x11680,
+	0x116BA,
+	0x116C0,
+	0x116CA,
+	0x11700,
+	0x1171B,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x11747,
+	0x11800,
+	0x1183C,
+	0x118A0,
+	0x118F3,
+	0x118FF,
+	0x11907,
+	0x11909,
+	0x1190A,
+	0x1190C,
+	0x11914,
+	0x11915,
+	0x11917,
+	0x11918,
+	0x11936,
+	0x11937,
+	0x11939,
+	0x1193B,
+	0x11947,
+	0x11950,
+	0x1195A,
+	0x119A0,
+	0x119A8,
+	0x119AA,
+	0x119D8,
+	0x119DA,
+	0x119E5,
+	0x11A00,
+	0x11A48,
+	0x11A50,
+	0x11AA3,
+	0x11AB0,
+	0x11AF9,
+	0x11C00,
+	0x11C09,
+	0x11C0A,
+	0x11C37,
+	0x11C38,
+	0x11C46,
+	0x11C50,
+	0x11C6D,
+	0x11C70,
+	0x11C90,
+	0x11C92,
+	0x11CA8,
+	0x11CA9,
+	0x11CB7,
+	0x11D00,
+	0x11D07,
+	0x11D08,
+	0x11D0A,
+	0x11D0B,
+	0x11D37,
+	0x11D3A,
+	0x11D3B,
+	0x11D3C,
+	0x11D3E,
+	0x11D3F,
+	0x11D48,
+	0x11D50,
+	0x11D5A,
+	0x11D60,
+	0x11D66,
+	0x11D67,
+	0x11D69,
+	0x11D6A,
+	0x11D8F,
+	0x11D90,
+	0x11D92,
+	0x11D93,
+	0x11D99,
+	0x11DA0,
+	0x11DAA,
+	0x11EE0,
+	0x11EF9,
+	0x11FB0,
+	0x11FB1,
+	0x11FC0,
+	0x11FF2,
+	0x11FFF,
+	0x1239A,
+	0x12400,
+	0x1246F,
+	0x12470,
+	0x12475,
+	0x12480,
+	0x12544,
+	0x12F90,
+	0x12FF3,
+	0x13000,
+	0x1342F,
+	0x13430,
+	0x13439,
+	0x14400,
+	0x14647,
+	0x16800,
+	0x16A39,
+	0x16A40,
+	0x16A5F,
+	0x16A60,
+	0x16A6A,
+	0x16A6E,
+	0x16ABF,
+	0x16AC0,
+	0x16ACA,
+	0x16AD0,
+	0x16AEE,
+	0x16AF0,
+	0x16AF6,
+	0x16B00,
+	0x16B46,
+	0x16B50,
+	0x16B5A,
+	0x16B5B,
+	0x16B62,
+	0x16B63,
+	0x16B78,
+	0x16B7D,
+	0x16B90,
+	0x16E40,
+	0x16E9B,
+	0x16F00,
+	0x16F4B,
+	0x16F4F,
+	0x16F88,
+	0x16F8F,
+	0x16FA0,
+	0x16FE0,
+	0x16FE5,
+	0x16FF0,
+	0x16FF2,
+	0x17000,
+	0x187F8,
+	0x18800,
+	0x18CD6,
+	0x18D00,
+	0x18D09,
+	0x1AFF0,
+	0x1AFF4,
+	0x1AFF5,
+	0x1AFFC,
+	0x1AFFD,
+	0x1AFFF,
+	0x1B000,
+	0x1B123,
+	0x1B150,
+	0x1B153,
+	0x1B164,
+	0x1B168,
+	0x1B170,
+	0x1B2FC,
+	0x1BC00,
+	0x1BC6B,
+	0x1BC70,
+	0x1BC7D,
+	0x1BC80,
+	0x1BC89,
+	0x1BC90,
+	0x1BC9A,
+	0x1BC9C,
+	0x1BCA4,
+	0x1CF00,
+	0x1CF2E,
+	0x1CF30,
+	0x1CF47,
+	0x1CF50,
+	0x1CFC4,
+	0x1D000,
+	0x1D0F6,
+	0x1D100,
+	0x1D127,
+	0x1D129,
+	0x1D1EB,
+	0x1D200,
+	0x1D246,
+	0x1D2E0,
+	0x1D2F4,
+	0x1D300,
+	0x1D357,
+	0x1D360,
+	0x1D379,
+	0x1D400,
+	0x1D455,
+	0x1D456,
+	0x1D49D,
+	0x1D49E,
+	0x1D4A0,
+	0x1D4A2,
+	0x1D4A3,
+	0x1D4A5,
+	0x1D4A7,
+	0x1D4A9,
+	0x1D4AD,
+	0x1D4AE,
+	0x1D4BA,
+	0x1D4BB,
+	0x1D4BC,
+	0x1D4BD,
+	0x1D4C4,
+	0x1D4C5,
+	0x1D506,
+	0x1D507,
+	0x1D50B,
+	0x1D50D,
+	0x1D515,
+	0x1D516,
+	0x1D51D,
+	0x1D51E,
+	0x1D53A,
+	0x1D53B,
+	0x1D53F,
+	0x1D540,
+	0x1D545,
+	0x1D546,
+	0x1D547,
+	0x1D54A,
+	0x1D551,
+	0x1D552,
+	0x1D6A6,
+	0x1D6A8,
+	0x1D7CC,
+	0x1D7CE,
+	0x1DA8C,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
+	0x1DF00,
+	0x1DF1F,
+	0x1E000,
+	0x1E007,
+	0x1E008,
+	0x1E019,
+	0x1E01B,
+	0x1E022,
+	0x1E023,
+	0x1E025,
+	0x1E026,
+	0x1E02B,
+	0x1E100,
+	0x1E12D,
+	0x1E130,
+	0x1E13E,
+	0x1E140,
+	0x1E14A,
+	0x1E14E,
+	0x1E150,
+	0x1E290,
+	0x1E2AF,
+	0x1E2C0,
+	0x1E2FA,
+	0x1E2FF,
+	0x1E300,
+	0x1E7E0,
+	0x1E7E7,
+	0x1E7E8,
+	0x1E7EC,
+	0x1E7ED,
+	0x1E7EF,
+	0x1E7F0,
+	0x1E7FF,
+	0x1E800,
+	0x1E8C5,
+	0x1E8C7,
+	0x1E8D7,
+	0x1E900,
+	0x1E94C,
+	0x1E950,
+	0x1E95A,
+	0x1E95E,
+	0x1E960,
+	0x1EC71,
+	0x1ECB5,
+	0x1ED01,
+	0x1ED3E,
+	0x1EE00,
+	0x1EE04,
+	0x1EE05,
+	0x1EE20,
+	0x1EE21,
+	0x1EE23,
+	0x1EE24,
+	0x1EE25,
+	0x1EE27,
+	0x1EE28,
+	0x1EE29,
+	0x1EE33,
+	0x1EE34,
+	0x1EE38,
+	0x1EE39,
+	0x1EE3A,
+	0x1EE3B,
+	0x1EE3C,
+	0x1EE42,
+	0x1EE43,
+	0x1EE47,
+	0x1EE48,
+	0x1EE49,
+	0x1EE4A,
+	0x1EE4B,
+	0x1EE4C,
+	0x1EE4D,
+	0x1EE50,
+	0x1EE51,
+	0x1EE53,
+	0x1EE54,
+	0x1EE55,
+	0x1EE57,
+	0x1EE58,
+	0x1EE59,
+	0x1EE5A,
+	0x1EE5B,
+	0x1EE5C,
+	0x1EE5D,
+	0x1EE5E,
+	0x1EE5F,
+	0x1EE60,
+	0x1EE61,
+	0x1EE63,
+	0x1EE64,
+	0x1EE65,
+	0x1EE67,
+	0x1EE6B,
+	0x1EE6C,
+	0x1EE73,
+	0x1EE74,
+	0x1EE78,
+	0x1EE79,
+	0x1EE7D,
+	0x1EE7E,
+	0x1EE7F,
+	0x1EE80,
+	0x1EE8A,
+	0x1EE8B,
+	0x1EE9C,
+	0x1EEA1,
+	0x1EEA4,
+	0x1EEA5,
+	0x1EEAA,
+	0x1EEAB,
+	0x1EEBC,
+	0x1EEF0,
+	0x1EEF2,
+	0x1F000,
+	0x1F02C,
+	0x1F030,
+	0x1F094,
+	0x1F0A0,
+	0x1F0AF,
+	0x1F0B1,
+	0x1F0C0,
+	0x1F0C1,
+	0x1F0D0,
+	0x1F0D1,
+	0x1F0F6,
+	0x1F100,
+	0x1F1AE,
+	0x1F1E6,
+	0x1F203,
+	0x1F210,
+	0x1F23C,
+	0x1F240,
+	0x1F249,
+	0x1F250,
+	0x1F252,
+	0x1F260,
+	0x1F266,
+	0x1F300,
+	0x1F6D8,
+	0x1F6DD,
+	0x1F6ED,
+	0x1F6F0,
+	0x1F6FD,
+	0x1F700,
+	0x1F774,
+	0x1F780,
+	0x1F7D9,
+	0x1F7E0,
+	0x1F7EC,
+	0x1F7F0,
+	0x1F7F1,
+	0x1F800,
+	0x1F80C,
+	0x1F810,
+	0x1F848,
+	0x1F850,
+	0x1F85A,
+	0x1F860,
+	0x1F888,
+	0x1F890,
+	0x1F8AE,
+	0x1F8B0,
+	0x1F8B2,
+	0x1F900,
+	0x1FA54,
+	0x1FA60,
+	0x1FA6E,
+	0x1FA70,
+	0x1FA75,
+	0x1FA78,
+	0x1FA7D,
+	0x1FA80,
+	0x1FA87,
+	0x1FA90,
+	0x1FAAD,
+	0x1FAB0,
+	0x1FABB,
+	0x1FAC0,
+	0x1FAC6,
+	0x1FAD0,
+	0x1FADA,
+	0x1FAE0,
+	0x1FAE8,
+	0x1FAF0,
+	0x1FAF7,
+	0x1FB00,
+	0x1FB93,
+	0x1FB94,
+	0x1FBCB,
+	0x1FBF0,
+	0x1FBFA,
+	0x1FFFE,
+	0x2A6E0,
+	0x2A700,
+	0x2B739,
+	0x2B740,
+	0x2B81E,
+	0x2B820,
+	0x2CEA2,
+	0x2CEB0,
+	0x2EBE1,
+	0x2F800,
+	0x2FA1E,
+	0x2FFFE,
+	0x3134B,
+	0x3FFFE,
+	0x40000,
+	0x4FFFE,
+	0x50000,
+	0x5FFFE,
+	0x60000,
+	0x6FFFE,
+	0x70000,
+	0x7FFFE,
+	0x80000,
+	0x8FFFE,
+	0x90000,
+	0x9FFFE,
+	0xA0000,
+	0xAFFFE,
+	0xB0000,
+	0xBFFFE,
+	0xC0000,
+	0xCFFFE,
+	0xD0000,
+	0xDFFFE,
+	0xE0000,
+	0xE0001,
+	0xE0002,
+	0xE0020,
+	0xE0080,
+	0xE0100,
+	0xE01F0,
+	0xEFFFE,
+	0x110000
+};
+
 static const UV UNI_INADLAM_invlist[] = {  /* for all charsets */
 	3,	/* Number of elements */
 	148565664, /* Version and data structure type */
@@ -424495,7 +424495,6 @@ typedef enum {
 	UNI_AGE__7,
 	UNI_AGE__8,
 	UNI_AGE__9,
-	UNI_AGE__NA,
 	UNI_AGHB,
 	UNI_AHOM,
 	UNI_ALCHEMICAL,
@@ -425014,6 +425013,7 @@ typedef enum {
 	UNI_IN__7,
 	UNI_IN__8,
 	UNI_IN__9,
+	UNI_IN__NA,
 	UNI_IPAEXT,
 	UNI_ITAL,
 	UNI_JAMO,
@@ -425728,7 +425728,6 @@ static const UV * const uni_prop_ptrs[] = {
 	UNI_AGE__7_invlist,
 	UNI_AGE__8_invlist,
 	UNI_AGE__9_invlist,
-	UNI_AGE__NA_invlist,
 	UNI_AGHB_invlist,
 	UNI_AHOM_invlist,
 	UNI_ALCHEMICAL_invlist,
@@ -426247,6 +426246,7 @@ static const UV * const uni_prop_ptrs[] = {
 	UNI_IN__7_invlist,
 	UNI_IN__8_invlist,
 	UNI_IN__9_invlist,
+	UNI_IN__NA_invlist,
 	UNI_IPAEXT_invlist,
 	UNI_ITAL_invlist,
 	UNI_JAMO_invlist,
@@ -428921,82 +428921,6 @@ static const char * const UNI_identifiertype_values[] = {
 	NULL
 };
 
-static const char * const UNI_in_values[] = {
-	"1.1",
-	"2.0",
-	"2.1",
-	"3.0",
-	"3.1",
-	"3.2",
-	"4.0",
-	"4.1",
-	"5.0",
-	"5.1",
-	"5.2",
-	"6.0",
-	"6.1",
-	"6.2",
-	"6.3",
-	"7.0",
-	"8.0",
-	"9.0",
-	"10.0",
-	"11.0",
-	"12.0",
-	"12.1",
-	"13.0",
-	"14.0",
-	"Unassigned",
-	"unassigned",
-	"V10_0",
-	"V11_0",
-	"V12_0",
-	"V12_1",
-	"V13_0",
-	"V14_0",
-	"V2_0",
-	"V2_1",
-	"V3_0",
-	"V3_1",
-	"V3_2",
-	"V4_0",
-	"V4_1",
-	"V5_0",
-	"V5_1",
-	"V5_2",
-	"V6_0",
-	"V6_1",
-	"V6_2",
-	"V6_3",
-	"V7_0",
-	"V8_0",
-	"V9_0",
-	"v100",
-	"v110",
-	"v120",
-	"v121",
-	"v130",
-	"v140",
-	"v20",
-	"v21",
-	"v30",
-	"v31",
-	"v32",
-	"v40",
-	"v41",
-	"v50",
-	"v51",
-	"v52",
-	"v60",
-	"v61",
-	"v62",
-	"v63",
-	"v70",
-	"v80",
-	"v90",
-	NULL
-};
-
 static const char * const UNI_inpc_values[] = {
 	"Bottom",
 	"bottom",
@@ -430533,7 +430457,6 @@ UNI_gcb_values,
 UNI_hst_values,
 UNI_identifierstatus_values,
 UNI_identifiertype_values,
-UNI_in_values,
 UNI_inpc_values,
 UNI_insc_values,
 UNI_jg_values,
@@ -430596,40 +430519,40 @@ UNI_wb_values
 #define UNI_ids_values_index  UNI_ahex_values_index
 #define UNI_idsb_values_index  UNI_ahex_values_index
 #define UNI_idst_values_index  UNI_ahex_values_index
-#define UNI_in_values_index  14
-#define UNI_inpc_values_index  15
-#define UNI_insc_values_index  16
-#define UNI_jg_values_index  17
+#define UNI_in_values_index  UNI_age_values_index
+#define UNI_inpc_values_index  14
+#define UNI_insc_values_index  15
+#define UNI_jg_values_index  16
 #define UNI_joinc_values_index  UNI_ahex_values_index
-#define UNI_jt_values_index  18
-#define UNI_lb_values_index  19
+#define UNI_jt_values_index  17
+#define UNI_lb_values_index  18
 #define UNI_loe_values_index  UNI_ahex_values_index
 #define UNI_lower_values_index  UNI_ahex_values_index
 #define UNI_math_values_index  UNI_ahex_values_index
 #define UNI_nchar_values_index  UNI_ahex_values_index
-#define UNI_nfcqc_values_index  20
-#define UNI_nfdqc_values_index  21
+#define UNI_nfcqc_values_index  19
+#define UNI_nfdqc_values_index  20
 #define UNI_nfkcqc_values_index  UNI_nfcqc_values_index
 #define UNI_nfkdqc_values_index  UNI_nfdqc_values_index
-#define UNI_nt_values_index  22
-#define UNI_nv_values_index  23
+#define UNI_nt_values_index  21
+#define UNI_nv_values_index  22
 #define UNI_patsyn_values_index  UNI_ahex_values_index
 #define UNI_patws_values_index  UNI_ahex_values_index
 #define UNI_pcm_values_index  UNI_ahex_values_index
 #define UNI_qmark_values_index  UNI_ahex_values_index
 #define UNI_radical_values_index  UNI_ahex_values_index
 #define UNI_ri_values_index  UNI_ahex_values_index
-#define UNI_sb_values_index  24
-#define UNI_sc_values_index  25
+#define UNI_sb_values_index  23
+#define UNI_sc_values_index  24
 #define UNI_scx_values_index  UNI_sc_values_index
 #define UNI_sd_values_index  UNI_ahex_values_index
 #define UNI_sterm_values_index  UNI_ahex_values_index
 #define UNI_term_values_index  UNI_ahex_values_index
 #define UNI_uideo_values_index  UNI_ahex_values_index
 #define UNI_upper_values_index  UNI_ahex_values_index
-#define UNI_vo_values_index  26
+#define UNI_vo_values_index  25
 #define UNI_vs_values_index  UNI_ahex_values_index
-#define UNI_wb_values_index  27
+#define UNI_wb_values_index  26
 #define UNI_wspace_values_index  UNI_ahex_values_index
 #define UNI_xidc_values_index  UNI_ahex_values_index
 #define UNI_xids_values_index  UNI_ahex_values_index
@@ -430828,7 +430751,7 @@ static const U8 WB_table[23][23] = {
  * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt
  * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt
  * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt
- * 8b1c80fb062345cd9c4febce79fc06d92e1bf642d83d404dc702acd293f13845 lib/unicore/mktables
+ * aede5ad2422a1b01dbbaa2ef6a93c756b00a18df3fb65d7ac8c843d88caf318a lib/unicore/mktables
  * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl