Fira Code v5

tonsky · Jun 8, 2020 · 63c6434 · 63c6434
1 parent 2a76d96
commit 63c6434
Show file tree

Hide file tree

Showing 49 changed files with 37 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-#### 5.0
+#### 5.0 (June 8, 2020)
 
 - Fixed Box drawing diagonal lines U+2571 `╱` U+2572 `╲` U+2573 `╳` #929
 - Added U+2236 Ratio `∶` #926
@@ -13,9 +13,10 @@ All notable changes to this project will be documented in this file.
 - Disable `=/` because of conflicts with paths `PATH=/...` #1056
 - Fixed STAT table in FiraCode-VF.ttf #770 #1054
 - Added `//=` `=//` `=//=` #816 
-- Added U+21B0..U+21B3 `↰↱↲↳`, U+2770..U+2771 `❰❱` #1032
+- Added U+21B0..U+21B3 `↰ ↱ ↲ ↳`, U+2770..U+2771 `❰ ❱` #1032
 - Fixed U+27F8 `⟸` U+27F9 `⟹` U+27FA `⟺` U+27FD `⟽` U+27FE `⟾` U+27FF `⟿` that were broken in v4 #1067
 - Added ss08 that adds gaps to `==` `===` `!=` `!==` #383
+- Removed OTF from distr to avoid confusion #939
 
 #### 4.0 (May 18, 2020)
 

diff --git a/FiraCode.glyphs b/FiraCode.glyphs
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Fira Code is a free monospaced font containing ligatures for common programming
 
 ### Download & Install
 
-<a href="https://github.com/tonsky/FiraCode/releases/download/4/Fira_Code_v4.zip"><img src="./extras/download.png" width="520" height="130"></a>
+<a href="https://github.com/tonsky/FiraCode/releases/download/5/Fira_Code_v5.zip"><img src="./extras/download.png" width="520" height="130"></a>
 
 Then:
 

diff --git a/distr/README.txt b/distr/README.txt
@@ -10,7 +10,7 @@ OR
 
 Use https://chocolatey.org:
 
-    choco install firacode
+    choco install firacode-ttf
 
 
 macOS

diff --git a/distr/otf/FiraCode-Bold.otf b/distr/otf/FiraCode-Bold.otf
diff --git a/distr/otf/FiraCode-Light.otf b/distr/otf/FiraCode-Light.otf
diff --git a/distr/otf/FiraCode-Medium.otf b/distr/otf/FiraCode-Medium.otf
diff --git a/distr/otf/FiraCode-Regular.otf b/distr/otf/FiraCode-Regular.otf
diff --git a/distr/otf/FiraCode-Retina.otf b/distr/otf/FiraCode-Retina.otf
diff --git a/distr/otf/FiraCode-SemiBold.otf b/distr/otf/FiraCode-SemiBold.otf
diff --git a/distr/ttf/FiraCode-Bold.ttf b/distr/ttf/FiraCode-Bold.ttf
diff --git a/distr/ttf/FiraCode-Light.ttf b/distr/ttf/FiraCode-Light.ttf
diff --git a/distr/ttf/FiraCode-Medium.ttf b/distr/ttf/FiraCode-Medium.ttf
diff --git a/distr/ttf/FiraCode-Regular.ttf b/distr/ttf/FiraCode-Regular.ttf
diff --git a/distr/ttf/FiraCode-Retina.ttf b/distr/ttf/FiraCode-Retina.ttf
diff --git a/distr/ttf/FiraCode-SemiBold.ttf b/distr/ttf/FiraCode-SemiBold.ttf
diff --git a/distr/variable_ttf/FiraCode-VF.ttf b/distr/variable_ttf/FiraCode-VF.ttf
diff --git a/distr/variable_ttf/FiraCodeGX.ttf b/distr/variable_ttf/FiraCodeGX.ttf
diff --git a/distr/woff/FiraCode-Bold.woff b/distr/woff/FiraCode-Bold.woff
diff --git a/distr/woff/FiraCode-Light.woff b/distr/woff/FiraCode-Light.woff
diff --git a/distr/woff/FiraCode-Medium.woff b/distr/woff/FiraCode-Medium.woff
diff --git a/distr/woff/FiraCode-Regular.woff b/distr/woff/FiraCode-Regular.woff
diff --git a/distr/woff/FiraCode-SemiBold.woff b/distr/woff/FiraCode-SemiBold.woff
diff --git a/distr/woff/FiraCode-VF.woff b/distr/woff/FiraCode-VF.woff
diff --git a/distr/woff2/FiraCode-Bold.woff2 b/distr/woff2/FiraCode-Bold.woff2
diff --git a/distr/woff2/FiraCode-Light.woff2 b/distr/woff2/FiraCode-Light.woff2
diff --git a/distr/woff2/FiraCode-Medium.woff2 b/distr/woff2/FiraCode-Medium.woff2
diff --git a/distr/woff2/FiraCode-Regular.woff2 b/distr/woff2/FiraCode-Regular.woff2
diff --git a/distr/woff2/FiraCode-SemiBold.woff2 b/distr/woff2/FiraCode-SemiBold.woff2
diff --git a/distr/woff2/FiraCode-VF.woff2 b/distr/woff2/FiraCode-VF.woff2
diff --git a/extras/arrows.png b/extras/arrows.png
diff --git a/extras/console.png b/extras/console.png
diff --git a/extras/download.png b/extras/download.png
diff --git a/extras/ligatures.png b/extras/ligatures.png
diff --git a/extras/math.png b/extras/math.png
diff --git a/extras/samples.png b/extras/samples.png
diff --git a/extras/samples2.png b/extras/samples2.png
diff --git a/extras/showcases.txt b/extras/showcases.txt
@@ -64,7 +64,7 @@ r 0 123456789 & && $ <$ <$> $> @ <= >=
 
 ┌─┬─┐ ╔╦═╗ ┏━┳┓ ╒═╤═╗ ╭─┰─╮ ○   ○ ◆ ◆
 ├─┼─┤ ╠╬═╣ ┣━╋┫ ├─┼─╢ ┝━╋━┥  ╲ ╱   ╳
