From a521315959ee183f0c1195149335a0720edc403f Mon Sep 17 00:00:00 2001 From: Rasmus Andersson Date: Sun, 19 Nov 2023 16:05:56 -0800 Subject: website: v4.0 --- docs/Makefile | 14 +- docs/_data/faq.yml | 4 +- docs/_data/fontinfo.json | 14 +- docs/_layouts/default.html | 4 +- docs/_scripts/build-fontkit.js.sh | 4 +- docs/download/index.html | 11 +- docs/font-files/Inter-Black.woff2 | Bin 108652 -> 108384 bytes docs/font-files/Inter-BlackItalic.woff2 | Bin 115772 -> 115596 bytes docs/font-files/Inter-Bold.woff2 | Bin 111312 -> 111596 bytes docs/font-files/Inter-BoldItalic.woff2 | Bin 118524 -> 118316 bytes docs/font-files/Inter-ExtraBold.woff2 | Bin 111896 -> 111484 bytes docs/font-files/Inter-ExtraBoldItalic.woff2 | Bin 118764 -> 118592 bytes docs/font-files/Inter-ExtraLight.woff2 | Bin 110056 -> 110064 bytes docs/font-files/Inter-ExtraLightItalic.woff2 | Bin 116328 -> 116384 bytes docs/font-files/Inter-Italic.woff2 | Bin 114916 -> 114680 bytes docs/font-files/Inter-Light.woff2 | Bin 110220 -> 110520 bytes docs/font-files/Inter-LightItalic.woff2 | Bin 116728 -> 116296 bytes docs/font-files/Inter-Medium.woff2 | Bin 111644 -> 111680 bytes docs/font-files/Inter-MediumItalic.woff2 | Bin 118372 -> 118392 bytes docs/font-files/Inter-Regular.woff2 | Bin 108492 -> 108764 bytes docs/font-files/Inter-SemiBold.woff2 | Bin 111876 -> 111760 bytes docs/font-files/Inter-SemiBoldItalic.woff2 | Bin 118312 -> 118172 bytes docs/font-files/Inter-Thin.woff2 | Bin 107060 -> 106780 bytes docs/font-files/Inter-ThinItalic.woff2 | Bin 113824 -> 113416 bytes docs/font-files/Inter-Variable-Italic.woff2 | Bin 381940 -> 0 bytes docs/font-files/Inter-Variable.ttf | Bin 875552 -> 0 bytes docs/font-files/Inter-Variable.woff2 | Bin 347408 -> 0 bytes docs/font-files/InterDisplay-Black.woff2 | Bin 107060 -> 107088 bytes docs/font-files/InterDisplay-BlackItalic.woff2 | Bin 114240 -> 114004 bytes docs/font-files/InterDisplay-Bold.woff2 | Bin 110032 -> 109936 bytes docs/font-files/InterDisplay-BoldItalic.woff2 | Bin 117712 -> 117252 bytes docs/font-files/InterDisplay-ExtraBold.woff2 | Bin 110280 -> 110156 bytes docs/font-files/InterDisplay-ExtraBoldItalic.woff2 | Bin 117816 -> 117536 bytes docs/font-files/InterDisplay-ExtraLight.woff2 | Bin 109468 -> 109476 bytes .../font-files/InterDisplay-ExtraLightItalic.woff2 | Bin 117376 -> 117068 bytes docs/font-files/InterDisplay-Italic.woff2 | Bin 113584 -> 113444 bytes docs/font-files/InterDisplay-Light.woff2 | Bin 110356 -> 109948 bytes docs/font-files/InterDisplay-LightItalic.woff2 | Bin 117164 -> 117084 bytes docs/font-files/InterDisplay-Medium.woff2 | Bin 109896 -> 109908 bytes docs/font-files/InterDisplay-MediumItalic.woff2 | Bin 117772 -> 117464 bytes docs/font-files/InterDisplay-Regular.woff2 | Bin 105688 -> 105528 bytes docs/font-files/InterDisplay-SemiBold.woff2 | Bin 110140 -> 110300 bytes docs/font-files/InterDisplay-SemiBoldItalic.woff2 | Bin 117712 -> 117748 bytes docs/font-files/InterDisplay-Thin.woff2 | Bin 106392 -> 105860 bytes docs/font-files/InterDisplay-ThinItalic.woff2 | Bin 113512 -> 113500 bytes docs/font-files/InterVariable-Italic.woff2 | Bin 0 -> 381880 bytes docs/font-files/InterVariable.ttf | Bin 0 -> 862936 bytes docs/font-files/InterVariable.woff2 | Bin 0 -> 345776 bytes docs/index.html | 22 ++- docs/inter-display.css | 8 +- docs/inter.css | 8 +- docs/lab/font-files.js | 106 ++++--------- docs/lab/glyphinfo.json | 9 -- docs/lab/index.html | 168 +++++++-------------- docs/lab/lab.css | 3 - docs/res/base.css | 4 +- docs/res/glyph-inspector.js | 15 +- 57 files changed, 142 insertions(+), 252 deletions(-) delete mode 100644 docs/font-files/Inter-Variable-Italic.woff2 delete mode 100644 docs/font-files/Inter-Variable.ttf delete mode 100644 docs/font-files/Inter-Variable.woff2 create mode 100644 docs/font-files/InterVariable-Italic.woff2 create mode 100644 docs/font-files/InterVariable.ttf create mode 100644 docs/font-files/InterVariable.woff2 diff --git a/docs/Makefile b/docs/Makefile index 4cac1dc8a..625e4d553 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -19,10 +19,10 @@ build-tmp: .ruby-bundle bundle exec jekyll build --disable-disk-cache -b /tmp/inter-v4-website -d _site-tmp serve: .ruby-bundle - $(Q)if [ ! -s lab/fonts ]; then \ - [ ! -s lab/fonts/fonts ] || rm lab/fonts/fonts; \ - rm -f lab/fonts && ln -fs ../../build/fonts lab/fonts; \ - fi + $(Q)( sleep 3 && \ + rm -f _site/lab/fonts && \ + ln -s ../../../build/fonts _site/lab/fonts ) & + @# @# need to delete generated content so that jekyll, being a little dumb, @# can manage to copy the font files into there again. @# Why not a symlink you ask? Jekyll traverses it and copies the content. @@ -97,9 +97,9 @@ FONTS_SRC := \ $(FONTDIR)/static/InterDisplay-SemiBoldItalic.woff2 \ $(FONTDIR)/static/InterDisplay-Thin.woff2 \ $(FONTDIR)/static/InterDisplay-ThinItalic.woff2 \ - $(FONTDIR)/var/Inter-Variable.woff2 \ - $(FONTDIR)/var/Inter-Variable-Italic.woff2 \ - $(FONTDIR)/var/Inter-Variable.ttf + $(FONTDIR)/var/InterVariable.woff2 \ + $(FONTDIR)/var/InterVariable-Italic.woff2 \ + $(FONTDIR)/var/InterVariable.ttf font-files/Inter-Regular.woff2: $(FONTS_SRC) rm -rf font-files/Inter* diff --git a/docs/_data/faq.yml b/docs/_data/faq.yml index c1b813aeb..8ebf8da7d 100644 --- a/docs/_data/faq.yml +++ b/docs/_data/faq.yml @@ -80,12 +80,12 @@ q: "What are the technical details of Inter?" a: | UPM: 2048
- Variable axis opsz [14–28]
+ Variable axis opsz [14–32]
Variable axis wght [100–900]
Constant axis ital [0, 9.4°]
Style classification: Sans-serif, Grotesk
x-height, opsz=14: 1118 UPM
- x-height, opsz=28: 1056 UPM
+ x-height, opsz=32: 1056 UPM
Cap height: 1490 UPM
Ascender: 1984 UPM
Descender: -494 UPM
diff --git a/docs/_data/fontinfo.json b/docs/_data/fontinfo.json index e6517ebb4..d8b33913f 100644 --- a/docs/_data/fontinfo.json +++ b/docs/_data/fontinfo.json @@ -55,7 +55,7 @@ "usWinAscent": 1984, "usWinDescent": 494, "version": 4, - "xAvgCharWidth": 1314, + "xAvgCharWidth": 1313, "yStrikeoutPosition": 671, "yStrikeoutSize": 140, "ySubscriptXOffset": 0, @@ -70,8 +70,8 @@ "cmap": "[present but not decoded]", "glyf": "[present but not decoded]", "head": { - "checkSumAdjustment": 402214426, - "created": 3783201336, + "checkSumAdjustment": 1565796926, + "created": 3783283210, "flags": [ "0: Baseline at y=0", "1: Left sidebearing point at x=0", @@ -86,7 +86,7 @@ "macStyle": [], "macStyle_raw": 0, "magicNumber": 1594834165, - "modified": 3783203555, + "modified": 3783283222, "tableVersion": 1.0, "unitsPerEm": 2048, "xMax": 5290, @@ -105,7 +105,7 @@ "metricDataFormat": 0, "minLeftSideBearing": -1513, "minRightSideBearing": -2200, - "numberOfHMetrics": 2935, + "numberOfHMetrics": 2926, "tableVersion": 65536, "xMaxExtent": 5290 }, @@ -143,9 +143,9 @@ "#274": "Single-story a", "#275": "Compact f", "#276": "Compact t", - "#3 fontId": "4.000;git-59063ec87;RSMS;Inter-Regular", + "#3 fontId": "4.000;git-401515a34;RSMS;Inter-Regular", "#4 fullName": "Inter Regular", - "#5 version": "Version 4.000;git-59063ec87", + "#5 version": "Version 4.000;git-401515a34", "#6 postscriptName": "Inter-Regular", "#7 trademark": "Inter UI and Inter is a trademark of rsms.", "#8 manufacturerName": "rsms", diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index e1c12552d..c4a5f7f69 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -10,8 +10,8 @@ - - + + diff --git a/docs/_scripts/build-fontkit.js.sh b/docs/_scripts/build-fontkit.js.sh index 616bf28bb..5f6469b2c 100644 --- a/docs/_scripts/build-fontkit.js.sh +++ b/docs/_scripts/build-fontkit.js.sh @@ -8,9 +8,9 @@ # Use the result like this: # # diff --git a/docs/download/index.html b/docs/download/index.html index 10d5bb30d..587478b3d 100644 --- a/docs/download/index.html +++ b/docs/download/index.html @@ -3,7 +3,6 @@ layout: default title: Download Inter --- {% include defs.html -%} -{% assign download_url = "https://github.com/rsms/inter/releases/download/v4.0-beta9h/Inter-4.0-beta9h.zip" %}
@@ -61,7 +60,7 @@ title: Download Inter
  1. Open the "Font Book" application.
  2. In the main menu, select "File" → "Add Fonts..."
    3. -
  3. Select "Inter.ttc", "Inter-Variable.ttf" and "Inter-Variable-Italic.ttf"
    4. +
  4. Select "Inter.ttc", "InterVariable.ttf" and "InterVariable-Italic.ttf"
  5. Press the "Open" button

@@ -73,7 +72,7 @@ title: Download Inter

  1. Open the zip file you downloaded
    2. -
  2. Select "Inter.ttc", "Inter-Variable.ttf" and "Inter-Variable-Italic.ttf"
    3. +
  3. Select "Inter.ttc", "InterVariable.ttf" and "InterVariable-Italic.ttf"
  4. Right-click the selected files, choose "Install for all users"

@@ -87,8 +86,8 @@ title: Download Inter

  1. Create a ".fonts" directory in your home. (mkdir -p ~/.fonts)
    2. -
  2. Copy "Inter.ttc", "Inter-Variable.ttf" and - "Inter-Variable-Italic.ttf" into your .fonts directory +
  3. Copy "Inter.ttc", "InterVariable.ttf" and + "InterVariable-Italic.ttf" into your .fonts directory (cp Inter.ttc *.ttf ~/.fonts/)
@@ -119,7 +118,7 @@ title: Download Inter

Inter fonts comes in two flavors: Variable and Static - (Inter-Variable*.ttf and Inter.ttc, respectively.) + (InterVariable*.ttf and Inter.ttc, respectively.)

Variable fonts is a new format which allows you to choose any weight and optical size. Variable fonts is a relatively new diff --git a/docs/font-files/Inter-Black.woff2 b/docs/font-files/Inter-Black.woff2 index 01a434dd9..231b01931 100644 Binary files a/docs/font-files/Inter-Black.woff2 and b/docs/font-files/Inter-Black.woff2 differ diff --git a/docs/font-files/Inter-BlackItalic.woff2 b/docs/font-files/Inter-BlackItalic.woff2 index 8f80a2c3b..8e973ef1a 100644 Binary files a/docs/font-files/Inter-BlackItalic.woff2 and b/docs/font-files/Inter-BlackItalic.woff2 differ diff --git a/docs/font-files/Inter-Bold.woff2 b/docs/font-files/Inter-Bold.woff2 index b54d00fc2..e81d67e84 100644 Binary files a/docs/font-files/Inter-Bold.woff2 and b/docs/font-files/Inter-Bold.woff2 differ diff --git a/docs/font-files/Inter-BoldItalic.woff2 b/docs/font-files/Inter-BoldItalic.woff2 index 00ed80624..df5d54b03 100644 Binary files a/docs/font-files/Inter-BoldItalic.woff2 and b/docs/font-files/Inter-BoldItalic.woff2 differ diff --git a/docs/font-files/Inter-ExtraBold.woff2 b/docs/font-files/Inter-ExtraBold.woff2 index 37fc8c119..79a1c5f3d 100644 Binary files a/docs/font-files/Inter-ExtraBold.woff2 and b/docs/font-files/Inter-ExtraBold.woff2 differ diff --git a/docs/font-files/Inter-ExtraBoldItalic.woff2 b/docs/font-files/Inter-ExtraBoldItalic.woff2 index eea687111..744532801 100644 Binary files a/docs/font-files/Inter-ExtraBoldItalic.woff2 and b/docs/font-files/Inter-ExtraBoldItalic.woff2 differ diff --git a/docs/font-files/Inter-ExtraLight.woff2 b/docs/font-files/Inter-ExtraLight.woff2 index d01b434c0..67b9a978b 100644 Binary files a/docs/font-files/Inter-ExtraLight.woff2 and b/docs/font-files/Inter-ExtraLight.woff2 differ diff --git a/docs/font-files/Inter-ExtraLightItalic.woff2 b/docs/font-files/Inter-ExtraLightItalic.woff2 index 902a27470..82d899a80 100644 Binary files a/docs/font-files/Inter-ExtraLightItalic.woff2 and b/docs/font-files/Inter-ExtraLightItalic.woff2 differ diff --git a/docs/font-files/Inter-Italic.woff2 b/docs/font-files/Inter-Italic.woff2 index d3973dd54..aa70d499d 100644 Binary files a/docs/font-files/Inter-Italic.woff2 and b/docs/font-files/Inter-Italic.woff2 differ diff --git a/docs/font-files/Inter-Light.woff2 b/docs/font-files/Inter-Light.woff2 index ba47e4951..a6ee80b8f 100644 Binary files a/docs/font-files/Inter-Light.woff2 and b/docs/font-files/Inter-Light.woff2 differ diff --git a/docs/font-files/Inter-LightItalic.woff2 b/docs/font-files/Inter-LightItalic.woff2 index e8ac5c474..055bf9284 100644 Binary files a/docs/font-files/Inter-LightItalic.woff2 and b/docs/font-files/Inter-LightItalic.woff2 differ diff --git a/docs/font-files/Inter-Medium.woff2 b/docs/font-files/Inter-Medium.woff2 index cdb7679ed..49108ddf7 100644 Binary files a/docs/font-files/Inter-Medium.woff2 and b/docs/font-files/Inter-Medium.woff2 differ diff --git a/docs/font-files/Inter-MediumItalic.woff2 b/docs/font-files/Inter-MediumItalic.woff2 index 88b3fb1ec..2a2f7b248 100644 Binary files a/docs/font-files/Inter-MediumItalic.woff2 and b/docs/font-files/Inter-MediumItalic.woff2 differ diff --git a/docs/font-files/Inter-Regular.woff2 b/docs/font-files/Inter-Regular.woff2 index 62d657a00..a6f26a307 100644 Binary files a/docs/font-files/Inter-Regular.woff2 and b/docs/font-files/Inter-Regular.woff2 differ diff --git a/docs/font-files/Inter-SemiBold.woff2 b/docs/font-files/Inter-SemiBold.woff2 index 919b52416..1e97ca316 100644 Binary files a/docs/font-files/Inter-SemiBold.woff2 and b/docs/font-files/Inter-SemiBold.woff2 differ diff --git a/docs/font-files/Inter-SemiBoldItalic.woff2 b/docs/font-files/Inter-SemiBoldItalic.woff2 index da9e7f79e..5626c30eb 100644 Binary files a/docs/font-files/Inter-SemiBoldItalic.woff2 and b/docs/font-files/Inter-SemiBoldItalic.woff2 differ diff --git a/docs/font-files/Inter-Thin.woff2 b/docs/font-files/Inter-Thin.woff2 index b744d3865..2a943bd79 100644 Binary files a/docs/font-files/Inter-Thin.woff2 and b/docs/font-files/Inter-Thin.woff2 differ diff --git a/docs/font-files/Inter-ThinItalic.woff2 b/docs/font-files/Inter-ThinItalic.woff2 index 697a4f1e7..f13eb6407 100644 Binary files a/docs/font-files/Inter-ThinItalic.woff2 and b/docs/font-files/Inter-ThinItalic.woff2 differ diff --git a/docs/font-files/Inter-Variable-Italic.woff2 b/docs/font-files/Inter-Variable-Italic.woff2 deleted file mode 100644 index 2f00e6b4f..000000000 Binary files a/docs/font-files/Inter-Variable-Italic.woff2 and /dev/null differ diff --git a/docs/font-files/Inter-Variable.ttf b/docs/font-files/Inter-Variable.ttf deleted file mode 100644 index 6cd7ebee3..000000000 Binary files a/docs/font-files/Inter-Variable.ttf and /dev/null differ diff --git a/docs/font-files/Inter-Variable.woff2 b/docs/font-files/Inter-Variable.woff2 deleted file mode 100644 index 18f5c9bda..000000000 Binary files a/docs/font-files/Inter-Variable.woff2 and /dev/null differ diff --git a/docs/font-files/InterDisplay-Black.woff2 b/docs/font-files/InterDisplay-Black.woff2 index df074a7f7..eceb5d3c0 100644 Binary files a/docs/font-files/InterDisplay-Black.woff2 and b/docs/font-files/InterDisplay-Black.woff2 differ diff --git a/docs/font-files/InterDisplay-BlackItalic.woff2 b/docs/font-files/InterDisplay-BlackItalic.woff2 index 7ce75af3c..ed05fe3a1 100644 Binary files a/docs/font-files/InterDisplay-BlackItalic.woff2 and b/docs/font-files/InterDisplay-BlackItalic.woff2 differ diff --git a/docs/font-files/InterDisplay-Bold.woff2 b/docs/font-files/InterDisplay-Bold.woff2 index b7870dce2..51fb942d5 100644 Binary files a/docs/font-files/InterDisplay-Bold.woff2 and b/docs/font-files/InterDisplay-Bold.woff2 differ diff --git a/docs/font-files/InterDisplay-BoldItalic.woff2 b/docs/font-files/InterDisplay-BoldItalic.woff2 index fd81aef11..4af3b72a4 100644 Binary files a/docs/font-files/InterDisplay-BoldItalic.woff2 and b/docs/font-files/InterDisplay-BoldItalic.woff2 differ diff --git a/docs/font-files/InterDisplay-ExtraBold.woff2 b/docs/font-files/InterDisplay-ExtraBold.woff2 index 1d7fa8a36..22c47e274 100644 Binary files a/docs/font-files/InterDisplay-ExtraBold.woff2 and b/docs/font-files/InterDisplay-ExtraBold.woff2 differ diff --git a/docs/font-files/InterDisplay-ExtraBoldItalic.woff2 b/docs/font-files/InterDisplay-ExtraBoldItalic.woff2 index 43aaa0a2c..ecfc42f0c 100644 Binary files a/docs/font-files/InterDisplay-ExtraBoldItalic.woff2 and b/docs/font-files/InterDisplay-ExtraBoldItalic.woff2 differ diff --git a/docs/font-files/InterDisplay-ExtraLight.woff2 b/docs/font-files/InterDisplay-ExtraLight.woff2 index 01af0178d..28c9a2093 100644 Binary files a/docs/font-files/InterDisplay-ExtraLight.woff2 and b/docs/font-files/InterDisplay-ExtraLight.woff2 differ diff --git a/docs/font-files/InterDisplay-ExtraLightItalic.woff2 b/docs/font-files/InterDisplay-ExtraLightItalic.woff2 index 7f4a7aa0d..cf597db4b 100644 Binary files a/docs/font-files/InterDisplay-ExtraLightItalic.woff2 and b/docs/font-files/InterDisplay-ExtraLightItalic.woff2 differ diff --git a/docs/font-files/InterDisplay-Italic.woff2 b/docs/font-files/InterDisplay-Italic.woff2 index 3ee25e843..cc7ef4759 100644 Binary files a/docs/font-files/InterDisplay-Italic.woff2 and b/docs/font-files/InterDisplay-Italic.woff2 differ diff --git a/docs/font-files/InterDisplay-Light.woff2 b/docs/font-files/InterDisplay-Light.woff2 index a2c7d476d..e6c1fca80 100644 Binary files a/docs/font-files/InterDisplay-Light.woff2 and b/docs/font-files/InterDisplay-Light.woff2 differ diff --git a/docs/font-files/InterDisplay-LightItalic.woff2 b/docs/font-files/InterDisplay-LightItalic.woff2 index d1201d810..2681094f7 100644 Binary files a/docs/font-files/InterDisplay-LightItalic.woff2 and b/docs/font-files/InterDisplay-LightItalic.woff2 differ diff --git a/docs/font-files/InterDisplay-Medium.woff2 b/docs/font-files/InterDisplay-Medium.woff2 index ac2ad4dca..dbe9a5c4a 100644 Binary files a/docs/font-files/InterDisplay-Medium.woff2 and b/docs/font-files/InterDisplay-Medium.woff2 differ diff --git a/docs/font-files/InterDisplay-MediumItalic.woff2 b/docs/font-files/InterDisplay-MediumItalic.woff2 index 57632a3e8..c30c3145a 100644 Binary files a/docs/font-files/InterDisplay-MediumItalic.woff2 and b/docs/font-files/InterDisplay-MediumItalic.woff2 differ diff --git a/docs/font-files/InterDisplay-Regular.woff2 b/docs/font-files/InterDisplay-Regular.woff2 index d84724c8b..35dbf818d 100644 Binary files a/docs/font-files/InterDisplay-Regular.woff2 and b/docs/font-files/InterDisplay-Regular.woff2 differ diff --git a/docs/font-files/InterDisplay-SemiBold.woff2 b/docs/font-files/InterDisplay-SemiBold.woff2 index f5936d8e5..3c652c68d 100644 Binary files a/docs/font-files/InterDisplay-SemiBold.woff2 and b/docs/font-files/InterDisplay-SemiBold.woff2 differ diff --git a/docs/font-files/InterDisplay-SemiBoldItalic.woff2 b/docs/font-files/InterDisplay-SemiBoldItalic.woff2 index 326dad789..7be961efa 100644 Binary files a/docs/font-files/InterDisplay-SemiBoldItalic.woff2 and b/docs/font-files/InterDisplay-SemiBoldItalic.woff2 differ diff --git a/docs/font-files/InterDisplay-Thin.woff2 b/docs/font-files/InterDisplay-Thin.woff2 index 19836d052..b57afd56f 100644 Binary files a/docs/font-files/InterDisplay-Thin.woff2 and b/docs/font-files/InterDisplay-Thin.woff2 differ diff --git a/docs/font-files/InterDisplay-ThinItalic.woff2 b/docs/font-files/InterDisplay-ThinItalic.woff2 index 46660e27e..6ee1f53fb 100644 Binary files a/docs/font-files/InterDisplay-ThinItalic.woff2 and b/docs/font-files/InterDisplay-ThinItalic.woff2 differ diff --git a/docs/font-files/InterVariable-Italic.woff2 b/docs/font-files/InterVariable-Italic.woff2 new file mode 100644 index 000000000..59dec6d8c Binary files /dev/null and b/docs/font-files/InterVariable-Italic.woff2 differ diff --git a/docs/font-files/InterVariable.ttf b/docs/font-files/InterVariable.ttf new file mode 100644 index 000000000..9ab871e9c Binary files /dev/null and b/docs/font-files/InterVariable.ttf differ diff --git a/docs/font-files/InterVariable.woff2 b/docs/font-files/InterVariable.woff2 new file mode 100644 index 000000000..43d9bf98b Binary files /dev/null and b/docs/font-files/InterVariable.woff2 differ diff --git a/docs/index.html b/docs/index.html index 63ca91b6e..a37caab73 100644 --- a/docs/index.html +++ b/docs/index.html @@ -571,6 +571,7 @@ input[type="range"]:focus::-moz-range-track { font-size: 2em; position:absolute; top:-4rem; left: 1rem; + color: var(--foreground-color-bright); } .row.glyphs > :first-child { display: none } /*.row.glyphs h2 { font-size: 2rem; margin-bottom: 1rem }*/ @@ -635,9 +636,15 @@ input[type="range"]:focus::-moz-range-track { } } +#faq { + margin-top: 2em; +} #faq .columns > p { margin-bottom: 2em; } +#faq h2 { + margin: 0 0 1.5em 0; +} #faq h4:target { background: var(--active-bgcolor); outline: 8px solid var(--active-bgcolor); @@ -677,7 +684,7 @@ input[type="range"]:focus::-moz-range-track {

