From f2715adcd52c287b5a4a7fe6305b369a63fcdf58 Mon Sep 17 00:00:00 2001
From: Mark Davis <mark@macchiato.com>
Date: Thu, 6 Jun 2024 10:56:52 -0700
Subject: [PATCH] CLDR-17582 Tweak the emoji collation/English (#3787)

---
 common/annotations/en.xml                     |  4 +--
 common/collation/root.xml                     | 18 +++++-----
 .../cldr/util/data/emoji/emoji-test.txt       | 36 +++++++++----------
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/common/annotations/en.xml b/common/annotations/en.xml
index c1c3b863c63..8fd149c119b 100644
--- a/common/annotations/en.xml
+++ b/common/annotations/en.xml
@@ -1076,7 +1076,7 @@ annotations.
 		<annotation cp="🖐" type="tts">hand with fingers splayed</annotation>
 		<annotation cp="✋">5 | five | hand | high | raised | stop</annotation>
 		<annotation cp="✋" type="tts">raised hand</annotation>
-		<annotation cp="🖖">finger | hand | hands | salute</annotation>
+		<annotation cp="🖖">finger | hand | hands | salute | Vulcan</annotation>
 		<annotation cp="🖖" type="tts">vulcan salute</annotation>
 		<annotation cp="🫱">hand | handshake | hold | reach | right | rightward | rightwards | shake</annotation> <!-- 1FAF1 -->
 		<annotation cp="🫱" type="tts">rightwards hand</annotation>
@@ -1453,7 +1453,7 @@ annotations.
 		<annotation cp="🤶">celebration | Christmas | claus | fairy | fantasy | holiday | merry | mother | Mrs | santa | tale | xmas</annotation>
 		<annotation cp="🤶" type="tts">Mrs. Claus</annotation>
 		<annotation cp="🧑‍🎄">celebration | Christmas | claus | fairy | fantasy | holiday | merry | Mx | santa | tale | xmas</annotation> <!-- 1F9D1 200D 1F384 -->
-		<annotation cp="🧑‍🎄" type="tts">Mx claus</annotation>
+		<annotation cp="🧑‍🎄" type="tts">Mx Claus</annotation>
 		<annotation cp="🦸">good | hero | superhero | superpower</annotation>
 		<annotation cp="🦸" type="tts">superhero</annotation>
 		<annotation cp="🦸‍♂">good | hero | man | superhero | superpower</annotation>
diff --git a/common/collation/root.xml b/common/collation/root.xml
index 3ad8b182d5a..d86022184fa 100644
--- a/common/collation/root.xml
+++ b/common/collation/root.xml
@@ -950,7 +950,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 &龠=\uFDD0龠 # radical 214
 				]]></cr>
 			</collation>
