Merge branch 'susnux-enh/update-unicode-15_1'

iamcal · Feb 5, 2024 · fe40d3c · fe40d3c
2 parents 1d119e6 + 93c4f4b
commit fe40d3c
Show file tree

Hide file tree

Showing 12,237 changed files with 11,785 additions and 9,127 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 2024-02-?? : v15.1.0
+
+* Update to Emoji 15.1
+* Updated Apple images, supporting 15.1
+* Updated Google images, supporting 15.1
+* Update Twitter images to repo fork, supporting 15.0
+
 ## 2023-05-31 : v15.0.1
 
 * Rebuilt Google quanitized sheets - 128 & 256 color vserions (thanks to @susnux)

diff --git a/README.md b/README.md
@@ -150,10 +150,10 @@ available versions. If you're looking for older versions of Apple or Android ima
 
 | Image Set | Source Version                                                  | Supported Emoji | Missing Images |
 | --------- | --------------------------------------------------------------- | --------------- | -------------- |
-| Apple     | macOS Ventura 13.3.1                                            | Emoji 15.0      | 3              |
-| Google    | [Noto Emoji](https://github.com/googlefonts/noto-emoji), v2.038 | Emoji 15.0      | 0              |
-| Twitter   | [Twemoji (fork)](https://github.com/jdecked/twemoji), v15.0.3   | Emoji 15.0      | 0              |
-| Facebook  | v9, fetched 2023-04-17                                          | Emoji 14.0      | 55             |
+| Apple     | macOS Ventura 13.3.1                                            | Emoji 15.1      | 3              |
+| Google    | [Noto Emoji](https://github.com/googlefonts/noto-emoji), v2.042 | Emoji 15.1      | 0              |
+| Twitter   | [Twemoji (fork)](https://github.com/jdecked/twemoji), v15.0.3   | Emoji 15.0      | 118            |
+| Facebook  | v9, fetched 2023-04-17                                          | Emoji 14.0      | 158            |
 
 * Apple images, Copyright © Apple Inc., are not licensed for commercial usage.
 * Android/Google/Noto images, are available under the [Apache License 2.0](https://github.com/googlei18n/noto-emoji/blob/master/LICENSE).

diff --git a/build/README.md b/build/README.md
@@ -65,7 +65,7 @@ Since it requires some time and a lot of CPU & memory, I usually spin up a tempo
 As of Ubuntu 22.04, you can install recent versions of all dependencies via apt:
 
     sudo apt-get update
-    sudo apt-get install -y git php imagemagick parallel
+    sudo apt-get install -y git php php-mbstring imagemagick parallel
     sudo apt-get install -y pngquant zopfli
 
 Don't forget to set up your git config before committing anything!

diff --git a/build/apple/extract.pl b/build/apple/extract.pl
@@ -12,7 +12,7 @@
 $Font::TTF::Font::tables{'sbix'} = 'Font::TTF::Sbix';
 $Font::TTF::Font::tables{'morx'} = 'Font::TTF::Morx';
 
-my $filename = "apple_color_emoji_macos_13_3_1.ttc";
+my $filename = "Apple Color Emoji.ttc";
 
 my $incremental_mode = 0;
 

diff --git a/build/build_map.php b/build/build_map.php
@@ -198,6 +198,7 @@ function get_versions($fields, $comment){
 	load_short_names('data_emoji_names_v13_1.txt');
 	load_short_names('data_emoji_names_v14.txt');
 	load_short_names('data_emoji_names_v15.txt');
+	load_short_names('data_emoji_names_v15_1.txt');
 	echo "DONE\n";
 
 	function load_short_names($file){

diff --git a/build/data_emoji_names_v15_1.txt b/build/data_emoji_names_v15_1.txt
@@ -0,0 +1,22 @@
+1F9D1-200D-1F9D1-200D-1F9D2;family_adult_adult_child
+1F9D1-200D-1F9D1-200D-1F9D2-200D-1F9D2;family_adult_adult_child_child
+1F9D1-200D-1F9D2;family_adult_child
+1F9D1-200D-1F9D2-200D-1F9D2;family_adult_child_child
+1F3C3{SKIN}-200D-27A1-FE0F;person_running_facing_right
+{MAN/WOMAN}{SKIN}-200D-1F9AF-200D-27A1-FE0F;{M/W}_with_white_cane_facing_right
+{MAN/WOMAN}{SKIN}-200D-1F9BC-200D-27A1-FE0F;{M/W}_in_motorized_wheelchair_facing_right
+{MAN/WOMAN}{SKIN}-200D-1F9BD-200D-27A1-FE0F;{M/W}_in_manual_wheelchair_facing_right
+1F9D1{SKIN}-200D-1F9AF-200D-27A1-FE0F;person_with_white_cane_facing_right
+1F9D1{SKIN}-200D-1F9BC-200D-27A1-FE0F;person_in_motorized_wheelchair_facing_right
+1F9D1{SKIN}-200D-1F9BD-200D-27A1-FE0F;person_in_manual_wheelchair_facing_right
+1F6B6{SKIN}-200D-27A1-FE0F;person_walking_facing_right
+1F9CE{SKIN}-200D-27A1-FE0F;person_kneeling_facing_right
+1F3C3{SKIN}-200D-{MALE/FEMALE}-200D-27A1-FE0F;{M/W}_running_facing_right
+1F6B6{SKIN}-200D-{MALE/FEMALE}-200D-27A1-FE0F;{M/W}_walking_facing_right
+1F9CE{SKIN}-200D-{MALE/FEMALE}-200D-27A1-FE0F;{M/W}_kneeling_facing_right
+26D3-FE0F-200D-1F4A5;broken_chain
+1F344-200D-1F7EB;brown_mushroom
+1F34B-200D-1F7E9;lime
+1F426-200D-1F525;phoenix
+1F642-200D-2194-FE0F;head_shaking_horizontally
+1F642-200D-2195-FE0F;head_shaking_vertically
diff --git a/build/download_spec_files.sh b/build/download_spec_files.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-wget -O unicode/UnicodeData.txt		https://www.unicode.org/Public/15.0.0/ucd/UnicodeData.txt
-wget -O unicode/emoji-data.txt		https://www.unicode.org/Public/15.0.0/ucd/emoji/emoji-data.txt
-wget -O unicode/emoji-sequences.txt	https://www.unicode.org/Public/emoji/15.0/emoji-sequences.txt
-wget -O unicode/emoji-zwj-sequences.txt	https://www.unicode.org/Public/emoji/15.0/emoji-zwj-sequences.txt
-wget -O unicode/emoji-test.txt		https://www.unicode.org/Public/emoji/15.0/emoji-test.txt
+wget -O unicode/UnicodeData.txt		https://www.unicode.org/Public/15.1.0/ucd/UnicodeData.txt
+wget -O unicode/emoji-data.txt		https://www.unicode.org/Public/15.1.0/ucd/emoji/emoji-data.txt
+wget -O unicode/emoji-sequences.txt	https://www.unicode.org/Public/emoji/15.1/emoji-sequences.txt
+wget -O unicode/emoji-zwj-sequences.txt	https://www.unicode.org/Public/emoji/15.1/emoji-zwj-sequences.txt
+wget -O unicode/emoji-test.txt		https://www.unicode.org/Public/emoji/15.1/emoji-test.txt
diff --git a/build/find_added_in_version_names.php b/build/find_added_in_version_names.php
@@ -1,6 +1,6 @@
 <?php
 	# needs to match the relevant lines in unicode/emoji-data.txt
-	$version = '15.0 ';
+	$version = '15.1 ';
 
 
 	include('common.php');
@@ -26,19 +26,19 @@
 
 		if (strpos($comment, $GLOBALS['version']) === false) return;
 
-                if (strpos($fields[0], '..')){
-                        list($a, $b) = explode('..', $fields[0]);
-                        $a = hexdec($a);
-                        $b = hexdec($b);
+		if (strpos($fields[0], '..')){
+			list($a, $b) = explode('..', $fields[0]);
+			$a = hexdec($a);
+			$b = hexdec($b);
 
-                        $cps = array();
-                        for ($i=$a; $i<=$b; $i++){
-                                $cps[] = $i;
-                        }
-                }else{
-                        $cp = sprintf('%04x', hexdec($fields[0]));
-                        $cps = array(hexdec($fields[0]));
-                }
+			$cps = array();
+			for ($i=$a; $i<=$b; $i++){
+				$cps[] = $i;
+			}
+		}else{
+			$cp = sprintf('%04x', hexdec($fields[0]));
+			$cps = array(hexdec($fields[0]));
+		}
 
 		foreach ($cps as $cp){
 			$hex_low = sprintf('%04x', $cp);
@@ -56,11 +56,10 @@
 	});
 
 
+	parse_unicode_specfile('unicode/emoji-sequences.txt', 'get_sequence_names');
+	parse_unicode_specfile('unicode/emoji-zwj-sequences.txt', 'get_sequence_names');
 
-        parse_unicode_specfile('unicode/emoji-sequences.txt', 'get_sequence_names');
-        parse_unicode_specfile('unicode/emoji-zwj-sequences.txt', 'get_sequence_names');
-
-        function get_sequence_names($fields, $comment){
+	function get_sequence_names($fields, $comment){
 
 		if (strpos($comment, $GLOBALS['version']) === false) return;
 
@@ -89,7 +88,7 @@ function got_sequence($cp, $name){
 
 		$cp = StrToUpper($cp);
 
-                $uni = str_replace(' ', '-', $cp);
+		$uni = str_replace(' ', '-', $cp);
 
 		# skip over all but one skin tone - this makes it easier
 		# for us to turn the remaining single-case into an expansion
@@ -102,7 +101,7 @@ function got_sequence($cp, $name){
 		$GLOBALS['done'][$uni] = 1;
 
 		echo "$uni;".format_name($name)."\n";
-        }
+	}
 
 
 

diff --git a/build/google/noto-emoji b/build/google/noto-emoji
diff --git a/build/unicode/UnicodeData.txt b/build/unicode/UnicodeData.txt
@@ -11231,6 +11231,10 @@
 2FF9;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT;So;0;ON;;;;;N;;;;;
 2FFA;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT;So;0;ON;;;;;N;;;;;
 2FFB;IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID;So;0;ON;;;;;N;;;;;
+2FFC;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT;So;0;ON;;;;;N;;;;;
+2FFD;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER RIGHT;So;0;ON;;;;;N;;;;;
+2FFE;IDEOGRAPHIC DESCRIPTION CHARACTER HORIZONTAL REFLECTION;So;0;ON;;;;;N;;;;;
+2FFF;IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION;So;0;ON;;;;;N;;;;;
 3000;IDEOGRAPHIC SPACE;Zs;0;WS;<wide> 0020;;;;N;;;;;
 3001;IDEOGRAPHIC COMMA;Po;0;ON;;;;;N;;;;;
 3002;IDEOGRAPHIC FULL STOP;Po;0;ON;;;;;N;IDEOGRAPHIC PERIOD;;;;
@@ -11705,6 +11709,7 @@
 31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;;
 31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;;
 31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;;
+31EF;IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION;So;0;ON;;;;;N;;;;;
 31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;;
 31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;;
 31F2;KATAKANA LETTER SMALL SU;Lo;0;L;;;;;N;;;;;
@@ -34035,6 +34040,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 2CEA1;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
 2CEB0;<CJK Ideograph Extension F, First>;Lo;0;L;;;;;N;;;;;
 2EBE0;<CJK Ideograph Extension F, Last>;Lo;0;L;;;;;N;;;;;
+2EBF0;<CJK Ideograph Extension I, First>;Lo;0;L;;;;;N;;;;;
+2EE5D;<CJK Ideograph Extension I, Last>;Lo;0;L;;;;;N;;;;;
 2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
 2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
 2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;

diff --git a/build/unicode/emoji-data.txt b/build/unicode/emoji-data.txt
@@ -1,11 +1,11 @@
 # emoji-data.txt
-# Date: 2022-08-02, 00:26:10 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-02-01, 02:22:54 GMT
+# © 2023 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
 #
 # Emoji Data for UTS #51
-# Used with Emoji Version 15.0 and subsequent minor revisions (if any)
+# Used with Emoji Version 15.1 and subsequent minor revisions (if any)
 #
 # For documentation and usage, see https://www.unicode.org/reports/tr51
 #

diff --git a/build/unicode/emoji-sequences.txt b/build/unicode/emoji-sequences.txt
@@ -1,11 +1,11 @@
 # emoji-sequences.txt
-# Date: 2022-08-15, 23:13:41 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-06-05, 21:39:54 GMT
+# © 2023 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
 #
 # Emoji Sequence Data for UTS #51
-# Version: 15.0
+# Version: 15.1
 #
 # For documentation and usage, see https://www.unicode.org/reports/tr51
 #
@@ -38,7 +38,6 @@
 
 # Basic_Emoji
 
-
 231A..231B    ; Basic_Emoji                  ; watch..hourglass done                                          # E0.6   [2] (⌚..⌛)
 23E9..23EC    ; Basic_Emoji                  ; fast-forward button..fast down button                          # E0.6   [4] (⏩..⏬)
 23F0          ; Basic_Emoji                  ; alarm clock                                                    # E0.6   [1] (⏰)
@@ -534,7 +533,6 @@
 
 # Emoji_Keycap_Sequence
 
-
 0023 FE0F 20E3; Emoji_Keycap_Sequence        ; keycap: \x{23}                                                 # E0.6   [1] (#️⃣)
 002A FE0F 20E3; Emoji_Keycap_Sequence        ; keycap: *                                                      # E2.0   [1] (*️⃣)
 0030 FE0F 20E3; Emoji_Keycap_Sequence        ; keycap: 0                                                      # E0.6   [1] (0️⃣)
@@ -553,8 +551,7 @@
 # ================================================
 
 # RGI_Emoji_Flag_Sequence: This list does not include deprecated or macroregion flags, except for UN and EU.
-# See Annex B of TR51 for more information.
-
+# See Annex B of UTS #51 for more information.
 
 1F1E6 1F1E8   ; RGI_Emoji_Flag_Sequence      ; flag: Ascension Island                                         # E2.0   [1] (🇦🇨)
 1F1E6 1F1E9   ; RGI_Emoji_Flag_Sequence      ; flag: Andorra                                                  # E2.0   [1] (🇦🇩)
@@ -787,7 +784,7 @@
 1F1F9 1F1F2   ; RGI_Emoji_Flag_Sequence      ; flag: Turkmenistan                                             # E2.0   [1] (🇹🇲)
 1F1F9 1F1F3   ; RGI_Emoji_Flag_Sequence      ; flag: Tunisia                                                  # E2.0   [1] (🇹🇳)
 1F1F9 1F1F4   ; RGI_Emoji_Flag_Sequence      ; flag: Tonga                                                    # E2.0   [1] (🇹🇴)
-1F1F9 1F1F7   ; RGI_Emoji_Flag_Sequence      ; flag: Turkey                                                   # E2.0   [1] (🇹🇷)
+1F1F9 1F1F7   ; RGI_Emoji_Flag_Sequence      ; flag: Türkiye                                                  # E2.0   [1] (🇹🇷)
 1F1F9 1F1F9   ; RGI_Emoji_Flag_Sequence      ; flag: Trinidad & Tobago                                        # E2.0   [1] (🇹🇹)
 1F1F9 1F1FB   ; RGI_Emoji_Flag_Sequence      ; flag: Tuvalu                                                   # E2.0   [1] (🇹🇻)
 1F1F9 1F1FC   ; RGI_Emoji_Flag_Sequence      ; flag: Taiwan                                                   # E2.0   [1] (🇹🇼)
@@ -819,8 +816,7 @@
 
 # ================================================
 
-# RGI_Emoji_Tag_Sequence: See Annex C of TR51 for more information.
-
+# RGI_Emoji_Tag_Sequence: See Annex C of UTS #51 for more information.
 
 1F3F4 E0067 E0062 E0065 E006E E0067 E007F; RGI_Emoji_Tag_Sequence; flag: England                              # E5.0   [1] (🏴󠁧󠁢󠁥󠁮󠁧󠁿)
 1F3F4 E0067 E0062 E0073 E0063 E0074 E007F; RGI_Emoji_Tag_Sequence; flag: Scotland                             # E5.0   [1] (🏴󠁧󠁢󠁳󠁣󠁴󠁿)
@@ -832,7 +828,6 @@
 
 # RGI_Emoji_Modifier_Sequence
 
-
 261D 1F3FB    ; RGI_Emoji_Modifier_Sequence  ; index pointing up: light skin tone                             # E1.0   [1] (☝🏻)
 261D 1F3FC    ; RGI_Emoji_Modifier_Sequence  ; index pointing up: medium-light skin tone                      # E1.0   [1] (☝🏼)
 261D 1F3FD    ; RGI_Emoji_Modifier_Sequence  ; index pointing up: medium skin tone                            # E1.0   [1] (☝🏽)