diff --git a/contrib/unaccent/unaccent.rules b/contrib/unaccent/unaccent.rules
index 99826408ac1..bf4c1bd1974 100644
--- a/contrib/unaccent/unaccent.rules
+++ b/contrib/unaccent/unaccent.rules
@@ -1107,6 +1107,7 @@
 ℕ	N
 №	No
 ℗	(P)
+℘	P
 ℙ	P
 ℚ	Q
 ℛ	R
@@ -1253,6 +1254,28 @@
 ⩴	::=
 ⩵	==
 ⩶	===
+Ⱡ	L
+ⱡ	l
+Ɫ	L
+Ᵽ	P
+Ɽ	R
+ⱥ	a
+ⱦ	t
+Ⱨ	H
+ⱨ	h
+Ⱪ	K
+ⱪ	k
+Ⱬ	Z
+ⱬ	z
+Ɱ	M
+ⱱ	v
+Ⱳ	W
+ⱳ	w
+ⱴ	v
+ⱸ	e
+ⱺ	o
+Ȿ	S
+Ɀ	Z
 、	,
 。	.
 〇	0
@@ -1349,6 +1372,82 @@
 ㏝	Wb
 ㏞	V/m
 ㏟	A/m
+ꜰ	F
+ꜱ	S
+Ꜳ	AA
+ꜳ	aa
+Ꜵ	AO
+ꜵ	ao
+Ꜷ	AU
+ꜷ	au
+Ꜹ	AV
+ꜹ	av
+Ꜻ	AV
+ꜻ	av
+Ꜽ	AY
+ꜽ	ay
+Ꝁ	K
+ꝁ	k
+Ꝃ	K
+ꝃ	k
+Ꝅ	K
+ꝅ	k
+Ꝇ	L
+ꝇ	l
+Ꝉ	L
+ꝉ	l
+Ꝋ	O
+ꝋ	o
+Ꝍ	O
+ꝍ	o
+Ꝏ	OO
+ꝏ	oo
+Ꝑ	P
+ꝑ	p
+Ꝓ	P
+ꝓ	p
+Ꝕ	P
+ꝕ	p
+Ꝗ	Q
+ꝗ	q
+Ꝙ	Q
+ꝙ	q
+Ꝟ	V
+ꝟ	v
+Ꝡ	VY
+ꝡ	vy
+Ꝥ	TH
+ꝥ	th
+Ꝧ	TH
+ꝧ	th
+ꝱ	d
+ꝲ	l
+ꝳ	m
+ꝴ	n
+ꝵ	r
+ꝶ	R
+ꝷ	t
+Ꝺ	D
+ꝺ	d
+Ꝼ	F
+ꝼ	f
+Ꞇ	T
+ꞇ	t
+Ꞑ	N
+ꞑ	n
+Ꞓ	C
+ꞓ	c
+Ꞡ	G
+ꞡ	g
+Ꞣ	K
+ꞣ	k
+Ꞥ	N
+ꞥ	n
+Ꞧ	R
+ꞧ	r
+Ꞩ	S
+ꞩ	s
+Ɦ	H
 ff	ff
 fi	fi
 fl	fl
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index b2434437701..9a6265b3a0b 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -362,10 +362,10 @@ DOWNLOAD = wget -O $@ --no-use-server-timestamps
 # Pick a release from here: <https://www.unicode.org/Public/>.  Note
 # that the most recent release listed there is often a pre-release;
 # don't pick that one, except for testing.
-UNICODE_VERSION = 12.1.0
+UNICODE_VERSION = 13.0.0
 
 # Pick a release from here: <http://cldr.unicode.org/index/downloads>
-CLDR_VERSION = 34
+CLDR_VERSION = 37
 
 
 # Tree-wide build support
diff --git a/src/include/common/unicode_combining_table.h b/src/include/common/unicode_combining_table.h
index b4a85882386..a9f10c31bc8 100644
--- a/src/include/common/unicode_combining_table.h
+++ b/src/include/common/unicode_combining_table.h
@@ -73,6 +73,7 @@ static const struct mbinterval combining[] = {
 	{0x0D41, 0x0D44},
 	{0x0D4D, 0x0D4D},
 	{0x0D62, 0x0D63},
+	{0x0D81, 0x0D81},
 	{0x0DCA, 0x0DCA},
 	{0x0DD2, 0x0DD6},
 	{0x0E31, 0x0E31},
@@ -162,6 +163,7 @@ static const struct mbinterval combining[] = {
 	{0xA806, 0xA806},
 	{0xA80B, 0xA80B},
 	{0xA825, 0xA826},
+	{0xA82C, 0xA82C},
 	{0xA8C4, 0xA8C5},
 	{0xA8E0, 0xA8F1},
 	{0xA8FF, 0xA8FF},
diff --git a/src/include/common/unicode_norm_table.h b/src/include/common/unicode_norm_table.h
index 122231b4f81..96d43b893c1 100644
--- a/src/include/common/unicode_norm_table.h
+++ b/src/include/common/unicode_norm_table.h
@@ -36,7 +36,7 @@ typedef struct
 #define DECOMPOSITION_IS_COMPAT(x) (((x)->dec_size_flags & DECOMP_COMPAT) != 0)
 
 /* Table of Unicode codepoints and their decompositions */
-static const pg_unicode_decomposition UnicodeDecompMain[6582] =
+static const pg_unicode_decomposition UnicodeDecompMain[6604] =
 {
 	{0x00A0, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0020},
 	{0x00A8, 0, 2 | DECOMP_COMPAT, 0},
@@ -940,6 +940,8 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x1ABB, 230, 0, 0},
 	{0x1ABC, 230, 0, 0},
 	{0x1ABD, 220, 0, 0},
+	{0x1ABF, 220, 0, 0},
+	{0x1AC0, 220, 0, 0},
 	{0x1B06, 0, 2, 885},
 	{0x1B08, 0, 2, 887},
 	{0x1B0A, 0, 2, 889},
@@ -2992,6 +2994,7 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0xA7F8, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0126},
 	{0xA7F9, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0153},
 	{0xA806, 9, 0, 0},
+	{0xA82C, 9, 0, 0},
 	{0xA8C4, 9, 0, 0},
 	{0xA8E0, 230, 0, 0},
 	{0xA8E1, 230, 0, 0},
@@ -3031,6 +3034,7 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0xAB5D, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0xAB37},
 	{0xAB5E, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x026B},
 	{0xAB5F, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0xAB52},
+	{0xAB69, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x028D},
 	{0xABED, 9, 0, 0},
 	{0xF900, 0, 1 | DECOMP_INLINE, 0x8C48},
 	{0xF901, 0, 1 | DECOMP_INLINE, 0x66F4},
@@ -4607,6 +4611,8 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x10D25, 230, 0, 0},
 	{0x10D26, 230, 0, 0},
 	{0x10D27, 230, 0, 0},
+	{0x10EAB, 230, 0, 0},
+	{0x10EAC, 230, 0, 0},
 	{0x10F46, 220, 0, 0},
 	{0x10F47, 220, 0, 0},
 	{0x10F48, 230, 0, 0},
@@ -4674,6 +4680,10 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x1172B, 9, 0, 0},
 	{0x11839, 9, 0, 0},
 	{0x1183A, 7, 0, 0},
+	{0x11938, 0, 2, 4800},
+	{0x1193D, 9, 0, 0},
+	{0x1193E, 9, 0, 0},
+	{0x11943, 7, 0, 0},
 	{0x119E0, 9, 0, 0},
 	{0x11A34, 9, 0, 0},
 	{0x11A47, 9, 0, 0},
@@ -4695,14 +4705,16 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x16B34, 230, 0, 0},
 	{0x16B35, 230, 0, 0},
 	{0x16B36, 230, 0, 0},
+	{0x16FF0, 6, 0, 0},
+	{0x16FF1, 6, 0, 0},
 	{0x1BC9E, 1, 0, 0},
-	{0x1D15E, 0, 2 | DECOMP_NO_COMPOSE, 4800},	/* in exclusion list */
-	{0x1D15F, 0, 2 | DECOMP_NO_COMPOSE, 4802},	/* in exclusion list */
-	{0x1D160, 0, 2 | DECOMP_NO_COMPOSE, 4804},	/* in exclusion list */
-	{0x1D161, 0, 2 | DECOMP_NO_COMPOSE, 4806},	/* in exclusion list */
-	{0x1D162, 0, 2 | DECOMP_NO_COMPOSE, 4808},	/* in exclusion list */
-	{0x1D163, 0, 2 | DECOMP_NO_COMPOSE, 4810},	/* in exclusion list */
-	{0x1D164, 0, 2 | DECOMP_NO_COMPOSE, 4812},	/* in exclusion list */
+	{0x1D15E, 0, 2 | DECOMP_NO_COMPOSE, 4802},	/* in exclusion list */
+	{0x1D15F, 0, 2 | DECOMP_NO_COMPOSE, 4804},	/* in exclusion list */
+	{0x1D160, 0, 2 | DECOMP_NO_COMPOSE, 4806},	/* in exclusion list */
+	{0x1D161, 0, 2 | DECOMP_NO_COMPOSE, 4808},	/* in exclusion list */
+	{0x1D162, 0, 2 | DECOMP_NO_COMPOSE, 4810},	/* in exclusion list */
+	{0x1D163, 0, 2 | DECOMP_NO_COMPOSE, 4812},	/* in exclusion list */
+	{0x1D164, 0, 2 | DECOMP_NO_COMPOSE, 4814},	/* in exclusion list */
 	{0x1D165, 216, 0, 0},
 	{0x1D166, 216, 0, 0},
 	{0x1D167, 1, 0, 0},
@@ -4733,12 +4745,12 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x1D1AB, 230, 0, 0},
 	{0x1D1AC, 230, 0, 0},
 	{0x1D1AD, 230, 0, 0},