The smaller "text" optical-size designs features a tall x-height to aid in legibility of lower-case text, with several contrast-enhancing details like ink traps and bridges. The larger "display" optical-size designs offers clean lines, smooth curves and delicate details for excellent rythm of large text.

- 38 OpenType features are provided as well, + Many OpenType features are provided as well, including contextual alternates which adjusts punctuation depending on the shape of surrounding glyphs, slashed zero for when you need to disambiguate "0" from "o", tabular numbers, and much more. @@ -944,7 +951,7 @@ input[type="range"]:focus::-moz-range-track {

Example text, Regular

-One of the most famous lighthouses of antiquity, as I have already pointed out, was the pharos of Alexandria, which ancient writers included among the Seven Wonders of the World. It might naturally be supposed that the founder of so remarkable a monument of architectural skill would be well known; yet while Strabo and Pliny, Eusebius, Suidas, and Lucian ascribe its erection to Ptolemæus Philadelphus, the wisest and most benevolent of the Ptolemean kings of Egypt, by Tzetzes and Ammianus Marcellinus the honour is given to Cleopatra; and other authorities even attribute it to Alexander the Great. +One of the most famous lighthouses of antiquity, as I have already pointed out, was the pharos of Alexandria, which ancient writers included among the Seven Wonders of the World. It might naturally be supposed that the founder of so remarkable a monument of architectural skill would be well known; yet while Strabo and Pliny, Eusebius, Suidas, and Lucian ascribe its erection to Ptolemæus Philadelphus, the wisest and most benevolent of the Ptolemean kings of Egypt, by Tzetzes and Ammianus Marcellinus the honour is given to Cleopatra; and other authorities even attribute it to Alexander the Great.

All that can with certainty be affirmed is, that the architect was named Sostrates. Montfaucon, in his great work, endeavours to explain how it is that while we are thus informed as to the architect, we are so doubtful as to the founder, whom, for his part, he believes to have been Ptolemæus. Our ignorance, he says, is owing to the knavery of Sostrates. He wished to immortalize his name; a blameless wish, if at the same time he had not sought to suppress that of the founder, whose glory it was to have suggested the erection. For this purpose Sostrates devised a stratagem which proved successful; deep in the wall of the tower he cut the following inscription: “Sostrates of Cnidos, son of Dexiphanes, to the gods who Protect those who are upon the Sea.” But, mistrustful that King Ptolemæus would scarcely be satisfied with an inscription in which he was wholly ignored, he covered it with a light coat of cement, which he knew would not long endure the action of the atmosphere, and carved thereon the name of Ptolemæus. After a few years the cement and the name of the king disappeared, and revealed the inscription which gave all the glory to Sostrates.

@@ -952,7 +959,7 @@ Montfaucon, with genial credulity, adopts this anecdote as authentic, and adds:

To solve the difficulty, Champollion represents the pharos as constructed by Ptolemæus Soter. But, as Edrisi solemnly remarks, “God alone knows what is the truth.”

-Much etymological erudition has been expended on the derivation of the word Pharos. As far as the Alexandrian light-tower is concerned, there can be no doubt that it was named from the islet on which it stood; yet Isidore asserts that the word came from φὼς, “light,” and ὁρἀν, “to see.” To quote again from Montfaucon: That numerous persons, who have not read the Greek authors, should exercise their ingenuity to no avail in the extraction of these etymologies, is far less surprising than that so good a scholar as Isaac Vossius should seek the origin of Pharos in the Greek language. From ϕαἰνειν, “to shine,” he says, comes ϕανερός, and from ϕανερός, ϕάρος.... But the island was called Pharos seven or eight hundred years before it possessed either tower or beacon-light. +Much etymological erudition has been expended on the derivation of the word Pharos. As far as the Alexandrian light-tower is concerned, there can be no doubt that it was named from the islet on which it stood; yet Isidore asserts that the word came from φὼς, “light,” and ὁρἀν, “to see.” To quote again from Montfaucon: That numerous persons, who have not read the Greek authors, should exercise their ingenuity to no avail in the extraction of these etymologies, is far less surprising than that so good a scholar as Isaac Vossius should seek the origin of Pharos in the Greek language. From ϕαἰνειν, “to shine,” he says, comes ϕανερός, and from ϕανερός, ϕάρος.... But the island was called Pharos seven or eight hundred years before it possessed either tower or beacon-light.

The most reasonable conjecture seems to be that the word is a Hellenic form of Phrah, the Egyptian name of the sun, to whom the Alexandrian lighthouse would naturally be compared by wondering spectators, or dedicated by a devout prince.

@@ -1183,7 +1190,6 @@ At a later date we find the word applied to very different objects, though alway dlig Discretionary Ligatures
dnom Denominators
frac Fractions
- liga Standard Ligatures
locl Localized Forms
numr Numerators
ordn Ordinals
@@ -1192,9 +1198,9 @@ At a later date we find the word applied to very different objects, though alway sinf Scientific Inferiors
smcp Small Capitals (limited)
ss01 Open digits
- ss02 Disambiguation (with zero<)
+ ss02 Disambiguation (with zero)
ss03 Round quotes & commas
- ss04 Disambiguation (no zero<)
+ ss04 Disambiguation (no zero)
ss05 Circled characters
ss06 Squared characters
ss07 Square punctuation
@@ -1247,8 +1253,8 @@ At a later date we find the word applied to very different objects, though alway Small optical size --> -

- +
+ Optical size
- - @@ -178,44 +163,60 @@ if (window.matchMedia('(prefers-color-scheme: dark)').matches) {

Features

- - - + + - - - - - - - - - - - - - - - -
- Default-on features: - - - - + Stylistic sets: + + + + + + + +
-
- Variable test page +
+ Character variants: + + + + + + + + + + + + + +
+ +
+ Partial or uncommon: + + + + +
+ +
+ Enabled by default: + + + +
@@ -254,16 +255,7 @@ function InterDynamicTracking(fontSize, family /* :"text"|"display" */) { return a + b * Math.pow(Math.E, c * fontSize) } -// provide hinted=1 to use TTF hinted fonts. -// not exposed in UI as it only works when serving the site locally -// with fonts in the build/fonts directory. -const hinted = location.search.indexOf('hinted=1') != -1 -const familyName = hinted ? fontFamilyNameHinted : fontFamilyName; - -if (hinted) { - document.body.classList.add('hinted') -} -document.body.style.fontFamily = familyName +document.body.style.fontFamily = fontFamilyName function parseQueryString(qs) { @@ -838,19 +830,16 @@ function main() { let usingVarFont = false let usingFontFamily = "text" - var varWeightRange, varSlantRange, varOpszRange + var varWeightRange, varOpszRange var varWeightSettingValueImpl = false - var varSlantSettingValueImpl = false var varOpszSettingValueImpl = false function getFontFamily(overrideFamily) { return ( (overrideFamily || usingFontFamily) == "text" ? ( - usingVarFont ? (hinted ? fontFamilyNameVarHinted : fontFamilyNameVar) : - hinted ? fontFamilyNameHinted : fontFamilyName + usingVarFont ? fontFamilyNameVar : fontFamilyName ) : ( - usingVarFont ? (hinted ? fontFamilyNameDisplayVarHinted : fontFamilyNameDisplayVar) : - hinted ? fontFamilyNameDisplayHinted : fontFamilyNameDisplay + usingVarFont ? fontFamilyNameDisplayVar : fontFamilyNameDisplay ) ) } @@ -866,33 +855,18 @@ function main() { var italicVar = vars.bind('italic', (e, on) => { document.body.classList[on ? 'add' : 'remove']('italic') - if (usingVarFont && !varSlantSettingValueImpl) { - if (varSlantRange) { - varSlantRange.setValue(on ? 100 : 0) - } - updateVarFont() - } }) let varState = { weight: 400, // 400..900 - slant: 0, // 0..-10 opsz: 14, // 14..32 } function updateVarFont() { if (usingVarFont) { - varSlantSettingValueImpl = true - if (varState.slant <= 0.1) { - varState.slant = 0 - italicVar.setValue(false) - } else { - italicVar.setValue(true) - } - varSlantSettingValueImpl = false setCSSProp( "font-variation-settings", - `"wght" ${varState.weight}, "slnt" ${-varState.slant}, "opsz" ${varState.opsz}` + `"wght" ${varState.weight}, "opsz" ${varState.opsz}` ) } else { setCSSProp("font-variation-settings", null) @@ -910,10 +884,6 @@ function main() { varWeightRange.setValue(w) } } - // document.body.style.fontFamily = ( - // hinted ? fontFamilyNameVarHinted : - // fontFamilyNameVar - // ) } else { if (!isInitial && varWeightRange) { // copy value of var weight to static weight @@ -922,10 +892,6 @@ function main() { vars.setValue("weight", Math.round(w / 100) * 100) } } - // document.body.style.fontFamily = ( - // hinted ? fontFamilyNameHinted : - // fontFamilyName - // ); } document.body.style.fontFamily = getFontFamily() updateVarFont() @@ -936,11 +902,6 @@ function main() { vars.setValue("wght", v) }) - let varSlantNum = vars.bind('_slnt', '[name="varSlantNum"]', (e, v) => { - if (varSlantRange && !varSlantSettingValueImpl) - vars.setValue("slnt", v) - }) - let varOpszNum = vars.bind('_opsz', '[name="varOpszNum"]', (e, v) => { if (varOpszRange && !varOpszSettingValueImpl) vars.setValue("opsz", v) @@ -964,18 +925,6 @@ function main() { return snapValue(e.valueAsNumber, 100) }) - varSlantRange = vars.bind('slnt', '[name="varSlant"]', (e, v) => { - varState.slant = v - varSlantSettingValueImpl = true - varSlantNum.setValue(v) - varSlantSettingValueImpl = false - updateVarFont() - }, (e, prevValue, ev) => { - if (prevValue === undefined) - return 0 - return snapValue(e.valueAsNumber, 1) - }) - varOpszRange = vars.bind('opsz', '[name="varOpsz"]', (e, v) => { varState.opsz = v varOpszSettingValueImpl = true @@ -1003,12 +952,12 @@ function main() { e.classList.remove(secondarySampleClassNameAddition)) } if (className) { - let explicitFontFamily = null - if (className == "inter-other-font") { - let otherFamily = usingFontFamily == "text" ? "display" : "text" - explicitFontFamily = getFontFamily(otherFamily) - } - secondarySample.style.fontFamily = explicitFontFamily + // let explicitFontFamily = null + // if (className == "inter-other-font") { + // let otherFamily = usingFontFamily == "text" ? "display" : "text" + // explicitFontFamily = getFontFamily(otherFamily) + // } + // secondarySample.style.fontFamily = explicitFontFamily secondarySample.classList.add(className) secondaryFontElements.forEach(e => e.classList.add(className)) } @@ -1029,9 +978,8 @@ function main() { vars.bind('compare', (e, v) => { disableSecondarySample() switch (v) { - // case 'roboto': enableSecondarySample('robotoFont'); break case 'system': enableSecondarySample('systemFont'); break - case 'inter-other': enableSecondarySample('inter-other-font'); break + //case 'inter-other': enableSecondarySample('inter-other-font'); break default: return '-'; } }, e => (e.value && e.value != '-') ? e.value : null) diff --git a/docs/lab/lab.css b/docs/lab/lab.css index b60c688d4..f9c5bb311 100644 --- a/docs/lab/lab.css +++ b/docs/lab/lab.css @@ -134,9 +134,6 @@ body { transition: all 168ms cubic-bezier(0.17, 0.65, 0.48, 1); transition-property: color, background; } -.robotoFont { - font-family: "Roboto", serif; -} .systemFont { font-family: system-ui,-system,-system-ui,-apple-system,sans-serif; } diff --git a/docs/res/base.css b/docs/res/base.css index c6b5582c2..28d453d2a 100644 --- a/docs/res/base.css +++ b/docs/res/base.css @@ -5,12 +5,12 @@ layout: none @font-face { font-family: InterVariable; font-style: normal; font-weight: 100 900; font-display: block; /* <-- block, not swap */ - src: url('../font-files/Inter-Variable.woff2?v={{font_v}}') format('woff2'); + src: url('../font-files/InterVariable.woff2?v={{font_v}}') format('woff2'); } @font-face { font-family: InterVariable; font-style: italic; font-weight: 100 900; font-display: block; /* <-- block, not swap */ - src: url('../font-files/Inter-Variable-Italic.woff2?v={{font_v}}') format('woff2'); + src: url('../font-files/InterVariable-Italic.woff2?v={{font_v}}') format('woff2'); } @font-face { font-family: "jbmono"; diff --git a/docs/res/glyph-inspector.js b/docs/res/glyph-inspector.js index f620d23e0..24f16540f 100644 --- a/docs/res/glyph-inspector.js +++ b/docs/res/glyph-inspector.js @@ -27,6 +27,7 @@ function pxround(px) { } const monotime = performance.now.bind(performance) +const WGHT_MIN = 14, WGHT_MAX = 32 class GlyphInspector { constructor() { @@ -35,7 +36,7 @@ class GlyphInspector { this.glyphUnicode = 0 this.defaultGlyphUnicode = 0x0041 this.selectedGlyphGridCell = null - this.defaultAxisValues = {wght: 400, opsz: 28} + this.defaultAxisValues = {wght: 400, opsz: WGHT_MAX} this.axisValues = {wght: 0, opsz: 0} this.idNameElement = $(".identification .name", rootElement) this.idUnicodeElement = $(".identification .unicode", rootElement) @@ -83,13 +84,13 @@ class GlyphInspector { // enable clicking on label to toggle this.opszSlider.onclick = (ev) => ev.stopPropagation() this.opszSlider.parentElement.onclick = (ev) => { - this.setFontInstance({opsz: this.axisValues.opsz > 14 ? 14 : 28}) + this.setFontInstance({opsz: this.axisValues.opsz > WGHT_MIN ? WGHT_MIN : WGHT_MAX}) } this.opszCheckbox = $('input[name="opsz-switch"]') - this.defaultAxisValues.opsz = this.opszCheckbox.checked ? 14 : 28 + this.defaultAxisValues.opsz = this.opszCheckbox.checked ? WGHT_MIN : WGHT_MAX this.opszCheckbox.onchange = (ev) => { - this.setFontInstance({opsz: this.opszCheckbox.checked ? 14 : 28}) + this.setFontInstance({opsz: this.opszCheckbox.checked ? WGHT_MIN : WGHT_MAX}) } let showDetailsCheckbox = $('input[name="show-details"]') @@ -272,7 +273,7 @@ class GlyphInspector { if (ev.shiftKey) wght = Math.round(wght / 100) * 100 wght = max(100, min(900, wght)) - // opsz = max(14, min(28, opsz)) + // opsz = max(WGHT_MIN, min(WGHT_MAX, opsz)) this.hasDraggedWght = true if (this.draggedWghtStartTime == 0) this.draggedWghtStartTime = monotime() @@ -942,7 +943,7 @@ class GlyphInspector { // let wght = 100 // let inc = true // setInterval(x => { - // this.setFontInstance({wght, opsz: 28}) + // this.setFontInstance({wght, opsz: WGHT_MAX}) // if (inc) { // wght += 10 // if (wght > 900) { @@ -961,5 +962,5 @@ class GlyphInspector { } let inspector = new GlyphInspector() -await inspector.loadFont('font-files/Inter-Variable.ttf') +await inspector.loadFont('font-files/InterVariable.ttf') // await inspector.loadFont('font-files/InterDisplay-Regular.otf') -- cgit v1.2.3