1
1
mirror of https://github.com/rsms/inter.git synced 2024-11-23 11:43:47 +03:00

import Inter and fontbuild from master

This commit is contained in:
Rasmus Andersson 2020-03-22 19:46:59 -07:00
parent 1513d2657f
commit 0224325743
4 changed files with 114 additions and 106 deletions

80
misc/dist/inter.css vendored
View File

@ -3,16 +3,16 @@
font-style: normal;
font-weight: 100;
font-display: swap;
src: url("Inter-Thin-BETA.woff2?v=3.11") format("woff2"),
url("Inter-Thin-BETA.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-BETA.woff2?v=3.11") format("woff2"),
url("Inter-ThinItalic-BETA.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-BETA.woff2?v=3.11") format("woff2"),
url("Inter-ExtraLight-BETA.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-BETA.woff2?v=3.11") format("woff2"),
url("Inter-ExtraLightItalic-BETA.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-BETA.woff2?v=3.11") format("woff2"),
url("Inter-Light-BETA.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-BETA.woff2?v=3.11") format("woff2"),
url("Inter-LightItalic-BETA.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");
}

View File

@ -353,8 +353,7 @@ class Main(object):
# files
master_dir = outdir
glyphsfile = args.glyphsfile
name = os.path.splitext(basename(glyphsfile))[0] # e.g. "Inter"
designspace_file = pjoin(outdir, name + '.designspace')
designspace_file = pjoin(outdir, 'Inter.designspace')
instance_dir = pjoin(BASEDIR, 'build', 'ufo')
# load glyphs project file
@ -393,17 +392,17 @@ class Main(object):
# Workaround for Glyphs limitation
# (Base italic master can't be called just Italic, so it's called
# "Italic Italic" which is converted here to just "Italic")
ufo_path = pjoin(master_dir, name + '-Italic.ufo')
ufo_path = pjoin(master_dir, 'Inter-Italic.ufo')
source.styleName = "Italic"
source.name = "italic"
source.font.info.styleName = source.styleName
elif source.styleName == "Black Italic Italic":
ufo_path = pjoin(master_dir, name + '-BlackItalic.ufo')
ufo_path = pjoin(master_dir, 'Inter-BlackItalic.ufo')
source.styleName = "Black Italic"
source.name = "blackitalic"
source.font.info.styleName = source.styleName
elif source.styleName == "Thin Italic Italic":
ufo_path = pjoin(master_dir, name + '-ThinItalic.ufo')
ufo_path = pjoin(master_dir, 'Inter-ThinItalic.ufo')
source.styleName = "Thin Italic"
source.name = "thinitalic"
source.font.info.styleName = source.styleName
@ -430,7 +429,7 @@ class Main(object):
designspace.write(designspace_file)
# roman designspace
roman_designspace_file = pjoin(outdir, name + '-roman.designspace')
roman_designspace_file = pjoin(outdir, 'Inter-roman.designspace')
p = Process(
target=self._genSubsetDesignSpace,
args=(designspace, 'roman', roman_designspace_file)
@ -439,7 +438,7 @@ class Main(object):
procs.append(p)
# italic designspace
italic_designspace_file = pjoin(outdir, name + '-italic.designspace')
italic_designspace_file = pjoin(outdir, 'Inter-italic.designspace')
p = Process(
target=self._genSubsetDesignSpace,
args=(designspace, 'italic', italic_designspace_file)
@ -621,4 +620,4 @@ class Main(object):
if __name__ == '__main__':
Main().main(sys.argv)
Main().main(sys.argv)

View File

@ -73,10 +73,6 @@ def setFontInfo(font, weight=None):
if weight is None:
weight = font.info.openTypeOS2WeightClass
# Add " BETA" to light weights
if weight < 400:
font.info.styleName = font.info.styleName + " BETA"
family = font.info.familyName # i.e. "Inter"
style = font.info.styleName # e.g. "Medium Italic"
@ -145,4 +141,4 @@ stripItalic_re = re.compile(r'(?:^|\b)italic\b|italic$', re.I | re.U)
def stripItalic(name):
return stripItalic_re.sub('', name.strip())
return stripItalic_re.sub('', name.strip())

119
src/Inter.glyphs Normal file → Executable file
View File

@ -1,5 +1,8 @@
{
.appVersion = "1284";
.appVersion = "1290";
DisplayStrings = (
"/tsecyrillic"
);
classes = (
{
code = "zero\012one\012two\012twostroke\012three\012four\012five\012Tonefive\012six\012seven\012eight\012nine\012zero.slash\012one.ss01\012three.1\012four.ss01\012six.ss01\012nine.ss01\012zero.tf\012one.tf\012two.tf\012three.tf\012four.tf\012five.tf\012six.tf\012seven.tf\012eight.tf\012nine.tf\012zero.tf.slash\012one.tf.ss01\012three.1.tf\012four.tf.ss01\012six.tf.ss01\012nine.tf.ss01\012";
@ -25,7 +28,7 @@ code = "A Adieresis Atilde Agrave Aacute Acircumflex Aring Amacron Abreve Aogone
name = All;
}
);
copyright = "Copyright 2019 The Inter project authors";
copyright = "Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)";
customParameters = (
{
name = glyphOrder;
@ -1954,7 +1957,7 @@ value = 6;
},
{
name = openTypeNameLicense;
value = "OFL 1.1 (SIL Open Font License, Version 1.1)";
value = "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";
},
{
name = openTypeNameLicenseURL;
@ -33681,7 +33684,7 @@ interface.gridadjust.original = "{'width': 2311, 'leftMargin': 91, 'rightMargin'
},
{
glyphname = Kadescendercyrillic;
lastChange = "2019-12-17 15:13:12 +0000";
lastChange = "2020-02-08 23:20:49 +0000";
layers = (
{
components = (
@ -33695,22 +33698,21 @@ transform = "{1, 0, 0, 1, 1440, 0}";
}
);
layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
width = 2008;
width = 1936;
},
{
components = (
{
alignment = -1;
name = Kacyr;
transform = "{1, 0, 0, 1, 12, 0}";
},
{
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1536, -136}";
transform = "{1, 0, 0, 1, 1364, 24}";
}
);
layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
width = 2392;
width = 2184;
},
{
components = (
@ -33724,57 +33726,55 @@ transform = "{1, 0, 0, 1, 1436, 0}";
}
);
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
width = 2004;
width = 1934;
},
{
components = (
{
alignment = -1;
name = Kacyr;
transform = "{1, 0, 0, 1, 12, 0}";
},
{
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1516, -136}";
transform = "{1, 0, 0, 1, 1370, 24}";
}
);
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
width = 2396;
width = 2188;
},
{
components = (
{
alignment = -1;
name = Kacyr;
transform = "{1, 0, 0, 1, -8, 0}";
},
{
alignment = -1;
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1406, 84}";
transform = "{1, 0, 0, 1, 1414, 84}";
}
);
layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
width = 1778;
width = 1680;
},
{
components = (
{
alignment = -1;
name = Kacyr;
transform = "{1, 0, 0, 1, -8, 0}";
},
{
alignment = -1;
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1422, 84}";
transform = "{1, 0, 0, 1, 1430, 84}";
}
);
layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
width = 1778;
width = 1682;
}
);
leftKerningGroup = B;
leftMetricsKey = K;
rightKerningGroup = K;
unicode = 049A;
userData = {
@ -49494,7 +49494,7 @@ interface.gridadjust.original = "{'width': 1819, 'leftMargin': 188, 'rightMargin
{
color = (219,235,247,1);
glyphname = T;
lastChange = "2019-12-17 15:13:12 +0000";
lastChange = "2020-02-08 20:45:05 +0000";
layers = (
{
anchors = (
@ -56699,7 +56699,7 @@ unicode = 03A7;
{
color = (219,235,247,1);
glyphname = Y;
lastChange = "2019-12-17 15:13:12 +0000";
lastChange = "2020-02-08 20:48:41 +0000";
layers = (
{
anchors = (
@ -132794,7 +132794,7 @@ interface.gridadjust.original = "{'width': 1671, 'leftMargin': 107, 'rightMargin
},
{
glyphname = Kacyr;
lastChange = "2019-12-17 15:13:12 +0000";
lastChange = "2020-02-08 23:19:00 +0000";
layers = (
{
anchors = (
@ -132830,7 +132830,7 @@ width = 1820;
anchors = (
{
name = cyrtic;
position = "{2012, 88}";
position = "{1852, 248}";
}
);
layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@ -132838,23 +132838,23 @@ paths = (
{
closed = 1;
nodes = (
"2084 0 LINE",
"1280 1020 LINE",
"2220 2048 LINE",
"1488 2048 LINE",
"784 1276 LINE",
"2092 0 LINE",
"1268 1064 LINE",
"2048 2048 LINE",
"1348 2048 LINE",
"760 1276 LINE",
"688 1276 LINE",
"688 2048 LINE",
"132 2048 LINE",
"132 0 LINE",
"688 0 LINE",
"688 828 LINE",
"740 828 LINE",
"1380 0 LINE"
"766 828 LINE",
"1394 0 LINE"
);
}
);
width = 2236;
width = 2108;
},
{
anchors = (
@ -132890,7 +132890,7 @@ width = 1820;
anchors = (
{
name = cyrtic;
position = "{1900, 88}";
position = "{1766, 248}";
}
);
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@ -132898,23 +132898,23 @@ paths = (
{
closed = 1;
nodes = (
"1956 0 LINE",
"1320 1020 LINE",
"2432 2048 LINE",
"1700 2048 LINE",
"868 1276 LINE",
"1964 0 LINE",
"1318 1064 LINE",
"2260 2048 LINE",
"1560 2048 LINE",
"844 1276 LINE",
"772 1276 LINE",
"900 2048 LINE",
"344 2048 LINE",
"4 0 LINE",
"560 0 LINE",
"696 828 LINE",
"748 828 LINE",
"1252 0 LINE"
"698 828 LINE",
"776 828 LINE",
"1266 0 LINE"
);
}
);
width = 2236;
width = 2108;
},
{
anchors = (
@ -166893,7 +166893,7 @@ interface.gridadjust.original = "{'width': 1482, 'leftMargin': 128, 'rightMargin
},
{
glyphname = tsecyrillic;
lastChange = "2019-12-17 15:13:12 +0000";
lastChange = "2020-02-08 23:37:06 +0000";
layers = (
{
components = (
@ -166904,7 +166904,7 @@ transform = "{-1, 0, 0, -1, 1640, 1536}";
{
alignment = -1;
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1292, 0}";
transform = "{1, 0, 0, 1, 1272, 0}";
}
);
layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@ -166919,11 +166919,11 @@ transform = "{-1, 0, 0, -1, 1712, 1536}";
{
alignment = -1;
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1348, 0}";
transform = "{1, 0, 0, 1, 1080, 0}";
}
);
layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
width = 2160;
width = 1892;
},
{
components = (
@ -166934,7 +166934,7 @@ transform = "{-1, 0, 0, -1, 1640, 1536}";
{
alignment = -1;
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1292, 0}";
transform = "{1, 0, 0, 1, 1272, 0}";
}
);
layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@ -166949,11 +166949,11 @@ transform = "{-1, 0, 0, -1, 1716, 1536}";
{
alignment = -1;
name = cyrillictic.cn;
transform = "{1, 0, 0, 1, 1348, 0}";
transform = "{1, 0, 0, 1, 1080, 2}";
}
);
layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
width = 2160;
width = 1892;
},
{
components = (
@ -166989,6 +166989,7 @@ width = 1544;
);
leftKerningGroup = m;
leftMetricsKey = idotless;
note = "!post:RemoveOverlap";
rightKerningGroup = t;
rightMetricsKey = t;
unicode = 0446;
@ -423260,7 +423261,8 @@ underscore = -96;
};
"@MMK_L_G" = {
"@MMK_R_A" = -64;
"@MMK_R_T" = 96;
"@MMK_R_T" = -84;
"@MMK_R_Y" = -64;
"@MMK_R_idieresis" = 96;
"@MMK_R_idotless" = 96;
"@MMK_R_jdotless" = 96;
@ -423369,6 +423371,7 @@ period = -96;
};
"@MMK_L_R" = {
"@MMK_R_V" = -32;
"@MMK_R_Y" = -96;
"@MMK_R_c" = -16;
"@MMK_R_idieresis" = 128;
};
@ -425802,7 +425805,8 @@ underscore = -96;
};
"@MMK_L_G" = {
"@MMK_R_A" = -64;
"@MMK_R_T" = 96;
"@MMK_R_T" = -84;
"@MMK_R_Y" = -64;
"@MMK_R_idieresis" = 96;
"@MMK_R_idotless" = 96;
"@MMK_R_jdotless" = 96;
@ -425911,6 +425915,7 @@ period = -96;
};
"@MMK_L_R" = {
"@MMK_R_V" = -32;
"@MMK_R_Y" = -96;
"@MMK_R_c" = -16;
"@MMK_R_idieresis" = 128;
};
@ -428287,9 +428292,10 @@ underscore = -96;
};
"@MMK_L_G" = {
"@MMK_R_A" = -64;
"@MMK_R_T" = 96;
"@MMK_R_T" = -84;
"@MMK_R_V" = -64;
"@MMK_R_X" = -16;
"@MMK_R_Y" = -64;
"@MMK_R_idieresis" = 96;
"@MMK_R_idotless" = 96;
"@MMK_R_jdotless" = 96;
@ -428399,6 +428405,7 @@ period = -96;
};
"@MMK_L_R" = {
"@MMK_R_V" = -48;
"@MMK_R_Y" = -68;
"@MMK_R_c" = -16;
"@MMK_R_idieresis" = 128;
};
@ -430816,9 +430823,10 @@ underscore = -96;
};
"@MMK_L_G" = {
"@MMK_R_A" = -64;
"@MMK_R_T" = 96;
"@MMK_R_T" = -84;
"@MMK_R_V" = -64;
"@MMK_R_X" = -16;
"@MMK_R_Y" = -64;
"@MMK_R_idieresis" = 96;
"@MMK_R_idotless" = 96;
"@MMK_R_jdotless" = 96;
@ -430927,6 +430935,7 @@ period = -96;
};
"@MMK_L_R" = {
"@MMK_R_V" = -48;
"@MMK_R_Y" = -68;
"@MMK_R_c" = -16;
"@MMK_R_idieresis" = 128;
};
@ -433302,9 +433311,10 @@ underscore = -96;
};
"@MMK_L_G" = {
"@MMK_R_A" = -64;
"@MMK_R_T" = 96;
"@MMK_R_T" = -90;
"@MMK_R_V" = -64;
"@MMK_R_X" = -64;
"@MMK_R_Y" = -96;
"@MMK_R_idieresis" = 96;
"@MMK_R_idotless" = 96;
"@MMK_R_jdotless" = 96;
@ -433411,6 +433421,7 @@ period = -96;
};
"@MMK_L_R" = {
"@MMK_R_V" = -64;
"@MMK_R_Y" = -96;
"@MMK_R_c" = -32;
"@MMK_R_idieresis" = 128;
};
@ -435805,9 +435816,10 @@ underscore = -96;
};
"@MMK_L_G" = {
"@MMK_R_A" = -64;
"@MMK_R_T" = 96;
"@MMK_R_T" = -90;
"@MMK_R_V" = -64;
"@MMK_R_X" = -64;
"@MMK_R_Y" = -96;
"@MMK_R_idieresis" = 96;
"@MMK_R_idotless" = 96;
"@MMK_R_jdotless" = 96;
@ -435915,6 +435927,7 @@ period = -96;
};
"@MMK_L_R" = {
"@MMK_R_V" = -64;
"@MMK_R_Y" = -96;
"@MMK_R_c" = -32;
"@MMK_R_idieresis" = 128;
};