-	{0x1D1BB, 0, 2 | DECOMP_NO_COMPOSE, 4814},	/* in exclusion list */
-	{0x1D1BC, 0, 2 | DECOMP_NO_COMPOSE, 4816},	/* in exclusion list */
-	{0x1D1BD, 0, 2 | DECOMP_NO_COMPOSE, 4818},	/* in exclusion list */
-	{0x1D1BE, 0, 2 | DECOMP_NO_COMPOSE, 4820},	/* in exclusion list */
-	{0x1D1BF, 0, 2 | DECOMP_NO_COMPOSE, 4822},	/* in exclusion list */
-	{0x1D1C0, 0, 2 | DECOMP_NO_COMPOSE, 4824},	/* in exclusion list */
+	{0x1D1BB, 0, 2 | DECOMP_NO_COMPOSE, 4816},	/* in exclusion list */
+	{0x1D1BC, 0, 2 | DECOMP_NO_COMPOSE, 4818},	/* in exclusion list */
+	{0x1D1BD, 0, 2 | DECOMP_NO_COMPOSE, 4820},	/* in exclusion list */
+	{0x1D1BE, 0, 2 | DECOMP_NO_COMPOSE, 4822},	/* in exclusion list */
+	{0x1D1BF, 0, 2 | DECOMP_NO_COMPOSE, 4824},	/* in exclusion list */
+	{0x1D1C0, 0, 2 | DECOMP_NO_COMPOSE, 4826},	/* in exclusion list */
 	{0x1D242, 230, 0, 0},
 	{0x1D243, 230, 0, 0},
 	{0x1D244, 230, 0, 0},
@@ -5942,48 +5954,48 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x1EEB9, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0636},
 	{0x1EEBA, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0638},
 	{0x1EEBB, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x063A},
-	{0x1F100, 0, 2 | DECOMP_COMPAT, 4826},
-	{0x1F101, 0, 2 | DECOMP_COMPAT, 4828},
-	{0x1F102, 0, 2 | DECOMP_COMPAT, 4830},
-	{0x1F103, 0, 2 | DECOMP_COMPAT, 4832},
-	{0x1F104, 0, 2 | DECOMP_COMPAT, 4834},
-	{0x1F105, 0, 2 | DECOMP_COMPAT, 4836},
-	{0x1F106, 0, 2 | DECOMP_COMPAT, 4838},
-	{0x1F107, 0, 2 | DECOMP_COMPAT, 4840},
-	{0x1F108, 0, 2 | DECOMP_COMPAT, 4842},
-	{0x1F109, 0, 2 | DECOMP_COMPAT, 4844},
-	{0x1F10A, 0, 2 | DECOMP_COMPAT, 4846},
-	{0x1F110, 0, 3 | DECOMP_COMPAT, 4848},
-	{0x1F111, 0, 3 | DECOMP_COMPAT, 4851},
-	{0x1F112, 0, 3 | DECOMP_COMPAT, 4854},
-	{0x1F113, 0, 3 | DECOMP_COMPAT, 4857},
-	{0x1F114, 0, 3 | DECOMP_COMPAT, 4860},
-	{0x1F115, 0, 3 | DECOMP_COMPAT, 4863},
-	{0x1F116, 0, 3 | DECOMP_COMPAT, 4866},
-	{0x1F117, 0, 3 | DECOMP_COMPAT, 4869},
-	{0x1F118, 0, 3 | DECOMP_COMPAT, 4872},
-	{0x1F119, 0, 3 | DECOMP_COMPAT, 4875},
-	{0x1F11A, 0, 3 | DECOMP_COMPAT, 4878},
-	{0x1F11B, 0, 3 | DECOMP_COMPAT, 4881},
-	{0x1F11C, 0, 3 | DECOMP_COMPAT, 4884},
-	{0x1F11D, 0, 3 | DECOMP_COMPAT, 4887},
-	{0x1F11E, 0, 3 | DECOMP_COMPAT, 4890},
-	{0x1F11F, 0, 3 | DECOMP_COMPAT, 4893},
-	{0x1F120, 0, 3 | DECOMP_COMPAT, 4896},
-	{0x1F121, 0, 3 | DECOMP_COMPAT, 4899},
-	{0x1F122, 0, 3 | DECOMP_COMPAT, 4902},
-	{0x1F123, 0, 3 | DECOMP_COMPAT, 4905},
-	{0x1F124, 0, 3 | DECOMP_COMPAT, 4908},
-	{0x1F125, 0, 3 | DECOMP_COMPAT, 4911},
-	{0x1F126, 0, 3 | DECOMP_COMPAT, 4914},
-	{0x1F127, 0, 3 | DECOMP_COMPAT, 4917},
-	{0x1F128, 0, 3 | DECOMP_COMPAT, 4920},
-	{0x1F129, 0, 3 | DECOMP_COMPAT, 4923},
-	{0x1F12A, 0, 3 | DECOMP_COMPAT, 4926},
+	{0x1F100, 0, 2 | DECOMP_COMPAT, 4828},
+	{0x1F101, 0, 2 | DECOMP_COMPAT, 4830},
+	{0x1F102, 0, 2 | DECOMP_COMPAT, 4832},
+	{0x1F103, 0, 2 | DECOMP_COMPAT, 4834},
+	{0x1F104, 0, 2 | DECOMP_COMPAT, 4836},
+	{0x1F105, 0, 2 | DECOMP_COMPAT, 4838},
+	{0x1F106, 0, 2 | DECOMP_COMPAT, 4840},
+	{0x1F107, 0, 2 | DECOMP_COMPAT, 4842},
+	{0x1F108, 0, 2 | DECOMP_COMPAT, 4844},
+	{0x1F109, 0, 2 | DECOMP_COMPAT, 4846},
+	{0x1F10A, 0, 2 | DECOMP_COMPAT, 4848},
+	{0x1F110, 0, 3 | DECOMP_COMPAT, 4850},
+	{0x1F111, 0, 3 | DECOMP_COMPAT, 4853},
+	{0x1F112, 0, 3 | DECOMP_COMPAT, 4856},
+	{0x1F113, 0, 3 | DECOMP_COMPAT, 4859},
+	{0x1F114, 0, 3 | DECOMP_COMPAT, 4862},
+	{0x1F115, 0, 3 | DECOMP_COMPAT, 4865},
+	{0x1F116, 0, 3 | DECOMP_COMPAT, 4868},
+	{0x1F117, 0, 3 | DECOMP_COMPAT, 4871},
+	{0x1F118, 0, 3 | DECOMP_COMPAT, 4874},
+	{0x1F119, 0, 3 | DECOMP_COMPAT, 4877},
+	{0x1F11A, 0, 3 | DECOMP_COMPAT, 4880},
+	{0x1F11B, 0, 3 | DECOMP_COMPAT, 4883},
+	{0x1F11C, 0, 3 | DECOMP_COMPAT, 4886},
+	{0x1F11D, 0, 3 | DECOMP_COMPAT, 4889},
+	{0x1F11E, 0, 3 | DECOMP_COMPAT, 4892},
+	{0x1F11F, 0, 3 | DECOMP_COMPAT, 4895},
+	{0x1F120, 0, 3 | DECOMP_COMPAT, 4898},
+	{0x1F121, 0, 3 | DECOMP_COMPAT, 4901},
+	{0x1F122, 0, 3 | DECOMP_COMPAT, 4904},
+	{0x1F123, 0, 3 | DECOMP_COMPAT, 4907},
+	{0x1F124, 0, 3 | DECOMP_COMPAT, 4910},
+	{0x1F125, 0, 3 | DECOMP_COMPAT, 4913},
+	{0x1F126, 0, 3 | DECOMP_COMPAT, 4916},
+	{0x1F127, 0, 3 | DECOMP_COMPAT, 4919},
+	{0x1F128, 0, 3 | DECOMP_COMPAT, 4922},
+	{0x1F129, 0, 3 | DECOMP_COMPAT, 4925},
+	{0x1F12A, 0, 3 | DECOMP_COMPAT, 4928},
 	{0x1F12B, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0043},
 	{0x1F12C, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0052},
-	{0x1F12D, 0, 2 | DECOMP_COMPAT, 4929},
-	{0x1F12E, 0, 2 | DECOMP_COMPAT, 4931},
+	{0x1F12D, 0, 2 | DECOMP_COMPAT, 4931},
+	{0x1F12E, 0, 2 | DECOMP_COMPAT, 4933},
 	{0x1F130, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0041},
 	{0x1F131, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0042},
 	{0x1F132, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0043},
@@ -6010,18 +6022,18 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x1F147, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0058},
 	{0x1F148, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0059},
 	{0x1F149, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x005A},
-	{0x1F14A, 0, 2 | DECOMP_COMPAT, 4933},
-	{0x1F14B, 0, 2 | DECOMP_COMPAT, 4935},
-	{0x1F14C, 0, 2 | DECOMP_COMPAT, 4937},
-	{0x1F14D, 0, 2 | DECOMP_COMPAT, 4939},
-	{0x1F14E, 0, 3 | DECOMP_COMPAT, 4941},
-	{0x1F14F, 0, 2 | DECOMP_COMPAT, 4944},
-	{0x1F16A, 0, 2 | DECOMP_COMPAT, 4946},
-	{0x1F16B, 0, 2 | DECOMP_COMPAT, 4948},
-	{0x1F16C, 0, 2 | DECOMP_COMPAT, 4950},
-	{0x1F190, 0, 2 | DECOMP_COMPAT, 4952},
-	{0x1F200, 0, 2 | DECOMP_COMPAT, 4954},
-	{0x1F201, 0, 2 | DECOMP_COMPAT, 4956},
+	{0x1F14A, 0, 2 | DECOMP_COMPAT, 4935},
+	{0x1F14B, 0, 2 | DECOMP_COMPAT, 4937},
+	{0x1F14C, 0, 2 | DECOMP_COMPAT, 4939},
+	{0x1F14D, 0, 2 | DECOMP_COMPAT, 4941},
+	{0x1F14E, 0, 3 | DECOMP_COMPAT, 4943},
+	{0x1F14F, 0, 2 | DECOMP_COMPAT, 4946},
+	{0x1F16A, 0, 2 | DECOMP_COMPAT, 4948},
+	{0x1F16B, 0, 2 | DECOMP_COMPAT, 4950},
+	{0x1F16C, 0, 2 | DECOMP_COMPAT, 4952},
+	{0x1F190, 0, 2 | DECOMP_COMPAT, 4954},
+	{0x1F200, 0, 2 | DECOMP_COMPAT, 4956},
+	{0x1F201, 0, 2 | DECOMP_COMPAT, 4958},
 	{0x1F202, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x30B5},
 	{0x1F210, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x624B},
 	{0x1F211, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x5B57},
@@ -6067,21 +6079,31 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x1F239, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x5272},
 	{0x1F23A, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x55B6},
 	{0x1F23B, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x914D},
