fixes wght mapping issues introduced by recent Glyphs app update. Also upgrades fontmake now that fontmake issue 894 is fixed

1 files changed, 69 insertions, 69 deletions

diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index da64d8c1c..81099ede2 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -1,5 +1,5 @@
 {
-.appVersion = "3151";
+.appVersion = "3260";
 .formatVersion = 3;
 axes = (
 {
@@ -4748,14 +4748,6 @@ m011 = 1;
 name = Thin;
 properties = (
 {
-key = WWSFamilyName;
-value = "Inter Display";
-},
-{
-key = WWSSubfamilyName;
-value = Thin;
-},
-{
 key = familyNames;
 values = (
 {
@@ -4763,6 +4755,14 @@ language = dflt;
 value = "Inter Display";
 }
 );
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = Thin;
 }
 );
 weightClass = 100;
@@ -4800,14 +4800,6 @@ m011 = 0.66667;
 name = ExtraLight;
 properties = (
 {
-key = WWSFamilyName;
-value = "Inter Display";
-},
-{
-key = WWSSubfamilyName;
-value = ExtraLight;
-},
-{
 key = familyNames;
 values = (
 {
@@ -4815,6 +4807,14 @@ language = dflt;
 value = "Inter Display";
 }
 );
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = ExtraLight;
 }
 );
 weightClass = 200;
@@ -4852,14 +4852,6 @@ m011 = 0.33333;
 name = Light;
 properties = (
 {
-key = WWSFamilyName;
-value = "Inter Display";
-},
-{
-key = WWSSubfamilyName;
-value = Light;
-},
-{
 key = familyNames;
 values = (
 {
@@ -4867,6 +4859,14 @@ language = dflt;
 value = "Inter Display";
 }
 );
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = Light;
 }
 );
 weightClass = 300;
@@ -4954,14 +4954,6 @@ m009 = 0.18;
 name = Medium;
 properties = (
 {
-key = WWSFamilyName;
-value = "Inter Display";
-},
-{
-key = WWSSubfamilyName;
-value = Medium;
-},
-{
 key = familyNames;
 values = (
 {
@@ -4969,6 +4961,14 @@ language = dflt;
 value = "Inter Display";
 }
 );
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = Medium;
 }
 );
 weightClass = 500;
@@ -5006,14 +5006,6 @@ m009 = 0.36;
 name = SemiBold;
 properties = (
 {
-key = WWSFamilyName;
-value = "Inter Display";
-},
-{
-key = WWSSubfamilyName;
-value = SemiBold;
-},
-{
 key = familyNames;
 values = (
 {
@@ -5021,6 +5013,14 @@ language = dflt;
 value = "Inter Display";
 }
 );
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = SemiBold;
 }
 );
 weightClass = 600;
@@ -5112,14 +5112,6 @@ m009 = 0.76;
 name = ExtraBold;
 properties = (
 {
-key = WWSFamilyName;
-value = "Inter Display";
-},
-{
-key = WWSSubfamilyName;
-value = ExtraBold;
-},
-{
 key = familyNames;
 values = (
 {
@@ -5127,6 +5119,14 @@ language = dflt;
 value = "Inter Display";
 }
 );
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = ExtraBold;
 }
 );
 weightClass = 800;
@@ -5163,14 +5163,6 @@ m009 = 1;
 name = Black;
 properties = (
 {
-key = WWSFamilyName;
-value = "Inter Display";
-},
-{
-key = WWSSubfamilyName;
-value = Black;
-},
-{
 key = familyNames;
 values = (
 {
@@ -5178,6 +5170,14 @@ language = dflt;
 value = "Inter Display";
 }
 );
+},
+{
+key = WWSFamilyName;
+value = "Inter Display";
+},
+{
+key = WWSSubfamilyName;
+value = Black;
 }
 );
 weightClass = 900;
@@ -16275,34 +16275,30 @@ key = designerURL;
 value = "https://rsms.me/";
 },
 {
-key = manufacturers;
+key = licenses;
 values = (
 {
 language = dflt;
-value = rsms;
+value = "This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: http://scripts.sil.org/OFL";
 }
 );
 },
 {
-key = manufacturerURL;
-value = "https://rsms.me/";
+key = licenseURL;
+value = "http://scripts.sil.org/OFL";
 },
 {
-key = licenses;
+key = manufacturers;
 values = (
 {
 language = dflt;
-value = "This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: http://scripts.sil.org/OFL";
+value = rsms;
 }
 );
 },
 {
-key = licenseURL;
-value = "http://scripts.sil.org/OFL";
-},
-{
-key = vendorID;
-value = RSMS;
+key = manufacturerURL;
+value = "https://rsms.me/";
 },
 {
 key = trademarks;
@@ -16312,6 +16308,10 @@ language = dflt;
 value = "Inter UI and Inter is a trademark of rsms.";
 }
 );
+},
+{
+key = vendorID;
+value = RSMS;
 }
 );
 settings = {