Tidy glyphs files a touch

googlefonts · Feb 14, 2025 · 3317612 · 3317612
1 parent 7d57971
commit 3317612
Show file tree

Hide file tree

Showing 80 changed files with 283 additions and 358 deletions.
diff --git a/resources/scripts/tidy_glyphs.py b/resources/scripts/tidy_glyphs.py
@@ -0,0 +1,43 @@
+"""
+Removes elements from .glyphs files that we don't care about.
+"""
+
+from pathlib import Path
+import re
+
+
+_EXEMPTIONS = {
+    ("Dated.glyphs", "date"),
+}
+
+
+def delete_key(plist_file: Path, plist: str, key: str) -> str:
+    if (plist_file.name, key) in _EXEMPTIONS:
+        print("skip", plist_file, key)
+        return plist
+    return re.sub(f"(?sm)^{key} = .*?;$", "", plist)
+
+
+def main():
+    testdata_dir = Path(__file__).parent.parent / "testdata"
+    assert testdata_dir.is_dir(), testdata_dir
+
+    plist_files = set()
+    for subdir in ("glyphs2", "glyphs3"):
+        for pat in ("*.glyphs", "*.plist"):
+            plist_files.update((testdata_dir / subdir).rglob(pat))
+
+    assert len(plist_files) > 0
+
+    for plist_file in plist_files:
+        plist = plist_file.read_text()
+
+        plist = delete_key(plist_file, plist, "DisplayStrings")
+        plist = delete_key(plist_file, plist, "date")
+        plist = delete_key(plist_file, plist, "lastChange")
+
+        plist_file.write_text(plist)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/resources/testdata/glyphs2/BadIndexing.glyphs b/resources/testdata/glyphs2/BadIndexing.glyphs
@@ -1,9 +1,6 @@
 {
 .appVersion = "3148";
-DisplayStrings = (
-"-",
-"!"
-);
+
 customParameters = (
 {
 name = "Variable Font Origin";
@@ -23,7 +20,7 @@ Tag = wdth;
 );
 }
 );
