Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make: add googlefonts target #678

Merged
merged 4 commits into from
May 15, 2024
+814 −708
Merged

make: add googlefonts target #678

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a65452
make: add googlefonts target
m4rc1e Feb 6, 2024
ec3c759
implement Rasmus feedback
m4rc1e Mar 26, 2024
ad0c3d2
make: ensure venv is activated before running gftools
m4rc1e May 15, 2024
9c5b1e0
Upgrade gftools
m4rc1e May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@ var: \
$(FONTDIR)/var/InterVariable.ttf \
$(FONTDIR)/var/InterVariable-Italic.ttf

googlefonts: var
gftools fix-family $(FONTDIR)/var/*.ttf \
m4rc1e marked this conversation as resolved.
Show resolved Hide resolved
--rename-family "Inter" \
--include-source-fixes \
-o $(FONTDIR)/googlefonts;
python -m gftools.fontsetter $(FONTDIR)/googlefonts/Inter[opsz,wght].ttf src/googlefonts-fixes.yaml -o $(FONTDIR)/googlefonts/Inter[opsz,wght].ttf;
python -m gftools.fontsetter $(FONTDIR)/googlefonts/Inter-Italic[opsz,wght].ttf src/googlefonts-fixes.yaml -o $(FONTDIR)/googlefonts/Inter-Italic[opsz,wght].ttf;

var_web: \
$(FONTDIR)/var/InterVariable.woff2 \
$(FONTDIR)/var/InterVariable-Italic.woff2
Expand Down Expand Up @@ -297,7 +305,7 @@ static_otf: $(STATIC_FONTS_OTF)
static_ttf: $(STATIC_FONTS_TTF)
static_web: $(STATIC_FONTS_WEB)

all: var static web static_otf
all: var googlefonts static web static_otf

.PHONY: \
all var var_web web \
Expand Down
4 changes: 2 additions & 2 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ ufo2ft = "==2.30.0"
fontmake = "==3.5.*"
fontbakery = "==0.10.4"
skia-pathops = "==0.8.*"
gftools = "==0.9.*"
gftools = "*"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please pin the version to whatever GF requires.
Accepting "any version" can break CI (it has happened in the past)

glyphspkg = "==0.1.*"
brotli = "==1.0.*"
psautohint = "==2.4.*"

[dev-packages]

# Mainly due to https://pypi.org/project/fonttools/
# > FontTools requires Python 3.8 or later. We try to follow the same schedule
# > of minimum Python version support as NumPy (see NEP 29).

[requires]
python_version = "3.8"
Loading