diff --git a/Makefile b/Makefile index 716a0aa47..e8d53b5a4 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ ADD_GLYPHS_FLAGS = -a emoji_aliases.txt PUA_ADDER = map_pua_emoji.py VS_ADDER = add_vs_cmap.py # from nototools -EMOJI_SRC_DIR := png/128 +EMOJI_SRC_DIR ?= png/128 FLAGS_SRC_DIR := third_party/region-flags/png BUILD_DIR := build @@ -53,7 +53,7 @@ COMPRESSED_DIR := $(BUILD_DIR)/compressed_pngs LIMITED_FLAGS = CN DE ES FR GB IT JP KR RU US SELECTED_FLAGS = AC AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ \ - BA BB BD BE BF BG BH BI BJ BM BN BO BR BS BT BW BY BZ \ + BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BW BY BZ \ CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ \ DE DJ DK DM DO DZ \ EC EE EG EH ER ES ET EU \ @@ -64,14 +64,14 @@ SELECTED_FLAGS = AC AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ \ JE JM JO JP \ KE KG KH KI KM KN KP KR KW KY KZ \ LA LB LC LI LK LR LS LT LU LV LY \ - MA MC MD ME MG MH MK ML MM MN MO MP MR MS MT MU MV MW MX MY MZ \ + MA MC MD ME MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ \ NA NC NE NF NG NI NL NO NP NR NU NZ \ OM \ PA PE PF PG PH PK PL PM PN PR PS PT PW PY \ QA \ - RO RS RU RW \ + RE RO RS RU RW \ SA SB SC SD SE SG SH SI SK SL SM SN SO SR SS ST SV SX SY SZ \ - TA TC TD TG TH TJ TK TL TM TN TO TR TT TV TW TZ \ + TA TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ \ UA UG UN US UY UZ \ VA VC VE VG VI VN VU \ WF WS \ diff --git a/NotoColorEmoji.tmpl.ttx.tmpl b/NotoColorEmoji.tmpl.ttx.tmpl index b57b9b697..22faeccc6 100644 --- a/NotoColorEmoji.tmpl.ttx.tmpl +++ b/NotoColorEmoji.tmpl.ttx.tmpl @@ -78,7 +78,7 @@ - + @@ -246,7 +246,7 @@ Noto Color Emoji - Version 2.017;GOOG;noto-emoji:20180810:f1da3bc656f9 + Version 2.018;GOOG;noto-emoji:20190327:BETA NotoColorEmoji diff --git a/emoji_aliases.txt b/emoji_aliases.txt index 2e138fffc..b217c1089 100644 --- a/emoji_aliases.txt +++ b/emoji_aliases.txt @@ -2,194 +2,6 @@ # from;to # the 'from' sequence should be represented by the image for the 'to' sequence # 'fe0f' is not in these sequences -1f3c3;1f3c3_200d_2642 # RUNNER -> man running -1f3c3_1f3fb;1f3c3_1f3fb_200d_2642 # light skin tone -1f3c3_1f3fc;1f3c3_1f3fc_200d_2642 # medium-light skin tone -1f3c3_1f3fd;1f3c3_1f3fd_200d_2642 # medium skin tone -1f3c3_1f3fe;1f3c3_1f3fe_200d_2642 # medium-dark skin tone -1f3c3_1f3ff;1f3c3_1f3ff_200d_2642 # dark skin tone -1f3c4;1f3c4_200d_2642 # SURFER -> man surfing -1f3c4_1f3fb;1f3c4_1f3fb_200d_2642 # light skin tone -1f3c4_1f3fc;1f3c4_1f3fc_200d_2642 # medium-light skin tone -1f3c4_1f3fd;1f3c4_1f3fd_200d_2642 # medium skin tone -1f3c4_1f3fe;1f3c4_1f3fe_200d_2642 # medium-dark skin tone -1f3c4_1f3ff;1f3c4_1f3ff_200d_2642 # dark skin tone -1f3ca;1f3ca_200d_2642 # SWIMMER -> man swimming -1f3ca_1f3fb;1f3ca_1f3fb_200d_2642 # light skin tone -1f3ca_1f3fc;1f3ca_1f3fc_200d_2642 # medium-light skin tone -1f3ca_1f3fd;1f3ca_1f3fd_200d_2642 # medium skin tone -1f3ca_1f3fe;1f3ca_1f3fe_200d_2642 # medium-dark skin tone -1f3ca_1f3ff;1f3ca_1f3ff_200d_2642 # dark skin tone -1f3cb;1f3cb_200d_2642 # WEIGHT LIFTER -> man lifting weights -1f3cb_1f3fb;1f3cb_1f3fb_200d_2642 # light skin tone -1f3cb_1f3fc;1f3cb_1f3fc_200d_2642 # medium-light skin tone -1f3cb_1f3fd;1f3cb_1f3fd_200d_2642 # medium skin tone -1f3cb_1f3fe;1f3cb_1f3fe_200d_2642 # medium-dark skin tone -1f3cb_1f3ff;1f3cb_1f3ff_200d_2642 # dark skin tone -1f3cc;1f3cc_200d_2642 # GOLFER -> man golfing -1f3cc_1f3fb;1f3cc_1f3fb_200d_2642 # light skin tone -1f3cc_1f3fc;1f3cc_1f3fc_200d_2642 # medium-light skin tone -1f3cc_1f3fd;1f3cc_1f3fd_200d_2642 # medium skin tone -1f3cc_1f3fe;1f3cc_1f3fe_200d_2642 # medium-dark skin tone -1f3cc_1f3ff;1f3cc_1f3ff_200d_2642 # dark skin tone -1f46e;1f46e_200d_2642 # POLICE OFFICER -> man police officer -1f46e_1f3fb;1f46e_1f3fb_200d_2642 # light skin tone -1f46e_1f3fc;1f46e_1f3fc_200d_2642 # medium-light skin tone -1f46e_1f3fd;1f46e_1f3fd_200d_2642 # medium skin tone -1f46e_1f3fe;1f46e_1f3fe_200d_2642 # medium-dark skin tone -1f46e_1f3ff;1f46e_1f3ff_200d_2642 # dark skin tone -1f46f;1f46f_200d_2640 # WOMAN WITH BUNNY EARS -> women with bunny ears partying -1f471;1f471_200d_2642 # PERSON WITH BLOND HAIR -> blond-haired man -1f471_1f3fb;1f471_1f3fb_200d_2642 # light skin tone -1f471_1f3fc;1f471_1f3fc_200d_2642 # medium-light skin tone -1f471_1f3fd;1f471_1f3fd_200d_2642 # medium skin tone -1f471_1f3fe;1f471_1f3fe_200d_2642 # medium-dark skin tone -1f471_1f3ff;1f471_1f3ff_200d_2642 # dark skin tone -1f473;1f473_200d_2642 # MAN WITH TURBAN -> man wearing turban -1f473_1f3fb;1f473_1f3fb_200d_2642 # light skin tone -1f473_1f3fc;1f473_1f3fc_200d_2642 # medium-light skin tone -1f473_1f3fd;1f473_1f3fd_200d_2642 # medium skin tone -1f473_1f3fe;1f473_1f3fe_200d_2642 # medium-dark skin tone -1f473_1f3ff;1f473_1f3ff_200d_2642 # dark skin tone -1f477;1f477_200d_2642 # CONSTRUCTION WORKER -> man construction worker -1f477_1f3fb;1f477_1f3fb_200d_2642 # light skin tone -1f477_1f3fc;1f477_1f3fc_200d_2642 # medium-light skin tone -1f477_1f3fd;1f477_1f3fd_200d_2642 # medium skin tone -1f477_1f3fe;1f477_1f3fe_200d_2642 # medium-dark skin tone -1f477_1f3ff;1f477_1f3ff_200d_2642 # dark skin tone -1f481;1f481_200d_2640 # INFORMATION DESK PERSON -> woman tipping hand -1f481_1f3fb;1f481_1f3fb_200d_2640 # light skin tone -1f481_1f3fc;1f481_1f3fc_200d_2640 # medium-light skin tone -1f481_1f3fd;1f481_1f3fd_200d_2640 # medium skin tone -1f481_1f3fe;1f481_1f3fe_200d_2640 # medium-dark skin tone -1f481_1f3ff;1f481_1f3ff_200d_2640 # dark skin tone -1f482;1f482_200d_2642 # GUARDSMAN -> man guard -1f482_1f3fb;1f482_1f3fb_200d_2642 # light skin tone -1f482_1f3fc;1f482_1f3fc_200d_2642 # medium-light skin tone -1f482_1f3fd;1f482_1f3fd_200d_2642 # medium skin tone -1f482_1f3fe;1f482_1f3fe_200d_2642 # medium-dark skin tone -1f482_1f3ff;1f482_1f3ff_200d_2642 # dark skin tone -1f486;1f486_200d_2640 # FACE MASSAGE -> woman getting massage -1f486_1f3fb;1f486_1f3fb_200d_2640 # light skin tone -1f486_1f3fc;1f486_1f3fc_200d_2640 # medium-light skin tone -1f486_1f3fd;1f486_1f3fd_200d_2640 # medium skin tone -1f486_1f3fe;1f486_1f3fe_200d_2640 # medium-dark skin tone -1f486_1f3ff;1f486_1f3ff_200d_2640 # dark skin tone -1f487;1f487_200d_2640 # HAIRCUT -> woman getting haircut -1f487_1f3fb;1f487_1f3fb_200d_2640 # light skin tone -1f487_1f3fc;1f487_1f3fc_200d_2640 # medium-light skin tone -1f487_1f3fd;1f487_1f3fd_200d_2640 # medium skin tone -1f487_1f3fe;1f487_1f3fe_200d_2640 # medium-dark skin tone -1f487_1f3ff;1f487_1f3ff_200d_2640 # dark skin tone -1f575;1f575_200d_2642 # SLEUTH OR SPY -> man detective -1f575_1f3fb;1f575_1f3fb_200d_2642 # light skin tone -1f575_1f3fc;1f575_1f3fc_200d_2642 # medium-light skin tone -1f575_1f3fd;1f575_1f3fd_200d_2642 # medium skin tone -1f575_1f3fe;1f575_1f3fe_200d_2642 # medium-dark skin tone -1f575_1f3ff;1f575_1f3ff_200d_2642 # dark skin tone -1f645;1f645_200d_2640 # FACE WITH NO GOOD GESTURE -> woman gesturing NO -1f645_1f3fb;1f645_1f3fb_200d_2640 # light skin tone -1f645_1f3fc;1f645_1f3fc_200d_2640 # medium-light skin tone -1f645_1f3fd;1f645_1f3fd_200d_2640 # medium skin tone -1f645_1f3fe;1f645_1f3fe_200d_2640 # medium-dark skin tone -1f645_1f3ff;1f645_1f3ff_200d_2640 # dark skin tone -1f646;1f646_200d_2640 # FACE WITH OK GESTURE -> woman gesturing OK -1f646_1f3fb;1f646_1f3fb_200d_2640 # light skin tone -1f646_1f3fc;1f646_1f3fc_200d_2640 # medium-light skin tone -1f646_1f3fd;1f646_1f3fd_200d_2640 # medium skin tone -1f646_1f3fe;1f646_1f3fe_200d_2640 # medium-dark skin tone -1f646_1f3ff;1f646_1f3ff_200d_2640 # dark skin tone -1f647;1f647_200d_2642 # PERSON BOWING DEEPLY -> man bowing -1f647_1f3fb;1f647_1f3fb_200d_2642 # light skin tone -1f647_1f3fc;1f647_1f3fc_200d_2642 # medium-light skin tone -1f647_1f3fd;1f647_1f3fd_200d_2642 # medium skin tone -1f647_1f3fe;1f647_1f3fe_200d_2642 # medium-dark skin tone -1f647_1f3ff;1f647_1f3ff_200d_2642 # dark skin tone -1f64b;1f64b_200d_2640 # HAPPY PERSON RAISING ONE HAND -> woman raising hand -1f64b_1f3fb;1f64b_1f3fb_200d_2640 # light skin tone -1f64b_1f3fc;1f64b_1f3fc_200d_2640 # medium-light skin tone -1f64b_1f3fd;1f64b_1f3fd_200d_2640 # medium skin tone -1f64b_1f3fe;1f64b_1f3fe_200d_2640 # medium-dark skin tone -1f64b_1f3ff;1f64b_1f3ff_200d_2640 # dark skin tone -1f64d;1f64d_200d_2640 # PERSON FROWNING -> woman frowning -1f64d_1f3fb;1f64d_1f3fb_200d_2640 # light skin tone -1f64d_1f3fc;1f64d_1f3fc_200d_2640 # medium-light skin tone -1f64d_1f3fd;1f64d_1f3fd_200d_2640 # medium skin tone -1f64d_1f3fe;1f64d_1f3fe_200d_2640 # medium-dark skin tone -1f64d_1f3ff;1f64d_1f3ff_200d_2640 # dark skin tone -1f64e;1f64e_200d_2640 # PERSON WITH POUTING FACE -> woman pouting -1f64e_1f3fb;1f64e_1f3fb_200d_2640 # light skin tone -1f64e_1f3fc;1f64e_1f3fc_200d_2640 # medium-light skin tone -1f64e_1f3fd;1f64e_1f3fd_200d_2640 # medium skin tone -1f64e_1f3fe;1f64e_1f3fe_200d_2640 # medium-dark skin tone -1f64e_1f3ff;1f64e_1f3ff_200d_2640 # dark skin tone -1f6a3;1f6a3_200d_2642 # ROWBOAT -> man rowing boat -1f6a3_1f3fb;1f6a3_1f3fb_200d_2642 # light skin tone -1f6a3_1f3fc;1f6a3_1f3fc_200d_2642 # medium-light skin tone -1f6a3_1f3fd;1f6a3_1f3fd_200d_2642 # medium skin tone -1f6a3_1f3fe;1f6a3_1f3fe_200d_2642 # medium-dark skin tone -1f6a3_1f3ff;1f6a3_1f3ff_200d_2642 # dark skin tone -1f6b4;1f6b4_200d_2642 # BICYCLIST -> man biking -1f6b4_1f3fb;1f6b4_1f3fb_200d_2642 # light skin tone -1f6b4_1f3fc;1f6b4_1f3fc_200d_2642 # medium-light skin tone -1f6b4_1f3fd;1f6b4_1f3fd_200d_2642 # medium skin tone -1f6b4_1f3fe;1f6b4_1f3fe_200d_2642 # medium-dark skin tone -1f6b4_1f3ff;1f6b4_1f3ff_200d_2642 # dark skin tone -1f6b5;1f6b5_200d_2642 # MOUNTAIN BICYCLIST -> man mountain biking -1f6b5_1f3fb;1f6b5_1f3fb_200d_2642 # light skin tone -1f6b5_1f3fc;1f6b5_1f3fc_200d_2642 # medium-light skin tone -1f6b5_1f3fd;1f6b5_1f3fd_200d_2642 # medium skin tone -1f6b5_1f3fe;1f6b5_1f3fe_200d_2642 # medium-dark skin tone -1f6b5_1f3ff;1f6b5_1f3ff_200d_2642 # dark skin tone -1f6b6;1f6b6_200d_2642 # PEDESTRIAN -> man walking -1f6b6_1f3fb;1f6b6_1f3fb_200d_2642 # light skin tone -1f6b6_1f3fc;1f6b6_1f3fc_200d_2642 # medium-light skin tone -1f6b6_1f3fd;1f6b6_1f3fd_200d_2642 # medium skin tone -1f6b6_1f3fe;1f6b6_1f3fe_200d_2642 # medium-dark skin tone -1f6b6_1f3ff;1f6b6_1f3ff_200d_2642 # dark skin tone -1f926;1f926_200d_2640 # FACE PALM -> woman facepalming -1f926_1f3fb;1f926_1f3fb_200d_2640 # light skin tone -1f926_1f3fc;1f926_1f3fc_200d_2640 # medium-light skin tone -1f926_1f3fd;1f926_1f3fd_200d_2640 # medium skin tone -1f926_1f3fe;1f926_1f3fe_200d_2640 # medium-dark skin tone -1f926_1f3ff;1f926_1f3ff_200d_2640 # dark skin tone -1f937;1f937_200d_2640 # SHRUG -> woman shrugging -1f937_1f3fb;1f937_1f3fb_200d_2640 # light skin tone -1f937_1f3fc;1f937_1f3fc_200d_2640 # medium-light skin tone -1f937_1f3fd;1f937_1f3fd_200d_2640 # medium skin tone -1f937_1f3fe;1f937_1f3fe_200d_2640 # medium-dark skin tone -1f937_1f3ff;1f937_1f3ff_200d_2640 # dark skin tone -1f938;1f938_200d_2642 # PERSON DOING CARTWHEEL -> man cartwheeling -1f938_1f3fb;1f938_1f3fb_200d_2642 # light skin tone -1f938_1f3fc;1f938_1f3fc_200d_2642 # medium-light skin tone -1f938_1f3fd;1f938_1f3fd_200d_2642 # medium skin tone -1f938_1f3fe;1f938_1f3fe_200d_2642 # medium-dark skin tone -1f938_1f3ff;1f938_1f3ff_200d_2642 # dark skin tone -1f939;1f939_200d_2642 # JUGGLING -> man juggling -1f939_1f3fb;1f939_1f3fb_200d_2642 # light skin tone -1f939_1f3fc;1f939_1f3fc_200d_2642 # medium-light skin tone -1f939_1f3fd;1f939_1f3fd_200d_2642 # medium skin tone -1f939_1f3fe;1f939_1f3fe_200d_2642 # medium-dark skin tone -1f939_1f3ff;1f939_1f3ff_200d_2642 # dark skin tone -1f93c;1f93c_200d_2642 # WRESTLERS -> men wrestling -1f93d;1f93d_200d_2642 # WATER POLO -> man playing water polo -1f93d_1f3fb;1f93d_1f3fb_200d_2642 # light skin tone -1f93d_1f3fc;1f93d_1f3fc_200d_2642 # medium-light skin tone -1f93d_1f3fd;1f93d_1f3fd_200d_2642 # medium skin tone -1f93d_1f3fe;1f93d_1f3fe_200d_2642 # medium-dark skin tone -1f93d_1f3ff;1f93d_1f3ff_200d_2642 # dark skin tone -1f93e;1f93e_200d_2642 # HANDBALL -> man playing handball -1f93e_1f3fb;1f93e_1f3fb_200d_2642 # light skin tone -1f93e_1f3fc;1f93e_1f3fc_200d_2642 # medium-light skin tone -1f93e_1f3fd;1f93e_1f3fd_200d_2642 # medium skin tone -1f93e_1f3fe;1f93e_1f3fe_200d_2642 # medium-dark skin tone -1f93e_1f3ff;1f93e_1f3ff_200d_2642 # dark skin tone -26f9;26f9_200d_2642 # PERSON WITH BALL -> man bouncing ball -26f9_1f3fb;26f9_1f3fb_200d_2642 # light skin tone -26f9_1f3fc;26f9_1f3fc_200d_2642 # medium-light skin tone -26f9_1f3fd;26f9_1f3fd_200d_2642 # medium skin tone -26f9_1f3fe;26f9_1f3fe_200d_2642 # medium-dark skin tone -26f9_1f3ff;26f9_1f3ff_200d_2642 # dark skin tone fe82b;unknown_flag # no name -> no name # flag aliases @@ -201,77 +13,3 @@ fe82b;unknown_flag # no name -> no name 1f1f2_1f1eb;1f1eb_1f1f7 # MF -> FR 1f1f8_1f1ef;1f1f3_1f1f4 # SJ -> NO 1f1fa_1f1f2;1f1fa_1f1f8 # UM -> US - -# additional emoji 5.0 aliases -1f9d6;1f9d6_200d_2640 # PERSON IN STEAMY ROOM -> woman in steamy room -1f9d6_1f3fb;1f9d6_1f3fb_200d_2640 # light skin tone -1f9d6_1f3fc;1f9d6_1f3fc_200d_2640 # medium-light skin tone -1f9d6_1f3fd;1f9d6_1f3fd_200d_2640 # medium skin tone -1f9d6_1f3fe;1f9d6_1f3fe_200d_2640 # medium-dark skin tone -1f9d6_1f3ff;1f9d6_1f3ff_200d_2640 # dark skin tone -1f9d7;1f9d7_200d_2640 # PERSON CLIMBING -> woman climbing -1f9d7_1f3fb;1f9d7_1f3fb_200d_2640 # light skin tone -1f9d7_1f3fc;1f9d7_1f3fc_200d_2640 # medium-light skin tone -1f9d7_1f3fd;1f9d7_1f3fd_200d_2640 # medium skin tone -1f9d7_1f3fe;1f9d7_1f3fe_200d_2640 # medium-dark skin tone -1f9d7_1f3ff;1f9d7_1f3ff_200d_2640 # dark skin tone -1f9d8;1f9d8_200d_2640 # PERSON IN LOTUS POSITION -> woman in lotus position -1f9d8_1f3fb;1f9d8_1f3fb_200d_2640 # light skin tone -1f9d8_1f3fc;1f9d8_1f3fc_200d_2640 # medium-light skin tone -1f9d8_1f3fd;1f9d8_1f3fd_200d_2640 # medium skin tone -1f9d8_1f3fe;1f9d8_1f3fe_200d_2640 # medium-dark skin tone -1f9d8_1f3ff;1f9d8_1f3ff_200d_2640 # dark skin tone -1f9d9;1f9d9_200d_2640 # MAGE -> female mage -1f9d9_1f3fb;1f9d9_1f3fb_200d_2640 # light skin tone -1f9d9_1f3fc;1f9d9_1f3fc_200d_2640 # medium-light skin tone -1f9d9_1f3fd;1f9d9_1f3fd_200d_2640 # medium skin tone -1f9d9_1f3fe;1f9d9_1f3fe_200d_2640 # medium-dark skin tone -1f9d9_1f3ff;1f9d9_1f3ff_200d_2640 # dark skin tone -1f9da;1f9da_200d_2640 # FAIRY -> female fairy -1f9da_1f3fb;1f9da_1f3fb_200d_2640 # light skin tone -1f9da_1f3fc;1f9da_1f3fc_200d_2640 # medium-light skin tone -1f9da_1f3fd;1f9da_1f3fd_200d_2640 # medium skin tone -1f9da_1f3fe;1f9da_1f3fe_200d_2640 # medium-dark skin tone -1f9da_1f3ff;1f9da_1f3ff_200d_2640 # dark skin tone -1f9db;1f9db_200d_2640 # VAMPIRE -> female vampire -1f9db_1f3fb;1f9db_1f3fb_200d_2640 # light skin tone -1f9db_1f3fc;1f9db_1f3fc_200d_2640 # medium-light skin tone -1f9db_1f3fd;1f9db_1f3fd_200d_2640 # medium skin tone -1f9db_1f3fe;1f9db_1f3fe_200d_2640 # medium-dark skin tone -1f9db_1f3ff;1f9db_1f3ff_200d_2640 # dark skin tone -1f9dc;1f9dc_200d_2640 # MERPERSON -> mermaid -1f9dc_1f3fb;1f9dc_1f3fb_200d_2640 # light skin tone -1f9dc_1f3fc;1f9dc_1f3fc_200d_2640 # medium-light skin tone -1f9dc_1f3fd;1f9dc_1f3fd_200d_2640 # medium skin tone -1f9dc_1f3fe;1f9dc_1f3fe_200d_2640 # medium-dark skin tone -1f9dc_1f3ff;1f9dc_1f3ff_200d_2640 # dark skin tone -1f9dd;1f9dd_200d_2640 # ELF -> female elf -1f9dd_1f3fb;1f9dd_1f3fb_200d_2640 # light skin tone -1f9dd_1f3fc;1f9dd_1f3fc_200d_2640 # medium-light skin tone -1f9dd_1f3fd;1f9dd_1f3fd_200d_2640 # medium skin tone -1f9dd_1f3fe;1f9dd_1f3fe_200d_2640 # medium-dark skin tone -1f9dd_1f3ff;1f9dd_1f3ff_200d_2640 # dark skin tone -1f9de;1f9de_200d_2640 # GENIE -> female genie -1f9df;1f9df_200d_2640 # ZOMBIE -> female zombie - -#unicode 11 -1f9b8;1f9b8_200d_2640 # SUPERHERO -> female superhero -1f9b8_1f3fb;1f9b8_1f3fb_200d_2640 # light skin tone -1f9b8_1f3fc;1f9b8_1f3fc_200d_2640 # medium-light skin tone -1f9b8_1f3fd;1f9b8_1f3fd_200d_2640 # medium skin tone -1f9b8_1f3fe;1f9b8_1f3fe_200d_2640 # medium-dark skin tone -1f9b8_1f3ff;1f9b8_1f3ff_200d_2640 # dark skin tone -1f9b9;1f9b9_200d_2640 # SUPERVILLAN -> female supervillan -1f9b9_1f3fb;1f9b9_1f3fb_200d_2640 # light skin tone -1f9b9_1f3fc;1f9b9_1f3fc_200d_2640 # medium-light skin tone -1f9b9_1f3fd;1f9b9_1f3fd_200d_2640 # medium skin tone -1f9b9_1f3fe;1f9b9_1f3fe_200d_2640 # medium-dark skin tone -1f9b9_1f3ff;1f9b9_1f3ff_200d_2640 # dark skin tone - -# legacy android sequences -# wrestlers -> men wrestling -1f93c_1f3fb;1f93c_1f3fb_200d_2642 # light skin tone -1f93c_1f3fc;1f93c_1f3fc_200d_2642 # medium-light skin tone -1f93c_1f3fd;1f93c_1f3fd_200d_2642 # medium skin tone -1f93c_1f3fe;1f93c_1f3fe_200d_2642 # medium-dark skin tone -1f93c_1f3ff;1f93c_1f3ff_200d_2642 # dark skin tone diff --git a/third_party/region-flags/png/BL.png b/third_party/region-flags/png/BL.png deleted file mode 120000 index becff2222..000000000 --- a/third_party/region-flags/png/BL.png +++ /dev/null @@ -1 +0,0 @@ -FR.png \ No newline at end of file diff --git a/third_party/region-flags/png/BL.png b/third_party/region-flags/png/BL.png new file mode 100644 index 000000000..0cbc6b347 Binary files /dev/null and b/third_party/region-flags/png/BL.png differ diff --git a/third_party/region-flags/png/BQ.png b/third_party/region-flags/png/BQ.png deleted file mode 120000 index 0eb272cf4..000000000 --- a/third_party/region-flags/png/BQ.png +++ /dev/null @@ -1 +0,0 @@ -NL.png \ No newline at end of file diff --git a/third_party/region-flags/png/BQ.png b/third_party/region-flags/png/BQ.png new file mode 100644 index 000000000..e22a2cde5 Binary files /dev/null and b/third_party/region-flags/png/BQ.png differ diff --git a/third_party/region-flags/png/MQ.png b/third_party/region-flags/png/MQ.png index 80d48564b..7bf70360a 100644 Binary files a/third_party/region-flags/png/MQ.png and b/third_party/region-flags/png/MQ.png differ diff --git a/third_party/region-flags/png/RE.png b/third_party/region-flags/png/RE.png index ace09f9a3..a45f5f217 100644 Binary files a/third_party/region-flags/png/RE.png and b/third_party/region-flags/png/RE.png differ diff --git a/third_party/region-flags/png/TF.png b/third_party/region-flags/png/TF.png deleted file mode 120000 index becff2222..000000000 --- a/third_party/region-flags/png/TF.png +++ /dev/null @@ -1 +0,0 @@ -FR.png \ No newline at end of file diff --git a/third_party/region-flags/png/TF.png b/third_party/region-flags/png/TF.png new file mode 100644 index 000000000..3291b83e7 Binary files /dev/null and b/third_party/region-flags/png/TF.png differ diff --git a/third_party/region-flags/png/XK.png b/third_party/region-flags/png/XK.png index 395311f9c..221ecd807 100644 Binary files a/third_party/region-flags/png/XK.png and b/third_party/region-flags/png/XK.png differ diff --git a/third_party/region-flags/svg/BL.svg b/third_party/region-flags/svg/BL.svg deleted file mode 120000 index 61f045a37..000000000 --- a/third_party/region-flags/svg/BL.svg +++ /dev/null @@ -1 +0,0 @@ -FR.svg \ No newline at end of file diff --git a/third_party/region-flags/svg/BL.svg b/third_party/region-flags/svg/BL.svg new file mode 100644 index 000000000..41b232ea1 --- /dev/null +++ b/third_party/region-flags/svg/BL.svg @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/region-flags/svg/BQ.svg b/third_party/region-flags/svg/BQ.svg deleted file mode 120000 index d8d68909f..000000000 --- a/third_party/region-flags/svg/BQ.svg +++ /dev/null @@ -1 +0,0 @@ -NL.svg \ No newline at end of file diff --git a/third_party/region-flags/svg/BQ.svg b/third_party/region-flags/svg/BQ.svg new file mode 100644 index 000000000..747daee5d --- /dev/null +++ b/third_party/region-flags/svg/BQ.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/region-flags/svg/MQ.svg b/third_party/region-flags/svg/MQ.svg index 173d25b69..b9dc8ee1c 100644 --- a/third_party/region-flags/svg/MQ.svg +++ b/third_party/region-flags/svg/MQ.svg @@ -1,98 +1,83 @@ - + xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + viewBox="0 0 326 217" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.43" + width="750" + height="500" + sodipodi:docname="fr-mq.svg" + sodipodi:docbase="C:\Documents and Settings\David Nelson\Archives\Svg" + version="1.0"> + + + + image/svg+xml + + + + - - - + id="defs17" /> + + id="g2058" + transform="matrix(0.999768,0,0,1.001187,3.78314e-2,-0.128793)"> + + sodipodi:nodetypes="ccccccccccccc" + d="M 148,93 L 0,93 L 0,124 L 148,124 L 148,217 L 178,217 L 178,124 L 326,124 L 326,93 L 178,93 L 178,-1.1368684e-013 L 148,-1.1368684e-013 L 148,93 z " + id="path6" + style="fill:#ffffff;fill-opacity:1;stroke:#21428e;stroke-width:0.07562672;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 62.3,11.9 C 59.9,13 58,14.6 58,15.4 C 58,16.3 59.411791,16.31817 57.640524,16.88575 C 55.869257,17.45333 51.340651,18.34959 48.084651,18.15186 C 47.009953,18.15642 44.426501,17.45414 43.677627,17.54814 C 42.928754,17.64213 47.067628,19.33111 45.467628,18.93111 C 43.267628,18.33111 42.006232,18.11037 43.706232,19.21037 C 45.006232,20.01037 47.874279,20.0473 51.974279,19.5473 C 53.624279,19.3473 57.767144,18.35344 59.289396,18.22682 C 60.341373,18.13932 60.260372,18.95 60.910372,19 C 66.310372,19.3 75.9,19.1 80.1,18.5 C 83.6,18 84.9,18.2 85.9,19.4 C 87.9,21.7 85.8,23.7 80.1,24.9 C 73.1,26.4 70.2,27.7 67.5,30.6 C 61,37.6 68.6,45.5 82.8,46.6 C 91.1,47.3 96.5,48.9 95.2,50.2 C 94.7,50.7 89.2,51.5 82.9,52 C 69.2,53.1 63.1,55 57.9,60 C 55,62.8 54,64.5 54,66.8 C 54,70 54,70 48.7,70 C 45.9,70 42,69.6 40.2,69 C 37.4,68.3 37,68.3 38,69.5 C 40,71.9 45.7,74 50.4,74 C 54,74 56,74.7 59.2,77 C 65.6,81.7 72.9,83.5 85,83.4 C 100.9,83.3 110,79.1 110,72 C 110,66.7 104,63.6 91.5,62.5 C 85.2,61.9 72.8,62.9 67.4,64.5 C 66.4,64.8 67.5,64.1 69.9,62.9 C 72.8,61.5 77.6,60.5 84.1,59.9 C 98.5,58.7 105,55.5 105,49.5 C 105,43.7 98.6,40.4 84.9,39.1 C 71.4,37.9 70.4,35.5 81.8,32 C 89.9,29.6 94,26 94,21.1 C 94,13.6 89.9,11.1 76.2,10.4 C 67.9,10 65.9,10.2 62.3,11.9 z M 69.5,14 C 69.2,14.5 68.4,15 67.9,15 C 67.3,15 67.2,14.5 67.5,14 C 67.8,13.4 68.6,13 69.1,13 C 69.7,13 69.8,13.4 69.5,14 z M 98.4,70 C 100.3,70.7 101,71.4 100.4,72 C 98.7,73.7 87.7,75.2 81,74.7 C 73.6,74 65.6,71.6 68,70.6 C 74.7,68 92.3,67.7 98.4,70 z " + id="path8" + sodipodi:nodetypes="cssczcccscsccccsccsscssccsccccsccscccscsccsccc" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> - - + d="M 241.08,11.97493 C 238.68,13.07493 236.78,14.67493 236.78,15.47493 C 236.78,16.37493 238.1918,16.3931 236.42053,16.96068 C 234.64926,17.52826 230.12066,18.42452 226.86466,18.22679 C 225.78996,18.23135 223.20651,17.52907 222.45763,17.62307 C 221.70876,17.71706 225.84763,19.40604 224.24763,19.00604 C 222.04763,18.40604 220.78624,18.1853 222.48624,19.2853 C 223.78624,20.0853 226.65428,20.12223 230.75428,19.62223 C 232.40428,19.42223 236.54715,18.42837 238.0694,18.30175 C 239.12138,18.21425 239.04038,19.02493 239.69038,19.07493 C 245.09038,19.37493 254.68,19.17493 258.88,18.57493 C 262.38,18.07493 263.68,18.27493 264.68,19.47493 C 266.68,21.77493 264.58,23.77493 258.88,24.97493 C 251.88,26.47493 248.98,27.77493 246.28,30.67493 C 239.78,37.67493 247.38,45.57493 261.58,46.67493 C 269.88,47.37493 275.28,48.97493 273.98,50.27493 C 273.48,50.77493 267.98,51.57493 261.68,52.07493 C 247.98,53.17493 241.88,55.07493 236.68,60.07493 C 233.78,62.87493 232.78,64.57493 232.78,66.87493 C 232.78,70.07493 232.78,70.07493 227.48,70.07493 C 224.68,70.07493 220.78,69.67493 218.98,69.07493 C 216.18,68.37493 215.78,68.37493 216.78,69.57493 C 218.78,71.97493 224.48,74.07493 229.18,74.07493 C 232.78,74.07493 234.78,74.77493 237.98,77.07493 C 244.38,81.77493 251.68,83.57493 263.78,83.47493 C 279.68,83.37493 288.78,79.17493 288.78,72.07493 C 288.78,66.77493 282.78,63.67493 270.28,62.57493 C 263.98,61.97493 251.58,62.97493 246.18,64.57493 C 245.18,64.87493 246.28,64.17493 248.68,62.97493 C 251.58,61.57493 256.38,60.57493 262.88,59.97493 C 277.28,58.77493 283.78,55.57493 283.78,49.57493 C 283.78,43.77493 277.38,40.47493 263.68,39.17493 C 250.18,37.97493 249.18,35.57493 260.58,32.07493 C 268.68,29.67493 272.78,26.07493 272.78,21.17493 C 272.78,13.67493 268.68,11.17493 254.98,10.47493 C 246.68,10.07493 244.68,10.27493 241.08,11.97493 z M 248.28,14.07493 C 247.98,14.57493 247.18,15.07493 246.68,15.07493 C 246.08,15.07493 245.98,14.57493 246.28,14.07493 C 246.58,13.47493 247.38,13.07493 247.88,13.07493 C 248.48,13.07493 248.58,13.47493 248.28,14.07493 z M 277.18,70.07493 C 279.08,70.77493 279.78,71.47493 279.18,72.07493 C 277.48,73.77493 266.48,75.27493 259.78,74.77493 C 252.38,74.07493 244.38,71.67493 246.78,70.67493 C 253.48,68.07493 271.08,67.77493 277.18,70.07493 z " + id="path2051" + sodipodi:nodetypes="cssczcccscsccccsccsscssccsccccsccscccscsccsccc" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> + d="M 62.718646,135.33943 C 60.318646,136.43943 58.418646,138.03943 58.418646,138.83943 C 58.418646,139.73943 59.830437,139.7576 58.05917,140.32518 C 56.287903,140.89276 51.759297,141.78902 48.503297,141.59129 C 47.428599,141.59585 44.845147,140.89357 44.096273,140.98757 C 43.3474,141.08156 47.486274,142.77054 45.886274,142.37054 C 43.686274,141.77054 42.424878,141.5498 44.124878,142.6498 C 45.424878,143.4498 48.292925,143.48673 52.392925,142.98673 C 54.042925,142.78673 58.18579,141.79287 59.708042,141.66625 C 60.760019,141.57875 60.679018,142.38943 61.329018,142.43943 C 66.729018,142.73943 76.318646,142.53943 80.518646,141.93943 C 84.018646,141.43943 85.318646,141.63943 86.318646,142.83943 C 88.318646,145.13943 86.218646,147.13943 80.518646,148.33943 C 73.518646,149.83943 70.618646,151.13943 67.918646,154.03943 C 61.418646,161.03943 69.018646,168.93943 83.218646,170.03943 C 91.518646,170.73943 96.918646,172.33943 95.618646,173.63943 C 95.118646,174.13943 89.618646,174.93943 83.318646,175.43943 C 69.618646,176.53943 63.518646,178.43943 58.318646,183.43943 C 55.418646,186.23943 54.418646,187.93943 54.418646,190.23943 C 54.418646,193.43943 54.418646,193.43943 49.118646,193.43943 C 46.318646,193.43943 42.418646,193.03943 40.618646,192.43943 C 37.818646,191.73943 37.418646,191.73943 38.418646,192.93943 C 40.418646,195.33943 46.118646,197.43943 50.818646,197.43943 C 54.418646,197.43943 56.418646,198.13943 59.618646,200.43943 C 66.018646,205.13943 73.318646,206.93943 85.418646,206.83943 C 101.31865,206.73943 110.41865,202.53943 110.41865,195.43943 C 110.41865,190.13943 104.41865,187.03943 91.918646,185.93943 C 85.618646,185.33943 73.218646,186.33943 67.818646,187.93943 C 66.818646,188.23943 67.918646,187.53943 70.318646,186.33943 C 73.218646,184.93943 78.018646,183.93943 84.518646,183.33943 C 98.918646,182.13943 105.41865,178.93943 105.41865,172.93943 C 105.41865,167.13943 99.018646,163.83943 85.318646,162.53943 C 71.818646,161.33943 70.818646,158.93943 82.218646,155.43943 C 90.318646,153.03943 94.418646,149.43943 94.418646,144.53943 C 94.418646,137.03943 90.318646,134.53943 76.618646,133.83943 C 68.318646,133.43943 66.318646,133.63943 62.718646,135.33943 z M 69.918646,137.43943 C 69.618646,137.93943 68.818646,138.43943 68.318646,138.43943 C 67.718646,138.43943 67.618646,137.93943 67.918646,137.43943 C 68.218646,136.83943 69.018646,136.43943 69.518646,136.43943 C 70.118646,136.43943 70.218646,136.83943 69.918646,137.43943 z M 98.818646,193.43943 C 100.71865,194.13943 101.41865,194.83943 100.81865,195.43943 C 99.118646,197.13943 88.118646,198.63943 81.418646,198.13943 C 74.018646,197.43943 66.018646,195.03943 68.418646,194.03943 C 75.118646,191.43943 92.718646,191.13943 98.818646,193.43943 z " + id="path2053" + sodipodi:nodetypes="cssczcccscsccccsccsscssccsccccsccscccscsccsccc" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> - - - - - - - - - - - + d="M 241.08,135.33943 C 238.68,136.43943 236.78,138.03943 236.78,138.83943 C 236.78,139.73943 238.1918,139.7576 236.42053,140.32518 C 234.64926,140.89276 230.12066,141.78902 226.86466,141.59129 C 225.78996,141.59585 223.20651,140.89357 222.45763,140.98757 C 221.70876,141.08156 225.84763,142.77054 224.24763,142.37054 C 222.04763,141.77054 220.78624,141.5498 222.48624,142.6498 C 223.78624,143.4498 226.65428,143.48673 230.75428,142.98673 C 232.40428,142.78673 236.54715,141.79287 238.0694,141.66625 C 239.12138,141.57875 239.04038,142.38943 239.69038,142.43943 C 245.09038,142.73943 254.68,142.53943 258.88,141.93943 C 262.38,141.43943 263.68,141.63943 264.68,142.83943 C 266.68,145.13943 264.58,147.13943 258.88,148.33943 C 251.88,149.83943 248.98,151.13943 246.28,154.03943 C 239.78,161.03943 247.38,168.93943 261.58,170.03943 C 269.88,170.73943 275.28,172.33943 273.98,173.63943 C 273.48,174.13943 267.98,174.93943 261.68,175.43943 C 247.98,176.53943 241.88,178.43943 236.68,183.43943 C 233.78,186.23943 232.78,187.93943 232.78,190.23943 C 232.78,193.43943 232.78,193.43943 227.48,193.43943 C 224.68,193.43943 220.78,193.03943 218.98,192.43943 C 216.18,191.73943 215.78,191.73943 216.78,192.93943 C 218.78,195.33943 224.48,197.43943 229.18,197.43943 C 232.78,197.43943 234.78,198.13943 237.98,200.43943 C 244.38,205.13943 251.68,206.93943 263.78,206.83943 C 279.68,206.73943 288.78,202.53943 288.78,195.43943 C 288.78,190.13943 282.78,187.03943 270.28,185.93943 C 263.98,185.33943 251.58,186.33943 246.18,187.93943 C 245.18,188.23943 246.28,187.53943 248.68,186.33943 C 251.58,184.93943 256.38,183.93943 262.88,183.33943 C 277.28,182.13943 283.78,178.93943 283.78,172.93943 C 283.78,167.13943 277.38,163.83943 263.68,162.53943 C 250.18,161.33943 249.18,158.93943 260.58,155.43943 C 268.68,153.03943 272.78,149.43943 272.78,144.53943 C 272.78,137.03943 268.68,134.53943 254.98,133.83943 C 246.68,133.43943 244.68,133.63943 241.08,135.33943 z M 248.28,137.43943 C 247.98,137.93943 247.18,138.43943 246.68,138.43943 C 246.08,138.43943 245.98,137.93943 246.28,137.43943 C 246.58,136.83943 247.38,136.43943 247.88,136.43943 C 248.48,136.43943 248.58,136.83943 248.28,137.43943 z M 277.18,193.43943 C 279.08,194.13943 279.78,194.83943 279.18,195.43943 C 277.48,197.13943 266.48,198.63943 259.78,198.13943 C 252.38,197.43943 244.38,195.03943 246.78,194.03943 C 253.48,191.43943 271.08,191.13943 277.18,193.43943 z " + id="path2055" + sodipodi:nodetypes="cssczcccscsccccsccsscssccsccccsccscccscsccsccc" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> diff --git a/third_party/region-flags/svg/RE.svg b/third_party/region-flags/svg/RE.svg index d36ef46e0..5f725f27f 100644 --- a/third_party/region-flags/svg/RE.svg +++ b/third_party/region-flags/svg/RE.svg @@ -1,3 +1,9 @@ - - - + + + + + + + + + \ No newline at end of file diff --git a/third_party/region-flags/svg/TF.svg b/third_party/region-flags/svg/TF.svg deleted file mode 120000 index 61f045a37..000000000 --- a/third_party/region-flags/svg/TF.svg +++ /dev/null @@ -1 +0,0 @@ -FR.svg \ No newline at end of file diff --git a/third_party/region-flags/svg/TF.svg b/third_party/region-flags/svg/TF.svg new file mode 100644 index 000000000..198d6d2ea --- /dev/null +++ b/third_party/region-flags/svg/TF.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/third_party/region-flags/svg/XK.svg b/third_party/region-flags/svg/XK.svg index 62490e663..ef804e196 100644 --- a/third_party/region-flags/svg/XK.svg +++ b/third_party/region-flags/svg/XK.svg @@ -1,466 +1 @@ - - - - - Flag of Kosovo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Flag of Kosovo - 2 August 2014 - - - Shervin Afshar - - - - - Public Domain - - - Outline of Kosovo is according to the document published by The Office of Prime Minister of the Republic of Kosovo at http://www.kryeministri-ks.net/repository/docs/flamuri_republikes_se_kosoves.pdf [http://www.kryeministri-ks.net/repository/docs/flamuri_republikes_se_kosoves.pdf the document] published by The Office of Prime Minister of the Republic of Kosovo - -Colors are RGB approximations from the same document (which is in CYMK). Additionally, a [https://commons.wikimedia.org/wiki/File:Flag_of_Kosovo.svg non-Public Domain version] from Wikimedia commons was used as a reference for sizing and placing of elements. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file