From nobody Thu Apr 21 12:16:50 2022
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 8B53B1990B26;
	Thu, 21 Apr 2022 12:16:53 +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 "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4Kkc3T3PnMz3rv2;
	Thu, 21 Apr 2022 12:16:53 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1650543413;
	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=ONyugX3arFHcEcYBVm8dr+bFrixUxu0FMFO1C0fK1AU=;
	b=xAjt1byn0dHxdxqqXfobAyjWkJUM/WIK+TodP6d07TMyTUcZ4Eu6cgt8qXdlPTNP6Mz9eF
	tjzkxq+jzczRHC0ybWBzwqN8Up5UHj0LbapiIh8N0E9yAD/6nrjqIlHQU3ziiulYScSiK5
	Lz4MK0x8TkZfg9iU5AP0XlbyrEq3vVCKuNT7KIvvtHJyAayGQnFiGweyMEOMsZPA6FYLUf
	162MboONTouCbB9yUgw57dSuUIJJYhNdAJERfZpDiR243aO7ao94ratXko7qeUF73WxL9j
	FjB6x3eBWaBTkAddUtcQ3dONOdlcWmPU7PctFZjYH6e0o4foUcyzxnVVOhd45Q==
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 5465E70E;
	Thu, 21 Apr 2022 12:16:53 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23LCGrAA080375;
	Thu, 21 Apr 2022 12:16:53 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LCGoJL080373;
	Thu, 21 Apr 2022 12:16:50 GMT
	(envelope-from git)
Date: Thu, 21 Apr 2022 12:16:50 GMT
Message-Id: <202204211216.23LCGoJL080373@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: e87ec409fa9b - main - locales: Update to CLDR 41.0 and Unicode 14.0
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>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: 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: e87ec409fa9b21abf79895837fe375ab3d7e408a
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1650543413;
	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=ONyugX3arFHcEcYBVm8dr+bFrixUxu0FMFO1C0fK1AU=;
	b=HXymCUTmoAd9M+oEVKV6Hf3jiqGc5zXZn8Fa9o4fos5qYgvH2Fgl7G/0n9GHCXNV/OkiTB
	7RFW8bHZ8u0LSdLtmamL6mLdZLbUeDUZKwBQqiuMcq4zELmEFUvr0y0mSpfEwnNdrhoSiO
	74vQxZEwGs/XLyP9fyZvi+pYKn2MjlVJtD9Fj2d4p1WIhIBLo+8QjjFdHQivsrXzoXXIeF
	58cSG6g382c5qOOgyToIyFx6HBOEl0mvpypVyN+N5Fkn8qopIj6PC5kjzxlhnMT8ozCDJ0
	FnGMEa293VDQNAtFyzFXlgkxb00kkMkIPn5xoPziIsjxe84+27ilRABTTw3XiA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650543413; a=rsa-sha256; cv=none;
	b=hPU7QCrp+liSeUlv3hAHH7Uk3hpflBnc3Ge00FyzZDraIWzUk5S6wWzDCKBkH5yTq39+He
	+ZD2HPyg9oMGaeLDn1kpdriLk/zM8PqglVdGLUBcOyePNJZUpsi0Cn5+qOmzgaDycM4pv2
	qgTPGbP8MT/nyNNPmUnPDdaW2u0D79A7SqIwOVJPN5uerWqiAYOy4IoT9kvBXhuCVu/ypL
	7egarpOPGVaN30SLxp1ORf6HheFXyNqz6Wjnjq1MlCsqKRahHknUWIhxnBU4WuBgwNxMbr
	scdozKKTmMhVfVbaxF73PehrG853hZripAvJoCc4DU5lMMgczYNYv74MSjSA1g==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by bapt:

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

commit e87ec409fa9b21abf79895837fe375ab3d7e408a
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-04-21 09:36:42 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2022-04-21 12:16:40 +0000

    locales: Update to CLDR 41.0 and Unicode 14.0
    
    Relnotes:       yes
---
 share/colldef_unicode/Makefile              |     6 +-
 share/colldef_unicode/af_ZA.UTF-8.src       |   621 +-
 share/colldef_unicode/am_ET.UTF-8.src       |   984 +-
 share/colldef_unicode/ar_SA.UTF-8.src       |  1950 +-
 share/colldef_unicode/be_BY.UTF-8.src       |   136 +-
 share/colldef_unicode/ca_AD.UTF-8.src       |   619 +-
 share/colldef_unicode/cs_CZ.UTF-8.src       |   619 +-
 share/colldef_unicode/da_DK.UTF-8.src       |   853 +-
 share/colldef_unicode/el_GR.UTF-8.src       |   130 +-
 share/colldef_unicode/en_US.UTF-8.src       |   619 +-
 share/colldef_unicode/es_MX.UTF-8.src       |   619 +-
 share/colldef_unicode/et_EE.UTF-8.src       |   723 +-
 share/colldef_unicode/fa_AF.UTF-8.src       |  2004 +-
 share/colldef_unicode/fa_IR.UTF-8.src       |  1960 +-
 share/colldef_unicode/fi_FI.UTF-8.src       |   669 +-
 share/colldef_unicode/fr_CA.UTF-8.src       |   619 +-
 share/colldef_unicode/he_IL.UTF-8.src       |   154 +-
 share/colldef_unicode/hi_IN.UTF-8.src       |   160 +-
 share/colldef_unicode/hu_HU.UTF-8.src       |   619 +-
 share/colldef_unicode/hy_AM.UTF-8.src       |   160 +-
 share/colldef_unicode/is_IS.UTF-8.src       |   689 +-
 share/colldef_unicode/ja_JP.UTF-8.src       |   902 +-
 share/colldef_unicode/kk_KZ.UTF-8.src       |   136 +-
 share/colldef_unicode/ko_KR.UTF-8.src       |   186 +-
 share/colldef_unicode/lt_LT.UTF-8.src       |   619 +-
 share/colldef_unicode/lv_LV.UTF-8.src       |   679 +-
 share/colldef_unicode/nn_NO.UTF-8.src       |   861 +-
 share/colldef_unicode/pl_PL.UTF-8.src       |   619 +-
 share/colldef_unicode/ro_RO.UTF-8.src       |   619 +-
 share/colldef_unicode/ru_RU.UTF-8.src       |   136 +-
 share/colldef_unicode/se_NO.UTF-8.src       |   821 +-
 share/colldef_unicode/sk_SK.UTF-8.src       |   619 +-
 share/colldef_unicode/sl_SI.UTF-8.src       |   619 +-
 share/colldef_unicode/sr_RS.UTF-8.src       |   136 +-
 share/colldef_unicode/sr_RS.UTF-8@latin.src |   619 +-
 share/colldef_unicode/sv_SE.UTF-8.src       |   705 +-
 share/colldef_unicode/tr_TR.UTF-8.src       |   619 +-
 share/colldef_unicode/uk_UA.UTF-8.src       |   142 +-
 share/colldef_unicode/zh_CN.UTF-8.src       | 81304 +++++++++++++-------------
 share/colldef_unicode/zh_TW.UTF-8.src       |  4296 +-
 share/ctypedef/C.UTF-8.src                  |   915 +-
 share/monetdef_unicode/Makefile             |     1 -
 share/monetdef_unicode/ar_AE.UTF-8.src      |     6 +-
 share/monetdef_unicode/fr_CA.UTF-8.src      |     2 +-
 share/monetdef_unicode/hr_HR.UTF-8.src      |     2 +-
 share/monetdef_unicode/nb_NO.UTF-8.src      |     4 +-
 share/msgdef_unicode/Makefile               |     1 -
 share/numericdef_unicode/Makefile           |     3 +-
 tools/tools/locale/Makefile                 |     4 +-
 tools/tools/locale/etc/final-maps/map.UTF-8 |   865 +-
 50 files changed, 56935 insertions(+), 54418 deletions(-)

diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile
index 0c1b0488b86d..6193c2fb499e 100644
--- a/share/colldef_unicode/Makefile
+++ b/share/colldef_unicode/Makefile
@@ -8,7 +8,7 @@ FILESNAME=	LC_COLLATE
 .SUFFIXES:	.src .LC_COLLATE
 MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 
-CLDR_VERSION=	"39.0"
+CLDR_VERSION=	"41.0"
 
 .include <bsd.endian.mk>
 
@@ -106,7 +106,7 @@ FILES=		${LOCALES:S/$/.LC_COLLATE/}
 CLEANFILES=	${FILES}
 
 .for f t in ${SAME}