-	{0x1F240, 0, 3 | DECOMP_COMPAT, 4958},
-	{0x1F241, 0, 3 | DECOMP_COMPAT, 4961},
-	{0x1F242, 0, 3 | DECOMP_COMPAT, 4964},
-	{0x1F243, 0, 3 | DECOMP_COMPAT, 4967},
-	{0x1F244, 0, 3 | DECOMP_COMPAT, 4970},
-	{0x1F245, 0, 3 | DECOMP_COMPAT, 4973},
-	{0x1F246, 0, 3 | DECOMP_COMPAT, 4976},
-	{0x1F247, 0, 3 | DECOMP_COMPAT, 4979},
-	{0x1F248, 0, 3 | DECOMP_COMPAT, 4982},
+	{0x1F240, 0, 3 | DECOMP_COMPAT, 4960},
+	{0x1F241, 0, 3 | DECOMP_COMPAT, 4963},
+	{0x1F242, 0, 3 | DECOMP_COMPAT, 4966},
+	{0x1F243, 0, 3 | DECOMP_COMPAT, 4969},
+	{0x1F244, 0, 3 | DECOMP_COMPAT, 4972},
+	{0x1F245, 0, 3 | DECOMP_COMPAT, 4975},
+	{0x1F246, 0, 3 | DECOMP_COMPAT, 4978},
+	{0x1F247, 0, 3 | DECOMP_COMPAT, 4981},
+	{0x1F248, 0, 3 | DECOMP_COMPAT, 4984},
 	{0x1F250, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x5F97},
 	{0x1F251, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x53EF},
+	{0x1FBF0, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0030},
+	{0x1FBF1, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0031},
+	{0x1FBF2, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0032},
+	{0x1FBF3, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0033},
+	{0x1FBF4, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0034},
+	{0x1FBF5, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0035},
+	{0x1FBF6, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0036},
+	{0x1FBF7, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0037},
+	{0x1FBF8, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0038},
+	{0x1FBF9, 0, 1 | DECOMP_COMPAT | DECOMP_INLINE, 0x0039},
 	{0x2F800, 0, 1 | DECOMP_INLINE, 0x4E3D},
 	{0x2F801, 0, 1 | DECOMP_INLINE, 0x4E38},
 	{0x2F802, 0, 1 | DECOMP_INLINE, 0x4E41},
-	{0x2F803, 0, 1, 4985},
+	{0x2F803, 0, 1, 4987},
 	{0x2F804, 0, 1 | DECOMP_INLINE, 0x4F60},
 	{0x2F805, 0, 1 | DECOMP_INLINE, 0x4FAE},
 	{0x2F806, 0, 1 | DECOMP_INLINE, 0x4FBB},
@@ -6091,22 +6113,22 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F80A, 0, 1 | DECOMP_INLINE, 0x50E7},
 	{0x2F80B, 0, 1 | DECOMP_INLINE, 0x50CF},
 	{0x2F80C, 0, 1 | DECOMP_INLINE, 0x349E},
-	{0x2F80D, 0, 1, 4986},
+	{0x2F80D, 0, 1, 4988},
 	{0x2F80E, 0, 1 | DECOMP_INLINE, 0x514D},
 	{0x2F80F, 0, 1 | DECOMP_INLINE, 0x5154},
 	{0x2F810, 0, 1 | DECOMP_INLINE, 0x5164},
 	{0x2F811, 0, 1 | DECOMP_INLINE, 0x5177},
-	{0x2F812, 0, 1, 4987},
+	{0x2F812, 0, 1, 4989},
 	{0x2F813, 0, 1 | DECOMP_INLINE, 0x34B9},
 	{0x2F814, 0, 1 | DECOMP_INLINE, 0x5167},
 	{0x2F815, 0, 1 | DECOMP_INLINE, 0x518D},
-	{0x2F816, 0, 1, 4988},
+	{0x2F816, 0, 1, 4990},
 	{0x2F817, 0, 1 | DECOMP_INLINE, 0x5197},
 	{0x2F818, 0, 1 | DECOMP_INLINE, 0x51A4},
 	{0x2F819, 0, 1 | DECOMP_INLINE, 0x4ECC},
 	{0x2F81A, 0, 1 | DECOMP_INLINE, 0x51AC},
 	{0x2F81B, 0, 1 | DECOMP_INLINE, 0x51B5},
-	{0x2F81C, 0, 1, 4989},
+	{0x2F81C, 0, 1, 4991},
 	{0x2F81D, 0, 1 | DECOMP_INLINE, 0x51F5},
 	{0x2F81E, 0, 1 | DECOMP_INLINE, 0x5203},
 	{0x2F81F, 0, 1 | DECOMP_INLINE, 0x34DF},
@@ -6130,11 +6152,11 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F831, 0, 1 | DECOMP_INLINE, 0x537F},
 	{0x2F832, 0, 1 | DECOMP_INLINE, 0x537F},
 	{0x2F833, 0, 1 | DECOMP_INLINE, 0x537F},
-	{0x2F834, 0, 1, 4990},
+	{0x2F834, 0, 1, 4992},
 	{0x2F835, 0, 1 | DECOMP_INLINE, 0x7070},
 	{0x2F836, 0, 1 | DECOMP_INLINE, 0x53CA},
 	{0x2F837, 0, 1 | DECOMP_INLINE, 0x53DF},
-	{0x2F838, 0, 1, 4991},
+	{0x2F838, 0, 1, 4993},
 	{0x2F839, 0, 1 | DECOMP_INLINE, 0x53EB},
 	{0x2F83A, 0, 1 | DECOMP_INLINE, 0x53F1},
 	{0x2F83B, 0, 1 | DECOMP_INLINE, 0x5406},
@@ -6167,15 +6189,15 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F856, 0, 1 | DECOMP_INLINE, 0x5832},
 	{0x2F857, 0, 1 | DECOMP_INLINE, 0x5831},
 	{0x2F858, 0, 1 | DECOMP_INLINE, 0x58AC},
-	{0x2F859, 0, 1, 4992},
+	{0x2F859, 0, 1, 4994},
 	{0x2F85A, 0, 1 | DECOMP_INLINE, 0x58F2},
 	{0x2F85B, 0, 1 | DECOMP_INLINE, 0x58F7},
 	{0x2F85C, 0, 1 | DECOMP_INLINE, 0x5906},
 	{0x2F85D, 0, 1 | DECOMP_INLINE, 0x591A},
 	{0x2F85E, 0, 1 | DECOMP_INLINE, 0x5922},
 	{0x2F85F, 0, 1 | DECOMP_INLINE, 0x5962},
-	{0x2F860, 0, 1, 4993},
-	{0x2F861, 0, 1, 4994},
+	{0x2F860, 0, 1, 4995},
+	{0x2F861, 0, 1, 4996},
 	{0x2F862, 0, 1 | DECOMP_INLINE, 0x59EC},
 	{0x2F863, 0, 1 | DECOMP_INLINE, 0x5A1B},
 	{0x2F864, 0, 1 | DECOMP_INLINE, 0x5A27},
@@ -6186,12 +6208,12 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F869, 0, 1 | DECOMP_INLINE, 0x5B08},
 	{0x2F86A, 0, 1 | DECOMP_INLINE, 0x5B3E},
 	{0x2F86B, 0, 1 | DECOMP_INLINE, 0x5B3E},
-	{0x2F86C, 0, 1, 4995},
+	{0x2F86C, 0, 1, 4997},
 	{0x2F86D, 0, 1 | DECOMP_INLINE, 0x5BC3},
 	{0x2F86E, 0, 1 | DECOMP_INLINE, 0x5BD8},
 	{0x2F86F, 0, 1 | DECOMP_INLINE, 0x5BE7},
 	{0x2F870, 0, 1 | DECOMP_INLINE, 0x5BF3},
-	{0x2F871, 0, 1, 4996},
+	{0x2F871, 0, 1, 4998},
 	{0x2F872, 0, 1 | DECOMP_INLINE, 0x5BFF},
 	{0x2F873, 0, 1 | DECOMP_INLINE, 0x5C06},
 	{0x2F874, 0, 1 | DECOMP_INLINE, 0x5F53},
@@ -6201,9 +6223,9 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F878, 0, 1 | DECOMP_INLINE, 0x5C6E},
 	{0x2F879, 0, 1 | DECOMP_INLINE, 0x5CC0},
 	{0x2F87A, 0, 1 | DECOMP_INLINE, 0x5C8D},
-	{0x2F87B, 0, 1, 4997},
+	{0x2F87B, 0, 1, 4999},
 	{0x2F87C, 0, 1 | DECOMP_INLINE, 0x5D43},
-	{0x2F87D, 0, 1, 4998},
+	{0x2F87D, 0, 1, 5000},
 	{0x2F87E, 0, 1 | DECOMP_INLINE, 0x5D6E},
 	{0x2F87F, 0, 1 | DECOMP_INLINE, 0x5D6B},
 	{0x2F880, 0, 1 | DECOMP_INLINE, 0x5D7C},
@@ -6215,22 +6237,22 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F886, 0, 1 | DECOMP_INLINE, 0x5E3D},
 	{0x2F887, 0, 1 | DECOMP_INLINE, 0x5E69},
 	{0x2F888, 0, 1 | DECOMP_INLINE, 0x3862},
-	{0x2F889, 0, 1, 4999},
+	{0x2F889, 0, 1, 5001},
 	{0x2F88A, 0, 1 | DECOMP_INLINE, 0x387C},
 	{0x2F88B, 0, 1 | DECOMP_INLINE, 0x5EB0},
 	{0x2F88C, 0, 1 | DECOMP_INLINE, 0x5EB3},
 	{0x2F88D, 0, 1 | DECOMP_INLINE, 0x5EB6},
 	{0x2F88E, 0, 1 | DECOMP_INLINE, 0x5ECA},
-	{0x2F88F, 0, 1, 5000},
+	{0x2F88F, 0, 1, 5002},
 	{0x2F890, 0, 1 | DECOMP_INLINE, 0x5EFE},
-	{0x2F891, 0, 1, 5001},
-	{0x2F892, 0, 1, 5002},
+	{0x2F891, 0, 1, 5003},
+	{0x2F892, 0, 1, 5004},
 	{0x2F893, 0, 1 | DECOMP_INLINE, 0x8201},
 	{0x2F894, 0, 1 | DECOMP_INLINE, 0x5F22},
 	{0x2F895, 0, 1 | DECOMP_INLINE, 0x5F22},
 	{0x2F896, 0, 1 | DECOMP_INLINE, 0x38C7},
-	{0x2F897, 0, 1, 5003},
-	{0x2F898, 0, 1, 5004},
+	{0x2F897, 0, 1, 5005},
+	{0x2F898, 0, 1, 5006},
 	{0x2F899, 0, 1 | DECOMP_INLINE, 0x5F62},
 	{0x2F89A, 0, 1 | DECOMP_INLINE, 0x5F6B},
 	{0x2F89B, 0, 1 | DECOMP_INLINE, 0x38E3},
