From nobody Mon Oct 14 08:44:45 2024
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XRrQ74svNz5ZRjx;
	Mon, 14 Oct 2024 08:44:47 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4XRrQ71vDMz4gVR;
	Mon, 14 Oct 2024 08:44:47 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1728895487;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=IJdC9aEl5IbyhSKmAgsC7RKMVS+c7HcgGQHTbNUsNzE=;
	b=wTIZlYxy8P8eB9H6Y3Oj/f+p55l7GUFwNfqup6/MJlpzG5D7my8BpshIbHao2M1hGjgvMD
	98yIEr+YgL+EDTjWncCtE9/auktCALrE2J7FajeOqyNCQ0fC9ssYvOesyaSKrqXObNHJeG
	KuIxHRuSapxLHntAsmrsHqWdNlIuI/virgax7gkGhJ70O24AbyXAAa0IXqG7aSjENQy2bF
	fiUUHoSU5hfFumxjHbcGOScw4SccvDaRgm5rtQrEZkyxc3/mazbOFknNTYiVi7OHE1ydWa
	zQthN5A2uSzScVxoKD6O4M13GA2S1rjewbTxVqZ4c3mEjRQim57SWhcsypbGSA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1728895487;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=IJdC9aEl5IbyhSKmAgsC7RKMVS+c7HcgGQHTbNUsNzE=;
	b=YPQGF8JN3EFWS9Ob3RvNFFaAx74wo9ujHAvtsZ0OzzK774ijH/4Gi9ci7FpxSMJ3nqHcxE
	ATdGCYIx/rsql4fxSs5pzi9tRzgoMseAgU3ShfbxQ/c+W31DM3RRZNmpz9sHK2eNN362j2
	D74A5Dieu2jZP+i0QrPcc1PsfS7lXFbygNSZ27Vu63S0wzn5AqJfCBBdhIULHqxMTut3FO
	/H77AltVc3xVe5awMwpQRKjj0e9oERU1p6y8n9qVGH1l3wzLGcAS3okUnISSbZak1pDcvg
	afOORJrYeFnPEpr4lxyNzU8LUZn9R4pg9GLEG8NavGBfqJbNj3rvWNSFB0K7Vw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728895487; a=rsa-sha256; cv=none;
	b=dLW3dgQJQJ/SaZ5AJW5I+dHhnQWWLiHOCzKf4ZzBhqL0xVtbcbNHUmVqwnVJUQE1IypFPt
	vKzpIYP8VehfATHlLSHyHmmQ3o88Pn0RKKJOm40JSt87CXei7XbNtNk2oYMEXgc9DLNf/a
	ykR7F21ASQ7Mej/Rp+Xycj9ZImatEMs23j34SOpzcoZQhmaBbdEUNURkcUuoiDxdbzuLkK
	5Wk/T1pjBTo/XfSzDmCkwcFusmFBsGacfv7uK8Yltl+HSBR8Km8A46wAumYD9D62tPdHE4
	PsR5UexPX8UkdhxmtxSpIQiNA/+OoxKeFevluCVmL0nVsCpUl2kW0mUVp0vICA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XRrQ71NqRzWF3;
	Mon, 14 Oct 2024 08:44:47 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49E8il4U098871;
	Mon, 14 Oct 2024 08:44:47 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49E8ij4T098868;
	Mon, 14 Oct 2024 08:44:45 GMT
	(envelope-from git)
Date: Mon, 14 Oct 2024 08:44:45 GMT
Message-Id: <202410140844.49E8ij4T098868@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: ddfc6f84f242 - main - locales: update unicode version
  16 and CLDR to version 45
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-all@freebsd.org
Sender: owner-dev-commits-src-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: ddfc6f84f24215b418af19260e9156219f6df03e
Auto-Submitted: auto-generated

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=ddfc6f84f24215b418af19260e9156219f6df03e

commit ddfc6f84f24215b418af19260e9156219f6df03e
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-10-14 08:43:09 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-10-14 08:43:39 +0000

    locales: update unicode version 16 and CLDR to version 45
---
 share/colldef_unicode/Makefile         |     2 +-
 share/colldef_unicode/fa_AF.UTF-8.src  |     6 +-
 share/colldef_unicode/fa_IR.UTF-8.src  |     6 +-
 share/colldef_unicode/ja_JP.UTF-8.src  |     6 +-
 share/colldef_unicode/lv_LV.UTF-8.src  |   168 +-
 share/colldef_unicode/zh_CN.UTF-8.src  | 81865 +++++++++++++++----------------
 share/colldef_unicode/zh_TW.UTF-8.src  |  4824 +-
 share/ctypedef/C.UTF-8.src             |     8 +
 share/monetdef_unicode/Makefile        |     6 +-
 share/monetdef_unicode/en_ZA.UTF-8.src |     4 +-
 share/monetdef_unicode/nb_NO.UTF-8.src |    50 -
 share/numericdef_unicode/Makefile      |     2 +-
 12 files changed, 43456 insertions(+), 43491 deletions(-)

diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile
index d2058baa99be..464f631fe309 100644
--- a/share/colldef_unicode/Makefile
+++ b/share/colldef_unicode/Makefile
@@ -7,7 +7,7 @@ FILESNAME=	LC_COLLATE
 .SUFFIXES:	.src .LC_COLLATE
 MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 
-CLDR_VERSION=	"43.0"
+CLDR_VERSION=	"45.0"
 
 .include <bsd.endian.mk>
 
diff --git a/share/colldef_unicode/fa_AF.UTF-8.src b/share/colldef_unicode/fa_AF.UTF-8.src
index f3664efdcee6..006826a3dbd2 100644
--- a/share/colldef_unicode/fa_AF.UTF-8.src
+++ b/share/colldef_unicode/fa_AF.UTF-8.src
@@ -141,7 +141,7 @@ collating-symbol <X0C8E>
 collating-symbol <X0C98>
 collating-symbol <X0D90>
 collating-symbol <X0D98>
-collating-symbol <X0DFA>
+collating-symbol <X0DF8>
 collating-symbol <X0E00>
 collating-symbol <X1000>
 collating-symbol <X1300>
@@ -468,7 +468,7 @@ order_start forward;forward;forward;forward
 <X0C98>
 <X0D90>
 <X0D98>
-<X0DFA>
+<X0DF8>
 <X0E00>
 <X1000>
 <X1300>
@@ -930,7 +930,7 @@ order_start forward;forward;forward;forward
 <ARABIC-INDIC_FOURTH_ROOT> "<X0C98><X3A00>";<X05>;"<X05><XC0>";<ARABIC-INDIC_FOURTH_ROOT>
 <DOLLAR_SIGN> <X0D90>;<X05>;<X05>;<DOLLAR_SIGN>
 <AFGHANI_SIGN> <X0D98>;<X05>;<X05>;<AFGHANI_SIGN>
-<RIAL_SIGN> <X0DFA>;<X05>;<X05>;<RIAL_SIGN>
+<RIAL_SIGN> <X0DF8>;<X05>;<X05>;<RIAL_SIGN>
 <zero> <X1300>;<X05>;<X05>;<zero>
 <ARABIC-INDIC_DIGIT_ZERO> <X1300>;<X05>;<X05>;<ARABIC-INDIC_DIGIT_ZERO>
 <EXTENDED_ARABIC-INDIC_DIGIT_ZERO> <X1300>;<X05>;<X05>;<EXTENDED_ARABIC-INDIC_DIGIT_ZERO>
diff --git a/share/colldef_unicode/fa_IR.UTF-8.src b/share/colldef_unicode/fa_IR.UTF-8.src
index 96cb67ff988d..04c1f164b78f 100644
--- a/share/colldef_unicode/fa_IR.UTF-8.src
+++ b/share/colldef_unicode/fa_IR.UTF-8.src
@@ -139,7 +139,7 @@ collating-symbol <X0C8E>
 collating-symbol <X0C98>
 collating-symbol <X0D90>
 collating-symbol <X0D98>
-collating-symbol <X0DFA>
+collating-symbol <X0DF8>
 collating-symbol <X0E00>
 collating-symbol <X1000>
 collating-symbol <X1300>
@@ -465,7 +465,7 @@ order_start forward;forward;forward;forward
 <X0C98>
 <X0D90>
 <X0D98>
-<X0DFA>
+<X0DF8>
 <X0E00>
 <X1000>
 <X1300>
@@ -924,7 +924,7 @@ order_start forward;forward;forward;forward
 <ARABIC-INDIC_FOURTH_ROOT> "<X0C98><X3A00>";<X05>;"<X05><XC0>";<ARABIC-INDIC_FOURTH_ROOT>
 <DOLLAR_SIGN> <X0D90>;<X05>;<X05>;<DOLLAR_SIGN>
 <AFGHANI_SIGN> <X0D98>;<X05>;<X05>;<AFGHANI_SIGN>
-<RIAL_SIGN> <X0DFA>;<X05>;<X05>;<RIAL_SIGN>
+<RIAL_SIGN> <X0DF8>;<X05>;<X05>;<RIAL_SIGN>
 <zero> <X1300>;<X05>;<X05>;<zero>
 <ARABIC-INDIC_DIGIT_ZERO> <X1300>;<X05>;<X05>;<ARABIC-INDIC_DIGIT_ZERO>
 <EXTENDED_ARABIC-INDIC_DIGIT_ZERO> <X1300>;<X05>;<X05>;<EXTENDED_ARABIC-INDIC_DIGIT_ZERO>
