Merge pull request #1279 from googlefonts/tidy

Tidy glyphs files a touch
googlefonts · Feb 14, 2025 · 2fe4a1c · 2fe4a1c
2 parents 50917d5 + cdcc86a
commit 2fe4a1c
Show file tree

Hide file tree

Showing 91 changed files with 49 additions and 446 deletions.
diff --git a/glyphs-reader/src/font.rs b/glyphs-reader/src/font.rs
@@ -358,8 +358,6 @@ pub enum Shape {
 #[derive(Default, Debug, PartialEq, FromPlist)]
 #[allow(non_snake_case)]
 struct RawFont {
-    #[fromplist(key = ".appVersion")]
-    app_version: i64,
     #[fromplist(key = ".formatVersion")]
     format_version: i64,
     units_per_em: Option<i64>,

diff --git a/resources/scripts/tidy_glyphs.py b/resources/scripts/tidy_glyphs.py
@@ -0,0 +1,49 @@
+"""
+Removes elements from .glyphs files that we don't care about.
+"""
+
+from pathlib import Path
+import re
+
+
+_EXEMPTIONS = {
+    ("Dated.glyphs", "date"),
+}
+
+_DELETE_ME = {
+    ".appVersion",
+    "DisplayStrings"
+    "date"
+    "lastChange"
+}
+
+
+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} = .*?;\n", "", 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()
+
+        for key in _DELETE_ME:
+            plist = delete_key(plist_file, plist, key)
+
+        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,4 @@
 {
-.appVersion = "3148";
-DisplayStrings = (
-"-",
-"!"
-);
 customParameters = (
 {
 name = "Variable Font Origin";
@@ -23,7 +18,6 @@ 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,4 @@
 {
-.appVersion = "3151";
-DisplayStrings = (
-".",
-","
-);
-date = "2023-01-20 20:20:30 +0000";
 familyName = "New Font";
 fontMaster = (
 {
@@ -26,7 +20,6 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = period;
-lastChange = "2023-01-20 20:20:51 +0000";
 layers = (
 {
 layerId = m01;
@@ -48,7 +41,6 @@ unicode = 002E;
 },
 {
 glyphname = comma;
-lastChange = "2023-01-20 20:22:39 +0000";
 layers = (
 {
 components = (
@@ -65,7 +57,6 @@ unicode = 002C;
 },
 {
 glyphname = non_uniform_scale;
-lastChange = "2023-01-20 20:22:39 +0000";
 layers = (
 {
 components = (
@@ -82,7 +73,6 @@ unicode = 0030;
 },
 {
 glyphname = simple_transform;
-lastChange = "2023-01-20 20:22:39 +0000";
 layers = (
 {
 components = (
@@ -99,7 +89,6 @@ unicode = 0031;
 },
 {
 glyphname = simple_transform_again;
-lastChange = "2023-01-20 20:22:39 +0000";
 layers = (
 {
 components = (
@@ -120,7 +109,6 @@ unicode = 0032;
 },
 {
 glyphname = translate_only;
-lastChange = "2023-01-20 20:22:39 +0000";
 layers = (
 {
 components = (

diff --git a/resources/testdata/glyphs2/FeaLegacyName.glyphs b/resources/testdata/glyphs2/FeaLegacyName.glyphs
@@ -1,5 +1,4 @@
 {
-.appVersion = "3148";
 familyName = "legacy stylistic set names";
 features = (
 {

diff --git a/resources/testdata/glyphs2/Fea_Class.glyphs b/resources/testdata/glyphs2/Fea_Class.glyphs
@@ -1,5 +1,4 @@
 {
-.appVersion = "3148";
 classes = (
 {
 automatic = 1;

diff --git a/resources/testdata/glyphs2/Fea_Feature.glyphs b/resources/testdata/glyphs2/Fea_Feature.glyphs
@@ -1,5 +1,4 @@
 {
-.appVersion = "3148";
 customParameters = (
 {
 name = Axes;

diff --git a/resources/testdata/glyphs2/Fea_Order.glyphs b/resources/testdata/glyphs2/Fea_Order.glyphs
@@ -1,5 +1,4 @@
 {
-.appVersion = "3148";
 customParameters = (
 {
 name = Axes;

diff --git a/resources/testdata/glyphs2/Fea_Prefix.glyphs b/resources/testdata/glyphs2/Fea_Prefix.glyphs
@@ -1,5 +1,4 @@
 {
-.appVersion = "3148";
 customParameters = (
 {
 name = Axes;

diff --git a/resources/testdata/glyphs2/IntermediateLayer.glyphs b/resources/testdata/glyphs2/IntermediateLayer.glyphs
@@ -1,9 +1,4 @@
 {
-.appVersion = "3300";
-DisplayStrings = (
-I,
-ii
-);
 customParameters = (
 {
 name = "Disable Last Change";
@@ -62,7 +57,6 @@ 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,6 @@ 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
@@ -1,5 +1,4 @@
 {
-.appVersion = "3228";
 customParameters = (
 {
 name = "Variable Font Origin";
@@ -15,7 +14,6 @@ Tag = slnt;
 );
 }
 );
-date = "2023-12-05 15:07:25 +0000";
 familyName = "MVAR Test";
 fontMaster = (
 {
@@ -296,7 +294,6 @@ 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
@@ -1,5 +1,4 @@
 {
-.appVersion = "3323";
 customParameters = (
 {
 name = "Disable Last Change";
@@ -19,7 +18,6 @@ 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
@@ -1,5 +1,4 @@
 {
-.appVersion = "3323";
 customParameters = (
 {
 name = "Disable Last Change";
@@ -27,7 +26,6 @@ Tag = slnt;
 );
 }
 );
-date = "2024-10-08 14:26:05 +0000";
 familyName = "Master Names";
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/MatrixComponent.glyphs b/resources/testdata/glyphs2/MatrixComponent.glyphs
@@ -1,5 +1,4 @@
 {
-.appVersion = "3219";
 familyName = MatrixComponent;
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/MixedContourComponent.glyphs b/resources/testdata/glyphs2/MixedContourComponent.glyphs
@@ -1,5 +1,4 @@
 {
-.appVersion = "3151";
 familyName = "New Font";
 fontMaster = (
 {

diff --git a/resources/testdata/glyphs2/OpszWghtVar_AxisMappings.glyphs b/resources/testdata/glyphs2/OpszWghtVar_AxisMappings.glyphs
@@ -1,9 +1,4 @@
 {
-.appVersion = "3148";
-DisplayStrings = (
-"-",
-"!"
-);
 customParameters = (
 {
 name = Axes;
@@ -41,7 +36,6 @@ wght = {
 };
 }
 );
-date = "2022-12-01 04:52:20 +0000";
 familyName = WghtVar;
 fontMaster = (
 {
@@ -104,7 +98,6 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = space;
-lastChange = "2022-12-01 04:58:12 +0000";
 layers = (
 {
 layerId = thin-12pt;
@@ -135,7 +128,6 @@ 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,10 @@
 {
-.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
@@ -1,5 +1,4 @@
 {
-.appVersion = "3227";
 customParameters = (
 {
 name = "Variable Font Origin";
@@ -15,7 +14,6 @@ Tag = slnt;
 );
 }
 );
-date = "2023-12-05 14:28:33 +0000";
 familyName = "Slanted Font";
 fontMaster = (
 {
@@ -54,7 +52,6 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = I;
-lastChange = "2023-12-05 14:31:49 +0000";
 layers = (
 {
 layerId = "E09E0C54-128D-4FEA-B209-1B70BEFE300B";
@@ -91,7 +88,6 @@ 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,4 @@
 {
-.appVersion = "3151";
-DisplayStrings = (
-"-",
-"!"
-);
 copyright = "Copy!";
 customParameters = (
 {
@@ -64,7 +59,6 @@ Tag = wght;
 );
 }
 );
-date = "2022-12-01 04:52:20 +0000";
 designer = "Designed by me!";
 designerURL = "https://example.com/designer";
 familyName = FamilyName;
@@ -95,7 +89,6 @@ xHeight = 500;
 glyphs = (
 {
 glyphname = space;
-lastChange = "2022-12-01 04:58:12 +0000";
 layers = (
 {
 layerId = m01;
@@ -110,7 +103,6 @@ unicode = 0020;
 },
 {
 glyphname = exclam;
-lastChange = "2022-12-01 05:10:49 +0000";
 layers = (
 {
 layerId = m01;
@@ -165,7 +157,6 @@ unicode = 0021;
 },
 {
 glyphname = hyphen;
-lastChange = "2022-12-01 04:57:39 +0000";
 layers = (
 {
 layerId = m01;
@@ -202,7 +193,6 @@ unicode = 002D;
 },
 {
 glyphname = "manual-component";
-lastChange = "2022-12-01 04:57:39 +0000";
 layers = (
 {
 components = (