Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update fontchain_linter for emoji 11" into pi-dev

Browse Source 
am: 485a197ab0

Change-Id: I1388a4b0292836f492a1f0d60406c266a0c1af15
This commit is contained in:
Siyamed Sinir
2018-04-23 11:48:54 -07:00
committed by android-build-merger
parent 346892b4ae 485a197ab0
commit edcdab22c4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/fonts/fontchain_linter.py
View File

@@ -471,11 +471,20 @@ def parse_ucd(ucd_path):
_emoji_zwj_sequences.update(parse_unicode_datafile( _emoji_zwj_sequences.update(parse_unicode_datafile(
path.join(ucd_path, 'additions', 'emoji-zwj-sequences.txt'))) path.join(ucd_path, 'additions', 'emoji-zwj-sequences.txt')))
exclusions = parse_unicode_datafile(path.join(ucd_path, 'additions', 'emoji-exclusions.txt'))
_emoji_sequences = remove_emoji_exclude(_emoji_sequences, exclusions)
_emoji_zwj_sequences = remove_emoji_exclude(_emoji_zwj_sequences, exclusions)
_emoji_variation_sequences = remove_emoji_variation_exclude(_emoji_variation_sequences, exclusions)
def remove_emoji_variation_exclude(source, items):
return source.difference(items.keys())
def remove_emoji_exclude(source, items):
return {k: v for k, v in source.items() if k not in items}
def flag_sequence(territory_code): def flag_sequence(territory_code):
return tuple(0x1F1E6 + ord(ch) - ord('A') for ch in territory_code) return tuple(0x1F1E6 + ord(ch) - ord('A') for ch in territory_code)
UNSUPPORTED_FLAGS = frozenset({ UNSUPPORTED_FLAGS = frozenset({
flag_sequence('BL'), flag_sequence('BQ'), flag_sequence('DG'), flag_sequence('BL'), flag_sequence('BQ'), flag_sequence('DG'),
flag_sequence('EA'), flag_sequence('EH'), flag_sequence('FK'), flag_sequence('EA'), flag_sequence('EH'), flag_sequence('FK'),
@@ -522,8 +531,6 @@ LEGACY_ANDROID_EMOJI = {
ZWJ_IDENTICALS = { ZWJ_IDENTICALS = {
# KISS # KISS
(0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468): 0x1F48F, (0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468): 0x1F48F,
# COUPLE WITH HEART
(0x1F469, 0x200D, 0x2764, 0x200D, 0x1F468): 0x1F491,
# FAMILY # FAMILY
(0x1F468, 0x200D, 0x1F469, 0x200D, 0x1F466): 0x1F46A, (0x1F468, 0x200D, 0x1F469, 0x200D, 0x1F466): 0x1F46A,
} }
@@ -576,6 +583,8 @@ GENDER_DEFAULTS = [
(0x1F9DD, FEMALE_SIGN), # ELF (0x1F9DD, FEMALE_SIGN), # ELF
(0x1F9DE, FEMALE_SIGN), # GENIE (0x1F9DE, FEMALE_SIGN), # GENIE
(0x1F9DF, FEMALE_SIGN), # ZOMBIE (0x1F9DF, FEMALE_SIGN), # ZOMBIE
(0X1F9B8, FEMALE_SIGN), # SUPERVILLAIN
(0x1F9B9, FEMALE_SIGN), # SUPERHERO
] ]
def is_fitzpatrick_modifier(cp): def is_fitzpatrick_modifier(cp):