@@ -6242,7 +6264,7 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F8A1, 0, 1 | DECOMP_INLINE, 0x393A},
 	{0x2F8A2, 0, 1 | DECOMP_INLINE, 0x391C},
 	{0x2F8A3, 0, 1 | DECOMP_INLINE, 0x6094},
-	{0x2F8A4, 0, 1, 5005},
+	{0x2F8A4, 0, 1, 5007},
 	{0x2F8A5, 0, 1 | DECOMP_INLINE, 0x60C7},
 	{0x2F8A6, 0, 1 | DECOMP_INLINE, 0x6148},
 	{0x2F8A7, 0, 1 | DECOMP_INLINE, 0x614C},
@@ -6262,13 +6284,13 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F8B5, 0, 1 | DECOMP_INLINE, 0x62B1},
 	{0x2F8B6, 0, 1 | DECOMP_INLINE, 0x62D4},
 	{0x2F8B7, 0, 1 | DECOMP_INLINE, 0x6350},
-	{0x2F8B8, 0, 1, 5006},
+	{0x2F8B8, 0, 1, 5008},
 	{0x2F8B9, 0, 1 | DECOMP_INLINE, 0x633D},
 	{0x2F8BA, 0, 1 | DECOMP_INLINE, 0x62FC},
 	{0x2F8BB, 0, 1 | DECOMP_INLINE, 0x6368},
 	{0x2F8BC, 0, 1 | DECOMP_INLINE, 0x6383},
 	{0x2F8BD, 0, 1 | DECOMP_INLINE, 0x63E4},
-	{0x2F8BE, 0, 1, 5007},
+	{0x2F8BE, 0, 1, 5009},
 	{0x2F8BF, 0, 1 | DECOMP_INLINE, 0x6422},
 	{0x2F8C0, 0, 1 | DECOMP_INLINE, 0x63C5},
 	{0x2F8C1, 0, 1 | DECOMP_INLINE, 0x63A9},
@@ -6280,7 +6302,7 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F8C7, 0, 1 | DECOMP_INLINE, 0x3A6C},
 	{0x2F8C8, 0, 1 | DECOMP_INLINE, 0x654F},
 	{0x2F8C9, 0, 1 | DECOMP_INLINE, 0x656C},
-	{0x2F8CA, 0, 1, 5008},
+	{0x2F8CA, 0, 1, 5010},
 	{0x2F8CB, 0, 1 | DECOMP_INLINE, 0x65E3},
 	{0x2F8CC, 0, 1 | DECOMP_INLINE, 0x66F8},
 	{0x2F8CD, 0, 1 | DECOMP_INLINE, 0x6649},
@@ -6299,13 +6321,13 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F8DA, 0, 1 | DECOMP_INLINE, 0x6721},
 	{0x2F8DB, 0, 1 | DECOMP_INLINE, 0x675E},
 	{0x2F8DC, 0, 1 | DECOMP_INLINE, 0x6753},
-	{0x2F8DD, 0, 1, 5009},
+	{0x2F8DD, 0, 1, 5011},
 	{0x2F8DE, 0, 1 | DECOMP_INLINE, 0x3B49},
 	{0x2F8DF, 0, 1 | DECOMP_INLINE, 0x67FA},
 	{0x2F8E0, 0, 1 | DECOMP_INLINE, 0x6785},
 	{0x2F8E1, 0, 1 | DECOMP_INLINE, 0x6852},
 	{0x2F8E2, 0, 1 | DECOMP_INLINE, 0x6885},
-	{0x2F8E3, 0, 1, 5010},
+	{0x2F8E3, 0, 1, 5012},
 	{0x2F8E4, 0, 1 | DECOMP_INLINE, 0x688E},
 	{0x2F8E5, 0, 1 | DECOMP_INLINE, 0x681F},
 	{0x2F8E6, 0, 1 | DECOMP_INLINE, 0x6914},
@@ -6314,22 +6336,22 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F8E9, 0, 1 | DECOMP_INLINE, 0x69A3},
 	{0x2F8EA, 0, 1 | DECOMP_INLINE, 0x69EA},
 	{0x2F8EB, 0, 1 | DECOMP_INLINE, 0x6AA8},
-	{0x2F8EC, 0, 1, 5011},
+	{0x2F8EC, 0, 1, 5013},
 	{0x2F8ED, 0, 1 | DECOMP_INLINE, 0x6ADB},
 	{0x2F8EE, 0, 1 | DECOMP_INLINE, 0x3C18},
 	{0x2F8EF, 0, 1 | DECOMP_INLINE, 0x6B21},
-	{0x2F8F0, 0, 1, 5012},
+	{0x2F8F0, 0, 1, 5014},
 	{0x2F8F1, 0, 1 | DECOMP_INLINE, 0x6B54},
 	{0x2F8F2, 0, 1 | DECOMP_INLINE, 0x3C4E},
 	{0x2F8F3, 0, 1 | DECOMP_INLINE, 0x6B72},
 	{0x2F8F4, 0, 1 | DECOMP_INLINE, 0x6B9F},
 	{0x2F8F5, 0, 1 | DECOMP_INLINE, 0x6BBA},
 	{0x2F8F6, 0, 1 | DECOMP_INLINE, 0x6BBB},
-	{0x2F8F7, 0, 1, 5013},
-	{0x2F8F8, 0, 1, 5014},
-	{0x2F8F9, 0, 1, 5015},
+	{0x2F8F7, 0, 1, 5015},
+	{0x2F8F8, 0, 1, 5016},
+	{0x2F8F9, 0, 1, 5017},
 	{0x2F8FA, 0, 1 | DECOMP_INLINE, 0x6C4E},
-	{0x2F8FB, 0, 1, 5016},
+	{0x2F8FB, 0, 1, 5018},
 	{0x2F8FC, 0, 1 | DECOMP_INLINE, 0x6CBF},
 	{0x2F8FD, 0, 1 | DECOMP_INLINE, 0x6CCD},
 	{0x2F8FE, 0, 1 | DECOMP_INLINE, 0x6C67},
@@ -6340,18 +6362,18 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F903, 0, 1 | DECOMP_INLINE, 0x6D69},
 	{0x2F904, 0, 1 | DECOMP_INLINE, 0x6D78},
 	{0x2F905, 0, 1 | DECOMP_INLINE, 0x6D85},
-	{0x2F906, 0, 1, 5017},
+	{0x2F906, 0, 1, 5019},
 	{0x2F907, 0, 1 | DECOMP_INLINE, 0x6D34},
 	{0x2F908, 0, 1 | DECOMP_INLINE, 0x6E2F},
 	{0x2F909, 0, 1 | DECOMP_INLINE, 0x6E6E},
 	{0x2F90A, 0, 1 | DECOMP_INLINE, 0x3D33},
 	{0x2F90B, 0, 1 | DECOMP_INLINE, 0x6ECB},
 	{0x2F90C, 0, 1 | DECOMP_INLINE, 0x6EC7},
-	{0x2F90D, 0, 1, 5018},
+	{0x2F90D, 0, 1, 5020},
 	{0x2F90E, 0, 1 | DECOMP_INLINE, 0x6DF9},
 	{0x2F90F, 0, 1 | DECOMP_INLINE, 0x6F6E},
-	{0x2F910, 0, 1, 5019},
-	{0x2F911, 0, 1, 5020},
+	{0x2F910, 0, 1, 5021},
+	{0x2F911, 0, 1, 5022},
 	{0x2F912, 0, 1 | DECOMP_INLINE, 0x6FC6},
 	{0x2F913, 0, 1 | DECOMP_INLINE, 0x7039},
 	{0x2F914, 0, 1 | DECOMP_INLINE, 0x701E},
@@ -6361,19 +6383,19 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F918, 0, 1 | DECOMP_INLINE, 0x707D},
 	{0x2F919, 0, 1 | DECOMP_INLINE, 0x7077},
 	{0x2F91A, 0, 1 | DECOMP_INLINE, 0x70AD},
-	{0x2F91B, 0, 1, 5021},
+	{0x2F91B, 0, 1, 5023},
 	{0x2F91C, 0, 1 | DECOMP_INLINE, 0x7145},
-	{0x2F91D, 0, 1, 5022},
+	{0x2F91D, 0, 1, 5024},
 	{0x2F91E, 0, 1 | DECOMP_INLINE, 0x719C},
-	{0x2F91F, 0, 1, 5023},
+	{0x2F91F, 0, 1, 5025},
 	{0x2F920, 0, 1 | DECOMP_INLINE, 0x7228},
 	{0x2F921, 0, 1 | DECOMP_INLINE, 0x7235},
 	{0x2F922, 0, 1 | DECOMP_INLINE, 0x7250},
-	{0x2F923, 0, 1, 5024},
+	{0x2F923, 0, 1, 5026},
 	{0x2F924, 0, 1 | DECOMP_INLINE, 0x7280},
 	{0x2F925, 0, 1 | DECOMP_INLINE, 0x7295},
-	{0x2F926, 0, 1, 5025},
-	{0x2F927, 0, 1, 5026},
+	{0x2F926, 0, 1, 5027},
+	{0x2F927, 0, 1, 5028},
 	{0x2F928, 0, 1 | DECOMP_INLINE, 0x737A},
 	{0x2F929, 0, 1 | DECOMP_INLINE, 0x738B},
 	{0x2F92A, 0, 1 | DECOMP_INLINE, 0x3EAC},
@@ -6387,22 +6409,22 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F932, 0, 1 | DECOMP_INLINE, 0x74CA},
 	{0x2F933, 0, 1 | DECOMP_INLINE, 0x3F1B},
 	{0x2F934, 0, 1 | DECOMP_INLINE, 0x7524},
-	{0x2F935, 0, 1, 5027},
+	{0x2F935, 0, 1, 5029},
 	{0x2F936, 0, 1 | DECOMP_INLINE, 0x753E},
-	{0x2F937, 0, 1, 5028},
+	{0x2F937, 0, 1, 5030},
 	{0x2F938, 0, 1 | DECOMP_INLINE, 0x7570},
-	{0x2F939, 0, 1, 5029},
+	{0x2F939, 0, 1, 5031},
 	{0x2F93A, 0, 1 | DECOMP_INLINE, 0x7610},
-	{0x2F93B, 0, 1, 5030},
-	{0x2F93C, 0, 1, 5031},
-	{0x2F93D, 0, 1, 5032},
+	{0x2F93B, 0, 1, 5032},
+	{0x2F93C, 0, 1, 5033},
+	{0x2F93D, 0, 1, 5034},
 	{0x2F93E, 0, 1 | DECOMP_INLINE, 0x3FFC},
 	{0x2F93F, 0, 1 | DECOMP_INLINE, 0x4008},
 	{0x2F940, 0, 1 | DECOMP_INLINE, 0x76F4},