-DIRS+=	LOCALEDIR_$t
+DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
 LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
@@ -115,13 +115,11 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f}
-FILESDIR_${f}.LC_COLLATEPACKAGE=	locales
 .endfor
 
 .for f t in ${LOCALES_MAPPED}
 FILES+=	$t.LC_COLLATE
 FILESDIR_$t.LC_COLLATE=	${LOCALEDIR}/$t
-FILESDIR_$t.LC_COLLATEPACKAGE=	locales
 $t.LC_COLLATE: ${.CURDIR}/$f.src
 	localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \
 	-V ${CLDR_VERSION} \
diff --git a/share/colldef_unicode/af_ZA.UTF-8.src b/share/colldef_unicode/af_ZA.UTF-8.src
index 44c7d4e784e6..aeb1a06fd276 100644
--- a/share/colldef_unicode/af_ZA.UTF-8.src
+++ b/share/colldef_unicode/af_ZA.UTF-8.src
@@ -25,7 +25,9 @@ collating-symbol <X2E>
 collating-symbol <X31>
 collating-symbol <X34>
 collating-symbol <X70>
+collating-symbol <X74>
 collating-symbol <X78>
+collating-symbol <X7C>
 collating-symbol <X88>
 collating-symbol <X8A>
 collating-symbol <X8C>
@@ -74,32 +76,32 @@ collating-symbol <X0600>
 collating-symbol <X072A>
 collating-symbol <X0736>
 collating-symbol <X075A>
-collating-symbol <X0762>
+collating-symbol <X0764>
 collating-symbol <X0800>
-collating-symbol <X096A>
-collating-symbol <X0978>
-collating-symbol <X098E>
-collating-symbol <X0990>
+collating-symbol <X096E>
+collating-symbol <X097C>
 collating-symbol <X0992>
 collating-symbol <X0994>
 collating-symbol <X0996>
 collating-symbol <X0998>
-collating-symbol <X0A7E>
-collating-symbol <X0A80>
-collating-symbol <X0A8A>
-collating-symbol <X0A8C>
-collating-symbol <X0A90>
-collating-symbol <X0A96>
-collating-symbol <X0A98>
+collating-symbol <X099A>
+collating-symbol <X099C>
+collating-symbol <X0A92>
+collating-symbol <X0A94>
+collating-symbol <X0A9E>
+collating-symbol <X0AA0>
+collating-symbol <X0AA4>
+collating-symbol <X0AAA>
+collating-symbol <X0AAC>
 collating-symbol <X0C04>
 collating-symbol <X0C0A>
-collating-symbol <X0C79>
-collating-symbol <X0C81>
-collating-symbol <X0C83>
-collating-symbol <X0C85>
-collating-symbol <X0C89>
-collating-symbol <X0C8D>
-collating-symbol <X0D8A>
+collating-symbol <X0C7A>
+collating-symbol <X0C82>
+collating-symbol <X0C84>
+collating-symbol <X0C86>
+collating-symbol <X0C8A>
+collating-symbol <X0C8E>
+collating-symbol <X0D8F>
 collating-symbol <X1090>
 collating-symbol <X1092>
 collating-symbol <X1094>
@@ -146,10 +148,10 @@ collating-symbol <X2F06>
 collating-symbol <X2F08>
 collating-symbol <X2F0A>
 collating-symbol <X2F0C>
-collating-symbol <X2F0E>
 collating-symbol <X2F10>
 collating-symbol <X2F12>
 collating-symbol <X2F14>
+collating-symbol <X2F16>
 collating-symbol <X3000>
 collating-symbol <X3106>
 collating-symbol <X3108>
@@ -198,7 +200,6 @@ collating-symbol <X3514>
 collating-symbol <X3600>
 collating-symbol <X3706>
 collating-symbol <X3708>
-collating-symbol <X370A>
 collating-symbol <X370C>
 collating-symbol <X370E>
 collating-symbol <X3710>
@@ -206,7 +207,9 @@ collating-symbol <X3712>
 collating-symbol <X3714>
 collating-symbol <X3716>
 collating-symbol <X3718>
-collating-symbol <X371A>
+collating-symbol <X371C>
+collating-symbol <X371E>
+collating-symbol <X3720>
 collating-symbol <X3800>
 collating-symbol <X3906>
 collating-symbol <X3908>
@@ -225,10 +228,10 @@ collating-symbol <X3B0C>
 collating-symbol <X3B0E>
 collating-symbol <X3B10>
 collating-symbol <X3B12>
-collating-symbol <X3B14>
 collating-symbol <X3B16>
 collating-symbol <X3B18>
 collating-symbol <X3B1A>
+collating-symbol <X3B1C>
 collating-symbol <X3C00>
 collating-symbol <X3D06>
 collating-symbol <X3D08>
@@ -244,7 +247,7 @@ collating-symbol <X3F0C>
 collating-symbol <X3F0E>
 collating-symbol <X3F10>
 collating-symbol <X3F12>
-collating-symbol <X3F14>
+collating-symbol <X3F16>
 collating-symbol <X4000>
 collating-symbol <X4106>
 collating-symbol <X4108>
@@ -256,16 +259,16 @@ collating-symbol <X4112>
 collating-symbol <X4114>
 collating-symbol <X4116>
 collating-symbol <X4118>
-collating-symbol <X411A>
-collating-symbol <X411C>
 collating-symbol <X411E>
 collating-symbol <X4120>
 collating-symbol <X4122>
 collating-symbol <X4124>
-collating-symbol <X4126>
 collating-symbol <X4128>
 collating-symbol <X412A>
 collating-symbol <X412C>
+collating-symbol <X4130>
+collating-symbol <X4132>
+collating-symbol <X4134>
 collating-symbol <X4200>
 collating-symbol <X4306>
 collating-symbol <X4308>
@@ -303,7 +306,6 @@ collating-symbol <X4716>
 collating-symbol <X4718>
 collating-symbol <X471A>
 collating-symbol <X471C>
-collating-symbol <X471E>
 collating-symbol <X4720>
 collating-symbol <X4722>
 collating-symbol <X4724>
@@ -319,6 +321,7 @@ collating-symbol <X4736>
 collating-symbol <X4738>
 collating-symbol <X473A>
 collating-symbol <X473C>
+collating-symbol <X473E>
 collating-symbol <X4800>
 collating-symbol <X4906>
 collating-symbol <X4908>
@@ -348,7 +351,6 @@ collating-symbol <X4D10>
 collating-symbol <X4D12>
 collating-symbol <X4D14>
 collating-symbol <X4D16>
-collating-symbol <X4D18>
 collating-symbol <X4D1A>
 collating-symbol <X4D1C>
 collating-symbol <X4D1E>
@@ -357,7 +359,6 @@ collating-symbol <X4D22>
 collating-symbol <X4D24>
 collating-symbol <X4D26>
 collating-symbol <X4D28>
-collating-symbol <X4D2A>
 collating-symbol <X4D2C>
 collating-symbol <X4D2E>
 collating-symbol <X4D30>
@@ -366,15 +367,15 @@ collating-symbol <X4D34>
 collating-symbol <X4D36>
 collating-symbol <X4D38>
 collating-symbol <X4D3A>
-collating-symbol <X4D3C>
 collating-symbol <X4D3E>
+collating-symbol <X4D40>
+collating-symbol <X4D42>
 collating-symbol <X4E00>
 collating-symbol <X4F06>
 collating-symbol <X4F08>
 collating-symbol <X4F0A>
 collating-symbol <X4F0C>
 collating-symbol <X4F0E>
-collating-symbol <X4F10>
 collating-symbol <X4F12>
 collating-symbol <X4F14>
 collating-symbol <X4F16>
@@ -384,6 +385,8 @@ collating-symbol <X4F1C>
 collating-symbol <X4F1E>
 collating-symbol <X4F20>
 collating-symbol <X4F22>
+collating-symbol <X4F24>
+collating-symbol <X4F26>
 collating-symbol <X5000>
 collating-symbol <X5106>
 collating-symbol <X5108>
@@ -392,9 +395,9 @@ collating-symbol <X510C>
 collating-symbol <X510E>
 collating-symbol <X5110>
 collating-symbol <X5112>
-collating-symbol <X5114>
 collating-symbol <X5116>
 collating-symbol <X5118>
+collating-symbol <X511A>
 collating-symbol <X5200>
 collating-symbol <X5306>
 collating-symbol <X5308>
@@ -432,7 +435,6 @@ collating-symbol <X5600>
 collating-symbol <X5706>
 collating-symbol <X5708>
 collating-symbol <X570A>
