diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dist/hinted vs unhinted.txt | 4 | ||||
| -rw-r--r-- | misc/dist/install-mac.txt | 8 | ||||
| -rw-r--r-- | misc/dist/install-win.txt | 14 | ||||
| -rw-r--r-- | misc/dist/inter-ui.css | 192 | ||||
| -rw-r--r-- | misc/dist/inter.css | 184 | ||||
| -rw-r--r-- | misc/dist/variable.txt | 10 | ||||
| -rwxr-xr-x | misc/docker/build.sh | 2 | ||||
| -rwxr-xr-x | misc/fontbuild | 21 | ||||
| -rwxr-xr-x | misc/tools/versionize.py | 6 | ||||
| -rwxr-xr-x | misc/vm | 6 |
10 files changed, 221 insertions, 226 deletions
diff --git a/misc/dist/hinted vs unhinted.txt b/misc/dist/hinted vs unhinted.txt index 638b340d0..3df90acbd 100644 --- a/misc/dist/hinted vs unhinted.txt +++ b/misc/dist/hinted vs unhinted.txt @@ -1,5 +1,5 @@ -Inter UI font files comes in two versions: +Inter font files comes in two versions: 1. "unhinted" -- Without TrueType hints (the default) @@ -14,5 +14,5 @@ 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 UI are automatically generated by a program called +The hints for Inter are automatically generated by a program called autohint. diff --git a/misc/dist/install-mac.txt b/misc/dist/install-mac.txt index 1fbb64c67..877c5e3d5 100644 --- a/misc/dist/install-mac.txt +++ b/misc/dist/install-mac.txt @@ -1,7 +1,7 @@ Installing on macOS: -1. Open the "Inter UI (OTF)" folder +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" @@ -13,12 +13,12 @@ cancel the installation and instead try the instructions below: Installing on macOS, manually: -1. Copy the "Inter UI (OTF)" folder +1. Copy the "Inter (OTF)" 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 UI (OTF)" folder. +4. Paste the "Inter (OTF)" folder. -If you have a previous installation of Inter UI, you should make sure to +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 diff --git a/misc/dist/install-win.txt b/misc/dist/install-win.txt index 9bff45889..1a227aa06 100644 --- a/misc/dist/install-win.txt +++ b/misc/dist/install-win.txt @@ -1,7 +1,7 @@ Installing on Windows 10: -1. Open the "Inter UI (OTF)" folder +1. Open the "Inter (OTF)" folder 2. Select all font files 3. Right-click the selected files and choose "Install" @@ -9,24 +9,24 @@ Installing on Windows 10: Installing on Windows 10, manually: 1. Double-click the downloaded zip file -2. Copy the "Inter UI (OTF)" folder +2. Copy the "Inter (OTF)" folder 3. Press Win-Q on your keyboard, then type "fonts" and hit ENTER -4. Paste the "Inter UI (OTF)" folder. +4. Paste the "Inter (OTF)" folder. -If you have a previous installation of Inter UI, you should make sure +If you have a previous installation of Inter, you should make sure to remove those fonts files before installing new ones. ClearType-hinted fonts - Inter UI also comes with a version that has TrueType hints used by ClearType + Inter also comes with a version that has TrueType hints used by ClearType on Windows. This changes the appearance of the fonts when rendered on a system with ClearType enabled and can in some cases increase the legibility - of text. However, the hints for Inter UI are automatically generated and are + of text. However, the hints for Inter are automatically generated and are 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 UI (TTF hinted)" + folders with "hinted" in their name, like "Inter (TTF hinted)" See https://github.com/rsms/inter for more information diff --git a/misc/dist/inter-ui.css b/misc/dist/inter-ui.css deleted file mode 100644 index bdb6d40fb..000000000 --- a/misc/dist/inter-ui.css +++ /dev/null @@ -1,192 +0,0 @@ -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 100; - src: url("Inter-UI-Thin-BETA.woff2") format("woff2"), - url("Inter-UI-Thin-BETA.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 100; - src: url("Inter-UI-ThinItalic-BETA.woff2") format("woff2"), - url("Inter-UI-ThinItalic-BETA.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 200; - src: url("Inter-UI-ExtraLight-BETA.woff2") format("woff2"), - url("Inter-UI-ExtraLight-BETA.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 200; - src: url("Inter-UI-ExtraLightItalic-BETA.woff2") format("woff2"), - url("Inter-UI-ExtraLightItalic-BETA.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 300; - src: url("Inter-UI-Light-BETA.woff2") format("woff2"), - url("Inter-UI-Light-BETA.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 300; - src: url("Inter-UI-LightItalic-BETA.woff2") format("woff2"), - url("Inter-UI-LightItalic-BETA.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 400; - src: url("Inter-UI-Regular.woff2") format("woff2"), - url("Inter-UI-Regular.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 400; - src: url("Inter-UI-Italic.woff2") format("woff2"), - url("Inter-UI-Italic.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 500; - src: url("Inter-UI-Medium.woff2") format("woff2"), - url("Inter-UI-Medium.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 500; - src: url("Inter-UI-MediumItalic.woff2") format("woff2"), - url("Inter-UI-MediumItalic.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 600; - src: url("Inter-UI-SemiBold.woff2") format("woff2"), - url("Inter-UI-SemiBold.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 600; - src: url("Inter-UI-SemiBoldItalic.woff2") format("woff2"), - url("Inter-UI-SemiBoldItalic.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 700; - src: url("Inter-UI-Bold.woff2") format("woff2"), - url("Inter-UI-Bold.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 700; - src: url("Inter-UI-BoldItalic.woff2") format("woff2"), - url("Inter-UI-BoldItalic.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 800; - src: url("Inter-UI-ExtraBold.woff2") format("woff2"), - url("Inter-UI-ExtraBold.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 800; - src: url("Inter-UI-ExtraBoldItalic.woff2") format("woff2"), - url("Inter-UI-ExtraBoldItalic.woff") format("woff"); -} - -@font-face { - font-family: 'Inter UI'; - font-style: normal; - font-weight: 900; - src: url("Inter-UI-Black.woff2") format("woff2"), - url("Inter-UI-Black.woff") format("woff"); -} -@font-face { - font-family: 'Inter UI'; - font-style: italic; - font-weight: 900; - src: url("Inter-UI-BlackItalic.woff2") format("woff2"), - url("Inter-UI-BlackItalic.woff") format("woff"); -} - -/* -------------------------------------------------------------------------- -Single variable font. - -Note that you may want to do something like this to make sure you're serving -constant fonts to older browsers: -html { - font-family: 'Inter UI', sans-serif; -} -@supports (font-variation-settings: normal) { - html { - font-family: 'Inter UI var', sans-serif; - } -} - -BUGS: -- Safari 12.0 will default to italic instead of regular when font-weight - is provided in a @font-face declaration. - Workaround: Use "Inter UI var alt" for Safari, or explicitly set - `font-variation-settings:"slnt" DEGREE`. -*/ -@font-face { - font-family: 'Inter UI var'; - font-weight: 100 900; - font-style: oblique 0deg 10deg; - src: url("Inter-UI.var.woff2") format("woff2-variations"), - url("Inter-UI.var.woff2") format("woff2"); -} - -/* -------------------------------------------------------------------------- - -"Inter UI var alt" is recommended for Safari and Edge, for reliable italics. - -@supports (font-variation-settings: normal) { - html { - font-family: 'Inter UI var alt', sans-serif; - } -} - -*/ -@font-face { - font-family: 'Inter UI var alt'; - font-weight: 100 900; - font-style: normal; - font-named-instance: 'Regular'; - src: url("Inter-UI-upright.var.woff2") format("woff2 supports variations(gvar)"), - url("Inter-UI-upright.var.woff2") format("woff2-variations"), - url("Inter-UI-upright.var.woff2") format("woff2"); -} -@font-face { - font-family: 'Inter UI var alt'; - font-weight: 100 900; - font-style: italic; - font-named-instance: 'Italic'; - src: url("Inter-UI-italic.var.woff2") format("woff2 supports variations(gvar)"), - url("Inter-UI-italic.var.woff2") format("woff2-variations"), - url("Inter-UI-italic.var.woff2") format("woff2"); -} diff --git a/misc/dist/inter.css b/misc/dist/inter.css new file mode 100644 index 000000000..235dfeaf9 --- /dev/null +++ b/misc/dist/inter.css @@ -0,0 +1,184 @@ +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 100; + src: url("Inter-Thin.woff2") format("woff2"), + url("Inter-Thin.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 100; + src: url("Inter-ThinItalic.woff2") format("woff2"), + url("Inter-ThinItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 200; + src: url("Inter-ExtraLight.woff2") format("woff2"), + url("Inter-ExtraLight.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 200; + src: url("Inter-ExtraLightItalic.woff2") format("woff2"), + url("Inter-ExtraLightItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 300; + src: url("Inter-Light.woff2") format("woff2"), + url("Inter-Light.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 300; + src: url("Inter-LightItalic.woff2") format("woff2"), + url("Inter-LightItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 400; + src: url("Inter-Regular.woff2") format("woff2"), + url("Inter-Regular.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 400; + src: url("Inter-Italic.woff2") format("woff2"), + url("Inter-Italic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 500; + src: url("Inter-Medium.woff2") format("woff2"), + url("Inter-Medium.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 500; + src: url("Inter-MediumItalic.woff2") format("woff2"), + url("Inter-MediumItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 600; + src: url("Inter-SemiBold.woff2") format("woff2"), + url("Inter-SemiBold.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 600; + src: url("Inter-SemiBoldItalic.woff2") format("woff2"), + url("Inter-SemiBoldItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 700; + src: url("Inter-Bold.woff2") format("woff2"), + url("Inter-Bold.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 700; + src: url("Inter-BoldItalic.woff2") format("woff2"), + url("Inter-BoldItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 800; + src: url("Inter-ExtraBold.woff2") format("woff2"), + url("Inter-ExtraBold.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 800; + src: url("Inter-ExtraBoldItalic.woff2") format("woff2"), + url("Inter-ExtraBoldItalic.woff") format("woff"); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 900; + src: url("Inter-Black.woff2") format("woff2"), + url("Inter-Black.woff") format("woff"); +} +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 900; + src: url("Inter-BlackItalic.woff2") format("woff2"), + url("Inter-BlackItalic.woff") format("woff"); +} + +/* ------------------------------------------------------- +Variable font. +Usage: + + html { font-family: 'Inter', sans-serif; } + @supports (font-variation-settings: normal) { + html { font-family: 'Inter var', sans-serif; } + } +*/ +@font-face { + font-family: 'Inter var'; + font-weight: 100 900; + font-style: normal; + font-named-instance: 'Regular'; + src: url("Inter-upright.var.woff2") format("woff2 supports variations(gvar)"), + url("Inter-upright.var.woff2") format("woff2-variations"), + url("Inter-upright.var.woff2") format("woff2"); +} +@font-face { + font-family: 'Inter var'; + font-weight: 100 900; + font-style: italic; + font-named-instance: 'Italic'; + src: url("Inter-italic.var.woff2") format("woff2 supports variations(gvar)"), + url("Inter-italic.var.woff2") format("woff2-variations"), + url("Inter-italic.var.woff2") format("woff2"); +} + + +/* -------------------------------------------------------------------------- +[EXPERIMENTAL] Multi-axis, single variable font. + +Slant axis is not yet widely supported (as of February 2019) and thus this +multi-axis single variable font is opt-in rather than the default. + +When using this, you will probably need to set font-variation-settings +explicitly, e.g. + + * { font-variation-settings: "slnt" 0deg } + .italic { font-variation-settings: "slnt" 10deg } + +*/ +@font-face { + font-family: 'Inter var experimental'; + font-weight: 100 900; + font-style: oblique 0deg 10deg; + src: url("Inter.var.woff2") format("woff2-variations"), + url("Inter.var.woff2") format("woff2"); +} diff --git a/misc/dist/variable.txt b/misc/dist/variable.txt index c2a3b5cb2..2f79e19b1 100644 --- a/misc/dist/variable.txt +++ b/misc/dist/variable.txt @@ -1,13 +1,13 @@ Variable fonts is a new technology still undergoing development. -The directory named "Inter UI (TTF variable)" contains three files: +The directory named "Inter (TTF variable)" contains three files: -- Inter-UI.var.ttf -- multi-axis complete family -- Inter-UI-italic.var.ttf -- italic-only with variable weight axis. -- Inter-UI-upright.var.ttf-- upright-only with variable weight axis. +- Inter.var.ttf -- multi-axis complete family +- Inter-italic.var.ttf -- italic-only with variable weight axis. +- Inter-upright.var.ttf-- upright-only with variable weight axis. -The "Inter UI (web)" directory contains WOFF2 versions of these same +The "Inter (web)" directory contains WOFF2 versions of these same font files. Support for variable fonts is limited as of late 2018, but support diff --git a/misc/docker/build.sh b/misc/docker/build.sh index d0d1bdfbe..159e9677b 100755 --- a/misc/docker/build.sh +++ b/misc/docker/build.sh @@ -8,7 +8,7 @@ DOCKER_DIR=$(pwd) cd ../.. ROOT_DIR=$(pwd) -IMAGE_NAME=rsms/inter-ui-build +IMAGE_NAME=rsms/inter-build BUILD_DIR=$ROOT_DIR/build/docker # setup build dir diff --git a/misc/fontbuild b/misc/fontbuild index 586285a3d..9c3b09c23 100755 --- a/misc/fontbuild +++ b/misc/fontbuild @@ -207,7 +207,7 @@ def setFontInfo(font, weight): # For OpenType NAME table IDs, see # https://docs.microsoft.com/en-us/typography/opentype/spec/name#name-ids # - family = font.info.familyName # i.e. "Inter UI" + family = font.info.familyName # i.e. "Inter" style = font.info.styleName # e.g. "Medium Italic" # Update italicAngle @@ -596,7 +596,7 @@ class Main(object): # files master_dir = outdir glyphsfile = args.glyphsfile - designspace_file = pjoin(outdir, 'Inter-UI.designspace') + designspace_file = pjoin(outdir, 'Inter.designspace') instance_dir = pjoin(BASEDIR, 'build', 'ufo') # load glyphs project file @@ -622,29 +622,29 @@ class Main(object): for source in designspace.sources: # source : fontTools.designspaceLib.SourceDescriptor # source.font : defcon.objects.font.Font - ufo_path = pjoin(master_dir, source.filename.replace('InterUI', 'Inter-UI')) + ufo_path = pjoin(master_dir, source.filename) # no need to also set the relative 'filename' attribute as that # will be auto-updated on writing the designspace document if source.styleName == "Italic Italic": # Workaround for Glyphs limitation # (Base italic master can't be called just Italic, so it's called # "Italic Italic" which is converted here to just "Italic") - ufo_path = pjoin(master_dir, 'Inter-UI-Italic.ufo') + ufo_path = pjoin(master_dir, 'Inter-Italic.ufo') source.styleName = "Italic" source.name = "italic" source.font.info.styleName = source.styleName elif source.styleName == "Black Italic Italic": - ufo_path = pjoin(master_dir, 'Inter-UI-BlackItalic.ufo') + ufo_path = pjoin(master_dir, 'Inter-BlackItalic.ufo') source.styleName = "Black Italic" source.name = "blackitalic" source.font.info.styleName = source.styleName elif source.styleName == "Thin Italic Italic": - ufo_path = pjoin(master_dir, 'Inter-UI-ThinItalic.ufo') + ufo_path = pjoin(master_dir, 'Inter-ThinItalic.ufo') source.styleName = "Thin Italic" source.name = "thinitalic" source.font.info.styleName = source.styleName else: - # name "Inter UI Black" => "black" + # name "Black" => "black" source.name = source.styleName.lower().replace(' ', '') source.path = ufo_path @@ -659,15 +659,14 @@ class Main(object): # patch instance names for instance in designspace.instances: - # name "Inter UI Black Italic" => "blackitalic" + # name "Black Italic" => "blackitalic" instance.name = instance.styleName.lower().replace(' ', '') - instance.filename = instance.filename.replace('InterUI', 'Inter-UI') self.log("write %s" % relpath(designspace_file, os.getcwd())) designspace.write(designspace_file) # upright designspace - upright_designspace_file = pjoin(outdir, 'Inter-UI-upright.designspace') + upright_designspace_file = pjoin(outdir, 'Inter-upright.designspace') p = Process( target=self._genSubsetDesignSpace, args=(designspace, 'upright', upright_designspace_file) @@ -676,7 +675,7 @@ class Main(object): procs.append(p) # italic designspace - italic_designspace_file = pjoin(outdir, 'Inter-UI-italic.designspace') + italic_designspace_file = pjoin(outdir, 'Inter-italic.designspace') p = Process( target=self._genSubsetDesignSpace, args=(designspace, 'italic', italic_designspace_file) diff --git a/misc/tools/versionize.py b/misc/tools/versionize.py index 6064294e6..304ba4242 100755 --- a/misc/tools/versionize.py +++ b/misc/tools/versionize.py @@ -1,7 +1,10 @@ #!/usr/bin/env python # encoding: utf8 # -# Updates the "?v=x" in docs/inter-ui.css +# Updates the "?v=x" in files: +# - docs/inter.css +# - docs/inter-ui.css +# - docs/_includes/preload-font-files.html # import os, sys, re from os.path import dirname, basename, abspath, relpath, join as pjoin @@ -29,5 +32,6 @@ def updateHTMLFile(filename): f.write(s) +updateCSSFile(pjoin(BASEDIR, 'docs', 'inter.css')) updateCSSFile(pjoin(BASEDIR, 'docs', 'inter-ui.css')) updateHTMLFile(pjoin(BASEDIR, 'docs', '_includes', 'preload-font-files.html')) @@ -1,7 +1,7 @@ #!/bin/bash -e # # Invokes provided arguments in a prebuilt docker image that contains -# the Inter UI toolchain. +# the Inter toolchain. # cd "$(dirname "$0")/.." @@ -10,10 +10,10 @@ if [[ "$1" == "--no-tty" ]]; then RUN_ARGS=-i shift elif [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]]; then - echo "Run Inter UI build environment virtual machine using docker." >&2 + echo "Run Inter build environment virtual machine using docker." >&2 echo "usage: $0 [--no-tty] [<arg> ...]" >&2 echo "--no-tty Do not run with TTY input device emulation (useful for scripting)" >&2 exit 1 fi -docker run --rm $RUN_ARGS -v "$PWD:/host" rsms/inter-ui-build:latest "$@" +docker run --rm $RUN_ARGS -v "$PWD:/host" rsms/inter-build:latest "$@" |