From owner-dev-commits-src-main@freebsd.org  Fri Jul 23 15:07:06 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8F635673BF9;
 Fri, 23 Jul 2021 15:07:06 +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 4GWXjQ2blMz53y3;
 Fri, 23 Jul 2021 15:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 3AA4427216;
 Fri, 23 Jul 2021 15:07:06 +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 16NF76eN044360;
 Fri, 23 Jul 2021 15:07:06 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16NF73iR044355;
 Fri, 23 Jul 2021 15:07:03 GMT (envelope-from git)
Date: Fri, 23 Jul 2021 15:07:03 GMT
Message-Id: <202107231507.16NF73iR044355@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: 3a04284df092 - main - locales: upgrade CLDR to 39.0 and Unicode
 to 13.0.0
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: 3a04284df09203b837948a492ccce797e1403e94
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
 <dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>, 
 <mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>, 
 <mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jul 2021 15:07:06 -0000

The branch main has been updated by bapt:

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

commit 3a04284df09203b837948a492ccce797e1403e94
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-07-23 14:32:19 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-07-23 14:58:20 +0000

    locales: upgrade CLDR to 39.0 and Unicode to 13.0.0
    
    MFC after:      3 weeks
    Relnotes:       yes
---
 share/colldef_unicode/Makefile                     |     6 +-
 share/colldef_unicode/af_ZA.UTF-8.src              |   311 +-
 share/colldef_unicode/am_ET.UTF-8.src              |   186 +-
 share/colldef_unicode/ar_SA.UTF-8.src              |   338 +-
 share/colldef_unicode/be_BY.UTF-8.src              |    80 +-
 share/colldef_unicode/ca_AD.UTF-8.src              |   311 +-
 share/colldef_unicode/cs_CZ.UTF-8.src              |   311 +-
 share/colldef_unicode/da_DK.UTF-8.src              |   311 +-
 share/colldef_unicode/el_GR.UTF-8.src              |    80 +-
 share/colldef_unicode/en_US.UTF-8.src              |   311 +-
 share/colldef_unicode/es_MX.UTF-8.src              |   311 +-
 share/colldef_unicode/et_EE.UTF-8.src              |   411 +-
 share/colldef_unicode/fi_FI.UTF-8.src              |   311 +-
 share/colldef_unicode/fr_CA.UTF-8.src              |   311 +-
 share/colldef_unicode/he_IL.UTF-8.src              |   254 +-
 share/colldef_unicode/hi_IN.UTF-8.src              |   138 +-
 share/colldef_unicode/hu_HU.UTF-8.src              |   311 +-
 share/colldef_unicode/hy_AM.UTF-8.src              |   103 +-
 share/colldef_unicode/is_IS.UTF-8.src              |   339 +-
 share/colldef_unicode/ja_JP.UTF-8.src              |   361 +-
 share/colldef_unicode/kk_KZ.UTF-8.src              |    80 +-
 share/colldef_unicode/ko_KR.UTF-8.src              |    78 +-
 share/colldef_unicode/lt_LT.UTF-8.src              |   311 +-
 share/colldef_unicode/lv_LV.UTF-8.src              |   331 +-
 share/colldef_unicode/nn_NO.UTF-8.src              |   311 +-
 share/colldef_unicode/pl_PL.UTF-8.src              |   311 +-
 share/colldef_unicode/ro_RO.UTF-8.src              |   311 +-
 share/colldef_unicode/ru_RU.UTF-8.src              |    80 +-
 share/colldef_unicode/se_NO.UTF-8.src              |   343 +-
 share/colldef_unicode/sk_SK.UTF-8.src              |   311 +-
 share/colldef_unicode/sl_SI.UTF-8.src              |   311 +-
 share/colldef_unicode/sr_RS.UTF-8.src              |    80 +-
 share/colldef_unicode/sr_RS.UTF-8@latin.src        |   311 +-
 share/colldef_unicode/sv_SE.UTF-8.src              |   311 +-
 share/colldef_unicode/tr_TR.UTF-8.src              |   349 +-
 share/colldef_unicode/uk_UA.UTF-8.src              |    80 +-
 share/colldef_unicode/zh_CN.UTF-8.src              | 85004 +++++++++----------
 share/colldef_unicode/zh_TW.UTF-8.src              |  4892 +-
 share/ctypedef/C.UTF-8.src                         |  1542 +-
 share/monetdef_unicode/Makefile                    |     6 +-
 .../{nl_BE.UTF-8.src => de_AT.UTF-8.src}           |     0
 share/monetdef_unicode/fr_CA.UTF-8.src             |     2 +-
 share/monetdef_unicode/hr_HR.UTF-8.src             |     2 +-
 share/monetdef_unicode/zh_CN.UTF-8.src             |     2 +-
 share/msgdef_unicode/Makefile                      |     4 +-
 share/msgdef_unicode/zh_HK.UTF-8.src               |    17 -
 tools/tools/locale/etc/final-maps/map.UTF-8        |  5931 ++
 47 files changed, 56155 insertions(+), 50251 deletions(-)

diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile
index 4a56ee9baf96..00d64f479a52 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=	"34.0"
+CLDR_VERSION=	"39.0"
 
 .include <bsd.endian.mk>
 
@@ -54,7 +54,9 @@ LOCALES+=	uk_UA.UTF-8
 LOCALES+=	zh_CN.UTF-8
 LOCALES+=	zh_TW.UTF-8
 
-LOCALES_MAPPED=	sr_RS.UTF-8@latin hr_HR.UTF-8
+LOCALES_MAPPED+=	sr_RS.UTF-8@latin hr_HR.UTF-8
+
+
 
 SAME+=		ar_SA.UTF-8 ar_QA.UTF-8
 SAME+=		ar_SA.UTF-8 ar_MA.UTF-8
diff --git a/share/colldef_unicode/af_ZA.UTF-8.src b/share/colldef_unicode/af_ZA.UTF-8.src
index 6f6c41c2db99..44c7d4e784e6 100644
--- a/share/colldef_unicode/af_ZA.UTF-8.src
+++ b/share/colldef_unicode/af_ZA.UTF-8.src
@@ -60,7 +60,7 @@ collating-symbol <XCC>
 collating-symbol <XCE>
 collating-symbol <XD0>
 collating-symbol <XD2>
-collating-symbol <XD6>
+collating-symbol <XDB>
 collating-symbol <XFB>
 collating-symbol <X0304>
 collating-symbol <X0306>
@@ -71,10 +71,10 @@ collating-symbol <X0400>
 collating-symbol <X050A>
 collating-symbol <X050E>
 collating-symbol <X0600>
-collating-symbol <X0726>
-collating-symbol <X0732>
-collating-symbol <X0756>
-collating-symbol <X075E>
+collating-symbol <X072A>
+collating-symbol <X0736>
+collating-symbol <X075A>
+collating-symbol <X0762>
 collating-symbol <X0800>
 collating-symbol <X096A>
 collating-symbol <X0978>
@@ -89,23 +89,23 @@ collating-symbol <X0A80>
 collating-symbol <X0A8A>
 collating-symbol <X0A8C>
 collating-symbol <X0A90>
-collating-symbol <X0A94>
 collating-symbol <X0A96>
+collating-symbol <X0A98>
 collating-symbol <X0C04>
 collating-symbol <X0C0A>
-collating-symbol <X0C78>
-collating-symbol <X0C80>
-collating-symbol <X0C82>
-collating-symbol <X0C84>
-collating-symbol <X0C88>
-collating-symbol <X0C8C>
-collating-symbol <X0D7C>
-collating-symbol <X1066>
-collating-symbol <X1068>
-collating-symbol <X106A>
-collating-symbol <X106C>
-collating-symbol <X106E>
-collating-symbol <X1070>
+collating-symbol <X0C79>
+collating-symbol <X0C81>
+collating-symbol <X0C83>
+collating-symbol <X0C85>
+collating-symbol <X0C89>
+collating-symbol <X0C8D>
+collating-symbol <X0D8A>
+collating-symbol <X1090>
+collating-symbol <X1092>
+collating-symbol <X1094>
+collating-symbol <X1096>
+collating-symbol <X1098>
+collating-symbol <X109A>
 collating-symbol <X1300>
 collating-symbol <X1500>
 collating-symbol <X1700>
@@ -129,6 +129,7 @@ collating-symbol <X2B16>
 collating-symbol <X2B18>
 collating-symbol <X2B1A>
 collating-symbol <X2B1C>
+collating-symbol <X2B1E>
 collating-symbol <X2C00>
 collating-symbol <X2D06>
 collating-symbol <X2D08>
@@ -161,6 +162,7 @@ collating-symbol <X3114>
 collating-symbol <X3116>
 collating-symbol <X3118>
 collating-symbol <X311A>
+collating-symbol <X311C>
 collating-symbol <X3200>
 collating-symbol <X3306>
 collating-symbol <X3308>