diff --git a/share/colldef_unicode/ja_JP.UTF-8.src b/share/colldef_unicode/ja_JP.UTF-8.src
index 0885b8852f70..d0b6d0372f60 100644
--- a/share/colldef_unicode/ja_JP.UTF-8.src
+++ b/share/colldef_unicode/ja_JP.UTF-8.src
@@ -833,7 +833,7 @@ collating-symbol <X0D8E>
 collating-symbol <X0D90>
 collating-symbol <X0D92>
 collating-symbol <X0D94>
-collating-symbol <X0DC6>
+collating-symbol <X0DC4>
 collating-symbol <X1300>
 collating-symbol <X1500>
 collating-symbol <X1700>
@@ -7416,7 +7416,7 @@ order_start forward;forward;forward;forward
 <X0D90>
 <X0D92>
 <X0D94>
-<X0DC6>
+<X0DC4>
 <X1300>
 <X1500>
 <X1700>
@@ -14039,7 +14039,7 @@ order_start forward;forward;forward;forward
 <FULLWIDTH_DOLLAR_SIGN> <X0D90>;<X05>;<X05>;<FULLWIDTH_DOLLAR_SIGN>
 <FULLWIDTH_POUND_SIGN> <X0D92>;<X05>;<X05>;<FULLWIDTH_POUND_SIGN>
 <FULLWIDTH_YEN_SIGN> <X0D94>;<X05>;<X05>;<FULLWIDTH_YEN_SIGN>
-<FULLWIDTH_WON_SIGN> <X0DC6>;<X05>;<X05>;<FULLWIDTH_WON_SIGN>
+<FULLWIDTH_WON_SIGN> <X0DC4>;<X05>;<X05>;<FULLWIDTH_WON_SIGN>
 <zero> <X1300>;<X05>;<X05>;<zero>
 <FULLWIDTH_DIGIT_ZERO> <X1300>;<X05>;<X05>;<FULLWIDTH_DIGIT_ZERO>
 <one> <X1500>;<X05>;<X05>;<one>
diff --git a/share/colldef_unicode/lv_LV.UTF-8.src b/share/colldef_unicode/lv_LV.UTF-8.src
index 352038b3e828..4286c37e7662 100644
--- a/share/colldef_unicode/lv_LV.UTF-8.src
+++ b/share/colldef_unicode/lv_LV.UTF-8.src
@@ -23,7 +23,6 @@ collating-symbol <X2C>
 collating-symbol <X2E>
 collating-symbol <X31>
 collating-symbol <X34>
-collating-symbol <X46>
 collating-symbol <X70>
 collating-symbol <X74>
 collating-symbol <X78>
@@ -120,6 +119,7 @@ collating-symbol <X2100>
 collating-symbol <X2300>
 collating-symbol <X2500>
 collating-symbol <X2A00>
+collating-symbol <X2B02>
 collating-symbol <X2B06>
 collating-symbol <X2B08>
 collating-symbol <X2B0A>
@@ -145,6 +145,7 @@ collating-symbol <X2D14>
 collating-symbol <X2D16>
 collating-symbol <X2D18>
 collating-symbol <X2E00>
+collating-symbol <X2F02>
 collating-symbol <X2F06>
 collating-symbol <X2F08>
 collating-symbol <X2F0A>
@@ -153,7 +154,6 @@ collating-symbol <X2F10>
 collating-symbol <X2F12>
 collating-symbol <X2F14>
 collating-symbol <X2F16>
-collating-symbol <X2F17>
 collating-symbol <X3000>
 collating-symbol <X3106>
 collating-symbol <X3108>
@@ -168,6 +168,7 @@ collating-symbol <X311A>
 collating-symbol <X311C>
 collating-symbol <X311E>
 collating-symbol <X3200>
+collating-symbol <X3302>
 collating-symbol <X3306>
 collating-symbol <X3308>
 collating-symbol <X330A>
@@ -200,6 +201,7 @@ collating-symbol <X3510>
 collating-symbol <X3512>
 collating-symbol <X3514>
 collating-symbol <X3600>
+collating-symbol <X3702>
 collating-symbol <X3706>
 collating-symbol <X3708>
 collating-symbol <X370C>
@@ -212,7 +214,6 @@ collating-symbol <X3718>
 collating-symbol <X371C>
 collating-symbol <X371E>
 collating-symbol <X3720>
-collating-symbol <X3721>
 collating-symbol <X3800>
 collating-symbol <X3906>
 collating-symbol <X3908>
@@ -224,6 +225,8 @@ collating-symbol <X3912>
 collating-symbol <X3914>
 collating-symbol <X3916>
 collating-symbol <X3A00>
+collating-symbol <X3B02>
+collating-symbol <X3B03>
 collating-symbol <X3B06>
 collating-symbol <X3B08>
 collating-symbol <X3B0A>
@@ -243,6 +246,7 @@ collating-symbol <X3D0C>
 collating-symbol <X3D0E>
 collating-symbol <X3D10>
 collating-symbol <X3E00>
+collating-symbol <X3F02>
 collating-symbol <X3F06>
 collating-symbol <X3F08>
 collating-symbol <X3F0A>
@@ -251,8 +255,8 @@ collating-symbol <X3F0E>
 collating-symbol <X3F10>
 collating-symbol <X3F12>
 collating-symbol <X3F16>
-collating-symbol <X3F19>
 collating-symbol <X4000>
+collating-symbol <X4102>
 collating-symbol <X4106>
 collating-symbol <X4108>
 collating-symbol <X410A>
@@ -273,7 +277,6 @@ collating-symbol <X412E>
 collating-symbol <X4132>
 collating-symbol <X4134>
 collating-symbol <X4136>
-collating-symbol <X4139>
 collating-symbol <X4200>
 collating-symbol <X4306>
 collating-symbol <X4308>
@@ -284,6 +287,7 @@ collating-symbol <X4310>
 collating-symbol <X4312>
 collating-symbol <X4314>
 collating-symbol <X4400>
+collating-symbol <X4502>
 collating-symbol <X4506>
 collating-symbol <X4508>
 collating-symbol <X450A>
@@ -298,8 +302,8 @@ collating-symbol <X451C>
 collating-symbol <X451E>
 collating-symbol <X4520>
 collating-symbol <X4522>
-collating-symbol <X4527>
 collating-symbol <X4600>
+collating-symbol <X4702>
 collating-symbol <X4706>
 collating-symbol <X4708>
 collating-symbol <X470A>
@@ -348,6 +352,7 @@ collating-symbol <X4B0C>
 collating-symbol <X4B0E>
 collating-symbol <X4B10>
 collating-symbol <X4C00>
+collating-symbol <X4D02>
 collating-symbol <X4D06>
 collating-symbol <X4D08>
 collating-symbol <X4D0A>
@@ -376,8 +381,8 @@ collating-symbol <X4D3C>
 collating-symbol <X4D40>
 collating-symbol <X4D42>
 collating-symbol <X4D44>
-collating-symbol <X4D45>
 collating-symbol <X4E00>
+collating-symbol <X4F02>
 collating-symbol <X4F06>
 collating-symbol <X4F08>
 collating-symbol <X4F0A>
@@ -394,7 +399,6 @@ collating-symbol <X4F22>
 collating-symbol <X4F24>
 collating-symbol <X4F26>
 collating-symbol <X4F28>
-collating-symbol <X4F2D>
 collating-symbol <X5000>
 collating-symbol <X5106>
 collating-symbol <X5108>
@@ -407,6 +411,7 @@ collating-symbol <X5118>
 collating-symbol <X511A>
 collating-symbol <X511C>
 collating-symbol <X5200>
+collating-symbol <X5302>
 collating-symbol <X5306>
 collating-symbol <X5308>
 collating-symbol <X530A>
@@ -460,6 +465,7 @@ collating-symbol <X5B0C>
 collating-symbol <X5B0E>
 collating-symbol <X5B10>
 collating-symbol <X5C00>
+collating-symbol <X5D02>
 collating-symbol <X5D06>
 collating-symbol <X5D08>
 collating-symbol <X5D0A>
@@ -470,7 +476,6 @@ collating-symbol <X5D12>
 collating-symbol <X5D14>
 collating-symbol <X5D16>
 collating-symbol <X5D18>
-collating-symbol <X5D19>
 collating-symbol <X5D1A>
 collating-symbol <X5D1C>
 collating-symbol <X5D1E>
@@ -538,7 +543,6 @@ order_start forward;forward;forward;forward
 <X2E>
 <X31>
 <X34>
-<X46>
 <X70>
 <X74>
 <X78>
@@ -635,6 +639,7 @@ order_start forward;forward;forward;forward
 <X2300>
 <X2500>
 <X2A00>
+<X2B02>
 <X2B06>
 <X2B08>
 <X2B0A>
@@ -660,6 +665,7 @@ order_start forward;forward;forward;forward
 <X2D16>
 <X2D18>
 <X2E00>
