From db0e3934338cf84e9af423d28ca788d62c7339ba Mon Sep 17 00:00:00 2001
From: Rod S <rsheeter@google.com>
Date: Wed, 16 Nov 2022 21:54:33 -0800
Subject: [PATCH] Ran fix_colr_font_revision.py

---
 about_fonts.py                    |  11 ++++++++-
 fix_colr_font_revision.py         |  36 ++++++++++++++++++++++++++++++
 fonts/Noto-COLRv1-emojicompat.ttf | Bin 4931580 -> 4931580 bytes
 fonts/Noto-COLRv1-noflags.ttf     | Bin 2767876 -> 2767876 bytes
 fonts/Noto-COLRv1.ttf             | Bin 4754692 -> 4754692 bytes
 5 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 fix_colr_font_revision.py

diff --git a/about_fonts.py b/about_fonts.py
index d1e5bb410..c1d8d1abb 100644
--- a/about_fonts.py
+++ b/about_fonts.py
@@ -5,6 +5,13 @@ from pathlib import Path
 import sys
 
 
+NAME_ID_VERSION = 5
+
+
+def name(font, name_id):
+    return ",".join(n.toUnicode() for n in font["name"].names if n.isUnicode() and n.nameID == name_id)
+
+
 def main():
     font_files = sorted(p for p in (Path(__file__).parent / "fonts").iterdir() if p.suffix == ".ttf")
     max_name_len = max(len(p.name) for p in font_files)
@@ -19,7 +26,9 @@ def main():
             font_type.append("COLR")
         if "meta" in font and "Emji" in font["meta"].data:
             font_type.append("EmojiCompat")
-        font_type = ",".join(font_type)
+        font_type.append(f"fontRevision:{font['head'].fontRevision:.3f}")
+        font_type.append(name(font, NAME_ID_VERSION))
+        font_type = ", ".join(font_type)
 
         print(f"{font_file.name:{max_name_len + 1}} {font_type}")
 