-	{0x2F941, 0, 1, 5033},
-	{0x2F942, 0, 1, 5034},
-	{0x2F943, 0, 1, 5035},
-	{0x2F944, 0, 1, 5036},
+	{0x2F941, 0, 1, 5035},
+	{0x2F942, 0, 1, 5036},
+	{0x2F943, 0, 1, 5037},
+	{0x2F944, 0, 1, 5038},
 	{0x2F945, 0, 1 | DECOMP_INLINE, 0x771E},
 	{0x2F946, 0, 1 | DECOMP_INLINE, 0x771F},
 	{0x2F947, 0, 1 | DECOMP_INLINE, 0x771F},
@@ -6411,68 +6433,68 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F94A, 0, 1 | DECOMP_INLINE, 0x778B},
 	{0x2F94B, 0, 1 | DECOMP_INLINE, 0x4046},
 	{0x2F94C, 0, 1 | DECOMP_INLINE, 0x4096},
-	{0x2F94D, 0, 1, 5037},
+	{0x2F94D, 0, 1, 5039},
 	{0x2F94E, 0, 1 | DECOMP_INLINE, 0x784E},
 	{0x2F94F, 0, 1 | DECOMP_INLINE, 0x788C},
 	{0x2F950, 0, 1 | DECOMP_INLINE, 0x78CC},
 	{0x2F951, 0, 1 | DECOMP_INLINE, 0x40E3},
-	{0x2F952, 0, 1, 5038},
+	{0x2F952, 0, 1, 5040},
 	{0x2F953, 0, 1 | DECOMP_INLINE, 0x7956},
-	{0x2F954, 0, 1, 5039},
-	{0x2F955, 0, 1, 5040},
+	{0x2F954, 0, 1, 5041},
+	{0x2F955, 0, 1, 5042},
 	{0x2F956, 0, 1 | DECOMP_INLINE, 0x798F},
 	{0x2F957, 0, 1 | DECOMP_INLINE, 0x79EB},
 	{0x2F958, 0, 1 | DECOMP_INLINE, 0x412F},
 	{0x2F959, 0, 1 | DECOMP_INLINE, 0x7A40},
 	{0x2F95A, 0, 1 | DECOMP_INLINE, 0x7A4A},
 	{0x2F95B, 0, 1 | DECOMP_INLINE, 0x7A4F},
-	{0x2F95C, 0, 1, 5041},
-	{0x2F95D, 0, 1, 5042},
-	{0x2F95E, 0, 1, 5043},
+	{0x2F95C, 0, 1, 5043},
+	{0x2F95D, 0, 1, 5044},
+	{0x2F95E, 0, 1, 5045},
 	{0x2F95F, 0, 1 | DECOMP_INLINE, 0x7AEE},
 	{0x2F960, 0, 1 | DECOMP_INLINE, 0x4202},
-	{0x2F961, 0, 1, 5044},
+	{0x2F961, 0, 1, 5046},
 	{0x2F962, 0, 1 | DECOMP_INLINE, 0x7BC6},
 	{0x2F963, 0, 1 | DECOMP_INLINE, 0x7BC9},
 	{0x2F964, 0, 1 | DECOMP_INLINE, 0x4227},
-	{0x2F965, 0, 1, 5045},
+	{0x2F965, 0, 1, 5047},
 	{0x2F966, 0, 1 | DECOMP_INLINE, 0x7CD2},
 	{0x2F967, 0, 1 | DECOMP_INLINE, 0x42A0},
 	{0x2F968, 0, 1 | DECOMP_INLINE, 0x7CE8},
 	{0x2F969, 0, 1 | DECOMP_INLINE, 0x7CE3},
 	{0x2F96A, 0, 1 | DECOMP_INLINE, 0x7D00},
-	{0x2F96B, 0, 1, 5046},
+	{0x2F96B, 0, 1, 5048},
 	{0x2F96C, 0, 1 | DECOMP_INLINE, 0x7D63},
 	{0x2F96D, 0, 1 | DECOMP_INLINE, 0x4301},
 	{0x2F96E, 0, 1 | DECOMP_INLINE, 0x7DC7},
 	{0x2F96F, 0, 1 | DECOMP_INLINE, 0x7E02},
 	{0x2F970, 0, 1 | DECOMP_INLINE, 0x7E45},
 	{0x2F971, 0, 1 | DECOMP_INLINE, 0x4334},
-	{0x2F972, 0, 1, 5047},
-	{0x2F973, 0, 1, 5048},
+	{0x2F972, 0, 1, 5049},
+	{0x2F973, 0, 1, 5050},
 	{0x2F974, 0, 1 | DECOMP_INLINE, 0x4359},
-	{0x2F975, 0, 1, 5049},
+	{0x2F975, 0, 1, 5051},
 	{0x2F976, 0, 1 | DECOMP_INLINE, 0x7F7A},
-	{0x2F977, 0, 1, 5050},
+	{0x2F977, 0, 1, 5052},
 	{0x2F978, 0, 1 | DECOMP_INLINE, 0x7F95},
 	{0x2F979, 0, 1 | DECOMP_INLINE, 0x7FFA},
 	{0x2F97A, 0, 1 | DECOMP_INLINE, 0x8005},
-	{0x2F97B, 0, 1, 5051},
-	{0x2F97C, 0, 1, 5052},
+	{0x2F97B, 0, 1, 5053},
+	{0x2F97C, 0, 1, 5054},
 	{0x2F97D, 0, 1 | DECOMP_INLINE, 0x8060},
-	{0x2F97E, 0, 1, 5053},
+	{0x2F97E, 0, 1, 5055},
 	{0x2F97F, 0, 1 | DECOMP_INLINE, 0x8070},
-	{0x2F980, 0, 1, 5054},
+	{0x2F980, 0, 1, 5056},
 	{0x2F981, 0, 1 | DECOMP_INLINE, 0x43D5},
 	{0x2F982, 0, 1 | DECOMP_INLINE, 0x80B2},
 	{0x2F983, 0, 1 | DECOMP_INLINE, 0x8103},
 	{0x2F984, 0, 1 | DECOMP_INLINE, 0x440B},
 	{0x2F985, 0, 1 | DECOMP_INLINE, 0x813E},
 	{0x2F986, 0, 1 | DECOMP_INLINE, 0x5AB5},
-	{0x2F987, 0, 1, 5055},
-	{0x2F988, 0, 1, 5056},
-	{0x2F989, 0, 1, 5057},
-	{0x2F98A, 0, 1, 5058},
+	{0x2F987, 0, 1, 5057},
+	{0x2F988, 0, 1, 5058},
+	{0x2F989, 0, 1, 5059},
+	{0x2F98A, 0, 1, 5060},
 	{0x2F98B, 0, 1 | DECOMP_INLINE, 0x8201},
 	{0x2F98C, 0, 1 | DECOMP_INLINE, 0x8204},
 	{0x2F98D, 0, 1 | DECOMP_INLINE, 0x8F9E},
@@ -6485,7 +6507,7 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F994, 0, 1 | DECOMP_INLINE, 0x82B3},
 	{0x2F995, 0, 1 | DECOMP_INLINE, 0x82BD},
 	{0x2F996, 0, 1 | DECOMP_INLINE, 0x82E6},
-	{0x2F997, 0, 1, 5059},
+	{0x2F997, 0, 1, 5061},
 	{0x2F998, 0, 1 | DECOMP_INLINE, 0x82E5},
 	{0x2F999, 0, 1 | DECOMP_INLINE, 0x831D},
 	{0x2F99A, 0, 1 | DECOMP_INLINE, 0x8363},
@@ -6498,20 +6520,20 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F9A1, 0, 1 | DECOMP_INLINE, 0x83CA},
 	{0x2F9A2, 0, 1 | DECOMP_INLINE, 0x83CC},
 	{0x2F9A3, 0, 1 | DECOMP_INLINE, 0x83DC},
-	{0x2F9A4, 0, 1, 5060},
-	{0x2F9A5, 0, 1, 5061},
-	{0x2F9A6, 0, 1, 5062},
+	{0x2F9A4, 0, 1, 5062},
+	{0x2F9A5, 0, 1, 5063},
+	{0x2F9A6, 0, 1, 5064},
 	{0x2F9A7, 0, 1 | DECOMP_INLINE, 0x452B},
 	{0x2F9A8, 0, 1 | DECOMP_INLINE, 0x84F1},
 	{0x2F9A9, 0, 1 | DECOMP_INLINE, 0x84F3},
 	{0x2F9AA, 0, 1 | DECOMP_INLINE, 0x8516},
-	{0x2F9AB, 0, 1, 5063},
+	{0x2F9AB, 0, 1, 5065},
 	{0x2F9AC, 0, 1 | DECOMP_INLINE, 0x8564},
-	{0x2F9AD, 0, 1, 5064},
+	{0x2F9AD, 0, 1, 5066},
 	{0x2F9AE, 0, 1 | DECOMP_INLINE, 0x455D},
 	{0x2F9AF, 0, 1 | DECOMP_INLINE, 0x4561},
-	{0x2F9B0, 0, 1, 5065},
-	{0x2F9B1, 0, 1, 5066},
+	{0x2F9B0, 0, 1, 5067},
+	{0x2F9B1, 0, 1, 5068},
 	{0x2F9B2, 0, 1 | DECOMP_INLINE, 0x456B},
 	{0x2F9B3, 0, 1 | DECOMP_INLINE, 0x8650},
 	{0x2F9B4, 0, 1 | DECOMP_INLINE, 0x865C},
@@ -6531,39 +6553,39 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F9C2, 0, 1 | DECOMP_INLINE, 0x45F9},
 	{0x2F9C3, 0, 1 | DECOMP_INLINE, 0x8860},
 	{0x2F9C4, 0, 1 | DECOMP_INLINE, 0x8863},
-	{0x2F9C5, 0, 1, 5067},
+	{0x2F9C5, 0, 1, 5069},
 	{0x2F9C6, 0, 1 | DECOMP_INLINE, 0x88D7},
 	{0x2F9C7, 0, 1 | DECOMP_INLINE, 0x88DE},
 	{0x2F9C8, 0, 1 | DECOMP_INLINE, 0x4635},
 	{0x2F9C9, 0, 1 | DECOMP_INLINE, 0x88FA},
 	{0x2F9CA, 0, 1 | DECOMP_INLINE, 0x34BB},
