diff --git a/bin/scripts/Hack/autohint.sh b/bin/scripts/Hack/autohint.sh index 5941600ab..4f2b917d2 100755 --- a/bin/scripts/Hack/autohint.sh +++ b/bin/scripts/Hack/autohint.sh @@ -24,19 +24,24 @@ command -v ttfautohint >/dev/null 2>&1 || { # ttfautohint - Input and output file names must not be identical cp "$fontfile" "${fontfile}.tmp" -if [[ "$fontfile" == *"Hack-Regular"* ]] +if [[ "$fontfile" == *" Regular"* ]] then - echo "[Nerd Fonts] Hinting Hack Regular" + echo "[Nerd Fonts] Hinting Knack (Hack) Regular" ttfautohint -l 4 -r 80 -G 350 -x 0 -H 181 -D latn -f latn -w G -W -t -X "" -I -m "bin/scripts/Hack/Hack-Regular-TA.txt" "${fontfile}.tmp" "$fontfile" -elif [[ "$fontfile" == *"Hack-Bold"* ]] - echo "[Nerd Fonts] Hinting Hack Bold" +elif [[ "$fontfile" == *" Bold"* ]] +then + echo "[Nerd Fonts] Hinting Knack (Hack) Bold" ttfautohint -l 4 -r 80 -G 350 -x 0 -H 260 -D latn -f latn -w G -W -t -X "" -I -m "bin/scripts/Hack/Hack-Bold-TA.txt" "${fontfile}.tmp" "$fontfile" -elif [[ "$fontfile" == *"Hack-Italic"* ]] - echo "[Nerd Fonts] Hinting Hack Italic" +elif [[ "$fontfile" == *" Italic"* ]] +then + echo "[Nerd Fonts] Hinting Knack (Hack) Italic" ttfautohint -l 4 -r 80 -G 350 -x 0 -H 145 -D latn -f latn -w G -W -t -X "" -I -m "bin/scripts/Hack/Hack-Bold-TA.txt" "${fontfile}.tmp" "$fontfile" -elif [[ "$fontfile" == *"Hack-BoldItalic"* ]] - echo "[Nerd Fonts] Hinting Hack Bold Italic" +elif [[ "$fontfile" == *" BoldItalic"* ]] +then + echo "[Nerd Fonts] Hinting Knack (Hack) Bold Italic" ttfautohint -l 4 -r 80 -G 350 -x 0 -H 265 -D latn -f latn -w G -W -t -X "" -I -m "bin/scripts/Hack/Hack-Bold-TA.txt" "${fontfile}.tmp" "$fontfile" +else + echo "[Nerd Fonts] Could not find any Knack (Hack) fonts to hint..." fi # clean-up diff --git a/bin/scripts/Hack/postprocess.sh b/bin/scripts/Hack/postprocess.sh index 942ddd9b2..b336fd654 100755 --- a/bin/scripts/Hack/postprocess.sh +++ b/bin/scripts/Hack/postprocess.sh @@ -4,7 +4,7 @@ fontfile=$1 dir=$(dirname "$0") -#echo "dir $dir" +echo "dir $dir" "${dir}/autohint.sh" "$fontfile" "${dir}/../fpfix.py" "$fontfile" diff --git a/bin/scripts/gotta-patch-em-all-font-patcher!.sh b/bin/scripts/gotta-patch-em-all-font-patcher!.sh index 262b985db..43770c713 100755 --- a/bin/scripts/gotta-patch-em-all-font-patcher!.sh +++ b/bin/scripts/gotta-patch-em-all-font-patcher!.sh @@ -73,6 +73,13 @@ function patch_font { source "$config_parent_dir/config.cfg" fi + if [ "$post_process" ] + then + post_process="--postprocess=$post_process" + else + post_process="" + fi + if [ "$config_has_powerline" ] then powerline="" @@ -87,10 +94,10 @@ function patch_font { exit 1 } - fontforge -quiet -script ./font-patcher "$f" -q $powerline --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null - fontforge -quiet -script ./font-patcher "$f" -q -s $powerline --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null - fontforge -quiet -script ./font-patcher "$f" -q -w $powerline --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null - fontforge -quiet -script ./font-patcher "$f" -q -s -w $powerline --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null + fontforge -quiet -script ./font-patcher "$f" -q $powerline $post_process --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null + fontforge -quiet -script ./font-patcher "$f" -q -s $powerline $post_process --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null + fontforge -quiet -script ./font-patcher "$f" -q -w $powerline $post_process --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null + fontforge -quiet -script ./font-patcher "$f" -q -s -w $powerline $post_process --complete --no-progressbars --outputdir "${patched_font_dir}complete/" 2>/dev/null # wait for this group of background processes to finish to avoid forking too many processes # that can add up quickly with the number of combinations #wait diff --git a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono Windows Compatible.ttf b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono Windows Compatible.ttf index 93adbb23d..7d2ee0ef3 100644 Binary files a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono Windows Compatible.ttf and b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono.ttf b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono.ttf index 13916c11b..49aa5d7c4 100644 Binary files a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono.ttf and b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Mono.ttf differ diff --git a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Windows Compatible.ttf b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Windows Compatible.ttf index 6136f0ab6..3df6539c6 100644 Binary files a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Windows Compatible.ttf and b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete.ttf b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete.ttf index 6ec61b6a4..8b3fd871c 100644 Binary files a/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete.ttf and b/patched-fonts/Hack/Bold/complete/Knack Bold Nerd Font Complete.ttf differ diff --git a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono Windows Compatible.ttf b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono Windows Compatible.ttf index 53f881725..f29d722bb 100644 Binary files a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono Windows Compatible.ttf and b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono.ttf b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono.ttf index 62baca71d..0023c58fa 100644 Binary files a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono.ttf and b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Mono.ttf differ diff --git a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Windows Compatible.ttf b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Windows Compatible.ttf index f2b15eaf5..eb20f50d9 100644 Binary files a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Windows Compatible.ttf and b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete.ttf b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete.ttf index 7f650d1f8..2c88007c6 100644 Binary files a/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete.ttf and b/patched-fonts/Hack/BoldItalic/complete/Knack Bold Italic Nerd Font Complete.ttf differ diff --git a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono Windows Compatible.ttf b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono Windows Compatible.ttf index 070da9662..577f696b1 100644 Binary files a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono Windows Compatible.ttf and b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono.ttf b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono.ttf index 9054dca82..94f7b0abc 100644 Binary files a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono.ttf and b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Mono.ttf differ diff --git a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Windows Compatible.ttf b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Windows Compatible.ttf index de94203a2..e01528ce8 100644 Binary files a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Windows Compatible.ttf and b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete.ttf b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete.ttf index d90d22c7a..de5dc0d80 100644 Binary files a/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete.ttf and b/patched-fonts/Hack/Italic/complete/Knack Italic Nerd Font Complete.ttf differ diff --git a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono Windows Compatible.ttf b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono Windows Compatible.ttf index cdaa6575b..1765e326c 100644 Binary files a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono Windows Compatible.ttf and b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono.ttf b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono.ttf index bd61090ba..2da4842c6 100644 Binary files a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono.ttf and b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Mono.ttf differ diff --git a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Windows Compatible.ttf b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Windows Compatible.ttf index c02f5ac62..75b68196b 100644 Binary files a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Windows Compatible.ttf and b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete Windows Compatible.ttf differ diff --git a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete.ttf b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete.ttf index d013fa3e8..4d808659e 100644 Binary files a/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete.ttf and b/patched-fonts/Hack/Regular/complete/Knack Regular Nerd Font Complete.ttf differ diff --git a/readme.md b/readme.md index 28964eb89..b0e44aca3 100644 --- a/readme.md +++ b/readme.md @@ -140,7 +140,7 @@ The following Sankey flow diagram shows the current glyph sets included: | [Hermut Nerd Font][p-hermit] | | NO | 1000 | ![w2] ![m2] ![l2] | | [Inconsolata Nerd Font][p-inconsolata] | | NO | 1000 | ![w2] ![m2] ![l2] | | [Iosevka Nerd Font][p-iosevka] | [Iosevka][f-iosevka] | YES | 1000 | [#83][s-iosevka] | -| [Knack Nerd Font][p-hack] | [Hack][f-hack] | YES | 2048 | [#70][s-hack] | +| [Knack Nerd Font][p-hack] | [Hack][f-hack] | YES | 2048 | ![w2] ![m2] ![l2] | | [Lekton Nerd Font][p-lekton] | | NO | 1000 | ![w2] ![m2] ![l2] | | [Literation Mono Nerd Font][p-liberation] | [Liberation][f-liberation] | YES | 2048 | ![w2] ![m2] ![l2] | | [Meslo Nerd Font][p-meslo] | | NO | 2048 | ![w2] ![m2] ![l2] |