diff --git a/unicodetools/data/emoji/dev/emoji-test.txt b/unicodetools/data/emoji/dev/emoji-test.txt index e81fe0b19..95c5d5431 100644 --- a/unicodetools/data/emoji/dev/emoji-test.txt +++ b/unicodetools/data/emoji/dev/emoji-test.txt @@ -1,5 +1,5 @@ # emoji-test.txt -# Date: 2024-05-01, 21:25:24 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 and license, see https://www.unicode.org/terms_of_use.html @@ -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 diff --git a/unicodetools/data/emoji/dev/emoji-zwj-sequences.txt b/unicodetools/data/emoji/dev/emoji-zwj-sequences.txt index e471645bf..ce31f22ce 100644 --- a/unicodetools/data/emoji/dev/emoji-zwj-sequences.txt +++ b/unicodetools/data/emoji/dev/emoji-zwj-sequences.txt @@ -1,5 +1,5 @@ # emoji-zwj-sequences.txt -# Date: 2024-05-01, 21:25:24 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 and license, see https://www.unicode.org/terms_of_use.html @@ -665,7 +665,7 @@ 1F9D1 200D 1F33E ; RGI_Emoji_ZWJ_Sequence ; farmer # E12.1 [1] (๐Ÿง‘โ€๐ŸŒพ) 1F9D1 200D 1F373 ; RGI_Emoji_ZWJ_Sequence ; cook # E12.1 [1] (๐Ÿง‘โ€๐Ÿณ) 1F9D1 200D 1F37C ; RGI_Emoji_ZWJ_Sequence ; person feeding baby # E13.0 [1] (๐Ÿง‘โ€๐Ÿผ) -1F9D1 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; mx claus # E13.0 [1] (๐Ÿง‘โ€๐ŸŽ„) +1F9D1 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; Mx claus # E13.0 [1] (๐Ÿง‘โ€๐ŸŽ„) 1F9D1 200D 1F393 ; RGI_Emoji_ZWJ_Sequence ; student # E12.1 [1] (๐Ÿง‘โ€๐ŸŽ“) 1F9D1 200D 1F3A4 ; RGI_Emoji_ZWJ_Sequence ; singer # E12.1 [1] (๐Ÿง‘โ€๐ŸŽค) 1F9D1 200D 1F3A8 ; RGI_Emoji_ZWJ_Sequence ; artist # E12.1 [1] (๐Ÿง‘โ€๐ŸŽจ) @@ -689,7 +689,7 @@ 1F9D1 1F3FB 200D 1F33E ; RGI_Emoji_ZWJ_Sequence ; farmer: light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿปโ€๐ŸŒพ) 1F9D1 1F3FB 200D 1F373 ; RGI_Emoji_ZWJ_Sequence ; cook: light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿปโ€๐Ÿณ) 1F9D1 1F3FB 200D 1F37C ; RGI_Emoji_ZWJ_Sequence ; person feeding baby: light skin tone # E13.0 [1] (๐Ÿง‘๐Ÿปโ€๐Ÿผ) -1F9D1 1F3FB 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; mx claus: light skin tone # E13.0 [1] (๐Ÿง‘๐Ÿปโ€๐ŸŽ„) +1F9D1 1F3FB 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; Mx claus: light skin tone # E13.0 [1] (๐Ÿง‘๐Ÿปโ€๐ŸŽ„) 1F9D1 1F3FB 200D 1F393 ; RGI_Emoji_ZWJ_Sequence ; student: light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿปโ€๐ŸŽ“) 1F9D1 1F3FB 200D 1F3A4 ; RGI_Emoji_ZWJ_Sequence ; singer: light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿปโ€๐ŸŽค) 1F9D1 1F3FB 200D 1F3A8 ; RGI_Emoji_ZWJ_Sequence ; artist: light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿปโ€๐ŸŽจ) @@ -713,7 +713,7 @@ 1F9D1 1F3FC 200D 1F33E ; RGI_Emoji_ZWJ_Sequence ; farmer: medium-light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿผโ€๐ŸŒพ) 1F9D1 1F3FC 200D 1F373 ; RGI_Emoji_ZWJ_Sequence ; cook: medium-light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿผโ€๐Ÿณ) 1F9D1 1F3FC 200D 1F37C ; RGI_Emoji_ZWJ_Sequence ; person feeding baby: medium-light skin tone # E13.0 [1] (๐Ÿง‘๐Ÿผโ€๐Ÿผ) -1F9D1 1F3FC 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; mx claus: medium-light skin tone # E13.0 [1] (๐Ÿง‘๐Ÿผโ€๐ŸŽ„) +1F9D1 1F3FC 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; Mx claus: medium-light skin tone # E13.0 [1] (๐Ÿง‘๐Ÿผโ€๐ŸŽ„) 1F9D1 1F3FC 200D 1F393 ; RGI_Emoji_ZWJ_Sequence ; student: medium-light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿผโ€๐ŸŽ“) 1F9D1 1F3FC 200D 1F3A4 ; RGI_Emoji_ZWJ_Sequence ; singer: medium-light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿผโ€๐ŸŽค) 1F9D1 1F3FC 200D 1F3A8 ; RGI_Emoji_ZWJ_Sequence ; artist: medium-light skin tone # E12.1 [1] (๐Ÿง‘๐Ÿผโ€๐ŸŽจ) @@ -737,7 +737,7 @@ 1F9D1 1F3FD 200D 1F33E ; RGI_Emoji_ZWJ_Sequence ; farmer: medium skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฝโ€๐ŸŒพ) 1F9D1 1F3FD 200D 1F373 ; RGI_Emoji_ZWJ_Sequence ; cook: medium skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฝโ€๐Ÿณ) 1F9D1 1F3FD 200D 1F37C ; RGI_Emoji_ZWJ_Sequence ; person feeding baby: medium skin tone # E13.0 [1] (๐Ÿง‘๐Ÿฝโ€๐Ÿผ) -1F9D1 1F3FD 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; mx claus: medium skin tone # E13.0 [1] (๐Ÿง‘๐Ÿฝโ€๐ŸŽ„) +1F9D1 1F3FD 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; Mx claus: medium skin tone # E13.0 [1] (๐Ÿง‘๐Ÿฝโ€๐ŸŽ„) 1F9D1 1F3FD 200D 1F393 ; RGI_Emoji_ZWJ_Sequence ; student: medium skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฝโ€๐ŸŽ“) 1F9D1 1F3FD 200D 1F3A4 ; RGI_Emoji_ZWJ_Sequence ; singer: medium skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฝโ€๐ŸŽค) 1F9D1 1F3FD 200D 1F3A8 ; RGI_Emoji_ZWJ_Sequence ; artist: medium skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฝโ€๐ŸŽจ) @@ -761,7 +761,7 @@ 1F9D1 1F3FE 200D 1F33E ; RGI_Emoji_ZWJ_Sequence ; farmer: medium-dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿพโ€๐ŸŒพ) 1F9D1 1F3FE 200D 1F373 ; RGI_Emoji_ZWJ_Sequence ; cook: medium-dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿพโ€๐Ÿณ) 1F9D1 1F3FE 200D 1F37C ; RGI_Emoji_ZWJ_Sequence ; person feeding baby: medium-dark skin tone # E13.0 [1] (๐Ÿง‘๐Ÿพโ€๐Ÿผ) -1F9D1 1F3FE 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; mx claus: medium-dark skin tone # E13.0 [1] (๐Ÿง‘๐Ÿพโ€๐ŸŽ„) +1F9D1 1F3FE 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; Mx claus: medium-dark skin tone # E13.0 [1] (๐Ÿง‘๐Ÿพโ€๐ŸŽ„) 1F9D1 1F3FE 200D 1F393 ; RGI_Emoji_ZWJ_Sequence ; student: medium-dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿพโ€๐ŸŽ“) 1F9D1 1F3FE 200D 1F3A4 ; RGI_Emoji_ZWJ_Sequence ; singer: medium-dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿพโ€๐ŸŽค) 1F9D1 1F3FE 200D 1F3A8 ; RGI_Emoji_ZWJ_Sequence ; artist: medium-dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿพโ€๐ŸŽจ) @@ -785,7 +785,7 @@ 1F9D1 1F3FF 200D 1F33E ; RGI_Emoji_ZWJ_Sequence ; farmer: dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฟโ€๐ŸŒพ) 1F9D1 1F3FF 200D 1F373 ; RGI_Emoji_ZWJ_Sequence ; cook: dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฟโ€๐Ÿณ) 1F9D1 1F3FF 200D 1F37C ; RGI_Emoji_ZWJ_Sequence ; person feeding baby: dark skin tone # E13.0 [1] (๐Ÿง‘๐Ÿฟโ€๐Ÿผ) -1F9D1 1F3FF 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; mx claus: dark skin tone # E13.0 [1] (๐Ÿง‘๐Ÿฟโ€๐ŸŽ„) +1F9D1 1F3FF 200D 1F384 ; RGI_Emoji_ZWJ_Sequence ; Mx claus: dark skin tone # E13.0 [1] (๐Ÿง‘๐Ÿฟโ€๐ŸŽ„) 1F9D1 1F3FF 200D 1F393 ; RGI_Emoji_ZWJ_Sequence ; student: dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฟโ€๐ŸŽ“) 1F9D1 1F3FF 200D 1F3A4 ; RGI_Emoji_ZWJ_Sequence ; singer: dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฟโ€๐ŸŽค) 1F9D1 1F3FF 200D 1F3A8 ; RGI_Emoji_ZWJ_Sequence ; artist: dark skin tone # E12.1 [1] (๐Ÿง‘๐Ÿฟโ€๐ŸŽจ) diff --git a/unicodetools/data/emoji/dev/internal/emoji-proposals.txt b/unicodetools/data/emoji/dev/internal/emoji-proposals.txt index edc931dbb..8769e7477 100644 --- a/unicodetools/data/emoji/dev/internal/emoji-proposals.txt +++ b/unicodetools/data/emoji/dev/internal/emoji-proposals.txt @@ -1925,7 +1925,7 @@ 1F9CF 1F3FF; L2/18-229, L2/14-173 # 2019 (๐Ÿง๐Ÿฟ) deaf person: dark skin tone # L2/19-231 -1F9D1 200D 1F384; L2/19-231 # 2020 (๐Ÿง‘โ€๐ŸŽ„) mx claus +1F9D1 200D 1F384; L2/19-231 # 2020 (๐Ÿง‘โ€๐ŸŽ„) Mx claus # L2/19-275, L2/18-223, L2/18-228, L2/19-021, L2/18-340 1F9D1 200D 1F91D 200D 1F9D1; L2/19-275, L2/18-223, L2/18-228, L2/19-021, L2/18-340 # 2019 (๐Ÿง‘โ€๐Ÿคโ€๐Ÿง‘) people holding hands diff --git a/unicodetools/src/main/resources/org/unicode/tools/emoji/emojiOrdering.txt b/unicodetools/src/main/resources/org/unicode/tools/emoji/emojiOrdering.txt index b8a0b631b..f3bfaccdd 100644 --- a/unicodetools/src/main/resources/org/unicode/tools/emoji/emojiOrdering.txt +++ b/unicodetools/src/main/resources/org/unicode/tools/emoji/emojiOrdering.txt @@ -408,7 +408,7 @@ ๐ŸŠ ๐Ÿข ๐ŸฆŽ ๐Ÿ ๐Ÿฒ ๐Ÿ‰ ๐Ÿฆ• ๐Ÿฆ– @ animal-marine -๐Ÿณ ๐Ÿ‹ ๐Ÿฌ ๐Ÿฆญ ๐ŸŸ ๐Ÿ  ๐Ÿก ๐Ÿฆˆ ๐Ÿ™ ๐Ÿš ๐Ÿชธ ๐Ÿชผ +๐Ÿณ ๐Ÿ‹ ๐Ÿฌ ๐Ÿฆญ ๐ŸŸ ๐Ÿ  ๐Ÿก ๐Ÿฆˆ ๐Ÿ™ ๐Ÿš ๐Ÿชธ ๐Ÿชผ ๐Ÿฆ€ ๐Ÿฆž ๐Ÿฆ ๐Ÿฆ‘ ๐Ÿฆช @ animal-bug ๐ŸŒ ๐Ÿฆ‹ ๐Ÿ› ๐Ÿœ ๐Ÿ ๐Ÿชฒ ๐Ÿž ๐Ÿฆ— ๐Ÿชณ ๐Ÿ•ท๏ธ ๐Ÿ•ธ๏ธ ๐Ÿฆ‚ ๐ŸฆŸ ๐Ÿชฐ ๐Ÿชฑ ๐Ÿฆ  @ plant-flower @@ -428,8 +428,6 @@ ๐Ÿฅซ @ food-asian ๐Ÿฑ ๐Ÿ˜ ๐Ÿ™ ๐Ÿš ๐Ÿ› ๐Ÿœ ๐Ÿ ๐Ÿ  ๐Ÿข ๐Ÿฃ ๐Ÿค ๐Ÿฅ ๐Ÿฅฎ ๐Ÿก ๐ŸฅŸ ๐Ÿฅ  ๐Ÿฅก -@ food-marine -๐Ÿฆ€ ๐Ÿฆž ๐Ÿฆ ๐Ÿฆ‘ ๐Ÿฆช @ food-sweet ๐Ÿฆ ๐Ÿง ๐Ÿจ ๐Ÿฉ ๐Ÿช ๐ŸŽ‚ ๐Ÿฐ ๐Ÿง ๐Ÿฅง ๐Ÿซ ๐Ÿฌ ๐Ÿญ ๐Ÿฎ ๐Ÿฏ @ drink