-collating-symbol <X570C>
 collating-symbol <X5800>
 collating-symbol <X5906>
 collating-symbol <X5908>
@@ -463,7 +465,6 @@ collating-symbol <X5D18>
 collating-symbol <X5D1A>
 collating-symbol <X5D1C>
 collating-symbol <X5D1E>
-collating-symbol <X5D20>
 collating-symbol <X5D22>
 collating-symbol <X5D24>
 collating-symbol <X5D26>
@@ -487,25 +488,28 @@ collating-symbol <X5D48>
 collating-symbol <X5D4A>
 collating-symbol <X5D4C>
 collating-symbol <X5D4E>
-collating-symbol <X5D56>
-collating-symbol <X5D58>
-collating-symbol <X5D5A>
+collating-symbol <X5D50>
+collating-symbol <X5D52>
+collating-symbol <X5D54>
 collating-symbol <X5D5C>
 collating-symbol <X5D5E>
+collating-symbol <X5D60>
+collating-symbol <X5D62>
 collating-symbol <X5D64>
-collating-symbol <X5D66>
-collating-symbol <X5D68>
 collating-symbol <X5D6A>
 collating-symbol <X5D6C>
 collating-symbol <X5D6E>
 collating-symbol <X5D70>
 collating-symbol <X5D72>
 collating-symbol <X5D74>
-collating-symbol <X5D76>
 collating-symbol <X5D78>
 collating-symbol <X5D7A>
 collating-symbol <X5D7C>
 collating-symbol <X5D7E>
+collating-symbol <X5D82>
+collating-symbol <X5D86>
+collating-symbol <X5D88>
+collating-symbol <X5D8A>
 
 order_start forward;forward;forward;forward
 
@@ -526,7 +530,9 @@ order_start forward;forward;forward;forward
 <X31>
 <X34>
 <X70>
+<X74>
 <X78>
+<X7C>
 <X88>
 <X8A>
 <X8C>
@@ -575,32 +581,32 @@ order_start forward;forward;forward;forward
 <X072A>
 <X0736>
 <X075A>
-<X0762>
+<X0764>
 <X0800>
-<X096A>
-<X0978>
-<X098E>
-<X0990>
+<X096E>
+<X097C>
 <X0992>
 <X0994>
 <X0996>
 <X0998>
-<X0A7E>
-<X0A80>
-<X0A8A>
-<X0A8C>
-<X0A90>
-<X0A96>
-<X0A98>
+<X099A>
+<X099C>
+<X0A92>
+<X0A94>
+<X0A9E>
+<X0AA0>
+<X0AA4>
+<X0AAA>
+<X0AAC>
 <X0C04>
 <X0C0A>
-<X0C79>
-<X0C81>
-<X0C83>
-<X0C85>
-<X0C89>
-<X0C8D>
-<X0D8A>
+<X0C7A>
+<X0C82>
+<X0C84>
+<X0C86>
+<X0C8A>
+<X0C8E>
+<X0D8F>
 <X1090>
 <X1092>
 <X1094>
@@ -647,10 +653,10 @@ order_start forward;forward;forward;forward
 <X2F08>
 <X2F0A>
 <X2F0C>
-<X2F0E>
 <X2F10>
 <X2F12>
 <X2F14>
+<X2F16>
 <X3000>
 <X3106>
 <X3108>
@@ -699,7 +705,6 @@ order_start forward;forward;forward;forward
 <X3600>
 <X3706>
 <X3708>
-<X370A>
 <X370C>
 <X370E>
 <X3710>
@@ -707,7 +712,9 @@ order_start forward;forward;forward;forward
 <X3714>
 <X3716>
 <X3718>
-<X371A>
+<X371C>
+<X371E>
+<X3720>
 <X3800>
 <X3906>
 <X3908>
@@ -726,10 +733,10 @@ order_start forward;forward;forward;forward
 <X3B0E>
 <X3B10>
 <X3B12>
-<X3B14>
 <X3B16>
 <X3B18>
 <X3B1A>
+<X3B1C>
 <X3C00>
 <X3D06>
 <X3D08>
@@ -745,7 +752,7 @@ order_start forward;forward;forward;forward
 <X3F0E>
 <X3F10>
 <X3F12>
-<X3F14>
+<X3F16>
 <X4000>
 <X4106>
 <X4108>
@@ -757,16 +764,16 @@ order_start forward;forward;forward;forward
 <X4114>
 <X4116>
 <X4118>
-<X411A>
-<X411C>
 <X411E>
 <X4120>
 <X4122>
 <X4124>
-<X4126>
 <X4128>
 <X412A>
 <X412C>
+<X4130>
+<X4132>
+<X4134>
 <X4200>
 <X4306>
 <X4308>
@@ -804,7 +811,6 @@ order_start forward;forward;forward;forward
 <X4718>
 <X471A>
 <X471C>
-<X471E>
 <X4720>
 <X4722>
 <X4724>
@@ -820,6 +826,7 @@ order_start forward;forward;forward;forward
 <X4738>
 <X473A>
 <X473C>
+<X473E>
 <X4800>
 <X4906>
 <X4908>
@@ -849,7 +856,6 @@ order_start forward;forward;forward;forward
 <X4D12>
 <X4D14>
 <X4D16>
-<X4D18>
 <X4D1A>
 <X4D1C>
 <X4D1E>
@@ -858,7 +864,6 @@ order_start forward;forward;forward;forward
 <X4D24>
 <X4D26>
 <X4D28>
-<X4D2A>
 <X4D2C>
 <X4D2E>
 <X4D30>
@@ -867,15 +872,15 @@ order_start forward;forward;forward;forward
 <X4D36>
 <X4D38>
 <X4D3A>
-<X4D3C>
 <X4D3E>
+<X4D40>
+<X4D42>
 <X4E00>
 <X4F06>
 <X4F08>
 <X4F0A>
 <X4F0C>
 <X4F0E>
-<X4F10>
 <X4F12>
 <X4F14>
 <X4F16>
@@ -885,6 +890,8 @@ order_start forward;forward;forward;forward
 <X4F1E>
 <X4F20>
 <X4F22>
+<X4F24>
+<X4F26>
 <X5000>
 <X5106>
 <X5108>
@@ -893,9 +900,9 @@ order_start forward;forward;forward;forward
 <X510E>
 <X5110>
 <X5112>
-<X5114>
 <X5116>
 <X5118>
+<X511A>
 <X5200>
 <X5306>
 <X5308>
@@ -933,7 +940,6 @@ order_start forward;forward;forward;forward
 <X5706>
 <X5708>
 <X570A>
-<X570C>
 <X5800>
 <X5906>
 <X5908>
@@ -964,7 +970,6 @@ order_start forward;forward;forward;forward
 <X5D1A>
 <X5D1C>
 <X5D1E>
-<X5D20>
 <X5D22>
 <X5D24>
 <X5D26>
@@ -988,25 +993,28 @@ order_start forward;forward;forward;forward
 <X5D4A>
 <X5D4C>
 <X5D4E>
-<X5D56>
-<X5D58>
-<X5D5A>
+<X5D50>
+<X5D52>
+<X5D54>
 <X5D5C>
 <X5D5E>
+<X5D60>
+<X5D62>
 <X5D64>
-<X5D66>
-<X5D68>
 <X5D6A>
 <X5D6C>
 <X5D6E>
 <X5D70>
 <X5D72>
 <X5D74>
-<X5D76>
 <X5D78>
 <X5D7A>
 <X5D7C>
 <X5D7E>
+<X5D82>
+<X5D86>
+<X5D88>
+<X5D8A>
 
 * assignment of characters to weights
 
@@ -1050,32 +1058,32 @@ order_start forward;forward;forward;forward
 <SEMICOLON> <X072A>;<X05>;<X05>;<SEMICOLON>
 <COLON> <X0736>;<X05>;<X05>;<COLON>
 <EXCLAMATION_MARK> <X075A>;<X05>;<X05>;<EXCLAMATION_MARK>
-<QUESTION_MARK> <X0762>;<X05>;<X05>;<QUESTION_MARK>
+<QUESTION_MARK> <X0764>;<X05>;<X05>;<QUESTION_MARK>
 <FULL_STOP> <X0800>;<X05>;<X05>;<FULL_STOP>
