diff --git a/docs/_data/feature_samples.yml b/docs/_data/feature_samples.yml index 8c49cbf9c..dbd0e6985 100644 --- a/docs/_data/feature_samples.yml +++ b/docs/_data/feature_samples.yml @@ -1,11 +1,11 @@ + - title: Contextual alternates tag: calt description: - This feature is enabled by default and causes certain characters to adjust + This feature is usually enabled by default and causes certain characters to adjust themselves or be replaced depending on the surrounding context. - footer: - There are many more contextual alternates. samples: + - "3›x‹9" - "12›:‹34, FE›—‹X" - "4›.‹2" - "›(‹SEMI›)‹PERMANENT" @@ -15,26 +15,23 @@ - "M›@‹N m@n" - "Smile ›:-)‹" -- title: Standard ligatures - tag: liga - description: - Conversion of common sequences into higher-fidelity glyphs, - like arrows and enclosing graphemes. - samples: - - "3›x‹9" - - "-> --> --->" - - "<- <-- <---" - - "<-> <-->" - - "=> ==> <==" - - "<=> <==>" - footer: - "In addition to standard ligatures, which are usually on by default but can be turned off, - Inter also comes with required/default ligatures as well, - like for instance specialized glyphs for enclosing combining characters like - e.g. U+0041 U+20DD => A\u20DD
- More examples:
- 1\u20DD 2\u20DD 3\u20DD A\u20DD B\u20DD - C\u20DE #\u20DE !\u20DE ?\u20DE →\u20DE" + +# - title: Arrows +# tag: calt +# description: +# Arrows are part of Contextual alternates. +# samples: +# - "-> --> --->" +# - "<- <-- <---" +# - "<-> <-->" +# - "=> ==> <==" +# - "<=> <==>" +# footer: +# "In addition to contextual alternates, Inter also provides some ligatures +# like for instance specialized glyphs for enclosing combining glyphs. Examples:
+# U+0041 U+20DD => A\u20DD
+# U+0023 U+20DE => #\u20DE
" + - title: Tabular numbers tag: tnum @@ -51,6 +48,7 @@ - "1.00, 9.44, −0.13› ‹" - "0.00, 1.13, ~7.12› ‹" + - title: Fractions tag: frac description: @@ -65,27 +63,6 @@ - "18/29  16/5" - "1337/591038" -- title: Numerators - tag: numr - samples: - - "Hello ›0123‹" - -- title: Denominators - tag: dnom - samples: - - "Hello ›0123‹" - -- title: Superscript - tag: sups - samples: - - "X›0123 (+)-[=]‹" - - "X›abcdefghijklmnopqrstuvwxyz‹" - -- title: Subscript - tag: subs - samples: - - "H›0123 (+)-[=]‹" - - "X›abcdefghijklmnopqrstuvwxyz‹" - title: Case alternates tag: case @@ -98,6 +75,55 @@ - "›*+÷±×=≠≈•~<>≤≥‹" - "›→‹ ›←‹ ›⟶‹ ›⟵‹ ›−‹ ›-‹ ›–‹ ›—‹ ›:‹" + +- title: Ligatures + tag: rlig + description: + Inter provides just a few ligatures for combining characters for which layout + support in various apps is spotty. + samples: + - "A›\u20DD‹" + - "#›\u20DE‹" + footer: + This means that for instance enclosed glyphs + works everywhere, not just in apps with correct combining character logic. + + +- title: Discretionary ligatures + tag: dlig + description: + Alternate style for a few chacters. This feature is usually disabled by default. + samples: + - "›¡¿‹What›?!‹" + - "›¿¡‹What›!?‹" + + +- title: Numerators + tag: numr + samples: + - "Hello ›0123‹" + + +- title: Denominators + tag: dnom + samples: + - "Hello ›0123‹" + + +- title: Superscript + tag: sups + samples: + - "X›0123 (+)-[=]‹" + - "X›abcdefghijklmnopqrstuvwxyz‹" + + +- title: Subscript + tag: subs + samples: + - "H›0123 (+)-[=]‹" + - "X›abcdefghijklmnopqrstuvwxyz‹" + + - title: "Stylistic set 1: Alternate digits" tag: ss01 description: @@ -108,6 +134,7 @@ - "›1‹2›34‹5›6‹78›9‹0" - "›13469‹" + - title: "Stylistic set 2: Disambiguation" tag: ss02 description: @@ -118,6 +145,7 @@ - "›Ill‹ega›l‹" - "βeta ›ß‹eta Busine›ß‹" + - title: "Stylistic set 3: r curves into round neighbors" tag: ss03 description: @@ -128,20 +156,13 @@ - "i›r‹d" - "Mon›r‹oe" -- title: Discretionary ligatures - tag: dlig - description: - Alternate glyph set that increases visual difference between - similar-looking characters. - samples: - - "›¡¿‹What›?!‹" - - "›¿¡‹What›!?‹" - title: Slashed zero tag: zero samples: - "O›0‹123" + - title: Character variants tag: cvXX description: "Allows cherry-picking alternate characters." diff --git a/docs/_data/fontinfo.json b/docs/_data/fontinfo.json index 980b2527f..b8c30cf81 100644 --- a/docs/_data/fontinfo.json +++ b/docs/_data/fontinfo.json @@ -1,18 +1,18 @@ [ { "head": { - "checkSumAdjustment": 1950728404, - "created": 3654646194, + "checkSumAdjustment": 3106795359, + "created": 3664050238, "flags": 27, "fontDirectionHint": 2, - "fontRevision": 3.011, + "fontRevision": 3.012, "glyphDataFormat": 0, "indexToLocFormat": 0, "lowestRecPPEM": 6, "macStyle": [], "macStyle_raw": 0, "magicNumber": 1594834165, - "modified": 3654646215, + "modified": 3664050265, "tableVersion": 1.0, "unitsPerEm": 2816, "xMax": 7274, @@ -35,7 +35,7 @@ "tableVersion": 65536, "xMaxExtent": 7274 }, - "id": "Inter-Regular:2019:f93a4a705", + "id": "Inter-Regular:2020:f93a4a705", "name": "Inter-Regular", "names": { "#256": "Alternate digits", @@ -52,20 +52,20 @@ "#267": "Flat top three", "#268": "Captital G with spur", "#269": "Single storey a", - "copyright": "Copyright 2019 The Inter project authors", + "copyright": "Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)", "designer": "Rasmus Andersson", "designerURL": "https://rsms.me/", "familyName": "Inter", - "fontId": "Inter-Regular:2019:f93a4a705", + "fontId": "Inter-Regular:2020:f93a4a705", "fullName": "Inter Regular", - "licenseDescription": "OFL 1.1 (SIL Open Font License, Version 1.1)", + "licenseDescription": "This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: http://scripts.sil.org/OFL", "licenseURL": "http://scripts.sil.org/OFL", "manufacturerName": "rsms", "postscriptName": "Inter-Regular", "subfamilyName": "Regular", "trademark": "Inter UI and Inter is a trademark of rsms.", "vendorURL": "https://rsms.me/", - "version": "Version 3.011;git-f93a4a705" + "version": "Version 3.012;git-f93a4a705" }, "os/2": { "achVendID": "RSMS", @@ -132,6 +132,6 @@ "underlinePosition": -464, "underlineThickness": 192 }, - "version": "3.11" + "version": "3.12" } ] diff --git a/docs/_data/languages.yml b/docs/_data/languages.yml new file mode 100644 index 000000000..29b513e09 --- /dev/null +++ b/docs/_data/languages.yml @@ -0,0 +1,153 @@ +- category: Cyrillic + languages: + - Azerbaijani + - Belarusian + - Bosnian + - Bulgarian + - Chechen + - Macedonian + - Ossetic + - Russian + - Sakha + - Serbian + - Ukrainian + - Uzbek + +- category: Greek + languages: + - Greek + +- category: Latin + languages: + - Afrikaans + - Aghem + - Akan + - Albanian + - Asturian + - Asu + - Bafia + - Basaa + - Basque + - Bemba + - Bena + - Breton + - Catalan + - Chiga + - Colognian + - Cornish + - Croatian + - Czech + - Danish + - Duala + - Dutch + - Embu + - English + - Esperanto + - Estonian + - Ewe + - Ewondo + - Faroese + - Filipino + - Finnish + - French + - Friulian + - Fulah + - Galician + - Ganda + - German + - Gusii + - Hawaiian + - Hungarian + - Icelandic + - Igbo + - Inari Sami + - Indonesian + - Irish + - Italian + - Jola-Fonyi + - Kabuverdianu + - Kabyle + - Kako + - Kalaallisut + - Kalenjin + - Kamba + - Kikuyu + - Kinyarwanda + - Koyra Chiini + - Koyraboro Senni + - Kwasio + - Lakota + - Langi + - Latvian + - Lingala + - Lithuanian + - Lower Sorbian + - Luba-Katanga + - Luo + - Luxembourgish + - Luyia + - Machame + - Makhuwa-Meetto + - Makonde + - Malagasy + - Maltese + - Manx + - Masai + - Meru + - Metaʼ + - Morisyen + - Mundang + - Nama + - Ngiemboon + - Ngomba + - North Ndebele + - Northern Sami + - Norwegian Bokmål + - Norwegian Nynorsk + - Nuer + - Nyankole + - Oromo + - Polish + - Portuguese + - Prussian + - Quechua + - Romanian + - Romansh + - Rombo + - Rundi + - Rwa + - Samburu + - Sango + - Sangu + - Scottish Gaelic + - Sena + - Serbian + - Shambala + - Shona + - Slovak + - Slovenian + - Soga + - Somali + - Spanish + - Swahili + - Swedish + - Swiss German + - Tachelhit + - Taita + - Tasawaq + - Teso + - Tongan + - Turkish + - Upper Sorbian + - Uzbek + - Vai + - Vietnamese + - Volapük + - Vunjo + - Walser + - Welsh + - Western Frisian + - Yangben + - Yoruba + - Zarma + - Zulu diff --git a/docs/_includes/charset-table.html b/docs/_includes/charset-table.html new file mode 100644 index 000000000..aabc6c318 --- /dev/null +++ b/docs/_includes/charset-table.html @@ -0,0 +1,23 @@ +{% +if site.safe == false %}{% +assign url_root = "/" %}{% else %}{% +assign url_root = "/inter/" %}{% endif +%} + +
+{% for g in site.data.glyphinfo.glyphs %} + {% comment %} + + Ignore empty glyphs and glyphs without unicode mapping. + + {% endcomment %} + {% if g[1] == 0 and g[2] %} + &#x{{g[2]}} + {% endif %} +{% endfor %} +
diff --git a/docs/_includes/ctxedit.html b/docs/_includes/ctxedit.html index 53e9eb8d8..931a5164e 100644 --- a/docs/_includes/ctxedit.html +++ b/docs/_includes/ctxedit.html @@ -19,9 +19,9 @@ endfor
@@ -128,9 +128,9 @@ endfor
- +
- +
@@ -519,7 +519,7 @@ function updateIdealMatches() { }) distance = distance / ndistances - + bindings.setValue('ideal-distance', distance.toFixed(6)) bindings.setValue('ideal-count', idealCount) } diff --git a/docs/font-files/Inter-Black.otf b/docs/font-files/Inter-Black.otf index 66cfaf6ce..b3675d6b3 100644 Binary files a/docs/font-files/Inter-Black.otf and b/docs/font-files/Inter-Black.otf differ diff --git a/docs/font-files/Inter-Black.woff b/docs/font-files/Inter-Black.woff index 046bc8039..c7737ed3d 100644 Binary files a/docs/font-files/Inter-Black.woff and b/docs/font-files/Inter-Black.woff differ diff --git a/docs/font-files/Inter-Black.woff2 b/docs/font-files/Inter-Black.woff2 index 05710ce5f..b16b995be 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.otf b/docs/font-files/Inter-BlackItalic.otf index 336c80449..1441cf280 100644 Binary files a/docs/font-files/Inter-BlackItalic.otf and b/docs/font-files/Inter-BlackItalic.otf differ diff --git a/docs/font-files/Inter-BlackItalic.woff b/docs/font-files/Inter-BlackItalic.woff index 4e429c82a..b5f144764 100644 Binary files a/docs/font-files/Inter-BlackItalic.woff and b/docs/font-files/Inter-BlackItalic.woff differ diff --git a/docs/font-files/Inter-BlackItalic.woff2 b/docs/font-files/Inter-BlackItalic.woff2 index ebc3c0fe4..a3f1b70cd 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.otf b/docs/font-files/Inter-Bold.otf index 0dbf67b7c..24c150914 100644 Binary files a/docs/font-files/Inter-Bold.otf and b/docs/font-files/Inter-Bold.otf differ diff --git a/docs/font-files/Inter-Bold.woff b/docs/font-files/Inter-Bold.woff index d196122f6..e38455587 100644 Binary files a/docs/font-files/Inter-Bold.woff and b/docs/font-files/Inter-Bold.woff differ diff --git a/docs/font-files/Inter-Bold.woff2 b/docs/font-files/Inter-Bold.woff2 index 6df3dbb59..835dd4977 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.otf b/docs/font-files/Inter-BoldItalic.otf index d9d46b67e..c4e9b163d 100644 Binary files a/docs/font-files/Inter-BoldItalic.otf and b/docs/font-files/Inter-BoldItalic.otf differ diff --git a/docs/font-files/Inter-BoldItalic.woff b/docs/font-files/Inter-BoldItalic.woff index 8178b668e..ffac3f59b 100644 Binary files a/docs/font-files/Inter-BoldItalic.woff and b/docs/font-files/Inter-BoldItalic.woff differ diff --git a/docs/font-files/Inter-BoldItalic.woff2 b/docs/font-files/Inter-BoldItalic.woff2 index 210ba3bea..1a41a14ff 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.otf b/docs/font-files/Inter-ExtraBold.otf index b3ef7a362..e94e535f3 100644 Binary files a/docs/font-files/Inter-ExtraBold.otf and b/docs/font-files/Inter-ExtraBold.otf differ diff --git a/docs/font-files/Inter-ExtraBold.woff b/docs/font-files/Inter-ExtraBold.woff index 2a1bd0090..885ac94fb 100644 Binary files a/docs/font-files/Inter-ExtraBold.woff and b/docs/font-files/Inter-ExtraBold.woff differ diff --git a/docs/font-files/Inter-ExtraBold.woff2 b/docs/font-files/Inter-ExtraBold.woff2 index 7f981e716..ae956b150 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.otf b/docs/font-files/Inter-ExtraBoldItalic.otf index 5f3410bdd..d236a179a 100644 Binary files a/docs/font-files/Inter-ExtraBoldItalic.otf and b/docs/font-files/Inter-ExtraBoldItalic.otf differ diff --git a/docs/font-files/Inter-ExtraBoldItalic.woff b/docs/font-files/Inter-ExtraBoldItalic.woff index aef52fe8e..d6cf86233 100644 Binary files a/docs/font-files/Inter-ExtraBoldItalic.woff and b/docs/font-files/Inter-ExtraBoldItalic.woff differ diff --git a/docs/font-files/Inter-ExtraBoldItalic.woff2 b/docs/font-files/Inter-ExtraBoldItalic.woff2 index 32f37a23b..86578995d 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.otf b/docs/font-files/Inter-ExtraLight.otf index 4152657ac..eaa57ba3e 100644 Binary files a/docs/font-files/Inter-ExtraLight.otf and b/docs/font-files/Inter-ExtraLight.otf differ diff --git a/docs/font-files/Inter-ExtraLight.woff b/docs/font-files/Inter-ExtraLight.woff index 9627261fc..ff7691932 100644 Binary files a/docs/font-files/Inter-ExtraLight.woff and b/docs/font-files/Inter-ExtraLight.woff differ diff --git a/docs/font-files/Inter-ExtraLight.woff2 b/docs/font-files/Inter-ExtraLight.woff2 index 8bb3e74f8..694b2df9f 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.otf b/docs/font-files/Inter-ExtraLightItalic.otf index 48bd97cd6..8b4bacbfe 100644 Binary files a/docs/font-files/Inter-ExtraLightItalic.otf and b/docs/font-files/Inter-ExtraLightItalic.otf differ diff --git a/docs/font-files/Inter-ExtraLightItalic.woff b/docs/font-files/Inter-ExtraLightItalic.woff index e682ed1ee..c6ed13a4f 100644 Binary files a/docs/font-files/Inter-ExtraLightItalic.woff and b/docs/font-files/Inter-ExtraLightItalic.woff differ diff --git a/docs/font-files/Inter-ExtraLightItalic.woff2 b/docs/font-files/Inter-ExtraLightItalic.woff2 index 2e86c68d0..9a7bd1109 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.otf b/docs/font-files/Inter-Italic.otf index d041c41f0..14255026e 100644 Binary files a/docs/font-files/Inter-Italic.otf and b/docs/font-files/Inter-Italic.otf differ diff --git a/docs/font-files/Inter-Italic.woff b/docs/font-files/Inter-Italic.woff index 6d7242f9a..4fdb59dc2 100644 Binary files a/docs/font-files/Inter-Italic.woff and b/docs/font-files/Inter-Italic.woff differ diff --git a/docs/font-files/Inter-Italic.woff2 b/docs/font-files/Inter-Italic.woff2 index d8fc3e300..deca637d8 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.otf b/docs/font-files/Inter-Light.otf index 9b986a567..960bf4e0e 100644 Binary files a/docs/font-files/Inter-Light.otf and b/docs/font-files/Inter-Light.otf differ diff --git a/docs/font-files/Inter-Light.woff b/docs/font-files/Inter-Light.woff index b8f1a1f5d..42850acc0 100644 Binary files a/docs/font-files/Inter-Light.woff and b/docs/font-files/Inter-Light.woff differ diff --git a/docs/font-files/Inter-Light.woff2 b/docs/font-files/Inter-Light.woff2 index 97e99c784..65a7daddd 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.otf b/docs/font-files/Inter-LightItalic.otf index bfb5ba3b0..14851982a 100644 Binary files a/docs/font-files/Inter-LightItalic.otf and b/docs/font-files/Inter-LightItalic.otf differ diff --git a/docs/font-files/Inter-LightItalic.woff b/docs/font-files/Inter-LightItalic.woff index 5c40757af..c4ed9a94f 100644 Binary files a/docs/font-files/Inter-LightItalic.woff and b/docs/font-files/Inter-LightItalic.woff differ diff --git a/docs/font-files/Inter-LightItalic.woff2 b/docs/font-files/Inter-LightItalic.woff2 index 4114f0228..555fc5595 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.otf b/docs/font-files/Inter-Medium.otf index 1bcb0a934..3fee170de 100644 Binary files a/docs/font-files/Inter-Medium.otf and b/docs/font-files/Inter-Medium.otf differ diff --git a/docs/font-files/Inter-Medium.woff b/docs/font-files/Inter-Medium.woff index c16b02fc4..495faef7f 100644 Binary files a/docs/font-files/Inter-Medium.woff and b/docs/font-files/Inter-Medium.woff differ diff --git a/docs/font-files/Inter-Medium.woff2 b/docs/font-files/Inter-Medium.woff2 index 7939bd148..871ce4ce5 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.otf b/docs/font-files/Inter-MediumItalic.otf index 0274a218f..3827cd2d4 100644 Binary files a/docs/font-files/Inter-MediumItalic.otf and b/docs/font-files/Inter-MediumItalic.otf differ diff --git a/docs/font-files/Inter-MediumItalic.woff b/docs/font-files/Inter-MediumItalic.woff index 55576163d..389c7a2bf 100644 Binary files a/docs/font-files/Inter-MediumItalic.woff and b/docs/font-files/Inter-MediumItalic.woff differ diff --git a/docs/font-files/Inter-MediumItalic.woff2 b/docs/font-files/Inter-MediumItalic.woff2 index fabe28c12..aa8057992 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.otf b/docs/font-files/Inter-Regular.otf index 6724353f4..2e3c5f4d3 100644 Binary files a/docs/font-files/Inter-Regular.otf and b/docs/font-files/Inter-Regular.otf differ diff --git a/docs/font-files/Inter-Regular.woff b/docs/font-files/Inter-Regular.woff index e267a73f1..fa7715d12 100644 Binary files a/docs/font-files/Inter-Regular.woff and b/docs/font-files/Inter-Regular.woff differ diff --git a/docs/font-files/Inter-Regular.woff2 b/docs/font-files/Inter-Regular.woff2 index 25b72283d..b52dd0a0b 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.otf b/docs/font-files/Inter-SemiBold.otf index a6f9b2dc5..7e014c941 100644 Binary files a/docs/font-files/Inter-SemiBold.otf and b/docs/font-files/Inter-SemiBold.otf differ diff --git a/docs/font-files/Inter-SemiBold.woff b/docs/font-files/Inter-SemiBold.woff index 7147ba1ee..18d7749f5 100644 Binary files a/docs/font-files/Inter-SemiBold.woff and b/docs/font-files/Inter-SemiBold.woff differ diff --git a/docs/font-files/Inter-SemiBold.woff2 b/docs/font-files/Inter-SemiBold.woff2 index df70c25a6..ece5204a1 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.otf b/docs/font-files/Inter-SemiBoldItalic.otf index ac35ffc52..b32d2774d 100644 Binary files a/docs/font-files/Inter-SemiBoldItalic.otf and b/docs/font-files/Inter-SemiBoldItalic.otf differ diff --git a/docs/font-files/Inter-SemiBoldItalic.woff b/docs/font-files/Inter-SemiBoldItalic.woff index 8c0e318fc..8ee64396a 100644 Binary files a/docs/font-files/Inter-SemiBoldItalic.woff and b/docs/font-files/Inter-SemiBoldItalic.woff differ diff --git a/docs/font-files/Inter-SemiBoldItalic.woff2 b/docs/font-files/Inter-SemiBoldItalic.woff2 index 67d27e01f..b32c0ba3b 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.otf b/docs/font-files/Inter-Thin.otf index 442f4724f..7d2391920 100644 Binary files a/docs/font-files/Inter-Thin.otf and b/docs/font-files/Inter-Thin.otf differ diff --git a/docs/font-files/Inter-Thin.woff b/docs/font-files/Inter-Thin.woff index 3121b7e7e..1a22286f6 100644 Binary files a/docs/font-files/Inter-Thin.woff and b/docs/font-files/Inter-Thin.woff differ diff --git a/docs/font-files/Inter-Thin.woff2 b/docs/font-files/Inter-Thin.woff2 index 832328f07..c56bc7ca6 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.otf b/docs/font-files/Inter-ThinItalic.otf index 6a9e70208..ec7ac003c 100644 Binary files a/docs/font-files/Inter-ThinItalic.otf and b/docs/font-files/Inter-ThinItalic.otf differ diff --git a/docs/font-files/Inter-ThinItalic.woff b/docs/font-files/Inter-ThinItalic.woff index d4d2c1990..d8ec8373a 100644 Binary files a/docs/font-files/Inter-ThinItalic.woff and b/docs/font-files/Inter-ThinItalic.woff differ diff --git a/docs/font-files/Inter-ThinItalic.woff2 b/docs/font-files/Inter-ThinItalic.woff2 index 04d159f5e..eca5608c0 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-V.var.otf b/docs/font-files/Inter-V.var.otf index 5fdbaf3e9..a33c6138a 100644 Binary files a/docs/font-files/Inter-V.var.otf and b/docs/font-files/Inter-V.var.otf differ diff --git a/docs/font-files/Inter-V.var.woff2 b/docs/font-files/Inter-V.var.woff2 index 1c2152c92..102dbbd73 100644 Binary files a/docs/font-files/Inter-V.var.woff2 and b/docs/font-files/Inter-V.var.woff2 differ diff --git a/docs/font-files/Inter-italic.var.otf b/docs/font-files/Inter-italic.var.otf index 405ec4b23..933ea8f83 100644 Binary files a/docs/font-files/Inter-italic.var.otf and b/docs/font-files/Inter-italic.var.otf differ diff --git a/docs/font-files/Inter-italic.var.woff2 b/docs/font-files/Inter-italic.var.woff2 index 2d849dad3..1f5d92611 100644 Binary files a/docs/font-files/Inter-italic.var.woff2 and b/docs/font-files/Inter-italic.var.woff2 differ diff --git a/docs/font-files/Inter-roman.var.otf b/docs/font-files/Inter-roman.var.otf index 5c380f6fc..8e2ba40c8 100644 Binary files a/docs/font-files/Inter-roman.var.otf and b/docs/font-files/Inter-roman.var.otf differ diff --git a/docs/font-files/Inter-roman.var.woff2 b/docs/font-files/Inter-roman.var.woff2 index b2753ec96..05621d8d1 100644 Binary files a/docs/font-files/Inter-roman.var.woff2 and b/docs/font-files/Inter-roman.var.woff2 differ diff --git a/docs/font-files/Inter.var.otf b/docs/font-files/Inter.var.otf index 819b15392..035107590 100644 Binary files a/docs/font-files/Inter.var.otf and b/docs/font-files/Inter.var.otf differ diff --git a/docs/font-files/Inter.var.woff2 b/docs/font-files/Inter.var.woff2 index 3696fac33..46bb51539 100644 Binary files a/docs/font-files/Inter.var.woff2 and b/docs/font-files/Inter.var.woff2 differ diff --git a/docs/glyphs/glyphs.css b/docs/glyphs/glyphs.css index 7cf395db1..e78d4aeed 100644 --- a/docs/glyphs/glyphs.css +++ b/docs/glyphs/glyphs.css @@ -10,17 +10,25 @@ body.iframe { padding:20px 10px; } +/*body .charset-table { margin-bottom: 3rem; }*/ +body.single .row.charset { display: none; } + +body .row.intro { display: none; } +body.single .row.intro { display: flex; } + #glyphs { - display: flex; + display: none; flex-wrap: wrap; padding-left: 6px; overflow: hidden; width:200%; box-sizing: border-box; transform-origin: 0 0; - transform: scale(0.5); + /*transform: scale(0.5);*/ + transform: scale(1); justify-content: center; - transition: transform 50ms ease-out; + /*transition: transform 50ms ease-out;*/ + margin-bottom: 0px; } body.single #glyphs { justify-content: flex-start; @@ -28,6 +36,7 @@ body.single #glyphs { margin:0 auto; padding-left: 0; overflow: visible; + display: flex; } .glyph { height: 346px; @@ -43,24 +52,21 @@ body.single #glyphs { text-shadow: none; } .glyph .line { - background: rgba(0,0,0,.1); + background: rgba(0,0,0,0.05); position: absolute; left:0; right:0; height: 1px; z-index:0; visibility: hidden; } - .glyph .line.baseline { - background: rgba(0,90,230,.6); - bottom: 64px; - } - .glyph .line.x-height { - background: rgba(230,60,10,.6); - top: 128px; - } - .glyph .line.cap-height { - background: rgba(60,130,20,.6); - top: 76px; + .glyph .line.baseline { bottom: 64px; visibility: visible; } + .glyph .line.x-height { top: 128px; } + .glyph .line.cap-height { top: 76px; } + .glyph:hover .line.baseline { background: rgba(0,90,230,.6); } + .glyph:hover .line.x-height { background: rgba(230,60,10,.6); } + .glyph:hover .line.cap-height { background: rgba(60,130,20,.6); } + .glyph:hover .line { + visibility: visible; } .glyph .names { position: absolute; @@ -82,16 +88,14 @@ body.single #glyphs { box-sizing: border-box; position: relative; width: 1px; + box-shadow: -1px 0 0 0 rgba(0,0,0,0.05), 1px 0 0 0 rgba(0,0,0,0.05); } .glyph.zero-width .advance { background: transparent; border-left: 1px dashed transparent; } - .glyph:hover .line { - visibility: visible; - } .glyph:hover .advance { - background: rgba(0,90,200,0.1); + box-shadow: -1px 0 0 0 rgba(0,0,0,0.15), 1px 0 0 0 rgba(0,0,0,0.15); } .glyph.zero-width:hover .advance { border-color: #aaa; @@ -111,10 +115,15 @@ body.single #glyphs { body.single .glyph svg { overflow: visible; } - .glyph .advancez { + /*.glyph .advance { display: block; background: salmon; z-index:0; + }*/ + .glyph.stroke svg path { + stroke-width: 8px; + stroke: black; + fill: none; } @@ -164,6 +173,39 @@ body.single .intro p { display: none; } + +body.single .row.styles { display: flex; } +body .row.styles { display: none; } +#style-spectrum { + list-style:none; + /*display: flex;*/ + /*flex-wrap: wrap;*/ + margin-left:0; +} +#style-spectrum > div { + --size: 5rem; + font-family: "Inter var experimental"; + font-size: var(--size); + line-height: 1rem; + display:inline-flex; + align-items: center; + justify-content: center; + min-height: calc(var(--size) * 1.25); + min-width: calc(var(--size) * 1.1); + margin-right:0.1rem; + text-align: center; + cursor: default; +} +#style-spectrum.xl > div { + /* e.g. P.circled */ + --size: 4rem; + min-height: calc(var(--size) * 1.7); + min-width: calc(var(--size) * 1.5); +} + + + + .row.kerning { display: none; } diff --git a/docs/glyphs/glyphs.js b/docs/glyphs/glyphs.js index 882eb4bb4..c0a9ae20b 100644 --- a/docs/glyphs/glyphs.js +++ b/docs/glyphs/glyphs.js @@ -58,7 +58,7 @@ function initMetrics(data) { // We expand the glyph IDs to glyph names here. var nameIds = data.nameids // console.log(data) - + var metrics = {} var metrics0 = data.metrics Object.keys(metrics0).forEach(function (id) { @@ -87,7 +87,7 @@ function initMetrics(data) { console.error('nameIds missing', t[1]) } var kerningValue = t[2] - + var lm = kerningLeft[leftName] if (!lm) { kerningLeft[leftName] = lm = {} @@ -131,7 +131,7 @@ fetchAll(render) var styleSheet = document.styleSheets[document.styleSheets.length-1] var glyphRule, lineRule, zeroWidthAdvRule -var currentScale = 0 +var currentScale = 1 var defaultSingleScale = 1 var currentSingleScale = 1 var defaultGridScale = 0.4 @@ -149,60 +149,7 @@ function updateLayoutAfterChanges() { } } -function setScale(scale) { - if (queryString.iframe !== undefined) { - scale = 0.11 - } else if (queryString.g) { - scale = Math.min(Math.max(1, scale), 3) - } else { - scale = Math.min(Math.max(0.05, scale), 3) - } - if (currentScale == scale) { - return - } - - currentScale = scale - if (queryString.g) { - currentSingleScale = scale - } else { - currentGridScale = scale - } - - var hairline = Math.ceil(1 / window.devicePixelRatio / scale) - var spacing = Math.ceil(6 / scale) - - var s = glyphs.style - if (queryString.g || queryString.iframe !== undefined) { - s.paddingLeft = null - } else { - s.paddingLeft = spacing + 'px' - } - s.width = (100 / scale) + '%' - s.transform = 'scale(' + scale + ')' - - if (!glyphRule) { - glyphRule = styleSheet.cssRules[styleSheet.insertRule('#glyphs .glyph {}', styleSheet.cssRules.length)] - lineRule = styleSheet.cssRules[styleSheet.insertRule('#glyphs .glyph .line {}', styleSheet.cssRules.length)] - zeroWidthAdvRule = styleSheet.cssRules[styleSheet.insertRule('#glyphs .glyph.zero-width .advance {}', styleSheet.cssRules.length)] - } - - if (queryString.g) { - glyphRule.style.marginRight = null - glyphRule.style.marginBottom = null - } else { - glyphRule.style.marginRight = Math.ceil(6 / scale) + 'px'; - glyphRule.style.marginBottom = Math.ceil(6 / scale) + 'px'; - if (queryString.iframe !== undefined) { - glyphRule.style.marginBottom = Math.ceil(16 / scale) + 'px'; - } - } - lineRule.style.height = hairline + 'px' - zeroWidthAdvRule.style.borderWidth = (hairline) + 'px' - - updateLayoutAfterChanges() - requestAnimationFrame(updateLayoutAfterChanges) -} function encodeQueryString(q) { @@ -238,8 +185,8 @@ singleInfo.style.display = 'block' function updateLocation() { queryString = parseQueryString(location.search) + // console.log("updateLocation. queryString=", queryString) - // var glyphs = document.getElementById('glyphs') var h1 = document.querySelector('h1') if (queryString.g) { if (!glyphNameEl) { @@ -252,26 +199,15 @@ function updateLocation() { glyphNameEl.innerText = queryString.g h1.appendChild(glyphNameEl) document.body.classList.add('single') - setScale(currentSingleScale) + render() } else { document.title = baseTitle if (glyphNameEl) { - h1.removeChild(glyphNameEl) + try { h1.removeChild(glyphNameEl) } catch(_) {} } document.body.classList.remove('single') - setScale(currentGridScale) } - - document.querySelector('.row.intro').style.display = ( - queryString.iframe !== undefined ? 'none' : null - ) - if (queryString.iframe !== undefined) { - document.body.classList.add('iframe') - } else { - document.body.classList.remove('iframe') - } - - render() + // render() } window.onpopstate = function(ev) { @@ -299,24 +235,29 @@ wrapIntLink(document.querySelector('h1 > a')) // keep refs to svgs so we don't have to refcount while using -var svgRepository = {} -;(function(){ - var svgs = document.getElementById('svgs'), svg, name - for (var i = 0; i < svgs.children.length; ++i) { - svg = svgs.children[i] - name = svg.id.substr(4) // strip "svg-" prefix - svgRepository[name] = svg +var svgRepository = null +function getGlyphSVG(name) { + if (!svgRepository) { + svgRepository = {} + let svgs = document.getElementById('svgs') + for (let i = 0; i < svgs.children.length; ++i) { + let svg = svgs.children[i] + let name = svg.id.substr(4) // strip "svg-" prefix + svgRepository[name] = svg + } } -})() + return svgRepository[name] +} // Maps glyphname to glyphInfo. Only links to first found entry for a flyph. var glyphInfoMap = {} -var needsUpdateGlyphInfoMap = true function render() { - if (!glyphInfo) { + let glyphname = queryString.g + + if (!glyphInfo || !glyphname) { return } @@ -326,7 +267,7 @@ function render() { // glyphinfo.json: // { "glyphs": [ - // [name :string, isEmpty: 1|0, unicode? :string|null, + // [name :string, isEmpty: 1|0, unicode? :string|null, // unicodeName? :string, color? :string|null], // ["A", 0, 65, "LATIN CAPITAL LETTER A", "#dbeaf7"], // ... @@ -339,57 +280,78 @@ function render() { // ["Delta", 0, "U+8710", "INCREMENT"], // - var singleGlyph = null - var lastGlyphEl = null - var lastGlyphName = '' + let g; - glyphInfo.forEach(function(g, i) { - var name = g[0] - - if (needsUpdateGlyphInfoMap && !glyphInfoMap[name]) { - glyphInfoMap[name] = g - } - - if (queryString.g && name != queryString.g) { - // ignore - return - } - - var glyph = renderGlyphGraphicG(g, lastGlyphName, lastGlyphEl, singleGlyph) - - if (glyph) { - rootEl.appendChild(glyph.element) - lastGlyphEl = glyph.element - lastGlyphName = name - if (queryString.g) { - singleGlyph = glyph + for (let i = 0; i < glyphInfo.length; i++) { + g = glyphInfo[i] + if (glyphname == g[0]) { + let glyph = renderGlyphGraphicG(g) + if (glyph) { + rootEl.appendChild(glyph.element) + renderSingleInfo(glyph) + rootEl.appendChild(singleInfo) } + break } - }) - - needsUpdateGlyphInfoMap = false - - if (singleGlyph) { - renderSingleInfo(singleGlyph) - rootEl.appendChild(singleInfo) } + renderStyleSpectrum(g) + rootEl.style.display = null updateLayoutAfterChanges() } +const stringFromCodePoint = String.fromCodePoint || function(c) { + return String.fromCharCode(c) +} + + +function glyphIsXL(g) { + let m + return glyphMetrics && (m = glyphMetrics.metrics[g[0]]) && m.advance > 3200 + // console.log("glyphMetrics.metrics", glyphMetrics.metrics[g[0]]) + // return g[0].indexOf(".circled") != -1 +} + + +function renderStyleSpectrum(g) { + // console.log("renderStyleSpectrum", g) + let list = document.querySelector("#style-spectrum") + list.innerText = "" + + let s = stringFromCodePoint(parseInt(g[2],16)) + list.classList.toggle("xl", glyphIsXL(g)) + + for (let slant = 0; slant <= 10; slant += 2) { + for (let weight = 100; weight <= 900; weight += 100) { + let el = document.createElement("div") + el.innerText = s + el.title = `wght ${weight}, slnt -${slant}°` + el.style.fontWeight = weight + if (slant > 0) { + el.style.fontStyle = "italic" + } + el.style.webkitFontVariationSettings = el.style.fontVariationSettings = + `'wght' ${weight}, 'slnt' -${slant}` + list.appendChild(el) + } + list.appendChild(document.createElement("br")) + } +} + + function renderGlyphGraphic(glyphName) { var g = glyphInfoMap[glyphName] return g ? renderGlyphGraphicG(g) : null } -function renderGlyphGraphicG(g, lastGlyphName, lastGlyphEl, singleGlyph) { +function renderGlyphGraphicG(g /*, lastGlyphName, lastGlyphEl, singleGlyph*/) { // let [name, isEmpty, uc, ucName, color] = g let name = g[0], /*isEmpty = g[1],*/ uc = g[2], ucName = g[3], color = g[4] var names, glyph - var svg = svgRepository[name] + var svg = getGlyphSVG(name) if (!svg) { // ignore @@ -416,38 +378,38 @@ function renderGlyphGraphicG(g, lastGlyphName, lastGlyphEl, singleGlyph) { element: null, } - if (name == lastGlyphName) { - // additional Unicode code point for same glyph - glyph = lastGlyphEl - names = glyph.querySelector('.names') - names.innerText += ',' - if (info.unicode) { - var ucid = ' U+' + info.unicode - names.innerText += ' U+' + info.unicode - if (!queryString.g) { - glyph.title += ucid - } - } - if (info.unicodeName) { - names.innerText += ' ' + info.unicodeName - if (!queryString.g) { - glyph.title += ' (' + info.unicodeName + ')' - } - } + // if (name == lastGlyphName) { + // // additional Unicode code point for same glyph + // glyph = lastGlyphEl + // names = glyph.querySelector('.names') + // names.innerText += ',' + // if (info.unicode) { + // var ucid = ' U+' + info.unicode + // names.innerText += ' U+' + info.unicode + // if (!queryString.g) { + // glyph.title += ucid + // } + // } + // if (info.unicodeName) { + // names.innerText += ' ' + info.unicodeName + // if (!queryString.g) { + // glyph.title += ' (' + info.unicodeName + ')' + // } + // } - if (queryString.g) { - if (singleGlyph) { - if (!singleGlyph.alternates) { - singleGlyph.alternates = [] - } - singleGlyph.alternates.push(info) - } else { - throw new Error('alternate glyph UC, but appears first in glyphinfo data') - } - } + // if (queryString.g) { + // if (singleGlyph) { + // if (!singleGlyph.alternates) { + // singleGlyph.alternates = [] + // } + // singleGlyph.alternates.push(info) + // } else { + // throw new Error('alternate glyph UC, but appears first in glyphinfo data') + // } + // } - return - } + // return + // } // console.log('svg for', name, svg.width.baseVal.value, '->', svg, '\n', info) @@ -580,7 +542,7 @@ function renderSingleInfo(g) { colorMark.classList.add('none') } - var svg = svgRepository[g.name] + var svg = getGlyphSVG(g.name) var svgFile = e.querySelector('.svgFile') svgFile.download = g.name + '.svg' svgFile.href = getSvgDataURI(svg) @@ -613,29 +575,29 @@ function selectKerningPair(id, directly) { // deselect existing eachElement('.kernpair.selected', function(kernpair) { eachElement(kernpair, '.g', function (glyph) { - var svgURI = getSvgDataURI(svgRepository[glyph.dataset.name]) + var svgURI = getSvgDataURI(getGlyphSVG(glyph.dataset.name)) glyph.style.backgroundImage = "url('" + svgURI + "')" }) kernpair.classList.remove('selected') }) var el = document.getElementById(id) - + if (!el) { history.replaceState({}, '', location.search) return } - + el.classList.add('selected') eachElement(el, '.g', function (glyph) { - var svgURI = getSvgDataURI(svgRepository[glyph.dataset.name], 'white') + var svgURI = getSvgDataURI(getGlyphSVG(glyph.dataset.name), 'white') glyph.style.backgroundImage = "url('" + svgURI + "')" }) if (!directly) { el.scrollIntoViewIfNeeded() } - + history.replaceState({}, '', location.search + '#' + id) } @@ -645,7 +607,7 @@ function renderSingleKerning(g) { var kerningList = document.getElementById('kerning-list') kerningList.style.display = 'none' kerningList.innerText = '' - var thisSvg = svgRepository[g.name] + var thisSvg = getGlyphSVG(g.name) var thisSvgURI = getSvgDataURI(thisSvg) if (!thisSvg) { @@ -705,7 +667,7 @@ function renderSingleKerning(g) { keys.forEach(function(glyphName) { var kerningValue = kerningInfo[glyphName] - var otherSvg = svgRepository[glyphName] + var otherSvg = getGlyphSVG(glyphName) var pair = document.createElement('a') pair.className = 'kernpair ' + side @@ -782,7 +744,7 @@ function renderSingleKerning(g) { pair.appendChild(link) } - + kerningList.appendChild(pair) }) @@ -824,19 +786,22 @@ function fmthex(cp, minWidth) { } -document.addEventListener('keydown', function(ev) { - if (!queryString.g && (ev.metaKey || ev.ctrlKey)) { - if (ev.keyCode == 187 || ev.key == '+') { - setScale(parseFloat((currentScale + 0.1).toFixed(2))) - ev.preventDefault() - } else if (ev.keyCode == 189 || ev.key == '-') { - setScale(parseFloat((currentScale - 0.1).toFixed(2))) - ev.preventDefault() - } else if (ev.keyCode == 48 || ev.key == '0') { - setScale(queryString.g ? defaultSingleScale : defaultGridScale) - ev.preventDefault() - } +// hook up glyph table click handlers +function onClickGlyphInTable(ev) { + // let le = ev.target + document.location.href = "?g=" + encodeURI(ev.target.dataset.glyphname) +} +const activeListener = { capture: true } +let cv = document.querySelector('.charset-table').querySelectorAll('c') +for (let i = 0; i < cv.length; i++) { + let c = cv[i] + if (typeof PointerEvent == "undefined") { + c.addEventListener('mousedown', onClickGlyphInTable, activeListener) + } else { + c.addEventListener('pointerdown', onClickGlyphInTable, activeListener) } -}) +} +// document.location.href = "/glyphs/?g=" + encodeURI(ev.target.dataset.glyphname) -updateLocation() \ No newline at end of file + +updateLocation() diff --git a/docs/glyphs/index.html b/docs/glyphs/index.html index 8d31dbca8..a6692f9c6 100644 --- a/docs/glyphs/index.html +++ b/docs/glyphs/index.html @@ -20,6 +20,43 @@ endfor %} + +
+