@@ -214,6 +216,7 @@ collating-symbol <X390E>
 collating-symbol <X3910>
 collating-symbol <X3912>
 collating-symbol <X3914>
+collating-symbol <X3916>
 collating-symbol <X3A00>
 collating-symbol <X3B06>
 collating-symbol <X3B08>
@@ -225,6 +228,7 @@ collating-symbol <X3B12>
 collating-symbol <X3B14>
 collating-symbol <X3B16>
 collating-symbol <X3B18>
+collating-symbol <X3B1A>
 collating-symbol <X3C00>
 collating-symbol <X3D06>
 collating-symbol <X3D08>
@@ -363,6 +367,7 @@ collating-symbol <X4D36>
 collating-symbol <X4D38>
 collating-symbol <X4D3A>
 collating-symbol <X4D3C>
+collating-symbol <X4D3E>
 collating-symbol <X4E00>
 collating-symbol <X4F06>
 collating-symbol <X4F08>
@@ -378,6 +383,7 @@ collating-symbol <X4F1A>
 collating-symbol <X4F1C>
 collating-symbol <X4F1E>
 collating-symbol <X4F20>
+collating-symbol <X4F22>
 collating-symbol <X5000>
 collating-symbol <X5106>
 collating-symbol <X5108>
@@ -412,6 +418,7 @@ collating-symbol <X532A>
 collating-symbol <X532C>
 collating-symbol <X532E>
 collating-symbol <X5330>
+collating-symbol <X5332>
 collating-symbol <X5400>
 collating-symbol <X5506>
 collating-symbol <X5508>
@@ -425,6 +432,7 @@ collating-symbol <X5600>
 collating-symbol <X5706>
 collating-symbol <X5708>
 collating-symbol <X570A>
+collating-symbol <X570C>
 collating-symbol <X5800>
 collating-symbol <X5906>
 collating-symbol <X5908>
@@ -553,7 +561,7 @@ order_start forward;forward;forward;forward
 <XCE>
 <XD0>
 <XD2>
-<XD6>
+<XDB>
 <XFB>
 <X0304>
 <X0306>
@@ -564,10 +572,10 @@ order_start forward;forward;forward;forward
 <X050A>
 <X050E>
 <X0600>
-<X0726>
-<X0732>
-<X0756>
-<X075E>
+<X072A>
+<X0736>
+<X075A>
+<X0762>
 <X0800>
 <X096A>
 <X0978>
@@ -582,23 +590,23 @@ order_start forward;forward;forward;forward
 <X0A8A>
 <X0A8C>
 <X0A90>
-<X0A94>
 <X0A96>
+<X0A98>
 <X0C04>
 <X0C0A>
-<X0C78>
-<X0C80>
-<X0C82>
-<X0C84>
-<X0C88>
-<X0C8C>
-<X0D7C>
-<X1066>
-<X1068>
-<X106A>
-<X106C>
-<X106E>
-<X1070>
+<X0C79>
+<X0C81>
+<X0C83>
+<X0C85>
+<X0C89>
+<X0C8D>
+<X0D8A>
+<X1090>
+<X1092>
+<X1094>
+<X1096>
+<X1098>
+<X109A>
 <X1300>
 <X1500>
 <X1700>
@@ -622,6 +630,7 @@ order_start forward;forward;forward;forward
 <X2B18>
 <X2B1A>
 <X2B1C>
+<X2B1E>
 <X2C00>
 <X2D06>
 <X2D08>
@@ -654,6 +663,7 @@ order_start forward;forward;forward;forward
 <X3116>
 <X3118>
 <X311A>
+<X311C>
 <X3200>
 <X3306>
 <X3308>
@@ -707,6 +717,7 @@ order_start forward;forward;forward;forward
 <X3910>
 <X3912>
 <X3914>
+<X3916>
 <X3A00>
 <X3B06>
 <X3B08>
@@ -718,6 +729,7 @@ order_start forward;forward;forward;forward
 <X3B14>
 <X3B16>
 <X3B18>
+<X3B1A>
 <X3C00>
 <X3D06>
 <X3D08>
@@ -856,6 +868,7 @@ order_start forward;forward;forward;forward
 <X4D38>
 <X4D3A>
 <X4D3C>
+<X4D3E>
 <X4E00>
 <X4F06>
 <X4F08>
@@ -871,6 +884,7 @@ order_start forward;forward;forward;forward
 <X4F1C>
 <X4F1E>
 <X4F20>
+<X4F22>
 <X5000>
 <X5106>
 <X5108>
@@ -905,6 +919,7 @@ order_start forward;forward;forward;forward
 <X532C>
 <X532E>
 <X5330>
+<X5332>
 <X5400>
 <X5506>
 <X5508>
@@ -918,6 +933,7 @@ order_start forward;forward;forward;forward
 <X5706>
 <X5708>
 <X570A>
+<X570C>
 <X5800>
 <X5906>
 <X5908>
@@ -1031,10 +1047,10 @@ order_start forward;forward;forward;forward
 <LOW_LINE> <X050A>;<X05>;<X05>;<LOW_LINE>
 <HYPHEN-MINUS> <X050E>;<X05>;<X05>;<HYPHEN-MINUS>
 <COMMA> <X0600>;<X05>;<X05>;<COMMA>
-<SEMICOLON> <X0726>;<X05>;<X05>;<SEMICOLON>
-<COLON> <X0732>;<X05>;<X05>;<COLON>
-<EXCLAMATION_MARK> <X0756>;<X05>;<X05>;<EXCLAMATION_MARK>
-<QUESTION_MARK> <X075E>;<X05>;<X05>;<QUESTION_MARK>
+<SEMICOLON> <X072A>;<X05>;<X05>;<SEMICOLON>
+<COLON> <X0736>;<X05>;<X05>;<COLON>
+<EXCLAMATION_MARK> <X075A>;<X05>;<X05>;<EXCLAMATION_MARK>
+<QUESTION_MARK> <X0762>;<X05>;<X05>;<QUESTION_MARK>
 <FULL_STOP> <X0800>;<X05>;<X05>;<FULL_STOP>
 <APOSTROPHE> <X096A>;<X05>;<X05>;<APOSTROPHE>
 <QUOTATION_MARK> <X0978>;<X05>;<X05>;<QUOTATION_MARK>
@@ -1049,23 +1065,23 @@ order_start forward;forward;forward;forward
 <SOLIDUS> <X0A8A>;<X05>;<X05>;<SOLIDUS>
 <REVERSE_SOLIDUS> <X0A8C>;<X05>;<X05>;<REVERSE_SOLIDUS>
 <AMPERSAND> <X0A90>;<X05>;<X05>;<AMPERSAND>
-<NUMBER_SIGN> <X0A94>;<X05>;<X05>;<NUMBER_SIGN>
-<PERCENT_SIGN> <X0A96>;<X05>;<X05>;<PERCENT_SIGN>
+<NUMBER_SIGN> <X0A96>;<X05>;<X05>;<NUMBER_SIGN>
+<PERCENT_SIGN> <X0A98>;<X05>;<X05>;<PERCENT_SIGN>
 <GRAVE_ACCENT> <X0C04>;<X05>;<X05>;<GRAVE_ACCENT>
 <CIRCUMFLEX_ACCENT> <X0C0A>;<X05>;<X05>;<CIRCUMFLEX_ACCENT>
-<PLUS_SIGN> <X0C78>;<X05>;<X05>;<PLUS_SIGN>
-<LESS-THAN_SIGN> <X0C80>;<X05>;<X05>;<LESS-THAN_SIGN>
-<EQUALS_SIGN> <X0C82>;<X05>;<X05>;<EQUALS_SIGN>
-<GREATER-THAN_SIGN> <X0C84>;<X05>;<X05>;<GREATER-THAN_SIGN>
-<VERTICAL_LINE> <X0C88>;<X05>;<X05>;<VERTICAL_LINE>
-<TILDE> <X0C8C>;<X05>;<X05>;<TILDE>
-<DOLLAR_SIGN> <X0D7C>;<X05>;<X05>;<DOLLAR_SIGN>
-<ROMAN_NUMERAL_ONE_THOUSAND_C_D> <X1066>;<X05>;<X05>;<ROMAN_NUMERAL_ONE_THOUSAND_C_D>
-<ROMAN_NUMERAL_FIVE_THOUSAND> <X1068>;<X05>;<X05>;<ROMAN_NUMERAL_FIVE_THOUSAND>
-<ROMAN_NUMERAL_TEN_THOUSAND> <X106A>;<X05>;<X05>;<ROMAN_NUMERAL_TEN_THOUSAND>
-<ROMAN_NUMERAL_FIFTY_EARLY_FORM> <X106C>;<X05>;<X05>;<ROMAN_NUMERAL_FIFTY_EARLY_FORM>
-<ROMAN_NUMERAL_FIFTY_THOUSAND> <X106E>;<X05>;<X05>;<ROMAN_NUMERAL_FIFTY_THOUSAND>
-<ROMAN_NUMERAL_ONE_HUNDRED_THOUSAND> <X1070>;<X05>;<X05>;<ROMAN_NUMERAL_ONE_HUNDRED_THOUSAND>
+<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>
+<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>
+<ROMAN_NUMERAL_FIFTY_EARLY_FORM> <X1096>;<X05>;<X05>;<ROMAN_NUMERAL_FIFTY_EARLY_FORM>
+<ROMAN_NUMERAL_FIFTY_THOUSAND> <X1098>;<X05>;<X05>;<ROMAN_NUMERAL_FIFTY_THOUSAND>
+<ROMAN_NUMERAL_ONE_HUNDRED_THOUSAND> <X109A>;<X05>;<X05>;<ROMAN_NUMERAL_ONE_HUNDRED_THOUSAND>
 <zero> <X1300>;<X05>;<X05>;<zero>
 <one> <X1500>;<X05>;<X05>;<one>
 <two> <X1700>;<X05>;<X05>;<two>