+<X2F02>
 <X2F06>
 <X2F08>
 <X2F0A>
@@ -668,7 +674,6 @@ order_start forward;forward;forward;forward
 <X2F12>
 <X2F14>
 <X2F16>
-<X2F17>
 <X3000>
 <X3106>
 <X3108>
@@ -683,6 +688,7 @@ order_start forward;forward;forward;forward
 <X311C>
 <X311E>
 <X3200>
+<X3302>
 <X3306>
 <X3308>
 <X330A>
@@ -715,6 +721,7 @@ order_start forward;forward;forward;forward
 <X3512>
 <X3514>
 <X3600>
+<X3702>
 <X3706>
 <X3708>
 <X370C>
@@ -727,7 +734,6 @@ order_start forward;forward;forward;forward
 <X371C>
 <X371E>
 <X3720>
-<X3721>
 <X3800>
 <X3906>
 <X3908>
@@ -739,6 +745,8 @@ order_start forward;forward;forward;forward
 <X3914>
 <X3916>
 <X3A00>
+<X3B02>
+<X3B03>
 <X3B06>
 <X3B08>
 <X3B0A>
@@ -758,6 +766,7 @@ order_start forward;forward;forward;forward
 <X3D0E>
 <X3D10>
 <X3E00>
+<X3F02>
 <X3F06>
 <X3F08>
 <X3F0A>
@@ -766,8 +775,8 @@ order_start forward;forward;forward;forward
 <X3F10>
 <X3F12>
 <X3F16>
-<X3F19>
 <X4000>
+<X4102>
 <X4106>
 <X4108>
 <X410A>
@@ -788,7 +797,6 @@ order_start forward;forward;forward;forward
 <X4132>
 <X4134>
 <X4136>
-<X4139>
 <X4200>
 <X4306>
 <X4308>
@@ -799,6 +807,7 @@ order_start forward;forward;forward;forward
 <X4312>
 <X4314>
 <X4400>
+<X4502>
 <X4506>
 <X4508>
 <X450A>
@@ -813,8 +822,8 @@ order_start forward;forward;forward;forward
 <X451E>
 <X4520>
 <X4522>
-<X4527>
 <X4600>
+<X4702>
 <X4706>
 <X4708>
 <X470A>
@@ -863,6 +872,7 @@ order_start forward;forward;forward;forward
 <X4B0E>
 <X4B10>
 <X4C00>
+<X4D02>
 <X4D06>
 <X4D08>
 <X4D0A>
@@ -891,8 +901,8 @@ order_start forward;forward;forward;forward
 <X4D40>
 <X4D42>
 <X4D44>
-<X4D45>
 <X4E00>
+<X4F02>
 <X4F06>
 <X4F08>
 <X4F0A>
@@ -909,7 +919,6 @@ order_start forward;forward;forward;forward
 <X4F24>
 <X4F26>
 <X4F28>
-<X4F2D>
 <X5000>
 <X5106>
 <X5108>
@@ -922,6 +931,7 @@ order_start forward;forward;forward;forward
 <X511A>
 <X511C>
 <X5200>
+<X5302>
 <X5306>
 <X5308>
 <X530A>
@@ -975,6 +985,7 @@ order_start forward;forward;forward;forward
 <X5B0E>
 <X5B10>
 <X5C00>
+<X5D02>
 <X5D06>
 <X5D08>
 <X5D0A>
@@ -985,7 +996,6 @@ order_start forward;forward;forward;forward
 <X5D14>
 <X5D16>
 <X5D18>
-<X5D19>
 <X5D1A>
 <X5D1C>
 <X5D1E>
@@ -1176,8 +1186,6 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_OLD_POLISH_O> <X2A00>;"<X05><XA2>";"<X13><X20>";<LATIN_SMALL_LETTER_OLD_POLISH_O>
 <LATIN_CAPITAL_LETTER_A_WITH_OGONEK> <X2A00>;"<X05><XA2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_A_WITH_OGONEK>
 <LATIN_CAPITAL_LETTER_OLD_POLISH_O> <X2A00>;"<X05><XA2>";"<XA2><X20>";<LATIN_CAPITAL_LETTER_OLD_POLISH_O>
-<LATIN_SMALL_LETTER_A_WITH_MACRON> <X2A00>;"<X05><XA4>";"<X05><X05>";<LATIN_SMALL_LETTER_A_WITH_MACRON>
-<LATIN_CAPITAL_LETTER_A_WITH_MACRON> <X2A00>;"<X05><XA4>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_A_WITH_MACRON>
 <LATIN_SMALL_LETTER_A_WITH_HOOK_ABOVE> <X2A00>;"<X05><XB6>";"<X05><X05>";<LATIN_SMALL_LETTER_A_WITH_HOOK_ABOVE>
 <LATIN_CAPITAL_LETTER_A_WITH_HOOK_ABOVE> <X2A00>;"<X05><XB6>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_A_WITH_HOOK_ABOVE>
 <LATIN_SMALL_LETTER_A_WITH_DOUBLE_GRAVE> <X2A00>;"<X05><XB8>";"<X05><X05>";<LATIN_SMALL_LETTER_A_WITH_DOUBLE_GRAVE>
@@ -1212,6 +1220,8 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_AY> "<X2A00><X5A00>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_AY>
 <LATIN_CAPITAL_LETTER_AY> "<X2A00><X5A00>";"<X05><X05>";"<XA2><XA2>";<LATIN_CAPITAL_LETTER_AY>
 <LATIN_SMALL_LETTER_A_WITH_RIGHT_HALF_RING> "<X2A00><X5D5C>";"<X05><X05>";"<X13><X20>";<LATIN_SMALL_LETTER_A_WITH_RIGHT_HALF_RING>
+<LATIN_SMALL_LETTER_A_WITH_MACRON> <X2B02>;<X05>;<X05>;<LATIN_SMALL_LETTER_A_WITH_MACRON>
+<LATIN_CAPITAL_LETTER_A_WITH_MACRON> <X2B02>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_A_WITH_MACRON>
 <LATIN_LETTER_SMALL_CAPITAL_A> <X2B06>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_A>
 <LATIN_SMALL_LETTER_A_WITH_STROKE> <X2B08>;<X05>;<X05>;<LATIN_SMALL_LETTER_A_WITH_STROKE>
 <LATIN_CAPITAL_LETTER_A_WITH_STROKE> <X2B08>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_A_WITH_STROKE>
@@ -1279,6 +1289,8 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_C_WITH_CEDILLA> <X2E00>;"<X05><XA0>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_C_WITH_CEDILLA>
 <LATIN_SMALL_LETTER_C_WITH_CEDILLA_AND_ACUTE> <X2E00>;"<X05><XA0><X88>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_C_WITH_CEDILLA_AND_ACUTE>
 <LATIN_CAPITAL_LETTER_C_WITH_CEDILLA_AND_ACUTE> <X2E00>;"<X05><XA0><X88>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_C_WITH_CEDILLA_AND_ACUTE>
+<LATIN_SMALL_LETTER_C_WITH_CARON> <X2F02>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_CARON>
+<LATIN_CAPITAL_LETTER_C_WITH_CARON> <X2F02>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_C_WITH_CARON>
 <LATIN_LETTER_SMALL_CAPITAL_C> <X2F06>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_C>
 <LATIN_SMALL_LETTER_C_WITH_STROKE> <X2F08>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_STROKE>
 <LATIN_CAPITAL_LETTER_C_WITH_STROKE> <X2F08>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_C_WITH_STROKE>
@@ -1294,8 +1306,6 @@ order_start forward;forward;forward;forward
 <ROMAN_NUMERAL_REVERSED_ONE_HUNDRED> <X2F14>;<X05>;<XA0>;<ROMAN_NUMERAL_REVERSED_ONE_HUNDRED>
 <LATIN_SMALL_LETTER_REVERSED_C_WITH_DOT> <X2F16>;<X05>;<X05>;<LATIN_SMALL_LETTER_REVERSED_C_WITH_DOT>
 <LATIN_CAPITAL_LETTER_REVERSED_C_WITH_DOT> <X2F16>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_REVERSED_C_WITH_DOT>
-<LATIN_SMALL_LETTER_C_WITH_CARON> <X2F17>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_CARON>
-<LATIN_CAPITAL_LETTER_C_WITH_CARON> <X2F17>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_C_WITH_CARON>
 <d> <X3000>;<X05>;<X05>;<d>
 <FULLWIDTH_LATIN_SMALL_LETTER_D> <X3000>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_D>
 <SMALL_ROMAN_NUMERAL_FIVE_HUNDRED> <X3000>;<X05>;<X13>;<SMALL_ROMAN_NUMERAL_FIVE_HUNDRED>
@@ -1387,12 +1397,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_E_WITH_CEDILLA_AND_BREVE> <X3200>;"<X05><XA0><X8C>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_E_WITH_CEDILLA_AND_BREVE>
 <LATIN_SMALL_LETTER_E_WITH_OGONEK> <X3200>;"<X05><XA2>";"<X05><X05>";<LATIN_SMALL_LETTER_E_WITH_OGONEK>
 <LATIN_CAPITAL_LETTER_E_WITH_OGONEK> <X3200>;"<X05><XA2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_E_WITH_OGONEK>