-	{0x2F9CB, 0, 1, 5068},
-	{0x2F9CC, 0, 1, 5069},
+	{0x2F9CB, 0, 1, 5070},
+	{0x2F9CC, 0, 1, 5071},
 	{0x2F9CD, 0, 1 | DECOMP_INLINE, 0x46BE},
 	{0x2F9CE, 0, 1 | DECOMP_INLINE, 0x46C7},
 	{0x2F9CF, 0, 1 | DECOMP_INLINE, 0x8AA0},
 	{0x2F9D0, 0, 1 | DECOMP_INLINE, 0x8AED},
 	{0x2F9D1, 0, 1 | DECOMP_INLINE, 0x8B8A},
 	{0x2F9D2, 0, 1 | DECOMP_INLINE, 0x8C55},
-	{0x2F9D3, 0, 1, 5070},
+	{0x2F9D3, 0, 1, 5072},
 	{0x2F9D4, 0, 1 | DECOMP_INLINE, 0x8CAB},
 	{0x2F9D5, 0, 1 | DECOMP_INLINE, 0x8CC1},
 	{0x2F9D6, 0, 1 | DECOMP_INLINE, 0x8D1B},
 	{0x2F9D7, 0, 1 | DECOMP_INLINE, 0x8D77},
-	{0x2F9D8, 0, 1, 5071},
-	{0x2F9D9, 0, 1, 5072},
+	{0x2F9D8, 0, 1, 5073},
+	{0x2F9D9, 0, 1, 5074},
 	{0x2F9DA, 0, 1 | DECOMP_INLINE, 0x8DCB},
 	{0x2F9DB, 0, 1 | DECOMP_INLINE, 0x8DBC},
 	{0x2F9DC, 0, 1 | DECOMP_INLINE, 0x8DF0},
-	{0x2F9DD, 0, 1, 5073},
+	{0x2F9DD, 0, 1, 5075},
 	{0x2F9DE, 0, 1 | DECOMP_INLINE, 0x8ED4},
 	{0x2F9DF, 0, 1 | DECOMP_INLINE, 0x8F38},
-	{0x2F9E0, 0, 1, 5074},
-	{0x2F9E1, 0, 1, 5075},
+	{0x2F9E0, 0, 1, 5076},
+	{0x2F9E1, 0, 1, 5077},
 	{0x2F9E2, 0, 1 | DECOMP_INLINE, 0x9094},
 	{0x2F9E3, 0, 1 | DECOMP_INLINE, 0x90F1},
 	{0x2F9E4, 0, 1 | DECOMP_INLINE, 0x9111},
-	{0x2F9E5, 0, 1, 5076},
+	{0x2F9E5, 0, 1, 5078},
 	{0x2F9E6, 0, 1 | DECOMP_INLINE, 0x911B},
 	{0x2F9E7, 0, 1 | DECOMP_INLINE, 0x9238},
 	{0x2F9E8, 0, 1 | DECOMP_INLINE, 0x92D7},
@@ -6571,27 +6593,27 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2F9EA, 0, 1 | DECOMP_INLINE, 0x927C},
 	{0x2F9EB, 0, 1 | DECOMP_INLINE, 0x93F9},
 	{0x2F9EC, 0, 1 | DECOMP_INLINE, 0x9415},
-	{0x2F9ED, 0, 1, 5077},
+	{0x2F9ED, 0, 1, 5079},
 	{0x2F9EE, 0, 1 | DECOMP_INLINE, 0x958B},
 	{0x2F9EF, 0, 1 | DECOMP_INLINE, 0x4995},
 	{0x2F9F0, 0, 1 | DECOMP_INLINE, 0x95B7},
-	{0x2F9F1, 0, 1, 5078},
+	{0x2F9F1, 0, 1, 5080},
 	{0x2F9F2, 0, 1 | DECOMP_INLINE, 0x49E6},
 	{0x2F9F3, 0, 1 | DECOMP_INLINE, 0x96C3},
 	{0x2F9F4, 0, 1 | DECOMP_INLINE, 0x5DB2},
 	{0x2F9F5, 0, 1 | DECOMP_INLINE, 0x9723},
-	{0x2F9F6, 0, 1, 5079},
-	{0x2F9F7, 0, 1, 5080},
+	{0x2F9F6, 0, 1, 5081},
+	{0x2F9F7, 0, 1, 5082},
 	{0x2F9F8, 0, 1 | DECOMP_INLINE, 0x4A6E},
 	{0x2F9F9, 0, 1 | DECOMP_INLINE, 0x4A76},
 	{0x2F9FA, 0, 1 | DECOMP_INLINE, 0x97E0},
-	{0x2F9FB, 0, 1, 5081},
+	{0x2F9FB, 0, 1, 5083},
 	{0x2F9FC, 0, 1 | DECOMP_INLINE, 0x4AB2},
-	{0x2F9FD, 0, 1, 5082},
+	{0x2F9FD, 0, 1, 5084},
 	{0x2F9FE, 0, 1 | DECOMP_INLINE, 0x980B},
 	{0x2F9FF, 0, 1 | DECOMP_INLINE, 0x980B},
 	{0x2FA00, 0, 1 | DECOMP_INLINE, 0x9829},
-	{0x2FA01, 0, 1, 5083},
+	{0x2FA01, 0, 1, 5085},
 	{0x2FA02, 0, 1 | DECOMP_INLINE, 0x98E2},
 	{0x2FA03, 0, 1 | DECOMP_INLINE, 0x4B33},
 	{0x2FA04, 0, 1 | DECOMP_INLINE, 0x9929},
@@ -6599,18 +6621,18 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2FA06, 0, 1 | DECOMP_INLINE, 0x99C2},
 	{0x2FA07, 0, 1 | DECOMP_INLINE, 0x99FE},
 	{0x2FA08, 0, 1 | DECOMP_INLINE, 0x4BCE},
-	{0x2FA09, 0, 1, 5084},
+	{0x2FA09, 0, 1, 5086},
 	{0x2FA0A, 0, 1 | DECOMP_INLINE, 0x9B12},
 	{0x2FA0B, 0, 1 | DECOMP_INLINE, 0x9C40},
 	{0x2FA0C, 0, 1 | DECOMP_INLINE, 0x9CFD},
 	{0x2FA0D, 0, 1 | DECOMP_INLINE, 0x4CCE},
 	{0x2FA0E, 0, 1 | DECOMP_INLINE, 0x4CED},
 	{0x2FA0F, 0, 1 | DECOMP_INLINE, 0x9D67},
-	{0x2FA10, 0, 1, 5085},
+	{0x2FA10, 0, 1, 5087},
 	{0x2FA11, 0, 1 | DECOMP_INLINE, 0x4CF8},
-	{0x2FA12, 0, 1, 5086},
-	{0x2FA13, 0, 1, 5087},
-	{0x2FA14, 0, 1, 5088},
+	{0x2FA12, 0, 1, 5088},
+	{0x2FA13, 0, 1, 5089},
+	{0x2FA14, 0, 1, 5090},
 	{0x2FA15, 0, 1 | DECOMP_INLINE, 0x9EBB},
 	{0x2FA16, 0, 1 | DECOMP_INLINE, 0x4D56},
 	{0x2FA17, 0, 1 | DECOMP_INLINE, 0x9EF9},
@@ -6619,12 +6641,12 @@ static const pg_unicode_decomposition UnicodeDecompMain[6582] =
 	{0x2FA1A, 0, 1 | DECOMP_INLINE, 0x9F0F},
 	{0x2FA1B, 0, 1 | DECOMP_INLINE, 0x9F16},
 	{0x2FA1C, 0, 1 | DECOMP_INLINE, 0x9F3B},
-	{0x2FA1D, 0, 1, 5089}
+	{0x2FA1D, 0, 1, 5091}
 
 };
 
 /* codepoints array  */