@@ -1170,22 +1186,24 @@ order_start forward;forward;forward;forward
 <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>
 <LATIN_SMALL_LETTER_A_WITH_RETROFLEX_HOOK> <X2B0A>;<X05>;<X05>;<LATIN_SMALL_LETTER_A_WITH_RETROFLEX_HOOK>
-<LATIN_LETTER_SMALL_CAPITAL_AE> <X2B0C>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_AE>
-<LATIN_SMALL_LETTER_TURNED_AE> <X2B0E>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_AE>
-<MODIFIER_LETTER_SMALL_TURNED_AE> <X2B0E>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TURNED_AE>
-<LATIN_SMALL_LETTER_A_REVERSED-SCHWA> <X2B10>;<X05>;<X05>;<LATIN_SMALL_LETTER_A_REVERSED-SCHWA>
-<LATIN_SMALL_LETTER_TURNED_A> <X2B12>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_A>
-<LATIN_CAPITAL_LETTER_TURNED_A> <X2B12>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_A>
-<MODIFIER_LETTER_SMALL_TURNED_A> <X2B12>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_A>
-<LATIN_SMALL_LETTER_ALPHA> <X2B14>;<X05>;<X05>;<LATIN_SMALL_LETTER_ALPHA>
-<LATIN_CAPITAL_LETTER_ALPHA> <X2B14>;<X05>;<X9E>;<LATIN_CAPITAL_LETTER_ALPHA>
-<MODIFIER_LETTER_SMALL_ALPHA> <X2B14>;<X05>;<X2C>;<MODIFIER_LETTER_SMALL_ALPHA>
-<LATIN_SMALL_LETTER_BARRED_ALPHA> <X2B16>;<X05>;<X05>;<LATIN_SMALL_LETTER_BARRED_ALPHA>
-<LATIN_SMALL_LETTER_ALPHA_WITH_RETROFLEX_HOOK> <X2B18>;<X05>;<X05>;<LATIN_SMALL_LETTER_ALPHA_WITH_RETROFLEX_HOOK>
-<LATIN_SMALL_LETTER_TURNED_ALPHA> <X2B1A>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_ALPHA>
-<LATIN_CAPITAL_LETTER_TURNED_ALPHA> <X2B1A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_ALPHA>
-<MODIFIER_LETTER_SMALL_TURNED_ALPHA> <X2B1A>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_ALPHA>
-<LATIN_SMALL_LETTER_INVERTED_ALPHA> <X2B1C>;<X05>;<X05>;<LATIN_SMALL_LETTER_INVERTED_ALPHA>
+<LATIN_SMALL_LETTER_GLOTTAL_A> <X2B0C>;<X05>;<X05>;<LATIN_SMALL_LETTER_GLOTTAL_A>
+<LATIN_CAPITAL_LETTER_GLOTTAL_A> <X2B0C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_GLOTTAL_A>
+<LATIN_LETTER_SMALL_CAPITAL_AE> <X2B0E>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_AE>
+<LATIN_SMALL_LETTER_TURNED_AE> <X2B10>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_AE>
+<MODIFIER_LETTER_SMALL_TURNED_AE> <X2B10>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TURNED_AE>
+<LATIN_SMALL_LETTER_A_REVERSED-SCHWA> <X2B12>;<X05>;<X05>;<LATIN_SMALL_LETTER_A_REVERSED-SCHWA>
+<LATIN_SMALL_LETTER_TURNED_A> <X2B14>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_A>
+<LATIN_CAPITAL_LETTER_TURNED_A> <X2B14>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_A>
+<MODIFIER_LETTER_SMALL_TURNED_A> <X2B14>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_A>
+<LATIN_SMALL_LETTER_ALPHA> <X2B16>;<X05>;<X05>;<LATIN_SMALL_LETTER_ALPHA>
+<LATIN_CAPITAL_LETTER_ALPHA> <X2B16>;<X05>;<X9E>;<LATIN_CAPITAL_LETTER_ALPHA>
+<MODIFIER_LETTER_SMALL_ALPHA> <X2B16>;<X05>;<X2C>;<MODIFIER_LETTER_SMALL_ALPHA>
+<LATIN_SMALL_LETTER_BARRED_ALPHA> <X2B18>;<X05>;<X05>;<LATIN_SMALL_LETTER_BARRED_ALPHA>
+<LATIN_SMALL_LETTER_ALPHA_WITH_RETROFLEX_HOOK> <X2B1A>;<X05>;<X05>;<LATIN_SMALL_LETTER_ALPHA_WITH_RETROFLEX_HOOK>
+<LATIN_SMALL_LETTER_TURNED_ALPHA> <X2B1C>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_ALPHA>
+<LATIN_CAPITAL_LETTER_TURNED_ALPHA> <X2B1C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_ALPHA>
+<MODIFIER_LETTER_SMALL_TURNED_ALPHA> <X2B1C>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_ALPHA>
+<LATIN_SMALL_LETTER_INVERTED_ALPHA> <X2B1E>;<X05>;<X05>;<LATIN_SMALL_LETTER_INVERTED_ALPHA>
 <b> <X2C00>;<X05>;<X05>;<b>
 <FULLWIDTH_LATIN_SMALL_LETTER_B> <X2C00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_B>
 <B> <X2C00>;<X05>;<X9C>;<B>
@@ -1238,6 +1256,7 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_C_WITH_BAR> <X2F0A>;<X05>;<X05>;<LATIN_SMALL_LETTER_C_WITH_BAR>
 <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>
@@ -1281,22 +1300,25 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_DZ_WITH_CARON> "<X3000><X5C00>";"<X05><X05><X90>";"<X13><X13><X20>";<LATIN_SMALL_LETTER_DZ_WITH_CARON>
 <LATIN_CAPITAL_LETTER_D_WITH_SMALL_LETTER_Z_WITH_CARON> "<X3000><X5C00>";"<X05><X05><X90>";"<XA2><X13><X20>";<LATIN_CAPITAL_LETTER_D_WITH_SMALL_LETTER_Z_WITH_CARON>
 <LATIN_CAPITAL_LETTER_DZ_WITH_CARON> "<X3000><X5C00>";"<X05><X05><X90>";"<XA2><XA2><X20>";<LATIN_CAPITAL_LETTER_DZ_WITH_CARON>
+<LATIN_SMALL_LETTER_DZ_DIGRAPH_WITH_RETROFLEX_HOOK> "<X3000><X5D10>";"<X05><X05>";"<X13><X20>";<LATIN_SMALL_LETTER_DZ_DIGRAPH_WITH_RETROFLEX_HOOK>
 <LATIN_SMALL_LETTER_DZ_DIGRAPH_WITH_CURL> "<X3000><X5D12>";"<X05><X05>";"<X13><X20>";<LATIN_SMALL_LETTER_DZ_DIGRAPH_WITH_CURL>
 <LATIN_SMALL_LETTER_DEZH_DIGRAPH> "<X3000><X5D1A>";"<X05><X05>";"<X13><X10>";<LATIN_SMALL_LETTER_DEZH_DIGRAPH>
 <LATIN_LETTER_SMALL_CAPITAL_D> <X3106>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_D>
 <LATIN_LETTER_SMALL_CAPITAL_ETH> <X3108>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_ETH>
