diff --git a/Makefile b/Makefile index 3ca12eb3fd..1975e95399 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ $(UFODIR)/Inter-BlackItalic.ufo: $(UFODIR)/Inter-Italic.designspace touch $@ $(UFODIR)/Inter-DisplayThin.ufo: $(UFODIR)/Inter-Roman.designspace touch $@ -$(UFODIR)/Inter-DisplayRegular.ufo: $(UFODIR)/Inter-Roman.designspace +$(UFODIR)/Inter-Display.ufo: $(UFODIR)/Inter-Roman.designspace touch $@ $(UFODIR)/Inter-DisplayBlack.ufo: $(UFODIR)/Inter-Roman.designspace touch $@ @@ -134,7 +134,7 @@ $(UFODIR)/Inter-DisplayExtraBoldItalic.ufo: $(UFODIR)/Inter-Italic.designspace | $(UFODIR)/Inter-ExtraBoldItalic.ufo \ \ $(UFODIR)/Inter-DisplayBlack.ufo \ - $(UFODIR)/Inter-DisplayRegular.ufo \ + $(UFODIR)/Inter-Display.ufo \ $(UFODIR)/Inter-DisplayThin.ufo \ $(UFODIR)/Inter-DisplayLight.ufo \ $(UFODIR)/Inter-DisplayExtraLight.ufo \ @@ -247,7 +247,7 @@ static_otf: \ $(FONTDIR)/static/Inter-ExtraBoldItalic.otf \ $(FONTDIR)/static/Inter-DisplayBlack.otf \ $(FONTDIR)/static/Inter-DisplayBlackItalic.otf \ - $(FONTDIR)/static/Inter-DisplayRegular.otf \ + $(FONTDIR)/static/Inter-Display.otf \ $(FONTDIR)/static/Inter-DisplayItalic.otf \ $(FONTDIR)/static/Inter-DisplayThin.otf \ $(FONTDIR)/static/Inter-DisplayThinItalic.otf \ @@ -285,7 +285,7 @@ static_ttf: \ $(FONTDIR)/static/Inter-ExtraBoldItalic.ttf \ $(FONTDIR)/static/Inter-DisplayBlack.ttf \ $(FONTDIR)/static/Inter-DisplayBlackItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayRegular.ttf \ + $(FONTDIR)/static/Inter-Display.ttf \ $(FONTDIR)/static/Inter-DisplayItalic.ttf \ $(FONTDIR)/static/Inter-DisplayThin.ttf \ $(FONTDIR)/static/Inter-DisplayThinItalic.ttf \ @@ -323,7 +323,7 @@ static_ttf_hinted: \ $(FONTDIR)/static-hinted/Inter-ExtraBoldItalic.ttf \ $(FONTDIR)/static-hinted/Inter-DisplayBlack.ttf \ $(FONTDIR)/static-hinted/Inter-DisplayBlackItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayRegular.ttf \ + $(FONTDIR)/static-hinted/Inter-Display.ttf \ $(FONTDIR)/static-hinted/Inter-DisplayItalic.ttf \ $(FONTDIR)/static-hinted/Inter-DisplayThin.ttf \ $(FONTDIR)/static-hinted/Inter-DisplayThinItalic.ttf \ @@ -361,7 +361,7 @@ static_web: \ $(FONTDIR)/static/Inter-ExtraBoldItalic.woff2 \ $(FONTDIR)/static/Inter-DisplayBlack.woff2 \ $(FONTDIR)/static/Inter-DisplayBlackItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayRegular.woff2 \ + $(FONTDIR)/static/Inter-Display.woff2 \ $(FONTDIR)/static/Inter-DisplayItalic.woff2 \ $(FONTDIR)/static/Inter-DisplayThin.woff2 \ $(FONTDIR)/static/Inter-DisplayThinItalic.woff2 \ @@ -399,7 +399,7 @@ static_web_hinted: \ $(FONTDIR)/static-hinted/Inter-ExtraBoldItalic.woff2 \ $(FONTDIR)/static-hinted/Inter-DisplayBlack.woff2 \ $(FONTDIR)/static-hinted/Inter-DisplayBlackItalic.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayRegular.woff2 \ + $(FONTDIR)/static-hinted/Inter-Display.woff2 \ $(FONTDIR)/static-hinted/Inter-DisplayItalic.woff2 \ $(FONTDIR)/static-hinted/Inter-DisplayThin.woff2 \ $(FONTDIR)/static-hinted/Inter-DisplayThinItalic.woff2 \ @@ -561,7 +561,7 @@ install: install_var \ $(INSTALLDIR)/Inter-ExtraBoldItalic.otf \ $(INSTALLDIR)/Inter-DisplayBlack.otf \ $(INSTALLDIR)/Inter-DisplayBlackItalic.otf \ - $(INSTALLDIR)/Inter-DisplayRegular.otf \ + $(INSTALLDIR)/Inter-Display.otf \ $(INSTALLDIR)/Inter-DisplayItalic.otf \ $(INSTALLDIR)/Inter-DisplayThin.otf \ $(INSTALLDIR)/Inter-DisplayThinItalic.otf \ diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist index 01a080ee29..654db53358 100644 --- a/src/Inter-Italic.glyphspackage/fontinfo.plist +++ b/src/Inter-Italic.glyphspackage/fontinfo.plist @@ -3809,8 +3809,8 @@ instanceInterpolations = { m008 = 1; }; isItalic = 1; -linkStyle = "Display Regular"; -name = "Display Regular Italic"; +linkStyle = Display; +name = "Display Italic"; }, { axesValues = ( @@ -3912,8 +3912,9 @@ instanceInterpolations = { m008 = 0.4; m010 = 0.6; }; +isBold = 1; isItalic = 1; -linkStyle = "Display Bold"; +linkStyle = Display; name = "Display Bold Italic"; weightClass = 700; }, diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph index 7d7c3e0698..6e9a8227dc 100644 --- a/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph +++ b/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph @@ -26,7 +26,7 @@ shapes = ( ref = uni0249.ccmp; }, { -pos = (-32,0); +pos = (-33,0); ref = dotaccent; } ); diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist index 060a7bbd53..90da5ee72d 100644 --- a/src/Inter-Roman.glyphspackage/fontinfo.plist +++ b/src/Inter-Roman.glyphspackage/fontinfo.plist @@ -3083,7 +3083,7 @@ pos = -494; { } ); -name = "Display Regular"; +name = Display; stemValues = ( 160, 180 @@ -3734,7 +3734,7 @@ value = ( instanceInterpolations = { m007 = 1; }; -name = "Display Regular"; +name = Display; }, { axesValues = ( @@ -3821,7 +3821,7 @@ m007 = 0.4; m009 = 0.6; }; isBold = 1; -linkStyle = "Display Regular"; +linkStyle = Display; name = "Display Bold"; weightClass = 700; },