Fix master/instance names

googlefonts · Jan 7, 2020 · 90e5a8f · 90e5a8f
1 parent 2544c20
commit 90e5a8f
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 66 deletions.
diff --git a/sources/Inconsolata-vf.glyphs b/sources/Inconsolata-vf.glyphs
@@ -1,5 +1,8 @@
 {
 .appVersion = "1271";
+DisplayStrings = (
+"/Ccedillaacute"
+);
 classes = (
 {
 automatic = 1;
@@ -342,7 +345,7 @@ alignmentZones = (
 );
 ascender = 665;
 capHeight = 623;
-custom = Extra;
+custom = "Ultra Extra";
 customParameters = (
 {
 name = typoAscender;
@@ -396,14 +399,17 @@ name = "sups top";
 position = "{139, 633}";
 }
 );
-id = "4196E4A4-01D0-4BE0-B812-9D3AF152A0E4";
-name = "Extra Light";
+iconName = Light;
+id = "0E826D2B-F2D1-4058-A5E0-936DF7ED7520";
+name = "Ultra Condensed ExtraLight";
 userData = {
 GSOffsetHorizontal = 20;
 GSOffsetVertical = 20;
 };
 weight = Light;
 weightValue = 200;
+width = Condensed;
+widthValue = 50;
 xHeight = 449;
 },
 {
@@ -416,6 +422,7 @@ alignmentZones = (
 );
 ascender = 665;
 capHeight = 623;
+custom = "Ultra Regular";
 customParameters = (
 {
 name = typoAscender;
@@ -469,25 +476,28 @@ name = "sups top";
 position = "{139, 633}";
 }
 );
-id = "051EFAE4-8BBE-4FBB-A016-4335C3E52F59";
+id = "7EB90DB1-9188-465D-93C7-E6C577A18003";
+name = "Ultra Condensed Regular";
 userData = {
 GSOffsetHorizontal = 20;
 GSOffsetVertical = 20;
 };
 weightValue = 400;
+width = Condensed;
+widthValue = 50;
 xHeight = 457;
 },
 {
 alignmentZones = (
-"{675, 12}",
-"{623, 12}",
+"{665, 7}",
+"{623, 5}",
 "{471, 11}",
 "{0, -12}",
-"{-167, -16}"
+"{-167, -6}"
 );
-ascender = 675;
+ascender = 665;
 capHeight = 623;
-custom = Black;
+custom = "Ultra Black";
 customParameters = (
 {
 name = typoAscender;
@@ -502,6 +512,14 @@ name = typoLineGap;
 value = 0;
 },
 {
+name = winAscent;
+value = 1004;
+},
+{
+name = winDescent;
+value = 454;
+},
+{
 name = hheaAscender;
 value = 859;
 },
@@ -522,38 +540,26 @@ name = hheaLineGap;
 value = 0;
 },
 {
-name = winDescent;
-value = 454;
-},
-{
-name = winAscent;
-value = 1004;
-},
-{
 name = "Master Icon Glyph Name";
 value = n;
 }
 );
 descender = -167;
 guideLines = (
 {
-locked = 1;
-name = "sups baseline";
-position = "{308, 262}";
-},
-{
 name = "sups top";
-position = "{311, 656}";
+position = "{139, 633}";
 }
 );
-iconName = Bold;
-id = "37FE174D-E85B-4C4C-A1AE-51D7E67A9FC9";
+id = "E49A0581-9397-4BB7-ADB1-45D6EDC9C316";
+name = "Ultra Condensed Black";
 userData = {
-GSOffsetHorizontal = 50;
-GSOffsetMakeStroke = 1;
-GSOffsetVertical = 50;
+GSOffsetHorizontal = 20;
+GSOffsetVertical = 20;
 };
 weightValue = 900;
+width = Condensed;
+widthValue = 50;
 xHeight = 471;
 },
 {
@@ -566,7 +572,7 @@ alignmentZones = (
 );
 ascender = 665;
 capHeight = 623;
-custom = "Narrow Extra";
+custom = Extra;
 customParameters = (
 {
 name = typoAscender;
@@ -620,15 +626,14 @@ name = "sups top";
 position = "{139, 633}";
 }
 );
-id = "0E826D2B-F2D1-4058-A5E0-936DF7ED7520";
-name = "Narrow Extra Light";
+id = "4196E4A4-01D0-4BE0-B812-9D3AF152A0E4";
+name = ExtraLight;
 userData = {
 GSOffsetHorizontal = 20;
 GSOffsetVertical = 20;
 };
 weight = Light;
 weightValue = 200;
-widthValue = 50;
 xHeight = 449;
 },
 {
@@ -641,7 +646,6 @@ alignmentZones = (
 );
 ascender = 665;
 capHeight = 623;
-custom = Narrow;
 customParameters = (
 {
 name = typoAscender;
@@ -695,26 +699,25 @@ name = "sups top";
 position = "{139, 633}";
 }
 );
-id = "7EB90DB1-9188-465D-93C7-E6C577A18003";
+id = "051EFAE4-8BBE-4FBB-A016-4335C3E52F59";
 userData = {
 GSOffsetHorizontal = 20;
 GSOffsetVertical = 20;
 };
 weightValue = 400;
-widthValue = 50;
 xHeight = 457;
 },
 {
 alignmentZones = (
-"{665, 7}",
-"{623, 5}",
+"{675, 12}",
+"{623, 12}",
 "{471, 11}",
 "{0, -12}",
-"{-167, -6}"
+"{-167, -16}"
 );
-ascender = 665;
+ascender = 675;
 capHeight = 623;
-custom = "Narrow Black";
+custom = Black;
 customParameters = (
 {
 name = typoAscender;
@@ -729,14 +732,6 @@ name = typoLineGap;
 value = 0;
 },
 {
-name = winAscent;
-value = 1004;
-},
-{
-name = winDescent;
-value = 454;
-},
-{
 name = hheaAscender;
 value = 859;
 },
@@ -757,24 +752,38 @@ name = hheaLineGap;
 value = 0;
 },
 {
+name = winDescent;
+value = 454;
+},
+{
+name = winAscent;
+value = 1004;
+},
+{
 name = "Master Icon Glyph Name";
 value = n;
 }
 );
 descender = -167;
 guideLines = (
 {
+locked = 1;
+name = "sups baseline";
+position = "{308, 262}";
+},
+{
 name = "sups top";
-position = "{139, 633}";
+position = "{311, 656}";
 }
 );
-id = "E49A0581-9397-4BB7-ADB1-45D6EDC9C316";
+iconName = Bold;
+id = "37FE174D-E85B-4C4C-A1AE-51D7E67A9FC9";
 userData = {
-GSOffsetHorizontal = 20;
-GSOffsetVertical = 20;
+GSOffsetHorizontal = 50;
+GSOffsetMakeStroke = 1;
+GSOffsetVertical = 50;
 };
 weightValue = 900;
-widthValue = 50;
 xHeight = 471;
 },
 {
@@ -787,7 +796,7 @@ alignmentZones = (
 );
 ascender = 665;
 capHeight = 623;
-custom = "Wide Extra";
+custom = "Ultra Expanded Extra";
 customParameters = (
 {
 name = typoAscender;
@@ -842,7 +851,7 @@ position = "{139, 633}";
 }
 );
 id = "16CD5438-0A7A-495F-951A-DBB915DF0BEC";
-name = "Wide Extra Light";
+name = "Ultra Expanded ExtraLight";
 userData = {
 GSOffsetHorizontal = 20;
 GSOffsetVertical = 20;
@@ -862,7 +871,7 @@ alignmentZones = (
 );
 ascender = 665;
 capHeight = 623;
-custom = Wide;
+custom = "Ultra Expanded Regular";
 customParameters = (
 {
 name = typoAscender;
@@ -935,7 +944,7 @@ alignmentZones = (
 );
 ascender = 665;
 capHeight = 623;
-custom = "Wide Black";
+custom = "Ultra Expanded Black";
 customParameters = (
 {
 name = typoAscender;
@@ -267893,7 +267902,7 @@ interpolationWidth = 50;
 instanceInterpolations = {
 "7EB90DB1-9188-465D-93C7-E6C577A18003" = 1;
 };
-name = "Ultra Condensed";
+name = UltraCondensed;
 widthClass = "Ultra Condensed";
 },
 {
@@ -267909,7 +267918,7 @@ interpolationWidth = 200;
 instanceInterpolations = {
 "382F13D7-0CC9-4B85-A585-CBE12F4435D4" = 1;
 };
-name = "Ultra Expanded";
+name = UltraExpanded;
 widthClass = "Ultra Expanded";
 },
 {

diff --git a/sources/gen_instances.py b/sources/gen_instances.py
@@ -3,15 +3,15 @@
 Generates additional interpolation instances for Inconsolata.
 """
 widths = [
-    ("UltraCondensed", 50),
-    ("ExtraCondensed", 70),
+    ("Ultra Condensed", 50),
+    ("Extra Condensed", 70),
     ("Condensed", 80),
-    ("SemiCondensed", 90),
+    ("Semi Condensed", 90),
     ("Medium", 100),
-    ("SemiExpanded", 110),
+    ("Semi Expanded", 110),
     ("Expanded", 120),
-    ("ExtraExpanded", 150),
-    ("UltraExpanded", 200),
+    ("Extra Expanded", 150),
+    ("Ultra Expanded", 200),
 ]
 
 weights = [
@@ -31,7 +31,7 @@
             instance = GSInstance()
             instance.width = wdth[0]
             instance.weight = wght[0]
-            name = wdth[0]
+            name = wdth[0].replace(" ", "")
             if wght[0] != "Regular":
                 name += " " + wght[0]
             instance.weightValue = wght[1]