-<LATIN_SMALL_LETTER_D_WITH_MIDDLE_TILDE> <X310A>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_MIDDLE_TILDE>
-<LATIN_SMALL_LETTER_D_WITH_PALATAL_HOOK> <X310C>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_PALATAL_HOOK>
-<LATIN_SMALL_LETTER_D_WITH_TAIL> <X310E>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_TAIL>
-<LATIN_CAPITAL_LETTER_AFRICAN_D> <X310E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_AFRICAN_D>
-<LATIN_SMALL_LETTER_D_WITH_HOOK> <X3110>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_HOOK>
-<LATIN_CAPITAL_LETTER_D_WITH_HOOK> <X3110>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_D_WITH_HOOK>
-<LATIN_SMALL_LETTER_D_WITH_HOOK_AND_TAIL> <X3112>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_HOOK_AND_TAIL>
-<LATIN_SMALL_LETTER_D_WITH_TOPBAR> <X3114>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_TOPBAR>
-<LATIN_CAPITAL_LETTER_D_WITH_TOPBAR> <X3114>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_D_WITH_TOPBAR>
-<LATIN_SMALL_LETTER_D_WITH_CURL> <X3116>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_CURL>
-<LATIN_SMALL_LETTER_DUM> <X3118>;<X05>;<X05>;<LATIN_SMALL_LETTER_DUM>
-<LATIN_SMALL_LETTER_DELTA> <X311A>;<X05>;<X05>;<LATIN_SMALL_LETTER_DELTA>
+<LATIN_SMALL_LETTER_D_WITH_SHORT_STROKE_OVERLAY> <X310A>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_SHORT_STROKE_OVERLAY>
+<LATIN_CAPITAL_LETTER_D_WITH_SHORT_STROKE_OVERLAY> <X310A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_D_WITH_SHORT_STROKE_OVERLAY>
+<LATIN_SMALL_LETTER_D_WITH_MIDDLE_TILDE> <X310C>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_MIDDLE_TILDE>
+<LATIN_SMALL_LETTER_D_WITH_PALATAL_HOOK> <X310E>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_PALATAL_HOOK>
+<LATIN_SMALL_LETTER_D_WITH_TAIL> <X3110>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_TAIL>
+<LATIN_CAPITAL_LETTER_AFRICAN_D> <X3110>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_AFRICAN_D>
+<LATIN_SMALL_LETTER_D_WITH_HOOK> <X3112>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_HOOK>
+<LATIN_CAPITAL_LETTER_D_WITH_HOOK> <X3112>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_D_WITH_HOOK>
+<LATIN_SMALL_LETTER_D_WITH_HOOK_AND_TAIL> <X3114>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_HOOK_AND_TAIL>
+<LATIN_SMALL_LETTER_D_WITH_TOPBAR> <X3116>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_TOPBAR>
+<LATIN_CAPITAL_LETTER_D_WITH_TOPBAR> <X3116>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_D_WITH_TOPBAR>
+<LATIN_SMALL_LETTER_D_WITH_CURL> <X3118>;<X05>;<X05>;<LATIN_SMALL_LETTER_D_WITH_CURL>
+<LATIN_SMALL_LETTER_DUM> <X311A>;<X05>;<X05>;<LATIN_SMALL_LETTER_DUM>
+<LATIN_SMALL_LETTER_DELTA> <X311C>;<X05>;<X05>;<LATIN_SMALL_LETTER_DELTA>
 <e> <X3200>;<X05>;<X05>;<e>
 <FULLWIDTH_LATIN_SMALL_LETTER_E> <X3200>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_E>
 <E> <X3200>;<X05>;<X9C>;<E>
@@ -1492,10 +1514,12 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_H_WITH_DESCENDER> <X390E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_H_WITH_DESCENDER>
 <LATIN_SMALL_LETTER_HALF_H> <X3910>;<X05>;<X05>;<LATIN_SMALL_LETTER_HALF_H>
 <LATIN_CAPITAL_LETTER_HALF_H> <X3910>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_HALF_H>
-<LATIN_SMALL_LETTER_HENG> <X3912>;<X05>;<X05>;<LATIN_SMALL_LETTER_HENG>
-<LATIN_CAPITAL_LETTER_HENG> <X3912>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_HENG>
-<MODIFIER_LETTER_SMALL_HENG> <X3912>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_HENG>
-<LATIN_SMALL_LETTER_HENG_WITH_HOOK> <X3914>;<X05>;<X05>;<LATIN_SMALL_LETTER_HENG_WITH_HOOK>
+<LATIN_SMALL_LETTER_REVERSED_HALF_H> <X3912>;<X05>;<X05>;<LATIN_SMALL_LETTER_REVERSED_HALF_H>
+<LATIN_CAPITAL_LETTER_REVERSED_HALF_H> <X3912>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_REVERSED_HALF_H>
+<LATIN_SMALL_LETTER_HENG> <X3914>;<X05>;<X05>;<LATIN_SMALL_LETTER_HENG>
+<LATIN_CAPITAL_LETTER_HENG> <X3914>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_HENG>
+<MODIFIER_LETTER_SMALL_HENG> <X3914>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_HENG>
+<LATIN_SMALL_LETTER_HENG_WITH_HOOK> <X3916>;<X05>;<X05>;<LATIN_SMALL_LETTER_HENG_WITH_HOOK>
 <i> <X3A00>;<X05>;<X05>;<i>
 <FULLWIDTH_LATIN_SMALL_LETTER_I> <X3A00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_I>
 <SMALL_ROMAN_NUMERAL_ONE> <X3A00>;<X05>;<X13>;<SMALL_ROMAN_NUMERAL_ONE>
@@ -1560,10 +1584,12 @@ order_start forward;forward;forward;forward
 <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_IOTA> <X3B16>;<X05>;<X05>;<LATIN_SMALL_LETTER_IOTA>
-<LATIN_CAPITAL_LETTER_IOTA> <X3B16>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_IOTA>
-<MODIFIER_LETTER_SMALL_IOTA> <X3B16>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_IOTA>
-<LATIN_SMALL_LETTER_IOTA_WITH_STROKE> <X3B18>;<X05>;<X05>;<LATIN_SMALL_LETTER_IOTA_WITH_STROKE>
+<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>
 <j> <X3C00>;<X05>;<X05>;<j>
 <FULLWIDTH_LATIN_SMALL_LETTER_J> <X3C00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_J>
 <J> <X3C00>;<X05>;<X9C>;<J>
@@ -1643,8 +1669,8 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_L_WITH_CIRCUMFLEX_BELOW> <X4000>;"<X05><XCC>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_L_WITH_CIRCUMFLEX_BELOW>
 <LATIN_SMALL_LETTER_L_WITH_LINE_BELOW> <X4000>;"<X05><XD2>";"<X05><X05>";<LATIN_SMALL_LETTER_L_WITH_LINE_BELOW>
 <LATIN_CAPITAL_LETTER_L_WITH_LINE_BELOW> <X4000>;"<X05><XD2>";"<X9C><X05>";<LATIN_CAPITAL_LETTER_L_WITH_LINE_BELOW>
-<LATIN_SMALL_LETTER_L_WITH_MIDDLE_DOT> <X4000>;"<X05><XFB><XD6>";"<X05><X05><XC0>";<LATIN_SMALL_LETTER_L_WITH_MIDDLE_DOT>
-<LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_DOT> <X4000>;"<X05><XFB><XD6>";"<X9C><X05><XC0>";<LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_DOT>
+<LATIN_SMALL_LETTER_L_WITH_MIDDLE_DOT> <X4000>;"<X05><XFB><XDB>";"<X05><X05><XC0>";<LATIN_SMALL_LETTER_L_WITH_MIDDLE_DOT>
+<LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_DOT> <X4000>;"<X05><XFB><XDB>";"<X9C><X05><XC0>";<LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_DOT>
 <LATIN_SMALL_LETTER_LJ> "<X4000><X3C00>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_LJ>
 <LATIN_CAPITAL_LETTER_L_WITH_SMALL_LETTER_J> "<X4000><X3C00>";"<X05><X05>";"<XA2><X13>";<LATIN_CAPITAL_LETTER_L_WITH_SMALL_LETTER_J>
 <LATIN_CAPITAL_LETTER_LJ> "<X4000><X3C00>";"<X05><X05>";"<XA2><XA2>";<LATIN_CAPITAL_LETTER_LJ>
@@ -1991,10 +2017,11 @@ order_start forward;forward;forward;forward
 <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_RUM> <X4D38>;<X05>;<X05>;<LATIN_SMALL_LETTER_RUM>
-<LATIN_LETTER_SMALL_CAPITAL_RUM> <X4D3A>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_RUM>
-<LATIN_SMALL_LETTER_RUM_ROTUNDA> <X4D3C>;<X05>;<X05>;<LATIN_SMALL_LETTER_RUM_ROTUNDA>
-<LATIN_CAPITAL_LETTER_RUM_ROTUNDA> <X4D3C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_RUM_ROTUNDA>
+<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>
 <s> <X4E00>;<X05>;<X05>;<s>
 <FULLWIDTH_LATIN_SMALL_LETTER_S> <X4E00>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_S>
 <S> <X4E00>;<X05>;<X9C>;<S>