-<LATIN_SMALL_LETTER_E_WITH_MACRON> <X3200>;"<X05><XA4>";"<X05><X05>";<LATIN_SMALL_LETTER_E_WITH_MACRON>
-<LATIN_CAPITAL_LETTER_E_WITH_MACRON> <X3200>;"<X05><XA4>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_E_WITH_MACRON>
-<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_ACUTE> <X3200>;"<X05><XA4><X88>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_ACUTE>
-<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_ACUTE> <X3200>;"<X05><XA4><X88>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_ACUTE>
-<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_GRAVE> <X3200>;"<X05><XA4><X8A>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_GRAVE>
-<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_GRAVE> <X3200>;"<X05><XA4><X8A>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_GRAVE>
 <LATIN_SMALL_LETTER_E_WITH_HOOK_ABOVE> <X3200>;"<X05><XB6>";"<X05><X05>";<LATIN_SMALL_LETTER_E_WITH_HOOK_ABOVE>
 <LATIN_CAPITAL_LETTER_E_WITH_HOOK_ABOVE> <X3200>;"<X05><XB6>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_E_WITH_HOOK_ABOVE>
 <LATIN_SMALL_LETTER_E_WITH_DOUBLE_GRAVE> <X3200>;"<X05><XB8>";"<X05><X05>";<LATIN_SMALL_LETTER_E_WITH_DOUBLE_GRAVE>
@@ -1407,6 +1411,12 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_BELOW> <X3200>;"<X05><XCC>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_BELOW>
 <LATIN_SMALL_LETTER_E_WITH_TILDE_BELOW> <X3200>;"<X05><XD0>";"<X05><X05>";<LATIN_SMALL_LETTER_E_WITH_TILDE_BELOW>
 <LATIN_CAPITAL_LETTER_E_WITH_TILDE_BELOW> <X3200>;"<X05><XD0>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_E_WITH_TILDE_BELOW>
+<LATIN_SMALL_LETTER_E_WITH_MACRON> <X3302>;<X05>;<X05>;<LATIN_SMALL_LETTER_E_WITH_MACRON>
+<LATIN_CAPITAL_LETTER_E_WITH_MACRON> <X3302>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_E_WITH_MACRON>
+<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_ACUTE> <X3302>;"<X05><X88>";"<X05><X05>";<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_ACUTE>
+<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_ACUTE> <X3302>;"<X05><X88>";"<X86><X05>";<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_ACUTE>
+<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_GRAVE> <X3302>;"<X05><X8A>";"<X05><X05>";<LATIN_SMALL_LETTER_E_WITH_MACRON_AND_GRAVE>
+<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_GRAVE> <X3302>;"<X05><X8A>";"<X86><X05>";<LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_GRAVE>
 <LATIN_LETTER_SMALL_CAPITAL_E> <X3306>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_E>
 <LATIN_SMALL_LETTER_BLACKLETTER_E> <X3308>;<X05>;<X05>;<LATIN_SMALL_LETTER_BLACKLETTER_E>
 <LATIN_SMALL_LETTER_BARRED_E> <X330A>;<X05>;<X05>;<LATIN_SMALL_LETTER_BARRED_E>
@@ -1489,6 +1499,8 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_G_WITH_OBLIQUE_STROKE> <X3600>;"<X05><XAA>";"<XA2><X20>";<LATIN_CAPITAL_LETTER_G_WITH_OBLIQUE_STROKE>
 <LATIN_SMALL_LETTER_INSULAR_G> <X3600>;<X70>;<X05>;<LATIN_SMALL_LETTER_INSULAR_G>
 <LATIN_CAPITAL_LETTER_INSULAR_G> <X3600>;<X70>;<XA0>;<LATIN_CAPITAL_LETTER_INSULAR_G>
+<LATIN_SMALL_LETTER_G_WITH_CEDILLA> <X3702>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_CEDILLA>
+<LATIN_CAPITAL_LETTER_G_WITH_CEDILLA> <X3702>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_G_WITH_CEDILLA>
 <LATIN_SMALL_LETTER_CLOSED_INSULAR_G> <X3706>;<X05>;<X05>;<LATIN_SMALL_LETTER_CLOSED_INSULAR_G>
 <LATIN_CAPITAL_LETTER_CLOSED_INSULAR_G> <X3706>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_CLOSED_INSULAR_G>
 <LATIN_SMALL_LETTER_SCRIPT_G> <X3708>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_G>
@@ -1510,8 +1522,6 @@ order_start forward;forward;forward;forward
 <MODIFIER_LETTER_SMALL_GAMMA> <X371E>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_GAMMA>
 <LATIN_SMALL_LETTER_OI> <X3720>;<X05>;<X05>;<LATIN_SMALL_LETTER_OI>
 <LATIN_CAPITAL_LETTER_OI> <X3720>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OI>
-<LATIN_SMALL_LETTER_G_WITH_CEDILLA> <X3721>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_CEDILLA>
-<LATIN_CAPITAL_LETTER_G_WITH_CEDILLA> <X3721>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_G_WITH_CEDILLA>
 <h> <X3800>;<X05>;<X05>;<h>
 <FULLWIDTH_LATIN_SMALL_LETTER_H> <X3800>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_H>
 <H> <X3800>;<X05>;<X9C>;<H>
@@ -1582,8 +1592,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE> <X3A00>;"<X05><X9C>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE>
 <LATIN_SMALL_LETTER_I_WITH_OGONEK> <X3A00>;"<X05><XA2>";"<X05><X05>";<LATIN_SMALL_LETTER_I_WITH_OGONEK>
 <LATIN_CAPITAL_LETTER_I_WITH_OGONEK> <X3A00>;"<X05><XA2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_I_WITH_OGONEK>
-<LATIN_SMALL_LETTER_I_WITH_MACRON> <X3A00>;"<X05><XA4>";"<X05><X05>";<LATIN_SMALL_LETTER_I_WITH_MACRON>
-<LATIN_CAPITAL_LETTER_I_WITH_MACRON> <X3A00>;"<X05><XA4>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_I_WITH_MACRON>
 <LATIN_SMALL_LETTER_I_WITH_HOOK_ABOVE> <X3A00>;"<X05><XB6>";"<X05><X05>";<LATIN_SMALL_LETTER_I_WITH_HOOK_ABOVE>
 <LATIN_CAPITAL_LETTER_I_WITH_HOOK_ABOVE> <X3A00>;"<X05><XB6>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_I_WITH_HOOK_ABOVE>
 <LATIN_SMALL_LETTER_I_WITH_DOUBLE_GRAVE> <X3A00>;"<X05><XB8>";"<X05><X05>";<LATIN_SMALL_LETTER_I_WITH_DOUBLE_GRAVE>
@@ -1594,27 +1602,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_I_WITH_DOT_BELOW> <X3A00>;"<X05><XC4>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_I_WITH_DOT_BELOW>
 <LATIN_SMALL_LETTER_I_WITH_TILDE_BELOW> <X3A00>;"<X05><XD0>";"<X05><X05>";<LATIN_SMALL_LETTER_I_WITH_TILDE_BELOW>
 <LATIN_CAPITAL_LETTER_I_WITH_TILDE_BELOW> <X3A00>;"<X05><XD0>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_I_WITH_TILDE_BELOW>
-<y> <X3A00>;<X46>;<X05>;<y>
-<Y> <X3A00>;<X46>;<X86>;<Y>
-<LATIN_SMALL_LETTER_Y_WITH_ACUTE> <X3A00>;"<X46><X88>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_ACUTE>
-<LATIN_CAPITAL_LETTER_Y_WITH_ACUTE> <X3A00>;"<X46><X88>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_ACUTE>
-<LATIN_SMALL_LETTER_Y_WITH_GRAVE> <X3A00>;"<X46><X8A>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_GRAVE>
-<LATIN_CAPITAL_LETTER_Y_WITH_GRAVE> <X3A00>;"<X46><X8A>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_GRAVE>
-<LATIN_SMALL_LETTER_Y_WITH_CIRCUMFLEX> <X3A00>;"<X46><X8E>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_CIRCUMFLEX>
-<LATIN_CAPITAL_LETTER_Y_WITH_CIRCUMFLEX> <X3A00>;"<X46><X8E>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_CIRCUMFLEX>
-<LATIN_SMALL_LETTER_Y_WITH_RING_ABOVE> <X3A00>;"<X46><X92>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_RING_ABOVE>
-<LATIN_SMALL_LETTER_Y_WITH_DIAERESIS> <X3A00>;"<X46><X96>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_DIAERESIS>
-<LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS> <X3A00>;"<X46><X96>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS>
-<LATIN_SMALL_LETTER_Y_WITH_TILDE> <X3A00>;"<X46><X9A>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_TILDE>
-<LATIN_CAPITAL_LETTER_Y_WITH_TILDE> <X3A00>;"<X46><X9A>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_TILDE>
-<LATIN_SMALL_LETTER_Y_WITH_DOT_ABOVE> <X3A00>;"<X46><X9C>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_DOT_ABOVE>
-<LATIN_CAPITAL_LETTER_Y_WITH_DOT_ABOVE> <X3A00>;"<X46><X9C>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_DOT_ABOVE>
-<LATIN_SMALL_LETTER_Y_WITH_MACRON> <X3A00>;"<X46><XA4>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_MACRON>
-<LATIN_CAPITAL_LETTER_Y_WITH_MACRON> <X3A00>;"<X46><XA4>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_MACRON>
-<LATIN_SMALL_LETTER_Y_WITH_HOOK_ABOVE> <X3A00>;"<X46><XB6>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_HOOK_ABOVE>
-<LATIN_CAPITAL_LETTER_Y_WITH_HOOK_ABOVE> <X3A00>;"<X46><XB6>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_HOOK_ABOVE>
-<LATIN_SMALL_LETTER_Y_WITH_DOT_BELOW> <X3A00>;"<X46><XC4>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_DOT_BELOW>
-<LATIN_CAPITAL_LETTER_Y_WITH_DOT_BELOW> <X3A00>;"<X46><XC4>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_DOT_BELOW>
 <SMALL_ROMAN_NUMERAL_TWO> "<X3A00><X3A00>";"<X05><X05>";"<X13><X13>";<SMALL_ROMAN_NUMERAL_TWO>
 <ROMAN_NUMERAL_TWO> "<X3A00><X3A00>";"<X05><X05>";"<XA2><XA2>";<ROMAN_NUMERAL_TWO>
 <SMALL_ROMAN_NUMERAL_THREE> "<X3A00><X3A00><X3A00>";"<X05><X05><X05>";"<X13><X13><X13>";<SMALL_ROMAN_NUMERAL_THREE>