Glyphs

+

+ The complete set of glyphs. Tap a glyph to learn more about it. +

+
+ +
+{% include charset-table.html %} +
+ +
+ +
+ +
+

Style spectrum

+
+
+ +
+

Kerning

+

List of all kerning pairs involving this glyph.

+
+
+
@@ -312,7 +349,7 @@ endfor - + @@ -508,12 +545,12 @@ endfor - + - + @@ -1565,7 +1602,7 @@ endfor - + @@ -1752,7 +1789,7 @@ endfor - + @@ -1811,7 +1848,7 @@ endfor - + @@ -1859,7 +1896,7 @@ endfor - + @@ -1882,7 +1919,7 @@ endfor - + @@ -2391,7 +2428,7 @@ endfor - + @@ -2508,7 +2545,7 @@ endfor - + @@ -2559,30 +2596,5 @@ endfor
-
-

Glyphs

-

- This shows the complete set of glyphs in Inter Regular. -

-
- -
- -
- -
-

Kerning

-
-
diff --git a/docs/glyphs/metrics.json b/docs/glyphs/metrics.json index 19edf8594..749974928 100644 --- a/docs/glyphs/metrics.json +++ b/docs/glyphs/metrics.json @@ -2771,7 +2771,7 @@ "231":[2004.0, 2100, 24.0, 72.0], "232":[1516.0, 1836, 248.0, 72.0], "233":[1500.0, 1820, 248.0, 72.0], -"234":[1560.0, 2008, 248.0, 200.0], +"234":[1560.0, 1936, 248.0, 128.0], "235":[1504.0, 1912, 248.0, 160.0], "236":[1516.0, 1836, 248.0, 72.0], "237":[1532.0, 1852, 248.0, 72.0], @@ -2828,7 +2828,7 @@ "288":[3712.0, 3912, 100.0, 100.0], "289":[2332.0, 2684, 168.0, 184.0], "290":[2084.0, 2544, 232.0, 228.0], -"291":[2016.0, 2288, 136.0, 136.0], +"291":[2016.0, 2432, 168.0, 248.0], "292":[1808.0, 2144, 168.0, 168.0], "293":[1808.0, 2144, 168.0, 168.0], "294":[1808.0, 2144, 168.0, 168.0], @@ -4081,7 +4081,7 @@ "1541":[380.0, 560, 136.0, 44.0], "1542":[380.0, 624, 196.0, 48.0], "1543":[380.0, 520, 44.0, 96.0], -"1544":[380.0, 560, 44.0, 136.0], +"1544":[380.0, 560, 40.0, 140.0], "1545":[220.0, 624, 200.0, 204.0], "1546":[768.0, 1048, 216.0, 64.0], "1547":[840.0, 1080, 216.0, 24.0], @@ -4327,7 +4327,7 @@ "1787":[1380.0, 1660, 140.0, 140.0], "1788":[824.0, 1040, 88.0, 128.0], "1789":[1848.0, 2032, 92.0, 92.0], -"1790":[1444.0, 1788, 216.0, 128.0], +"1790":[1424.0, 1788, 216.0, 148.0], "1791":[1552.0, 1664, -104.0, 216.0], "1792":[824.0, 1024, 112.0, 88.0], "1793":[1536.0, 1808, 136.0, 136.0], @@ -40909,226 +40909,226 @@ [1085,4,-64], [1085,29,-64], [1085,2494,-64], -[135,389,96], -[135,396,96], -[135,394,96], -[135,1852,96], -[135,397,96], -[135,398,96], -[135,404,96], -[135,395,96], -[135,402,96], -[135,408,96], -[135,1882,96], -[135,392,96], -[135,400,96], -[135,615,96], -[135,597,96], -[135,604,96], -[135,1445,96], -[135,393,96], -[135,589,96], -[135,399,96], -[143,389,96], -[143,396,96], -[143,394,96], -[143,1852,96], -[143,397,96], -[143,398,96], -[143,404,96], -[143,395,96], -[143,402,96], -[143,408,96], -[143,1882,96], -[143,392,96], -[143,400,96], -[143,615,96], -[143,597,96], -[143,604,96], -[143,1445,96], -[143,393,96], -[143,589,96], -[143,399,96], -[158,389,96], -[158,396,96], -[158,394,96], -[158,1852,96], -[158,397,96], -[158,398,96], -[158,404,96], -[158,395,96], -[158,402,96], -[158,408,96], -[158,1882,96], -[158,392,96], -[158,400,96], -[158,615,96], -[158,597,96], -[158,604,96], -[158,1445,96], -[158,393,96], -[158,589,96], -[158,399,96], -[149,389,96], -[149,396,96], -[149,394,96], -[149,1852,96], -[149,397,96], -[149,398,96], -[149,404,96], -[149,395,96], -[149,402,96], -[149,408,96], -[149,1882,96], -[149,392,96], -[149,400,96], -[149,615,96], -[149,597,96], -[149,604,96], -[149,1445,96], -[149,393,96], -[149,589,96], -[149,399,96], -[145,389,96], -[145,396,96], -[145,394,96], -[145,1852,96], -[145,397,96], -[145,398,96], -[145,404,96], -[145,395,96], -[145,402,96], -[145,408,96], -[145,1882,96], -[145,392,96], -[145,400,96], -[145,615,96], -[145,597,96], -[145,604,96], -[145,1445,96], -[145,393,96], -[145,589,96], -[145,399,96], -[153,389,96], -[153,396,96], -[153,394,96], -[153,1852,96], -[153,397,96], -[153,398,96], -[153,404,96], -[153,395,96], -[153,402,96], -[153,408,96], -[153,1882,96], -[153,392,96], -[153,400,96], -[153,615,96], -[153,597,96], -[153,604,96], -[153,1445,96], -[153,393,96], -[153,589,96], -[153,399,96], -[151,389,96], -[151,396,96], -[151,394,96], -[151,1852,96], -[151,397,96], -[151,398,96], -[151,404,96], -[151,395,96], -[151,402,96], -[151,408,96], -[151,1882,96], -[151,392,96], -[151,400,96], -[151,615,96], -[151,597,96], -[151,604,96], -[151,1445,96], -[151,393,96], -[151,589,96], -[151,399,96], -[147,389,96], -[147,396,96], -[147,394,96], -[147,1852,96], -[147,397,96], -[147,398,96], -[147,404,96], -[147,395,96], -[147,402,96], -[147,408,96], -[147,1882,96], -[147,392,96], -[147,400,96], -[147,615,96], -[147,597,96], -[147,604,96], -[147,1445,96], -[147,393,96], -[147,589,96], -[147,399,96], -[139,389,96], -[139,396,96], -[139,394,96], -[139,1852,96], -[139,397,96], -[139,398,96], -[139,404,96], -[139,395,96], -[139,402,96], -[139,408,96], -[139,1882,96], -[139,392,96], -[139,400,96], -[139,615,96], -[139,597,96], -[139,604,96], -[139,1445,96], -[139,393,96], -[139,589,96], -[139,399,96], -[160,389,96], -[160,396,96], -[160,394,96], -[160,1852,96], -[160,397,96], -[160,398,96], -[160,404,96], -[160,395,96], -[160,402,96], -[160,408,96], -[160,1882,96], -[160,392,96], -[160,400,96], -[160,615,96], -[160,597,96], -[160,604,96], -[160,1445,96], -[160,393,96], -[160,589,96], -[160,399,96], -[1085,389,96], -[1085,396,96], -[1085,394,96], -[1085,1852,96], -[1085,397,96], -[1085,398,96], -[1085,404,96], -[1085,395,96], -[1085,402,96], -[1085,408,96], -[1085,1882,96], -[1085,392,96], -[1085,400,96], -[1085,615,96], -[1085,597,96], -[1085,604,96], -[1085,1445,96], -[1085,393,96], -[1085,589,96], -[1085,399,96], +[135,389,-84], +[135,396,-84], +[135,394,-84], +[135,1852,-84], +[135,397,-84], +[135,398,-84], +[135,404,-84], +[135,395,-84], +[135,402,-84], +[135,408,-84], +[135,1882,-84], +[135,392,-84], +[135,400,-84], +[135,615,-84], +[135,597,-84], +[135,604,-84], +[135,1445,-84], +[135,393,-84], +[135,589,-84], +[135,399,-84], +[143,389,-84], +[143,396,-84], +[143,394,-84], +[143,1852,-84], +[143,397,-84], +[143,398,-84], +[143,404,-84], +[143,395,-84], +[143,402,-84], +[143,408,-84], +[143,1882,-84], +[143,392,-84], +[143,400,-84], +[143,615,-84], +[143,597,-84], +[143,604,-84], +[143,1445,-84], +[143,393,-84], +[143,589,-84], +[143,399,-84], +[158,389,-84], +[158,396,-84], +[158,394,-84], +[158,1852,-84], +[158,397,-84], +[158,398,-84], +[158,404,-84], +[158,395,-84], +[158,402,-84], +[158,408,-84], +[158,1882,-84], +[158,392,-84], +[158,400,-84], +[158,615,-84], +[158,597,-84], +[158,604,-84], +[158,1445,-84], +[158,393,-84], +[158,589,-84], +[158,399,-84], +[149,389,-84], +[149,396,-84], +[149,394,-84], +[149,1852,-84], +[149,397,-84], +[149,398,-84], +[149,404,-84], +[149,395,-84], +[149,402,-84], +[149,408,-84], +[149,1882,-84], +[149,392,-84], +[149,400,-84], +[149,615,-84], +[149,597,-84], +[149,604,-84], +[149,1445,-84], +[149,393,-84], +[149,589,-84], +[149,399,-84], +[145,389,-84], +[145,396,-84], +[145,394,-84], +[145,1852,-84], +[145,397,-84], +[145,398,-84], +[145,404,-84], +[145,395,-84], +[145,402,-84], +[145,408,-84], +[145,1882,-84], +[145,392,-84], +[145,400,-84], +[145,615,-84], +[145,597,-84], +[145,604,-84], +[145,1445,-84], +[145,393,-84], +[145,589,-84], +[145,399,-84], +[153,389,-84], +[153,396,-84], +[153,394,-84], +[153,1852,-84], +[153,397,-84], +[153,398,-84], +[153,404,-84], +[153,395,-84], +[153,402,-84], +[153,408,-84], +[153,1882,-84], +[153,392,-84], +[153,400,-84], +[153,615,-84], +[153,597,-84], +[153,604,-84], +[153,1445,-84], +[153,393,-84], +[153,589,-84], +[153,399,-84], +[151,389,-84], +[151,396,-84], +[151,394,-84], +[151,1852,-84], +[151,397,-84], +[151,398,-84], +[151,404,-84], +[151,395,-84], +[151,402,-84], +[151,408,-84], +[151,1882,-84], +[151,392,-84], +[151,400,-84], +[151,615,-84], +[151,597,-84], +[151,604,-84], +[151,1445,-84], +[151,393,-84], +[151,589,-84], +[151,399,-84], +[147,389,-84], +[147,396,-84], +[147,394,-84], +[147,1852,-84], +[147,397,-84], +[147,398,-84], +[147,404,-84], +[147,395,-84], +[147,402,-84], +[147,408,-84], +[147,1882,-84], +[147,392,-84], +[147,400,-84], +[147,615,-84], +[147,597,-84], +[147,604,-84], +[147,1445,-84], +[147,393,-84], +[147,589,-84], +[147,399,-84], +[139,389,-84], +[139,396,-84], +[139,394,-84], +[139,1852,-84], +[139,397,-84], +[139,398,-84], +[139,404,-84], +[139,395,-84], +[139,402,-84], +[139,408,-84], +[139,1882,-84], +[139,392,-84], +[139,400,-84], +[139,615,-84], +[139,597,-84], +[139,604,-84], +[139,1445,-84], +[139,393,-84], +[139,589,-84], +[139,399,-84], +[160,389,-84], +[160,396,-84], +[160,394,-84], +[160,1852,-84], +[160,397,-84], +[160,398,-84], +[160,404,-84], +[160,395,-84], +[160,402,-84], +[160,408,-84], +[160,1882,-84], +[160,392,-84], +[160,400,-84], +[160,615,-84], +[160,597,-84], +[160,604,-84], +[160,1445,-84], +[160,393,-84], +[160,589,-84], +[160,399,-84], +[1085,389,-84], +[1085,396,-84], +[1085,394,-84], +[1085,1852,-84], +[1085,397,-84], +[1085,398,-84], +[1085,404,-84], +[1085,395,-84], +[1085,402,-84], +[1085,408,-84], +[1085,1882,-84], +[1085,392,-84], +[1085,400,-84], +[1085,615,-84], +[1085,597,-84], +[1085,604,-84], +[1085,1445,-84], +[1085,393,-84], +[1085,589,-84], +[1085,399,-84], [135,455,-64], [135,460,-64], [135,459,-64], @@ -41305,6 +41305,226 @@ [1085,507,-16], [1085,509,-16], [1085,2017,-16], +[135,476,-64], +[135,487,-64], +[135,480,-64], +[135,481,-64], +[135,482,-64], +[135,1875,-64], +[135,483,-64], +[135,486,-64], +[135,484,-64], +[135,488,-64], +[135,490,-64], +[135,1898,-64], +[135,442,-64], +[135,448,-64], +[135,445,-64], +[135,2322,-64], +[135,2323,-64], +[135,590,-64], +[135,450,-64], +[135,451,-64], +[143,476,-64], +[143,487,-64], +[143,480,-64], +[143,481,-64], +[143,482,-64], +[143,1875,-64], +[143,483,-64], +[143,486,-64], +[143,484,-64], +[143,488,-64], +[143,490,-64], +[143,1898,-64], +[143,442,-64], +[143,448,-64], +[143,445,-64], +[143,2322,-64], +[143,2323,-64], +[143,590,-64], +[143,450,-64], +[143,451,-64], +[158,476,-64], +[158,487,-64], +[158,480,-64], +[158,481,-64], +[158,482,-64], +[158,1875,-64], +[158,483,-64], +[158,486,-64], +[158,484,-64], +[158,488,-64], +[158,490,-64], +[158,1898,-64], +[158,442,-64], +[158,448,-64], +[158,445,-64], +[158,2322,-64], +[158,2323,-64], +[158,590,-64], +[158,450,-64], +[158,451,-64], +[149,476,-64], +[149,487,-64], +[149,480,-64], +[149,481,-64], +[149,482,-64], +[149,1875,-64], +[149,483,-64], +[149,486,-64], +[149,484,-64], +[149,488,-64], +[149,490,-64], +[149,1898,-64], +[149,442,-64], +[149,448,-64], +[149,445,-64], +[149,2322,-64], +[149,2323,-64], +[149,590,-64], +[149,450,-64], +[149,451,-64], +[145,476,-64], +[145,487,-64], +[145,480,-64], +[145,481,-64], +[145,482,-64], +[145,1875,-64], +[145,483,-64], +[145,486,-64], +[145,484,-64], +[145,488,-64], +[145,490,-64], +[145,1898,-64], +[145,442,-64], +[145,448,-64], +[145,445,-64], +[145,2322,-64], +[145,2323,-64], +[145,590,-64], +[145,450,-64], +[145,451,-64], +[153,476,-64], +[153,487,-64], +[153,480,-64], +[153,481,-64], +[153,482,-64], +[153,1875,-64], +[153,483,-64], +[153,486,-64], +[153,484,-64], +[153,488,-64], +[153,490,-64], +[153,1898,-64], +[153,442,-64], +[153,448,-64], +[153,445,-64], +[153,2322,-64], +[153,2323,-64], +[153,590,-64], +[153,450,-64], +[153,451,-64], +[151,476,-64], +[151,487,-64], +[151,480,-64], +[151,481,-64], +[151,482,-64], +[151,1875,-64], +[151,483,-64], +[151,486,-64], +[151,484,-64], +[151,488,-64], +[151,490,-64], +[151,1898,-64], +[151,442,-64], +[151,448,-64], +[151,445,-64], +[151,2322,-64], +[151,2323,-64], +[151,590,-64], +[151,450,-64], +[151,451,-64], +[147,476,-64], +[147,487,-64], +[147,480,-64], +[147,481,-64], +[147,482,-64], +[147,1875,-64], +[147,483,-64], +[147,486,-64], +[147,484,-64], +[147,488,-64], +[147,490,-64], +[147,1898,-64], +[147,442,-64], +[147,448,-64], +[147,445,-64], +[147,2322,-64], +[147,2323,-64], +[147,590,-64], +[147,450,-64], +[147,451,-64], +[139,476,-64], +[139,487,-64], +[139,480,-64], +[139,481,-64], +[139,482,-64], +[139,1875,-64], +[139,483,-64], +[139,486,-64], +[139,484,-64], +[139,488,-64], +[139,490,-64], +[139,1898,-64], +[139,442,-64], +[139,448,-64], +[139,445,-64], +[139,2322,-64], +[139,2323,-64], +[139,590,-64], +[139,450,-64], +[139,451,-64], +[160,476,-64], +[160,487,-64], +[160,480,-64], +[160,481,-64], +[160,482,-64], +[160,1875,-64], +[160,483,-64], +[160,486,-64], +[160,484,-64], +[160,488,-64], +[160,490,-64], +[160,1898,-64], +[160,442,-64], +[160,448,-64], +[160,445,-64], +[160,2322,-64], +[160,2323,-64], +[160,590,-64], +[160,450,-64], +[160,451,-64], +[1085,476,-64], +[1085,487,-64], +[1085,480,-64], +[1085,481,-64], +[1085,482,-64], +[1085,1875,-64], +[1085,483,-64], +[1085,486,-64], +[1085,484,-64], +[1085,488,-64], +[1085,490,-64], +[1085,1898,-64], +[1085,442,-64], +[1085,448,-64], +[1085,445,-64], +[1085,2322,-64], +[1085,2323,-64], +[1085,590,-64], +[1085,450,-64], +[1085,451,-64], [135,1143,96], [135,1144,96], [135,1170,96], @@ -112494,6 +112714,286 @@ [1895,459,-48], [1895,142,-48], [1895,621,-48], +[136,476,-68], +[136,487,-68], +[136,480,-68], +[136,481,-68], +[136,482,-68], +[136,1875,-68], +[136,483,-68], +[136,486,-68], +[136,484,-68], +[136,488,-68], +[136,490,-68], +[136,1898,-68], +[136,442,-68], +[136,448,-68], +[136,445,-68], +[136,2322,-68], +[136,2323,-68], +[136,590,-68], +[136,450,-68], +[136,451,-68], +[352,476,-68], +[352,487,-68], +[352,480,-68], +[352,481,-68], +[352,482,-68], +[352,1875,-68], +[352,483,-68], +[352,486,-68], +[352,484,-68], +[352,488,-68], +[352,490,-68], +[352,1898,-68], +[352,442,-68], +[352,448,-68], +[352,445,-68], +[352,2322,-68], +[352,2323,-68], +[352,590,-68], +[352,450,-68], +[352,451,-68], +[355,476,-68], +[355,487,-68], +[355,480,-68], +[355,481,-68], +[355,482,-68], +[355,1875,-68], +[355,483,-68], +[355,486,-68], +[355,484,-68], +[355,488,-68], +[355,490,-68], +[355,1898,-68], +[355,442,-68], +[355,448,-68], +[355,445,-68], +[355,2322,-68], +[355,2323,-68], +[355,590,-68], +[355,450,-68], +[355,451,-68], +[357,476,-68], +[357,487,-68], +[357,480,-68], +[357,481,-68], +[357,482,-68], +[357,1875,-68], +[357,483,-68], +[357,486,-68], +[357,484,-68], +[357,488,-68], +[357,490,-68], +[357,1898,-68], +[357,442,-68], +[357,448,-68], +[357,445,-68], +[357,2322,-68], +[357,2323,-68], +[357,590,-68], +[357,450,-68], +[357,451,-68], +[356,476,-68], +[356,487,-68], +[356,480,-68], +[356,481,-68], +[356,482,-68], +[356,1875,-68], +[356,483,-68], +[356,486,-68], +[356,484,-68], +[356,488,-68], +[356,490,-68], +[356,1898,-68], +[356,442,-68], +[356,448,-68], +[356,445,-68], +[356,2322,-68], +[356,2323,-68], +[356,590,-68], +[356,450,-68], +[356,451,-68], +[358,476,-68], +[358,487,-68], +[358,480,-68], +[358,481,-68], +[358,482,-68], +[358,1875,-68], +[358,483,-68], +[358,486,-68], +[358,484,-68], +[358,488,-68], +[358,490,-68], +[358,1898,-68], +[358,442,-68], +[358,448,-68], +[358,445,-68], +[358,2322,-68], +[358,2323,-68], +[358,590,-68], +[358,450,-68], +[358,451,-68], +[363,476,-68], +[363,487,-68], +[363,480,-68], +[363,481,-68], +[363,482,-68], +[363,1875,-68], +[363,483,-68], +[363,486,-68], +[363,484,-68], +[363,488,-68], +[363,490,-68], +[363,1898,-68], +[363,442,-68], +[363,448,-68], +[363,445,-68], +[363,2322,-68], +[363,2323,-68], +[363,590,-68], +[363,450,-68], +[363,451,-68], +[359,476,-68], +[359,487,-68], +[359,480,-68], +[359,481,-68], +[359,482,-68], +[359,1875,-68], +[359,483,-68], +[359,486,-68], +[359,484,-68], +[359,488,-68], +[359,490,-68], +[359,1898,-68], +[359,442,-68], +[359,448,-68], +[359,445,-68], +[359,2322,-68], +[359,2323,-68], +[359,590,-68], +[359,450,-68], +[359,451,-68], +[360,476,-68], +[360,487,-68], +[360,480,-68], +[360,481,-68], +[360,482,-68], +[360,1875,-68], +[360,483,-68], +[360,486,-68], +[360,484,-68], +[360,488,-68], +[360,490,-68], +[360,1898,-68], +[360,442,-68], +[360,448,-68], +[360,445,-68], +[360,2322,-68], +[360,2323,-68], +[360,590,-68], +[360,450,-68], +[360,451,-68], +[361,476,-68], +[361,487,-68], +[361,480,-68], +[361,481,-68], +[361,482,-68], +[361,1875,-68], +[361,483,-68], +[361,486,-68], +[361,484,-68], +[361,488,-68], +[361,490,-68], +[361,1898,-68], +[361,442,-68], +[361,448,-68], +[361,445,-68], +[361,2322,-68], +[361,2323,-68], +[361,590,-68], +[361,450,-68], +[361,451,-68], +[364,476,-68], +[364,487,-68], +[364,480,-68], +[364,481,-68], +[364,482,-68], +[364,1875,-68], +[364,483,-68], +[364,486,-68], +[364,484,-68], +[364,488,-68], +[364,490,-68], +[364,1898,-68], +[364,442,-68], +[364,448,-68], +[364,445,-68], +[364,2322,-68], +[364,2323,-68], +[364,590,-68], +[364,450,-68], +[364,451,-68], +[1569,476,-68], +[1569,487,-68], +[1569,480,-68], +[1569,481,-68], +[1569,482,-68], +[1569,1875,-68], +[1569,483,-68], +[1569,486,-68], +[1569,484,-68], +[1569,488,-68], +[1569,490,-68], +[1569,1898,-68], +[1569,442,-68], +[1569,448,-68], +[1569,445,-68], +[1569,2322,-68], +[1569,2323,-68], +[1569,590,-68], +[1569,450,-68], +[1569,451,-68], +[368,476,-68], +[368,487,-68], +[368,480,-68], +[368,481,-68], +[368,482,-68], +[368,1875,-68], +[368,483,-68], +[368,486,-68], +[368,484,-68], +[368,488,-68], +[368,490,-68], +[368,1898,-68], +[368,442,-68], +[368,448,-68], +[368,445,-68], +[368,2322,-68], +[368,2323,-68], +[368,590,-68], +[368,450,-68], +[368,451,-68], +[1895,476,-68], +[1895,487,-68], +[1895,480,-68], +[1895,481,-68], +[1895,482,-68], +[1895,1875,-68], +[1895,483,-68], +[1895,486,-68], +[1895,484,-68], +[1895,488,-68], +[1895,490,-68], +[1895,1898,-68], +[1895,442,-68], +[1895,448,-68], +[1895,445,-68], +[1895,2322,-68], +[1895,2323,-68], +[1895,590,-68], +[1895,450,-68], +[1895,451,-68], [136,514,-16], [136,518,-16], [136,520,-16], diff --git a/docs/index.css b/docs/index.css index d9fc2a613..c38fa49d5 100644 --- a/docs/index.css +++ b/docs/index.css @@ -51,7 +51,7 @@ h1 { width: var(--subwayHeight); height: var(--subwayHeight); color: black; - background: var(--yellow); + background: var(--warm-yellow); border-radius: var(--subwayHeight); text-align: center; line-height: var(--subwayHeight); @@ -70,7 +70,7 @@ h1 { #subway-nav .dest:hover { text-decoration:none; color:inherit; } #subway-nav .dest:hover .disc { background:#222; color:white; } #subway-nav .dest1 .disc { background:var(--green); font-size: calc(var(--subwayHeight) * 0.3); } -#subway-nav .dest2 .disc { background:var(--yellow); } +#subway-nav .dest2 .disc { background:var(--warm-yellow); } #subway-nav .dest3 .disc { background:var(--red); color: white; } @media only screen and (min-width: 987px) { #subway-nav { --subwayHeight: 3.2rem; } @@ -147,7 +147,6 @@ h1 { .dynmet-calc .arrow { margin: 0 0.5em; - /*color: var(--red);*/ } .dynmet-calc #dynmet-tracking { @@ -167,72 +166,31 @@ h1 { color: white; } +@media only screen and (max-width: 565px) { + .dynmet-calc { font-size: 1rem; } + .dynmet-calc .arrow { margin: 0; } + .dynmet-calc input { width:32px; } +} + +#languages {} +.language-list { + column-count: 4; + column-gap: 32px; + column-fill: balance; +} +.language-list p { margin: 0; } +@media only screen and (max-width: 660px) { + .language-list { column-count: 3; } +} +@media only screen and (max-width: 540px) { + .language-list { column-count: 2; } +} -/* Character set table */ + +/* Character set table (main css comes from _include) */ .row.charset-title { padding-bottom: 0; } .row.charset-title > h2 { text-align: center; } -.row.charset { - padding-top: 1rem; - padding-left: 0; - padding-right: 0; - /* maintain cascading margin-bottom */ -} -.charset-table { - --gridColor: #bbb; - --columns: 24; - --tableWidth: 95vw; - - flex: 1 1 auto; - padding: 0; - margin: 1rem auto; - - max-width: var(--tableWidth); - width: var(--tableWidth); - overflow: hidden; - - display: flex; - flex-wrap: wrap; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - box-shadow: -1px -1px 0 var(--gridColor), - -1px 0 0 var(--gridColor), - 0 -1px 0 var(--gridColor); -} - .charset-table > c { - flex: 0 0 auto; - - margin: 0; - padding: 0; - - display: flex; - align-items: center; - justify-content: center; - - width: calc(var(--tableWidth) / var(--columns)); - height: calc(var(--tableWidth) / var(--columns)); - - font-size: calc(100vw / calc(var(--columns) * 2)); - line-height: 100%; - text-align: center; - font-feature-settings: "calt" 0; /* disable all */ - - background: white; - box-shadow: inset -1px -1px 0 var(--gridColor); - - cursor: cell; - } -/* for window width >= 1600 */ -@media only screen and (min-width: 1599px) { - .charset-table { --columns: 32; } -} -@media only screen and (max-width: 800px) { - .charset-table { --columns: 16; } -} -@media only screen and (max-width: 565px) { - .charset-table { --columns: 8; } -} @keyframes charset-flash { 0% { background-color: black; color: white; } 20% { background-color: black; color: white; } @@ -244,7 +202,21 @@ h1 { 100% { background-color: white; color: inherit; } } - .charset-table > c.flash { +.charset-table { + /*--gridColor: #559966;*/ + --gridColor: transparent; +} + .charset-table > a { + cursor: cell; + border-radius: 2px; + } + .charset-table > a:hover { + /*color: white; + background: black;*/ + color: black; + background: white; + } + .charset-table > a.flash { animation: charset-flash 300ms 1; animation-fill-mode: forwards; animation-timing-function: ease-out; @@ -252,6 +224,7 @@ h1 { + /* FAQ */ grid.faq { grid-row-gap: calc(var(--spacingv) * 3); @@ -269,8 +242,11 @@ boxes.features { boxes.features box h3 + p { margin-top:0.5em; } -.features h3 a q {padding-left: 0.5em; color: transparent; float:right; font-weight:400; } -.features h3 a:hover q { color: inherit; } + +/*.features h3 a q {padding-left: 0.5em; color: transparent; float:right; font-weight:400; } +.features h3 a:hover q { color: inherit; }*/ +.features h3 a q {padding-left: 0.5em; opacity:0.3; float:right; font-weight:400; } +.features h3 a:hover q { opacity:1; } boxes.features grid .sample { word-break: break-word; diff --git a/docs/index.html b/docs/index.html index a8fbd7930..3b21fbd39 100644 --- a/docs/index.html +++ b/docs/index.html @@ -25,6 +25,8 @@ endfor +
+
@@ -253,15 +255,13 @@ html { font-family: 'Inter', sans-serif; } %} {% if has_feature_col %} - + Feature Disabled - Enabled {% else %} - + Disabled - Enabled {% endif %} {% for s in f.samples %} @@ -280,18 +280,19 @@ html { font-family: 'Inter', sans-serif; } %} {% if has_feature_col %} {{feat_tag}} {{sample_in}} - {{sample_out}} {% else %} {{sample_in}} - {{sample_out}} {% endif %} {% endfor %} -