@@ -2032,23 +2059,26 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LIGATURE_ST> "<X4E00><X5000>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LIGATURE_ST>
 <LATIN_SMALL_LIGATURE_LONG_S_T> "<X4E00><X5000>";"<X78><X05>";"<X05><X13>";<LATIN_SMALL_LIGATURE_LONG_S_T>
 <LATIN_LETTER_SMALL_CAPITAL_S> <X4F06>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_S>
-<LATIN_SMALL_LETTER_S_WITH_MIDDLE_TILDE> <X4F08>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_MIDDLE_TILDE>
-<LATIN_SMALL_LETTER_S_WITH_PALATAL_HOOK> <X4F0A>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_PALATAL_HOOK>
-<LATIN_SMALL_LETTER_S_WITH_HOOK> <X4F0C>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_HOOK>
-<MODIFIER_LETTER_SMALL_S_WITH_HOOK> <X4F0C>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_S_WITH_HOOK>
-<LATIN_SMALL_LETTER_S_WITH_SWASH_TAIL> <X4F0E>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_SWASH_TAIL>
-<LATIN_CAPITAL_LETTER_S_WITH_SWASH_TAIL> <X4F0E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_S_WITH_SWASH_TAIL>
-<LATIN_SMALL_LETTER_LONG_S_WITH_DIAGONAL_STROKE> <X4F10>;<X05>;<X05>;<LATIN_SMALL_LETTER_LONG_S_WITH_DIAGONAL_STROKE>
-<LATIN_SMALL_LETTER_LONG_S_WITH_HIGH_STROKE> <X4F12>;<X05>;<X05>;<LATIN_SMALL_LETTER_LONG_S_WITH_HIGH_STROKE>
-<LATIN_SMALL_LETTER_ESH> <X4F14>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH>
-<LATIN_CAPITAL_LETTER_ESH> <X4F14>;<X05>;<X9E>;<LATIN_CAPITAL_LETTER_ESH>
-<MODIFIER_LETTER_SMALL_ESH> <X4F14>;<X05>;<X2C>;<MODIFIER_LETTER_SMALL_ESH>
-<LATIN_SMALL_LETTER_BASELINE_ESH> <X4F16>;<X05>;<X05>;<LATIN_SMALL_LETTER_BASELINE_ESH>
-<LATIN_SMALL_LETTER_ESH_WITH_PALATAL_HOOK> <X4F18>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH_WITH_PALATAL_HOOK>
-<LATIN_LETTER_REVERSED_ESH_LOOP> <X4F1A>;<X05>;<X05>;<LATIN_LETTER_REVERSED_ESH_LOOP>
-<LATIN_SMALL_LETTER_SQUAT_REVERSED_ESH> <X4F1C>;<X05>;<X05>;<LATIN_SMALL_LETTER_SQUAT_REVERSED_ESH>
-<LATIN_SMALL_LETTER_ESH_WITH_RETROFLEX_HOOK> <X4F1E>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH_WITH_RETROFLEX_HOOK>
-<LATIN_SMALL_LETTER_ESH_WITH_CURL> <X4F20>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH_WITH_CURL>
+<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>
+<LATIN_SMALL_LETTER_S_WITH_MIDDLE_TILDE> <X4F0A>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_MIDDLE_TILDE>
+<LATIN_SMALL_LETTER_S_WITH_PALATAL_HOOK> <X4F0C>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_PALATAL_HOOK>
+<LATIN_SMALL_LETTER_S_WITH_HOOK> <X4F0E>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_HOOK>
+<LATIN_CAPITAL_LETTER_S_WITH_HOOK> <X4F0E>;<X05>;<X9E>;<LATIN_CAPITAL_LETTER_S_WITH_HOOK>
+<MODIFIER_LETTER_SMALL_S_WITH_HOOK> <X4F0E>;<X05>;<X2C>;<MODIFIER_LETTER_SMALL_S_WITH_HOOK>
+<LATIN_SMALL_LETTER_S_WITH_SWASH_TAIL> <X4F10>;<X05>;<X05>;<LATIN_SMALL_LETTER_S_WITH_SWASH_TAIL>
+<LATIN_CAPITAL_LETTER_S_WITH_SWASH_TAIL> <X4F10>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_S_WITH_SWASH_TAIL>
+<LATIN_SMALL_LETTER_LONG_S_WITH_DIAGONAL_STROKE> <X4F12>;<X05>;<X05>;<LATIN_SMALL_LETTER_LONG_S_WITH_DIAGONAL_STROKE>
+<LATIN_SMALL_LETTER_LONG_S_WITH_HIGH_STROKE> <X4F14>;<X05>;<X05>;<LATIN_SMALL_LETTER_LONG_S_WITH_HIGH_STROKE>
+<LATIN_SMALL_LETTER_ESH> <X4F16>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH>
+<LATIN_CAPITAL_LETTER_ESH> <X4F16>;<X05>;<X9E>;<LATIN_CAPITAL_LETTER_ESH>
+<MODIFIER_LETTER_SMALL_ESH> <X4F16>;<X05>;<X2C>;<MODIFIER_LETTER_SMALL_ESH>
+<LATIN_SMALL_LETTER_BASELINE_ESH> <X4F18>;<X05>;<X05>;<LATIN_SMALL_LETTER_BASELINE_ESH>
+<LATIN_SMALL_LETTER_ESH_WITH_PALATAL_HOOK> <X4F1A>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH_WITH_PALATAL_HOOK>
+<LATIN_LETTER_REVERSED_ESH_LOOP> <X4F1C>;<X05>;<X05>;<LATIN_LETTER_REVERSED_ESH_LOOP>
+<LATIN_SMALL_LETTER_SQUAT_REVERSED_ESH> <X4F1E>;<X05>;<X05>;<LATIN_SMALL_LETTER_SQUAT_REVERSED_ESH>
+<LATIN_SMALL_LETTER_ESH_WITH_RETROFLEX_HOOK> <X4F20>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH_WITH_RETROFLEX_HOOK>
+<LATIN_SMALL_LETTER_ESH_WITH_CURL> <X4F22>;<X05>;<X05>;<LATIN_SMALL_LETTER_ESH_WITH_CURL>
 <t> <X5000>;<X05>;<X05>;<t>
 <FULLWIDTH_LATIN_SMALL_LETTER_T> <X5000>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_T>
 <T> <X5000>;<X05>;<X9C>;<T>
@@ -2077,7 +2107,8 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_TH_WITH_STRIKETHROUGH> "<X5000><X3800>";"<X70><X05>";"<X05><X13>";<LATIN_SMALL_LETTER_TH_WITH_STRIKETHROUGH>
 <LATIN_LETTER_INVERTED_GLOTTAL_STOP_WITH_STROKE> "<X5000><X4E00>";"<X05><X05>";"<X13><X13>";<LATIN_LETTER_INVERTED_GLOTTAL_STOP_WITH_STROKE>
 <LATIN_SMALL_LETTER_TS_DIGRAPH> "<X5000><X4E00>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_TS_DIGRAPH>
-<LATIN_SMALL_LETTER_TESH_DIGRAPH> "<X5000><X4F14>";"<X05><X05>";"<X13><X10>";<LATIN_SMALL_LETTER_TESH_DIGRAPH>
+<LATIN_SMALL_LETTER_TS_DIGRAPH_WITH_RETROFLEX_HOOK> "<X5000><X4F0E>";"<X05><X05>";"<X13><X10>";<LATIN_SMALL_LETTER_TS_DIGRAPH_WITH_RETROFLEX_HOOK>
+<LATIN_SMALL_LETTER_TESH_DIGRAPH> "<X5000><X4F16>";"<X05><X05>";"<X13><X10>";<LATIN_SMALL_LETTER_TESH_DIGRAPH>
 <LATIN_SMALL_LETTER_TZ> "<X5000><X5C00>";"<X05><X05>";"<X13><X13>";<LATIN_SMALL_LETTER_TZ>
 <LATIN_CAPITAL_LETTER_TZ> "<X5000><X5C00>";"<X05><X05>";"<XA2><X13>";<LATIN_CAPITAL_LETTER_TZ>
 <LATIN_LETTER_SMALL_CAPITAL_T> <X5106>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_T>
@@ -2184,22 +2215,24 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_U_WITH_RETROFLEX_HOOK> <X531C>;<X05>;<X05>;<LATIN_SMALL_LETTER_U_WITH_RETROFLEX_HOOK>
 <LATIN_SMALL_LETTER_U_WITH_LEFT_HOOK> <X531E>;<X05>;<X05>;<LATIN_SMALL_LETTER_U_WITH_LEFT_HOOK>
 <MODIFIER_LETTER_SMALL_U_WITH_LEFT_HOOK> <X531E>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_U_WITH_LEFT_HOOK>
