module: unicode: #ifdef out unused U8_UNICODE_320

nabijaczleweli · behlendorf · commit e17a9698faf9 · 2024-11-04T17:26:17.000-08:00
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes openzfs#16704
diff --git a/include/sys/u8_textprep.h b/include/sys/u8_textprep.h
@@ -68,8 +68,12 @@ extern "C" {
 #define	U8_TEXTPREP_IGNORE_INVALID	(0x00020000)
 #define	U8_TEXTPREP_NOWAIT		(0x00040000)
 
+#if 0
 #define	U8_UNICODE_320			(0)
 #define	U8_UNICODE_500			(1)
+#else
+#define	U8_UNICODE_500			(0)
+#endif
 #define	U8_UNICODE_LATEST		(U8_UNICODE_500)
 
 #define	U8_VALIDATE_ENTIRE		(0x00100000)
diff --git a/include/sys/u8_textprep_data.h b/include/sys/u8_textprep_data.h
@@ -147,6 +147,7 @@ typedef struct {
  * toupper case conversion mappings.
  */
 static const uchar_t u8_common_b1_tbl[U8_UNICODE_LATEST + 1][256] = {
+#ifdef U8_UNICODE_320
 	{
 		0,  N_, N_, N_, N_, N_, N_, N_,
 		N_, N_, N_, N_, N_, N_, N_, N_,
@@ -181,6 +182,7 @@ static const uchar_t u8_common_b1_tbl[U8_UNICODE_LATEST + 1][256] = {
 		1,  N_, N_, N_, N_, N_, N_, N_,
 		N_, N_, N_, N_, N_, N_, N_, N_,
 	},
+#endif
 	{
 		0,  N_, N_, N_, N_, N_, N_, N_,
 		N_, N_, N_, N_, N_, N_, N_, N_,
@@ -219,6 +221,7 @@ static const uchar_t u8_common_b1_tbl[U8_UNICODE_LATEST + 1][256] = {
 
 static const uchar_t u8_combining_class_b2_tbl[U8_UNICODE_LATEST + 1][2][256] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -290,6 +293,7 @@ static const uchar_t u8_combining_class_b2_tbl[U8_UNICODE_LATEST + 1][2][256] =
 		},
 
 	},
+#endif
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -366,6 +370,7 @@ static const uchar_t u8_combining_class_b2_tbl[U8_UNICODE_LATEST + 1][2][256] =
 
 static const uchar_t u8_combining_class_b3_tbl[U8_UNICODE_LATEST + 1][9][256] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Third byte table 0. */
 			N_, N_, N_, N_, N_, N_, N_, N_,
@@ -674,6 +679,7 @@ static const uchar_t u8_combining_class_b3_tbl[U8_UNICODE_LATEST + 1][9][256] =
 			N_, N_, N_, N_, N_, N_, N_, N_,
 		},
 	},
+#endif
 	{
 		{	/* Third byte table 0. */
 			N_, N_, N_, N_, N_, N_, N_, N_,
@@ -990,6 +996,7 @@ static const uchar_t u8_combining_class_b3_tbl[U8_UNICODE_LATEST + 1][9][256] =
  */
 static const uchar_t u8_combining_class_b4_tbl[U8_UNICODE_LATEST + 1][55][256] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -2862,6 +2869,7 @@ static const uchar_t u8_combining_class_b4_tbl[U8_UNICODE_LATEST + 1][55][256] =
 			0,   0,   0,   0,   0,   0,   0,   0,
 		},
 	},
+#endif
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -4737,6 +4745,7 @@ static const uchar_t u8_combining_class_b4_tbl[U8_UNICODE_LATEST + 1][55][256] =
 };
 
 static const uchar_t u8_composition_b1_tbl[U8_UNICODE_LATEST + 1][256] = {
+#ifdef U8_UNICODE_320
 	{
 		0,  N_, N_, N_, N_, N_, N_, N_,
 		N_, N_, N_, N_, N_, N_, N_, N_,
@@ -4771,6 +4780,7 @@ static const uchar_t u8_composition_b1_tbl[U8_UNICODE_LATEST + 1][256] = {
 		N_, N_, N_, N_, N_, N_, N_, N_,
 		N_, N_, N_, N_, N_, N_, N_, N_,
 	},
+#endif
 	{
 		0,  N_, N_, N_, N_, N_, N_, N_,
 		N_, N_, N_, N_, N_, N_, N_, N_,
@@ -4808,6 +4818,7 @@ static const uchar_t u8_composition_b1_tbl[U8_UNICODE_LATEST + 1][256] = {
 };
 
 static const uchar_t u8_composition_b2_tbl[U8_UNICODE_LATEST + 1][1][256] = {
+#ifdef U8_UNICODE_320
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -4845,6 +4856,7 @@ static const uchar_t u8_composition_b2_tbl[U8_UNICODE_LATEST + 1][1][256] = {
 		},
 
 	},
+#endif
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -4888,6 +4900,7 @@ static const uchar_t u8_composition_b2_tbl[U8_UNICODE_LATEST + 1][1][256] = {
 static const u8_displacement_t u8_composition_b3_tbl[
     U8_UNICODE_LATEST + 1][5][256] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Third byte table 0. */
 			{ 0x8000, 0 }, { N_, 0 }, { N_, 0 },
@@ -5330,6 +5343,7 @@ static const u8_displacement_t u8_composition_b3_tbl[
 			{ N_, 0 },
 		},
 	},
+#endif
 	{
 		{	/* Third byte table 0. */
 			{ 0x8000, 0 }, { N_, 0 }, { N_, 0 },
@@ -5775,6 +5789,7 @@ static const u8_displacement_t u8_composition_b3_tbl[
 };
 
 static const uchar_t u8_composition_b4_tbl[U8_UNICODE_LATEST + 1][41][257] = {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -7212,6 +7227,7 @@ static const uchar_t u8_composition_b4_tbl[U8_UNICODE_LATEST + 1][41][257] = {
 			0,
 		},
 	},
+#endif
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -8654,6 +8670,7 @@ static const uchar_t u8_composition_b4_tbl[U8_UNICODE_LATEST + 1][41][257] = {
 static const uint16_t u8_composition_b4_16bit_tbl[
     U8_UNICODE_LATEST + 1][5][257] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Fourth byte 16-bit table 0. */
 			0,    0,    0,    0,    0,    0,    0,    0,
@@ -8831,6 +8848,7 @@ static const uint16_t u8_composition_b4_16bit_tbl[
 			362,
 		},
 	},
+#endif
 	{
 		{	/* Fourth byte 16-bit table 0. */
 			0,    0,    0,    0,    0,    0,    0,    0,
@@ -9011,6 +9029,7 @@ static const uint16_t u8_composition_b4_16bit_tbl[
 };
 
 static const uchar_t u8_composition_final_tbl[U8_UNICODE_LATEST + 1][6623] = {
+#ifdef U8_UNICODE_320
 	{
 		0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xAE, FIL_,
 		0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xA0, FIL_,
@@ -9841,6 +9860,7 @@ static const uchar_t u8_composition_final_tbl[U8_UNICODE_LATEST + 1][6623] = {
 		0,    0,    0,    0,    0,    0,    0,    0,
 		0,    0,    0,    0,    0,    0,    0,
 	},
+#endif
 	{
 		0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xAE, FIL_,
 		0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xA0, FIL_,
@@ -10674,6 +10694,7 @@ static const uchar_t u8_composition_final_tbl[U8_UNICODE_LATEST + 1][6623] = {
 };
 
 static const uchar_t u8_decomp_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {
+#ifdef U8_UNICODE_320
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -10745,6 +10766,7 @@ static const uchar_t u8_decomp_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {
 		},
 
 	},
+#endif
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -10821,6 +10843,7 @@ static const uchar_t u8_decomp_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {
 
 static const u8_displacement_t u8_decomp_b3_tbl[U8_UNICODE_LATEST + 1][8][256] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Third byte table 0. */
 			{ N_, 0 }, { N_, 0 }, { N_, 0 },
@@ -11527,6 +11550,7 @@ static const u8_displacement_t u8_decomp_b3_tbl[U8_UNICODE_LATEST + 1][8][256] =
 			{ N_, 0 },
 		},
 	},
+#endif
 	{
 		{	/* Third byte table 0. */
 			{ N_, 0 }, { N_, 0 }, { N_, 0 },
@@ -12236,6 +12260,7 @@ static const u8_displacement_t u8_decomp_b3_tbl[U8_UNICODE_LATEST + 1][8][256] =
 };
 
 static const uchar_t u8_decomp_b4_tbl[U8_UNICODE_LATEST + 1][118][257] = {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -16368,6 +16393,7 @@ static const uchar_t u8_decomp_b4_tbl[U8_UNICODE_LATEST + 1][118][257] = {
 			0,
 		},
 	},
+#endif
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -20503,6 +20529,7 @@ static const uchar_t u8_decomp_b4_tbl[U8_UNICODE_LATEST + 1][118][257] = {
 };
 
 static const uint16_t u8_decomp_b4_16bit_tbl[U8_UNICODE_LATEST + 1][30][257] = {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Fourth byte 16-bit table 0. */
 			0,    0,    0,    0,    0,    0,    0,    0,
@@ -21555,6 +21582,7 @@ static const uint16_t u8_decomp_b4_16bit_tbl[U8_UNICODE_LATEST + 1][30][257] = {
 			0,
 		},
 	},
+#endif
 	{
 		{	/* Fourth byte 16-bit table 0. */
 			0,    0,    0,    0,    0,    0,    0,    0,
@@ -22610,6 +22638,7 @@ static const uint16_t u8_decomp_b4_16bit_tbl[U8_UNICODE_LATEST + 1][30][257] = {
 };
 
 static const uchar_t u8_decomp_final_tbl[U8_UNICODE_LATEST + 1][19370] = {
+#ifdef U8_UNICODE_320
 	{
 		0x20, 0x20, 0xCC, 0x88, 0x61, 0x20, 0xCC, 0x84,
 		0x32, 0x33, 0x20, 0xCC, 0x81, 0xCE, 0xBC, 0x20,
@@ -25034,6 +25063,7 @@ static const uchar_t u8_decomp_final_tbl[U8_UNICODE_LATEST + 1][19370] = {
 		0,    0,    0,    0,    0,    0,    0,    0,
 		0,    0,
 	},
+#endif
 	{
 		0x20, 0x20, 0xCC, 0x88, 0x61, 0x20, 0xCC, 0x84,
 		0x32, 0x33, 0x20, 0xCC, 0x81, 0xCE, 0xBC, 0x20,
@@ -27461,6 +27491,7 @@ static const uchar_t u8_decomp_final_tbl[U8_UNICODE_LATEST + 1][19370] = {
 };
 
 static const uchar_t u8_case_common_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {
+#ifdef U8_UNICODE_320
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -27532,6 +27563,7 @@ static const uchar_t u8_case_common_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {
 		},
 
 	},
+#endif
 	{
 		{
 			0,  N_, N_, N_, N_, N_, N_, N_,
@@ -27609,6 +27641,7 @@ static const uchar_t u8_case_common_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {
 static const u8_displacement_t u8_tolower_b3_tbl[
     U8_UNICODE_LATEST + 1][5][256] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Third byte table 0. */
 			{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },
@@ -27941,6 +27974,7 @@ static const u8_displacement_t u8_tolower_b3_tbl[
 			{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },
 		},
 	},
+#endif
 	{
 		{	/* Third byte table 0. */
 			{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },
@@ -28276,6 +28310,7 @@ static const u8_displacement_t u8_tolower_b3_tbl[
 };
 
 static const uchar_t u8_tolower_b4_tbl[U8_UNICODE_LATEST + 1][36][257] = {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -29538,6 +29573,7 @@ static const uchar_t u8_tolower_b4_tbl[U8_UNICODE_LATEST + 1][36][257] = {
 			0,
 		},
 	},
+#endif
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -30803,6 +30839,7 @@ static const uchar_t u8_tolower_b4_tbl[U8_UNICODE_LATEST + 1][36][257] = {
 };
 
 static const uchar_t u8_tolower_final_tbl[U8_UNICODE_LATEST + 1][2299] = {
+#ifdef U8_UNICODE_320
 	{
 		0xC3, 0xA0, 0xC3, 0xA1, 0xC3, 0xA2, 0xC3, 0xA3,
 		0xC3, 0xA4, 0xC3, 0xA5, 0xC3, 0xA6, 0xC3, 0xA7,
@@ -31093,6 +31130,7 @@ static const uchar_t u8_tolower_final_tbl[U8_UNICODE_LATEST + 1][2299] = {
 		0,    0,    0,    0,    0,    0,    0,    0,
 		0,    0,    0,
 	},
+#endif
 	{
 		0xC3, 0xA0, 0xC3, 0xA1, 0xC3, 0xA2, 0xC3, 0xA3,
 		0xC3, 0xA4, 0xC3, 0xA5, 0xC3, 0xA6, 0xC3, 0xA7,
@@ -31388,6 +31426,7 @@ static const uchar_t u8_tolower_final_tbl[U8_UNICODE_LATEST + 1][2299] = {
 static const u8_displacement_t u8_toupper_b3_tbl[
     U8_UNICODE_LATEST + 1][5][256] =
 {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Third byte table 0. */
 			{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },
@@ -31720,6 +31759,7 @@ static const u8_displacement_t u8_toupper_b3_tbl[
 			{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },
 		},
 	},
+#endif
 	{
 		{	/* Third byte table 0. */
 			{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },
@@ -32055,6 +32095,7 @@ static const u8_displacement_t u8_toupper_b3_tbl[
 };
 
 static const uchar_t u8_toupper_b4_tbl[U8_UNICODE_LATEST + 1][39][257] = {
+#ifdef U8_UNICODE_320
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -33422,6 +33463,7 @@ static const uchar_t u8_toupper_b4_tbl[U8_UNICODE_LATEST + 1][39][257] = {
 			0,
 		},
 	},
+#endif
 	{
 		{	/* Fourth byte table 0. */
 			0,   0,   0,   0,   0,   0,   0,   0,
@@ -34792,6 +34834,7 @@ static const uchar_t u8_toupper_b4_tbl[U8_UNICODE_LATEST + 1][39][257] = {
 };
 
 static const uchar_t u8_toupper_final_tbl[U8_UNICODE_LATEST + 1][2318] = {
+#ifdef U8_UNICODE_320
 	{
 		0xCE, 0x9C, 0xC3, 0x80, 0xC3, 0x81, 0xC3, 0x82,
 		0xC3, 0x83, 0xC3, 0x84, 0xC3, 0x85, 0xC3, 0x86,
@@ -35084,6 +35127,7 @@ static const uchar_t u8_toupper_final_tbl[U8_UNICODE_LATEST + 1][2318] = {
 		0,    0,    0,    0,    0,    0,    0,    0,
 		0,    0,    0,    0,    0,    0,
 	},
+#endif
 	{
 		0xCE, 0x9C, 0xC3, 0x80, 0xC3, 0x81, 0xC3, 0x82,
 		0xC3, 0x83, 0xC3, 0x84, 0xC3, 0x85, 0xC3, 0x86,

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ typedef struct {`
`147`	`147`	`* toupper case conversion mappings.`
`148`	`148`	`*/`
`149`	`149`	`static const uchar_t u8_common_b1_tbl[U8_UNICODE_LATEST + 1][256] = {`
	`150`	`+#ifdef U8_UNICODE_320`
`150`	`151`	`{`
`151`	`152`	`0, N_, N_, N_, N_, N_, N_, N_,`
`152`	`153`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`@@ -181,6 +182,7 @@ static const uchar_t u8_common_b1_tbl[U8_UNICODE_LATEST + 1][256] = {`
`181`	`182`	`1, N_, N_, N_, N_, N_, N_, N_,`
`182`	`183`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`183`	`184`	`},`
	`185`	`+#endif`
`184`	`186`	`{`
`185`	`187`	`0, N_, N_, N_, N_, N_, N_, N_,`
`186`	`188`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`@@ -219,6 +221,7 @@ static const uchar_t u8_common_b1_tbl[U8_UNICODE_LATEST + 1][256] = {`
`219`	`221`
`220`	`222`	`static const uchar_t u8_combining_class_b2_tbl[U8_UNICODE_LATEST + 1][2][256] =`
`221`	`223`	`{`
	`224`	`+#ifdef U8_UNICODE_320`
`222`	`225`	`{`
`223`	`226`	`{`
`224`	`227`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -290,6 +293,7 @@ static const uchar_t u8_combining_class_b2_tbl[U8_UNICODE_LATEST + 1][2][256] =`
`290`	`293`	`},`
`291`	`294`
`292`	`295`	`},`
	`296`	`+#endif`
`293`	`297`	`{`
`294`	`298`	`{`
`295`	`299`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -366,6 +370,7 @@ static const uchar_t u8_combining_class_b2_tbl[U8_UNICODE_LATEST + 1][2][256] =`
`366`	`370`
`367`	`371`	`static const uchar_t u8_combining_class_b3_tbl[U8_UNICODE_LATEST + 1][9][256] =`
`368`	`372`	`{`
	`373`	`+#ifdef U8_UNICODE_320`
`369`	`374`	`{`
`370`	`375`	`{ /* Third byte table 0. */`
`371`	`376`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`@@ -674,6 +679,7 @@ static const uchar_t u8_combining_class_b3_tbl[U8_UNICODE_LATEST + 1][9][256] =`
`674`	`679`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`675`	`680`	`},`
`676`	`681`	`},`
	`682`	`+#endif`
`677`	`683`	`{`
`678`	`684`	`{ /* Third byte table 0. */`
`679`	`685`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`@@ -990,6 +996,7 @@ static const uchar_t u8_combining_class_b3_tbl[U8_UNICODE_LATEST + 1][9][256] =`
`990`	`996`	`*/`
`991`	`997`	`static const uchar_t u8_combining_class_b4_tbl[U8_UNICODE_LATEST + 1][55][256] =`
`992`	`998`	`{`
	`999`	`+#ifdef U8_UNICODE_320`
`993`	`1000`	`{`
`994`	`1001`	`{ /* Fourth byte table 0. */`
`995`	`1002`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -2862,6 +2869,7 @@ static const uchar_t u8_combining_class_b4_tbl[U8_UNICODE_LATEST + 1][55][256] =`
`2862`	`2869`	`0, 0, 0, 0, 0, 0, 0, 0,`
`2863`	`2870`	`},`
`2864`	`2871`	`},`
	`2872`	`+#endif`
`2865`	`2873`	`{`
`2866`	`2874`	`{ /* Fourth byte table 0. */`
`2867`	`2875`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -4737,6 +4745,7 @@ static const uchar_t u8_combining_class_b4_tbl[U8_UNICODE_LATEST + 1][55][256] =`
`4737`	`4745`	`};`
`4738`	`4746`
`4739`	`4747`	`static const uchar_t u8_composition_b1_tbl[U8_UNICODE_LATEST + 1][256] = {`
	`4748`	`+#ifdef U8_UNICODE_320`
`4740`	`4749`	`{`
`4741`	`4750`	`0, N_, N_, N_, N_, N_, N_, N_,`
`4742`	`4751`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`@@ -4771,6 +4780,7 @@ static const uchar_t u8_composition_b1_tbl[U8_UNICODE_LATEST + 1][256] = {`
`4771`	`4780`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`4772`	`4781`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`4773`	`4782`	`},`
	`4783`	`+#endif`
`4774`	`4784`	`{`
`4775`	`4785`	`0, N_, N_, N_, N_, N_, N_, N_,`
`4776`	`4786`	`N_, N_, N_, N_, N_, N_, N_, N_,`
`@@ -4808,6 +4818,7 @@ static const uchar_t u8_composition_b1_tbl[U8_UNICODE_LATEST + 1][256] = {`
`4808`	`4818`	`};`
`4809`	`4819`
`4810`	`4820`	`static const uchar_t u8_composition_b2_tbl[U8_UNICODE_LATEST + 1][1][256] = {`
	`4821`	`+#ifdef U8_UNICODE_320`
`4811`	`4822`	`{`
`4812`	`4823`	`{`
`4813`	`4824`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -4845,6 +4856,7 @@ static const uchar_t u8_composition_b2_tbl[U8_UNICODE_LATEST + 1][1][256] = {`
`4845`	`4856`	`},`
`4846`	`4857`
`4847`	`4858`	`},`
	`4859`	`+#endif`
`4848`	`4860`	`{`
`4849`	`4861`	`{`
`4850`	`4862`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -4888,6 +4900,7 @@ static const uchar_t u8_composition_b2_tbl[U8_UNICODE_LATEST + 1][1][256] = {`
`4888`	`4900`	`static const u8_displacement_t u8_composition_b3_tbl[`
`4889`	`4901`	`U8_UNICODE_LATEST + 1][5][256] =`
`4890`	`4902`	`{`
	`4903`	`+#ifdef U8_UNICODE_320`
`4891`	`4904`	`{`
`4892`	`4905`	`{ /* Third byte table 0. */`
`4893`	`4906`	`{ 0x8000, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -5330,6 +5343,7 @@ static const u8_displacement_t u8_composition_b3_tbl[`
`5330`	`5343`	`{ N_, 0 },`
`5331`	`5344`	`},`
`5332`	`5345`	`},`
	`5346`	`+#endif`
`5333`	`5347`	`{`
`5334`	`5348`	`{ /* Third byte table 0. */`
`5335`	`5349`	`{ 0x8000, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -5775,6 +5789,7 @@ static const u8_displacement_t u8_composition_b3_tbl[`
`5775`	`5789`	`};`
`5776`	`5790`
`5777`	`5791`	`static const uchar_t u8_composition_b4_tbl[U8_UNICODE_LATEST + 1][41][257] = {`
	`5792`	`+#ifdef U8_UNICODE_320`
`5778`	`5793`	`{`
`5779`	`5794`	`{ /* Fourth byte table 0. */`
`5780`	`5795`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -7212,6 +7227,7 @@ static const uchar_t u8_composition_b4_tbl[U8_UNICODE_LATEST + 1][41][257] = {`
`7212`	`7227`	`0,`
`7213`	`7228`	`},`
`7214`	`7229`	`},`
	`7230`	`+#endif`
`7215`	`7231`	`{`
`7216`	`7232`	`{ /* Fourth byte table 0. */`
`7217`	`7233`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -8654,6 +8670,7 @@ static const uchar_t u8_composition_b4_tbl[U8_UNICODE_LATEST + 1][41][257] = {`
`8654`	`8670`	`static const uint16_t u8_composition_b4_16bit_tbl[`
`8655`	`8671`	`U8_UNICODE_LATEST + 1][5][257] =`
`8656`	`8672`	`{`
	`8673`	`+#ifdef U8_UNICODE_320`
`8657`	`8674`	`{`
`8658`	`8675`	`{ /* Fourth byte 16-bit table 0. */`
`8659`	`8676`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -8831,6 +8848,7 @@ static const uint16_t u8_composition_b4_16bit_tbl[`
`8831`	`8848`	`362,`
`8832`	`8849`	`},`
`8833`	`8850`	`},`
	`8851`	`+#endif`
`8834`	`8852`	`{`
`8835`	`8853`	`{ /* Fourth byte 16-bit table 0. */`
`8836`	`8854`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -9011,6 +9029,7 @@ static const uint16_t u8_composition_b4_16bit_tbl[`
`9011`	`9029`	`};`
`9012`	`9030`
`9013`	`9031`	`static const uchar_t u8_composition_final_tbl[U8_UNICODE_LATEST + 1][6623] = {`
	`9032`	`+#ifdef U8_UNICODE_320`
`9014`	`9033`	`{`
`9015`	`9034`	`0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xAE, FIL_,`
`9016`	`9035`	`0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xA0, FIL_,`
`@@ -9841,6 +9860,7 @@ static const uchar_t u8_composition_final_tbl[U8_UNICODE_LATEST + 1][6623] = {`
`9841`	`9860`	`0, 0, 0, 0, 0, 0, 0, 0,`
`9842`	`9861`	`0, 0, 0, 0, 0, 0, 0,`
`9843`	`9862`	`},`
	`9863`	`+#endif`
`9844`	`9864`	`{`
`9845`	`9865`	`0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xAE, FIL_,`
`9846`	`9866`	`0x01, 0xCC, 0xB8, FIL_, 0xE2, 0x89, 0xA0, FIL_,`
`@@ -10674,6 +10694,7 @@ static const uchar_t u8_composition_final_tbl[U8_UNICODE_LATEST + 1][6623] = {`
`10674`	`10694`	`};`
`10675`	`10695`
`10676`	`10696`	`static const uchar_t u8_decomp_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {`
	`10697`	`+#ifdef U8_UNICODE_320`
`10677`	`10698`	`{`
`10678`	`10699`	`{`
`10679`	`10700`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -10745,6 +10766,7 @@ static const uchar_t u8_decomp_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {`
`10745`	`10766`	`},`
`10746`	`10767`
`10747`	`10768`	`},`
	`10769`	`+#endif`
`10748`	`10770`	`{`
`10749`	`10771`	`{`
`10750`	`10772`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -10821,6 +10843,7 @@ static const uchar_t u8_decomp_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {`
`10821`	`10843`
`10822`	`10844`	`static const u8_displacement_t u8_decomp_b3_tbl[U8_UNICODE_LATEST + 1][8][256] =`
`10823`	`10845`	`{`
	`10846`	`+#ifdef U8_UNICODE_320`
`10824`	`10847`	`{`
`10825`	`10848`	`{ /* Third byte table 0. */`
`10826`	`10849`	`{ N_, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -11527,6 +11550,7 @@ static const u8_displacement_t u8_decomp_b3_tbl[U8_UNICODE_LATEST + 1][8][256] =`
`11527`	`11550`	`{ N_, 0 },`
`11528`	`11551`	`},`
`11529`	`11552`	`},`
	`11553`	`+#endif`
`11530`	`11554`	`{`
`11531`	`11555`	`{ /* Third byte table 0. */`
`11532`	`11556`	`{ N_, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -12236,6 +12260,7 @@ static const u8_displacement_t u8_decomp_b3_tbl[U8_UNICODE_LATEST + 1][8][256] =`
`12236`	`12260`	`};`
`12237`	`12261`
`12238`	`12262`	`static const uchar_t u8_decomp_b4_tbl[U8_UNICODE_LATEST + 1][118][257] = {`
	`12263`	`+#ifdef U8_UNICODE_320`
`12239`	`12264`	`{`
`12240`	`12265`	`{ /* Fourth byte table 0. */`
`12241`	`12266`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -16368,6 +16393,7 @@ static const uchar_t u8_decomp_b4_tbl[U8_UNICODE_LATEST + 1][118][257] = {`
`16368`	`16393`	`0,`
`16369`	`16394`	`},`
`16370`	`16395`	`},`
	`16396`	`+#endif`
`16371`	`16397`	`{`
`16372`	`16398`	`{ /* Fourth byte table 0. */`
`16373`	`16399`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -20503,6 +20529,7 @@ static const uchar_t u8_decomp_b4_tbl[U8_UNICODE_LATEST + 1][118][257] = {`
`20503`	`20529`	`};`
`20504`	`20530`
`20505`	`20531`	`static const uint16_t u8_decomp_b4_16bit_tbl[U8_UNICODE_LATEST + 1][30][257] = {`
	`20532`	`+#ifdef U8_UNICODE_320`
`20506`	`20533`	`{`
`20507`	`20534`	`{ /* Fourth byte 16-bit table 0. */`
`20508`	`20535`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -21555,6 +21582,7 @@ static const uint16_t u8_decomp_b4_16bit_tbl[U8_UNICODE_LATEST + 1][30][257] = {`
`21555`	`21582`	`0,`
`21556`	`21583`	`},`
`21557`	`21584`	`},`
	`21585`	`+#endif`
`21558`	`21586`	`{`
`21559`	`21587`	`{ /* Fourth byte 16-bit table 0. */`
`21560`	`21588`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -22610,6 +22638,7 @@ static const uint16_t u8_decomp_b4_16bit_tbl[U8_UNICODE_LATEST + 1][30][257] = {`
`22610`	`22638`	`};`
`22611`	`22639`
`22612`	`22640`	`static const uchar_t u8_decomp_final_tbl[U8_UNICODE_LATEST + 1][19370] = {`
	`22641`	`+#ifdef U8_UNICODE_320`
`22613`	`22642`	`{`
`22614`	`22643`	`0x20, 0x20, 0xCC, 0x88, 0x61, 0x20, 0xCC, 0x84,`
`22615`	`22644`	`0x32, 0x33, 0x20, 0xCC, 0x81, 0xCE, 0xBC, 0x20,`
`@@ -25034,6 +25063,7 @@ static const uchar_t u8_decomp_final_tbl[U8_UNICODE_LATEST + 1][19370] = {`
`25034`	`25063`	`0, 0, 0, 0, 0, 0, 0, 0,`
`25035`	`25064`	`0, 0,`
`25036`	`25065`	`},`
	`25066`	`+#endif`
`25037`	`25067`	`{`
`25038`	`25068`	`0x20, 0x20, 0xCC, 0x88, 0x61, 0x20, 0xCC, 0x84,`
`25039`	`25069`	`0x32, 0x33, 0x20, 0xCC, 0x81, 0xCE, 0xBC, 0x20,`
`@@ -27461,6 +27491,7 @@ static const uchar_t u8_decomp_final_tbl[U8_UNICODE_LATEST + 1][19370] = {`
`27461`	`27491`	`};`
`27462`	`27492`
`27463`	`27493`	`static const uchar_t u8_case_common_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {`
	`27494`	`+#ifdef U8_UNICODE_320`
`27464`	`27495`	`{`
`27465`	`27496`	`{`
`27466`	`27497`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -27532,6 +27563,7 @@ static const uchar_t u8_case_common_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {`
`27532`	`27563`	`},`
`27533`	`27564`
`27534`	`27565`	`},`
	`27566`	`+#endif`
`27535`	`27567`	`{`
`27536`	`27568`	`{`
`27537`	`27569`	`0, N_, N_, N_, N_, N_, N_, N_,`
`@@ -27609,6 +27641,7 @@ static const uchar_t u8_case_common_b2_tbl[U8_UNICODE_LATEST + 1][2][256] = {`
`27609`	`27641`	`static const u8_displacement_t u8_tolower_b3_tbl[`
`27610`	`27642`	`U8_UNICODE_LATEST + 1][5][256] =`
`27611`	`27643`	`{`
	`27644`	`+#ifdef U8_UNICODE_320`
`27612`	`27645`	`{`
`27613`	`27646`	`{ /* Third byte table 0. */`
`27614`	`27647`	`{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -27941,6 +27974,7 @@ static const u8_displacement_t u8_tolower_b3_tbl[`
`27941`	`27974`	`{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },`
`27942`	`27975`	`},`
`27943`	`27976`	`},`
	`27977`	`+#endif`
`27944`	`27978`	`{`
`27945`	`27979`	`{ /* Third byte table 0. */`
`27946`	`27980`	`{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -28276,6 +28310,7 @@ static const u8_displacement_t u8_tolower_b3_tbl[`
`28276`	`28310`	`};`
`28277`	`28311`
`28278`	`28312`	`static const uchar_t u8_tolower_b4_tbl[U8_UNICODE_LATEST + 1][36][257] = {`
	`28313`	`+#ifdef U8_UNICODE_320`
`28279`	`28314`	`{`
`28280`	`28315`	`{ /* Fourth byte table 0. */`
`28281`	`28316`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -29538,6 +29573,7 @@ static const uchar_t u8_tolower_b4_tbl[U8_UNICODE_LATEST + 1][36][257] = {`
`29538`	`29573`	`0,`
`29539`	`29574`	`},`
`29540`	`29575`	`},`
	`29576`	`+#endif`
`29541`	`29577`	`{`
`29542`	`29578`	`{ /* Fourth byte table 0. */`
`29543`	`29579`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -30803,6 +30839,7 @@ static const uchar_t u8_tolower_b4_tbl[U8_UNICODE_LATEST + 1][36][257] = {`
`30803`	`30839`	`};`
`30804`	`30840`
`30805`	`30841`	`static const uchar_t u8_tolower_final_tbl[U8_UNICODE_LATEST + 1][2299] = {`
	`30842`	`+#ifdef U8_UNICODE_320`
`30806`	`30843`	`{`
`30807`	`30844`	`0xC3, 0xA0, 0xC3, 0xA1, 0xC3, 0xA2, 0xC3, 0xA3,`
`30808`	`30845`	`0xC3, 0xA4, 0xC3, 0xA5, 0xC3, 0xA6, 0xC3, 0xA7,`
`@@ -31093,6 +31130,7 @@ static const uchar_t u8_tolower_final_tbl[U8_UNICODE_LATEST + 1][2299] = {`
`31093`	`31130`	`0, 0, 0, 0, 0, 0, 0, 0,`
`31094`	`31131`	`0, 0, 0,`
`31095`	`31132`	`},`
	`31133`	`+#endif`
`31096`	`31134`	`{`
`31097`	`31135`	`0xC3, 0xA0, 0xC3, 0xA1, 0xC3, 0xA2, 0xC3, 0xA3,`
`31098`	`31136`	`0xC3, 0xA4, 0xC3, 0xA5, 0xC3, 0xA6, 0xC3, 0xA7,`
`@@ -31388,6 +31426,7 @@ static const uchar_t u8_tolower_final_tbl[U8_UNICODE_LATEST + 1][2299] = {`
`31388`	`31426`	`static const u8_displacement_t u8_toupper_b3_tbl[`
`31389`	`31427`	`U8_UNICODE_LATEST + 1][5][256] =`
`31390`	`31428`	`{`
	`31429`	`+#ifdef U8_UNICODE_320`
`31391`	`31430`	`{`
`31392`	`31431`	`{ /* Third byte table 0. */`
`31393`	`31432`	`{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -31720,6 +31759,7 @@ static const u8_displacement_t u8_toupper_b3_tbl[`
`31720`	`31759`	`{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },`
`31721`	`31760`	`},`
`31722`	`31761`	`},`
	`31762`	`+#endif`
`31723`	`31763`	`{`
`31724`	`31764`	`{ /* Third byte table 0. */`
`31725`	`31765`	`{ N_, 0 }, { N_, 0 }, { N_, 0 }, { N_, 0 },`
`@@ -32055,6 +32095,7 @@ static const u8_displacement_t u8_toupper_b3_tbl[`
`32055`	`32095`	`};`
`32056`	`32096`
`32057`	`32097`	`static const uchar_t u8_toupper_b4_tbl[U8_UNICODE_LATEST + 1][39][257] = {`
	`32098`	`+#ifdef U8_UNICODE_320`
`32058`	`32099`	`{`
`32059`	`32100`	`{ /* Fourth byte table 0. */`
`32060`	`32101`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -33422,6 +33463,7 @@ static const uchar_t u8_toupper_b4_tbl[U8_UNICODE_LATEST + 1][39][257] = {`
`33422`	`33463`	`0,`
`33423`	`33464`	`},`
`33424`	`33465`	`},`
	`33466`	`+#endif`
`33425`	`33467`	`{`
`33426`	`33468`	`{ /* Fourth byte table 0. */`
`33427`	`33469`	`0, 0, 0, 0, 0, 0, 0, 0,`
`@@ -34792,6 +34834,7 @@ static const uchar_t u8_toupper_b4_tbl[U8_UNICODE_LATEST + 1][39][257] = {`
`34792`	`34834`	`};`
`34793`	`34835`
`34794`	`34836`	`static const uchar_t u8_toupper_final_tbl[U8_UNICODE_LATEST + 1][2318] = {`
	`34837`	`+#ifdef U8_UNICODE_320`
`34795`	`34838`	`{`
`34796`	`34839`	`0xCE, 0x9C, 0xC3, 0x80, 0xC3, 0x81, 0xC3, 0x82,`
`34797`	`34840`	`0xC3, 0x83, 0xC3, 0x84, 0xC3, 0x85, 0xC3, 0x86,`
`@@ -35084,6 +35127,7 @@ static const uchar_t u8_toupper_final_tbl[U8_UNICODE_LATEST + 1][2318] = {`
`35084`	`35127`	`0, 0, 0, 0, 0, 0, 0, 0,`
`35085`	`35128`	`0, 0, 0, 0, 0, 0,`
`35086`	`35129`	`},`
	`35130`	`+#endif`
`35087`	`35131`	`{`
`35088`	`35132`	`0xCE, 0x9C, 0xC3, 0x80, 0xC3, 0x81, 0xC3, 0x82,`
`35089`	`35133`	`0xC3, 0x83, 0xC3, 0x84, 0xC3, 0x85, 0xC3, 0x86,`