diff --git a/fix_colr_font_revision.py b/fix_colr_font_revision.py
new file mode 100644
index 000000000..76b65b72b
--- /dev/null
+++ b/fix_colr_font_revision.py
@@ -0,0 +1,36 @@
+"""Set COLRv1 fontRevision from CBDT.
+
+Used for bugfix, should fix to set properly on build instead.
+"""
+
+from fontTools import ttLib
+from pathlib import Path
+import sys
+
+
+NAME_ID_VERSION = 5
+
+
+def name(font, name_id):
+    return ",".join(n.toUnicode() for n in font["name"].names if n.isUnicode() and n.nameID == name_id)
+
+
+def main():
+    colr_font_files = sorted(p for p in (Path(__file__).parent / "fonts").iterdir() if p.name.startswith("Noto-COLRv1"))
+
+    for colr_font_file in colr_font_files:
+        cbdt_font_file = colr_font_file.with_stem(colr_font_file.stem.replace("Noto-COLRv1", "NotoColorEmoji"))
+
+        colr_font = ttLib.TTFont(colr_font_file)
+        cbdt_font = ttLib.TTFont(cbdt_font_file)
+
+        assert "CBDT" in cbdt_font
+        assert "COLR" in colr_font
+
+        colr_font["head"].fontRevision = cbdt_font["head"].fontRevision
+
+        colr_font.save(colr_font_file)
+
+
+if __name__ == '__main__':
+  main()
diff --git a/fonts/Noto-COLRv1-emojicompat.ttf b/fonts/Noto-COLRv1-emojicompat.ttf
index c67132dfb96ce7ac312b5bc7668e92284fd929bf..c93afb11c9a6572a62733007f2d0ab6ec1b2658e 100644
GIT binary patch
delta 354
zcmW;7IWj{50D$3__hLybv9BSBeSP*ViP*Ps1}9LM(W(?$YU2hvg&B<txPu$$beZ9c
zf99LN^7|52c({(f(;tsF&$%%5{(6<oUuFtFL6i)teHF_W|9`p-?&8FKoTv(kNK!*B
zb<~q0O#_WI(M*OGT4|%54m#<gn;v@Uqn|7T43cArVMfR^${6EJFv%3t%rMIw^DGdv
p$P&w}u*w?iY_Q1|+Y~5LVuv!j?6J=Qha7Rt38$RB#fkIJ(jPuoR51Vm

delta 354
zcmW;7w@m{906@_@pUJ`G3?}Dr<YXHYOcXOP0<y#g6tqwyHh_wPCD?%lXs<z*;F&Ky
z{mSoas={MA`c8hH?q0HC5WL@(-fl9vB#6>MwXb~f`v1@6<US4`;;<@3M4B3EsiU3-
z8fl`L7Fx;BMmrsJ(nU8t^wLK^0}L|6Fe79cWsGqqm}H7+W|(D;c@|h?iDg!ZS!IoN
mHrQl~ZFbmYk9~6FDR4lMLykD+gc7Hman1#oA8~l~S@;9Qf>tj8

diff --git a/fonts/Noto-COLRv1-noflags.ttf b/fonts/Noto-COLRv1-noflags.ttf
index 3487ad881371e2999ec91db1d8c591149808ad7b..daa7629e8ba1dbcb8d2b291a8c573bb1baa78b5c 100644
GIT binary patch
delta 222
zcmW;7ISRr+06@{1Ok5I|823HnzMMcrv9R$Lo<Xp+GGHZWZDH#Tgmj+7#@bG>^v4g6
z?|*O7$7!S9wtL<lJ;MrCkL6_T%sxVyBJ4R|T>ro9#9qsTmLUTQCL)L;hBz$PNFa$6
r(r}Q0i!5@;qktkxD5HWZYN(@uCOl}g&_)Mc^w7ruLyYcPj$hLsKoBtU

delta 222
zcmXBFISxTl7(n6syU#p4^US;EVF^O$#44;oqE~o{im(E$9oT?UY(ZlI8i~?*agr~`
z{a(byaitHp`Dwj(M5)E*abMcwkJ6U%dQPV2|7Y*5k)08b4;mKy2q1_M!iXS>7~)94
pMiMEckwF$Y<WWEoC6rM?6*bi1z@UL9T4<w#E_&!=a5XY~jeh@fG4TKZ

diff --git a/fonts/Noto-COLRv1.ttf b/fonts/Noto-COLRv1.ttf
index 59968a6096a86618cc19f904a31b7c99b78afbca..37d4655acd02c9e38fd27fce8cb6387c13787e03 100644
GIT binary patch
delta 342
zcmW;7IWL0&0D$4|Xwf?AzUk+_@0(WZw)hQxgT!jmL_#F2Z2pAA;&0fxm~D1Xy~&fe
z^70l{c)E&zvY*e_kNGI`k*?l<UFHhEL7WO|Rg2|||G(Y@w@G-Hgf$T{DbmzYPXigU
zG}1&fE#zpWjdnWdq>FBP=%tT-1{h?BVe%x5Fv=L?Ofbn5)66i-9P=!&$P&w}u*w?i
hY_Q1|+w8E*9tDc*Q=-fPha7Rt38$RBC*k?`!yjRQObGx0

delta 342
zcmXZNNiIVH0D$55`l{yEShGGet$7|=ic%YAa0ZDRXksCxwiXsH;R4RVf-Bhjn)FY;
z{I%EjM2-4w^!)kra`%)AgCO;mt>0vde?gQC8hw|_*Uf+3$KgX9HYA8h(n5+>+GwYP
zPP*tOO@<zN>7$<k2FWtSFe8jI#yAs9k|Sn{X=a#Zj(HYXWQjZlmRVtyHP+c+lP$K{
gVV6DjIpB~Zij+9!gfgd`aZZH`E~$RR;nnZsKOV$O3IG5A