-<LATIN_SMALL_LETTER_TURNED_H> <X5320>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_H>
-<LATIN_CAPITAL_LETTER_TURNED_H> <X5320>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_H>
-<MODIFIER_LETTER_SMALL_TURNED_H> <X5320>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_H>
-<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK> <X5322>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK>
-<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK_AND_TAIL> <X5324>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK_AND_TAIL>
-<LATIN_SMALL_LETTER_TURNED_M> <X5326>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_M>
-<LATIN_CAPITAL_LETTER_TURNED_M> <X5326>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_M>
-<MODIFIER_LETTER_SMALL_TURNED_M> <X5326>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_M>
-<LATIN_LETTER_SMALL_CAPITAL_TURNED_M> <X5328>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_TURNED_M>
-<LATIN_SMALL_LETTER_SIDEWAYS_TURNED_M> <X532A>;<X05>;<X05>;<LATIN_SMALL_LETTER_SIDEWAYS_TURNED_M>
-<LATIN_SMALL_LETTER_TURNED_M_WITH_LONG_LEG> <X532C>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_M_WITH_LONG_LEG>
-<MODIFIER_LETTER_SMALL_TURNED_M_WITH_LONG_LEG> <X532C>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TURNED_M_WITH_LONG_LEG>
-<LATIN_SMALL_LETTER_UPSILON> <X532E>;<X05>;<X05>;<LATIN_SMALL_LETTER_UPSILON>
-<LATIN_CAPITAL_LETTER_UPSILON> <X532E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_UPSILON>
-<MODIFIER_LETTER_SMALL_UPSILON> <X532E>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_UPSILON>
-<LATIN_SMALL_LETTER_UPSILON_WITH_STROKE> <X5330>;<X05>;<X05>;<LATIN_SMALL_LETTER_UPSILON_WITH_STROKE>
+<LATIN_SMALL_LETTER_GLOTTAL_U> <X5320>;<X05>;<X05>;<LATIN_SMALL_LETTER_GLOTTAL_U>
+<LATIN_CAPITAL_LETTER_GLOTTAL_U> <X5320>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_GLOTTAL_U>
+<LATIN_SMALL_LETTER_TURNED_H> <X5322>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_H>
+<LATIN_CAPITAL_LETTER_TURNED_H> <X5322>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_H>
+<MODIFIER_LETTER_SMALL_TURNED_H> <X5322>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_H>
+<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK> <X5324>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK>
+<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK_AND_TAIL> <X5326>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_H_WITH_FISHHOOK_AND_TAIL>
+<LATIN_SMALL_LETTER_TURNED_M> <X5328>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_M>
+<LATIN_CAPITAL_LETTER_TURNED_M> <X5328>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_TURNED_M>
+<MODIFIER_LETTER_SMALL_TURNED_M> <X5328>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_M>
+<LATIN_LETTER_SMALL_CAPITAL_TURNED_M> <X532A>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_TURNED_M>
+<LATIN_SMALL_LETTER_SIDEWAYS_TURNED_M> <X532C>;<X05>;<X05>;<LATIN_SMALL_LETTER_SIDEWAYS_TURNED_M>
+<LATIN_SMALL_LETTER_TURNED_M_WITH_LONG_LEG> <X532E>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_M_WITH_LONG_LEG>
+<MODIFIER_LETTER_SMALL_TURNED_M_WITH_LONG_LEG> <X532E>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_TURNED_M_WITH_LONG_LEG>
+<LATIN_SMALL_LETTER_UPSILON> <X5330>;<X05>;<X05>;<LATIN_SMALL_LETTER_UPSILON>
+<LATIN_CAPITAL_LETTER_UPSILON> <X5330>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_UPSILON>
+<MODIFIER_LETTER_SMALL_UPSILON> <X5330>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_UPSILON>
+<LATIN_SMALL_LETTER_UPSILON_WITH_STROKE> <X5332>;<X05>;<X05>;<LATIN_SMALL_LETTER_UPSILON_WITH_STROKE>
 <v> <X5400>;<X05>;<X05>;<v>
 <FULLWIDTH_LATIN_SMALL_LETTER_V> <X5400>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_V>
 <SMALL_ROMAN_NUMERAL_FIVE> <X5400>;<X05>;<X13>;<SMALL_ROMAN_NUMERAL_FIVE>
@@ -2255,9 +2288,12 @@ order_start forward;forward;forward;forward
 <LATIN_SMALL_LETTER_W_WITH_DOT_BELOW> <X5600>;"<X05><XC4>";"<X05><X05>";<LATIN_SMALL_LETTER_W_WITH_DOT_BELOW>
 <LATIN_CAPITAL_LETTER_W_WITH_DOT_BELOW> <X5600>;"<X05><XC4>";"<XA0><X05>";<LATIN_CAPITAL_LETTER_W_WITH_DOT_BELOW>
 <LATIN_LETTER_SMALL_CAPITAL_W> <X5706>;<X05>;<X05>;<LATIN_LETTER_SMALL_CAPITAL_W>
-<LATIN_SMALL_LETTER_W_WITH_HOOK> <X5708>;<X05>;<X05>;<LATIN_SMALL_LETTER_W_WITH_HOOK>
-<LATIN_CAPITAL_LETTER_W_WITH_HOOK> <X5708>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_W_WITH_HOOK>
-<LATIN_SMALL_LETTER_TURNED_W> <X570A>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_W>
+<LATIN_SMALL_LETTER_ANGLICANA_W> <X5708>;<X05>;<X05>;<LATIN_SMALL_LETTER_ANGLICANA_W>
+<LATIN_CAPITAL_LETTER_ANGLICANA_W> <X5708>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_ANGLICANA_W>
+<LATIN_SMALL_LETTER_W_WITH_HOOK> <X570A>;<X05>;<X05>;<LATIN_SMALL_LETTER_W_WITH_HOOK>
+<LATIN_CAPITAL_LETTER_W_WITH_HOOK> <X570A>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_W_WITH_HOOK>
+<LATIN_SMALL_LETTER_TURNED_W> <X570C>;<X05>;<X05>;<LATIN_SMALL_LETTER_TURNED_W>
+<MODIFIER_LETTER_SMALL_TURNED_W> <X570C>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_TURNED_W>
 <x> <X5800>;<X05>;<X05>;<x>
 <FULLWIDTH_LATIN_SMALL_LETTER_X> <X5800>;<X05>;<X10>;<FULLWIDTH_LATIN_SMALL_LETTER_X>
 <SMALL_ROMAN_NUMERAL_TEN> <X5800>;<X05>;<X13>;<SMALL_ROMAN_NUMERAL_TEN>
@@ -2340,10 +2376,11 @@ order_start forward;forward;forward;forward
 <LATIN_CAPITAL_LETTER_Z_WITH_STROKE> <X5D08>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_Z_WITH_STROKE>
 <LATIN_SMALL_LETTER_Z_WITH_MIDDLE_TILDE> <X5D0A>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_MIDDLE_TILDE>
 <LATIN_SMALL_LETTER_Z_WITH_PALATAL_HOOK> <X5D0C>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_PALATAL_HOOK>
+<LATIN_CAPITAL_LETTER_Z_WITH_PALATAL_HOOK> <X5D0C>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_Z_WITH_PALATAL_HOOK>
 <LATIN_SMALL_LETTER_Z_WITH_HOOK> <X5D0E>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_HOOK>
 <LATIN_CAPITAL_LETTER_Z_WITH_HOOK> <X5D0E>;<X05>;<XA0>;<LATIN_CAPITAL_LETTER_Z_WITH_HOOK>
 <LATIN_SMALL_LETTER_Z_WITH_RETROFLEX_HOOK> <X5D10>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_RETROFLEX_HOOK>
-<MODIFIER_LETTER_SMALL_Z_WITH_RETROFLEX_HOOK> <X5D10>;<X05>;<X20>;<MODIFIER_LETTER_SMALL_Z_WITH_RETROFLEX_HOOK>
+<MODIFIER_LETTER_SMALL_Z_WITH_RETROFLEX_HOOK> <X5D10>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_Z_WITH_RETROFLEX_HOOK>
 <LATIN_SMALL_LETTER_Z_WITH_CURL> <X5D12>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_CURL>
 <MODIFIER_LETTER_SMALL_Z_WITH_CURL> <X5D12>;<X05>;<X2E>;<MODIFIER_LETTER_SMALL_Z_WITH_CURL>
 <LATIN_SMALL_LETTER_Z_WITH_SWASH_TAIL> <X5D14>;<X05>;<X05>;<LATIN_SMALL_LETTER_Z_WITH_SWASH_TAIL>
diff --git a/share/colldef_unicode/am_ET.UTF-8.src b/share/colldef_unicode/am_ET.UTF-8.src
index 00e78835e3bd..a6d5fcdc9e51 100644
--- a/share/colldef_unicode/am_ET.UTF-8.src
+++ b/share/colldef_unicode/am_ET.UTF-8.src
@@ -13,13 +13,13 @@ LC_COLLATE
 
 collating-symbol <X01>
 collating-symbol <X05>