-<APOSTROPHE> <X096A>;<X05>;<X05>;<APOSTROPHE>
-<QUOTATION_MARK> <X0978>;<X05>;<X05>;<QUOTATION_MARK>
-<LEFT_PARENTHESIS> <X098E>;<X05>;<X05>;<LEFT_PARENTHESIS>
-<RIGHT_PARENTHESIS> <X0990>;<X05>;<X05>;<RIGHT_PARENTHESIS>
-<LEFT_SQUARE_BRACKET> <X0992>;<X05>;<X05>;<LEFT_SQUARE_BRACKET>
-<RIGHT_SQUARE_BRACKET> <X0994>;<X05>;<X05>;<RIGHT_SQUARE_BRACKET>
-<LEFT_CURLY_BRACKET> <X0996>;<X05>;<X05>;<LEFT_CURLY_BRACKET>
-<RIGHT_CURLY_BRACKET> <X0998>;<X05>;<X05>;<RIGHT_CURLY_BRACKET>
-<COMMERCIAL_AT> <X0A7E>;<X05>;<X05>;<COMMERCIAL_AT>
-<ASTERISK> <X0A80>;<X05>;<X05>;<ASTERISK>
-<SOLIDUS> <X0A8A>;<X05>;<X05>;<SOLIDUS>
-<REVERSE_SOLIDUS> <X0A8C>;<X05>;<X05>;<REVERSE_SOLIDUS>
-<AMPERSAND> <X0A90>;<X05>;<X05>;<AMPERSAND>
-<NUMBER_SIGN> <X0A96>;<X05>;<X05>;<NUMBER_SIGN>
-<PERCENT_SIGN> <X0A98>;<X05>;<X05>;<PERCENT_SIGN>
+<APOSTROPHE> <X096E>;<X05>;<X05>;<APOSTROPHE>
+<QUOTATION_MARK> <X097C>;<X05>;<X05>;<QUOTATION_MARK>
+<LEFT_PARENTHESIS> <X0992>;<X05>;<X05>;<LEFT_PARENTHESIS>
+<RIGHT_PARENTHESIS> <X0994>;<X05>;<X05>;<RIGHT_PARENTHESIS>
+<LEFT_SQUARE_BRACKET> <X0996>;<X05>;<X05>;<LEFT_SQUARE_BRACKET>
+<RIGHT_SQUARE_BRACKET> <X0998>;<X05>;<X05>;<RIGHT_SQUARE_BRACKET>
+<LEFT_CURLY_BRACKET> <X099A>;<X05>;<X05>;<LEFT_CURLY_BRACKET>
+<RIGHT_CURLY_BRACKET> <X099C>;<X05>;<X05>;<RIGHT_CURLY_BRACKET>
+<COMMERCIAL_AT> <X0A92>;<X05>;<X05>;<COMMERCIAL_AT>
+<ASTERISK> <X0A94>;<X05>;<X05>;<ASTERISK>
+<SOLIDUS> <X0A9E>;<X05>;<X05>;<SOLIDUS>
+<REVERSE_SOLIDUS> <X0AA0>;<X05>;<X05>;<REVERSE_SOLIDUS>
+<AMPERSAND> <X0AA4>;<X05>;<X05>;<AMPERSAND>
+<NUMBER_SIGN> <X0AAA>;<X05>;<X05>;<NUMBER_SIGN>
+<PERCENT_SIGN> <X0AAC>;<X05>;<X05>;<PERCENT_SIGN>
 <GRAVE_ACCENT> <X0C04>;<X05>;<X05>;<GRAVE_ACCENT>
 <CIRCUMFLEX_ACCENT> <X0C0A>;<X05>;<X05>;<CIRCUMFLEX_ACCENT>
-<PLUS_SIGN> <X0C79>;<X05>;<X05>;<PLUS_SIGN>
-<LESS-THAN_SIGN> <X0C81>;<X05>;<X05>;<LESS-THAN_SIGN>
-<EQUALS_SIGN> <X0C83>;<X05>;<X05>;<EQUALS_SIGN>
-<GREATER-THAN_SIGN> <X0C85>;<X05>;<X05>;<GREATER-THAN_SIGN>
-<VERTICAL_LINE> <X0C89>;<X05>;<X05>;<VERTICAL_LINE>
-<TILDE> <X0C8D>;<X05>;<X05>;<TILDE>
-<DOLLAR_SIGN> <X0D8A>;<X05>;<X05>;<DOLLAR_SIGN>
+<PLUS_SIGN> <X0C7A>;<X05>;<X05>;<PLUS_SIGN>
+<LESS-THAN_SIGN> <X0C82>;<X05>;<X05>;<LESS-THAN_SIGN>
+<EQUALS_SIGN> <X0C84>;<X05>;<X05>;<EQUALS_SIGN>
+<GREATER-THAN_SIGN> <X0C86>;<X05>;<X05>;<GREATER-THAN_SIGN>
+<VERTICAL_LINE> <X0C8A>;<X05>;<X05>;<VERTICAL_LINE>
+<TILDE> <X0C8E>;<X05>;<X05>;<TILDE>
+<DOLLAR_SIGN> <X0D8F>;<X05>;<X05>;<DOLLAR_SIGN>
 <ROMAN_NUMERAL_ONE_THOUSAND_C_D> <X1090>;<X05>;<X05>;<ROMAN_NUMERAL_ONE_THOUSAND_C_D>
 <ROMAN_NUMERAL_FIVE_THOUSAND> <X1092>;<X05>;<X05>;<ROMAN_NUMERAL_FIVE_THOUSAND>
 <ROMAN_NUMERAL_TEN_THOUSAND> <X1094>;<X05>;<X05>;<ROMAN_NUMERAL_TEN_THOUSAND>
@@ -1145,7 +1153,9 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_A_WITH_DOT_ABOVE_AND_MACRON> <X2A00>;"<X05><X9C><XA4>";"<X05><X05><X05>";<LATIN_SMALL_LETTER_A_WITH_DOT_ABOVE_AND_MACRON>
 <LATIN_CAPITAL_LETTER_A_WITH_DOT_ABOVE_AND_MACRON> <X2A00>;"<X05><X9C><XA4>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_A_WITH_DOT_ABOVE_AND_MACRON>
 <LATIN_SMALL_LETTER_A_WITH_OGONEK> <X2A00>;"<X05><XA2>";"<X05><X05>";<LATIN_SMALL_LETTER_A_WITH_OGONEK>
+<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>
@@ -1181,7 +1191,7 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_AV_WITH_HORIZONTAL_BAR> "<X2A00><X5400>";"<X70><X05>";"<XA0><XA2>";<LATIN_CAPITAL_LETTER_AV_WITH_HORIZONTAL_BAR>
 <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><X5D56>";"<X05><X05>";"<X13><X20>";<LATIN_SMALL_LETTER_A_WITH_RIGHT_HALF_RING>
+<LATIN_SMALL_LETTER_A_WITH_RIGHT_HALF_RING> "<X2A00><X5D5C>";"<X05><X05>";"<X13><X20>";<LATIN_SMALL_LETTER_A_WITH_RIGHT_HALF_RING>
 <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>
@@ -1238,6 +1248,7 @@ order_start forward;forward;forward;forward
 <FULLWIDTH_LATIN_CAPITAL_LETTER_C> <X2E00>;<X05>;<X9F>;<FULLWIDTH_LATIN_CAPITAL_LETTER_C>
 <ROMAN_NUMERAL_ONE_HUNDRED> <X2E00>;<X05>;<XA2>;<ROMAN_NUMERAL_ONE_HUNDRED>
 <MODIFIER_LETTER_SMALL_C> <X2E00>;<X05>;<X2B>;<MODIFIER_LETTER_SMALL_C>
+<MODIFIER_LETTER_CAPITAL_C> <X2E00>;<X05>;<XB1>;<MODIFIER_LETTER_CAPITAL_C>
 <LATIN_SMALL_LETTER_C_WITH_ACUTE> <X2E00>;"<X05><X88>";"<X05><X05>";<LATIN_SMALL_LETTER_C_WITH_ACUTE>
 <LATIN_CAPITAL_LETTER_C_WITH_ACUTE> <X2E00>;"<X05><X88>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_C_WITH_ACUTE>
 <LATIN_SMALL_LETTER_C_WITH_CIRCUMFLEX> <X2E00>;"<X05><X8E>";"<X05><X05>";<LATIN_SMALL_LETTER_C_WITH_CIRCUMFLEX>
@@ -1257,14 +1268,14 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_C_WITH_BAR> <X2F0A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_C_WITH_BAR>
 <LATIN_SMALL_LETTER_C_WITH_PALATAL_HOOK> <X2F0C>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_PALATAL_HOOK>
 <LATIN_CAPITAL_LETTER_C_WITH_PALATAL_HOOK> <X2F0C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_C_WITH_PALATAL_HOOK>