-└─┴─┘ ╚╩═╝ ┗━┻┛ ╘═╧═╝ ╰─┸─╯   ◼   ◆ ◆
+└─┴─┘ ╚╩═╝ ┗━┻┛ ╘═╧═╝ ╰─┸─╯   ■   ◆ ◆
 
 # Blocks
 

diff --git a/extras/stylistic_sets.png b/extras/stylistic_sets.png
diff --git a/extras/typographics.png b/extras/typographics.png
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firacode",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "Fira Code: monospaced font with programming ligatures",
   "main": "distr/fira_code.css",
   "keywords": [

diff --git a/script/build_otf b/script/build_otf
diff --git a/script/build_variable b/script/build_variable
@@ -2,6 +2,8 @@
 
 cd "`dirname $0`/.."
 
+source venv/bin/activate
+
 DIR=distr/variable_ttf
 FILE=FiraCode-VF.ttf
 

diff --git a/script/build_woff b/script/build_woff
@@ -1,17 +1,17 @@
-#!/bin/bash -e
+#!/bin/bash -euo pipefail
 # requires sfnt2woff-zopfli (get from https://github.com/bramstein/homebrew-webfonttools)
 
-rm -rf distr/woff
+cd "`dirname $0`/.."
+source venv/bin/activate
+
+rm -rf distr/*/*.woff
 
 ttfs=$(ls distr/*/*.ttf)
 for ttf in $ttfs; do
+    echo "sfnt2woff-zopfli $ttf"
     sfnt2woff-zopfli $ttf
 done
 
-rm distr/ttf/FiraCode-Retina.woff
-
 mkdir -p distr/woff
-woffs=$(ls distr/*/*.woff)
-for woff in $woffs; do
-    mv $woff distr/woff/$(basename $woff)
-done
+mv distr/*/*.woff distr/woff
+rm distr/woff/FiraCode-Retina.woff
diff --git a/script/build_woff2 b/script/build_woff2
@@ -1,17 +1,16 @@
-#!/bin/bash -e
+#!/bin/bash -euo pipefail
 # requires woff2_compress (get from https://github.com/bramstein/homebrew-webfonttools)
 
-rm -rf distr/woff2
+cd "`dirname $0`/.."
+source venv/bin/activate
+
+rm -rf distr/*/*.woff2
 
 ttfs=$(ls distr/*/*.ttf)
 for ttf in $ttfs; do
     woff2_compress $ttf
 done
 
-rm distr/ttf/FiraCode-Retina.woff2
-
 mkdir -p distr/woff2
-woff2s=$(ls distr/*/*.woff2)
-for woff2 in $woff2s; do
-    mv $woff2 distr/woff2/$(basename $woff2)
-done
+mv distr/*/*.woff2 distr/woff2
+rm distr/woff2/FiraCode-Retina.woff2
diff --git a/script/everything b/script/everything
@@ -0,0 +1,9 @@
+#!/bin/zsh -euo pipefail
+cd "`dirname $0`/.."
+
+./script/check_widths
+# ./script/build_ttf
+./script/build_variable
+./script/build_woff
+./script/build_woff2
+./script/package
diff --git a/script/install b/script/install
diff --git a/script/package.sh → script/package b/script/package.sh → script/package
@@ -1,8 +1,6 @@
 #!/bin/zsh -euo pipefail
-
 cd "`dirname $0`/.."
 
-
 setopt BASH_REMATCH
 MAJOR=`cat FiraCode.glyphs | grep versionMajor`
 VERSION=""

diff --git a/script/release b/script/release
@@ -1,24 +1,5 @@
-#!/bin/bash -x
-
-# Remove Retina from webfonts
-rm distr/FiraCode-Retina.eot   2> /dev/null
-rm distr/FiraCode-Retina.woff  2> /dev/null
-rm distr/FiraCode-Retina.woff2 2> /dev/null
-
-# Move to folders
-mv distr/*.eot distr/eot/      2> /dev/null
-mv distr/*.woff distr/woff/    2> /dev/null
-mv distr/*.woff2 distr/woff2/  2> /dev/null
-mv distr/*.ttf distr/ttf/      2> /dev/null
-mv distr/*.otf distr/otf/      2> /dev/null
-
-# Install OTF version
-cp distr/otf/*.otf ~/Library/Fonts/
-
-# Pack zip archive
-cd distr
-find . -not -name ".*" | xargs zip ../FiraCode.zip
-cd ..
+#!/bin/bash -euo pipefail
+cd "`dirname $0`/.."
 
 # Update npm
 npm publish