Rebuild as v2.041

Update postproc to update head.fontRevision
2025-06-07 15:27:59 +00:00 · 2023-11-20 18:49:04 -08:00 · 2023-11-20 18:49:04 -08:00 · 8a5d56d7b8
commit 8a5d56d7b8
parent 69db164275
11 changed files with 29 additions and 3 deletions
--- a/NotoColorEmoji.tmpl.ttx.tmpl
+++ b/NotoColorEmoji.tmpl.ttx.tmpl
@ -78,7 +78,7 @@
  <head>
    <!-- Most of this table will be recalculated by the compiler -->
    <tableVersion value="1.0"/>
-    <fontRevision value="2.040"/>
+    <fontRevision value="2.041"/>
    <checkSumAdjustment value="0x4d5a161a"/>
    <magicNumber value="0x5f0f3cf5"/>
    <flags value="00000000 00001011"/>
@ -246,7 +246,7 @@
      Noto Color Emoji
    </namerecord>
    <namerecord nameID="5" platformID="3" platEncID="1" langID="0x409">
-      Version 2.040;GOOG;noto-emoji:20231016:92a58ea6b2cfcad2560c2271855bc9c77eab6c51
+      Version 2.041;GOOG;noto-emoji:20231120:69db1642752d1457ed8cfa6880781a9f36c9722e
    </namerecord>
    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
      NotoColorEmoji
--- a/colrv1_postproc.py
+++ b/colrv1_postproc.py
@ -16,6 +16,7 @@ from nototools import add_vs_cmap
 from nototools import font_data
 from nototools import unicode_data
 from pathlib import Path
+import re

 from colrv1_add_soft_light_to_flags import add_soft_light_to_flags

@ -291,6 +292,16 @@ def _set_no_font_embedding_restrictions(colr_font):
    colr_font["OS/2"].fsType = 0


+def _set_head_version_to_name_version(colr_font):
+    # head.fontRevision and the version on name 5 should match
+    name_version = colr_font['name'].getName(5, 3, 1, 0x409)
+    assert name_version is not None, "No version found in 'name'"
+    name_version = name_version.toUnicode()
+    match = re.match(r'^Version (\d+[.]\d+);GOOG;', name_version)
+    assert match is not None, f"Unable to parse version from '{name_version}'"
+    colr_font["head"].fontRevision = float(match.group(1))
+
+
 def _font(path, check_fn, check_fail_str):
    assert path.is_file(), path
    font = ttLib.TTFont(path)
@ -324,6 +335,8 @@ def main(_):

        _set_no_font_embedding_restrictions(colr_font)

+        _set_head_version_to_name_version(colr_font)
+
        print("Writing", colr_file)
        colr_font.save(colr_file)

--- a/fonts/Noto-COLRv1-emojicompat.ttf
+++ b/fonts/Noto-COLRv1-emojicompat.ttf
--- a/fonts/Noto-COLRv1-noflags.ttf
+++ b/fonts/Noto-COLRv1-noflags.ttf
--- a/fonts/Noto-COLRv1.ttf
+++ b/fonts/Noto-COLRv1.ttf
--- a/fonts/NotoColorEmoji-emojicompat.ttf
+++ b/fonts/NotoColorEmoji-emojicompat.ttf
--- a/fonts/NotoColorEmoji-noflags.ttf
+++ b/fonts/NotoColorEmoji-noflags.ttf
--- a/fonts/NotoColorEmoji.ttf
+++ b/fonts/NotoColorEmoji.ttf
--- a/fonts/NotoColorEmoji_WindowsCompatible.ttf
+++ b/fonts/NotoColorEmoji_WindowsCompatible.ttf
--- a/requirements.txt
+++ b/requirements.txt
@ -1,3 +1,4 @@
 fonttools>=4.7.0
 notofonttools>=0.2.17
 nanoemoji >= 0.14.3
+pytest>=7.4
--- a/tests/basic_test.py
+++ b/tests/basic_test.py
@ -44,3 +44,15 @@ def test_consistent_fstype():
        debug_fstypes.append(f"{font_file.name} fsType {fstype}")
    debug_fstypes = "\n".join(debug_fstypes)
    assert fstypes == {0}, f"All fsType's should be 0, found\n{debug_fstypes}"
+
+def test_has_emojicompat():
+    fonts_dir = Path("fonts")
+    assert fonts_dir.is_dir()
+
+    ec_fonts = set(fonts_dir.rglob("*-emojicompat.ttf"))
+    assert {f.name for f in ec_fonts} == {"Noto-COLRv1-emojicompat.ttf", "NotoColorEmoji-emojicompat.ttf"}
+
+    for font_file in ec_fonts:
+        font = ttLib.TTFont(font_file)
+        assert "meta" in font, f"{font_file.name} should have a meta table"
+        assert "Emji" in font["meta"].data, f"{font_file.name} should have emojicompat data"