-<LATIN_SMALL_LETTER_C_WITH_HOOK> <X2F0E>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_HOOK>
-<LATIN_CAPITAL_LETTER_C_WITH_HOOK> <X2F0E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_C_WITH_HOOK>
-<LATIN_SMALL_LETTER_C_WITH_CURL> <X2F10>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_CURL>
-<MODIFIER_LETTER_SMALL_C_WITH_CURL> <X2F10>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_C_WITH_CURL>
-<LATIN_SMALL_LETTER_REVERSED_C> <X2F12>;<X05>;<X05>;<LATIN_SMALL_LETTER_REVERSED_C>
-<ROMAN_NUMERAL_REVERSED_ONE_HUNDRED> <X2F12>;<X05>;<XA0>;<ROMAN_NUMERAL_REVERSED_ONE_HUNDRED>
-<LATIN_SMALL_LETTER_REVERSED_C_WITH_DOT> <X2F14>;<X05>;<X05>;<LATIN_SMALL_LETTER_REVERSED_C_WITH_DOT>
-<LATIN_CAPITAL_LETTER_REVERSED_C_WITH_DOT> <X2F14>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_REVERSED_C_WITH_DOT>
+<LATIN_SMALL_LETTER_C_WITH_HOOK> <X2F10>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_HOOK>
+<LATIN_CAPITAL_LETTER_C_WITH_HOOK> <X2F10>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_C_WITH_HOOK>
+<LATIN_SMALL_LETTER_C_WITH_CURL> <X2F12>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_CURL>
+<MODIFIER_LETTER_SMALL_C_WITH_CURL> <X2F12>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_C_WITH_CURL>
+<LATIN_SMALL_LETTER_REVERSED_C> <X2F14>;<X05>;<X05>;<LATIN_SMALL_LETTER_REVERSED_C>
+<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>
 <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>
@@ -1414,6 +1425,7 @@ order_start forward;forward;forward;forward
 <F> <X3400>;<X05>;<X9C>;<F>
 <FULLWIDTH_LATIN_CAPITAL_LETTER_F> <X3400>;<X05>;<X9F>;<FULLWIDTH_LATIN_CAPITAL_LETTER_F>
 <MODIFIER_LETTER_SMALL_F> <X3400>;<X05>;<X2B>;<MODIFIER_LETTER_SMALL_F>
+<MODIFIER_LETTER_CAPITAL_F> <X3400>;<X05>;<XB1>;<MODIFIER_LETTER_CAPITAL_F>
 <LATIN_SMALL_LETTER_F_WITH_DOT_ABOVE> <X3400>;"<X05><X9C>";"<X05><X05>";<LATIN_SMALL_LETTER_F_WITH_DOT_ABOVE>
 <LATIN_CAPITAL_LETTER_F_WITH_DOT_ABOVE> <X3400>;"<X05><X9C>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_F_WITH_DOT_ABOVE>
 <LATIN_SMALL_LETTER_INSULAR_F> <X3400>;<X70>;<X05>;<LATIN_SMALL_LETTER_INSULAR_F>
@@ -1459,25 +1471,27 @@ 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_SCRIPT_G> <X3706>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_G>
-<LATIN_CAPITAL_LETTER_SCRIPT_G> <X3706>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_SCRIPT_G>
-<MODIFIER_LETTER_SMALL_SCRIPT_G> <X3706>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_SCRIPT_G>
-<LATIN_SMALL_LETTER_SCRIPT_G_WITH_CROSSED-TAIL> <X3708>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_G_WITH_CROSSED-TAIL>
-<LATIN_LETTER_SMALL_CAPITAL_G> <X370A>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_G>
-<LATIN_SMALL_LETTER_G_WITH_STROKE> <X370C>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_STROKE>
-<LATIN_CAPITAL_LETTER_G_WITH_STROKE> <X370C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_G_WITH_STROKE>
-<LATIN_SMALL_LETTER_G_WITH_PALATAL_HOOK> <X370E>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_PALATAL_HOOK>
-<LATIN_SMALL_LETTER_G_WITH_HOOK> <X3710>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_HOOK>
-<LATIN_CAPITAL_LETTER_G_WITH_HOOK> <X3710>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_G_WITH_HOOK>
-<LATIN_LETTER_SMALL_CAPITAL_G_WITH_HOOK> <X3712>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_G_WITH_HOOK>
-<LATIN_SMALL_LETTER_TURNED_G> <X3714>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_G>
-<LATIN_SMALL_LETTER_TURNED_INSULAR_G> <X3716>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_INSULAR_G>
-<LATIN_CAPITAL_LETTER_TURNED_INSULAR_G> <X3716>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_INSULAR_G>
-<LATIN_SMALL_LETTER_GAMMA> <X3718>;<X05>;<X05>;<LATIN_SMALL_LETTER_GAMMA>
-<LATIN_CAPITAL_LETTER_GAMMA> <X3718>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_GAMMA>
-<MODIFIER_LETTER_SMALL_GAMMA> <X3718>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_GAMMA>
-<LATIN_SMALL_LETTER_OI> <X371A>;<X05>;<X05>;<LATIN_SMALL_LETTER_OI>
-<LATIN_CAPITAL_LETTER_OI> <X371A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OI>
+<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>
+<LATIN_CAPITAL_LETTER_SCRIPT_G> <X3708>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_SCRIPT_G>
+<MODIFIER_LETTER_SMALL_SCRIPT_G> <X3708>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_SCRIPT_G>
+<LATIN_SMALL_LETTER_SCRIPT_G_WITH_CROSSED-TAIL> <X370C>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_G_WITH_CROSSED-TAIL>
+<LATIN_LETTER_SMALL_CAPITAL_G> <X370E>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_G>
+<LATIN_SMALL_LETTER_G_WITH_STROKE> <X3710>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_STROKE>
+<LATIN_CAPITAL_LETTER_G_WITH_STROKE> <X3710>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_G_WITH_STROKE>
+<LATIN_SMALL_LETTER_G_WITH_PALATAL_HOOK> <X3712>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_PALATAL_HOOK>
+<LATIN_SMALL_LETTER_G_WITH_HOOK> <X3714>;<X05>;<X05>;<LATIN_SMALL_LETTER_G_WITH_HOOK>
+<LATIN_CAPITAL_LETTER_G_WITH_HOOK> <X3714>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_G_WITH_HOOK>
+<LATIN_LETTER_SMALL_CAPITAL_G_WITH_HOOK> <X3716>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_G_WITH_HOOK>
+<LATIN_SMALL_LETTER_TURNED_G> <X3718>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_G>
+<LATIN_SMALL_LETTER_TURNED_INSULAR_G> <X371C>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_INSULAR_G>
+<LATIN_CAPITAL_LETTER_TURNED_INSULAR_G> <X371C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_INSULAR_G>
+<LATIN_SMALL_LETTER_GAMMA> <X371E>;<X05>;<X05>;<LATIN_SMALL_LETTER_GAMMA>
+<LATIN_CAPITAL_LETTER_GAMMA> <X371E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_GAMMA>
+<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>
 <h> <X3800>;<X05>;<X05>;<h>
 <FULLWIDTH_LATIN_SMALL_LETTER_H> <X3800>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_H>
 <H> <X3800>;<X05>;<X9C>;<H>
@@ -1583,13 +1597,13 @@ order_start forward;forward;forward;forward
 <MODIFIER_LETTER_SMALL_I_WITH_STROKE> <X3B10>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_I_WITH_STROKE>
 <LATIN_SMALL_CAPITAL_LETTER_I_WITH_STROKE> <X3B12>;<X05>;<X05>;<LATIN_SMALL_CAPITAL_LETTER_I_WITH_STROKE>
 <MODIFIER_LETTER_SMALL_CAPITAL_I_WITH_STROKE> <X3B12>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_CAPITAL_I_WITH_STROKE>