@@ -1625,6 +1612,29 @@ order_start forward;forward;forward;forward
 <ROMAN_NUMERAL_FOUR> "<X3A00><X5400>";"<X05><X05>";"<XA2><XA2>";<ROMAN_NUMERAL_FOUR>
 <SMALL_ROMAN_NUMERAL_NINE> "<X3A00><X5800>";"<X05><X05>";"<X13><X13>";<SMALL_ROMAN_NUMERAL_NINE>
 <ROMAN_NUMERAL_NINE> "<X3A00><X5800>";"<X05><X05>";"<XA2><XA2>";<ROMAN_NUMERAL_NINE>
+<y> <X3B02>;<X05>;<X05>;<y>
+<Y> <X3B02>;<X05>;<X86>;<Y>
+<LATIN_SMALL_LETTER_Y_WITH_ACUTE> <X3B02>;"<X05><X88>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_ACUTE>
+<LATIN_CAPITAL_LETTER_Y_WITH_ACUTE> <X3B02>;"<X05><X88>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_ACUTE>
+<LATIN_SMALL_LETTER_Y_WITH_GRAVE> <X3B02>;"<X05><X8A>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_GRAVE>
+<LATIN_CAPITAL_LETTER_Y_WITH_GRAVE> <X3B02>;"<X05><X8A>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_GRAVE>
+<LATIN_SMALL_LETTER_Y_WITH_CIRCUMFLEX> <X3B02>;"<X05><X8E>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_CIRCUMFLEX>
+<LATIN_CAPITAL_LETTER_Y_WITH_CIRCUMFLEX> <X3B02>;"<X05><X8E>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_CIRCUMFLEX>
+<LATIN_SMALL_LETTER_Y_WITH_RING_ABOVE> <X3B02>;"<X05><X92>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_RING_ABOVE>
+<LATIN_SMALL_LETTER_Y_WITH_DIAERESIS> <X3B02>;"<X05><X96>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_DIAERESIS>
+<LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS> <X3B02>;"<X05><X96>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS>
+<LATIN_SMALL_LETTER_Y_WITH_TILDE> <X3B02>;"<X05><X9A>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_TILDE>
+<LATIN_CAPITAL_LETTER_Y_WITH_TILDE> <X3B02>;"<X05><X9A>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_TILDE>
+<LATIN_SMALL_LETTER_Y_WITH_DOT_ABOVE> <X3B02>;"<X05><X9C>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_DOT_ABOVE>
+<LATIN_CAPITAL_LETTER_Y_WITH_DOT_ABOVE> <X3B02>;"<X05><X9C>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_DOT_ABOVE>
+<LATIN_SMALL_LETTER_Y_WITH_MACRON> <X3B02>;"<X05><XA4>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_MACRON>
+<LATIN_CAPITAL_LETTER_Y_WITH_MACRON> <X3B02>;"<X05><XA4>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_MACRON>
+<LATIN_SMALL_LETTER_Y_WITH_HOOK_ABOVE> <X3B02>;"<X05><XB6>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_HOOK_ABOVE>
+<LATIN_CAPITAL_LETTER_Y_WITH_HOOK_ABOVE> <X3B02>;"<X05><XB6>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_HOOK_ABOVE>
+<LATIN_SMALL_LETTER_Y_WITH_DOT_BELOW> <X3B02>;"<X05><XC4>";"<X05><X05>";<LATIN_SMALL_LETTER_Y_WITH_DOT_BELOW>
+<LATIN_CAPITAL_LETTER_Y_WITH_DOT_BELOW> <X3B02>;"<X05><XC4>";"<X86><X05>";<LATIN_CAPITAL_LETTER_Y_WITH_DOT_BELOW>
+<LATIN_SMALL_LETTER_I_WITH_MACRON> <X3B03>;<X05>;<X05>;<LATIN_SMALL_LETTER_I_WITH_MACRON>
+<LATIN_CAPITAL_LETTER_I_WITH_MACRON> <X3B03>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_I_WITH_MACRON>
 <LATIN_SMALL_LETTER_DOTLESS_I> <X3B06>;<X05>;<X05>;<LATIN_SMALL_LETTER_DOTLESS_I>
 <LATIN_LETTER_SMALL_CAPITAL_I> <X3B08>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_I>
 <LATIN_CAPITAL_LETTER_SMALL_CAPITAL_I> <X3B08>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_SMALL_CAPITAL_I>
@@ -1683,6 +1693,8 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_K_WITH_DOT_BELOW> <X3E00>;"<X05><XC4>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_K_WITH_DOT_BELOW>
 <LATIN_SMALL_LETTER_K_WITH_LINE_BELOW> <X3E00>;"<X05><XD2>";"<X05><X05>";<LATIN_SMALL_LETTER_K_WITH_LINE_BELOW>
 <LATIN_CAPITAL_LETTER_K_WITH_LINE_BELOW> <X3E00>;"<X05><XD2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_K_WITH_LINE_BELOW>
+<LATIN_SMALL_LETTER_K_WITH_CEDILLA> <X3F02>;<X05>;<X05>;<LATIN_SMALL_LETTER_K_WITH_CEDILLA>
+<LATIN_CAPITAL_LETTER_K_WITH_CEDILLA> <X3F02>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_K_WITH_CEDILLA>
 <LATIN_LETTER_SMALL_CAPITAL_K> <X3F06>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_K>
 <LATIN_SMALL_LETTER_K_WITH_PALATAL_HOOK> <X3F08>;<X05>;<X05>;<LATIN_SMALL_LETTER_K_WITH_PALATAL_HOOK>
 <LATIN_SMALL_LETTER_K_WITH_HOOK> <X3F0A>;<X05>;<X05>;<LATIN_SMALL_LETTER_K_WITH_HOOK>
@@ -1697,8 +1709,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_K_WITH_STROKE_AND_DIAGONAL_STROKE> <X3F12>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_K_WITH_STROKE_AND_DIAGONAL_STROKE>
 <LATIN_SMALL_LETTER_TURNED_K> <X3F16>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_K>
 <LATIN_CAPITAL_LETTER_TURNED_K> <X3F16>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_K>
-<LATIN_SMALL_LETTER_K_WITH_CEDILLA> <X3F19>;<X05>;<X05>;<LATIN_SMALL_LETTER_K_WITH_CEDILLA>
-<LATIN_CAPITAL_LETTER_K_WITH_CEDILLA> <X3F19>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_K_WITH_CEDILLA>
 <l> <X4000>;<X05>;<X05>;<l>
 <FULLWIDTH_LATIN_SMALL_LETTER_L> <X4000>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_L>
 <SMALL_ROMAN_NUMERAL_FIFTY> <X4000>;<X05>;<X13>;<SMALL_ROMAN_NUMERAL_FIFTY>
@@ -1731,6 +1741,8 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_MIDDLE-WELSH_LL> "<X4000><X4000>";"<X05><X05>";"<XA2><XA2>";<LATIN_CAPITAL_LETTER_MIDDLE-WELSH_LL>
 <LATIN_SMALL_LETTER_LS_DIGRAPH> "<X4000><X4E00>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_LS_DIGRAPH>
 <LATIN_SMALL_LETTER_LZ_DIGRAPH> "<X4000><X5C00>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_LZ_DIGRAPH>
+<LATIN_SMALL_LETTER_L_WITH_CEDILLA> <X4102>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_CEDILLA>
+<LATIN_CAPITAL_LETTER_L_WITH_CEDILLA> <X4102>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_L_WITH_CEDILLA>
 <LATIN_LETTER_SMALL_CAPITAL_L> <X4106>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_L>
 <MODIFIER_LETTER_SMALL_CAPITAL_L> <X4106>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_CAPITAL_L>
 <LATIN_SMALL_LETTER_BROKEN_L> <X4108>;<X05>;<X05>;<LATIN_SMALL_LETTER_BROKEN_L>