-static const uint32 UnicodeDecomp_codepoints[5090] =
+static const uint32 UnicodeDecomp_codepoints[5092] =
 {
 	 /* 0 */ 0x0020, 0x0308,
 	 /* 2 */ 0x0020, 0x0304,
@@ -8732,183 +8754,184 @@ static const uint32 UnicodeDecomp_codepoints[5090] =
 	 /* 4794 */ 0x114B9, 0x114BD,
 	 /* 4796 */ 0x115B8, 0x115AF,
 	 /* 4798 */ 0x115B9, 0x115AF,
-	 /* 4800 */ 0x1D157, 0x1D165,
-	 /* 4802 */ 0x1D158, 0x1D165,
-	 /* 4804 */ 0x1D15F, 0x1D16E,
-	 /* 4806 */ 0x1D15F, 0x1D16F,
-	 /* 4808 */ 0x1D15F, 0x1D170,
-	 /* 4810 */ 0x1D15F, 0x1D171,
-	 /* 4812 */ 0x1D15F, 0x1D172,
-	 /* 4814 */ 0x1D1B9, 0x1D165,
-	 /* 4816 */ 0x1D1BA, 0x1D165,
-	 /* 4818 */ 0x1D1BB, 0x1D16E,
-	 /* 4820 */ 0x1D1BC, 0x1D16E,
-	 /* 4822 */ 0x1D1BB, 0x1D16F,
-	 /* 4824 */ 0x1D1BC, 0x1D16F,
-	 /* 4826 */ 0x0030, 0x002E,
-	 /* 4828 */ 0x0030, 0x002C,
-	 /* 4830 */ 0x0031, 0x002C,
-	 /* 4832 */ 0x0032, 0x002C,
-	 /* 4834 */ 0x0033, 0x002C,
-	 /* 4836 */ 0x0034, 0x002C,
-	 /* 4838 */ 0x0035, 0x002C,
-	 /* 4840 */ 0x0036, 0x002C,
-	 /* 4842 */ 0x0037, 0x002C,
-	 /* 4844 */ 0x0038, 0x002C,
-	 /* 4846 */ 0x0039, 0x002C,
-	 /* 4848 */ 0x0028, 0x0041, 0x0029,
-	 /* 4851 */ 0x0028, 0x0042, 0x0029,
-	 /* 4854 */ 0x0028, 0x0043, 0x0029,
-	 /* 4857 */ 0x0028, 0x0044, 0x0029,
-	 /* 4860 */ 0x0028, 0x0045, 0x0029,
-	 /* 4863 */ 0x0028, 0x0046, 0x0029,
-	 /* 4866 */ 0x0028, 0x0047, 0x0029,
-	 /* 4869 */ 0x0028, 0x0048, 0x0029,
-	 /* 4872 */ 0x0028, 0x0049, 0x0029,
-	 /* 4875 */ 0x0028, 0x004A, 0x0029,
-	 /* 4878 */ 0x0028, 0x004B, 0x0029,
-	 /* 4881 */ 0x0028, 0x004C, 0x0029,
-	 /* 4884 */ 0x0028, 0x004D, 0x0029,
-	 /* 4887 */ 0x0028, 0x004E, 0x0029,
-	 /* 4890 */ 0x0028, 0x004F, 0x0029,
-	 /* 4893 */ 0x0028, 0x0050, 0x0029,
-	 /* 4896 */ 0x0028, 0x0051, 0x0029,
-	 /* 4899 */ 0x0028, 0x0052, 0x0029,
-	 /* 4902 */ 0x0028, 0x0053, 0x0029,
-	 /* 4905 */ 0x0028, 0x0054, 0x0029,
-	 /* 4908 */ 0x0028, 0x0055, 0x0029,
-	 /* 4911 */ 0x0028, 0x0056, 0x0029,
-	 /* 4914 */ 0x0028, 0x0057, 0x0029,
-	 /* 4917 */ 0x0028, 0x0058, 0x0029,
-	 /* 4920 */ 0x0028, 0x0059, 0x0029,
-	 /* 4923 */ 0x0028, 0x005A, 0x0029,
-	 /* 4926 */ 0x3014, 0x0053, 0x3015,
-	 /* 4929 */ 0x0043, 0x0044,
-	 /* 4931 */ 0x0057, 0x005A,
-	 /* 4933 */ 0x0048, 0x0056,
-	 /* 4935 */ 0x004D, 0x0056,
-	 /* 4937 */ 0x0053, 0x0044,
-	 /* 4939 */ 0x0053, 0x0053,
-	 /* 4941 */ 0x0050, 0x0050, 0x0056,
-	 /* 4944 */ 0x0057, 0x0043,
-	 /* 4946 */ 0x004D, 0x0043,
-	 /* 4948 */ 0x004D, 0x0044,
-	 /* 4950 */ 0x004D, 0x0052,
-	 /* 4952 */ 0x0044, 0x004A,
-	 /* 4954 */ 0x307B, 0x304B,
-	 /* 4956 */ 0x30B3, 0x30B3,
-	 /* 4958 */ 0x3014, 0x672C, 0x3015,
-	 /* 4961 */ 0x3014, 0x4E09, 0x3015,
-	 /* 4964 */ 0x3014, 0x4E8C, 0x3015,
-	 /* 4967 */ 0x3014, 0x5B89, 0x3015,
-	 /* 4970 */ 0x3014, 0x70B9, 0x3015,
-	 /* 4973 */ 0x3014, 0x6253, 0x3015,
-	 /* 4976 */ 0x3014, 0x76D7, 0x3015,
-	 /* 4979 */ 0x3014, 0x52DD, 0x3015,
-	 /* 4982 */ 0x3014, 0x6557, 0x3015,
-	 /* 4985 */ 0x20122,
-	 /* 4986 */ 0x2063A,
-	 /* 4987 */ 0x2051C,
-	 /* 4988 */ 0x2054B,
-	 /* 4989 */ 0x291DF,
-	 /* 4990 */ 0x20A2C,
-	 /* 4991 */ 0x20B63,
-	 /* 4992 */ 0x214E4,
-	 /* 4993 */ 0x216A8,
-	 /* 4994 */ 0x216EA,
-	 /* 4995 */ 0x219C8,
-	 /* 4996 */ 0x21B18,
-	 /* 4997 */ 0x21DE4,
-	 /* 4998 */ 0x21DE6,
-	 /* 4999 */ 0x22183,
-	 /* 5000 */ 0x2A392,
-	 /* 5001 */ 0x22331,
-	 /* 5002 */ 0x22331,
-	 /* 5003 */ 0x232B8,
-	 /* 5004 */ 0x261DA,
-	 /* 5005 */ 0x226D4,
-	 /* 5006 */ 0x22B0C,
-	 /* 5007 */ 0x22BF1,
-	 /* 5008 */ 0x2300A,
-	 /* 5009 */ 0x233C3,
-	 /* 5010 */ 0x2346D,
-	 /* 5011 */ 0x236A3,
-	 /* 5012 */ 0x238A7,
-	 /* 5013 */ 0x23A8D,
-	 /* 5014 */ 0x21D0B,
-	 /* 5015 */ 0x23AFA,
-	 /* 5016 */ 0x23CBC,
-	 /* 5017 */ 0x23D1E,
-	 /* 5018 */ 0x23ED1,
-	 /* 5019 */ 0x23F5E,
-	 /* 5020 */ 0x23F8E,
-	 /* 5021 */ 0x20525,
-	 /* 5022 */ 0x24263,
-	 /* 5023 */ 0x243AB,
-	 /* 5024 */ 0x24608,
-	 /* 5025 */ 0x24735,
-	 /* 5026 */ 0x24814,
-	 /* 5027 */ 0x24C36,
-	 /* 5028 */ 0x24C92,
-	 /* 5029 */ 0x2219F,
-	 /* 5030 */ 0x24FA1,
-	 /* 5031 */ 0x24FB8,
-	 /* 5032 */ 0x25044,
-	 /* 5033 */ 0x250F3,
-	 /* 5034 */ 0x250F2,
-	 /* 5035 */ 0x25119,
-	 /* 5036 */ 0x25133,
-	 /* 5037 */ 0x2541D,
-	 /* 5038 */ 0x25626,
-	 /* 5039 */ 0x2569A,
-	 /* 5040 */ 0x256C5,
-	 /* 5041 */ 0x2597C,
-	 /* 5042 */ 0x25AA7,
-	 /* 5043 */ 0x25AA7,
-	 /* 5044 */ 0x25BAB,
-	 /* 5045 */ 0x25C80,
-	 /* 5046 */ 0x25F86,
-	 /* 5047 */ 0x26228,
-	 /* 5048 */ 0x26247,
-	 /* 5049 */ 0x262D9,
-	 /* 5050 */ 0x2633E,
-	 /* 5051 */ 0x264DA,
-	 /* 5052 */ 0x26523,
-	 /* 5053 */ 0x265A8,
-	 /* 5054 */ 0x2335F,
-	 /* 5055 */ 0x267A7,
-	 /* 5056 */ 0x267B5,
-	 /* 5057 */ 0x23393,
-	 /* 5058 */ 0x2339C,
-	 /* 5059 */ 0x26B3C,
-	 /* 5060 */ 0x26C36,
-	 /* 5061 */ 0x26D6B,
-	 /* 5062 */ 0x26CD5,
-	 /* 5063 */ 0x273CA,
-	 /* 5064 */ 0x26F2C,
-	 /* 5065 */ 0x26FB1,
-	 /* 5066 */ 0x270D2,
-	 /* 5067 */ 0x27667,
-	 /* 5068 */ 0x278AE,
-	 /* 5069 */ 0x27966,
-	 /* 5070 */ 0x27CA8,
-	 /* 5071 */ 0x27F2F,
-	 /* 5072 */ 0x20804,
-	 /* 5073 */ 0x208DE,
-	 /* 5074 */ 0x285D2,
-	 /* 5075 */ 0x285ED,
-	 /* 5076 */ 0x2872E,
-	 /* 5077 */ 0x28BFA,
-	 /* 5078 */ 0x28D77,
-	 /* 5079 */ 0x29145,
-	 /* 5080 */ 0x2921A,
-	 /* 5081 */ 0x2940A,
-	 /* 5082 */ 0x29496,
-	 /* 5083 */ 0x295B6,
-	 /* 5084 */ 0x29B30,
-	 /* 5085 */ 0x2A0CE,
-	 /* 5086 */ 0x2A105,
-	 /* 5087 */ 0x2A20E,
-	 /* 5088 */ 0x2A291,
-	 /* 5089 */ 0x2A600
+	 /* 4800 */ 0x11935, 0x11930,
+	 /* 4802 */ 0x1D157, 0x1D165,
+	 /* 4804 */ 0x1D158, 0x1D165,
+	 /* 4806 */ 0x1D15F, 0x1D16E,
+	 /* 4808 */ 0x1D15F, 0x1D16F,
+	 /* 4810 */ 0x1D15F, 0x1D170,
+	 /* 4812 */ 0x1D15F, 0x1D171,
+	 /* 4814 */ 0x1D15F, 0x1D172,
+	 /* 4816 */ 0x1D1B9, 0x1D165,
+	 /* 4818 */ 0x1D1BA, 0x1D165,
+	 /* 4820 */ 0x1D1BB, 0x1D16E,
+	 /* 4822 */ 0x1D1BC, 0x1D16E,
+	 /* 4824 */ 0x1D1BB, 0x1D16F,
+	 /* 4826 */ 0x1D1BC, 0x1D16F,
+	 /* 4828 */ 0x0030, 0x002E,
+	 /* 4830 */ 0x0030, 0x002C,
+	 /* 4832 */ 0x0031, 0x002C,
+	 /* 4834 */ 0x0032, 0x002C,
+	 /* 4836 */ 0x0033, 0x002C,
+	 /* 4838 */ 0x0034, 0x002C,
+	 /* 4840 */ 0x0035, 0x002C,
+	 /* 4842 */ 0x0036, 0x002C,
+	 /* 4844 */ 0x0037, 0x002C,
+	 /* 4846 */ 0x0038, 0x002C,
+	 /* 4848 */ 0x0039, 0x002C,
+	 /* 4850 */ 0x0028, 0x0041, 0x0029,
+	 /* 4853 */ 0x0028, 0x0042, 0x0029,
+	 /* 4856 */ 0x0028, 0x0043, 0x0029,
+	 /* 4859 */ 0x0028, 0x0044, 0x0029,
+	 /* 4862 */ 0x0028, 0x0045, 0x0029,
+	 /* 4865 */ 0x0028, 0x0046, 0x0029,
+	 /* 4868 */ 0x0028, 0x0047, 0x0029,
+	 /* 4871 */ 0x0028, 0x0048, 0x0029,
+	 /* 4874 */ 0x0028, 0x0049, 0x0029,
+	 /* 4877 */ 0x0028, 0x004A, 0x0029,
+	 /* 4880 */ 0x0028, 0x004B, 0x0029,
+	 /* 4883 */ 0x0028, 0x004C, 0x0029,
+	 /* 4886 */ 0x0028, 0x004D, 0x0029,
+	 /* 4889 */ 0x0028, 0x004E, 0x0029,
+	 /* 4892 */ 0x0028, 0x004F, 0x0029,
+	 /* 4895 */ 0x0028, 0x0050, 0x0029,
+	 /* 4898 */ 0x0028, 0x0051, 0x0029,
+	 /* 4901 */ 0x0028, 0x0052, 0x0029,
+	 /* 4904 */ 0x0028, 0x0053, 0x0029,
+	 /* 4907 */ 0x0028, 0x0054, 0x0029,
+	 /* 4910 */ 0x0028, 0x0055, 0x0029,
+	 /* 4913 */ 0x0028, 0x0056, 0x0029,
+	 /* 4916 */ 0x0028, 0x0057, 0x0029,
+	 /* 4919 */ 0x0028, 0x0058, 0x0029,
+	 /* 4922 */ 0x0028, 0x0059, 0x0029,
+	 /* 4925 */ 0x0028, 0x005A, 0x0029,
+	 /* 4928 */ 0x3014, 0x0053, 0x3015,
+	 /* 4931 */ 0x0043, 0x0044,
+	 /* 4933 */ 0x0057, 0x005A,
+	 /* 4935 */ 0x0048, 0x0056,
+	 /* 4937 */ 0x004D, 0x0056,
+	 /* 4939 */ 0x0053, 0x0044,
+	 /* 4941 */ 0x0053, 0x0053,
+	 /* 4943 */ 0x0050, 0x0050, 0x0056,
+	 /* 4946 */ 0x0057, 0x0043,
+	 /* 4948 */ 0x004D, 0x0043,
+	 /* 4950 */ 0x004D, 0x0044,
+	 /* 4952 */ 0x004D, 0x0052,
+	 /* 4954 */ 0x0044, 0x004A,
+	 /* 4956 */ 0x307B, 0x304B,
+	 /* 4958 */ 0x30B3, 0x30B3,
+	 /* 4960 */ 0x3014, 0x672C, 0x3015,
+	 /* 4963 */ 0x3014, 0x4E09, 0x3015,
+	 /* 4966 */ 0x3014, 0x4E8C, 0x3015,
+	 /* 4969 */ 0x3014, 0x5B89, 0x3015,
+	 /* 4972 */ 0x3014, 0x70B9, 0x3015,
+	 /* 4975 */ 0x3014, 0x6253, 0x3015,
+	 /* 4978 */ 0x3014, 0x76D7, 0x3015,
+	 /* 4981 */ 0x3014, 0x52DD, 0x3015,
+	 /* 4984 */ 0x3014, 0x6557, 0x3015,
+	 /* 4987 */ 0x20122,
+	 /* 4988 */ 0x2063A,
+	 /* 4989 */ 0x2051C,
+	 /* 4990 */ 0x2054B,
+	 /* 4991 */ 0x291DF,
+	 /* 4992 */ 0x20A2C,
+	 /* 4993 */ 0x20B63,
+	 /* 4994 */ 0x214E4,
+	 /* 4995 */ 0x216A8,
+	 /* 4996 */ 0x216EA,
+	 /* 4997 */ 0x219C8,
+	 /* 4998 */ 0x21B18,
+	 /* 4999 */ 0x21DE4,
+	 /* 5000 */ 0x21DE6,
+	 /* 5001 */ 0x22183,
+	 /* 5002 */ 0x2A392,
+	 /* 5003 */ 0x22331,
+	 /* 5004 */ 0x22331,
+	 /* 5005 */ 0x232B8,
+	 /* 5006 */ 0x261DA,
+	 /* 5007 */ 0x226D4,
+	 /* 5008 */ 0x22B0C,
+	 /* 5009 */ 0x22BF1,
+	 /* 5010 */ 0x2300A,
+	 /* 5011 */ 0x233C3,
+	 /* 5012 */ 0x2346D,
+	 /* 5013 */ 0x236A3,
+	 /* 5014 */ 0x238A7,
+	 /* 5015 */ 0x23A8D,
+	 /* 5016 */ 0x21D0B,
+	 /* 5017 */ 0x23AFA,
+	 /* 5018 */ 0x23CBC,
+	 /* 5019 */ 0x23D1E,
+	 /* 5020 */ 0x23ED1,
+	 /* 5021 */ 0x23F5E,
+	 /* 5022 */ 0x23F8E,
+	 /* 5023 */ 0x20525,
+	 /* 5024 */ 0x24263,
+	 /* 5025 */ 0x243AB,
+	 /* 5026 */ 0x24608,
+	 /* 5027 */ 0x24735,
+	 /* 5028 */ 0x24814,
+	 /* 5029 */ 0x24C36,
+	 /* 5030 */ 0x24C92,
+	 /* 5031 */ 0x2219F,
+	 /* 5032 */ 0x24FA1,
+	 /* 5033 */ 0x24FB8,
+	 /* 5034 */ 0x25044,
+	 /* 5035 */ 0x250F3,
+	 /* 5036 */ 0x250F2,
+	 /* 5037 */ 0x25119,
+	 /* 5038 */ 0x25133,
+	 /* 5039 */ 0x2541D,
+	 /* 5040 */ 0x25626,
+	 /* 5041 */ 0x2569A,
+	 /* 5042 */ 0x256C5,
+	 /* 5043 */ 0x2597C,
+	 /* 5044 */ 0x25AA7,
+	 /* 5045 */ 0x25AA7,
+	 /* 5046 */ 0x25BAB,
+	 /* 5047 */ 0x25C80,
+	 /* 5048 */ 0x25F86,
+	 /* 5049 */ 0x26228,
+	 /* 5050 */ 0x26247,
+	 /* 5051 */ 0x262D9,
+	 /* 5052 */ 0x2633E,
+	 /* 5053 */ 0x264DA,
+	 /* 5054 */ 0x26523,
+	 /* 5055 */ 0x265A8,
+	 /* 5056 */ 0x2335F,
+	 /* 5057 */ 0x267A7,
+	 /* 5058 */ 0x267B5,
+	 /* 5059 */ 0x23393,
+	 /* 5060 */ 0x2339C,
+	 /* 5061 */ 0x26B3C,
+	 /* 5062 */ 0x26C36,
+	 /* 5063 */ 0x26D6B,
+	 /* 5064 */ 0x26CD5,
+	 /* 5065 */ 0x273CA,
+	 /* 5066 */ 0x26F2C,
+	 /* 5067 */ 0x26FB1,
+	 /* 5068 */ 0x270D2,
+	 /* 5069 */ 0x27667,
+	 /* 5070 */ 0x278AE,
+	 /* 5071 */ 0x27966,
+	 /* 5072 */ 0x27CA8,
+	 /* 5073 */ 0x27F2F,
+	 /* 5074 */ 0x20804,
+	 /* 5075 */ 0x208DE,
+	 /* 5076 */ 0x285D2,
+	 /* 5077 */ 0x285ED,
+	 /* 5078 */ 0x2872E,
+	 /* 5079 */ 0x28BFA,
+	 /* 5080 */ 0x28D77,
+	 /* 5081 */ 0x29145,
+	 /* 5082 */ 0x2921A,
+	 /* 5083 */ 0x2940A,
+	 /* 5084 */ 0x29496,
+	 /* 5085 */ 0x295B6,
+	 /* 5086 */ 0x29B30,
+	 /* 5087 */ 0x2A0CE,
+	 /* 5088 */ 0x2A105,
+	 /* 5089 */ 0x2A20E,
+	 /* 5090 */ 0x2A291,
+	 /* 5091 */ 0x2A600
 };
