Rolled back ascender/descender changes from 6ee86a6 #798

tonsky · Aug 1, 2019 · c13a803 · fabiangreffrath · Jun 9, 2020 · tonsky
1 parent cf056b2
commit c13a803
Show file tree

Hide file tree

Showing 29 changed files with 45 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ FiraCode\ (Autosaved).glyphs
 master_ufo
 instance_ufo
 venv
-.DS_Store
+.DS_Store
+*.numbers
diff --git a/FiraCode.glyphs b/FiraCode.glyphs
@@ -236,31 +236,31 @@ capHeight = 1374;
 customParameters = (
 {
 name = typoAscender;
-value = 1980;
+value = 1870;
 },
 {
 name = typoDescender;
-value = -644;
+value = -530;
 },
 {
 name = typoLineGap;
 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,31 +306,31 @@ capHeight = 1386;
 customParameters = (
 {
 name = typoAscender;
-value = 1980;
+value = 1870;
 },
 {
 name = typoDescender;
-value = -644;
+value = -530;
 },
 {
 name = typoLineGap;
 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
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/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/variable_ttf/FiraCode-VF.ttf b/distr/variable_ttf/FiraCode-VF.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-Retina.woff b/distr/woff/FiraCode-Retina.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-Retina.woff2 b/distr/woff2/FiraCode-Retina.woff2
diff --git a/distr/woff2/FiraCode-VF.woff2 b/distr/woff2/FiraCode-VF.woff2
diff --git 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
diff --git 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
@@ -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
diff --git a/script/check b/script/check
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+source venv/bin/activate
+
+fontbakery check-universal -C $1