Merge pull request #49 from dougfelt/tweaks

Tweaks to emoji build tools to deal with odds and ends.
googlefonts · Apr 5, 2016 · e7a7241 · e7a7241
2 parents 9aed6b2 + ae1b833
commit e7a7241
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/NotoColorEmoji.tmpl.ttx.tmpl b/NotoColorEmoji.tmpl.ttx.tmpl
@@ -13,7 +13,7 @@
   <head>
     <!-- Most of this table will be recalculated by the compiler -->
     <tableVersion value="1.0"/>
-    <fontRevision value="1.25"/>
+    <fontRevision value="1.27"/>
     <checkSumAdjustment value="0x4d5a161a"/>
     <magicNumber value="0x5f0f3cf5"/>
     <flags value="00000000 00001011"/>
@@ -156,7 +156,7 @@
       Noto Color Emoji
     </namerecord>
     <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
-      Version 1.25
+      Version 1.27
     </namerecord>
     <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
       NotoColorEmoji

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

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