diff --git a/src/include/common/unicode_normprops_table.h b/src/include/common/unicode_normprops_table.h
index f0e450713fc..74cfaa35bf1 100644
--- a/src/include/common/unicode_normprops_table.h
+++ b/src/include/common/unicode_normprops_table.h
@@ -687,6 +687,7 @@ static const pg_unicode_normprops UnicodeNormProps_NFC_QC[] = {
 	{0x114BA, UNICODE_NORM_QC_MAYBE},
 	{0x114BD, UNICODE_NORM_QC_MAYBE},
 	{0x115AF, UNICODE_NORM_QC_MAYBE},
+	{0x11930, UNICODE_NORM_QC_MAYBE},
 	{0x1D15E, UNICODE_NORM_QC_NO},
 	{0x1D15F, UNICODE_NORM_QC_NO},
 	{0x1D160, UNICODE_NORM_QC_NO},
@@ -2776,6 +2777,7 @@ static const pg_unicode_normprops UnicodeNormProps_NFKC_QC[] = {
 	{0xAB5D, UNICODE_NORM_QC_NO},
 	{0xAB5E, UNICODE_NORM_QC_NO},
 	{0xAB5F, UNICODE_NORM_QC_NO},
+	{0xAB69, UNICODE_NORM_QC_NO},
 	{0xF900, UNICODE_NORM_QC_NO},
 	{0xF901, UNICODE_NORM_QC_NO},
 	{0xF902, UNICODE_NORM_QC_NO},
@@ -4323,6 +4325,7 @@ static const pg_unicode_normprops UnicodeNormProps_NFKC_QC[] = {
 	{0x114BA, UNICODE_NORM_QC_MAYBE},
 	{0x114BD, UNICODE_NORM_QC_MAYBE},
 	{0x115AF, UNICODE_NORM_QC_MAYBE},
+	{0x11930, UNICODE_NORM_QC_MAYBE},
 	{0x1D15E, UNICODE_NORM_QC_NO},
 	{0x1D15F, UNICODE_NORM_QC_NO},
 	{0x1D160, UNICODE_NORM_QC_NO},
@@ -5609,6 +5612,16 @@ static const pg_unicode_normprops UnicodeNormProps_NFKC_QC[] = {
 	{0x1F248, UNICODE_NORM_QC_NO},
 	{0x1F250, UNICODE_NORM_QC_NO},
 	{0x1F251, UNICODE_NORM_QC_NO},
+	{0x1FBF0, UNICODE_NORM_QC_NO},
+	{0x1FBF1, UNICODE_NORM_QC_NO},
+	{0x1FBF2, UNICODE_NORM_QC_NO},
+	{0x1FBF3, UNICODE_NORM_QC_NO},
+	{0x1FBF4, UNICODE_NORM_QC_NO},
+	{0x1FBF5, UNICODE_NORM_QC_NO},
+	{0x1FBF6, UNICODE_NORM_QC_NO},
+	{0x1FBF7, UNICODE_NORM_QC_NO},
+	{0x1FBF8, UNICODE_NORM_QC_NO},
+	{0x1FBF9, UNICODE_NORM_QC_NO},
 	{0x2F800, UNICODE_NORM_QC_NO},
 	{0x2F801, UNICODE_NORM_QC_NO},
 	{0x2F802, UNICODE_NORM_QC_NO},