Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CLDR-17582 Tweak the emoji collation/English #3787

Merged
merged 2 commits into from
Jun 6, 2024
Merged

CLDR-17582 Tweak the emoji collation/English #3787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05890fe
CLDR-17582 Tweak the emoji collation/English
macchiati Jun 5, 2024
202bcbd
CLDR-17582 Update the emoji ordering also
macchiati Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/annotations/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
18 changes: 9 additions & 9 deletions common/collation/root.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -967,7 +967,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<*🤥🫨
< 🙂‍↔
< 🙂‍↕
<*😌😔😪🤤😴
<*😌😔😪🤤😴🫩
<*😷🤒🤕🤢🤮🤧🥵🥶🥴😵
< 😵‍💫
<*🤯
Expand Down Expand Up @@ -1286,7 +1286,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
< 🧑‍🧑‍🧒‍🧒
< 🧑‍🧒
< 🧑‍🧒‍🧒
<*👣
<*👣🫆
<*🦰🦱🦳🦲
<*🐵🐒🦍🦧🐶🐕🦮
< 🐕‍🦺
Expand All @@ -1301,18 +1301,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
< 🐦‍🔥
<*🐸
<*🐊🐢🦎🐍🐲🐉🦕🦖
<*🐳🐋🐬🦭🐟🐠🐡🦈🐙🐚🪸🪼
<*🐳🐋🐬🦭🐟🐠🐡🦈🐙🐚🪸🪼🦀🦞🦐🦑🦪
<*🐌🦋🐛🐜🐝🪲🐞🦗🪳🕷🕸🦂🦟🪰🪱🦠
<*💐🌸💮🪷🏵🌹🥀🌺🌻🌼🌷🪻
<*🌱🪴🌲🌳🌴🌵🌾🌿☘🍀🍁🍂🍃🪹🪺🍄
<*🌱🪴🌲🌳🌴🌵🌾🌿☘🍀🍁🍂🍃🪹🪺🍄🪾
<*🍇🍈🍉🍊🍋
< 🍋‍🟩
<*🍌🍍🥭🍎🍏🍐🍑🍒🍓🫐🥝🍅🫒🥥
<*🥑🍆🥔🥕🌽🌶🫑🥒🥬🥦🧄🧅🥜🫘🌰🫚🫛
< 🍄‍🟫
<*🫜
<*🍞🥐🥖🫓🥨🥯🥞🧇🧀🍖🍗🥩🥓🍔🍟🍕🌭🥪🌮🌯🫔🥙🧆🥚🍳🥘🍲🫕🥣🥗🍿🧈🧂🥫
<*🍱🍘🍙🍚🍛🍜🍝🍠🍢🍣🍤🍥🥮🍡🥟🥠🥡
<*🦀🦞🦐🦑🦪
<*🍦🍧🍨🍩🍪🎂🍰🧁🥧🍫🍬🍭🍮🍯
<*🍼🥛☕🫖🍵🍶🍾🍷🍸🍹🍺🍻🥂🥃🫗🥤🧋🧃🧉🧊
<*🥢🍽🍴🥄🔪🫙🏺
Expand All @@ -1335,7 +1335,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<*👓🕶🥽🥼🦺👔👕👖🧣🧤🧥🧦👗👘🥻🩱🩲🩳👙👚🪭👛👜👝🛍🎒🩴👞👟🥾🥿👠👡🩰👢🪮👑👒🎩🎓🧢🪖⛑📿💄💍💎
<*🔇🔈🔉🔊📢📣📯🔔🔕
<*🎼🎵🎶🎙🎚🎛🎤🎧📻
<*🎷🪗🎸🎹🎺🎻🪕🥁🪘🪇🪈
<*🎷🪗🎸🎹🎺🎻🪕🥁🪘🪇🪈🪉
<*📱📲☎📞📟📠
<*🔋🪫🔌💻🖥🖨⌨🖱🖲💽💾💿📀🧮
<*🎥🎞📽🎬📺📷📸📹📼🔍🔎🕯💡🔦🏮🪔
Expand All @@ -1347,7 +1347,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<*🔒🔓🔏🔐🔑🗝
<*🔨🪓⛏⚒🛠🗡⚔💣🪃🏹🛡🪚🔧🪛🔩⚙🗜⚖🦯🔗
< ⛓‍💥 = ⛓️‍💥
<*⛓🪝🧰🧲🪜
<*⛓🪝🧰🧲🪜🪏
<*⚗🧪🧫🧬🔬🔭📡
<*💉🩸💊🩹🩼🩺🩻
<*🚪🛗🪞🪟🛏🛋🪑🚽🪠🚿🛁🪤🪒🧴🧷🧹🧺🧻🪣🧼🫧🪥🧽🧯🛒
Expand All @@ -1362,7 +1362,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<*✖➕➖➗🟰♾
<*‼⁉❓❔❕❗〰
<*💱💲
<*⚕♻⚜🔱📛🔰⭕✅☑✔❌❎➰➿〽✳✴❇©®™
<*⚕♻⚜🔱📛🔰⭕✅☑✔❌❎➰➿〽✳✴❇©®™🫟
< '#⃣' = '#️⃣'
< '*⃣' = '*️⃣'
< 0⃣ = 0️⃣
Expand Down
36 changes: 17 additions & 19 deletions tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/emoji/emoji-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Loading