diff --git a/Makefile b/Makefile index 4c8125aec..5bdbb0ce9 100644 --- a/Makefile +++ b/Makefile @@ -83,36 +83,51 @@ build/%.woff: build/%.ttf # Master UFO -> OTF, TTF -all_ufo_masters = $(Regular_ufo_d) $(Black_ufo_d) $(Italic_ufo_d) $(BlackItalic_ufo_d) +all_ufo_masters = $(Thin_ufo_d) \ + $(ThinItalic_ufo_d) \ + $(Regular_ufo_d) \ + $(Italic_ufo_d) \ + $(Black_ufo_d) \ + $(BlackItalic_ufo_d) $(FONTDIR)/var/%.var.ttf: src/%.designspace $(all_ufo_masters) misc/fontbuild compile-var -o $@ $< +$(FONTDIR)/const/Inter-UI-Thin.%: src/Inter-UI.designspace $(Thin_ufo_d) + misc/fontbuild compile -o $@ src/Inter-UI-Thin.ufo + +$(FONTDIR)/const/Inter-UI-ThinItalic.%: src/Inter-UI.designspace $(ThinItalic_ufo_d) + misc/fontbuild compile -o $@ src/Inter-UI-ThinItalic.ufo + $(FONTDIR)/const/Inter-UI-Regular.%: src/Inter-UI.designspace $(Regular_ufo_d) misc/fontbuild compile -o $@ src/Inter-UI-Regular.ufo -$(FONTDIR)/const/Inter-UI-Black.%: src/Inter-UI.designspace $(Black_ufo_d) - misc/fontbuild compile -o $@ src/Inter-UI-Black.ufo - $(FONTDIR)/const/Inter-UI-Italic.%: src/Inter-UI.designspace $(Italic_ufo_d) misc/fontbuild compile -o $@ src/Inter-UI-Italic.ufo +$(FONTDIR)/const/Inter-UI-Black.%: src/Inter-UI.designspace $(Black_ufo_d) + misc/fontbuild compile -o $@ src/Inter-UI-Black.ufo + $(FONTDIR)/const/Inter-UI-BlackItalic.%: src/Inter-UI.designspace $(BlackItalic_ufo_d) misc/fontbuild compile -o $@ src/Inter-UI-BlackItalic.ufo # Instance UFO -> OTF, TTF -$(FONTDIR)/const/Inter-UI-%.otf: build/ufo/Inter-UI-%.ufo src/Inter-UI.designspace $(all_ufo_masters) +$(FONTDIR)/const/Inter-UI-%.otf: build/ufo/Inter-UI-%.ufo misc/fontbuild compile -o $@ $< -$(FONTDIR)/const/Inter-UI-%.ttf: build/ufo/Inter-UI-%.ufo src/Inter-UI.designspace $(all_ufo_masters) +$(FONTDIR)/const/Inter-UI-%.ttf: build/ufo/Inter-UI-%.ufo misc/fontbuild compile -o $@ $< # designspace <- glyphs file +src/Inter-UI-*.designspace: src/Inter-UI.designspace src/Inter-UI.designspace: src/Inter-UI.glyphs misc/fontbuild glyphsync $< +# make sure intermediate files are not gc'd by make +.PRECIOUS: src/Inter-UI-*.designspace + designspace: src/Inter-UI.designspace .PHONY: designspace @@ -121,7 +136,7 @@ src/Inter-UI.glyphs: @true # instance UFOs <- master UFOs -build/ufo/Inter-UI-%.ufo: src/Inter-UI.designspace $(Regular_ufo_d) $(Black_ufo_d) +build/ufo/Inter-UI-%.ufo: src/Inter-UI.designspace $(all_ufo_masters) misc/fontbuild instancegen src/Inter-UI.designspace $* # make sure intermediate UFOs are not gc'd by make diff --git a/docs/lab/index.html b/docs/lab/index.html index 8fd1b9339..1e9fc0c9c 100644 --- a/docs/lab/index.html +++ b/docs/lab/index.html @@ -997,6 +997,36 @@ for (const ch of uniqueChars) { /* Roboto for comparison */ @import url('https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i,700,700i,900,900i&subset=cyrillic,cyrillic-ext,greek,greek-ext,latin-ext,vietnamese'); +@font-face { + font-family: 'Inter-UI-VERSION'; + font-style: normal; + font-weight: 100; + src: url("fonts/const/Inter-UI-Thin.woff2") format("woff2"), + url("fonts/const/Inter-UI-Thin.woff") format("woff"); +} +@font-face { + font-family: 'Inter-UI-VERSION'; + font-style: italic; + font-weight: 100; + src: url("fonts/const/Inter-UI-ThinItalic.woff2") format("woff2"), + url("fonts/const/Inter-UI-ThinItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter-UI-VERSION'; + font-style: normal; + font-weight: 300; + src: url("fonts/const/Inter-UI-Light.woff2") format("woff2"), + url("fonts/const/Inter-UI-Light.woff") format("woff"); +} +@font-face { + font-family: 'Inter-UI-VERSION'; + font-style: italic; + font-weight: 300; + src: url("fonts/const/Inter-UI-LightItalic.woff2") format("woff2"), + url("fonts/const/Inter-UI-LightItalic.woff") format("woff"); +} + @font-face { font-family: 'Inter-UI-VERSION'; font-style: normal; @@ -1089,7 +1119,7 @@ for (const ch of uniqueChars) { @font-face { font-family: 'Inter-UI-var-VERSION'; - font-weight: 400 900; + font-weight: 100 900; font-style: oblique 0deg 10deg; src: url('fonts/var/Inter-UI.var.woff2') format("woff2-variations"); } @@ -1253,8 +1283,8 @@ document.head.appendChild(fontCSS)