-collating-symbol <X20>
-collating-symbol <X42>
-collating-symbol <X64>
 collating-symbol <X9C>
 collating-symbol <XA0>
+collating-symbol <XBC>
 collating-symbol <XC0>
-collating-symbol <XEF>
+collating-symbol <XDD>
+collating-symbol <XEE>
+collating-symbol <XFE>
 collating-symbol <X0200>
 collating-symbol <X0300>
 collating-symbol <X0304>
@@ -33,16 +33,16 @@ collating-symbol <X050A>
 collating-symbol <X050E>
 collating-symbol <X0600>
 collating-symbol <X0700>
-collating-symbol <X0726>
-collating-symbol <X0732>
-collating-symbol <X073A>
-collating-symbol <X073C>
+collating-symbol <X072A>
+collating-symbol <X0736>
 collating-symbol <X073E>
 collating-symbol <X0740>
 collating-symbol <X0742>
-collating-symbol <X0756>
-collating-symbol <X075E>
-collating-symbol <X076A>
+collating-symbol <X0744>
+collating-symbol <X0746>
+collating-symbol <X075A>
+collating-symbol <X0762>
+collating-symbol <X076E>
 collating-symbol <X0800>
 collating-symbol <X0900>
 collating-symbol <X090C>
@@ -62,35 +62,35 @@ collating-symbol <X0A80>
 collating-symbol <X0A8A>
 collating-symbol <X0A8C>
 collating-symbol <X0A90>
-collating-symbol <X0A94>
 collating-symbol <X0A96>
+collating-symbol <X0A98>
 collating-symbol <X0B00>
 collating-symbol <X0C00>
 collating-symbol <X0C04>
 collating-symbol <X0C0A>
 collating-symbol <X0C38>
-collating-symbol <X0C78>
-collating-symbol <X0C80>
-collating-symbol <X0C82>
-collating-symbol <X0C84>
-collating-symbol <X0C88>
-collating-symbol <X0C8C>
+collating-symbol <X0C79>
+collating-symbol <X0C81>
+collating-symbol <X0C83>
+collating-symbol <X0C85>
+collating-symbol <X0C89>
+collating-symbol <X0C8D>
 collating-symbol <X0D00>
-collating-symbol <X0D7C>
+collating-symbol <X0D8A>
 collating-symbol <X0E00>
 collating-symbol <X0F00>
 collating-symbol <X1000>
-collating-symbol <X1050>
-collating-symbol <X1052>
-collating-symbol <X1054>
-collating-symbol <X1056>
-collating-symbol <X1058>
-collating-symbol <X105A>
-collating-symbol <X105C>
-collating-symbol <X105E>
-collating-symbol <X1060>
-collating-symbol <X1062>
-collating-symbol <X1064>
+collating-symbol <X107A>
+collating-symbol <X107C>
+collating-symbol <X107E>
+collating-symbol <X1080>
+collating-symbol <X1082>
+collating-symbol <X1084>
+collating-symbol <X1086>
+collating-symbol <X1088>
+collating-symbol <X108A>
+collating-symbol <X108C>
+collating-symbol <X108E>
 collating-symbol <X1100>
 collating-symbol <X1200>
 collating-symbol <X1300>
@@ -351,13 +351,13 @@ order_start forward;forward;forward;forward
 
 <X01>
 <X05>
-<X20>
-<X42>
-<X64>
 <X9C>
 <XA0>
+<XBC>
 <XC0>
-<XEF>
+<XDD>
+<XEE>
+<XFE>
 <X0200>
 <X0300>
 <X0304>
@@ -371,16 +371,16 @@ order_start forward;forward;forward;forward
 <X050E>
 <X0600>
 <X0700>
-<X0726>
-<X0732>
-<X073A>
-<X073C>
+<X072A>
+<X0736>
 <X073E>
 <X0740>
 <X0742>
-<X0756>
-<X075E>
-<X076A>
+<X0744>
+<X0746>
+<X075A>
+<X0762>
+<X076E>
 <X0800>
 <X0900>
 <X090C>
@@ -400,35 +400,35 @@ order_start forward;forward;forward;forward
 <X0A8A>
 <X0A8C>
 <X0A90>
-<X0A94>
 <X0A96>
+<X0A98>
 <X0B00>
 <X0C00>
 <X0C04>
 <X0C0A>
 <X0C38>
-<X0C78>
-<X0C80>
-<X0C82>
-<X0C84>
-<X0C88>
-<X0C8C>
+<X0C79>
+<X0C81>
+<X0C83>
+<X0C85>
+<X0C89>
+<X0C8D>
 <X0D00>
-<X0D7C>
+<X0D8A>
 <X0E00>
 <X0F00>
 <X1000>
-<X1050>
-<X1052>
-<X1054>
-<X1056>
-<X1058>
-<X105A>
-<X105C>
-<X105E>
-<X1060>
-<X1062>
-<X1064>
+<X107A>
+<X107C>
+<X107E>
+<X1080>
+<X1082>
+<X1084>
+<X1086>
+<X1088>
+<X108A>
+<X108C>
+<X108E>
 <X1100>
 <X1200>
 <X1300>
@@ -712,9 +712,9 @@ order_start forward;forward;forward;forward
 <INFORMATION_SEPARATOR_TWO> IGNORE;IGNORE;IGNORE;<INFORMATION_SEPARATOR_TWO>
 <INFORMATION_SEPARATOR_ONE> IGNORE;IGNORE;IGNORE;<INFORMATION_SEPARATOR_ONE>
 <DELETE> IGNORE;IGNORE;IGNORE;<DELETE>
-<ETHIOPIC_COMBINING_GEMINATION_MARK> IGNORE;"<XEF><X20>";"<X05><XC0>";<ETHIOPIC_COMBINING_GEMINATION_MARK>
-<ETHIOPIC_COMBINING_VOWEL_LENGTH_MARK> IGNORE;"<XEF><X42>";"<X05><XC0>";<ETHIOPIC_COMBINING_VOWEL_LENGTH_MARK>
-<ETHIOPIC_COMBINING_GEMINATION_AND_VOWEL_LENGTH_MARK> IGNORE;"<XEF><X64>";"<X05><XC0>";<ETHIOPIC_COMBINING_GEMINATION_AND_VOWEL_LENGTH_MARK>
+<ETHIOPIC_COMBINING_GEMINATION_MARK> IGNORE;"<XEE><XBC>";"<X05><XC0>";<ETHIOPIC_COMBINING_GEMINATION_MARK>
+<ETHIOPIC_COMBINING_VOWEL_LENGTH_MARK> IGNORE;"<XEE><XDD>";"<X05><XC0>";<ETHIOPIC_COMBINING_VOWEL_LENGTH_MARK>
+<ETHIOPIC_COMBINING_GEMINATION_AND_VOWEL_LENGTH_MARK> IGNORE;"<XEE><XFE>";"<X05><XC0>";<ETHIOPIC_COMBINING_GEMINATION_AND_VOWEL_LENGTH_MARK>
 <tab> <X0304>;<X05>;<X05>;<tab>
 <newline> <X0306>;<X05>;<X05>;<newline>
 <vertical-tab> <X0308>;<X05>;<X05>;<vertical-tab>
@@ -724,16 +724,16 @@ order_start forward;forward;forward;forward
 <LOW_LINE> <X050A>;<X05>;<X05>;<LOW_LINE>
 <HYPHEN-MINUS> <X050E>;<X05>;<X05>;<HYPHEN-MINUS>
 <COMMA> <X0600>;<X05>;<X05>;<COMMA>
