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

Update lint check to accommodate new emoji sequences

Browse Source 
am: 0790ac68bc

Change-Id: Id179440ba304c40c498555389deb7b9cad7dcd9f
This commit is contained in:
Raph Levien
2016-08-23 14:30:08 +00:00
committed by android-build-merger
parent 69f7492184 0790ac68bc
commit b1581dbbfd
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/fonts/fontchain_lint.py
View File

@@ -507,12 +507,46 @@ def compute_expected_emoji():
all_sequences = set()
all_sequences.update(_emoji_variation_sequences)
# add zwj sequences not in the current emoji-zwj-sequences.txt
adjusted_emoji_zwj_sequences = dict(_emoji_zwj_sequences)
adjusted_emoji_zwj_sequences.update(_emoji_zwj_sequences)
# single parent families
additional_emoji_zwj = (
(0x1F468, 0x200D, 0x1F466),
(0x1F468, 0x200D, 0x1F467),
(0x1F468, 0x200D, 0x1F466, 0x200D, 0x1F466),
(0x1F468, 0x200D, 0x1F467, 0x200D, 0x1F466),
(0x1F468, 0x200D, 0x1F467, 0x200D, 0x1F467),
(0x1F469, 0x200D, 0x1F466),
(0x1F469, 0x200D, 0x1F467),
(0x1F469, 0x200D, 0x1F466, 0x200D, 0x1F466),
(0x1F469, 0x200D, 0x1F467, 0x200D, 0x1F466),
(0x1F469, 0x200D, 0x1F467, 0x200D, 0x1F467),
)
# sequences formed from man and woman and optional fitzpatrick modifier
modified_extensions = (
0x2696,
0x2708,
0x1F3A8,
0x1F680,
0x1F692,
)
for seq in additional_emoji_zwj:
adjusted_emoji_zwj_sequences[seq] = 'Emoji_ZWJ_Sequence'
for ext in modified_extensions:
for base in (0x1F468, 0x1F469):
seq = (base, 0x200D, ext)
adjusted_emoji_zwj_sequences[seq] = 'Emoji_ZWJ_Sequence'
for modifier in range(0x1F3FB, 0x1F400):
seq = (base, modifier, 0x200D, ext)
adjusted_emoji_zwj_sequences[seq] = 'Emoji_ZWJ_Sequence'
for sequence in _emoji_sequences.keys():
sequence = tuple(ch for ch in sequence if ch != EMOJI_VS)
all_sequences.add(sequence)
sequence_pieces.update(sequence)
for sequence in _emoji_zwj_sequences.keys():
for sequence in adjusted_emoji_zwj_sequences.keys():
sequence = tuple(ch for ch in sequence if ch != EMOJI_VS)
all_sequences.add(sequence)
sequence_pieces.update(sequence)