-<!-- Machine-readable version of the emoji ordering rules for v15.1β (corresponding to CLDR). -->
+<!-- Machine-readable version of the emoji ordering rules for v16.0β (corresponding to CLDR). -->
 <collation type='emoji'>
 <cr><![CDATA[
 # START AUTOGENERATED EMOJI ORDER
@@ -967,7 +967,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <*🤥🫨
 < 🙂‍↔
 < 🙂‍↕
-<*😌😔😪🤤😴
+<*😌😔😪🤤😴🫩
 <*😷🤒🤕🤢🤮🤧🥵🥶🥴😵
 < 😵‍💫
 <*🤯
@@ -1286,7 +1286,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 < 🧑‍🧑‍🧒‍🧒
 < 🧑‍🧒
 < 🧑‍🧒‍🧒
-<*👣
+<*👣🫆
 <*🦰🦱🦳🦲
 <*🐵🐒🦍🦧🐶🐕🦮
 < 🐕‍🦺
@@ -1301,18 +1301,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 < 🐦‍🔥
 <*🐸
 <*🐊🐢🦎🐍🐲🐉🦕🦖
-<*🐳🐋🐬🦭🐟🐠🐡🦈🐙🐚🪸🪼
+<*🐳🐋🐬🦭🐟🐠🐡🦈🐙🐚🪸🪼🦀🦞🦐🦑🦪
 <*🐌🦋🐛🐜🐝🪲🐞🦗🪳🕷🕸🦂🦟🪰🪱🦠
 <*💐🌸💮🪷🏵🌹🥀🌺🌻🌼🌷🪻
-<*🌱🪴🌲🌳🌴🌵🌾🌿☘🍀🍁🍂🍃🪹🪺🍄
+<*🌱🪴🌲🌳🌴🌵🌾🌿☘🍀🍁🍂🍃🪹🪺🍄🪾
 <*🍇🍈🍉🍊🍋
 < 🍋‍🟩
 <*🍌🍍🥭🍎🍏🍐🍑🍒🍓🫐🥝🍅🫒🥥
 <*🥑🍆🥔🥕🌽🌶🫑🥒🥬🥦🧄🧅🥜🫘🌰🫚🫛
 < 🍄‍🟫
+<*🫜
 <*🍞🥐🥖🫓🥨🥯🥞🧇🧀🍖🍗🥩🥓🍔🍟🍕🌭🥪🌮🌯🫔🥙🧆🥚🍳🥘🍲🫕🥣🥗🍿🧈🧂🥫
 <*🍱🍘🍙🍚🍛🍜🍝🍠🍢🍣🍤🍥🥮🍡🥟🥠🥡
-<*🦀🦞🦐🦑🦪
 <*🍦🍧🍨🍩🍪🎂🍰🧁🥧🍫🍬🍭🍮🍯
 <*🍼🥛☕🫖🍵🍶🍾🍷🍸🍹🍺🍻🥂🥃🫗🥤🧋🧃🧉🧊
 <*🥢🍽🍴🥄🔪🫙🏺
@@ -1335,7 +1335,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <*👓🕶🥽🥼🦺👔👕👖🧣🧤🧥🧦👗👘🥻🩱🩲🩳👙👚🪭👛👜👝🛍🎒🩴👞👟🥾🥿👠👡🩰👢🪮👑👒🎩🎓🧢🪖⛑📿💄💍💎
 <*🔇🔈🔉🔊📢📣📯🔔🔕
 <*🎼🎵🎶🎙🎚🎛🎤🎧📻
-<*🎷🪗🎸🎹🎺🎻🪕🥁🪘🪇🪈
+<*🎷🪗🎸🎹🎺🎻🪕🥁🪘🪇🪈🪉
 <*📱📲☎📞📟📠
 <*🔋🪫🔌💻🖥🖨⌨🖱🖲💽💾💿📀🧮
 <*🎥🎞📽🎬📺📷📸📹📼🔍🔎🕯💡🔦🏮🪔
@@ -1347,7 +1347,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <*🔒🔓🔏🔐🔑🗝
 <*🔨🪓⛏⚒🛠🗡⚔💣🪃🏹🛡🪚🔧🪛🔩⚙🗜⚖🦯🔗
 < ⛓‍💥 = ⛓️‍💥
-<*⛓🪝🧰🧲🪜
+<*⛓🪝🧰🧲🪜🪏
 <*⚗🧪🧫🧬🔬🔭📡
 <*💉🩸💊🩹🩼🩺🩻
 <*🚪🛗🪞🪟🛏🛋🪑🚽🪠🚿🛁🪤🪒🧴🧷🧹🧺🧻🪣🧼🫧🪥🧽🧯🛒
@@ -1362,7 +1362,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <*✖➕➖➗🟰♾
 <*‼⁉❓❔❕❗〰
 <*💱💲
-<*⚕♻⚜🔱📛🔰⭕✅☑✔❌❎➰➿〽✳✴❇©®™
+<*⚕♻⚜🔱📛🔰⭕✅☑✔❌❎➰➿〽✳✴❇©®™🫟
 < '#⃣' = '#️⃣'
 < '*⃣' = '*️⃣'
 < 0⃣ = 0️⃣
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/emoji/emoji-test.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/emoji/emoji-test.txt
index 770b5fbc82b..95c5d5431e3 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/emoji/emoji-test.txt
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/emoji/emoji-test.txt
@@ -1,8 +1,8 @@
 # emoji-test.txt
-# Date: 2024-01-16, 16:25:20 GMT
+# Date: 2024-06-04, 16:46:01 GMT
 # © 2024 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use and license, see https://www.unicode.org/terms_of_use.html
 #
 # Emoji Keyboard/Display Test Data for UTS #51
 # Version: 16.0
@@ -1751,12 +1751,12 @@
 1F936 1F3FD                                            ; fully-qualified     # 🤶🏽 E3.0 Mrs. Claus: medium skin tone
 1F936 1F3FE                                            ; fully-qualified     # 🤶🏾 E3.0 Mrs. Claus: medium-dark skin tone
 1F936 1F3FF                                            ; fully-qualified     # 🤶🏿 E3.0 Mrs. Claus: dark skin tone
-1F9D1 200D 1F384                                       ; fully-qualified     # 🧑‍🎄 E13.0 mx claus
-1F9D1 1F3FB 200D 1F384                                 ; fully-qualified     # 🧑🏻‍🎄 E13.0 mx claus: light skin tone
-1F9D1 1F3FC 200D 1F384                                 ; fully-qualified     # 🧑🏼‍🎄 E13.0 mx claus: medium-light skin tone
-1F9D1 1F3FD 200D 1F384                                 ; fully-qualified     # 🧑🏽‍🎄 E13.0 mx claus: medium skin tone
-1F9D1 1F3FE 200D 1F384                                 ; fully-qualified     # 🧑🏾‍🎄 E13.0 mx claus: medium-dark skin tone
-1F9D1 1F3FF 200D 1F384                                 ; fully-qualified     # 🧑🏿‍🎄 E13.0 mx claus: dark skin tone
+1F9D1 200D 1F384                                       ; fully-qualified     # 🧑‍🎄 E13.0 Mx claus
+1F9D1 1F3FB 200D 1F384                                 ; fully-qualified     # 🧑🏻‍🎄 E13.0 Mx claus: light skin tone
+1F9D1 1F3FC 200D 1F384                                 ; fully-qualified     # 🧑🏼‍🎄 E13.0 Mx claus: medium-light skin tone
+1F9D1 1F3FD 200D 1F384                                 ; fully-qualified     # 🧑🏽‍🎄 E13.0 Mx claus: medium skin tone
+1F9D1 1F3FE 200D 1F384                                 ; fully-qualified     # 🧑🏾‍🎄 E13.0 Mx claus: medium-dark skin tone
+1F9D1 1F3FF 200D 1F384                                 ; fully-qualified     # 🧑🏿‍🎄 E13.0 Mx claus: dark skin tone
 1F9B8                                                  ; fully-qualified     # 🦸 E11.0 superhero
 1F9B8 1F3FB                                            ; fully-qualified     # 🦸🏻 E11.0 superhero: light skin tone
 1F9B8 1F3FC                                            ; fully-qualified     # 🦸🏼 E11.0 superhero: medium-light skin tone
@@ -3721,6 +3721,11 @@
 1F41A                                                  ; fully-qualified     # 🐚 E0.6 spiral shell
 1FAB8                                                  ; fully-qualified     # 🪸 E14.0 coral
 1FABC                                                  ; fully-qualified     # 🪼 E15.0 jellyfish
+1F980                                                  ; fully-qualified     # 🦀 E1.0 crab
+1F99E                                                  ; fully-qualified     # 🦞 E11.0 lobster
+1F990                                                  ; fully-qualified     # 🦐 E3.0 shrimp
+1F991                                                  ; fully-qualified     # 🦑 E3.0 squid
+1F9AA                                                  ; fully-qualified     # 🦪 E12.0 oyster
 
 # subgroup: animal-bug
 1F40C                                                  ; fully-qualified     # 🐌 E0.6 snail
@@ -3777,8 +3782,8 @@
 1F344                                                  ; fully-qualified     # 🍄 E0.6 mushroom
 1FABE                                                  ; fully-qualified     # 🪾 E16.0 leafless tree
 
-# Animals & Nature subtotal:		161
-# Animals & Nature subtotal:		161	w/o modifiers
+# Animals & Nature subtotal:		166
+# Animals & Nature subtotal:		166	w/o modifiers
 
 # group: Food & Drink
 
@@ -3881,13 +3886,6 @@
 1F960                                                  ; fully-qualified     # 🥠 E5.0 fortune cookie
 1F961                                                  ; fully-qualified     # 🥡 E5.0 takeout box
 
-# subgroup: food-marine
-1F980                                                  ; fully-qualified     # 🦀 E1.0 crab
-1F99E                                                  ; fully-qualified     # 🦞 E11.0 lobster
-1F990                                                  ; fully-qualified     # 🦐 E3.0 shrimp
-1F991                                                  ; fully-qualified     # 🦑 E3.0 squid
-1F9AA                                                  ; fully-qualified     # 🦪 E12.0 oyster
-
 # subgroup: food-sweet
 1F366                                                  ; fully-qualified     # 🍦 E0.6 soft ice cream
 1F367                                                  ; fully-qualified     # 🍧 E0.6 shaved ice
@@ -3936,8 +3934,8 @@
 1FAD9                                                  ; fully-qualified     # 🫙 E14.0 jar
 1F3FA                                                  ; fully-qualified     # 🏺 E1.0 amphora
 
-# Food & Drink subtotal:		138
-# Food & Drink subtotal:		138	w/o modifiers
+# Food & Drink subtotal:		133
+# Food & Drink subtotal:		133	w/o modifiers
 
 # group: Travel & Places