1
0
Fork 0
mirror of synced 2024-05-17 19:13:52 +12:00

Fixed version (no ligatures)

This commit is contained in:
Nikita Prokopov 2020-06-26 15:54:00 +02:00
parent e367fa4871
commit bbba9f05dc
38 changed files with 6742 additions and 6621 deletions

File diff suppressed because one or more lines are too long

View file

@ -1,47 +1,47 @@
@font-face { @font-face {
font-family: 'Fira Code'; font-family: 'Fira Code Fixed';
src: url('woff2/FiraCode-Light.woff2') format('woff2'), src: url('woff2/FiraCodeFixed-Light.woff2') format('woff2'),
url("woff/FiraCode-Light.woff") format("woff"); url("woff/FiraCodeFixed-Light.woff") format("woff");
font-weight: 300; font-weight: 300;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Fira Code'; font-family: 'Fira Code Fixed';
src: url('woff2/FiraCode-Regular.woff2') format('woff2'), src: url('woff2/FiraCodeFixed-Regular.woff2') format('woff2'),
url("woff/FiraCode-Regular.woff") format("woff"); url("woff/FiraCodeFixed-Regular.woff") format("woff");
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Fira Code'; font-family: 'Fira Code Fixed';
src: url('woff2/FiraCode-Medium.woff2') format('woff2'), src: url('woff2/FiraCodeFixed-Medium.woff2') format('woff2'),
url("woff/FiraCode-Medium.woff") format("woff"); url("woff/FiraCodeFixed-Medium.woff") format("woff");
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Fira Code'; font-family: 'Fira Code Fixed';
src: url('woff2/FiraCode-SemiBold.woff2') format('woff2'), src: url('woff2/FiraCodeFixed-SemiBold.woff2') format('woff2'),
url("woff/FiraCode-SemiBold.woff") format("woff"); url("woff/FiraCodeFixed-SemiBold.woff") format("woff");
font-weight: 600; font-weight: 600;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Fira Code'; font-family: 'Fira Code Fixed';
src: url('woff2/FiraCode-Bold.woff2') format('woff2'), src: url('woff2/FiraCodeFixed-Bold.woff2') format('woff2'),
url("woff/FiraCode-Bold.woff") format("woff"); url("woff/FiraCodeFixed-Bold.woff") format("woff");
font-weight: 700; font-weight: 700;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: 'Fira Code VF'; font-family: 'Fira Code Fixed VF';
src: url('woff2/FiraCode-VF.woff2') format('woff2-variations'), src: url('woff2/FiraCodeFixed-VF.woff2') format('woff2-variations'),
url('woff/FiraCode-VF.woff') format('woff-variations'); url('woff/FiraCodeFixed-VF.woff') format('woff-variations');
/* font-weight requires a range: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide#Using_a_variable_font_font-face_changes */ /* font-weight requires a range: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide#Using_a_variable_font_font-face_changes */
font-weight: 300 700; font-weight: 300 700;
font-style: normal; font-style: normal;

View file

@ -3,11 +3,11 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>Fira Code Specimen</title> <title>Fira Code Fixed Specimen</title>
<link rel="stylesheet" href="fira_code.css"> <link rel="stylesheet" href="fira_code.css">
<style> <style>
body { font: 14px/1.5em "Fira Code"; } body { font: 14px/1.5em "Fira Code Fixed"; }
.code { .code {
font-feature-settings: "calt" 1; /* Enable ligatures for IE 10+, Edge */ font-feature-settings: "calt" 1; /* Enable ligatures for IE 10+, Edge */
text-rendering: optimizeLegibility; /* Force ligatures for Webkit, Blink, Gecko */ text-rendering: optimizeLegibility; /* Force ligatures for Webkit, Blink, Gecko */
@ -21,7 +21,7 @@
.medium { font-weight: 500; } .medium { font-weight: 500; }
.semibold { font-weight: 600; } .semibold { font-weight: 600; }
.bold { font-weight: 700; } .bold { font-weight: 700; }
.variable { font-family: 'Fira Code VF'; font-variation-settings: 'wght' 400; } .variable { font-family: 'Fira Code Fixed VF'; font-variation-settings: 'wght' 400; }
i { font-style: normal; color: #c33; } i { font-style: normal; color: #c33; }
b { font-weight: inherit; color: #c33; } b { font-weight: inherit; color: #c33; }
</style> </style>
@ -34,7 +34,7 @@
</script> </script>
<body> <body>
<div class="code light"><b># Fira Code Light</b> <div class="code light"><b># Fira Code Fixed Light</b>
take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i> take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
| n <i>&lt;=</i> 0 <i>=&gt;</i> [] | n <i>&lt;=</i> 0 <i>=&gt;</i> []
@ -44,7 +44,7 @@ take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div> last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div>
<div class="code regular"><b># Fira Code Regular</b> <div class="code regular"><b># Fira Code Fixed Regular</b>
take = (n, [x, <i>...</i>xs]:list) <i>--></i> take = (n, [x, <i>...</i>xs]:list) <i>--></i>
| n <i>&lt;=</i> 0 <i>=&gt;</i> [] | n <i>&lt;=</i> 0 <i>=&gt;</i> []
@ -54,7 +54,7 @@ take = (n, [x, <i>...</i>xs]:list) <i>--></i>
last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div> last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div>
<div class="code medium"><b># Fira Code Medium</b> <div class="code medium"><b># Fira Code Fixed Medium</b>
take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i> take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
| n <i>&lt;=</i> 0 <i>=&gt;</i> [] | n <i>&lt;=</i> 0 <i>=&gt;</i> []
@ -64,7 +64,7 @@ take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div> last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div>
<div class="code semibold"><b># Fira Code SemiBold</b> <div class="code semibold"><b># Fira Code Fixed SemiBold</b>
take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i> take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
| n <i>&lt;=</i> 0 <i>=&gt;</i> [] | n <i>&lt;=</i> 0 <i>=&gt;</i> []
@ -74,7 +74,7 @@ take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div> last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div>
<div class="code bold"><b># Fira Code Bold</b> <div class="code bold"><b># Fira Code Fixed Bold</b>
take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i> take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
| n <i>&lt;=</i> 0 <i>=&gt;</i> [] | n <i>&lt;=</i> 0 <i>=&gt;</i> []
@ -83,7 +83,7 @@ take = (n, [x, <i>...</i>xs]:list) <i>--&gt;</i>
last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div> last3 = reverse <i>&gt;&gt;</i> take 3 <i>&gt;&gt;</i> reverse</div>
<div id="code_variable" class="code variable"><b># Fira Code Variable</b> <div id="code_variable" class="code variable"><b># Fira Code Fixed Variable</b>
<input type="range" min="300" max="700" value="400" step="10" style="width: 300px;" oninput="onWeightChange(this.value)" onchange="onWeightChange(this.value)"> <span id="span_wght">400</span> <input type="range" min="300" max="700" value="400" step="10" style="width: 300px;" oninput="onWeightChange(this.value)" onchange="onWeightChange(this.value)"> <span id="span_wght">400</span>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -5,7 +5,7 @@ cd "`dirname $0`/.."
source venv/bin/activate source venv/bin/activate
DIR=distr/variable_ttf DIR=distr/variable_ttf
FILE=FiraCode-VF.ttf FILE=FiraCodeFixed-VF.ttf
rm -rf $DIR/$FILE rm -rf $DIR/$FILE
fontmake -g FiraCode.glyphs -o variable --output-dir $DIR fontmake -g FiraCode.glyphs -o variable --output-dir $DIR

View file

@ -14,4 +14,4 @@ done
mkdir -p distr/woff mkdir -p distr/woff
mv distr/*/*.woff distr/woff mv distr/*/*.woff distr/woff
rm distr/woff/FiraCode-Retina.woff rm distr/woff/FiraCodeFixed-Retina.woff

View file

@ -13,4 +13,4 @@ done
mkdir -p distr/woff2 mkdir -p distr/woff2
mv distr/*/*.woff2 distr/woff2 mv distr/*/*.woff2 distr/woff2
rm distr/woff2/FiraCode-Retina.woff2 rm distr/woff2/FiraCodeFixed-Retina.woff2

View file

@ -17,7 +17,7 @@ if [[ $MINOR =~ 'versionMinor = ([0-9]+);' ]] ; then
fi fi
fi fi
FILE="Fira_Code_v$VERSION.zip" FILE="Fira_Code_Fixed_v$VERSION.zip"
rm -f $FILE rm -f $FILE
pushd distr pushd distr