Merge pull request #49 from dougfelt/tweaks

Tweaks to emoji build tools to deal with odds and ends.
pull/52/head
dougfelt 2016-04-05 14:40:24 -07:00
commit e7a7241a92
3 changed files with 6 additions and 3 deletions

View File

@ -13,7 +13,7 @@
<head> <head>
<!-- Most of this table will be recalculated by the compiler --> <!-- Most of this table will be recalculated by the compiler -->
<tableVersion value="1.0"/> <tableVersion value="1.0"/>
<fontRevision value="1.25"/> <fontRevision value="1.27"/>
<checkSumAdjustment value="0x4d5a161a"/> <checkSumAdjustment value="0x4d5a161a"/>
<magicNumber value="0x5f0f3cf5"/> <magicNumber value="0x5f0f3cf5"/>
<flags value="00000000 00001011"/> <flags value="00000000 00001011"/>
@ -156,7 +156,7 @@
Noto Color Emoji Noto Color Emoji
</namerecord> </namerecord>
<namerecord nameID="5" platformID="3" platEncID="1" langID="0x409"> <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
Version 1.25 Version 1.27
</namerecord> </namerecord>
<namerecord nameID="6" platformID="3" platEncID="1" langID="0x409"> <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
NotoColorEmoji NotoColorEmoji

View File

@ -130,12 +130,15 @@ def _check_skintone(sorted_seqs):
cp, len(modifiers), cp, len(modifiers),
', '.join('%04x' % cp for cp in sorted(modifiers))) ', '.join('%04x' % cp for cp in sorted(modifiers)))
def check_sequences(seqs): def check_sequences(seqs):
sorted_seqs = sorted(seqs) sorted_seqs = sorted(seqs)
print 'checking %d sequences' % len(seqs)
_check_valid_emoji(sorted_seqs) _check_valid_emoji(sorted_seqs)
_check_zwj(sorted_seqs) _check_zwj(sorted_seqs)
_check_flags(sorted_seqs) _check_flags(sorted_seqs)
_check_skintone(sorted_seqs) _check_skintone(sorted_seqs)
print 'done.'
def _collect_sequences(dirs, prefix='emoji_u'): def _collect_sequences(dirs, prefix='emoji_u'):

View File

@ -131,7 +131,7 @@ def _get_image_data(image_dir, ext, prefix):
filename = path.basename(f) filename = path.basename(f)
m = expect_re.match(filename) m = expect_re.match(filename)
if not m: if not m:
if filename.startswith('unknown_flag.'): if filename.startswith('unknown_flag.') or filename.startswith('p4p_'):
continue continue
fails.append('"%s" did not match: "%s"' % (expect_re.pattern, filename)) fails.append('"%s" did not match: "%s"' % (expect_re.pattern, filename))
continue continue