-<SEMICOLON> <X0726>;<X05>;<X05>;<SEMICOLON>
-<COLON> <X0732>;<X05>;<X05>;<COLON>
-<ETHIOPIC_WORDSPACE> <X073A>;<X05>;<X05>;<ETHIOPIC_WORDSPACE>
-<ETHIOPIC_COMMA> <X073C>;<X05>;<X05>;<ETHIOPIC_COMMA>
-<ETHIOPIC_SEMICOLON> <X073E>;<X05>;<X05>;<ETHIOPIC_SEMICOLON>
-<ETHIOPIC_COLON> <X0740>;<X05>;<X05>;<ETHIOPIC_COLON>
-<ETHIOPIC_PREFACE_COLON> <X0742>;<X05>;<X05>;<ETHIOPIC_PREFACE_COLON>
-<EXCLAMATION_MARK> <X0756>;<X05>;<X05>;<EXCLAMATION_MARK>
-<QUESTION_MARK> <X075E>;<X05>;<X05>;<QUESTION_MARK>
-<ETHIOPIC_QUESTION_MARK> <X076A>;<X05>;<X05>;<ETHIOPIC_QUESTION_MARK>
+<SEMICOLON> <X072A>;<X05>;<X05>;<SEMICOLON>
+<COLON> <X0736>;<X05>;<X05>;<COLON>
+<ETHIOPIC_WORDSPACE> <X073E>;<X05>;<X05>;<ETHIOPIC_WORDSPACE>
+<ETHIOPIC_COMMA> <X0740>;<X05>;<X05>;<ETHIOPIC_COMMA>
+<ETHIOPIC_SEMICOLON> <X0742>;<X05>;<X05>;<ETHIOPIC_SEMICOLON>
+<ETHIOPIC_COLON> <X0744>;<X05>;<X05>;<ETHIOPIC_COLON>
+<ETHIOPIC_PREFACE_COLON> <X0746>;<X05>;<X05>;<ETHIOPIC_PREFACE_COLON>
+<EXCLAMATION_MARK> <X075A>;<X05>;<X05>;<EXCLAMATION_MARK>
+<QUESTION_MARK> <X0762>;<X05>;<X05>;<QUESTION_MARK>
+<ETHIOPIC_QUESTION_MARK> <X076E>;<X05>;<X05>;<ETHIOPIC_QUESTION_MARK>
 <FULL_STOP> <X0800>;<X05>;<X05>;<FULL_STOP>
 <ETHIOPIC_FULL_STOP> <X090C>;<X05>;<X05>;<ETHIOPIC_FULL_STOP>
 <ETHIOPIC_SECTION_MARK> <X0939>;<X05>;<X05>;<ETHIOPIC_SECTION_MARK>
@@ -751,8 +751,8 @@ order_start forward;forward;forward;forward
 <SOLIDUS> <X0A8A>;<X05>;<X05>;<SOLIDUS>
 <REVERSE_SOLIDUS> <X0A8C>;<X05>;<X05>;<REVERSE_SOLIDUS>
 <AMPERSAND> <X0A90>;<X05>;<X05>;<AMPERSAND>
-<NUMBER_SIGN> <X0A94>;<X05>;<X05>;<NUMBER_SIGN>
-<PERCENT_SIGN> <X0A96>;<X05>;<X05>;<PERCENT_SIGN>
+<NUMBER_SIGN> <X0A96>;<X05>;<X05>;<NUMBER_SIGN>
+<PERCENT_SIGN> <X0A98>;<X05>;<X05>;<PERCENT_SIGN>
 <GRAVE_ACCENT> <X0C04>;<X05>;<X05>;<GRAVE_ACCENT>
 <CIRCUMFLEX_ACCENT> <X0C0A>;<X05>;<X05>;<CIRCUMFLEX_ACCENT>
 <ETHIOPIC_TONAL_MARK_YIZET> "<X0C38><X8000>";<X05>;"<X05><XC0>";<ETHIOPIC_TONAL_MARK_YIZET>
@@ -765,24 +765,24 @@ order_start forward;forward;forward;forward
 <ETHIOPIC_TONAL_MARK_HIDET> "<X0C38><XB100>";<X05>;"<X05><XC0>";<ETHIOPIC_TONAL_MARK_HIDET>
 <ETHIOPIC_TONAL_MARK_DERET-HIDET> "<X0C38><XB800>";<X05>;"<X05><XC0>";<ETHIOPIC_TONAL_MARK_DERET-HIDET>
 <ETHIOPIC_TONAL_MARK_KURT> "<X0C38><XBF00>";<X05>;"<X05><XC0>";<ETHIOPIC_TONAL_MARK_KURT>
-<PLUS_SIGN> <X0C78>;<X05>;<X05>;<PLUS_SIGN>
-<LESS-THAN_SIGN> <X0C80>;<X05>;<X05>;<LESS-THAN_SIGN>
-<EQUALS_SIGN> <X0C82>;<X05>;<X05>;<EQUALS_SIGN>
-<GREATER-THAN_SIGN> <X0C84>;<X05>;<X05>;<GREATER-THAN_SIGN>
-<VERTICAL_LINE> <X0C88>;<X05>;<X05>;<VERTICAL_LINE>
-<TILDE> <X0C8C>;<X05>;<X05>;<TILDE>
-<DOLLAR_SIGN> <X0D7C>;<X05>;<X05>;<DOLLAR_SIGN>
-<ETHIOPIC_NUMBER_TEN> <X1050>;<X05>;<X05>;<ETHIOPIC_NUMBER_TEN>
-<ETHIOPIC_NUMBER_TWENTY> <X1052>;<X05>;<X05>;<ETHIOPIC_NUMBER_TWENTY>
-<ETHIOPIC_NUMBER_THIRTY> <X1054>;<X05>;<X05>;<ETHIOPIC_NUMBER_THIRTY>
-<ETHIOPIC_NUMBER_FORTY> <X1056>;<X05>;<X05>;<ETHIOPIC_NUMBER_FORTY>
-<ETHIOPIC_NUMBER_FIFTY> <X1058>;<X05>;<X05>;<ETHIOPIC_NUMBER_FIFTY>
-<ETHIOPIC_NUMBER_SIXTY> <X105A>;<X05>;<X05>;<ETHIOPIC_NUMBER_SIXTY>
-<ETHIOPIC_NUMBER_SEVENTY> <X105C>;<X05>;<X05>;<ETHIOPIC_NUMBER_SEVENTY>
-<ETHIOPIC_NUMBER_EIGHTY> <X105E>;<X05>;<X05>;<ETHIOPIC_NUMBER_EIGHTY>
-<ETHIOPIC_NUMBER_NINETY> <X1060>;<X05>;<X05>;<ETHIOPIC_NUMBER_NINETY>
-<ETHIOPIC_NUMBER_HUNDRED> <X1062>;<X05>;<X05>;<ETHIOPIC_NUMBER_HUNDRED>
-<ETHIOPIC_NUMBER_TEN_THOUSAND> <X1064>;<X05>;<X05>;<ETHIOPIC_NUMBER_TEN_THOUSAND>
+<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>
+<ETHIOPIC_NUMBER_TEN> <X107A>;<X05>;<X05>;<ETHIOPIC_NUMBER_TEN>
+<ETHIOPIC_NUMBER_TWENTY> <X107C>;<X05>;<X05>;<ETHIOPIC_NUMBER_TWENTY>
+<ETHIOPIC_NUMBER_THIRTY> <X107E>;<X05>;<X05>;<ETHIOPIC_NUMBER_THIRTY>
+<ETHIOPIC_NUMBER_FORTY> <X1080>;<X05>;<X05>;<ETHIOPIC_NUMBER_FORTY>
+<ETHIOPIC_NUMBER_FIFTY> <X1082>;<X05>;<X05>;<ETHIOPIC_NUMBER_FIFTY>
+<ETHIOPIC_NUMBER_SIXTY> <X1084>;<X05>;<X05>;<ETHIOPIC_NUMBER_SIXTY>
+<ETHIOPIC_NUMBER_SEVENTY> <X1086>;<X05>;<X05>;<ETHIOPIC_NUMBER_SEVENTY>
+<ETHIOPIC_NUMBER_EIGHTY> <X1088>;<X05>;<X05>;<ETHIOPIC_NUMBER_EIGHTY>
+<ETHIOPIC_NUMBER_NINETY> <X108A>;<X05>;<X05>;<ETHIOPIC_NUMBER_NINETY>
+<ETHIOPIC_NUMBER_HUNDRED> <X108C>;<X05>;<X05>;<ETHIOPIC_NUMBER_HUNDRED>
+<ETHIOPIC_NUMBER_TEN_THOUSAND> <X108E>;<X05>;<X05>;<ETHIOPIC_NUMBER_TEN_THOUSAND>
 <zero> <X1300>;<X05>;<X05>;<zero>
 <one> <X1500>;<X05>;<X05>;<one>
 <ETHIOPIC_DIGIT_ONE> <X1500>;<X05>;<X05>;<ETHIOPIC_DIGIT_ONE>
diff --git a/share/colldef_unicode/ar_SA.UTF-8.src b/share/colldef_unicode/ar_SA.UTF-8.src
index a903edd4df59..c38a0cd2468a 100644
--- a/share/colldef_unicode/ar_SA.UTF-8.src
+++ b/share/colldef_unicode/ar_SA.UTF-8.src
@@ -62,43 +62,42 @@ collating-symbol <X06>
 collating-symbol <X07>
 collating-symbol <X08>
 collating-symbol <X09>
-collating-symbol <X0A>
 collating-symbol <X10>
-collating-symbol <X18>
+collating-symbol <X13>
 collating-symbol <X1A>
-collating-symbol <X1C>
+collating-symbol <X1D>
 collating-symbol <X20>
-collating-symbol <X28>
+collating-symbol <X27>
 collating-symbol <X2A>
-collating-symbol <X2C>
-collating-symbol <X3A>
-collating-symbol <X3C>
+collating-symbol <X31>
+collating-symbol <X34>
+collating-symbol <X3B>
*** 139927 LINES SKIPPED ***