diff options
author | Rasmus Andersson <rasmus@notion.se> | 2021-04-01 05:09:32 +0300 |
---|---|---|
committer | Rasmus Andersson <rasmus@notion.se> | 2021-04-01 05:09:32 +0300 |
commit | 310a73bad970c7ab593f9da4a1db12333c97f5ea (patch) | |
tree | 655bf4289ef4861735ce1a5ad8608b870717c6c4 /misc | |
parent | 588b234681db73db7086d6ef2a6684c09314c319 (diff) | |
download | inter-310a73bad970c7ab593f9da4a1db12333c97f5ea.tar.xz |
v3.18v3.18
Diffstat (limited to 'misc')
-rw-r--r-- | misc/dist/inter.css | 78 | ||||
-rwxr-xr-x | misc/tools/gen-glyphinfo.py | 9 |
2 files changed, 47 insertions, 40 deletions
diff --git a/misc/dist/inter.css b/misc/dist/inter.css index 2a77e16d6..6a19718ec 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.17") format("woff2"), - url("Inter-Thin.woff?v=3.17") format("woff"); + src: url("Inter-Thin.woff2?v=3.18") format("woff2"), + url("Inter-Thin.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 100; font-display: swap; - src: url("Inter-ThinItalic.woff2?v=3.17") format("woff2"), - url("Inter-ThinItalic.woff?v=3.17") format("woff"); + src: url("Inter-ThinItalic.woff2?v=3.18") format("woff2"), + url("Inter-ThinItalic.woff?v=3.18") format("woff"); } @font-face { @@ -20,16 +20,16 @@ font-style: normal; font-weight: 200; font-display: swap; - src: url("Inter-ExtraLight.woff2?v=3.17") format("woff2"), - url("Inter-ExtraLight.woff?v=3.17") format("woff"); + src: url("Inter-ExtraLight.woff2?v=3.18") format("woff2"), + url("Inter-ExtraLight.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 200; font-display: swap; - src: url("Inter-ExtraLightItalic.woff2?v=3.17") format("woff2"), - url("Inter-ExtraLightItalic.woff?v=3.17") format("woff"); + src: url("Inter-ExtraLightItalic.woff2?v=3.18") format("woff2"), + url("Inter-ExtraLightItalic.woff?v=3.18") format("woff"); } @font-face { @@ -37,16 +37,16 @@ font-style: normal; font-weight: 300; font-display: swap; - src: url("Inter-Light.woff2?v=3.17") format("woff2"), - url("Inter-Light.woff?v=3.17") format("woff"); + src: url("Inter-Light.woff2?v=3.18") format("woff2"), + url("Inter-Light.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 300; font-display: swap; - src: url("Inter-LightItalic.woff2?v=3.17") format("woff2"), - url("Inter-LightItalic.woff?v=3.17") format("woff"); + src: url("Inter-LightItalic.woff2?v=3.18") format("woff2"), + url("Inter-LightItalic.woff?v=3.18") format("woff"); } @font-face { @@ -54,16 +54,16 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url("Inter-Regular.woff2?v=3.17") format("woff2"), - url("Inter-Regular.woff?v=3.17") format("woff"); + src: url("Inter-Regular.woff2?v=3.18") format("woff2"), + url("Inter-Regular.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 400; font-display: swap; - src: url("Inter-Italic.woff2?v=3.17") format("woff2"), - url("Inter-Italic.woff?v=3.17") format("woff"); + src: url("Inter-Italic.woff2?v=3.18") format("woff2"), + url("Inter-Italic.woff?v=3.18") format("woff"); } @font-face { @@ -71,16 +71,16 @@ font-style: normal; font-weight: 500; font-display: swap; - src: url("Inter-Medium.woff2?v=3.17") format("woff2"), - url("Inter-Medium.woff?v=3.17") format("woff"); + src: url("Inter-Medium.woff2?v=3.18") format("woff2"), + url("Inter-Medium.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 500; font-display: swap; - src: url("Inter-MediumItalic.woff2?v=3.17") format("woff2"), - url("Inter-MediumItalic.woff?v=3.17") format("woff"); + src: url("Inter-MediumItalic.woff2?v=3.18") format("woff2"), + url("Inter-MediumItalic.woff?v=3.18") format("woff"); } @font-face { @@ -88,16 +88,16 @@ font-style: normal; font-weight: 600; font-display: swap; - src: url("Inter-SemiBold.woff2?v=3.17") format("woff2"), - url("Inter-SemiBold.woff?v=3.17") format("woff"); + src: url("Inter-SemiBold.woff2?v=3.18") format("woff2"), + url("Inter-SemiBold.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 600; font-display: swap; - src: url("Inter-SemiBoldItalic.woff2?v=3.17") format("woff2"), - url("Inter-SemiBoldItalic.woff?v=3.17") format("woff"); + src: url("Inter-SemiBoldItalic.woff2?v=3.18") format("woff2"), + url("Inter-SemiBoldItalic.woff?v=3.18") format("woff"); } @font-face { @@ -105,16 +105,16 @@ font-style: normal; font-weight: 700; font-display: swap; - src: url("Inter-Bold.woff2?v=3.17") format("woff2"), - url("Inter-Bold.woff?v=3.17") format("woff"); + src: url("Inter-Bold.woff2?v=3.18") format("woff2"), + url("Inter-Bold.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 700; font-display: swap; - src: url("Inter-BoldItalic.woff2?v=3.17") format("woff2"), - url("Inter-BoldItalic.woff?v=3.17") format("woff"); + src: url("Inter-BoldItalic.woff2?v=3.18") format("woff2"), + url("Inter-BoldItalic.woff?v=3.18") format("woff"); } @font-face { @@ -122,16 +122,16 @@ font-style: normal; font-weight: 800; font-display: swap; - src: url("Inter-ExtraBold.woff2?v=3.17") format("woff2"), - url("Inter-ExtraBold.woff?v=3.17") format("woff"); + src: url("Inter-ExtraBold.woff2?v=3.18") format("woff2"), + url("Inter-ExtraBold.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 800; font-display: swap; - src: url("Inter-ExtraBoldItalic.woff2?v=3.17") format("woff2"), - url("Inter-ExtraBoldItalic.woff?v=3.17") format("woff"); + src: url("Inter-ExtraBoldItalic.woff2?v=3.18") format("woff2"), + url("Inter-ExtraBoldItalic.woff?v=3.18") format("woff"); } @font-face { @@ -139,16 +139,16 @@ font-style: normal; font-weight: 900; font-display: swap; - src: url("Inter-Black.woff2?v=3.17") format("woff2"), - url("Inter-Black.woff?v=3.17") format("woff"); + src: url("Inter-Black.woff2?v=3.18") format("woff2"), + url("Inter-Black.woff?v=3.18") format("woff"); } @font-face { font-family: 'Inter'; font-style: italic; font-weight: 900; font-display: swap; - src: url("Inter-BlackItalic.woff2?v=3.17") format("woff2"), - url("Inter-BlackItalic.woff?v=3.17") format("woff"); + src: url("Inter-BlackItalic.woff2?v=3.18") format("woff2"), + url("Inter-BlackItalic.woff?v=3.18") 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.17") format("woff2"); + src: url("Inter-roman.var.woff2?v=3.18") 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.17") format("woff2"); + src: url("Inter-italic.var.woff2?v=3.18") 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.17") format("woff2"); + src: url("Inter.var.woff2?v=3.18") format("woff2"); } diff --git a/misc/tools/gen-glyphinfo.py b/misc/tools/gen-glyphinfo.py index c39d6ebd3..94cdb8927 100755 --- a/misc/tools/gen-glyphinfo.py +++ b/misc/tools/gen-glyphinfo.py @@ -85,6 +85,13 @@ def processGlyph(g, ucd, seenGlyphnames): return glyph +def glyphSortFun(g): + if len(g) > 2 and g[2] is not None: + return g[2] + elif len(g) > 0: + return g[0] + else: + return "" def main(): argparser = ArgumentParser( @@ -120,7 +127,7 @@ def main(): if unorderedGlyphs: # sort by unicode - glyphs = glyphs + sorted(unorderedGlyphs, key=lambda g: g[2]) + glyphs = glyphs + sorted(unorderedGlyphs, key=glyphSortFun) print('{"glyphs":[') prefix = ' ' |