attempt at fixing names for Windows, re issue #519

2 files changed, 220 insertions, 18 deletions

diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist
index 77821f352..2ba06774f 100644
--- a/src/Inter-Italic.glyphspackage/fontinfo.plist
+++ b/src/Inter-Italic.glyphspackage/fontinfo.plist
@@ -4167,7 +4167,7 @@ m012 = 1;
 };
 isItalic = 1;
 linkStyle = "Display Thin";
-name = "Display Thin Italic";
+name = "Thin Italic";
 properties = (
 {
 key = WWSFamilyName;
@@ -4176,6 +4176,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = "Thin Italic";
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 },
@@ -4215,7 +4224,7 @@ m012 = 0.66667;
 };
 isItalic = 1;
 linkStyle = "Display ExtraLight";
-name = "Display ExtraLight Italic";
+name = "ExtraLight Italic";
 properties = (
 {
 key = WWSFamilyName;
@@ -4224,6 +4233,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = "ExtraLight Italic";
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 200;
@@ -4264,7 +4282,7 @@ m012 = 0.33333;
 };
 isItalic = 1;
 linkStyle = "Display Light";
-name = "Display Light Italic";
+name = "Light Italic";
 properties = (
 {
 key = WWSFamilyName;
@@ -4273,6 +4291,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = "Light Italic";
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 300;
@@ -4312,7 +4339,26 @@ m008 = 1;
 };
 isItalic = 1;
 linkStyle = Display;
-name = "Display Italic";
+name = Italic;
+properties = (
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = Italic;
+}
+);
 },
 {
 axesValues = (
@@ -4350,7 +4396,7 @@ m010 = 0.2;
 };
 isItalic = 1;
 linkStyle = "Display Medium";
-name = "Display Medium Italic";
+name = "Medium Italic";
 properties = (
 {
 key = WWSFamilyName;
@@ -4359,6 +4405,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = "Medium Italic";
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 500;
@@ -4399,7 +4454,7 @@ m010 = 0.36;
 };
 isItalic = 1;
 linkStyle = "Display SemiBold";
-name = "Display SemiBold Italic";
+name = "SemiBold Italic";
 properties = (
 {
 key = WWSFamilyName;
@@ -4408,6 +4463,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = "SemiBold Italic";
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 600;
@@ -4449,7 +4513,26 @@ m010 = 0.52;
 isBold = 1;
 isItalic = 1;
 linkStyle = Display;
-name = "Display Bold Italic";
+name = "Bold Italic";
+properties = (
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = "Bold Italic";
+}
+);
 weightClass = 700;
 },
 {
@@ -4488,7 +4571,7 @@ m010 = 0.76;
 };
 isItalic = 1;
 linkStyle = "Display ExtraBold";
-name = "Display ExtraBold Italic";
+name = "ExtraBold Italic";
 properties = (
 {
 key = WWSFamilyName;
@@ -4497,6 +4580,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = "ExtraBold Italic";
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 800;
@@ -4536,7 +4628,7 @@ m010 = 1;
 };
 isItalic = 1;
 linkStyle = "Display Black";
-name = "Display Black Italic";
+name = "Black Italic";
 properties = (
 {
 key = WWSFamilyName;
@@ -4545,6 +4637,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = "Black Italic";
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 900;
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index 5b2a3f44c..f748f516b 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -4096,7 +4096,7 @@ value = 0;
 instanceInterpolations = {
 m011 = 1;
 };
-name = "Display Thin";
+name = Thin;
 properties = (
 {
 key = WWSFamilyName;
@@ -4105,6 +4105,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = Thin;
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 100;
@@ -4139,7 +4148,7 @@ instanceInterpolations = {
 m007 = 0.33333;
 m011 = 0.66667;
 };
-name = "Display ExtraLight";
+name = ExtraLight;
 properties = (
 {
 key = WWSFamilyName;
@@ -4148,6 +4157,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = ExtraLight;
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 200;
@@ -4182,7 +4200,7 @@ instanceInterpolations = {
 m007 = 0.66667;
 m011 = 0.33333;
 };
-name = "Display Light";
+name = Light;
 properties = (
 {
 key = WWSFamilyName;
@@ -4191,6 +4209,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = Light;
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 300;
@@ -4224,7 +4251,26 @@ value = 0;
 instanceInterpolations = {
 m007 = 1;
 };
-name = Display;
+name = Regular;
+properties = (
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = Regular;
+}
+);
 },
 {
 axesValues = (
@@ -4256,7 +4302,7 @@ instanceInterpolations = {
 m007 = 0.8;
 m009 = 0.2;
 };
-name = "Display Medium";
+name = Medium;
 properties = (
 {
 key = WWSFamilyName;
@@ -4265,6 +4311,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = Medium;
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 500;
@@ -4299,7 +4354,7 @@ instanceInterpolations = {
 m007 = 0.64;
 m009 = 0.36;
 };
-name = "Display SemiBold";
+name = SemiBold;
 properties = (
 {
 key = WWSFamilyName;
@@ -4308,6 +4363,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = SemiBold;
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 600;
@@ -4344,7 +4408,26 @@ m009 = 0.52;
 };
 isBold = 1;
 linkStyle = Display;
-name = "Display Bold";
+name = Bold;
+properties = (
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = Bold;
+}
+);
 weightClass = 700;
 },
 {
@@ -4377,7 +4460,7 @@ instanceInterpolations = {
 m007 = 0.24;
 m009 = 0.76;
 };
-name = "Display ExtraBold";
+name = ExtraBold;
 properties = (
 {
 key = WWSFamilyName;
@@ -4386,6 +4469,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = ExtraBold;
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 800;
@@ -4419,7 +4511,7 @@ value = 0;
 instanceInterpolations = {
 m009 = 1;
 };
-name = "Display Black";
+name = Black;
 properties = (
 {
 key = WWSFamilyName;
@@ -4428,6 +4520,15 @@ value = "Inter Display";
 {
 key = WWSSubfamilyName;
 value = Black;
+},
+{
+key = familyNames;
+values = (
+{
+language = dflt;
+value = "Inter Display";
+}
+);
 }
 );
 weightClass = 900;