@@ -1763,8 +1775,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_TURNED_L> <X4132>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_L>
 <LATIN_SMALL_LETTER_LAMBDA_WITH_STROKE> <X4134>;<X05>;<X05>;<LATIN_SMALL_LETTER_LAMBDA_WITH_STROKE>
 <LATIN_SMALL_LETTER_TURNED_Y> <X4136>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_Y>
-<LATIN_SMALL_LETTER_L_WITH_CEDILLA> <X4139>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_CEDILLA>
-<LATIN_CAPITAL_LETTER_L_WITH_CEDILLA> <X4139>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_L_WITH_CEDILLA>
 <m> <X4200>;<X05>;<X05>;<m>
 <FULLWIDTH_LATIN_SMALL_LETTER_M> <X4200>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_M>
 <SMALL_ROMAN_NUMERAL_ONE_THOUSAND> <X4200>;<X05>;<X13>;<SMALL_ROMAN_NUMERAL_ONE_THOUSAND>
@@ -1818,6 +1828,8 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_NJ> "<X4400><X3C00>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_NJ>
 <LATIN_CAPITAL_LETTER_N_WITH_SMALL_LETTER_J> "<X4400><X3C00>";"<X05><X05>";"<XA2><X13>";<LATIN_CAPITAL_LETTER_N_WITH_SMALL_LETTER_J>
 <LATIN_CAPITAL_LETTER_NJ> "<X4400><X3C00>";"<X05><X05>";"<XA2><XA2>";<LATIN_CAPITAL_LETTER_NJ>
+<LATIN_SMALL_LETTER_N_WITH_CEDILLA> <X4502>;<X05>;<X05>;<LATIN_SMALL_LETTER_N_WITH_CEDILLA>
+<LATIN_CAPITAL_LETTER_N_WITH_CEDILLA> <X4502>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_N_WITH_CEDILLA>
 <LATIN_LETTER_SMALL_CAPITAL_N> <X4506>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_N>
 <MODIFIER_LETTER_SMALL_CAPITAL_N> <X4506>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_CAPITAL_N>
 <MODIFIER_LETTER_CAPITAL_REVERSED_N> <X4508>;<X05>;<X05>;<MODIFIER_LETTER_CAPITAL_REVERSED_N>
@@ -1840,8 +1852,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_ENG> <X4520>;<X05>;<X9E>;<LATIN_CAPITAL_LETTER_ENG>
 <MODIFIER_LETTER_SMALL_ENG> <X4520>;<X05>;<X2C>;<MODIFIER_LETTER_SMALL_ENG>
 <LATIN_SMALL_LETTER_ENG_WITH_CROSSED-TAIL> <X4522>;<X05>;<X05>;<LATIN_SMALL_LETTER_ENG_WITH_CROSSED-TAIL>
-<LATIN_SMALL_LETTER_N_WITH_CEDILLA> <X4527>;<X05>;<X05>;<LATIN_SMALL_LETTER_N_WITH_CEDILLA>
-<LATIN_CAPITAL_LETTER_N_WITH_CEDILLA> <X4527>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_N_WITH_CEDILLA>
 <o> <X4600>;<X05>;<X05>;<o>
 <FULLWIDTH_LATIN_SMALL_LETTER_O> <X4600>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_O>
 <O> <X4600>;<X05>;<X9C>;<O>
@@ -1894,14 +1904,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_O_WITH_STROKE_AND_ACUTE> <X4600>;"<X05><X9E><X88>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_O_WITH_STROKE_AND_ACUTE>
 <LATIN_SMALL_LETTER_O_WITH_OGONEK> <X4600>;"<X05><XA2>";"<X05><X05>";<LATIN_SMALL_LETTER_O_WITH_OGONEK>
 <LATIN_CAPITAL_LETTER_O_WITH_OGONEK> <X4600>;"<X05><XA2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_O_WITH_OGONEK>
-<LATIN_SMALL_LETTER_O_WITH_OGONEK_AND_MACRON> <X4600>;"<X05><XA2><XA4>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_O_WITH_OGONEK_AND_MACRON>
-<LATIN_CAPITAL_LETTER_O_WITH_OGONEK_AND_MACRON> <X4600>;"<X05><XA2><XA4>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_O_WITH_OGONEK_AND_MACRON>
-<LATIN_SMALL_LETTER_O_WITH_MACRON> <X4600>;"<X05><XA4>";"<X05><X05>";<LATIN_SMALL_LETTER_O_WITH_MACRON>
-<LATIN_CAPITAL_LETTER_O_WITH_MACRON> <X4600>;"<X05><XA4>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_O_WITH_MACRON>
-<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_ACUTE> <X4600>;"<X05><XA4><X88>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_ACUTE>
-<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_ACUTE> <X4600>;"<X05><XA4><X88>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_ACUTE>
-<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_GRAVE> <X4600>;"<X05><XA4><X8A>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_GRAVE>
-<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_GRAVE> <X4600>;"<X05><XA4><X8A>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_GRAVE>
 <LATIN_SMALL_LETTER_O_WITH_HOOK_ABOVE> <X4600>;"<X05><XB6>";"<X05><X05>";<LATIN_SMALL_LETTER_O_WITH_HOOK_ABOVE>
 <LATIN_CAPITAL_LETTER_O_WITH_HOOK_ABOVE> <X4600>;"<X05><XB6>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_O_WITH_HOOK_ABOVE>
 <LATIN_SMALL_LETTER_O_WITH_DOUBLE_GRAVE> <X4600>;"<X05><XB8>";"<X05><X05>";<LATIN_SMALL_LETTER_O_WITH_DOUBLE_GRAVE>
@@ -1929,6 +1931,14 @@ order_start forward;forward;forward;forward
 <MODIFIER_LETTER_SMALL_LIGATURE_OE> "<X4600><X3200>";"<X70><X05>";"<X2E><X2B>";<MODIFIER_LETTER_SMALL_LIGATURE_OE>
 <LATIN_SMALL_LETTER_OO> "<X4600><X4600>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_OO>
 <LATIN_CAPITAL_LETTER_OO> "<X4600><X4600>";"<X05><X05>";"<XA2><XA2>";<LATIN_CAPITAL_LETTER_OO>
+<LATIN_SMALL_LETTER_O_WITH_MACRON> <X4702>;<X05>;<X05>;<LATIN_SMALL_LETTER_O_WITH_MACRON>
+<LATIN_CAPITAL_LETTER_O_WITH_MACRON> <X4702>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_O_WITH_MACRON>
+<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_ACUTE> <X4702>;"<X05><X88>";"<X05><X05>";<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_ACUTE>
+<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_ACUTE> <X4702>;"<X05><X88>";"<X86><X05>";<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_ACUTE>
+<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_GRAVE> <X4702>;"<X05><X8A>";"<X05><X05>";<LATIN_SMALL_LETTER_O_WITH_MACRON_AND_GRAVE>
+<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_GRAVE> <X4702>;"<X05><X8A>";"<X86><X05>";<LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_GRAVE>
+<LATIN_SMALL_LETTER_O_WITH_OGONEK_AND_MACRON> <X4702>;"<X05><XA2>";"<X05><X05>";<LATIN_SMALL_LETTER_O_WITH_OGONEK_AND_MACRON>
+<LATIN_CAPITAL_LETTER_O_WITH_OGONEK_AND_MACRON> <X4702>;"<X05><XA2>";"<X86><X05>";<LATIN_CAPITAL_LETTER_O_WITH_OGONEK_AND_MACRON>
 <LATIN_LETTER_SMALL_CAPITAL_O> <X4706>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_O>
 <LATIN_SMALL_LETTER_SIDEWAYS_O> <X4708>;<X05>;<X05>;<LATIN_SMALL_LETTER_SIDEWAYS_O>
 <LATIN_SMALL_LETTER_BLACKLETTER_O> <X470A>;<X05>;<X05>;<LATIN_SMALL_LETTER_BLACKLETTER_O>
@@ -2040,6 +2050,8 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_INSULAR_R> <X4C00>;<X70>;<XA0>;<LATIN_CAPITAL_LETTER_INSULAR_R>
 <LATIN_SMALL_LETTER_R_ROTUNDA> <X4C00>;<X78>;<X05>;<LATIN_SMALL_LETTER_R_ROTUNDA>
 <LATIN_CAPITAL_LETTER_R_ROTUNDA> <X4C00>;<X78>;<XA0>;<LATIN_CAPITAL_LETTER_R_ROTUNDA>
+<LATIN_SMALL_LETTER_R_WITH_CEDILLA> <X4D02>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_CEDILLA>
+<LATIN_CAPITAL_LETTER_R_WITH_CEDILLA> <X4D02>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_R_WITH_CEDILLA>
 <LATIN_SMALL_LETTER_STIRRUP_R> <X4D06>;<X05>;<X05>;<LATIN_SMALL_LETTER_STIRRUP_R>
 <LATIN_LETTER_SMALL_CAPITAL_R> <X4D08>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_R>
 <LATIN_LETTER_YR> <X4D08>;<X05>;<X9E>;<LATIN_LETTER_YR>