-<LATIN_SMALL_LETTER_I_WITH_RETROFLEX_HOOK> <X3B14>;<X05>;<X05>;<LATIN_SMALL_LETTER_I_WITH_RETROFLEX_HOOK>
-<LATIN_SMALL_LETTER_GLOTTAL_I> <X3B16>;<X05>;<X05>;<LATIN_SMALL_LETTER_GLOTTAL_I>
-<LATIN_CAPITAL_LETTER_GLOTTAL_I> <X3B16>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_GLOTTAL_I>
-<LATIN_SMALL_LETTER_IOTA> <X3B18>;<X05>;<X05>;<LATIN_SMALL_LETTER_IOTA>
-<LATIN_CAPITAL_LETTER_IOTA> <X3B18>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_IOTA>
-<MODIFIER_LETTER_SMALL_IOTA> <X3B18>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_IOTA>
-<LATIN_SMALL_LETTER_IOTA_WITH_STROKE> <X3B1A>;<X05>;<X05>;<LATIN_SMALL_LETTER_IOTA_WITH_STROKE>
+<LATIN_SMALL_LETTER_I_WITH_RETROFLEX_HOOK> <X3B16>;<X05>;<X05>;<LATIN_SMALL_LETTER_I_WITH_RETROFLEX_HOOK>
+<LATIN_SMALL_LETTER_GLOTTAL_I> <X3B18>;<X05>;<X05>;<LATIN_SMALL_LETTER_GLOTTAL_I>
+<LATIN_CAPITAL_LETTER_GLOTTAL_I> <X3B18>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_GLOTTAL_I>
+<LATIN_SMALL_LETTER_IOTA> <X3B1A>;<X05>;<X05>;<LATIN_SMALL_LETTER_IOTA>
+<LATIN_CAPITAL_LETTER_IOTA> <X3B1A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_IOTA>
+<MODIFIER_LETTER_SMALL_IOTA> <X3B1A>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_IOTA>
+<LATIN_SMALL_LETTER_IOTA_WITH_STROKE> <X3B1C>;<X05>;<X05>;<LATIN_SMALL_LETTER_IOTA_WITH_STROKE>
 <j> <X3C00>;<X05>;<X05>;<j>
 <FULLWIDTH_LATIN_SMALL_LETTER_J> <X3C00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_J>
 <J> <X3C00>;<X05>;<X9C>;<J>
@@ -1642,8 +1656,8 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_K_WITH_DIAGONAL_STROKE> <X3F10>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_K_WITH_DIAGONAL_STROKE>
 <LATIN_SMALL_LETTER_K_WITH_STROKE_AND_DIAGONAL_STROKE> <X3F12>;<X05>;<X05>;<LATIN_SMALL_LETTER_K_WITH_STROKE_AND_DIAGONAL_STROKE>
 <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> <X3F14>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_K>
-<LATIN_CAPITAL_LETTER_TURNED_K> <X3F14>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_K>
+<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>
 <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>
@@ -1696,20 +1710,20 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_L_WITH_MIDDLE_RING> <X4116>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_MIDDLE_RING>
 <LATIN_SMALL_LETTER_L_WITH_BELT> <X4118>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_BELT>
 <LATIN_CAPITAL_LETTER_L_WITH_BELT> <X4118>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_L_WITH_BELT>
-<LATIN_SMALL_LETTER_L_WITH_INVERTED_LAZY_S> <X411A>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_INVERTED_LAZY_S>
-<MODIFIER_LETTER_SMALL_L_WITH_INVERTED_LAZY_S> <X411A>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_L_WITH_INVERTED_LAZY_S>
-<LATIN_SMALL_LETTER_L_WITH_PALATAL_HOOK> <X411C>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_PALATAL_HOOK>
-<MODIFIER_LETTER_SMALL_L_WITH_PALATAL_HOOK> <X411C>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_L_WITH_PALATAL_HOOK>
-<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK> <X411E>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK>
-<MODIFIER_LETTER_SMALL_L_WITH_RETROFLEX_HOOK> <X411E>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_L_WITH_RETROFLEX_HOOK>
-<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK_AND_BELT> <X4120>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK_AND_BELT>
-<LATIN_SMALL_LETTER_L_WITH_CURL> <X4122>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_CURL>
-<LATIN_SMALL_LETTER_LUM> <X4124>;<X05>;<X05>;<LATIN_SMALL_LETTER_LUM>
-<LATIN_SMALL_LETTER_LEZH> <X4126>;<X05>;<X05>;<LATIN_SMALL_LETTER_LEZH>
-<LATIN_SMALL_LETTER_TURNED_L> <X4128>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_L>
-<LATIN_CAPITAL_LETTER_TURNED_L> <X4128>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_L>
-<LATIN_SMALL_LETTER_LAMBDA_WITH_STROKE> <X412A>;<X05>;<X05>;<LATIN_SMALL_LETTER_LAMBDA_WITH_STROKE>
-<LATIN_SMALL_LETTER_TURNED_Y> <X412C>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_Y>
+<LATIN_SMALL_LETTER_L_WITH_INVERTED_LAZY_S> <X411E>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_INVERTED_LAZY_S>
+<MODIFIER_LETTER_SMALL_L_WITH_INVERTED_LAZY_S> <X411E>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_L_WITH_INVERTED_LAZY_S>
+<LATIN_SMALL_LETTER_L_WITH_PALATAL_HOOK> <X4120>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_PALATAL_HOOK>
+<MODIFIER_LETTER_SMALL_L_WITH_PALATAL_HOOK> <X4120>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_L_WITH_PALATAL_HOOK>
+<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK> <X4122>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK>
+<MODIFIER_LETTER_SMALL_L_WITH_RETROFLEX_HOOK> <X4122>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_L_WITH_RETROFLEX_HOOK>
+<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK_AND_BELT> <X4124>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK_AND_BELT>
+<LATIN_SMALL_LETTER_L_WITH_CURL> <X4128>;<X05>;<X05>;<LATIN_SMALL_LETTER_L_WITH_CURL>
+<LATIN_SMALL_LETTER_LUM> <X412A>;<X05>;<X05>;<LATIN_SMALL_LETTER_LUM>
+<LATIN_SMALL_LETTER_LEZH> <X412C>;<X05>;<X05>;<LATIN_SMALL_LETTER_LEZH>
+<LATIN_SMALL_LETTER_TURNED_L> <X4130>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_L>
+<LATIN_CAPITAL_LETTER_TURNED_L> <X4130>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_L>
+<LATIN_SMALL_LETTER_LAMBDA_WITH_STROKE> <X4132>;<X05>;<X05>;<LATIN_SMALL_LETTER_LAMBDA_WITH_STROKE>
+<LATIN_SMALL_LETTER_TURNED_Y> <X4134>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_Y>
 <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>
@@ -1887,33 +1901,33 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_TURNED_O_OPEN-O_WITH_STROKE> <X4718>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_O_OPEN-O_WITH_STROKE>
 <LATIN_SMALL_LETTER_SIDEWAYS_O_WITH_STROKE> <X471A>;<X05>;<X05>;<LATIN_SMALL_LETTER_SIDEWAYS_O_WITH_STROKE>
 <LATIN_SMALL_LETTER_BLACKLETTER_O_WITH_STROKE> <X471C>;<X05>;<X05>;<LATIN_SMALL_LETTER_BLACKLETTER_O_WITH_STROKE>