+ +
+ + {% if f.footer %}

{{f.footer}}

{% endif %} @@ -313,31 +314,44 @@ html { font-family: 'Inter', sans-serif; }
-
-

Character set

-
-
-
- {% for g in site.data.glyphinfo.glyphs %} - {% comment %} - - Ignore empty glyphs and glyphs without unicode mapping. - - {% endcomment %} - {% if g[1] == 0 and g[2] %} - {% if g[3] %} - &#x{{g[2]}} - {% else %} - &#x{{g[2]}} - {% endif %} - {% endif %} +
+

Language support

+
+
+ {% for c in site.data.languages %} +

{{c.category}}

+ {% for language in c.languages %} +

{{language}}

+ {% endfor %} {% endfor %}
+
+ +
+
+

Character set

+

+ All characters {{ site.data.glyphinfo.glyphs | size }} provided with Inter. + Tap a glyph to copy it to your clipboard.
+ Use the Glyphs Browser to inspect details like kerning and style variation. +

+
+
+
+{% include charset-table.html %}
@@ -680,3 +701,7 @@ trackingEl.addEventListener('mousedown', onPointerdownTracking, activeListener) updateTracking() })(); + \ No newline at end of file diff --git a/docs/lab/index.html b/docs/lab/index.html index e7747cce0..7b7aa3ab1 100644 --- a/docs/lab/index.html +++ b/docs/lab/index.html @@ -161,36 +161,7 @@ Ambiguation: (should not be fractions) `) -samples.set('Feature: liga', ` -dash[1-3]+gt\t\t-> --> ---> -e{n,m}dash+gt\t–> —> -lt+dash[1-3]\t\t<- <-- <--- -lt+endash[1,3]\t\t<– <––– -lt+emdash[1,3]\t<— <——— -lt+dash[1-2]+gt\t<-> <--> -lt+e{n,m}dash+gt\t<–> <—> -equal[1,2]+gt\t\t=> ==> -lt+equal+equal\t<== -lt+equal[1,2]+gt\t<=> <==> - -combined with calt to adjust to caps -A -> B <- C->D<-E=>F<=>G -A –> B <– C–>D<–E=>F<=>G -A —> B <— C—>D<—E=>F<=>G -A <-> B <–> C <—> D<->E<–>F<—>G -x<-yX<-Y - -exceptions; should NOT yield arrows -x<-4 X<-4 < - - > <= - -numeral+x+numeral => numeral+multiply+numeral -3x9 x9 x9x 9 x 9 x 9x 9 x 9 x 9 - -plain x when not surrounded by numerals -9x -x9 -9xM - +samples.set('Feature: rlig', ` Enclosing glyphs (glyph + {U+20DD,U+20DE}) U+20DD COMBINING ENCLOSING CIRCLE: ⃝ U+20DE COMBINING ENCLOSING SQUARE: ⃞ @@ -224,13 +195,35 @@ U\u20DE V\u20DE W\u20DE X\u20DE Y\u20DE Z\u20DE !\u20DE ?\u HE\u20DDLLO WO\u20DERLD Note on combining-marks compatibility: -• liga=on: uses precomposed ligatures. -• liga=off: some browsers will compose glyphs - with combining marks (support is limited.) +• rlig=on: uses precomposed ligatures (default.) +• rlig=off: rely on layout engine to combine (limited support.) `) samples.set('Feature: calt', ` +Arrows +dash[1-3]+gt\t\t-> --> ---> +e{n,m}dash+gt\t–> —> +lt+dash[1-3]\t\t<- <-- <--- +lt+endash[1,3]\t\t<– <––– +lt+emdash[1,3]\t<— <——— +lt+dash[1-2]+gt\t<-> <--> +lt+e{n,m}dash+gt\t<–> <—> +equal[1,2]+gt\t\t=> ==> +lt+equal+equal\t<== +lt+equal[1,2]+gt\t<=> <==> + +combined with calt to adjust to caps +A -> B <- C->D<-E=>F<=>G +A –> B <– C–>D<–E=>F<=>G +A —> B <— C—>D<—E=>F<=>G +A <-> B <–> C <—> D<->E<–>F<—>G +x<-yX<-Y + +exceptions; should NOT yield arrows +x<-4 X<-4 < - - > <= + +Case conversion (m). (M). (6). [m]. [M]. [6]. {m}. {M}. {6}. m@n. M@N 3×5 3 × 5 ×9 8× @@ -271,11 +264,11 @@ A+Y V+V W+W N+N X+X :-) :–) :—) calt case should cascade: -U() U[] U{} rightx should be rightx.case -()U []U {}U special-cased as "delim' delim -> delim.case" ----U--- all hyphens should be hyphen.case -U-→(){}[]• all should be .case -x[]{}H "x br br" separate from "cb cb H" +U() U[] U{} \t rightx should be rightx.case +()U []U {}U \t special-cased as "delim' delim -> delim.case" +---U--- \t\t all hyphens should be hyphen.case +U-→(){}[]• \t all should be .case +x[]{}H \t\t "x br br" separate from "cb cb H" left side cascades up to 5 characters: ••••••ABBA•••••• @@ -283,22 +276,22 @@ left side cascades up to 5 characters: @@@@@@M@@@@@@ ++++++M++++++ -x[x]. [X] x lc x lc followed by .case C .case -(Xx) lc uc uc lc -[Zzz] lc uc lc lc lc +x[x]. [X] \t x lc x lc followed by .case C .case +(Xx) \t\t lc uc uc lc +[Zzz] \t lc uc lc lc lc (XX) (x) (X) ( ) M () M ()M -X(_) .case around underscore next to uc -(_) lc otherwise +X(_) \t\t .case around underscore next to uc +(_) \t\t lc otherwise Foo::Bar() foo::bar() Foo foo::bar( ) Foo foo::bar()Foo -foo::bar( )Foo +foo::bar( )Foo \t\t\t\t ← No support in Chrome FOO::bar This is (a)Thing :: dog :: Kitten :: dog ::: Kitten @@ -308,6 +301,17 @@ FOO::bar This is (a)Thing X() X() x- X x -- X + +numeral+x+numeral => numeral+multiply+numeral +3x9 x9 x9x 9 x 9 x 9x 9 x 9 x 9 + +Note: AFAIK only Safari supports calt with whitespace. +In e.g. Chrome, only NxN works. + +plain x when not surrounded by numerals +9x +x9 +9xM `) @@ -422,7 +426,7 @@ samples.set('Latin extended', ` Ā Ă Ą Ǎ Ǟ Ǡ Ǣ Ǻ Ǽ Ȁ Ȃ Ȧ Ⱥ Ɓ Ƃ Ƀ Ć Ĉ Ċ Č Ƈ Ȼ -Ď Đ Ɖ Ɗ DŽ Dž dž DZ Dz dz +Ď Đ Ɖ Ɗ Dž dž DZ Dz dz Ē Ĕ Ė Ę Ě Ȅ Ȇ Ȩ Ɇ Ĝ Ğ Ġ Ģ Ɠ Ǥ Ǧ Ǵ Ĥ Ħ Ƕ Ȟ @@ -454,7 +458,7 @@ samples.set('Latin extended', ` ĵ ǰ ȷ ɉ ķ ĸ ƙ ǩ ĺ ļ ľ ŀ ƚ ł -ń ņ ň ʼn ŋ ƞ ǹ ȵ +ń ņ ň ŋ ƞ ǹ ȵ ō ŏ ő œ ơ ǒ ǫ ǭ ǿ ȍ ȏ ȫ ȭ ȯ ȱ ƥ ŕ ŗ ř ȑ ȓ ɍ @@ -1759,8 +1763,8 @@ document.head.appendChild(fontCSS)
Default-on features: - - + +
diff --git a/docs/res/base.css b/docs/res/base.css index f2521e544..1cedcdffb 100644 --- a/docs/res/base.css +++ b/docs/res/base.css @@ -12,7 +12,8 @@ /* colors */ --red: color(display-p3 0.94 0.19 0.04); - --yellow: color(display-p3 1 0.87 0.05); + --yellow: color(display-p3 1 0.96 0.05); + --warm-yellow: color(display-p3 1 0.87 0.05); --light-yellow: color(display-p3 1 1 0.7); --blue: rgb(3, 102, 230); --green: rgb(38, 220, 78); @@ -23,7 +24,8 @@ /* sRGB colors */ :root { --red: #F03009; - --yellow: #FFE310; + --yellow: #FFF310; + --warm-yellow: #FFE310; --light-yellow: rgb(255, 255, 179); } } @@ -154,6 +156,8 @@ code { } pre { white-space: pre-wrap; + line-break: loose; + overflow-x: auto; } q { display: inline; @@ -240,6 +244,7 @@ h2 { } h3, .h3 { font-weight: 700; + font-weight: 650; font-size: 1.2rem; letter-spacing: -0.018em; line-height: calc(var(--spacingv) * 2); @@ -425,55 +430,45 @@ h2.banner { /* narrow windows */ @media only screen and (max-width: 565px) { .row { - padding-left:32px; - padding-right:32px; + padding-left: 24px; + padding-right: 24px; } .row.menu ul { - justify-content: space-between; - margin: 0 35px; - padding-bottom: 5px; + display: grid; + grid-template-columns: repeat(4,1fr); + margin: 0 20px; + } + .row.menu ul { + } + .row.menu ul li { + display: flex; } .row.menu ul li > a { - /*background:#666;*/ - padding: 10px 15px; + flex: 0 1 100%; + margin: 0; + padding-right:0; + padding-left:0; + box-shadow: inset 1px 0 0 0 rgba(255,255,255,0.1); } - .row.menu ul li.nav-home { - text-align:center; - margin: 0 0 -12px 0; - width: 100%; + .row.menu ul li:first-child > a { + margin-right: 0; + box-shadow: none; } - .row.menu ul li.nav-home > a { - border-bottom: none; - padding: 0 1em; - margin: 0.5em 0; - line-height: 34px; - border-radius: 90px; - } - .row.menu ul li.nav-home > a:hover { - color: white; - background-color: #222; - text-decoration: none; + .row.menu ul li.nav-home a { + text-align: left; } } -/* small devices (<= iPhone 6+) */ -@media only screen and (max-device-width: 414px) { - .row.menu ul { - margin: 0 5px; - } +/* progressively hide menu items */ +@media only screen and (max-width: 680px) { + .row.menu .nav-lab { display: none; } } - -@media only screen and (max-width: 800px) { - .menu .nav-dynmetrics { display: none; } +@media only screen and (max-width: 565px) { + .row.menu .nav-download { display: none; } } -@media only screen and (max-width: 640px) { - .menu .nav-download { display: none; } -} -@media only screen and (max-width: 375px) { - .menu .nav-source { display: none; } -} -@media only screen and (max-width: 250px) { - .menu .nav-lab { display: none; } +@media only screen and (max-width: 280px) { + .row.menu ul { grid-template-columns: repeat(3,1fr); } + .row.menu .nav-dynmetrics { display: none; } } @@ -527,6 +522,19 @@ h2.banner { color: #3B414A; } +.noise-layer { + background-image: url(noise512.png); + background-size: 256px; + opacity: 0.03; + pointer-events: none; + position: absolute; + top:0; + left:0; + right:0; + /*bottom:0;*/ +} + + /* --------------------------------------------------------------------- */ ul { margin-left:1.1em; } @@ -640,7 +648,8 @@ boxes { box { overflow: auto; flex: 1 1 0; - min-width: 280px; + box-sizing: border-box; + min-width: 270px; max-width: 100%; display: flex; flex-direction: column; @@ -777,3 +786,69 @@ instead. .ff-cv09 { font-feature-settings: 'kern' 1, 'cv09' 1; -webkit-font-feature-settings: 'kern' 1, 'cv09' 1; -ms-font-feature-settings: 'kern' 1, 'cv09' 1; -moz-font-feature-settings: 'kern' 1, 'cv09' 1; } .ff-cv10 { font-feature-settings: 'kern' 1, 'cv10' 1; -webkit-font-feature-settings: 'kern' 1, 'cv10' 1; -ms-font-feature-settings: 'kern' 1, 'cv10' 1; -moz-font-feature-settings: 'kern' 1, 'cv10' 1; } .ff-cv11 { font-feature-settings: 'kern' 1, 'cv11' 1; -webkit-font-feature-settings: 'kern' 1, 'cv11' 1; -ms-font-feature-settings: 'kern' 1, 'cv11' 1; -moz-font-feature-settings: 'kern' 1, 'cv11' 1; } + + + +.row.charset { + padding-top: 1rem; + padding-left: 0; + padding-right: 0; + /* maintain cascading margin-bottom */ +} + +.charset-table { + --gridColor: #bbb; + --columns: 24; + --columnsL: 32; + --columnsS: 16; + --columnsXS: 8; + --tableWidth: 95vw; + + flex: 1 1 auto; + padding: 0; + margin: 1rem auto; + + max-width: var(--tableWidth); + width: var(--tableWidth); + overflow: hidden; + + display: flex; + flex-wrap: wrap; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + box-shadow: -1px -1px 0 var(--gridColor), + -1px 0 0 var(--gridColor), + 0 -1px 0 var(--gridColor); +} + .charset-table > a { + flex: 0 0 auto; + + margin: 0; + padding: 0; + + display: flex; + align-items: center; + justify-content: center; + + width: calc(var(--tableWidth) / var(--columns)); + height: calc(var(--tableWidth) / var(--columns)); + + font-size: calc(100vw / calc(var(--columns) * 2)); + line-height: 100%; + text-align: center; + font-feature-settings: "calt" 0; /* disable all */ + + box-shadow: inset -1px -1px 0 var(--gridColor); + text-decoration: none; + } +/* for window width >= 1600 */ +@media only screen and (min-width: 1599px) { + .charset-table { --columns: var(--columnsL); } +} +@media only screen and (max-width: 800px) { + .charset-table { --columns: var(--columnsS); } +} +@media only screen and (max-width: 565px) { + .charset-table { --columns: var(--columnsXS); } +} diff --git a/docs/res/close.svg b/docs/res/close.svg old mode 100755 new mode 100644 diff --git a/docs/res/dismiss.svg b/docs/res/dismiss.svg old mode 100755 new mode 100644 diff --git a/docs/res/icons/reset-black.svg b/docs/res/icons/reset-black.svg index b89b764bc..6f20feaef 100755 --- a/docs/res/icons/reset-black.svg +++ b/docs/res/icons/reset-black.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/docs/res/icons/reset.svg b/docs/res/icons/reset.svg index e459c7571..33b7ca175 100755 --- a/docs/res/icons/reset.svg +++ b/docs/res/icons/reset.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/docs/res/noise512.png b/docs/res/noise512.png new file mode 100644 index 000000000..66fe28ec1 Binary files /dev/null and b/docs/res/noise512.png differ diff --git a/docs/res/popup.svg b/docs/res/popup.svg old mode 100755 new mode 100644 diff --git a/docs/res/reset.svg b/docs/res/reset.svg old mode 100755 new mode 100644 index e459c7571..33b7ca175 --- a/docs/res/reset.svg +++ b/docs/res/reset.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/docs/res/sample.png b/docs/res/sample.png index a3d21628d..c10811ca3 100644 Binary files a/docs/res/sample.png and b/docs/res/sample.png differ diff --git a/docs/res/settings.svg b/docs/res/settings.svg old mode 100755 new mode 100644 diff --git a/docs/res/share.png b/docs/res/share.png index 1b9583bfb..70425394a 100644 Binary files a/docs/res/share.png and b/docs/res/share.png differ diff --git a/docs/res/weights-and-styles.svg b/docs/res/weights-and-styles.svg old mode 100755 new mode 100644 index a1827e34d..240d4f9a4 --- a/docs/res/weights-and-styles.svg +++ b/docs/res/weights-and-styles.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/docs/samples/img/01.png b/docs/samples/img/01.png index c630dc521..1b35cd4ed 100644 Binary files a/docs/samples/img/01.png and b/docs/samples/img/01.png differ diff --git a/docs/samples/img/01@2x.png b/docs/samples/img/01@2x.png index 46bfcfcd6..f155ecb8b 100644 Binary files a/docs/samples/img/01@2x.png and b/docs/samples/img/01@2x.png differ diff --git a/docs/samples/img/02.png b/docs/samples/img/02.png index 606401ee7..52560bf81 100644 Binary files a/docs/samples/img/02.png and b/docs/samples/img/02.png differ diff --git a/docs/samples/img/02@2x.png b/docs/samples/img/02@2x.png index 77a3e198d..f51022371 100644 Binary files a/docs/samples/img/02@2x.png and b/docs/samples/img/02@2x.png differ diff --git a/docs/samples/img/03.png b/docs/samples/img/03.png index 12710b83a..2ab9ce867 100644 Binary files a/docs/samples/img/03.png and b/docs/samples/img/03.png differ diff --git a/docs/samples/img/03@2x.png b/docs/samples/img/03@2x.png index 7c710bb14..fab889b57 100644 Binary files a/docs/samples/img/03@2x.png and b/docs/samples/img/03@2x.png differ diff --git a/docs/samples/img/04.png b/docs/samples/img/04.png index b10036a25..a08618b55 100644 Binary files a/docs/samples/img/04.png and b/docs/samples/img/04.png differ diff --git a/docs/samples/img/04@2x.png b/docs/samples/img/04@2x.png index 4dec10674..e61142ba9 100644 Binary files a/docs/samples/img/04@2x.png and b/docs/samples/img/04@2x.png differ diff --git a/docs/samples/img/05.png b/docs/samples/img/05.png index 0eb51ed9f..3b60b3a68 100644 Binary files a/docs/samples/img/05.png and b/docs/samples/img/05.png differ diff --git a/docs/samples/img/05@2x.png b/docs/samples/img/05@2x.png index 5e3a66edf..68586cbf4 100644 Binary files a/docs/samples/img/05@2x.png and b/docs/samples/img/05@2x.png differ diff --git a/docs/samples/img/06.png b/docs/samples/img/06.png index 33d7dbb20..a5b1289fc 100644 Binary files a/docs/samples/img/06.png and b/docs/samples/img/06.png differ diff --git a/docs/samples/img/06@2x.png b/docs/samples/img/06@2x.png index 2c8448a26..c8ed13ba6 100644 Binary files a/docs/samples/img/06@2x.png and b/docs/samples/img/06@2x.png differ diff --git a/docs/samples/img/07.png b/docs/samples/img/07.png index 9f2c13066..969c3826d 100644 Binary files a/docs/samples/img/07.png and b/docs/samples/img/07.png differ diff --git a/docs/samples/img/07@2x.png b/docs/samples/img/07@2x.png index c753e1233..4c4c297d7 100644 Binary files a/docs/samples/img/07@2x.png and b/docs/samples/img/07@2x.png differ diff --git a/docs/samples/img/08.png b/docs/samples/img/08.png index 21f72173e..bb0aba687 100644 Binary files a/docs/samples/img/08.png and b/docs/samples/img/08.png differ diff --git a/docs/samples/img/08@2x.png b/docs/samples/img/08@2x.png index b39ba7082..c153d028e 100644 Binary files a/docs/samples/img/08@2x.png and b/docs/samples/img/08@2x.png differ diff --git a/docs/samples/img/09.png b/docs/samples/img/09.png index 32e056c2e..36adcb434 100644 Binary files a/docs/samples/img/09.png and b/docs/samples/img/09.png differ diff --git a/docs/samples/img/09@2x.png b/docs/samples/img/09@2x.png index 58a46e534..68fcd59eb 100644 Binary files a/docs/samples/img/09@2x.png and b/docs/samples/img/09@2x.png differ diff --git a/docs/samples/img/10@2x.png b/docs/samples/img/10@2x.png index ecbb8b534..9740dcb7d 100644 Binary files a/docs/samples/img/10@2x.png and b/docs/samples/img/10@2x.png differ diff --git a/docs/samples/img/12.png b/docs/samples/img/12.png index cab51e851..0ee5d6590 100644 Binary files a/docs/samples/img/12.png and b/docs/samples/img/12.png differ diff --git a/docs/samples/img/12@2x.png b/docs/samples/img/12@2x.png index 198cbff6e..cf87703ac 100644 Binary files a/docs/samples/img/12@2x.png and b/docs/samples/img/12@2x.png differ diff --git a/docs/samples/img/13@2x.png b/docs/samples/img/13@2x.png index 15a161c7b..dc2d023bb 100644 Binary files a/docs/samples/img/13@2x.png and b/docs/samples/img/13@2x.png differ diff --git a/docs/samples/img/14.png b/docs/samples/img/14.png index 487ac5dbb..510770f21 100644 Binary files a/docs/samples/img/14.png and b/docs/samples/img/14.png differ diff --git a/docs/samples/img/14@2x.png b/docs/samples/img/14@2x.png index bda4238d6..d38a37203 100644 Binary files a/docs/samples/img/14@2x.png and b/docs/samples/img/14@2x.png differ diff --git a/docs/samples/img/15@2x.png b/docs/samples/img/15@2x.png index 79034e8d8..7fd9a2986 100644 Binary files a/docs/samples/img/15@2x.png and b/docs/samples/img/15@2x.png differ diff --git a/docs/samples/img/a-z-regular.svg b/docs/samples/img/a-z-regular.svg index a2bbc8e60..6acce2ba3 100755 --- a/docs/samples/img/a-z-regular.svg +++ b/docs/samples/img/a-z-regular.svg @@ -1,6 +1,6 @@ - + diff --git a/docs/samples/img/dark-phone.jpg b/docs/samples/img/dark-phone.jpg index 6b82a4f33..4581e4fd1 100755 Binary files a/docs/samples/img/dark-phone.jpg and b/docs/samples/img/dark-phone.jpg differ diff --git a/docs/samples/img/dark-phone@2x.jpg b/docs/samples/img/dark-phone@2x.jpg index b3829977e..f46fdc743 100755 Binary files a/docs/samples/img/dark-phone@2x.jpg and b/docs/samples/img/dark-phone@2x.jpg differ diff --git a/docs/samples/img/sfs-pid-30.png b/docs/samples/img/sfs-pid-30.png index e25adfd80..e60a378e5 100644 Binary files a/docs/samples/img/sfs-pid-30.png and b/docs/samples/img/sfs-pid-30.png differ diff --git a/docs/samples/img/sfs-pid-30@2x.png b/docs/samples/img/sfs-pid-30@2x.png index f38590d41..dcdc488e4 100644 Binary files a/docs/samples/img/sfs-pid-30@2x.png and b/docs/samples/img/sfs-pid-30@2x.png differ diff --git a/docs/samples/img/thin-beta.png b/docs/samples/img/thin-beta.png index 9587681d5..d78fc59c8 100644 Binary files a/docs/samples/img/thin-beta.png and b/docs/samples/img/thin-beta.png differ diff --git a/docs/samples/img/thin-beta@2x.png b/docs/samples/img/thin-beta@2x.png index dd2b221f9..0a972ec59 100644 Binary files a/docs/samples/img/thin-beta@2x.png and b/docs/samples/img/thin-beta@2x.png differ diff --git a/docs/samples/img/weights-1.svg b/docs/samples/img/weights-1.svg old mode 100755 new mode 100644 diff --git a/misc/dist/inter.css b/misc/dist/inter.css index 919263a82..dc367b22b 100644 --- a/misc/dist/inter.css +++ b/misc/dist/inter.css @@ -3,16 +3,16 @@ font-style: normal; font-weight: 100; font-display: swap; - src: url("Inter-Thin.woff2?v=3.11") format("woff2"), - url("Inter-Thin.woff?v=3.11") format("woff"); + src: url("Inter-Thin.woff2?v=3.12") format("woff2"), + url("Inter-Thin.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 100; font-display: swap; - src: url("Inter-ThinItalic.woff2?v=3.11") format("woff2"), - url("Inter-ThinItalic.woff?v=3.11") format("woff"); + src: url("Inter-ThinItalic.woff2?v=3.12") format("woff2"), + url("Inter-ThinItalic.woff?v=3.12") format("woff"); } @font-face { @@ -20,16 +20,16 @@ font-style: normal; font-weight: 200; font-display: swap; - src: url("Inter-ExtraLight.woff2?v=3.11") format("woff2"), - url("Inter-ExtraLight.woff?v=3.11") format("woff"); + src: url("Inter-ExtraLight.woff2?v=3.12") format("woff2"), + url("Inter-ExtraLight.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 200; font-display: swap; - src: url("Inter-ExtraLightItalic.woff2?v=3.11") format("woff2"), - url("Inter-ExtraLightItalic.woff?v=3.11") format("woff"); + src: url("Inter-ExtraLightItalic.woff2?v=3.12") format("woff2"), + url("Inter-ExtraLightItalic.woff?v=3.12") format("woff"); } @font-face { @@ -37,16 +37,16 @@ font-style: normal; font-weight: 300; font-display: swap; - src: url("Inter-Light.woff2?v=3.11") format("woff2"), - url("Inter-Light.woff?v=3.11") format("woff"); + src: url("Inter-Light.woff2?v=3.12") format("woff2"), + url("Inter-Light.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 300; font-display: swap; - src: url("Inter-LightItalic.woff2?v=3.11") format("woff2"), - url("Inter-LightItalic.woff?v=3.11") format("woff"); + src: url("Inter-LightItalic.woff2?v=3.12") format("woff2"), + url("Inter-LightItalic.woff?v=3.12") format("woff"); } @font-face { @@ -54,16 +54,16 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url("Inter-Regular.woff2?v=3.11") format("woff2"), - url("Inter-Regular.woff?v=3.11") format("woff"); + src: url("Inter-Regular.woff2?v=3.12") format("woff2"), + url("Inter-Regular.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 400; font-display: swap; - src: url("Inter-Italic.woff2?v=3.11") format("woff2"), - url("Inter-Italic.woff?v=3.11") format("woff"); + src: url("Inter-Italic.woff2?v=3.12") format("woff2"), + url("Inter-Italic.woff?v=3.12") format("woff"); } @font-face { @@ -71,16 +71,16 @@ font-style: normal; font-weight: 500; font-display: swap; - src: url("Inter-Medium.woff2?v=3.11") format("woff2"), - url("Inter-Medium.woff?v=3.11") format("woff"); + src: url("Inter-Medium.woff2?v=3.12") format("woff2"), + url("Inter-Medium.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 500; font-display: swap; - src: url("Inter-MediumItalic.woff2?v=3.11") format("woff2"), - url("Inter-MediumItalic.woff?v=3.11") format("woff"); + src: url("Inter-MediumItalic.woff2?v=3.12") format("woff2"), + url("Inter-MediumItalic.woff?v=3.12") format("woff"); } @font-face { @@ -88,16 +88,16 @@ font-style: normal; font-weight: 600; font-display: swap; - src: url("Inter-SemiBold.woff2?v=3.11") format("woff2"), - url("Inter-SemiBold.woff?v=3.11") format("woff"); + src: url("Inter-SemiBold.woff2?v=3.12") format("woff2"), + url("Inter-SemiBold.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 600; font-display: swap; - src: url("Inter-SemiBoldItalic.woff2?v=3.11") format("woff2"), - url("Inter-SemiBoldItalic.woff?v=3.11") format("woff"); + src: url("Inter-SemiBoldItalic.woff2?v=3.12") format("woff2"), + url("Inter-SemiBoldItalic.woff?v=3.12") format("woff"); } @font-face { @@ -105,16 +105,16 @@ font-style: normal; font-weight: 700; font-display: swap; - src: url("Inter-Bold.woff2?v=3.11") format("woff2"), - url("Inter-Bold.woff?v=3.11") format("woff"); + src: url("Inter-Bold.woff2?v=3.12") format("woff2"), + url("Inter-Bold.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 700; font-display: swap; - src: url("Inter-BoldItalic.woff2?v=3.11") format("woff2"), - url("Inter-BoldItalic.woff?v=3.11") format("woff"); + src: url("Inter-BoldItalic.woff2?v=3.12") format("woff2"), + url("Inter-BoldItalic.woff?v=3.12") format("woff"); } @font-face { @@ -122,16 +122,16 @@ font-style: normal; font-weight: 800; font-display: swap; - src: url("Inter-ExtraBold.woff2?v=3.11") format("woff2"), - url("Inter-ExtraBold.woff?v=3.11") format("woff"); + src: url("Inter-ExtraBold.woff2?v=3.12") format("woff2"), + url("Inter-ExtraBold.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 800; font-display: swap; - src: url("Inter-ExtraBoldItalic.woff2?v=3.11") format("woff2"), - url("Inter-ExtraBoldItalic.woff?v=3.11") format("woff"); + src: url("Inter-ExtraBoldItalic.woff2?v=3.12") format("woff2"), + url("Inter-ExtraBoldItalic.woff?v=3.12") format("woff"); } @font-face { @@ -139,16 +139,16 @@ font-style: normal; font-weight: 900; font-display: swap; - src: url("Inter-Black.woff2?v=3.11") format("woff2"), - url("Inter-Black.woff?v=3.11") format("woff"); + src: url("Inter-Black.woff2?v=3.12") format("woff2"), + url("Inter-Black.woff?v=3.12") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 900; font-display: swap; - src: url("Inter-BlackItalic.woff2?v=3.11") format("woff2"), - url("Inter-BlackItalic.woff?v=3.11") format("woff"); + src: url("Inter-BlackItalic.woff2?v=3.12") format("woff2"), + url("Inter-BlackItalic.woff?v=3.12") format("woff"); } /* ------------------------------------------------------- @@ -166,7 +166,7 @@ Usage: font-display: swap; font-style: normal; font-named-instance: 'Regular'; - src: url("Inter-roman.var.woff2?v=3.11") format("woff2"); + src: url("Inter-roman.var.woff2?v=3.12") 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?v=3.11") format("woff2"); + src: url("Inter-italic.var.woff2?v=3.12") 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?v=3.11") format("woff2"); + src: url("Inter.var.woff2?v=3.12") format("woff2"); }