@@ -2075,8 +2087,6 @@ order_start forward;forward;forward;forward
 <LATIN_LETTER_SMALL_CAPITAL_RUM> <X4D42>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_RUM>
 <LATIN_SMALL_LETTER_RUM_ROTUNDA> <X4D44>;<X05>;<X05>;<LATIN_SMALL_LETTER_RUM_ROTUNDA>
 <LATIN_CAPITAL_LETTER_RUM_ROTUNDA> <X4D44>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_RUM_ROTUNDA>
-<LATIN_SMALL_LETTER_R_WITH_CEDILLA> <X4D45>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_CEDILLA>
-<LATIN_CAPITAL_LETTER_R_WITH_CEDILLA> <X4D45>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_R_WITH_CEDILLA>
 <s> <X4E00>;<X05>;<X05>;<s>
 <FULLWIDTH_LATIN_SMALL_LETTER_S> <X4E00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_S>
 <S> <X4E00>;<X05>;<X9C>;<S>
@@ -2111,6 +2121,10 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_SHARP_S> "<X4E00><X4E00>";"<X70><X05>";"<XA0><XA2>";<LATIN_CAPITAL_LETTER_SHARP_S>
 <LATIN_SMALL_LIGATURE_ST> "<X4E00><X5000>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LIGATURE_ST>
 <LATIN_SMALL_LIGATURE_LONG_S_T> "<X4E00><X5000>";"<X74><X05>";"<X05><X13>";<LATIN_SMALL_LIGATURE_LONG_S_T>
+<LATIN_SMALL_LETTER_S_WITH_CARON> <X4F02>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_CARON>
+<LATIN_CAPITAL_LETTER_S_WITH_CARON> <X4F02>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_S_WITH_CARON>
+<LATIN_SMALL_LETTER_S_WITH_CARON_AND_DOT_ABOVE> <X4F02>;"<X05><X9C>";"<X05><X05>";<LATIN_SMALL_LETTER_S_WITH_CARON_AND_DOT_ABOVE>
+<LATIN_CAPITAL_LETTER_S_WITH_CARON_AND_DOT_ABOVE> <X4F02>;"<X05><X9C>";"<X86><X05>";<LATIN_CAPITAL_LETTER_S_WITH_CARON_AND_DOT_ABOVE>
 <LATIN_LETTER_SMALL_CAPITAL_S> <X4F06>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_S>
 <LATIN_SMALL_LETTER_S_WITH_SHORT_STROKE_OVERLAY> <X4F08>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_SHORT_STROKE_OVERLAY>
 <LATIN_CAPITAL_LETTER_S_WITH_SHORT_STROKE_OVERLAY> <X4F08>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_S_WITH_SHORT_STROKE_OVERLAY>
@@ -2134,10 +2148,6 @@ order_start forward;forward;forward;forward
 <LATIN_LETTER_REVERSED_ESH_LOOP> <X4F24>;<X05>;<X05>;<LATIN_LETTER_REVERSED_ESH_LOOP>
 <LATIN_SMALL_LETTER_SQUAT_REVERSED_ESH> <X4F26>;<X05>;<X05>;<LATIN_SMALL_LETTER_SQUAT_REVERSED_ESH>
 <LATIN_SMALL_LETTER_ESH_WITH_CURL> <X4F28>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH_WITH_CURL>
-<LATIN_SMALL_LETTER_S_WITH_CARON> <X4F2D>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_CARON>
-<LATIN_CAPITAL_LETTER_S_WITH_CARON> <X4F2D>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_S_WITH_CARON>
-<LATIN_SMALL_LETTER_S_WITH_CARON_AND_DOT_ABOVE> <X4F2D>;"<X05><X9C>";"<X05><X05>";<LATIN_SMALL_LETTER_S_WITH_CARON_AND_DOT_ABOVE>
-<LATIN_CAPITAL_LETTER_S_WITH_CARON_AND_DOT_ABOVE> <X4F2D>;"<X05><X9C>";"<X86><X05>";<LATIN_CAPITAL_LETTER_S_WITH_CARON_AND_DOT_ABOVE>
 <t> <X5000>;<X05>;<X05>;<t>
 <FULLWIDTH_LATIN_SMALL_LETTER_T> <X5000>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_T>
 <T> <X5000>;<X05>;<X9C>;<T>
@@ -2225,10 +2235,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_U_WITH_TILDE_AND_ACUTE> <X5200>;"<X05><X9A><X88>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_U_WITH_TILDE_AND_ACUTE>
 <LATIN_SMALL_LETTER_U_WITH_OGONEK> <X5200>;"<X05><XA2>";"<X05><X05>";<LATIN_SMALL_LETTER_U_WITH_OGONEK>
 <LATIN_CAPITAL_LETTER_U_WITH_OGONEK> <X5200>;"<X05><XA2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_U_WITH_OGONEK>
-<LATIN_SMALL_LETTER_U_WITH_MACRON> <X5200>;"<X05><XA4>";"<X05><X05>";<LATIN_SMALL_LETTER_U_WITH_MACRON>
-<LATIN_CAPITAL_LETTER_U_WITH_MACRON> <X5200>;"<X05><XA4>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_U_WITH_MACRON>
-<LATIN_SMALL_LETTER_U_WITH_MACRON_AND_DIAERESIS> <X5200>;"<X05><XA4><X96>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_U_WITH_MACRON_AND_DIAERESIS>
-<LATIN_CAPITAL_LETTER_U_WITH_MACRON_AND_DIAERESIS> <X5200>;"<X05><XA4><X96>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_U_WITH_MACRON_AND_DIAERESIS>
 <LATIN_SMALL_LETTER_U_WITH_HOOK_ABOVE> <X5200>;"<X05><XB6>";"<X05><X05>";<LATIN_SMALL_LETTER_U_WITH_HOOK_ABOVE>
 <LATIN_CAPITAL_LETTER_U_WITH_HOOK_ABOVE> <X5200>;"<X05><XB6>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_U_WITH_HOOK_ABOVE>
 <LATIN_SMALL_LETTER_U_WITH_DOUBLE_GRAVE> <X5200>;"<X05><XB8>";"<X05><X05>";<LATIN_SMALL_LETTER_U_WITH_DOUBLE_GRAVE>
@@ -2255,6 +2261,10 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX_BELOW> <X5200>;"<X05><XCC>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX_BELOW>
 <LATIN_SMALL_LETTER_U_WITH_TILDE_BELOW> <X5200>;"<X05><XD0>";"<X05><X05>";<LATIN_SMALL_LETTER_U_WITH_TILDE_BELOW>
 <LATIN_CAPITAL_LETTER_U_WITH_TILDE_BELOW> <X5200>;"<X05><XD0>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_U_WITH_TILDE_BELOW>
+<LATIN_SMALL_LETTER_U_WITH_MACRON> <X5302>;<X05>;<X05>;<LATIN_SMALL_LETTER_U_WITH_MACRON>
+<LATIN_CAPITAL_LETTER_U_WITH_MACRON> <X5302>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_U_WITH_MACRON>
+<LATIN_SMALL_LETTER_U_WITH_MACRON_AND_DIAERESIS> <X5302>;"<X05><X96>";"<X05><X05>";<LATIN_SMALL_LETTER_U_WITH_MACRON_AND_DIAERESIS>
+<LATIN_CAPITAL_LETTER_U_WITH_MACRON_AND_DIAERESIS> <X5302>;"<X05><X96>";"<X86><X05>";<LATIN_CAPITAL_LETTER_U_WITH_MACRON_AND_DIAERESIS>
 <LATIN_LETTER_SMALL_CAPITAL_U> <X5306>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_U>
 <MODIFIER_LETTER_SMALL_CAPITAL_U> <X5306>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_CAPITAL_U>
 <LATIN_SMALL_LETTER_U_WITH_SHORT_RIGHT_LEG> <X5308>;<X05>;<X05>;<LATIN_SMALL_LETTER_U_WITH_SHORT_RIGHT_LEG>
@@ -2407,6 +2417,8 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_Z_WITH_LINE_BELOW> <X5C00>;"<X05><XD2>";"<X05><X05>";<LATIN_SMALL_LETTER_Z_WITH_LINE_BELOW>
 <LATIN_CAPITAL_LETTER_Z_WITH_LINE_BELOW> <X5C00>;"<X05><XD2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_Z_WITH_LINE_BELOW>
 <LATIN_SMALL_LETTER_TURNED_DELTA> "<X5C00><X5600>";"<X05><X05>";"<X13><X14>";<LATIN_SMALL_LETTER_TURNED_DELTA>
+<LATIN_SMALL_LETTER_Z_WITH_CARON> <X5D02>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_CARON>
+<LATIN_CAPITAL_LETTER_Z_WITH_CARON> <X5D02>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_Z_WITH_CARON>
 <LATIN_LETTER_SMALL_CAPITAL_Z> <X5D06>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_Z>
 <LATIN_SMALL_LETTER_Z_WITH_STROKE> <X5D08>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_STROKE>
 <LATIN_CAPITAL_LETTER_Z_WITH_STROKE> <X5D08>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_Z_WITH_STROKE>
