diff --git a/Dockerfile b/Dockerfile index 13085bb..951502f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,9 @@ RUN apt-get install -y locales \ && sed -i "s/^# $LANG/$LANG/" /etc/locale.gen \ && locale-gen +# for BitsNPicas +RUN apt-get install -y openjdk-11-jdk-headless + # for bitmap-font-patcher RUN apt-get install -y python python-fontforge python-pip python-dev libfreetype6-dev RUN pip install bdflib Pillow diff --git a/README.md b/README.md index 946de0a..3843a95 100644 --- a/README.md +++ b/README.md @@ -267,7 +267,7 @@ You can build the Tamzen fonts for yourself by running these commands: But first, you'll need to install these dependencies (assuming Debian): # NOTE: the "xfonts-utils" package provides both bdftopcf(1) and fonttosfnt(1) - sudo apt-get install ruby git imagemagick xfonts-utils bdf2psf default-jre gbdfed + sudo apt-get install ruby git imagemagick xfonts-utils bdf2psf default-jre gbdfed openjdk-11-jdk-headless gem install bundler -v 2.3.26 bundle install diff --git a/Rakefile b/Rakefile index b8ed7e0..222fa4a 100644 --- a/Rakefile +++ b/Rakefile @@ -287,7 +287,7 @@ CLOBBER.include %w[ .opentype otb ] directory 'ttf' desc 'Build Tamzen fonts in TrueType (TTF) format.' -file '.truetype' => %w[ ttf .bitmap bitsnpicas/downloads/BitsNPicas.jar ] do |t| +file '.truetype' => %w[ ttf .bitmap bitsnpicas/main/java/BitsNPicas/BitsNPicas.jar ] do |t| FileList['bdf/Tamzen*.bdf'].each do |src| dst = src.gsub('bdf', 'ttf') sh 'java', '-jar', t.prerequisites.last, @@ -297,8 +297,14 @@ file '.truetype' => %w[ ttf .bitmap bitsnpicas/downloads/BitsNPicas.jar ] do |t| end CLOBBER.include %w[ .truetype ttf ] -file 'bitsnpicas/downloads/BitsNPicas.jar' do - sh 'git', 'clone', 'https://github.com/kreativekorp/bitsnpicas' +file 'bitsnpicas/main/java/BitsNPicas/BitsNPicas.jar' do + sh 'git', 'clone', 'https://github.com/sunaku/bitsnpicas' + cd 'bitsnpicas' do + sh 'git', 'checkout', 'timeless' + cd 'main/java/BitsNPicas' do + sh 'make', 'BitsNPicas.jar' + end + end end #----------------------------------------------------------------------------- diff --git a/ttf/Tamzen10x20b.ttf b/ttf/Tamzen10x20b.ttf index 09b1da6..8a2d329 100644 Binary files a/ttf/Tamzen10x20b.ttf and b/ttf/Tamzen10x20b.ttf differ diff --git a/ttf/Tamzen10x20r.ttf b/ttf/Tamzen10x20r.ttf index 0ad28d6..db3edfe 100644 Binary files a/ttf/Tamzen10x20r.ttf and b/ttf/Tamzen10x20r.ttf differ diff --git a/ttf/Tamzen5x9b.ttf b/ttf/Tamzen5x9b.ttf index a33d0e7..8d38f06 100644 Binary files a/ttf/Tamzen5x9b.ttf and b/ttf/Tamzen5x9b.ttf differ diff --git a/ttf/Tamzen5x9r.ttf b/ttf/Tamzen5x9r.ttf index 428f2fa..34bbbe9 100644 Binary files a/ttf/Tamzen5x9r.ttf and b/ttf/Tamzen5x9r.ttf differ diff --git a/ttf/Tamzen6x12b.ttf b/ttf/Tamzen6x12b.ttf index 9eb7cbd..d9fb2d9 100644 Binary files a/ttf/Tamzen6x12b.ttf and b/ttf/Tamzen6x12b.ttf differ diff --git a/ttf/Tamzen6x12r.ttf b/ttf/Tamzen6x12r.ttf index f509d8f..d0921c2 100644 Binary files a/ttf/Tamzen6x12r.ttf and b/ttf/Tamzen6x12r.ttf differ diff --git a/ttf/Tamzen7x13b.ttf b/ttf/Tamzen7x13b.ttf index 10afedc..8d0cf32 100644 Binary files a/ttf/Tamzen7x13b.ttf and b/ttf/Tamzen7x13b.ttf differ diff --git a/ttf/Tamzen7x13r.ttf b/ttf/Tamzen7x13r.ttf index db58b4d..8d7ad3f 100644 Binary files a/ttf/Tamzen7x13r.ttf and b/ttf/Tamzen7x13r.ttf differ diff --git a/ttf/Tamzen7x14b.ttf b/ttf/Tamzen7x14b.ttf index e258204..00298fe 100644 Binary files a/ttf/Tamzen7x14b.ttf and b/ttf/Tamzen7x14b.ttf differ diff --git a/ttf/Tamzen7x14r.ttf b/ttf/Tamzen7x14r.ttf index ad7ba84..75294fa 100644 Binary files a/ttf/Tamzen7x14r.ttf and b/ttf/Tamzen7x14r.ttf differ diff --git a/ttf/Tamzen8x15b.ttf b/ttf/Tamzen8x15b.ttf index 10d1c75..e575d2e 100644 Binary files a/ttf/Tamzen8x15b.ttf and b/ttf/Tamzen8x15b.ttf differ diff --git a/ttf/Tamzen8x15r.ttf b/ttf/Tamzen8x15r.ttf index bba903e..509585d 100644 Binary files a/ttf/Tamzen8x15r.ttf and b/ttf/Tamzen8x15r.ttf differ diff --git a/ttf/Tamzen8x16b.ttf b/ttf/Tamzen8x16b.ttf index 0730e85..b5eadcf 100644 Binary files a/ttf/Tamzen8x16b.ttf and b/ttf/Tamzen8x16b.ttf differ diff --git a/ttf/Tamzen8x16r.ttf b/ttf/Tamzen8x16r.ttf index f097c61..b16c24b 100644 Binary files a/ttf/Tamzen8x16r.ttf and b/ttf/Tamzen8x16r.ttf differ diff --git a/ttf/TamzenForPowerline10x20b.ttf b/ttf/TamzenForPowerline10x20b.ttf index 9af92d9..5f81221 100644 Binary files a/ttf/TamzenForPowerline10x20b.ttf and b/ttf/TamzenForPowerline10x20b.ttf differ diff --git a/ttf/TamzenForPowerline10x20r.ttf b/ttf/TamzenForPowerline10x20r.ttf index 6621845..0a99220 100644 Binary files a/ttf/TamzenForPowerline10x20r.ttf and b/ttf/TamzenForPowerline10x20r.ttf differ diff --git a/ttf/TamzenForPowerline5x9b.ttf b/ttf/TamzenForPowerline5x9b.ttf index 9a479b1..fa88f2e 100644 Binary files a/ttf/TamzenForPowerline5x9b.ttf and b/ttf/TamzenForPowerline5x9b.ttf differ diff --git a/ttf/TamzenForPowerline5x9r.ttf b/ttf/TamzenForPowerline5x9r.ttf index 8ba2c73..0306c12 100644 Binary files a/ttf/TamzenForPowerline5x9r.ttf and b/ttf/TamzenForPowerline5x9r.ttf differ diff --git a/ttf/TamzenForPowerline6x12b.ttf b/ttf/TamzenForPowerline6x12b.ttf index 26f0859..518c53a 100644 Binary files a/ttf/TamzenForPowerline6x12b.ttf and b/ttf/TamzenForPowerline6x12b.ttf differ diff --git a/ttf/TamzenForPowerline6x12r.ttf b/ttf/TamzenForPowerline6x12r.ttf index 41e1edf..afe3ab2 100644 Binary files a/ttf/TamzenForPowerline6x12r.ttf and b/ttf/TamzenForPowerline6x12r.ttf differ diff --git a/ttf/TamzenForPowerline7x13b.ttf b/ttf/TamzenForPowerline7x13b.ttf index 4ef60fe..f354c8d 100644 Binary files a/ttf/TamzenForPowerline7x13b.ttf and b/ttf/TamzenForPowerline7x13b.ttf differ diff --git a/ttf/TamzenForPowerline7x13r.ttf b/ttf/TamzenForPowerline7x13r.ttf index 8308408..cd7c948 100644 Binary files a/ttf/TamzenForPowerline7x13r.ttf and b/ttf/TamzenForPowerline7x13r.ttf differ diff --git a/ttf/TamzenForPowerline7x14b.ttf b/ttf/TamzenForPowerline7x14b.ttf index 1ee42b6..094aa64 100644 Binary files a/ttf/TamzenForPowerline7x14b.ttf and b/ttf/TamzenForPowerline7x14b.ttf differ diff --git a/ttf/TamzenForPowerline7x14r.ttf b/ttf/TamzenForPowerline7x14r.ttf index 0280307..33bced4 100644 Binary files a/ttf/TamzenForPowerline7x14r.ttf and b/ttf/TamzenForPowerline7x14r.ttf differ diff --git a/ttf/TamzenForPowerline8x15b.ttf b/ttf/TamzenForPowerline8x15b.ttf index 22e66f2..871b459 100644 Binary files a/ttf/TamzenForPowerline8x15b.ttf and b/ttf/TamzenForPowerline8x15b.ttf differ diff --git a/ttf/TamzenForPowerline8x15r.ttf b/ttf/TamzenForPowerline8x15r.ttf index 5224a1e..4d5d99b 100644 Binary files a/ttf/TamzenForPowerline8x15r.ttf and b/ttf/TamzenForPowerline8x15r.ttf differ diff --git a/ttf/TamzenForPowerline8x16b.ttf b/ttf/TamzenForPowerline8x16b.ttf index b8f3321..d48a7a0 100644 Binary files a/ttf/TamzenForPowerline8x16b.ttf and b/ttf/TamzenForPowerline8x16b.ttf differ diff --git a/ttf/TamzenForPowerline8x16r.ttf b/ttf/TamzenForPowerline8x16r.ttf index 7064460..b6b4686 100644 Binary files a/ttf/TamzenForPowerline8x16r.ttf and b/ttf/TamzenForPowerline8x16r.ttf differ