diff --git a/.gitignore b/.gitignore index 4d1ca16..df16350 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ FiraCode\ (Autosaved).glyphs master_ufo instance_ufo venv -.DS_Store \ No newline at end of file +.DS_Store +*.numbers \ No newline at end of file diff --git a/FiraCode.glyphs b/FiraCode.glyphs index 4fc4719..9f5d22f 100644 --- a/FiraCode.glyphs +++ b/FiraCode.glyphs @@ -236,11 +236,11 @@ capHeight = 1374; customParameters = ( { name = typoAscender; -value = 1980; +value = 1870; }, { name = typoDescender; -value = -644; +value = -530; }, { name = typoLineGap; @@ -248,19 +248,19 @@ value = 0; }, { name = winAscent; -value = 2164; +value = 1870; }, { name = winDescent; -value = 1000; +value = 530; }, { name = hheaAscender; -value = 1980; +value = 1870; }, { name = hheaDescender; -value = -644; +value = -530; }, { name = hheaLineGap; @@ -306,11 +306,11 @@ capHeight = 1386; customParameters = ( { name = typoAscender; -value = 1980; +value = 1870; }, { name = typoDescender; -value = -644; +value = -530; }, { name = typoLineGap; @@ -318,19 +318,19 @@ value = 0; }, { name = winAscent; -value = 2164; +value = 1870; }, { name = winDescent; -value = 1000; +value = 530; }, { name = hheaAscender; -value = 1980; +value = 1870; }, { name = hheaDescender; -value = -644; +value = -530; }, { name = hheaLineGap; diff --git a/distr/otf/FiraCode-Bold.otf b/distr/otf/FiraCode-Bold.otf index 92fdc00..0408ff5 100644 Binary files a/distr/otf/FiraCode-Bold.otf and b/distr/otf/FiraCode-Bold.otf differ diff --git a/distr/otf/FiraCode-Light.otf b/distr/otf/FiraCode-Light.otf index fa5275d..d669383 100644 Binary files a/distr/otf/FiraCode-Light.otf and b/distr/otf/FiraCode-Light.otf differ diff --git a/distr/otf/FiraCode-Medium.otf b/distr/otf/FiraCode-Medium.otf index 0f5aad3..df48a8c 100644 Binary files a/distr/otf/FiraCode-Medium.otf and b/distr/otf/FiraCode-Medium.otf differ diff --git a/distr/otf/FiraCode-Regular.otf b/distr/otf/FiraCode-Regular.otf index 1fa22f7..9981d7e 100644 Binary files a/distr/otf/FiraCode-Regular.otf and b/distr/otf/FiraCode-Regular.otf differ diff --git a/distr/otf/FiraCode-Retina.otf b/distr/otf/FiraCode-Retina.otf index 5efdd57..47df9d2 100644 Binary files a/distr/otf/FiraCode-Retina.otf and b/distr/otf/FiraCode-Retina.otf differ diff --git a/distr/ttf/FiraCode-Bold.ttf b/distr/ttf/FiraCode-Bold.ttf index 58326a3..cd7aa48 100644 Binary files a/distr/ttf/FiraCode-Bold.ttf and b/distr/ttf/FiraCode-Bold.ttf differ diff --git a/distr/ttf/FiraCode-Light.ttf b/distr/ttf/FiraCode-Light.ttf index 01da0cb..06cf7c3 100644 Binary files a/distr/ttf/FiraCode-Light.ttf and b/distr/ttf/FiraCode-Light.ttf differ diff --git a/distr/ttf/FiraCode-Medium.ttf b/distr/ttf/FiraCode-Medium.ttf index 23e673c..5c64825 100644 Binary files a/distr/ttf/FiraCode-Medium.ttf and b/distr/ttf/FiraCode-Medium.ttf differ diff --git a/distr/ttf/FiraCode-Regular.ttf b/distr/ttf/FiraCode-Regular.ttf index ed00ce8..ffbb903 100644 Binary files a/distr/ttf/FiraCode-Regular.ttf and b/distr/ttf/FiraCode-Regular.ttf differ diff --git a/distr/ttf/FiraCode-Retina.ttf b/distr/ttf/FiraCode-Retina.ttf index a8916af..2db1c0d 100644 Binary files a/distr/ttf/FiraCode-Retina.ttf and b/distr/ttf/FiraCode-Retina.ttf differ diff --git a/distr/variable_ttf/FiraCode-VF.ttf b/distr/variable_ttf/FiraCode-VF.ttf index 8b1c1b9..90ac4cc 100644 Binary files a/distr/variable_ttf/FiraCode-VF.ttf and b/distr/variable_ttf/FiraCode-VF.ttf differ diff --git a/distr/woff/FiraCode-Bold.woff b/distr/woff/FiraCode-Bold.woff index 41ae43d..dd6d534 100644 Binary files a/distr/woff/FiraCode-Bold.woff and b/distr/woff/FiraCode-Bold.woff differ diff --git a/distr/woff/FiraCode-Light.woff b/distr/woff/FiraCode-Light.woff index 80b0a14..f778b02 100644 Binary files a/distr/woff/FiraCode-Light.woff and b/distr/woff/FiraCode-Light.woff differ diff --git a/distr/woff/FiraCode-Medium.woff b/distr/woff/FiraCode-Medium.woff index 10aada2..e632ba3 100644 Binary files a/distr/woff/FiraCode-Medium.woff and b/distr/woff/FiraCode-Medium.woff differ diff --git a/distr/woff/FiraCode-Regular.woff b/distr/woff/FiraCode-Regular.woff index fed7e50..e73f098 100644 Binary files a/distr/woff/FiraCode-Regular.woff and b/distr/woff/FiraCode-Regular.woff differ diff --git a/distr/woff/FiraCode-Retina.woff b/distr/woff/FiraCode-Retina.woff index 08aad6a..35ca551 100644 Binary files a/distr/woff/FiraCode-Retina.woff and b/distr/woff/FiraCode-Retina.woff differ diff --git a/distr/woff/FiraCode-VF.woff b/distr/woff/FiraCode-VF.woff index eda9b15..bc5fb4e 100644 Binary files a/distr/woff/FiraCode-VF.woff and b/distr/woff/FiraCode-VF.woff differ diff --git a/distr/woff2/FiraCode-Bold.woff2 b/distr/woff2/FiraCode-Bold.woff2 index 7011682..d504c0b 100644 Binary files a/distr/woff2/FiraCode-Bold.woff2 and b/distr/woff2/FiraCode-Bold.woff2 differ diff --git a/distr/woff2/FiraCode-Light.woff2 b/distr/woff2/FiraCode-Light.woff2 index 3fc4fd9..1553342 100644 Binary files a/distr/woff2/FiraCode-Light.woff2 and b/distr/woff2/FiraCode-Light.woff2 differ diff --git a/distr/woff2/FiraCode-Medium.woff2 b/distr/woff2/FiraCode-Medium.woff2 index 4461ce8..8e5da1e 100644 Binary files a/distr/woff2/FiraCode-Medium.woff2 and b/distr/woff2/FiraCode-Medium.woff2 differ diff --git a/distr/woff2/FiraCode-Regular.woff2 b/distr/woff2/FiraCode-Regular.woff2 index 061dddb..f6583be 100644 Binary files a/distr/woff2/FiraCode-Regular.woff2 and b/distr/woff2/FiraCode-Regular.woff2 differ diff --git a/distr/woff2/FiraCode-Retina.woff2 b/distr/woff2/FiraCode-Retina.woff2 index ac90d3e..3a4b95a 100644 Binary files a/distr/woff2/FiraCode-Retina.woff2 and b/distr/woff2/FiraCode-Retina.woff2 differ diff --git a/distr/woff2/FiraCode-VF.woff2 b/distr/woff2/FiraCode-VF.woff2 index cf34f8c..1ea6c92 100644 Binary files a/distr/woff2/FiraCode-VF.woff2 and b/distr/woff2/FiraCode-VF.woff2 differ diff --git a/script/bootstrap b/script/bootstrap index 23e1709..1bcb6db 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -17,3 +17,4 @@ brew install ttfautohint brew install woff2 brew tap bramstein/webfonttools brew install sfnt2woff-zopfli +pip3 install fontbakery \ No newline at end of file diff --git a/script/build b/script/build index c0a73dc..016b318 100755 --- a/script/build +++ b/script/build @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/bin/bash -e source venv/bin/activate diff --git a/script/build_ttf b/script/build_ttf new file mode 100755 index 0000000..33e2e3c --- /dev/null +++ b/script/build_ttf @@ -0,0 +1,24 @@ +#!/bin/bash -e + +source venv/bin/activate + +args=( "$@" ) +default_weights=( "Light" "Regular" "Retina" "Medium" "Bold" ) +weights=( "${args[@]:-"${default_weights[@]}"}" ) + +for weight in "${weights[@]}"; do + file=distr/ttf/FiraCode-${weight}.ttf + + echo "Making " ${file} + rm -rf ${file} + fontmake -g FiraCode.glyphs -o ttf --output-dir distr/ttf -i "Fira Code ${weight}" + + echo "Fixing DSIG in " ${file} + gftools fix-dsig --autofix ${file} + + echo "TTFautohint " ${file} + hintedFile=${file/".ttf"/"-hinted.ttf"} + ttfautohint -I ${file} ${hintedFile} --stem-width-mode nnn --composites + # --windows-compatibility + mv ${hintedFile} ${file} +done \ No newline at end of file diff --git a/script/check b/script/check new file mode 100755 index 0000000..bc83740 --- /dev/null +++ b/script/check @@ -0,0 +1,5 @@ +#!/bin/bash -e + +source venv/bin/activate + +fontbakery check-universal -C $1 \ No newline at end of file