-date = "2022-12-01 04:52:20 +0000";
+
 familyName = WghtVar;
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/Component.glyphs b/resources/testdata/glyphs2/Component.glyphs
@@ -1,10 +1,7 @@
 {
 .appVersion = "3151";
-DisplayStrings = (
-".",
-","
-);
-date = "2023-01-20 20:20:30 +0000";
+
+
 familyName = "New Font";
 fontMaster = (
 {
@@ -26,7 +23,7 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = period;
-lastChange = "2023-01-20 20:20:51 +0000";
+
 layers = (
 {
 layerId = m01;
@@ -48,7 +45,7 @@ unicode = 002E;
 },
 {
 glyphname = comma;
-lastChange = "2023-01-20 20:22:39 +0000";
+
 layers = (
 {
 components = (
@@ -65,7 +62,7 @@ unicode = 002C;
 },
 {
 glyphname = non_uniform_scale;
-lastChange = "2023-01-20 20:22:39 +0000";
+
 layers = (
 {
 components = (
@@ -82,7 +79,7 @@ unicode = 0030;
 },
 {
 glyphname = simple_transform;
-lastChange = "2023-01-20 20:22:39 +0000";
+
 layers = (
 {
 components = (
@@ -99,7 +96,7 @@ unicode = 0031;
 },
 {
 glyphname = simple_transform_again;
-lastChange = "2023-01-20 20:22:39 +0000";
+
 layers = (
 {
 components = (
@@ -120,7 +117,7 @@ unicode = 0032;
 },
 {
 glyphname = translate_only;
-lastChange = "2023-01-20 20:22:39 +0000";
+
 layers = (
 {
 components = (

diff --git a/resources/testdata/glyphs2/IntermediateLayer.glyphs b/resources/testdata/glyphs2/IntermediateLayer.glyphs
@@ -1,9 +1,6 @@
 {
 .appVersion = "3300";
-DisplayStrings = (
-I,
-ii
-);
+
 customParameters = (
 {
 name = "Disable Last Change";
@@ -62,7 +59,7 @@ Tag = wght;
 );
 }
 );
-date = "2023-07-20 13:49:39 +0000";
+
 familyName = "Intermediate Layer";
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/KernImplicitAxes.glyphs b/resources/testdata/glyphs2/KernImplicitAxes.glyphs
@@ -27,7 +27,7 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = hyphen;
-lastChange = "2023-06-05 23:23:03 +0000";
+
 layers = (
 {
 layerId = m01;

diff --git a/resources/testdata/glyphs2/MVAR.glyphs b/resources/testdata/glyphs2/MVAR.glyphs
@@ -15,7 +15,7 @@ Tag = slnt;
 );
 }
 );
-date = "2023-12-05 15:07:25 +0000";
+
 familyName = "MVAR Test";
 fontMaster = (
 {
@@ -296,7 +296,7 @@ xHeight = 505;
 glyphs = (
 {
 glyphname = space;
-lastChange = "2023-12-07 13:14:38 +0000";
+
 layers = (
 {
 layerId = m01;

diff --git a/resources/testdata/glyphs2/MasterNames-Italic.glyphs b/resources/testdata/glyphs2/MasterNames-Italic.glyphs
@@ -19,7 +19,7 @@ Tag = wght;
 );
 }
 );
-date = "2024-10-08 16:36:05 +0000";
+
 familyName = "Master Names";
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/MasterNames.glyphs b/resources/testdata/glyphs2/MasterNames.glyphs
@@ -27,7 +27,7 @@ Tag = slnt;
 );
 }
 );
-date = "2024-10-08 14:26:05 +0000";
+
 familyName = "Master Names";
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/OpszWghtVar_AxisMappings.glyphs b/resources/testdata/glyphs2/OpszWghtVar_AxisMappings.glyphs
@@ -1,9 +1,6 @@
 {
 .appVersion = "3148";
-DisplayStrings = (
-"-",
-"!"
-);
+
 customParameters = (
 {
 name = Axes;
@@ -41,7 +38,7 @@ wght = {
 };
 }
 );
-date = "2022-12-01 04:52:20 +0000";
+
 familyName = WghtVar;
 fontMaster = (
 {
@@ -104,7 +101,7 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = space;
-lastChange = "2022-12-01 04:58:12 +0000";
+
 layers = (
 {
 layerId = thin-12pt;
@@ -135,7 +132,7 @@ unicode = 0020;
 },
 {
 glyphname = hyphen;
-lastChange = "2022-12-01 04:57:39 +0000";
+
 layers = (
 {
 layerId = thin-12pt;

diff --git a/resources/testdata/glyphs2/QCurve.glyphs b/resources/testdata/glyphs2/QCurve.glyphs
@@ -1,16 +1,13 @@
 {
 .appVersion = "3208";
-DisplayStrings = (
-"",
-i
-);
+
 customParameters = (
 {
 name = "Disable Last Change";
 value = 1;
 }
 );
-date = "2023-07-20 13:49:39 +0000";
+
 familyName = "New Font";
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/SlantedFont.glyphs b/resources/testdata/glyphs2/SlantedFont.glyphs
@@ -15,7 +15,7 @@ Tag = slnt;
 );
 }
 );
-date = "2023-12-05 14:28:33 +0000";
+
 familyName = "Slanted Font";
 fontMaster = (
 {
@@ -54,7 +54,7 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = I;
-lastChange = "2023-12-05 14:31:49 +0000";
+
 layers = (
 {
 layerId = "E09E0C54-128D-4FEA-B209-1B70BEFE300B";
@@ -91,7 +91,7 @@ unicode = 0049;
 },
 {
 glyphname = space;
-lastChange = "2023-12-05 14:44:13 +0000";
+
 layers = (
 {
 layerId = "E09E0C54-128D-4FEA-B209-1B70BEFE300B";

diff --git a/resources/testdata/glyphs2/TheBestNames.glyphs b/resources/testdata/glyphs2/TheBestNames.glyphs
@@ -1,9 +1,6 @@
 {
 .appVersion = "3151";
-DisplayStrings = (
-"-",
-"!"
-);
+
 copyright = "Copy!";
 customParameters = (
 {
@@ -64,7 +61,7 @@ Tag = wght;
 );
 }
 );
-date = "2022-12-01 04:52:20 +0000";
+
 designer = "Designed by me!";
 designerURL = "https://example.com/designer";
 familyName = FamilyName;
@@ -95,7 +92,7 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = space;
-lastChange = "2022-12-01 04:58:12 +0000";
+
 layers = (
 {
 layerId = m01;
@@ -110,7 +107,7 @@ unicode = 0020;
 },
 {
 glyphname = exclam;
-lastChange = "2022-12-01 05:10:49 +0000";
+
 layers = (
 {
 layerId = m01;
@@ -165,7 +162,7 @@ unicode = 0021;
 },
 {
 glyphname = hyphen;
-lastChange = "2022-12-01 04:57:39 +0000";
+
 layers = (
 {
 layerId = m01;
@@ -202,7 +199,7 @@ unicode = 002D;
 },
 {
 glyphname = "manual-component";
-lastChange = "2022-12-01 04:57:39 +0000";
+
 layers = (
 {
 components = (

diff --git a/resources/testdata/glyphs2/WdthVar.glyphs b/resources/testdata/glyphs2/WdthVar.glyphs
@@ -28,7 +28,7 @@ Tag = wdth;
 );
 }
 );
-date = "2022-12-01 04:52:20 +0000";
+
 familyName = WdthVar;
 fontMaster = (
 {
@@ -60,7 +60,7 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = space;
-lastChange = "2022-12-01 04:58:12 +0000";
+
 layers = (
 {
 layerId = m01;
@@ -75,7 +75,7 @@ unicode = 0020;
 },
 {
 glyphname = hyphen;
-lastChange = "2024-08-28 11:45:55 +0000";
+
 layers = (
 {
 layerId = m01;
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ Tag = wght; @@
     );
     }
     );
-    date = "2024-10-08 16:36:05 +0000";
     familyName = "Master Names";
     fontMaster = (
     {
@@ Expand Down @@