Skip to content

Commit

Permalink
Merge pull request #1283 from googlefonts/tidy3
Browse files Browse the repository at this point in the history
Keep .appVersion in .glyphs files
  • Loading branch information
rsheeter authored Feb 14, 2025
2 parents ba7f319 + a9fe440 commit 191518c
Show file tree
Hide file tree
Showing 88 changed files with 92 additions and 4 deletions.
9 changes: 5 additions & 4 deletions resources/scripts/tidy_glyphs.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
}

_DELETE_ME = {
".appVersion",
"DisplayStrings"
"date"
"lastChange"
# Keep .appVersion, per @anthrotype Glyphs.app makes decisions based on this
# ".appVersion",
"DisplayStrings",
"date",
"lastChange",
}


Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/BadIndexing.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
customParameters = (
{
name = "Variable Font Origin";
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/Component.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
familyName = "New Font";
fontMaster = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/FeaLegacyName.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
familyName = "legacy stylistic set names";
features = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/Fea_Class.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
classes = (
{
automatic = 1;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/Fea_Feature.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
customParameters = (
{
name = Axes;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/Fea_Order.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
customParameters = (
{
name = Axes;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/Fea_Prefix.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
customParameters = (
{
name = Axes;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/IntermediateLayer.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3300";
customParameters = (
{
name = "Disable Last Change";
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/MVAR.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3228";
customParameters = (
{
name = "Variable Font Origin";
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/MasterNames-Italic.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3323";
customParameters = (
{
name = "Disable Last Change";
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/MasterNames.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3323";
customParameters = (
{
name = "Disable Last Change";
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/MatrixComponent.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
familyName = MatrixComponent;
fontMaster = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/MixedContourComponent.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
familyName = "New Font";
fontMaster = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/OpszWghtVar_AxisMappings.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
customParameters = (
{
name = Axes;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/QCurve.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3208";
customParameters = (
{
name = "Disable Last Change";
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/SlantedFont.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3227";
customParameters = (
{
name = "Variable Font Origin";
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/TheBestNames.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
copyright = "Copy!";
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WdthVar.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3323";
copyright = "Copy!";
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
copyright = "Copy!";
customParameters = (
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
copyright = "Copy!";
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar_Anchors.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
customParameters = (
{
name = Axes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
customParameters = (
{
name = Axes;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar_Avar.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
copyright = "Copy!";
customParameters = (
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
copyright = "Copy!";
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar_HeavyHyphen.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3148";
customParameters = (
{
name = Axes;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar_ImplicitAxes.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3340";
customParameters = (
);
familyName = WghtVar;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar_Instances.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
copyright = "Copy!";
customParameters = (
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
copyright = "Copy!";
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar_NoExport.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3226";
copyright = "Copy!";
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/WghtVar_OS2.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3340";
copyright = "Copy!";
customParameters = (
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
copyright = "Copy!";
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/alignment_zones_v2.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "1365";
familyName = "New Font";
fontMaster = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs2/infinity.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
customParameters = (
{
name = Axes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
customParameters = (
{
name = Axes;
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/Component.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
.formatVersion = 3;
familyName = "New Font";
fontMaster = (
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/ComponentAnchor.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3259";
.formatVersion = 3;
familyName = "New Font";
fontMaster = (
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/CustomOrigin.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3227";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/EmptyMetaTable.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3260";
.formatVersion = 3;
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/Fea_Labels.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3317";
.formatVersion = 3;
familyName = "GlobalMetrics Font Test";
features = (
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/FixedPitch.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
.formatVersion = 3;
axes = (
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3316";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/IntermediateLayer.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3300";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/InvalidVendorID.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/MVAR.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3228";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/MasterNames-Italic.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3323";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/MasterNames.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3323";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/MetaTable.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3260";
.formatVersion = 3;
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/NestedComponent.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
.formatVersion = 3;
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/NoMetaTable.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3260";
.formatVersion = 3;
familyName = NoMetaTable;
fontMaster = (
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/Oswald-AE-comb.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3223";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/Oswald-O.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3192";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/Oswald-glyph-categories.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3260";
.formatVersion = 3;
axes = (
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3300";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/PropagateAnchorsTest.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3300";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/QCurve.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3208";
.formatVersion = 3;
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/SlantedFont.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3227";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/StandardAxisNames.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3324";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/StaticBoldItalic.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
.formatVersion = 3;
familyName = WghtVar;
fontMaster = (
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/StaticWithInstance.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
.formatVersion = 3;
familyName = WghtVar;
fontMaster = (
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/TheBestNames.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/TheBestV2NamesInAV3File.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3151";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/UnusualCustomParams.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3260";
.formatVersion = 3;
customParameters = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/WdthVar.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3316";
.formatVersion = 3;
axes = (
{
Expand Down
1 change: 1 addition & 0 deletions resources/testdata/glyphs3/WghtVar.glyphs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
.appVersion = "3219";
.formatVersion = 3;
axes = (
{
Expand Down
Loading

0 comments on commit 191518c

Please sign in to comment.