@@ -2425,8 +2437,6 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_Z_WITH_DESCENDER> <X5D16>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_Z_WITH_DESCENDER>
 <LATIN_SMALL_LETTER_VISIGOTHIC_Z> <X5D18>;<X05>;<X05>;<LATIN_SMALL_LETTER_VISIGOTHIC_Z>
 <LATIN_CAPITAL_LETTER_VISIGOTHIC_Z> <X5D18>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_VISIGOTHIC_Z>
-<LATIN_SMALL_LETTER_Z_WITH_CARON> <X5D19>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_CARON>
-<LATIN_CAPITAL_LETTER_Z_WITH_CARON> <X5D19>;<X05>;<X86>;<LATIN_CAPITAL_LETTER_Z_WITH_CARON>
 <LATIN_SMALL_LETTER_EZH> <X5D1A>;<X05>;<X05>;<LATIN_SMALL_LETTER_EZH>
 <LATIN_CAPITAL_LETTER_EZH> <X5D1A>;<X05>;<X9E>;<LATIN_CAPITAL_LETTER_EZH>
 <MODIFIER_LETTER_SMALL_EZH> <X5D1A>;<X05>;<X2C>;<MODIFIER_LETTER_SMALL_EZH>
diff --git a/share/colldef_unicode/zh_CN.UTF-8.src b/share/colldef_unicode/zh_CN.UTF-8.src
index e55962dbf4fd..f78a82208ede 100644
--- a/share/colldef_unicode/zh_CN.UTF-8.src
+++ b/share/colldef_unicode/zh_CN.UTF-8.src
@@ -383,12 +383,12 @@ collating-symbol <X7E73>
 collating-symbol <X7E74>
 collating-symbol <X7E75>
 collating-symbol <X7E79>
-collating-symbol <X7E7B>
-collating-symbol <X7E7D>
-collating-symbol <X7E80>
-collating-symbol <X7E82>
-collating-symbol <X7E85>
-collating-symbol <X7E8A>
+collating-symbol <X7E7A>
+collating-symbol <X7E7C>
+collating-symbol <X7E7E>
+collating-symbol <X7E81>
+collating-symbol <X7E83>
+collating-symbol <X7E86>
 collating-symbol <X7E8B>
 collating-symbol <X7E8C>
 collating-symbol <X7E8E>
@@ -681,9 +681,9 @@ collating-symbol <X8040>
 collating-symbol <X8041>
 collating-symbol <X8042>
 collating-symbol <X8043>
-collating-symbol <X8045>
+collating-symbol <X8044>
 collating-symbol <X8046>
-collating-symbol <X8048>
+collating-symbol <X8047>
 collating-symbol <X8049>
 collating-symbol <X804B>
 collating-symbol <X804D>
@@ -954,8 +954,8 @@ collating-symbol <X81EB>
 collating-symbol <X81EC>
 collating-symbol <X81ED>
 collating-symbol <X81EE>
-collating-symbol <X81F0>
-collating-symbol <X81F2>
+collating-symbol <X81EF>
+collating-symbol <X81F1>
 collating-symbol <X81F6>
 collating-symbol <X81F7>
 collating-symbol <X81F8>
@@ -1037,24 +1037,23 @@ collating-symbol <X8279>
 collating-symbol <X827B>
 collating-symbol <X827C>
 collating-symbol <X827D>
-collating-symbol <X8281>
 collating-symbol <X8282>
 collating-symbol <X8283>
-collating-symbol <X8285>
+collating-symbol <X8284>
 collating-symbol <X8286>
 collating-symbol <X8287>
-collating-symbol <X828B>
-collating-symbol <X828D>
-collating-symbol <X828F>
-collating-symbol <X8293>
+collating-symbol <X8288>
+collating-symbol <X828C>
+collating-symbol <X828E>
+collating-symbol <X8290>
 collating-symbol <X8294>
 collating-symbol <X8295>
 collating-symbol <X8296>
-collating-symbol <X8298>
+collating-symbol <X8297>
 collating-symbol <X8299>
-collating-symbol <X829B>
+collating-symbol <X829A>
 collating-symbol <X829C>
-collating-symbol <X829E>
+collating-symbol <X829D>
 collating-symbol <X829F>
 collating-symbol <X82A0>
 collating-symbol <X82A1>
@@ -1063,13 +1062,13 @@ collating-symbol <X82A3>
 collating-symbol <X82A4>
 collating-symbol <X82A5>
 collating-symbol <X82A6>
-collating-symbol <X82A8>
+collating-symbol <X82A7>
 collating-symbol <X82A9>
 collating-symbol <X82AA>
 collating-symbol <X82AB>
 collating-symbol <X82AC>
 collating-symbol <X82AD>
-collating-symbol <X82AF>
+collating-symbol <X82AE>
 collating-symbol <X82B0>
 collating-symbol <X82B1>
 collating-symbol <X82B2>
@@ -1079,107 +1078,107 @@ collating-symbol <X82B5>
 collating-symbol <X82B6>
 collating-symbol <X82B7>
 collating-symbol <X82B8>
-collating-symbol <X82BB>
-collating-symbol <X82BD>
-collating-symbol <X82BF>
-collating-symbol <X82C3>
+collating-symbol <X82B9>
+collating-symbol <X82BC>
+collating-symbol <X82BE>
+collating-symbol <X82C0>
 collating-symbol <X82C4>
-collating-symbol <X82C7>
+collating-symbol <X82C5>
 collating-symbol <X82C8>
-collating-symbol <X82CE>
+collating-symbol <X82C9>
 collating-symbol <X82CF>
-collating-symbol <X82D2>
-collating-symbol <X82D4>
+collating-symbol <X82D0>
+collating-symbol <X82D3>
 collating-symbol <X82D5>
-collating-symbol <X82D8>
+collating-symbol <X82D6>
 collating-symbol <X82D9>
-collating-symbol <X82DB>
-collating-symbol <X82DD>
+collating-symbol <X82DA>
+collating-symbol <X82DC>
 collating-symbol <X82DE>
-collating-symbol <X82E2>
+collating-symbol <X82DF>
 collating-symbol <X82E3>
 collating-symbol <X82E4>
-collating-symbol <X82E6>
+collating-symbol <X82E5>
 collating-symbol <X82E7>
 collating-symbol <X82E8>
-collating-symbol <X82EA>
+collating-symbol <X82E9>
 collating-symbol <X82EB>
 collating-symbol <X82EC>
 collating-symbol <X82ED>
-collating-symbol <X82EF>
-collating-symbol <X82F4>
-collating-symbol <X82F6>
-collating-symbol <X82F9>
-collating-symbol <X82FC>
-collating-symbol <X82FE>
+collating-symbol <X82EE>
+collating-symbol <X82F0>
+collating-symbol <X82F5>
+collating-symbol <X82F7>
+collating-symbol <X82FA>
+collating-symbol <X82FD>
 collating-symbol <X82FF>
 collating-symbol <X8300>
 collating-symbol <X8302>
-collating-symbol <X8304>
-collating-symbol <X8306>
-collating-symbol <X8309>
+collating-symbol <X8303>
+collating-symbol <X8305>
+collating-symbol <X8307>
 collating-symbol <X830A>
 collating-symbol <X830B>
-collating-symbol <X830D>
+collating-symbol <X830C>
 collating-symbol <X830E>
-collating-symbol <X8310>
+collating-symbol <X830F>
 collating-symbol <X8311>
 collating-symbol <X8312>
 collating-symbol <X8313>
 collating-symbol <X8314>
 collating-symbol <X8315>
-collating-symbol <X8317>
+collating-symbol <X8316>
 collating-symbol <X8318>
 collating-symbol <X8319>
 collating-symbol <X831A>
-collating-symbol <X831C>
+collating-symbol <X831B>
 collating-symbol <X831D>
-collating-symbol <X8320>
+collating-symbol <X831E>
 collating-symbol <X8321>
-collating-symbol <X8324>
+collating-symbol <X8322>
 collating-symbol <X8325>
 collating-symbol <X8326>
 collating-symbol <X8327>
 collating-symbol <X8328>
-collating-symbol <X832A>
+collating-symbol <X8329>
 collating-symbol <X832B>
 collating-symbol <X832C>
 collating-symbol <X832D>
 collating-symbol <X832E>
-collating-symbol <X8330>
+collating-symbol <X832F>
 collating-symbol <X8331>
 collating-symbol <X8332>
-collating-symbol <X8334>
+collating-symbol <X8333>
 collating-symbol <X8335>
-collating-symbol <X8338>
+collating-symbol <X8336>
 collating-symbol <X8339>
 collating-symbol <X833A>
 collating-symbol <X833B>
 collating-symbol <X833C>
-collating-symbol <X8340>
-collating-symbol <X8342>
-collating-symbol <X8344>
+collating-symbol <X833D>
+collating-symbol <X8341>
+collating-symbol <X8343>
 collating-symbol <X8345>
-collating-symbol <X8348>
+collating-symbol <X8346>
 collating-symbol <X8349>
 collating-symbol <X834A>
-collating-symbol <X834C>
*** 109844 LINES SKIPPED ***