mirror of
https://github.com/tonsky/FiraCode.git
synced 2024-10-04 00:31:49 +03:00
Fixed building on the latest fontmake
This commit is contained in:
parent
390c41cc94
commit
d80b0f07f1
File diff suppressed because one or more lines are too long
@ -20,12 +20,10 @@
|
|||||||
(let [[_ name] (re-matches #"([^.]+)\.fea" (.getName file))
|
(let [[_ name] (re-matches #"([^.]+)\.fea" (.getName file))
|
||||||
code (slurp file)
|
code (slurp file)
|
||||||
[_ notes code'] (re-matches #"(?s)#([^\n]+)\n(.*)" code)
|
[_ notes code'] (re-matches #"(?s)#([^\n]+)\n(.*)" code)
|
||||||
feature (if notes
|
feature (cond-> {:code (str/trim (or code' code))
|
||||||
{:code (str/trim code')
|
:name name}
|
||||||
:name name
|
notes
|
||||||
:notes (str/trim notes)}
|
(assoc :notes (str/trim notes)))]
|
||||||
{:code (str/trim code)
|
|
||||||
:name name})]
|
|
||||||
(glyphs/set-feature font name feature)))
|
(glyphs/set-feature font name feature)))
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: alternate lowercase a
|
# alternate lowercase a
|
||||||
|
|
||||||
sub a by a.cv01;
|
sub a by a.cv01;
|
||||||
sub aacute by aacute.cv01;
|
sub aacute by aacute.cv01;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: single storey lowercase g
|
# single storey lowercase g
|
||||||
|
|
||||||
sub g by g.cv02;
|
sub g by g.cv02;
|
||||||
sub gbreve by gbreve.cv02;
|
sub gbreve by gbreve.cv02;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase I without any horizontal decorations
|
# lowercase I without any horizontal decorations
|
||||||
|
|
||||||
sub i by i.cv03;
|
sub i by i.cv03;
|
||||||
sub idotless by idotless.cv03;
|
sub idotless by idotless.cv03;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase I with horizontal left line at the top
|
# lowercase I with horizontal left line at the top
|
||||||
|
|
||||||
sub i by i.cv04;
|
sub i by i.cv04;
|
||||||
sub idotless by idotless.cv04;
|
sub idotless by idotless.cv04;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase I with horizontal left line at the top and right line at the bottom
|
# lowercase I with horizontal left line at the top and right line at the bottom
|
||||||
|
|
||||||
sub i by i.cv05;
|
sub i by i.cv05;
|
||||||
sub idotless by idotless.cv05;
|
sub idotless by idotless.cv05;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase I with horizontal left line at the top and curved right hook at the bottom
|
# lowercase I with horizontal left line at the top and curved right hook at the bottom
|
||||||
|
|
||||||
sub i by i.cv06;
|
sub i by i.cv06;
|
||||||
sub idotless by idotless.cv06;
|
sub idotless by idotless.cv06;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase L without any horizontal decorations
|
# lowercase L without any horizontal decorations
|
||||||
|
|
||||||
sub l by l.cv07;
|
sub l by l.cv07;
|
||||||
sub lacute by lacute.cv07;
|
sub lacute by lacute.cv07;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase L with horizontal left line at the top
|
# lowercase L with horizontal left line at the top
|
||||||
|
|
||||||
sub l by l.cv08;
|
sub l by l.cv08;
|
||||||
sub lacute by lacute.cv08;
|
sub lacute by lacute.cv08;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase L with horizontal left line at the top and right line at the bottom
|
# lowercase L with horizontal left line at the top and right line at the bottom
|
||||||
|
|
||||||
sub l by l.cv09;
|
sub l by l.cv09;
|
||||||
sub lacute by lacute.cv09;
|
sub lacute by lacute.cv09;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: lowercase L with horizontal left line at the top and horizontal base
|
# lowercase L with horizontal left line at the top and horizontal base
|
||||||
|
|
||||||
sub l by l.cv10;
|
sub l by l.cv10;
|
||||||
sub lacute by lacute.cv10;
|
sub lacute by lacute.cv10;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: zero without anything inside
|
# zero without anything inside
|
||||||
|
|
||||||
sub zero by zero.cv11;
|
sub zero by zero.cv11;
|
||||||
sub zero.tosf by zero.tosf.cv11;
|
sub zero.tosf by zero.tosf.cv11;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: zero with a backslash inside
|
# zero with a backslash inside
|
||||||
|
|
||||||
sub zero by zero.cv12;
|
sub zero by zero.cv12;
|
||||||
sub zero.tosf by zero.tosf.cv12;
|
sub zero.tosf by zero.tosf.cv12;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: zero with a vertical line inside
|
# zero with a vertical line inside
|
||||||
|
|
||||||
sub zero by zero.cv13;
|
sub zero by zero.cv13;
|
||||||
sub zero.tosf by zero.tosf.cv13;
|
sub zero.tosf by zero.tosf.cv13;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: 3 with straight lines for the top half
|
# 3 with straight lines for the top half
|
||||||
|
|
||||||
sub three by three.cv14;
|
sub three by three.cv14;
|
||||||
sub three.tosf by three.tosf.cv14;
|
sub three.tosf by three.tosf.cv14;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: Top-aligned asterisk
|
# Top-aligned asterisk
|
||||||
|
|
||||||
sub [asterisk asterisk.lc] by asterisk.cv15;
|
sub [asterisk asterisk.lc] by asterisk.cv15;
|
||||||
sub [asteriskmath asteriskmath.lc] by asteriskmath.cv15;
|
sub [asteriskmath asteriskmath.lc] by asteriskmath.cv15;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: Hexagonal asterisk
|
# Hexagonal asterisk
|
||||||
|
|
||||||
sub [asterisk asterisk.lc asterisk.cv15 asteriskmath asteriskmath.lc asteriskmath.cv15]
|
sub [asterisk asterisk.lc asterisk.cv15 asteriskmath asteriskmath.lc asteriskmath.cv15]
|
||||||
by [asteriskmath asteriskmath.lc asteriskmath.cv15 asterisk asterisk.lc asterisk.cv15];
|
by [asteriskmath asteriskmath.lc asteriskmath.cv15 asterisk asterisk.lc asterisk.cv15];
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
# Name: Top-aligned tilde
|
# Top-aligned tilde
|
||||||
|
|
||||||
sub asciitilde by asciitilde.cv17;
|
sub asciitilde by asciitilde.cv17;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: percent sign with dots instead of hollow circles
|
# percent sign with dots instead of hollow circles
|
||||||
|
|
||||||
sub percent by percent.cv18;
|
sub percent by percent.cv18;
|
||||||
sub perthousand by perthousand.cv18;
|
sub perthousand by perthousand.cv18;
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
# Name: Less Than + Equal with horizontal bar
|
# Less Than + Equal with horizontal bar
|
||||||
|
|
||||||
sub less_equal.liga by less_equal.ss02;
|
sub less_equal.liga by less_equal.ss02;
|
@ -1,4 +1,4 @@
|
|||||||
# Name: Less Than + Equal as an arrow
|
# Less Than + Equal as an arrow
|
||||||
|
|
||||||
lookup less_equal_cv20 {
|
lookup less_equal_cv20 {
|
||||||
sub less_equal_start.seq less_equal.liga' by equal_end.seq;
|
sub less_equal_start.seq less_equal.liga' by equal_end.seq;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: =<
|
# =<
|
||||||
|
|
||||||
lookup equal_less_cv21 {
|
lookup equal_less_cv21 {
|
||||||
ignore sub equal equal' less;
|
ignore sub equal equal' less;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: =< with horizontal bar
|
# =< with horizontal bar
|
||||||
|
|
||||||
lookup equal_less_cv22 {
|
lookup equal_less_cv22 {
|
||||||
ignore sub equal equal' less;
|
ignore sub equal equal' less;
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
# Name: >= with horizontal bar
|
# >= with horizontal bar
|
||||||
|
|
||||||
sub greater_equal.liga by greater_equal.ss02;
|
sub greater_equal.liga by greater_equal.ss02;
|
@ -1,4 +1,4 @@
|
|||||||
# Name: /= as not equal
|
# /= as not equal
|
||||||
|
|
||||||
lookup slash_equal_as_not_equal {
|
lookup slash_equal_as_not_equal {
|
||||||
sub slash.spacer equal_end.seq' by exclam_equal.liga;
|
sub slash.spacer equal_end.seq' by exclam_equal.liga;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: .- as ligature
|
# .- as ligature
|
||||||
|
|
||||||
lookup period_hyphen {
|
lookup period_hyphen {
|
||||||
ignore sub period period' hyphen;
|
ignore sub period period' hyphen;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: :- as ligature
|
# :- as ligature
|
||||||
|
|
||||||
lookup colon_hyphen {
|
lookup colon_hyphen {
|
||||||
ignore sub colon colon' hyphen;
|
ignore sub colon colon' hyphen;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: [] as ligature
|
# [] as ligature
|
||||||
|
|
||||||
lookup bracketleft_bracketright {
|
lookup bracketleft_bracketright {
|
||||||
sub bracketleft.spacer bracketright' by bracketleft_bracketright.cv27;
|
sub bracketleft.spacer bracketright' by bracketleft_bracketright.cv27;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: {. .} as ligature
|
# {. .} as ligature
|
||||||
|
|
||||||
sub braceleft period' by bullet;
|
sub braceleft period' by bullet;
|
||||||
sub period' braceright by bullet;
|
sub period' braceright by bullet;
|
@ -1,4 +1,4 @@
|
|||||||
# Name: Rounded curly braces {}
|
# Rounded curly braces {}
|
||||||
|
|
||||||
sub braceleft by braceleft.cv29;
|
sub braceleft by braceleft.cv29;
|
||||||
sub braceright by braceright.cv29;
|
sub braceright by braceright.cv29;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: longer pipe symbol
|
# longer pipe symbol
|
||||||
|
|
||||||
sub bar by bar.cv30;
|
sub bar by bar.cv30;
|
||||||
sub bar_bar.liga by bar_bar.liga.cv30;
|
sub bar_bar.liga by bar_bar.liga.cv30;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: Circular parentheses
|
# Circular parentheses
|
||||||
|
|
||||||
sub parenleft by parenleft.cv31;
|
sub parenleft by parenleft.cv31;
|
||||||
sub parenright by parenright.cv31;
|
sub parenright by parenright.cv31;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: .= as ligature
|
# .= as ligature
|
||||||
|
|
||||||
lookup period_equal {
|
lookup period_equal {
|
||||||
ignore sub period period' equal;
|
ignore sub period period' equal;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Name: Zero with a dot inside
|
# Zero with a dot inside
|
||||||
|
|
||||||
sub zero by zero.zero;
|
sub zero by zero.zero;
|
||||||
sub zero.tosf by zero.tosf.zero;
|
sub zero.tosf by zero.tosf.zero;
|
Loading…
Reference in New Issue
Block a user