From 6e73e7995002505dc4b7d3b1bb5e9d9356cbc225 Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Wed, 7 Jun 2023 18:03:53 -0700 Subject: attempt at fixing names for Windows, re issue #519 --- Makefile | 366 +++++++++++++------------- misc/dist/inter.css | 36 +-- misc/makezip2.sh | 8 +- misc/tools/gen-instance-ufo.sh | 26 +- misc/tools/postprocess-designspace.py | 15 +- misc/tools/postprocess_instance_ufo.py | 23 -- src/Inter-Italic.glyphspackage/fontinfo.plist | 119 ++++++++- src/Inter-Roman.glyphspackage/fontinfo.plist | 119 ++++++++- 8 files changed, 457 insertions(+), 255 deletions(-) diff --git a/Makefile b/Makefile index 44054d242..b9287a360 100644 --- a/Makefile +++ b/Makefile @@ -41,9 +41,9 @@ $(UFODIR)/%.designspace: $(UFODIR)/%.glyphs $(UFODIR)/features | venv . $(VENV) ; python misc/tools/postprocess-designspace.py $@ # instance UFOs from designspace -$(UFODIR)/Inter-%Italic.ufo: $(UFODIR)/Inter-Italic.designspace | venv +$(UFODIR)/Inter%Italic.ufo: $(UFODIR)/Inter-Italic.designspace | venv . $(VENV) ; bash misc/tools/gen-instance-ufo.sh $< $@ -$(UFODIR)/Inter-%.ufo: $(UFODIR)/Inter-Roman.designspace | venv +$(UFODIR)/Inter%.ufo: $(UFODIR)/Inter-Roman.designspace | venv . $(VENV) ; bash misc/tools/gen-instance-ufo.sh $< $@ # designspace & master UFOs (for editing) @@ -54,9 +54,9 @@ build/ufo-editable/%.designspace: $(UFODIR)/%.glyphs $(UFODIR)/features | venv . $(VENV) ; python misc/tools/postprocess-designspace.py --editable $@ # instance UFOs from designspace (for editing) -build/ufo-editable/Inter-%Italic.ufo: build/ufo-editable/Inter-Italic.designspace | venv +build/ufo-editable/Inter%Italic.ufo: build/ufo-editable/Inter-Italic.designspace | venv . $(VENV) ; bash misc/tools/gen-instance-ufo.sh $< $@ -build/ufo-editable/Inter-%.ufo: build/ufo-editable/Inter-Roman.designspace | venv +build/ufo-editable/Inter%.ufo: build/ufo-editable/Inter-Roman.designspace | venv . $(VENV) ; bash misc/tools/gen-instance-ufo.sh $< $@ editable-ufos: build/ufo-editable/.ok @@ -81,19 +81,19 @@ build/ufo-editable/.ok: build/ufo-editable/Inter-Roman.designspace build/ufo-edi build/ufo-editable/Inter-BoldItalic.ufo \ build/ufo-editable/Inter-ExtraBoldItalic.ufo \ \ - build/ufo-editable/Inter-DisplayLight.ufo \ - build/ufo-editable/Inter-DisplayExtraLight.ufo \ - build/ufo-editable/Inter-DisplayMedium.ufo \ - build/ufo-editable/Inter-DisplaySemiBold.ufo \ - build/ufo-editable/Inter-DisplayBold.ufo \ - build/ufo-editable/Inter-DisplayExtraBold.ufo \ + build/ufo-editable/InterDisplay-Light.ufo \ + build/ufo-editable/InterDisplay-ExtraLight.ufo \ + build/ufo-editable/InterDisplay-Medium.ufo \ + build/ufo-editable/InterDisplay-SemiBold.ufo \ + build/ufo-editable/InterDisplay-Bold.ufo \ + build/ufo-editable/InterDisplay-ExtraBold.ufo \ \ - build/ufo-editable/Inter-DisplayLightItalic.ufo \ - build/ufo-editable/Inter-DisplayExtraLightItalic.ufo \ - build/ufo-editable/Inter-DisplayMediumItalic.ufo \ - build/ufo-editable/Inter-DisplaySemiBoldItalic.ufo \ - build/ufo-editable/Inter-DisplayBoldItalic.ufo \ - build/ufo-editable/Inter-DisplayExtraBoldItalic.ufo + build/ufo-editable/InterDisplay-LightItalic.ufo \ + build/ufo-editable/InterDisplay-ExtraLightItalic.ufo \ + build/ufo-editable/InterDisplay-MediumItalic.ufo \ + build/ufo-editable/InterDisplay-SemiBoldItalic.ufo \ + build/ufo-editable/InterDisplay-BoldItalic.ufo \ + build/ufo-editable/InterDisplay-ExtraBoldItalic.ufo @touch $@ @echo "" @@ -119,25 +119,25 @@ build/ufo-editable/.ok: build/ufo-editable/Inter-Roman.designspace build/ufo-edi $(UFODIR)/Inter-BoldItalic.ufo \ $(UFODIR)/Inter-ExtraBoldItalic.ufo \ \ - $(UFODIR)/Inter-DisplayBlack.ufo \ - $(UFODIR)/Inter-Display.ufo \ - $(UFODIR)/Inter-DisplayThin.ufo \ - $(UFODIR)/Inter-DisplayLight.ufo \ - $(UFODIR)/Inter-DisplayExtraLight.ufo \ - $(UFODIR)/Inter-DisplayMedium.ufo \ - $(UFODIR)/Inter-DisplaySemiBold.ufo \ - $(UFODIR)/Inter-DisplayBold.ufo \ - $(UFODIR)/Inter-DisplayExtraBold.ufo \ + $(UFODIR)/InterDisplay-Black.ufo \ + $(UFODIR)/InterDisplay-Regular.ufo \ + $(UFODIR)/InterDisplay-Thin.ufo \ + $(UFODIR)/InterDisplay-Light.ufo \ + $(UFODIR)/InterDisplay-ExtraLight.ufo \ + $(UFODIR)/InterDisplay-Medium.ufo \ + $(UFODIR)/InterDisplay-SemiBold.ufo \ + $(UFODIR)/InterDisplay-Bold.ufo \ + $(UFODIR)/InterDisplay-ExtraBold.ufo \ \ - $(UFODIR)/Inter-DisplayBlackItalic.ufo \ - $(UFODIR)/Inter-DisplayItalic.ufo \ - $(UFODIR)/Inter-DisplayThinItalic.ufo \ - $(UFODIR)/Inter-DisplayLightItalic.ufo \ - $(UFODIR)/Inter-DisplayExtraLightItalic.ufo \ - $(UFODIR)/Inter-DisplayMediumItalic.ufo \ - $(UFODIR)/Inter-DisplaySemiBoldItalic.ufo \ - $(UFODIR)/Inter-DisplayBoldItalic.ufo \ - $(UFODIR)/Inter-DisplayExtraBoldItalic.ufo \ + $(UFODIR)/InterDisplay-BlackItalic.ufo \ + $(UFODIR)/InterDisplay-Italic.ufo \ + $(UFODIR)/InterDisplay-ThinItalic.ufo \ + $(UFODIR)/InterDisplay-LightItalic.ufo \ + $(UFODIR)/InterDisplay-ExtraLightItalic.ufo \ + $(UFODIR)/InterDisplay-MediumItalic.ufo \ + $(UFODIR)/InterDisplay-SemiBoldItalic.ufo \ + $(UFODIR)/InterDisplay-BoldItalic.ufo \ + $(UFODIR)/InterDisplay-ExtraBoldItalic.ufo \ \ $(UFODIR)/Inter-Roman.glyphs \ $(UFODIR)/Inter-Italic.glyphs \ @@ -160,7 +160,7 @@ else FM_ARGS_2 += --no-production-names endif -$(FONTDIR)/static/Inter-Displa%.otf: $(UFODIR)/Inter-Displa%.ufo build/features_data | $(FONTDIR)/static venv +$(FONTDIR)/static/InterDisplay-%.otf: $(UFODIR)/InterDisplay-%.ufo build/features_data | $(FONTDIR)/static venv . $(VENV) ; fontmake -u $< -o otf --output-path $@ $(FM_ARGS_2) . $(VENV) ; python misc/tools/fix-static-display-names.py $@ @@ -168,7 +168,7 @@ $(FONTDIR)/static/%.otf: $(UFODIR)/%.ufo build/features_data | $(FONTDIR)/static . $(VENV) ; fontmake -u $< -o otf --output-path $@ $(FM_ARGS_2) -$(FONTDIR)/static/Inter-Displa%.ttf: $(UFODIR)/Inter-Displa%.ufo build/features_data | $(FONTDIR)/static venv +$(FONTDIR)/static/InterDisplay-%.ttf: $(UFODIR)/InterDisplay-%.ufo build/features_data | $(FONTDIR)/static venv . $(VENV) ; fontmake -u $< -o ttf --output-path $@ $(FM_ARGS_2) . $(VENV) ; python misc/tools/fix-static-display-names.py $@ @@ -243,24 +243,24 @@ $(FONTDIR)/static/Inter.otc: \ $(FONTDIR)/static/Inter-BoldItalic.otf \ $(FONTDIR)/static/Inter-ExtraBold.otf \ $(FONTDIR)/static/Inter-ExtraBoldItalic.otf \ - $(FONTDIR)/static/Inter-DisplayBlack.otf \ - $(FONTDIR)/static/Inter-DisplayBlackItalic.otf \ - $(FONTDIR)/static/Inter-Display.otf \ - $(FONTDIR)/static/Inter-DisplayItalic.otf \ - $(FONTDIR)/static/Inter-DisplayThin.otf \ - $(FONTDIR)/static/Inter-DisplayThinItalic.otf \ - $(FONTDIR)/static/Inter-DisplayLight.otf \ - $(FONTDIR)/static/Inter-DisplayLightItalic.otf \ - $(FONTDIR)/static/Inter-DisplayExtraLight.otf \ - $(FONTDIR)/static/Inter-DisplayExtraLightItalic.otf \ - $(FONTDIR)/static/Inter-DisplayMedium.otf \ - $(FONTDIR)/static/Inter-DisplayMediumItalic.otf \ - $(FONTDIR)/static/Inter-DisplaySemiBold.otf \ - $(FONTDIR)/static/Inter-DisplaySemiBoldItalic.otf \ - $(FONTDIR)/static/Inter-DisplayBold.otf \ - $(FONTDIR)/static/Inter-DisplayBoldItalic.otf \ - $(FONTDIR)/static/Inter-DisplayExtraBold.otf \ - $(FONTDIR)/static/Inter-DisplayExtraBoldItalic.otf + $(FONTDIR)/static/InterDisplay-Black.otf \ + $(FONTDIR)/static/InterDisplay-BlackItalic.otf \ + $(FONTDIR)/static/InterDisplay-Regular.otf \ + $(FONTDIR)/static/InterDisplay-Italic.otf \ + $(FONTDIR)/static/InterDisplay-Thin.otf \ + $(FONTDIR)/static/InterDisplay-ThinItalic.otf \ + $(FONTDIR)/static/InterDisplay-Light.otf \ + $(FONTDIR)/static/InterDisplay-LightItalic.otf \ + $(FONTDIR)/static/InterDisplay-ExtraLight.otf \ + $(FONTDIR)/static/InterDisplay-ExtraLightItalic.otf \ + $(FONTDIR)/static/InterDisplay-Medium.otf \ + $(FONTDIR)/static/InterDisplay-MediumItalic.otf \ + $(FONTDIR)/static/InterDisplay-SemiBold.otf \ + $(FONTDIR)/static/InterDisplay-SemiBoldItalic.otf \ + $(FONTDIR)/static/InterDisplay-Bold.otf \ + $(FONTDIR)/static/InterDisplay-BoldItalic.otf \ + $(FONTDIR)/static/InterDisplay-ExtraBold.otf \ + $(FONTDIR)/static/InterDisplay-ExtraBoldItalic.otf . $(VENV) ; python -m fontTools.ttLib.__init__ -o $@ $^ $(FONTDIR)/static-hinted/Inter.ttc: \ @@ -282,24 +282,24 @@ $(FONTDIR)/static-hinted/Inter.ttc: \ $(FONTDIR)/static-hinted/Inter-BoldItalic.ttf \ $(FONTDIR)/static-hinted/Inter-ExtraBold.ttf \ $(FONTDIR)/static-hinted/Inter-ExtraBoldItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBlack.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBlackItalic.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 \ - $(FONTDIR)/static-hinted/Inter-DisplayLight.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayLightItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraLight.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraLightItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayMedium.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayMediumItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplaySemiBold.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplaySemiBoldItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBold.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBoldItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraBold.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraBoldItalic.ttf + $(FONTDIR)/static-hinted/InterDisplay-Black.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-BlackItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Regular.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Italic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Thin.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ThinItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Light.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-LightItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraLight.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraLightItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Medium.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-MediumItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-SemiBold.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-SemiBoldItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Bold.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-BoldItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraBold.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraBoldItalic.ttf . $(VENV) ; python -m fontTools.ttLib.__init__ -o $@ $^ static_otf: \ @@ -321,24 +321,24 @@ static_otf: \ $(FONTDIR)/static/Inter-BoldItalic.otf \ $(FONTDIR)/static/Inter-ExtraBold.otf \ $(FONTDIR)/static/Inter-ExtraBoldItalic.otf \ - $(FONTDIR)/static/Inter-DisplayBlack.otf \ - $(FONTDIR)/static/Inter-DisplayBlackItalic.otf \ - $(FONTDIR)/static/Inter-Display.otf \ - $(FONTDIR)/static/Inter-DisplayItalic.otf \ - $(FONTDIR)/static/Inter-DisplayThin.otf \ - $(FONTDIR)/static/Inter-DisplayThinItalic.otf \ - $(FONTDIR)/static/Inter-DisplayLight.otf \ - $(FONTDIR)/static/Inter-DisplayLightItalic.otf \ - $(FONTDIR)/static/Inter-DisplayExtraLight.otf \ - $(FONTDIR)/static/Inter-DisplayExtraLightItalic.otf \ - $(FONTDIR)/static/Inter-DisplayMedium.otf \ - $(FONTDIR)/static/Inter-DisplayMediumItalic.otf \ - $(FONTDIR)/static/Inter-DisplaySemiBold.otf \ - $(FONTDIR)/static/Inter-DisplaySemiBoldItalic.otf \ - $(FONTDIR)/static/Inter-DisplayBold.otf \ - $(FONTDIR)/static/Inter-DisplayBoldItalic.otf \ - $(FONTDIR)/static/Inter-DisplayExtraBold.otf \ - $(FONTDIR)/static/Inter-DisplayExtraBoldItalic.otf + $(FONTDIR)/static/InterDisplay-Black.otf \ + $(FONTDIR)/static/InterDisplay-BlackItalic.otf \ + $(FONTDIR)/static/InterDisplay-Regular.otf \ + $(FONTDIR)/static/InterDisplay-Italic.otf \ + $(FONTDIR)/static/InterDisplay-Thin.otf \ + $(FONTDIR)/static/InterDisplay-ThinItalic.otf \ + $(FONTDIR)/static/InterDisplay-Light.otf \ + $(FONTDIR)/static/InterDisplay-LightItalic.otf \ + $(FONTDIR)/static/InterDisplay-ExtraLight.otf \ + $(FONTDIR)/static/InterDisplay-ExtraLightItalic.otf \ + $(FONTDIR)/static/InterDisplay-Medium.otf \ + $(FONTDIR)/static/InterDisplay-MediumItalic.otf \ + $(FONTDIR)/static/InterDisplay-SemiBold.otf \ + $(FONTDIR)/static/InterDisplay-SemiBoldItalic.otf \ + $(FONTDIR)/static/InterDisplay-Bold.otf \ + $(FONTDIR)/static/InterDisplay-BoldItalic.otf \ + $(FONTDIR)/static/InterDisplay-ExtraBold.otf \ + $(FONTDIR)/static/InterDisplay-ExtraBoldItalic.otf static_ttf: \ $(FONTDIR)/static/Inter-Black.ttf \ @@ -359,24 +359,24 @@ static_ttf: \ $(FONTDIR)/static/Inter-BoldItalic.ttf \ $(FONTDIR)/static/Inter-ExtraBold.ttf \ $(FONTDIR)/static/Inter-ExtraBoldItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayBlack.ttf \ - $(FONTDIR)/static/Inter-DisplayBlackItalic.ttf \ - $(FONTDIR)/static/Inter-Display.ttf \ - $(FONTDIR)/static/Inter-DisplayItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayThin.ttf \ - $(FONTDIR)/static/Inter-DisplayThinItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayLight.ttf \ - $(FONTDIR)/static/Inter-DisplayLightItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayExtraLight.ttf \ - $(FONTDIR)/static/Inter-DisplayExtraLightItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayMedium.ttf \ - $(FONTDIR)/static/Inter-DisplayMediumItalic.ttf \ - $(FONTDIR)/static/Inter-DisplaySemiBold.ttf \ - $(FONTDIR)/static/Inter-DisplaySemiBoldItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayBold.ttf \ - $(FONTDIR)/static/Inter-DisplayBoldItalic.ttf \ - $(FONTDIR)/static/Inter-DisplayExtraBold.ttf \ - $(FONTDIR)/static/Inter-DisplayExtraBoldItalic.ttf + $(FONTDIR)/static/InterDisplay-Black.ttf \ + $(FONTDIR)/static/InterDisplay-BlackItalic.ttf \ + $(FONTDIR)/static/InterDisplay-Regular.ttf \ + $(FONTDIR)/static/InterDisplay-Italic.ttf \ + $(FONTDIR)/static/InterDisplay-Thin.ttf \ + $(FONTDIR)/static/InterDisplay-ThinItalic.ttf \ + $(FONTDIR)/static/InterDisplay-Light.ttf \ + $(FONTDIR)/static/InterDisplay-LightItalic.ttf \ + $(FONTDIR)/static/InterDisplay-ExtraLight.ttf \ + $(FONTDIR)/static/InterDisplay-ExtraLightItalic.ttf \ + $(FONTDIR)/static/InterDisplay-Medium.ttf \ + $(FONTDIR)/static/InterDisplay-MediumItalic.ttf \ + $(FONTDIR)/static/InterDisplay-SemiBold.ttf \ + $(FONTDIR)/static/InterDisplay-SemiBoldItalic.ttf \ + $(FONTDIR)/static/InterDisplay-Bold.ttf \ + $(FONTDIR)/static/InterDisplay-BoldItalic.ttf \ + $(FONTDIR)/static/InterDisplay-ExtraBold.ttf \ + $(FONTDIR)/static/InterDisplay-ExtraBoldItalic.ttf static_ttf_hinted: \ $(FONTDIR)/static-hinted/Inter-Black.ttf \ @@ -397,24 +397,24 @@ static_ttf_hinted: \ $(FONTDIR)/static-hinted/Inter-BoldItalic.ttf \ $(FONTDIR)/static-hinted/Inter-ExtraBold.ttf \ $(FONTDIR)/static-hinted/Inter-ExtraBoldItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBlack.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBlackItalic.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 \ - $(FONTDIR)/static-hinted/Inter-DisplayLight.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayLightItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraLight.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraLightItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayMedium.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayMediumItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplaySemiBold.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplaySemiBoldItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBold.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayBoldItalic.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraBold.ttf \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraBoldItalic.ttf + $(FONTDIR)/static-hinted/InterDisplay-Black.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-BlackItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Regular.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Italic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Thin.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ThinItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Light.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-LightItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraLight.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraLightItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Medium.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-MediumItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-SemiBold.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-SemiBoldItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-Bold.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-BoldItalic.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraBold.ttf \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraBoldItalic.ttf static_web: \ $(FONTDIR)/static/Inter-Black.woff2 \ @@ -435,24 +435,24 @@ static_web: \ $(FONTDIR)/static/Inter-BoldItalic.woff2 \ $(FONTDIR)/static/Inter-ExtraBold.woff2 \ $(FONTDIR)/static/Inter-ExtraBoldItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayBlack.woff2 \ - $(FONTDIR)/static/Inter-DisplayBlackItalic.woff2 \ - $(FONTDIR)/static/Inter-Display.woff2 \ - $(FONTDIR)/static/Inter-DisplayItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayThin.woff2 \ - $(FONTDIR)/static/Inter-DisplayThinItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayLight.woff2 \ - $(FONTDIR)/static/Inter-DisplayLightItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayExtraLight.woff2 \ - $(FONTDIR)/static/Inter-DisplayExtraLightItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayMedium.woff2 \ - $(FONTDIR)/static/Inter-DisplayMediumItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplaySemiBold.woff2 \ - $(FONTDIR)/static/Inter-DisplaySemiBoldItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayBold.woff2 \ - $(FONTDIR)/static/Inter-DisplayBoldItalic.woff2 \ - $(FONTDIR)/static/Inter-DisplayExtraBold.woff2 \ - $(FONTDIR)/static/Inter-DisplayExtraBoldItalic.woff2 + $(FONTDIR)/static/InterDisplay-Black.woff2 \ + $(FONTDIR)/static/InterDisplay-BlackItalic.woff2 \ + $(FONTDIR)/static/InterDisplay-Regular.woff2 \ + $(FONTDIR)/static/InterDisplay-Italic.woff2 \ + $(FONTDIR)/static/InterDisplay-Thin.woff2 \ + $(FONTDIR)/static/InterDisplay-ThinItalic.woff2 \ + $(FONTDIR)/static/InterDisplay-Light.woff2 \ + $(FONTDIR)/static/InterDisplay-LightItalic.woff2 \ + $(FONTDIR)/static/InterDisplay-ExtraLight.woff2 \ + $(FONTDIR)/static/InterDisplay-ExtraLightItalic.woff2 \ + $(FONTDIR)/static/InterDisplay-Medium.woff2 \ + $(FONTDIR)/static/InterDisplay-MediumItalic.woff2 \ + $(FONTDIR)/static/InterDisplay-SemiBold.woff2 \ + $(FONTDIR)/static/InterDisplay-SemiBoldItalic.woff2 \ + $(FONTDIR)/static/InterDisplay-Bold.woff2 \ + $(FONTDIR)/static/InterDisplay-BoldItalic.woff2 \ + $(FONTDIR)/static/InterDisplay-ExtraBold.woff2 \ + $(FONTDIR)/static/InterDisplay-ExtraBoldItalic.woff2 static_web_hinted: \ $(FONTDIR)/static-hinted/Inter-Black.woff2 \ @@ -473,27 +473,27 @@ static_web_hinted: \ $(FONTDIR)/static-hinted/Inter-BoldItalic.woff2 \ $(FONTDIR)/static-hinted/Inter-ExtraBold.woff2 \ $(FONTDIR)/static-hinted/Inter-ExtraBoldItalic.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayBlack.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayBlackItalic.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 \ - $(FONTDIR)/static-hinted/Inter-DisplayLight.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayLightItalic.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraLight.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraLightItalic.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayMedium.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayMediumItalic.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplaySemiBold.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplaySemiBoldItalic.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayBold.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayBoldItalic.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraBold.woff2 \ - $(FONTDIR)/static-hinted/Inter-DisplayExtraBoldItalic.woff2 - - -all: var static web static_otf static_ttf static_ttf_hinted static_web_hinted + $(FONTDIR)/static-hinted/InterDisplay-Black.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-BlackItalic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-Regular.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-Italic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-Thin.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-ThinItalic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-Light.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-LightItalic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraLight.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraLightItalic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-Medium.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-MediumItalic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-SemiBold.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-SemiBoldItalic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-Bold.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-BoldItalic.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraBold.woff2 \ + $(FONTDIR)/static-hinted/InterDisplay-ExtraBoldItalic.woff2 + + +all: var static web static_otf static_ttf_hinted static_web_hinted .PHONY: \ all var var_web web \ @@ -687,24 +687,24 @@ ttx_static: \ build/ttx/Inter-BoldItalic.ttx \ build/ttx/Inter-ExtraBold.ttx \ build/ttx/Inter-ExtraBoldItalic.ttx \ - build/ttx/Inter-DisplayBlack.ttx \ - build/ttx/Inter-DisplayBlackItalic.ttx \ - build/ttx/Inter-Display.ttx \ - build/ttx/Inter-DisplayItalic.ttx \ - build/ttx/Inter-DisplayThin.ttx \ - build/ttx/Inter-DisplayThinItalic.ttx \ - build/ttx/Inter-DisplayLight.ttx \ - build/ttx/Inter-DisplayLightItalic.ttx \ - build/ttx/Inter-DisplayExtraLight.ttx \ - build/ttx/Inter-DisplayExtraLightItalic.ttx \ - build/ttx/Inter-DisplayMedium.ttx \ - build/ttx/Inter-DisplayMediumItalic.ttx \ - build/ttx/Inter-DisplaySemiBold.ttx \ - build/ttx/Inter-DisplaySemiBoldItalic.ttx \ - build/ttx/Inter-DisplayBold.ttx \ - build/ttx/Inter-DisplayBoldItalic.ttx \ - build/ttx/Inter-DisplayExtraBold.ttx \ - build/ttx/Inter-DisplayExtraBoldItalic.ttx + build/ttx/InterDisplay-Black.ttx \ + build/ttx/InterDisplay-BlackItalic.ttx \ + build/ttx/InterDisplay-Regular.ttx \ + build/ttx/InterDisplay-Italic.ttx \ + build/ttx/InterDisplay-Thin.ttx \ + build/ttx/InterDisplay-ThinItalic.ttx \ + build/ttx/InterDisplay-Light.ttx \ + build/ttx/InterDisplay-LightItalic.ttx \ + build/ttx/InterDisplay-ExtraLight.ttx \ + build/ttx/InterDisplay-ExtraLightItalic.ttx \ + build/ttx/InterDisplay-Medium.ttx \ + build/ttx/InterDisplay-MediumItalic.ttx \ + build/ttx/InterDisplay-SemiBold.ttx \ + build/ttx/InterDisplay-SemiBoldItalic.ttx \ + build/ttx/InterDisplay-Bold.ttx \ + build/ttx/InterDisplay-BoldItalic.ttx \ + build/ttx/InterDisplay-ExtraBold.ttx \ + build/ttx/InterDisplay-ExtraBoldItalic.ttx .PHONY: ttx_var ttx_var_roman ttx_var_italic ttx_static diff --git a/misc/dist/inter.css b/misc/dist/inter.css index cf5f2f94f..315e633ae 100644 --- a/misc/dist/inter.css +++ b/misc/dist/inter.css @@ -40,21 +40,21 @@ @font-face { font-family: "Inter"; font-style: italic; font-weight: 780; font-display: swap; src: url("Inter-ExtraBoldItalic.woff2?v=3.19") format("woff2"); } @font-face { font-family: "Inter"; font-style: normal; font-weight: 900; font-display: swap; src: url("Inter-Black.woff2?v=3.19") format("woff2"); } @font-face { font-family: "Inter"; font-style: italic; font-weight: 900; font-display: swap; src: url("Inter-BlackItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 100; font-display: swap; src: url("Inter-DisplayThin.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 100; font-display: swap; src: url("Inter-DisplayThinItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 200; font-display: swap; src: url("Inter-DisplayExtraLight.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 200; font-display: swap; src: url("Inter-DisplayExtraLightItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 300; font-display: swap; src: url("Inter-DisplayLight.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 300; font-display: swap; src: url("Inter-DisplayLightItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 400; font-display: swap; src: url("Inter-DisplayRegular.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 400; font-display: swap; src: url("Inter-DisplayItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 500; font-display: swap; src: url("Inter-DisplayMedium.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 500; font-display: swap; src: url("Inter-DisplayMediumItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 580; font-display: swap; src: url("Inter-DisplaySemiBold.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 580; font-display: swap; src: url("Inter-DisplaySemiBoldItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 660; font-display: swap; src: url("Inter-DisplayBold.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 660; font-display: swap; src: url("Inter-DisplayBoldItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 780; font-display: swap; src: url("Inter-DisplayExtraBold.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 780; font-display: swap; src: url("Inter-DisplayExtraBoldItalic.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 900; font-display: swap; src: url("Inter-DisplayBlack.woff2?v=3.19") format("woff2"); } -@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 900; font-display: swap; src: url("Inter-DisplayBlackItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 100; font-display: swap; src: url("InterDisplay-Thin.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 100; font-display: swap; src: url("InterDisplay-ThinItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 200; font-display: swap; src: url("InterDisplay-ExtraLight.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 200; font-display: swap; src: url("InterDisplay-ExtraLightItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 300; font-display: swap; src: url("InterDisplay-Light.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 300; font-display: swap; src: url("InterDisplay-LightItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 400; font-display: swap; src: url("InterDisplay-Regular.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 400; font-display: swap; src: url("InterDisplay-Italic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 500; font-display: swap; src: url("InterDisplay-Medium.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 500; font-display: swap; src: url("InterDisplay-MediumItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 580; font-display: swap; src: url("InterDisplay-SemiBold.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 580; font-display: swap; src: url("InterDisplay-SemiBoldItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 660; font-display: swap; src: url("InterDisplay-Bold.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 660; font-display: swap; src: url("InterDisplay-BoldItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 780; font-display: swap; src: url("InterDisplay-ExtraBold.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 780; font-display: swap; src: url("InterDisplay-ExtraBoldItalic.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: normal; font-weight: 900; font-display: swap; src: url("InterDisplay-Black.woff2?v=3.19") format("woff2"); } +@font-face { font-family: "InterDisplay"; font-style: italic; font-weight: 900; font-display: swap; src: url("InterDisplay-BlackItalic.woff2?v=3.19") format("woff2"); } diff --git a/misc/makezip2.sh b/misc/makezip2.sh index 938d42031..590b43d19 100644 --- a/misc/makezip2.sh +++ b/misc/makezip2.sh @@ -55,7 +55,7 @@ cp misc/dist/help.txt "$ZIPDIR/help.txt" cp build/fonts/static-hinted/Inter.ttc "$ZIPDIR/Inter.ttc" cp build/fonts/var/Inter-Variable.ttf "$ZIPDIR/Inter-Variable.ttf" cp build/fonts/var/Inter-Variable-Italic.ttf "$ZIPDIR/Inter-Variable-Italic.ttf" -cp build/fonts/static/Inter-*.woff2 "$ZIPDIR/web/" & +cp build/fonts/static/Inter*.woff2 "$ZIPDIR/web/" & cp build/fonts/var/Inter-Variable.woff2 "$ZIPDIR/web/InterVariable.woff2" cp build/fonts/var/Inter-Variable-Italic.woff2 "$ZIPDIR/web/InterVariable-Italic.woff2" cp misc/dist/inter.css "$ZIPDIR/web/" @@ -67,9 +67,9 @@ mkdir -p "$ZIPDIR/extras/otf" \ "$ZIPDIR/extras/ttf" \ "$ZIPDIR/extras/woff-hinted" -cp build/fonts/static/Inter-*.otf "$ZIPDIR/extras/otf/" & -cp build/fonts/static-hinted/Inter-*.ttf "$ZIPDIR/extras/ttf/" & -cp build/fonts/static-hinted/Inter-*.woff2 "$ZIPDIR/extras/woff-hinted/" & +cp build/fonts/static/Inter*.otf "$ZIPDIR/extras/otf/" & +cp build/fonts/static-hinted/Inter*.ttf "$ZIPDIR/extras/ttf/" & +cp build/fonts/static-hinted/Inter*.woff2 "$ZIPDIR/extras/woff-hinted/" & diff --git a/misc/tools/gen-instance-ufo.sh b/misc/tools/gen-instance-ufo.sh index c3250af89..8e1041220 100755 --- a/misc/tools/gen-instance-ufo.sh +++ b/misc/tools/gen-instance-ufo.sh @@ -11,13 +11,6 @@ INSTANCE_SemiBold="Inter SemiBold" INSTANCE_Bold="Inter Bold" INSTANCE_ExtraBold="Inter ExtraBold" -INSTANCE_DisplayLight="Inter Display Light" -INSTANCE_DisplayExtraLight="Inter Display ExtraLight" -INSTANCE_DisplayMedium="Inter Display Medium" -INSTANCE_DisplaySemiBold="Inter Display SemiBold" -INSTANCE_DisplayBold="Inter Display Bold" -INSTANCE_DisplayExtraBold="Inter Display ExtraBold" - INSTANCE_LightItalic="Inter Light Italic" INSTANCE_ExtraLightItalic="Inter ExtraLight Italic" INSTANCE_MediumItalic="Inter Medium Italic" @@ -25,12 +18,25 @@ INSTANCE_SemiBoldItalic="Inter SemiBold Italic" INSTANCE_BoldItalic="Inter Bold Italic" INSTANCE_ExtraBoldItalic="Inter ExtraBold Italic" +INSTANCE_DisplayThin="Inter Display Thin" +INSTANCE_DisplayLight="Inter Display Light" +INSTANCE_DisplayExtraLight="Inter Display ExtraLight" +INSTANCE_DisplayRegular="Inter Display Regular" +INSTANCE_DisplayMedium="Inter Display Medium" +INSTANCE_DisplaySemiBold="Inter Display SemiBold" +INSTANCE_DisplayBold="Inter Display Bold" +INSTANCE_DisplayExtraBold="Inter Display ExtraBold" +INSTANCE_DisplayBlack="Inter Display Black" + +INSTANCE_DisplayThinItalic="Inter Display Thin Italic" INSTANCE_DisplayLightItalic="Inter Display Light Italic" INSTANCE_DisplayExtraLightItalic="Inter Display ExtraLight Italic" +INSTANCE_DisplayItalic="Inter Display Italic" INSTANCE_DisplayMediumItalic="Inter Display Medium Italic" INSTANCE_DisplaySemiBoldItalic="Inter Display SemiBold Italic" INSTANCE_DisplayBoldItalic="Inter Display Bold Italic" INSTANCE_DisplayExtraBoldItalic="Inter Display ExtraBold Italic" +INSTANCE_DisplayBlackItalic="Inter Display Black Italic" MASTER_Thin=1 MASTER_Regular=1 @@ -49,7 +55,10 @@ _err() { echo "$PROG: $@" >&2; exit 1; } # build/ufo/Inter-DisplayExtraBold.ufo -> DisplayExtraBold UFO_NAME=$(basename "$UFO" .ufo) -case "$UFO_NAME" in Inter-*) UFO_NAME=${UFO_NAME:6} ;; esac +case "$UFO_NAME" in + Inter-*) UFO_NAME=${UFO_NAME:6} ;; + InterDisplay-*) UFO_NAME=Display${UFO_NAME:13} ;; +esac # DisplayExtraBold -> "Inter Display ExtraBold" INSTANCE=INSTANCE_${UFO_NAME} ; INSTANCE=${!INSTANCE} @@ -59,6 +68,7 @@ INSTANCE=INSTANCE_${UFO_NAME} ; INSTANCE=${!INSTANCE} if [ -z "$INSTANCE" ]; then MASTER=MASTER_${UFO_NAME} [ -n "${!MASTER}" ] || _err "Failed to map UFO name \"$UFO_NAME\" to instance" + [ -d "$UFO" ] || _err "Cannot find master UFO: $UFO" echo "touch $UFO" touch "$UFO" exit diff --git a/misc/tools/postprocess-designspace.py b/misc/tools/postprocess-designspace.py index fbe76a364..9157a57e4 100644 --- a/misc/tools/postprocess-designspace.py +++ b/misc/tools/postprocess-designspace.py @@ -7,7 +7,6 @@ from datetime import datetime sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'tools'))) from common import getGitHash, getVersion -from postprocess_instance_ufo import ufo_set_wws OPT_EDITABLE = False # --editable @@ -45,6 +44,20 @@ def update_version(ufo): ufo.info.openTypeHeadCreated = now.strftime("%Y/%m/%d %H:%M:%S") +def ufo_set_wws(ufo): + # Fix missing WWS entries for Display fonts: + # See https://github.com/googlefonts/glyphsLib/issues/820 + subfamily = ufo.info.styleName + if subfamily.find("Display") == -1: + return + subfamily = subfamily[len("Display"):].strip() + if subfamily == "": + # "Display" -> "Regular" + subfamily = "Regular" + ufo.info.openTypeNameWWSFamilyName = "Inter Display" + ufo.info.openTypeNameWWSSubfamilyName = subfamily + + def fix_opsz_range(designspace): opsz_min = 1000000 opsz_max = 0 diff --git a/misc/tools/postprocess_instance_ufo.py b/misc/tools/postprocess_instance_ufo.py index 8b5b60970..b391503e9 100644 --- a/misc/tools/postprocess_instance_ufo.py +++ b/misc/tools/postprocess_instance_ufo.py @@ -1,19 +1,6 @@ import sys import defcon -def ufo_set_wws(ufo): - # Fix missing WWS entries for Display fonts: - # See https://github.com/googlefonts/glyphsLib/issues/820 - subfamily = ufo.info.styleName - if subfamily.find("Display") == -1: - return - subfamily = subfamily[len("Display"):].strip() - if subfamily == "": - # "Display" -> "Regular" - subfamily = "Regular" - ufo.info.openTypeNameWWSFamilyName = "Inter Display" - ufo.info.openTypeNameWWSSubfamilyName = subfamily - # See https://github.com/rsms/inter/issues/508 # TODO: Remove when https://github.com/googlefonts/glyphsLib/issues/821 is fixed @@ -30,18 +17,8 @@ def fix_fractional_advance_width(ufo): def main(argv): ufo_file = argv[1] - - # TODO: Uncomment when https://github.com/googlefonts/glyphsLib/issues/821 is fixed - # if ufo_file.find("Display") == -1: - # return # skip fonts of "default" family - ufo = defcon.Font(ufo_file) - - if ufo_file.find("Display") != -1: - ufo_set_wws(ufo) - fix_fractional_advance_width(ufo) - ufo.save(ufo_file) 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; -- cgit v1.2.3