diff --git a/misc/tools/gen-instance-ufo.sh b/misc/tools/gen-instance-ufo.sh index 61a1a1b4d0..c3250af897 100755 --- a/misc/tools/gen-instance-ufo.sh +++ b/misc/tools/gen-instance-ufo.sh @@ -5,32 +5,32 @@ DESIGNSPACE=$1 UFO=$2 INSTANCE_Light="Inter Light" -INSTANCE_ExtraLight="Inter Extra Light" +INSTANCE_ExtraLight="Inter ExtraLight" INSTANCE_Medium="Inter Medium" -INSTANCE_SemiBold="Inter Semi Bold" +INSTANCE_SemiBold="Inter SemiBold" INSTANCE_Bold="Inter Bold" -INSTANCE_ExtraBold="Inter Extra Bold" +INSTANCE_ExtraBold="Inter ExtraBold" INSTANCE_DisplayLight="Inter Display Light" -INSTANCE_DisplayExtraLight="Inter Display Extra Light" +INSTANCE_DisplayExtraLight="Inter Display ExtraLight" INSTANCE_DisplayMedium="Inter Display Medium" -INSTANCE_DisplaySemiBold="Inter Display Semi Bold" +INSTANCE_DisplaySemiBold="Inter Display SemiBold" INSTANCE_DisplayBold="Inter Display Bold" -INSTANCE_DisplayExtraBold="Inter Display Extra Bold" +INSTANCE_DisplayExtraBold="Inter Display ExtraBold" INSTANCE_LightItalic="Inter Light Italic" -INSTANCE_ExtraLightItalic="Inter Extra Light Italic" +INSTANCE_ExtraLightItalic="Inter ExtraLight Italic" INSTANCE_MediumItalic="Inter Medium Italic" -INSTANCE_SemiBoldItalic="Inter Semi Bold Italic" +INSTANCE_SemiBoldItalic="Inter SemiBold Italic" INSTANCE_BoldItalic="Inter Bold Italic" -INSTANCE_ExtraBoldItalic="Inter Extra Bold Italic" +INSTANCE_ExtraBoldItalic="Inter ExtraBold Italic" INSTANCE_DisplayLightItalic="Inter Display Light Italic" -INSTANCE_DisplayExtraLightItalic="Inter Display Extra Light Italic" +INSTANCE_DisplayExtraLightItalic="Inter Display ExtraLight Italic" INSTANCE_DisplayMediumItalic="Inter Display Medium Italic" -INSTANCE_DisplaySemiBoldItalic="Inter Display Semi Bold Italic" +INSTANCE_DisplaySemiBoldItalic="Inter Display SemiBold Italic" INSTANCE_DisplayBoldItalic="Inter Display Bold Italic" -INSTANCE_DisplayExtraBoldItalic="Inter Display Extra Bold Italic" +INSTANCE_DisplayExtraBoldItalic="Inter Display ExtraBold Italic" MASTER_Thin=1 MASTER_Regular=1 @@ -51,7 +51,7 @@ _err() { echo "$PROG: $@" >&2; exit 1; } UFO_NAME=$(basename "$UFO" .ufo) case "$UFO_NAME" in Inter-*) UFO_NAME=${UFO_NAME:6} ;; esac -# DisplayExtraBold -> "Inter Display Extra Bold" +# DisplayExtraBold -> "Inter Display ExtraBold" INSTANCE=INSTANCE_${UFO_NAME} ; INSTANCE=${!INSTANCE} # If UFO is not an instance, assume that it's a master (or else error) diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist index 68e337ec75..02ebbce0e7 100644 --- a/src/Inter-Italic.glyphspackage/fontinfo.plist +++ b/src/Inter-Italic.glyphspackage/fontinfo.plist @@ -3780,8 +3780,8 @@ instanceInterpolations = { "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F" = 0.66667; }; isItalic = 1; -linkStyle = "Extra Light"; -name = "Extra Light Italic"; +linkStyle = ExtraLight; +name = "ExtraLight Italic"; weightClass = 200; }, { @@ -3917,8 +3917,8 @@ instanceInterpolations = { "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E" = 0.36; }; isItalic = 1; -linkStyle = "Semi Bold"; -name = "Semi Bold Italic"; +linkStyle = SemiBold; +name = "SemiBold Italic"; weightClass = 600; }, { @@ -3987,8 +3987,8 @@ instanceInterpolations = { "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E" = 0.76; }; isItalic = 1; -linkStyle = "Extra Bold"; -name = "Extra Bold Italic"; +linkStyle = ExtraBold; +name = "ExtraBold Italic"; weightClass = 800; }, { @@ -4107,8 +4107,8 @@ m008 = 0.33333; m012 = 0.66667; }; isItalic = 1; -linkStyle = "Display Extra Light"; -name = "Display Extra Light Italic"; +linkStyle = "Display ExtraLight"; +name = "Display ExtraLight Italic"; properties = ( { key = WWSFamilyName; @@ -4116,7 +4116,7 @@ value = "Inter Display"; }, { key = WWSSubfamilyName; -value = "Extra Light Italic"; +value = "ExtraLight Italic"; } ); weightClass = 200; @@ -4301,8 +4301,8 @@ m008 = 0.64; m010 = 0.36; }; isItalic = 1; -linkStyle = "Display Semi Bold"; -name = "Display Semi Bold Italic"; +linkStyle = "Display SemiBold"; +name = "Display SemiBold Italic"; properties = ( { key = WWSFamilyName; @@ -4310,7 +4310,7 @@ value = "Inter Display"; }, { key = WWSSubfamilyName; -value = "Semi Bold Italic"; +value = "SemiBold Italic"; } ); weightClass = 600; @@ -4400,8 +4400,8 @@ m008 = 0.24; m010 = 0.76; }; isItalic = 1; -linkStyle = "Display Extra Bold"; -name = "Display Extra Bold Italic"; +linkStyle = "Display ExtraBold"; +name = "Display ExtraBold Italic"; properties = ( { key = WWSFamilyName; @@ -4409,7 +4409,7 @@ value = "Inter Display"; }, { key = WWSSubfamilyName; -value = "Extra Bold Italic"; +value = "ExtraBold Italic"; } ); weightClass = 800; diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist index 46c84b5b1e..81abbb5c0d 100644 --- a/src/Inter-Roman.glyphspackage/fontinfo.plist +++ b/src/Inter-Roman.glyphspackage/fontinfo.plist @@ -3756,7 +3756,7 @@ instanceInterpolations = { "B1F27B51-9973-4381-9301-4FE46FE1CA59" = 0.66667; "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265" = 0.33333; }; -name = "Extra Light"; +name = ExtraLight; weightClass = 200; }, { @@ -3870,7 +3870,7 @@ instanceInterpolations = { "5C20EF92-B63D-42A8-8878-93C2863E0093" = 0.36; "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265" = 0.64; }; -name = "Semi Bold"; +name = SemiBold; weightClass = 600; }, { @@ -3929,7 +3929,7 @@ instanceInterpolations = { "5C20EF92-B63D-42A8-8878-93C2863E0093" = 0.76; "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265" = 0.24; }; -name = "Extra Bold"; +name = ExtraBold; weightClass = 800; }, { @@ -4032,7 +4032,7 @@ instanceInterpolations = { m007 = 0.33333; m011 = 0.66667; }; -name = "Display Extra Light"; +name = "Display ExtraLight"; properties = ( { key = WWSFamilyName; @@ -4040,7 +4040,7 @@ value = "Inter Display"; }, { key = WWSSubfamilyName; -value = "Extra Light"; +value = ExtraLight; } ); weightClass = 200; @@ -4202,7 +4202,7 @@ instanceInterpolations = { m007 = 0.64; m009 = 0.36; }; -name = "Display Semi Bold"; +name = "Display SemiBold"; properties = ( { key = WWSFamilyName; @@ -4210,7 +4210,7 @@ value = "Inter Display"; }, { key = WWSSubfamilyName; -value = "Semi Bold"; +value = SemiBold; } ); weightClass = 600; @@ -4290,7 +4290,7 @@ instanceInterpolations = { m007 = 0.24; m009 = 0.76; }; -name = "Display Extra Bold"; +name = "Display ExtraBold"; properties = ( { key = WWSFamilyName; @@ -4298,7 +4298,7 @@ value = "Inter Display"; }, { key = WWSSubfamilyName; -value = "Extra Bold"; +value = ExtraBold; } ); weightClass = 800;