-<LATIN_SMALL_LETTER_OPEN_O> <X471E>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_O>
-<LATIN_CAPITAL_LETTER_OPEN_O> <X471E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OPEN_O>
-<MODIFIER_LETTER_SMALL_OPEN_O> <X471E>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_OPEN_O>
-<LATIN_LETTER_SMALL_CAPITAL_OPEN_O> <X4720>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_OPEN_O>
-<LATIN_SMALL_LETTER_SIDEWAYS_OPEN_O> <X4722>;<X05>;<X05>;<LATIN_SMALL_LETTER_SIDEWAYS_OPEN_O>
-<LATIN_SMALL_LETTER_OPEN_O_WITH_STROKE> <X4724>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_O_WITH_STROKE>
-<LATIN_SMALL_LETTER_OPEN_O_WITH_RETROFLEX_HOOK> <X4726>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_O_WITH_RETROFLEX_HOOK>
-<LATIN_SMALL_LETTER_OPEN_OE> <X4728>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_OE>
-<LATIN_SMALL_LETTER_O_WITH_LOOP> <X472A>;<X05>;<X05>;<LATIN_SMALL_LETTER_O_WITH_LOOP>
-<LATIN_CAPITAL_LETTER_O_WITH_LOOP> <X472A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_O_WITH_LOOP>
-<LATIN_SMALL_LETTER_TOP_HALF_O> <X472C>;<X05>;<X05>;<LATIN_SMALL_LETTER_TOP_HALF_O>
-<MODIFIER_LETTER_SMALL_TOP_HALF_O> <X472C>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TOP_HALF_O>
-<LATIN_SMALL_LETTER_BOTTOM_HALF_O> <X472E>;<X05>;<X05>;<LATIN_SMALL_LETTER_BOTTOM_HALF_O>
-<MODIFIER_LETTER_SMALL_BOTTOM_HALF_O> <X472E>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_BOTTOM_HALF_O>
-<LATIN_SMALL_LETTER_O_WITH_LOW_RING_INSIDE> <X4730>;<X05>;<X05>;<LATIN_SMALL_LETTER_O_WITH_LOW_RING_INSIDE>
-<LATIN_SMALL_LETTER_BARRED_O> <X4732>;<X05>;<X05>;<LATIN_SMALL_LETTER_BARRED_O>
-<LATIN_CAPITAL_LETTER_O_WITH_MIDDLE_TILDE> <X4732>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_O_WITH_MIDDLE_TILDE>
-<MODIFIER_LETTER_SMALL_BARRED_O> <X4732>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_BARRED_O>
-<LATIN_SMALL_LETTER_O_WITH_LONG_STROKE_OVERLAY> <X4734>;<X05>;<X05>;<LATIN_SMALL_LETTER_O_WITH_LONG_STROKE_OVERLAY>
-<LATIN_CAPITAL_LETTER_O_WITH_LONG_STROKE_OVERLAY> <X4734>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_O_WITH_LONG_STROKE_OVERLAY>
-<LATIN_SMALL_LETTER_CLOSED_OMEGA> <X4736>;<X05>;<X05>;<LATIN_SMALL_LETTER_CLOSED_OMEGA>
-<LATIN_SMALL_LETTER_OMEGA> <X4738>;<X05>;<X05>;<LATIN_SMALL_LETTER_OMEGA>
-<LATIN_CAPITAL_LETTER_OMEGA> <X4738>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OMEGA>
-<LATIN_SMALL_LETTER_OU> <X473A>;<X05>;<X05>;<LATIN_SMALL_LETTER_OU>
-<LATIN_CAPITAL_LETTER_OU> <X473A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OU>
-<MODIFIER_LETTER_CAPITAL_OU> <X473A>;<X05>;<XAE>;<MODIFIER_LETTER_CAPITAL_OU>
-<LATIN_LETTER_SMALL_CAPITAL_OU> <X473C>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_OU>
+<LATIN_SMALL_LETTER_OPEN_O> <X4720>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_O>
+<LATIN_CAPITAL_LETTER_OPEN_O> <X4720>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OPEN_O>
+<MODIFIER_LETTER_SMALL_OPEN_O> <X4720>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_OPEN_O>
+<LATIN_LETTER_SMALL_CAPITAL_OPEN_O> <X4722>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_OPEN_O>
+<LATIN_SMALL_LETTER_SIDEWAYS_OPEN_O> <X4724>;<X05>;<X05>;<LATIN_SMALL_LETTER_SIDEWAYS_OPEN_O>
+<LATIN_SMALL_LETTER_OPEN_O_WITH_STROKE> <X4726>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_O_WITH_STROKE>
+<LATIN_SMALL_LETTER_OPEN_O_WITH_RETROFLEX_HOOK> <X4728>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_O_WITH_RETROFLEX_HOOK>
+<LATIN_SMALL_LETTER_OPEN_OE> <X472A>;<X05>;<X05>;<LATIN_SMALL_LETTER_OPEN_OE>
+<LATIN_SMALL_LETTER_O_WITH_LOOP> <X472C>;<X05>;<X05>;<LATIN_SMALL_LETTER_O_WITH_LOOP>
+<LATIN_CAPITAL_LETTER_O_WITH_LOOP> <X472C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_O_WITH_LOOP>
+<LATIN_SMALL_LETTER_TOP_HALF_O> <X472E>;<X05>;<X05>;<LATIN_SMALL_LETTER_TOP_HALF_O>
+<MODIFIER_LETTER_SMALL_TOP_HALF_O> <X472E>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TOP_HALF_O>
+<LATIN_SMALL_LETTER_BOTTOM_HALF_O> <X4730>;<X05>;<X05>;<LATIN_SMALL_LETTER_BOTTOM_HALF_O>
+<MODIFIER_LETTER_SMALL_BOTTOM_HALF_O> <X4730>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_BOTTOM_HALF_O>
+<LATIN_SMALL_LETTER_O_WITH_LOW_RING_INSIDE> <X4732>;<X05>;<X05>;<LATIN_SMALL_LETTER_O_WITH_LOW_RING_INSIDE>
+<LATIN_SMALL_LETTER_BARRED_O> <X4734>;<X05>;<X05>;<LATIN_SMALL_LETTER_BARRED_O>
+<LATIN_CAPITAL_LETTER_O_WITH_MIDDLE_TILDE> <X4734>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_O_WITH_MIDDLE_TILDE>
+<MODIFIER_LETTER_SMALL_BARRED_O> <X4734>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_BARRED_O>
+<LATIN_SMALL_LETTER_O_WITH_LONG_STROKE_OVERLAY> <X4736>;<X05>;<X05>;<LATIN_SMALL_LETTER_O_WITH_LONG_STROKE_OVERLAY>
+<LATIN_CAPITAL_LETTER_O_WITH_LONG_STROKE_OVERLAY> <X4736>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_O_WITH_LONG_STROKE_OVERLAY>
+<LATIN_SMALL_LETTER_CLOSED_OMEGA> <X4738>;<X05>;<X05>;<LATIN_SMALL_LETTER_CLOSED_OMEGA>
+<LATIN_SMALL_LETTER_OMEGA> <X473A>;<X05>;<X05>;<LATIN_SMALL_LETTER_OMEGA>
+<LATIN_CAPITAL_LETTER_OMEGA> <X473A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OMEGA>
+<LATIN_SMALL_LETTER_OU> <X473C>;<X05>;<X05>;<LATIN_SMALL_LETTER_OU>
+<LATIN_CAPITAL_LETTER_OU> <X473C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_OU>
+<MODIFIER_LETTER_CAPITAL_OU> <X473C>;<X05>;<XAE>;<MODIFIER_LETTER_CAPITAL_OU>
+<LATIN_LETTER_SMALL_CAPITAL_OU> <X473E>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_OU>
 <p> <X4800>;<X05>;<X05>;<p>
 <FULLWIDTH_LATIN_SMALL_LETTER_P> <X4800>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_P>
 <P> <X4800>;<X05>;<X9C>;<P>
@@ -1944,9 +1958,10 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_TAILLESS_PHI> <X491A>;<X05>;<X05>;<LATIN_SMALL_LETTER_TAILLESS_PHI>
 <q> <X4A00>;<X05>;<X05>;<q>
 <FULLWIDTH_LATIN_SMALL_LETTER_Q> <X4A00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_Q>
-<Q> <X4A00>;<X05>;<XA0>;<Q>
-<FULLWIDTH_LATIN_CAPITAL_LETTER_Q> <X4A00>;<X05>;<XA4>;<FULLWIDTH_LATIN_CAPITAL_LETTER_Q>
-<LATIN_SMALL_LETTER_QP_DIGRAPH> "<X4A00><X4800>";"<X05><X05>";"<X14><X13>";<LATIN_SMALL_LETTER_QP_DIGRAPH>
+<Q> <X4A00>;<X05>;<X9C>;<Q>
+<FULLWIDTH_LATIN_CAPITAL_LETTER_Q> <X4A00>;<X05>;<X9F>;<FULLWIDTH_LATIN_CAPITAL_LETTER_Q>
+<MODIFIER_LETTER_CAPITAL_Q> <X4A00>;<X05>;<XB1>;<MODIFIER_LETTER_CAPITAL_Q>
+<LATIN_SMALL_LETTER_QP_DIGRAPH> "<X4A00><X4800>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_QP_DIGRAPH>
 <LATIN_LETTER_SMALL_CAPITAL_Q> <X4B06>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_Q>
 <LATIN_SMALL_LETTER_Q_WITH_STROKE_THROUGH_DESCENDER> <X4B08>;<X05>;<X05>;<LATIN_SMALL_LETTER_Q_WITH_STROKE_THROUGH_DESCENDER>
 <LATIN_CAPITAL_LETTER_Q_WITH_STROKE_THROUGH_DESCENDER> <X4B08>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_Q_WITH_STROKE_THROUGH_DESCENDER>
@@ -1985,20 +2000,20 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_R_WITH_LINE_BELOW> <X4C00>;"<X05><XD2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_R_WITH_LINE_BELOW>
 <LATIN_SMALL_LETTER_INSULAR_R> <X4C00>;<X70>;<X05>;<LATIN_SMALL_LETTER_INSULAR_R>
 <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_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>;<XAE>;<LATIN_LETTER_YR>
