archive/inter-font
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates to distribution

Browse source
This commit is contained in:
Rasmus Andersson 2019-10-22 12:34:20 -07:00
parent 0ba7c2b42f
commit ba71122abf
10 changed files with 136 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored
View file

@ -1,3 +1,3 @@
# Use CRLF for line endings in the Windows install "readme" file
misc/dist/install-win.txt text eol=crlf
misc/dist/hinted[[:space:]]vs[[:space:]]unhinted.txt text eol=crlf
misc/dist/about[[:space:]]hinted[[:space:]]fonts.txt text eol=crlf

66
Makefile
View file

@ -66,7 +66,7 @@ all_ufo_masters = $(Thin_ufo_d) \
$(BlackItalic_ufo_d)
# Hinted variable font disabled. See https://github.com/rsms/inter/issues/75
# all_var_hinted: $(FONTDIR)/var-hinted/Inter.var.ttf $(FONTDIR)/var-hinted/Inter.var.woff2
# all_var_hinted: $(FONTDIR)/var-hinted/Inter.var.otf $(FONTDIR)/var-hinted/Inter.var.woff2
# .PHONY: all_var_hinted
.PHONY: all_const all_const_hinted var all_var
@ -89,7 +89,7 @@ build/%.woff: build/%.ttf
ttf2woff -O -t woff "$<" "$@"
# make sure intermediate TTFs are not gc'd by make
.PRECIOUS: build/%.ttf
.PRECIOUS: build/%.ttf build/%.var.otf
@ -155,14 +155,14 @@ $(FONTDIR)/const-hinted/%.ttf: $(FONTDIR)/const/%.ttf
# ttfautohint --fallback-stem-width=256 --no-info "$<" "$@"
# make sure intermediate TTFs are not gc'd by make
.PRECIOUS: $(FONTDIR)/const/%.ttf $(FONTDIR)/const-hinted/%.ttf $(FONTDIR)/var/%.var.ttf
.PRECIOUS: $(FONTDIR)/const/%.ttf $(FONTDIR)/const-hinted/%.ttf $(FONTDIR)/var/%.var.otf
# check var
test_var: all_var
misc/fontbuild checkfont $(FONTDIR)/var/*.ttf $(FONTDIR)/var/*.woff2
misc/fontbuild checkfont $(FONTDIR)/var/*.otf $(FONTDIR)/var/*.woff2
# test runs all tests
# Note: all_check_const is generated by init.sh and runs "fontbuild checkfont"
@ -177,7 +177,7 @@ check:
$(FONTDIR)/const/*.ttf \
$(FONTDIR)/const/*.otf \
$(FONTDIR)/const/*.woff2 \
$(FONTDIR)/var/*.ttf \
$(FONTDIR)/var/*.otf \
$(FONTDIR)/var/*.woff2
@echo "check: all ok"
@ -189,15 +189,18 @@ check:
# samples renders PDF and PNG samples
samples: $(FONTDIR)/samples all_samples_pdf all_samples_png
$(FONTDIR)/samples/%.pdf: $(FONTDIR)/const/%.otf
$(FONTDIR)/samples/%.pdf: $(FONTDIR)/const/%.otf $(FONTDIR)/samples
misc/tools/fontsample/fontsample -o "$@" "$<"
$(FONTDIR)/samples/%.png: $(FONTDIR)/const/%.otf
$(FONTDIR)/samples/%.png: $(FONTDIR)/const/%.otf $(FONTDIR)/samples
misc/tools/fontsample/fontsample -o "$@" "$<"
$(FONTDIR)/samples:
mkdir -p $@
.PHONY: samples
ZD = build/tmp/zip
# intermediate zip target that creates a zip file at build/tmp/a.zip
@ -205,29 +208,38 @@ build/tmp/a.zip:
@rm -rf "$(ZD)"
@rm -f build/tmp/a.zip
@mkdir -p \
"$(ZD)/Inter (web)" \
"$(ZD)/Inter (web hinted)" \
"$(ZD)/Inter (TTF)" \
"$(ZD)/Inter (TTF hinted)" \
"$(ZD)/Inter (TTF variable)" \
"$(ZD)/Inter (OTF)"
"$(ZD)/Inter" \
"$(ZD)/Inter (Hinted, for Windows)" \
"$(ZD)/Inter (Variable)" \
"$(ZD)/Inter (Variable, single axis)" \
"$(ZD)/Inter (Web)" \
"$(ZD)/Inter V (Variable)"
@#
@# copy font files
cp -a $(FONTDIR)/const/*.otf "$(ZD)/Inter/"
@#
cp -a $(FONTDIR)/const/*.woff \
$(FONTDIR)/const/*.woff2 \
$(FONTDIR)/var/*.woff2 "$(ZD)/Inter (web)/"
$(FONTDIR)/var/Inter.var.woff2 \
$(FONTDIR)/var/Inter-italic.var.woff2 \
$(FONTDIR)/var/Inter-roman.var.woff2 \
misc/dist/inter.css \
"$(ZD)/Inter (Web)/"
cp -a $(FONTDIR)/const-hinted/*.woff \
$(FONTDIR)/const-hinted/*.woff2 \
"$(ZD)/Inter (web hinted)/"
cp -a $(FONTDIR)/const/*.ttf "$(ZD)/Inter (TTF)/"
cp -a $(FONTDIR)/const-hinted/*.ttf "$(ZD)/Inter (TTF hinted)/"
cp -a $(FONTDIR)/var/*.ttf "$(ZD)/Inter (TTF variable)/"
cp -a $(FONTDIR)/const/*.otf "$(ZD)/Inter (OTF)/"
$(FONTDIR)/const-hinted/*.ttf \
misc/dist/inter.css \
"misc/dist/about hinted fonts.txt" \
"$(ZD)/Inter (Hinted, for Windows)/"
@#
cp -a $(FONTDIR)/var/Inter.var.otf "$(ZD)/Inter (Variable)/Inter.otf"
cp -a $(FONTDIR)/var/Inter-roman.var.otf "$(ZD)/Inter (Variable, single axis)/Inter-roman.otf"
cp -a $(FONTDIR)/var/Inter-italic.var.otf "$(ZD)/Inter (Variable, single axis)/Inter-italic.otf"
@#
cp -a $(FONTDIR)/var/Inter-V.var.otf "$(ZD)/Inter V (Variable)/Inter-V.otf"
@#
@# copy misc stuff
cp -a misc/dist/inter.css "$(ZD)/Inter (web)/"
cp -a misc/dist/inter.css "$(ZD)/Inter (web hinted)/"
cp -a misc/dist/*.txt "$(ZD)/"
cp -a misc/dist/install*.txt "$(ZD)/"
cp -a LICENSE.txt "$(ZD)/"
@#
@# Add "beta" to Light and Thin filenames.
@ -259,8 +271,6 @@ zip_dist: pre_dist
$(MAKE) check
$(MAKE) ${ZIP_FILE_DIST}
.PHONY: zip zip_dist
# distribution
pre_dist: all
@echo "Creating distribution for version ${VERSION}"
@ -268,10 +278,10 @@ pre_dist: all
then echo "${ZIP_FILE_DIST} already exists. Bump version or remove the zip file to continue." >&2; \
exit 1; \
fi
misc/tools/versionize.py
dist: zip_dist
$(MAKE) -j docs
misc/tools/versionize.py
@echo "——————————————————————————————————————————————————————————————————"
@echo ""
@echo "Next steps:"
@ -285,6 +295,10 @@ dist: zip_dist
@echo ""
@echo "——————————————————————————————————————————————————————————————————"
.PHONY: zip zip_dist pre_dist dist
docs: docs_fonts
$(MAKE) -j docs_info
@ -363,4 +377,4 @@ install: install_otf
clean:
rm -rvf build/tmp build/fonts
.PHONY: all web clean install install_otf install_ttf deploy pre_dist dist geninfo glyphsync
.PHONY: all web clean install install_otf install_ttf

4
docs/_includes/preload-font-files.html
View file

@ -5,5 +5,5 @@ assign url_root = "/" %}{% else %}{%
assign url_root = "/inter/" %}{% endif %}{%
assign font_v = site.data.fontinfo[0].version
%}<link rel="preload" href="{{url_root}}font-files/Inter-roman.var.woff2?v=3.10" as="font" type="font/woff2" crossorigin="anonymous">
<link rel="preload" href="{{url_root}}font-files/Inter-italic.var.woff2?v=3.10" as="font" type="font/woff2" crossorigin="anonymous">
%}<link rel="preload" href="{{url_root}}font-files/Inter-roman.var.woff2?v=3.11" as="font" type="font/woff2" crossorigin="anonymous">
<link rel="preload" href="{{url_root}}font-files/Inter-italic.var.woff2?v=3.11" as="font" type="font/woff2" crossorigin="anonymous">

13
misc/dist/hinted vs unhinted.txt → misc/dist/about hinted fonts.txt vendored
View file

@ -1,9 +1,13 @@
Inter font files comes in two versions:
Inter font files comes in two versions: without TrueType hints
and "hinted"; with TrueType hints.
1. "unhinted" -- Without TrueType hints (the default)
The folder called "Inter (Hinted, for Windows)" contains font files with
ClearType hints. All other folders contains font files without hints.
2. "hinted" -- With TrueType hints
-----------------------------------------------------------------------------
What are hints?
The TrueType hints are used by ClearType on Windows machines where ClearType
@ -14,5 +18,4 @@ Additionally, hints are little computer programs that takes up considerable
disk space, meaning that font files with hints are larger than those without
hints. This might be a consideration when using web fonts.
The hints for Inter are automatically generated by a program called
autohint.
The hints for Inter are automatically generated by a program called autohint.

4
misc/dist/install-linux.txt vendored
View file

@ -7,8 +7,8 @@ differently. These instructions are for the most common Linux distributions:
1. Create a folder called ".fonts" in your home directory.
Example: mkdir -p ~/.fonts
2. Copy the otf files in the "Inter (OTF)" folder into your .fonts directory
Example: cp "Inter (OTF)/*.otf" ~/.fonts/
2. Copy the otf files in the "Inter" folder into your .fonts directory
Example: cp "Inter/*.otf" ~/.fonts/
You may have to restart apps and/or your window server session.

38
misc/dist/install-mac.txt vendored
View file

@ -1,24 +1,24 @@
Installing traditional static/constant font files on macOS:
Installing on macOS:
1. Open the "Inter (OTF)" folder
2. Select all font files
3. Right-click (or ctrl-click) the selected files
and choose "Open with..." → "Font Book"
4. Press the "Install" button
If you get any errors, like Font Book saying there're duplicate fonts,
cancel the installation and instead try the instructions below:
Installing on macOS, manually:
1. Copy the "Inter (OTF)" folder
1. Copy the "Inter" folder
2. Press cmd-shift-G in Finder
3. Enter "~/Library/Fonts" into the dialog that shows up and press RETURN.
4. Paste the "Inter (OTF)" folder.
4. Delete any existing "Inter" files and folders
5. Paste the "Inter" folder
If you have a previous installation of Inter, you should make sure to
remove those fonts files before installing new ones.
See https://github.com/rsms/inter for more information
Installing variable font on macOS:
1. Copy the "Inter.otf" file in the "Inter (Variable)" folder
2. Press cmd-shift-G in Finder
3. Enter "~/Library/Fonts" into the dialog that shows up and press RETURN.
4. Delete any existing "Inter" files and folders
5. Paste the "Inter.otf" file
Note that you can install both the traditional static fonts AND variable fonts
alongside each other: Use the "Inter" and "Inter V (Variable)" folders.
The "Inter V (Variable)" folder contains Inter named "Inter V", avoiding name
conflicts.
Having issues? Are you using an older version of macOS (older than 10.13)?
Then you'll want to install the non-variable fonts (top of this document.)

6
misc/dist/install-win.txt vendored
View file

@ -1,7 +1,7 @@
Installing on Windows 10:
1. Open the "Inter (OTF)" folder
1. Open the "Inter" folder
2. Select all font files
3. Copy and paste the font files to your Desktop
4. Select all the font files on your Desktop
@ -22,7 +22,5 @@ ClearType-hinted fonts
not always a good thing.
If you do prefer to use the version with hints, use the font files in the
folders with "hinted" in their name, like "Inter (TTF hinted)"
"Inter (Hinted, for Windows)" folder instead of "Inter".
See https://github.com/rsms/inter for more information

78
misc/dist/inter.css vendored
View file

@ -3,16 +3,16 @@
font-style: normal;
font-weight: 100;
font-display: swap;
src: url("Inter-Thin-BETA.woff2") format("woff2"),
url("Inter-Thin-BETA.woff") format("woff");
src: url("Inter-Thin-BETA.woff2?v=3.10") format("woff2"),
url("Inter-Thin-BETA.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 100;
font-display: swap;
src: url("Inter-ThinItalic-BETA.woff2") format("woff2"),
url("Inter-ThinItalic-BETA.woff") format("woff");
src: url("Inter-ThinItalic-BETA.woff2?v=3.10") format("woff2"),
url("Inter-ThinItalic-BETA.woff?v=3.10") format("woff");
}
@font-face {
@ -20,16 +20,16 @@
font-style: normal;
font-weight: 200;
font-display: swap;
src: url("Inter-ExtraLight-BETA.woff2") format("woff2"),
url("Inter-ExtraLight-BETA.woff") format("woff");
src: url("Inter-ExtraLight-BETA.woff2?v=3.10") format("woff2"),
url("Inter-ExtraLight-BETA.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 200;
font-display: swap;
src: url("Inter-ExtraLightItalic-BETA.woff2") format("woff2"),
url("Inter-ExtraLightItalic-BETA.woff") format("woff");
src: url("Inter-ExtraLightItalic-BETA.woff2?v=3.10") format("woff2"),
url("Inter-ExtraLightItalic-BETA.woff?v=3.10") format("woff");
}
@font-face {
@ -37,16 +37,16 @@
font-style: normal;
font-weight: 300;
font-display: swap;
src: url("Inter-Light-BETA.woff2") format("woff2"),
url("Inter-Light-BETA.woff") format("woff");
src: url("Inter-Light-BETA.woff2?v=3.10") format("woff2"),
url("Inter-Light-BETA.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 300;
font-display: swap;
src: url("Inter-LightItalic-BETA.woff2") format("woff2"),
url("Inter-LightItalic-BETA.woff") format("woff");
src: url("Inter-LightItalic-BETA.woff2?v=3.10") format("woff2"),
url("Inter-LightItalic-BETA.woff?v=3.10") format("woff");
}
@font-face {
@ -54,16 +54,16 @@
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("Inter-Regular.woff2") format("woff2"),
url("Inter-Regular.woff") format("woff");
src: url("Inter-Regular.woff2?v=3.10") format("woff2"),
url("Inter-Regular.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 400;
font-display: swap;
src: url("Inter-Italic.woff2") format("woff2"),
url("Inter-Italic.woff") format("woff");
src: url("Inter-Italic.woff2?v=3.10") format("woff2"),
url("Inter-Italic.woff?v=3.10") format("woff");
}
@font-face {
@ -71,16 +71,16 @@
font-style: normal;
font-weight: 500;
font-display: swap;
src: url("Inter-Medium.woff2") format("woff2"),
url("Inter-Medium.woff") format("woff");
src: url("Inter-Medium.woff2?v=3.10") format("woff2"),
url("Inter-Medium.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 500;
font-display: swap;
src: url("Inter-MediumItalic.woff2") format("woff2"),
url("Inter-MediumItalic.woff") format("woff");
src: url("Inter-MediumItalic.woff2?v=3.10") format("woff2"),
url("Inter-MediumItalic.woff?v=3.10") format("woff");
}
@font-face {
@ -88,16 +88,16 @@
font-style: normal;
font-weight: 600;
font-display: swap;
src: url("Inter-SemiBold.woff2") format("woff2"),
url("Inter-SemiBold.woff") format("woff");
src: url("Inter-SemiBold.woff2?v=3.10") format("woff2"),
url("Inter-SemiBold.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 600;
font-display: swap;
src: url("Inter-SemiBoldItalic.woff2") format("woff2"),
url("Inter-SemiBoldItalic.woff") format("woff");
src: url("Inter-SemiBoldItalic.woff2?v=3.10") format("woff2"),
url("Inter-SemiBoldItalic.woff?v=3.10") format("woff");
}
@font-face {
@ -105,16 +105,16 @@
font-style: normal;
font-weight: 700;
font-display: swap;
src: url("Inter-Bold.woff2") format("woff2"),
url("Inter-Bold.woff") format("woff");
src: url("Inter-Bold.woff2?v=3.10") format("woff2"),
url("Inter-Bold.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 700;
font-display: swap;
src: url("Inter-BoldItalic.woff2") format("woff2"),
url("Inter-BoldItalic.woff") format("woff");
src: url("Inter-BoldItalic.woff2?v=3.10") format("woff2"),
url("Inter-BoldItalic.woff?v=3.10") format("woff");
}
@font-face {
@ -122,16 +122,16 @@
font-style: normal;
font-weight: 800;
font-display: swap;
src: url("Inter-ExtraBold.woff2") format("woff2"),
url("Inter-ExtraBold.woff") format("woff");
src: url("Inter-ExtraBold.woff2?v=3.10") format("woff2"),
url("Inter-ExtraBold.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 800;
font-display: swap;
src: url("Inter-ExtraBoldItalic.woff2") format("woff2"),
url("Inter-ExtraBoldItalic.woff") format("woff");
src: url("Inter-ExtraBoldItalic.woff2?v=3.10") format("woff2"),
url("Inter-ExtraBoldItalic.woff?v=3.10") format("woff");
}
@font-face {
@ -139,16 +139,16 @@
font-style: normal;
font-weight: 900;
font-display: swap;
src: url("Inter-Black.woff2") format("woff2"),
url("Inter-Black.woff") format("woff");
src: url("Inter-Black.woff2?v=3.10") format("woff2"),
url("Inter-Black.woff?v=3.10") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 900;
font-display: swap;
src: url("Inter-BlackItalic.woff2") format("woff2"),
url("Inter-BlackItalic.woff") format("woff");
src: url("Inter-BlackItalic.woff2?v=3.10") format("woff2"),
url("Inter-BlackItalic.woff?v=3.10") format("woff");
}
/* -------------------------------------------------------
@ -166,7 +166,7 @@ Usage:
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url("Inter-roman.var.woff2") format("woff2");
src: url("Inter-roman.var.woff2?v=3.10") format("woff2");
}
@font-face {
font-family: 'Inter var';
@ -174,7 +174,7 @@ Usage:
font-display: swap;
font-style: italic;
font-named-instance: 'Italic';
src: url("Inter-italic.var.woff2") format("woff2");
src: url("Inter-italic.var.woff2?v=3.10") format("woff2");
}
@ -196,5 +196,5 @@ explicitly, e.g.
font-weight: 100 900;
font-display: swap;
font-style: oblique 0deg 10deg;
src: url("Inter.var.woff2") format("woff2");
src: url("Inter.var.woff2?v=3.10") format("woff2");
}

34
misc/dist/variable.txt vendored
View file

@ -1,23 +1,25 @@
Variable fonts is a new technology still undergoing development.
There are three flavors of variable Inter to choose from:
The directory named "Inter (TTF variable)" contains three files:
- Inter (Variable)
Multi-axis complete family called "Inter"
- Inter.var.otf -- Multi-axis complete family
- Inter-italic.var.otf -- Single-axis italic style with variable weight axis.
- Inter-roman.var.otf -- Single-axis roman style with variable weight axis.
- Inter V (Variable)
Multi-axis complete family called "Inter V"
Apart from the difference in family name, this is the same as the above.
Useful when you want to install traditional constant font files alongside
the variable version.
The "Inter (web)" directory contains WOFF2 versions of these same
font files.
- Inter (Variable, single axis)
Single-axis variable fonts. Only the weight is variable, but not the slant.
These font files are provided only for technical compatibility with systems
that do not support mult-axis variable fonts.
Support for variable fonts is limited as of late 2018, but support
is quickly arriving to web browsers, operating systems and
design application.
Note: Variable fonts is a new technology still undergoing development.
System and application support is emerging but is not perfect.
Multi-axis variable fonts have worse support than single-axis variable fonts,
so in case you are experiencing issue with the multi-axis font, try the
two single-axis variable fonts instead.
The "Inter (Web)" directory contains WOFF2 files of both the multi-axis and
single-axis variable font files.
If you're in doubt or uncertain about variable fonts, then you
probably don't need to use a variable font, and you can ignore
files which name contains ".var"
If you're in doubt or uncertain about variable fonts, then you probably don't
need to use a variable font. Install the fonts in the "Inter" folder instead.

5
misc/tools/versionize.py
View file

@ -32,6 +32,9 @@ def updateHTMLFile(filename):
f.write(s)
updateCSSFile(pjoin(BASEDIR, 'misc', 'dist', 'inter.css'))
updateHTMLFile(pjoin(BASEDIR, 'docs', '_includes', 'preload-font-files.html'))
# Note: The website CSS file uses Jekyll variables to add ?v= so don't need this anymore.
# updateCSSFile(pjoin(BASEDIR, 'docs', 'inter.css'))
# updateCSSFile(pjoin(BASEDIR, 'docs', 'inter-ui.css'))
updateHTMLFile(pjoin(BASEDIR, 'docs', '_includes', 'preload-font-files.html'))