+<LATIN_LETTER_YR> <X4D08>;<X05>;<X9E>;<LATIN_LETTER_YR>
 <LATIN_LETTER_SMALL_CAPITAL_R_WITH_RIGHT_LEG> <X4D0A>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_R_WITH_RIGHT_LEG>
-<LATIN_SMALL_LETTER_R_ROTUNDA> <X4D0C>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_ROTUNDA>
-<LATIN_CAPITAL_LETTER_R_ROTUNDA> <X4D0C>;<X05>;<XAE>;<LATIN_CAPITAL_LETTER_R_ROTUNDA>
-<LATIN_LETTER_SMALL_CAPITAL_REVERSED_R> <X4D0E>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_REVERSED_R>
-<LATIN_SMALL_LETTER_R_WITH_STROKE> <X4D10>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_STROKE>
-<LATIN_CAPITAL_LETTER_R_WITH_STROKE> <X4D10>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_R_WITH_STROKE>
-<LATIN_SMALL_LETTER_R_WITH_MIDDLE_TILDE> <X4D12>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_MIDDLE_TILDE>
-<LATIN_SMALL_LETTER_TURNED_R> <X4D14>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_R>
-<MODIFIER_LETTER_SMALL_TURNED_R> <X4D14>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TURNED_R>
-<LATIN_LETTER_SMALL_CAPITAL_TURNED_R> <X4D16>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_TURNED_R>
-<LATIN_SMALL_LETTER_TURNED_R_WITH_LONG_LEG> <X4D18>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_R_WITH_LONG_LEG>
+<LATIN_LETTER_SMALL_CAPITAL_REVERSED_R> <X4D0C>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_REVERSED_R>
+<LATIN_SMALL_LETTER_R_WITH_STROKE> <X4D0E>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_STROKE>
+<LATIN_CAPITAL_LETTER_R_WITH_STROKE> <X4D0E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_R_WITH_STROKE>
+<LATIN_SMALL_LETTER_R_WITH_MIDDLE_TILDE> <X4D10>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_MIDDLE_TILDE>
+<LATIN_SMALL_LETTER_TURNED_R> <X4D12>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_R>
+<MODIFIER_LETTER_SMALL_TURNED_R> <X4D12>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TURNED_R>
+<LATIN_LETTER_SMALL_CAPITAL_TURNED_R> <X4D14>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_TURNED_R>
+<LATIN_SMALL_LETTER_TURNED_R_WITH_LONG_LEG> <X4D16>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_R_WITH_LONG_LEG>
 <LATIN_SMALL_LETTER_R_WITH_PALATAL_HOOK> <X4D1A>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_PALATAL_HOOK>
 <LATIN_SMALL_LETTER_TURNED_R_WITH_HOOK> <X4D1C>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_R_WITH_HOOK>
 <MODIFIER_LETTER_SMALL_TURNED_R_WITH_HOOK> <X4D1C>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TURNED_R_WITH_HOOK>
@@ -2009,19 +2024,19 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_R_WITH_CROSSED-TAIL> <X4D24>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_CROSSED-TAIL>
 <LATIN_SMALL_LETTER_R_WITH_FISHHOOK> <X4D26>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_FISHHOOK>
 <LATIN_SMALL_LETTER_R_WITH_FISHHOOK_AND_MIDDLE_TILDE> <X4D28>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITH_FISHHOOK_AND_MIDDLE_TILDE>
-<LATIN_SMALL_LETTER_REVERSED_R_WITH_FISHHOOK> <X4D2A>;<X05>;<X05>;<LATIN_SMALL_LETTER_REVERSED_R_WITH_FISHHOOK>
-<LATIN_SMALL_LETTER_R_WITHOUT_HANDLE> <X4D2C>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITHOUT_HANDLE>
-<LATIN_SMALL_LETTER_DOUBLE_R> <X4D2E>;<X05>;<X05>;<LATIN_SMALL_LETTER_DOUBLE_R>
-<LATIN_SMALL_LETTER_DOUBLE_R_WITH_CROSSED-TAIL> <X4D30>;<X05>;<X05>;<LATIN_SMALL_LETTER_DOUBLE_R_WITH_CROSSED-TAIL>
-<LATIN_SMALL_LETTER_SCRIPT_R> <X4D32>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_R>
-<LATIN_SMALL_LETTER_SCRIPT_R_WITH_RING> <X4D34>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_R_WITH_RING>
-<LATIN_LETTER_SMALL_CAPITAL_INVERTED_R> <X4D36>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_INVERTED_R>
-<MODIFIER_LETTER_SMALL_CAPITAL_INVERTED_R> <X4D36>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_CAPITAL_INVERTED_R>
-<LATIN_SMALL_LETTER_TURNED_R_WITH_MIDDLE_TILDE> <X4D38>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_R_WITH_MIDDLE_TILDE>
-<LATIN_SMALL_LETTER_RUM> <X4D3A>;<X05>;<X05>;<LATIN_SMALL_LETTER_RUM>
-<LATIN_LETTER_SMALL_CAPITAL_RUM> <X4D3C>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_RUM>
-<LATIN_SMALL_LETTER_RUM_ROTUNDA> <X4D3E>;<X05>;<X05>;<LATIN_SMALL_LETTER_RUM_ROTUNDA>
-<LATIN_CAPITAL_LETTER_RUM_ROTUNDA> <X4D3E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_RUM_ROTUNDA>
+<LATIN_SMALL_LETTER_REVERSED_R_WITH_FISHHOOK> <X4D2C>;<X05>;<X05>;<LATIN_SMALL_LETTER_REVERSED_R_WITH_FISHHOOK>
+<LATIN_SMALL_LETTER_R_WITHOUT_HANDLE> <X4D2E>;<X05>;<X05>;<LATIN_SMALL_LETTER_R_WITHOUT_HANDLE>
+<LATIN_SMALL_LETTER_DOUBLE_R> <X4D30>;<X05>;<X05>;<LATIN_SMALL_LETTER_DOUBLE_R>
+<LATIN_SMALL_LETTER_DOUBLE_R_WITH_CROSSED-TAIL> <X4D32>;<X05>;<X05>;<LATIN_SMALL_LETTER_DOUBLE_R_WITH_CROSSED-TAIL>
+<LATIN_SMALL_LETTER_SCRIPT_R> <X4D34>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_R>
+<LATIN_SMALL_LETTER_SCRIPT_R_WITH_RING> <X4D36>;<X05>;<X05>;<LATIN_SMALL_LETTER_SCRIPT_R_WITH_RING>
+<LATIN_LETTER_SMALL_CAPITAL_INVERTED_R> <X4D38>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_INVERTED_R>
+<MODIFIER_LETTER_SMALL_CAPITAL_INVERTED_R> <X4D38>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_CAPITAL_INVERTED_R>
+<LATIN_SMALL_LETTER_TURNED_R_WITH_MIDDLE_TILDE> <X4D3A>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_R_WITH_MIDDLE_TILDE>
+<LATIN_SMALL_LETTER_RUM> <X4D3E>;<X05>;<X05>;<LATIN_SMALL_LETTER_RUM>
+<LATIN_LETTER_SMALL_CAPITAL_RUM> <X4D40>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_RUM>
+<LATIN_SMALL_LETTER_RUM_ROTUNDA> <X4D42>;<X05>;<X05>;<LATIN_SMALL_LETTER_RUM_ROTUNDA>
+<LATIN_CAPITAL_LETTER_RUM_ROTUNDA> <X4D42>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_RUM_ROTUNDA>
 <s> <X4E00>;<X05>;<X05>;<s>
 <FULLWIDTH_LATIN_SMALL_LETTER_S> <X4E00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_S>
 <S> <X4E00>;<X05>;<X9C>;<S>
@@ -2050,14 +2065,16 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_S_WITH_DOT_BELOW_AND_DOT_ABOVE> <X4E00>;"<X05><XC4><X9C>";"<X9C><X05><X05>";<LATIN_CAPITAL_LETTER_S_WITH_DOT_BELOW_AND_DOT_ABOVE>
 <LATIN_SMALL_LETTER_S_WITH_COMMA_BELOW> <X4E00>;"<X05><XCA>";"<X05><X05>";<LATIN_SMALL_LETTER_S_WITH_COMMA_BELOW>
*** 147293 LINES SKIPPED ***