From 72b058279c5fa43c0e153afdd6f86c2d1000efe5 Mon Sep 17 00:00:00 2001 From: "Suraj N. Kurapati" Date: Wed, 20 May 2015 12:11:36 -0700 Subject: [PATCH] move *.bdf and *.png into their own subfolders too --- README.md | 63 +++++++++--------- Rakefile | 48 +++++++------ Tamzen10x20b.bdf => bdf/Tamzen10x20b.bdf | 0 Tamzen10x20r.bdf => bdf/Tamzen10x20r.bdf | 0 Tamzen5x9b.bdf => bdf/Tamzen5x9b.bdf | 0 Tamzen5x9r.bdf => bdf/Tamzen5x9r.bdf | 0 Tamzen6x12b.bdf => bdf/Tamzen6x12b.bdf | 0 Tamzen6x12r.bdf => bdf/Tamzen6x12r.bdf | 0 Tamzen7x13b.bdf => bdf/Tamzen7x13b.bdf | 0 Tamzen7x13r.bdf => bdf/Tamzen7x13r.bdf | 0 Tamzen7x14b.bdf => bdf/Tamzen7x14b.bdf | 0 Tamzen7x14r.bdf => bdf/Tamzen7x14r.bdf | 0 Tamzen8x15b.bdf => bdf/Tamzen8x15b.bdf | 0 Tamzen8x15r.bdf => bdf/Tamzen8x15r.bdf | 0 Tamzen8x16b.bdf => bdf/Tamzen8x16b.bdf | 0 Tamzen8x16r.bdf => bdf/Tamzen8x16r.bdf | 0 .../TamzenForPowerline10x20b.bdf | 0 .../TamzenForPowerline10x20r.bdf | 0 .../TamzenForPowerline5x9b.bdf | 0 .../TamzenForPowerline5x9r.bdf | 0 .../TamzenForPowerline6x12b.bdf | 0 .../TamzenForPowerline6x12r.bdf | 0 .../TamzenForPowerline7x13b.bdf | 0 .../TamzenForPowerline7x13r.bdf | 0 .../TamzenForPowerline7x14b.bdf | 0 .../TamzenForPowerline7x14r.bdf | 0 .../TamzenForPowerline8x15b.bdf | 0 .../TamzenForPowerline8x15r.bdf | 0 .../TamzenForPowerline8x16b.bdf | 0 .../TamzenForPowerline8x16r.bdf | 0 fonts.dir => bdf/fonts.dir | 0 Tamzen10x20b.png => png/Tamzen10x20b.png | Bin Tamzen10x20r.png => png/Tamzen10x20r.png | Bin Tamzen5x9b.png => png/Tamzen5x9b.png | Bin Tamzen5x9r.png => png/Tamzen5x9r.png | Bin Tamzen6x12b.png => png/Tamzen6x12b.png | Bin Tamzen6x12r.png => png/Tamzen6x12r.png | Bin Tamzen7x13b.png => png/Tamzen7x13b.png | Bin Tamzen7x13r.png => png/Tamzen7x13r.png | Bin Tamzen7x14b.png => png/Tamzen7x14b.png | Bin Tamzen7x14r.png => png/Tamzen7x14r.png | Bin Tamzen8x15b.png => png/Tamzen8x15b.png | Bin Tamzen8x15r.png => png/Tamzen8x15r.png | Bin Tamzen8x16b.png => png/Tamzen8x16b.png | Bin Tamzen8x16r.png => png/Tamzen8x16r.png | Bin .../TamzenForPowerline10x20b.png | Bin .../TamzenForPowerline10x20r.png | Bin .../TamzenForPowerline5x9b.png | Bin .../TamzenForPowerline5x9r.png | Bin .../TamzenForPowerline6x12b.png | Bin .../TamzenForPowerline6x12r.png | Bin .../TamzenForPowerline7x13b.png | Bin .../TamzenForPowerline7x13r.png | Bin .../TamzenForPowerline7x14b.png | Bin .../TamzenForPowerline7x14r.png | Bin .../TamzenForPowerline8x15b.png | Bin .../TamzenForPowerline8x15r.png | Bin .../TamzenForPowerline8x16b.png | Bin .../TamzenForPowerline8x16r.png | Bin 59 files changed, 60 insertions(+), 51 deletions(-) rename Tamzen10x20b.bdf => bdf/Tamzen10x20b.bdf (100%) rename Tamzen10x20r.bdf => bdf/Tamzen10x20r.bdf (100%) rename Tamzen5x9b.bdf => bdf/Tamzen5x9b.bdf (100%) rename Tamzen5x9r.bdf => bdf/Tamzen5x9r.bdf (100%) rename Tamzen6x12b.bdf => bdf/Tamzen6x12b.bdf (100%) rename Tamzen6x12r.bdf => bdf/Tamzen6x12r.bdf (100%) rename Tamzen7x13b.bdf => bdf/Tamzen7x13b.bdf (100%) rename Tamzen7x13r.bdf => bdf/Tamzen7x13r.bdf (100%) rename Tamzen7x14b.bdf => bdf/Tamzen7x14b.bdf (100%) rename Tamzen7x14r.bdf => bdf/Tamzen7x14r.bdf (100%) rename Tamzen8x15b.bdf => bdf/Tamzen8x15b.bdf (100%) rename Tamzen8x15r.bdf => bdf/Tamzen8x15r.bdf (100%) rename Tamzen8x16b.bdf => bdf/Tamzen8x16b.bdf (100%) rename Tamzen8x16r.bdf => bdf/Tamzen8x16r.bdf (100%) rename TamzenForPowerline10x20b.bdf => bdf/TamzenForPowerline10x20b.bdf (100%) rename TamzenForPowerline10x20r.bdf => bdf/TamzenForPowerline10x20r.bdf (100%) rename TamzenForPowerline5x9b.bdf => bdf/TamzenForPowerline5x9b.bdf (100%) rename TamzenForPowerline5x9r.bdf => bdf/TamzenForPowerline5x9r.bdf (100%) rename TamzenForPowerline6x12b.bdf => bdf/TamzenForPowerline6x12b.bdf (100%) rename TamzenForPowerline6x12r.bdf => bdf/TamzenForPowerline6x12r.bdf (100%) rename TamzenForPowerline7x13b.bdf => bdf/TamzenForPowerline7x13b.bdf (100%) rename TamzenForPowerline7x13r.bdf => bdf/TamzenForPowerline7x13r.bdf (100%) rename TamzenForPowerline7x14b.bdf => bdf/TamzenForPowerline7x14b.bdf (100%) rename TamzenForPowerline7x14r.bdf => bdf/TamzenForPowerline7x14r.bdf (100%) rename TamzenForPowerline8x15b.bdf => bdf/TamzenForPowerline8x15b.bdf (100%) rename TamzenForPowerline8x15r.bdf => bdf/TamzenForPowerline8x15r.bdf (100%) rename TamzenForPowerline8x16b.bdf => bdf/TamzenForPowerline8x16b.bdf (100%) rename TamzenForPowerline8x16r.bdf => bdf/TamzenForPowerline8x16r.bdf (100%) rename fonts.dir => bdf/fonts.dir (100%) rename Tamzen10x20b.png => png/Tamzen10x20b.png (100%) rename Tamzen10x20r.png => png/Tamzen10x20r.png (100%) rename Tamzen5x9b.png => png/Tamzen5x9b.png (100%) rename Tamzen5x9r.png => png/Tamzen5x9r.png (100%) rename Tamzen6x12b.png => png/Tamzen6x12b.png (100%) rename Tamzen6x12r.png => png/Tamzen6x12r.png (100%) rename Tamzen7x13b.png => png/Tamzen7x13b.png (100%) rename Tamzen7x13r.png => png/Tamzen7x13r.png (100%) rename Tamzen7x14b.png => png/Tamzen7x14b.png (100%) rename Tamzen7x14r.png => png/Tamzen7x14r.png (100%) rename Tamzen8x15b.png => png/Tamzen8x15b.png (100%) rename Tamzen8x15r.png => png/Tamzen8x15r.png (100%) rename Tamzen8x16b.png => png/Tamzen8x16b.png (100%) rename Tamzen8x16r.png => png/Tamzen8x16r.png (100%) rename TamzenForPowerline10x20b.png => png/TamzenForPowerline10x20b.png (100%) rename TamzenForPowerline10x20r.png => png/TamzenForPowerline10x20r.png (100%) rename TamzenForPowerline5x9b.png => png/TamzenForPowerline5x9b.png (100%) rename TamzenForPowerline5x9r.png => png/TamzenForPowerline5x9r.png (100%) rename TamzenForPowerline6x12b.png => png/TamzenForPowerline6x12b.png (100%) rename TamzenForPowerline6x12r.png => png/TamzenForPowerline6x12r.png (100%) rename TamzenForPowerline7x13b.png => png/TamzenForPowerline7x13b.png (100%) rename TamzenForPowerline7x13r.png => png/TamzenForPowerline7x13r.png (100%) rename TamzenForPowerline7x14b.png => png/TamzenForPowerline7x14b.png (100%) rename TamzenForPowerline7x14r.png => png/TamzenForPowerline7x14r.png (100%) rename TamzenForPowerline8x15b.png => png/TamzenForPowerline8x15b.png (100%) rename TamzenForPowerline8x15r.png => png/TamzenForPowerline8x15r.png (100%) rename TamzenForPowerline8x16b.png => png/TamzenForPowerline8x16b.png (100%) rename TamzenForPowerline8x16r.png => png/TamzenForPowerline8x16r.png (100%) diff --git a/README.md b/README.md index 7f07191..4a71ebc 100644 --- a/README.md +++ b/README.md @@ -17,60 +17,60 @@ Screenshots ----------- ### Tamzen-9 -![Tamzen5x9r.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen5x9r.png) -![Tamzen5x9b.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen5x9b.png) +![Tamzen5x9r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen5x9r.png) +![Tamzen5x9b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen5x9b.png) ### Tamzen-12 -![Tamzen6x12r.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen6x12r.png) -![Tamzen6x12b.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen6x12b.png) +![Tamzen6x12r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen6x12r.png) +![Tamzen6x12b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen6x12b.png) ### Tamzen-13 -![Tamzen7x13r.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen7x13r.png) -![Tamzen7x13b.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen7x13b.png) +![Tamzen7x13r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen7x13r.png) +![Tamzen7x13b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen7x13b.png) ### Tamzen-14 -![Tamzen7x14r.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen7x14r.png) -![Tamzen7x14b.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen7x14b.png) +![Tamzen7x14r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen7x14r.png) +![Tamzen7x14b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen7x14b.png) ### Tamzen-15 -![Tamzen8x15r.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen8x15r.png) -![Tamzen8x15b.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen8x15b.png) +![Tamzen8x15r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen8x15r.png) +![Tamzen8x15b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen8x15b.png) ### Tamzen-16 -![Tamzen8x16r.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen8x16r.png) -![Tamzen8x16b.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen8x16b.png) +![Tamzen8x16r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen8x16r.png) +![Tamzen8x16b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen8x16b.png) ### Tamzen-20 -![Tamzen10x20r.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen10x20r.png) -![Tamzen10x20b.bdf](https://github.com/sunaku/tamzen-font/raw/master/Tamzen10x20b.png) +![Tamzen10x20r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen10x20r.png) +![Tamzen10x20b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/Tamzen10x20b.png) ### TamzenForPowerline-9 -![TamzenForPowerline5x9r.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline5x9r.png) -![TamzenForPowerline5x9b.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline5x9b.png) +![TamzenForPowerline5x9r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline5x9r.png) +![TamzenForPowerline5x9b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline5x9b.png) ### TamzenForPowerline-12 -![TamzenForPowerline6x12r.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline6x12r.png) -![TamzenForPowerline6x12b.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline6x12b.png) +![TamzenForPowerline6x12r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline6x12r.png) +![TamzenForPowerline6x12b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline6x12b.png) ### TamzenForPowerline-13 -![TamzenForPowerline7x13r.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline7x13r.png) -![TamzenForPowerline7x13b.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline7x13b.png) +![TamzenForPowerline7x13r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline7x13r.png) +![TamzenForPowerline7x13b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline7x13b.png) ### TamzenForPowerline-14 -![TamzenForPowerline7x14r.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline7x14r.png) -![TamzenForPowerline7x14b.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline7x14b.png) +![TamzenForPowerline7x14r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline7x14r.png) +![TamzenForPowerline7x14b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline7x14b.png) ### TamzenForPowerline-15 -![TamzenForPowerline8x15r.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline8x15r.png) -![TamzenForPowerline8x15b.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline8x15b.png) +![TamzenForPowerline8x15r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline8x15r.png) +![TamzenForPowerline8x15b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline8x15b.png) ### TamzenForPowerline-16 -![TamzenForPowerline8x16r.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline8x16r.png) -![TamzenForPowerline8x16b.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline8x16b.png) +![TamzenForPowerline8x16r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline8x16r.png) +![TamzenForPowerline8x16b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline8x16b.png) ### TamzenForPowerline-20 -![TamzenForPowerline10x20r.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline10x20r.png) -![TamzenForPowerline10x20b.bdf](https://github.com/sunaku/tamzen-font/raw/master/TamzenForPowerline10x20b.png) +![TamzenForPowerline10x20r.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline10x20r.png) +![TamzenForPowerline10x20b.bdf](https://github.com/sunaku/tamzen-font/raw/master/png/TamzenForPowerline10x20b.png) Installation ------------ @@ -89,14 +89,15 @@ NOTE: For non-Linux platforms, try using the font files in these subfolders: NOTE: [Arch Linux](https://www.archlinux.org) users may also install this font through [this AUR package](https://aur.archlinux.org/packages.php?ID=57298). -Copy the `Tamzen*.bdf` files into your `~/.fonts` directory and run: +[Download] this Git repository to `~/.fonts/tamzen-font` and then run: - mkfontdir ~/.fonts - xset +fp ~/.fonts + xset +fp ~/.fonts/tamzen-font/bdf xset fp rehash Now you should be able to access the "Tamzen" font family in xfontsel. +[Download]: https://github.com/sunaku/tamzen-font/archive/master.zip + ### XTerm integration The following Xresources let you dynamically switch between the various Tamzen diff --git a/Rakefile b/Rakefile index 19233e6..26559da 100644 --- a/Rakefile +++ b/Rakefile @@ -7,12 +7,13 @@ task 'default' => ['.screenshots', '.fontforge'] # index #----------------------------------------------------------------------------- -file 'fonts.dir' => ['.tamzen', '.powerline'] do - sh 'mkfontdir' - sh 'xset', '+fp', Dir.pwd +directory 'bdf' +file 'bdf/fonts.dir' => ['bdf', '.tamzen', '.powerline'] do + sh 'mkfontdir', 'bdf' + sh 'xset', '+fp', File.expand_path('bdf') sh 'xset', 'fp', 'rehash' end -CLOBBER.include 'fonts.dir' +CLOBBER.include 'bdf' #----------------------------------------------------------------------------- # fonts @@ -98,7 +99,7 @@ TAMZEN_BACKPORT_SPECS = { } desc 'Build Tamzen fonts.' -file '.tamzen' => __FILE__ do +file '.tamzen' => ['bdf', __FILE__] do require 'git' git = Git.open('.') @@ -139,17 +140,18 @@ file '.tamzen' => __FILE__ do # save backported font under a different name rename = ['Tamsyn', 'Tamzen'] - File.write target_file.sub(*rename), target_font.to_s.gsub(*rename) + dst = File.join('bdf', target_file.sub(*rename)) + File.write dst, target_font.to_s.gsub(*rename) end touch '.tamzen' end -CLOBBER.include '.tamzen', '*.bdf' +CLOBBER.include '.tamzen' desc 'Build Tamzen fonts for Powerline.' file '.powerline' => ['.tamzen', 'bitmap-font-patcher'] do rename = [/Tamzen/, '\&ForPowerline'] - FileList['*.bdf'].exclude('*ForPowerline*').each do |src| + FileList['bdf/*.bdf'].exclude('bdf/*ForPowerline*').each do |src| dst = src.sub(*rename) IO.popen('python bitmap-font-patcher/fontpatcher.py', 'w+') do |patcher| patcher.write File.read(src).gsub(*rename).gsub('ISO8859', 'ISO10646') @@ -181,7 +183,7 @@ FONTFORGE_FORMATS = [ end FONTFORGE_COMMANDS = ['Open($1)'] + FONTFORGE_FORMATS.map do |format| - "Generate(#{(format + '/').inspect} + $1:r + #{('.' + format).inspect})" + "Generate(#{(format + '/').inspect} + $1:t:r + #{('.' + format).inspect})" end desc 'Build Tamzen fonts for other platforms.' @@ -189,7 +191,7 @@ file '.fontforge' => ['.tamzen', '.powerline'] + FONTFORGE_FORMATS do Tempfile.open(['fontforge', '.pe']) do |script| script.puts FONTFORGE_COMMANDS script.close - FileList['*.bdf'].each do |src| + FileList['bdf/*.bdf'].each do |src| sh 'fontforge', '-script', script.path, src end end @@ -201,18 +203,24 @@ CLOBBER.include '.fontforge', *FONTFORGE_FORMATS # screenshots #----------------------------------------------------------------------------- +directory 'png' desc 'Build font preview screenshots.' -file '.screenshots' => 'fonts.dir' do - FileList['*.bdf'].ext('png').each do |png| - Rake::Task[png].invoke +file '.screenshots' => ['bdf/fonts.dir'] do + FileList['bdf/*.bdf'].each do |bdf| + Rake::Task[bdf.sub('bdf', 'png').ext('png')].invoke end touch '.screenshots' end -CLEAN.include '.screenshots', '*.png' +CLEAN.include '.screenshots', 'png' + +rule %r{^png/.+\.png$} => [->(png){ png.sub('png', 'bdf').ext('bdf') }, 'png', + 'bdf/fonts.dir'] do |t| + + src = File.basename(t.source) + dst = t.name -rule '.png' => ['.bdf', 'fonts.dir'] do |t| # translate the BDF font filename into its full X11 font name - @bdf_to_x11 ||= Hash[File.readlines('fonts.dir').map(&:split)] + @bdf_to_x11 ||= Hash[File.readlines('bdf/fonts.dir').map(&:split)] # assemble sample text for rendering lines = [ @@ -226,7 +234,7 @@ rule '.png' => ['.bdf', 'fonts.dir'] do |t| "Illegal1i = oO0 \uE0A0 \uE0A1 \uE0A2 \uE0B0 \uE0B1 \uE0B2 \uE0B3" ] width = lines.first.length - lines.unshift t.source.center(width) + lines.unshift src.center(width) # store sample text in a file because it's the easiest way to render sample_text_file = Tempfile.open('screenshot') @@ -237,12 +245,12 @@ rule '.png' => ['.bdf', 'fonts.dir'] do |t| sh 'xterm', '-fg', 'black', '-bg', 'white', - '-T', t.source, - '-font', @bdf_to_x11[t.source], + '-T', src, + '-font', @bdf_to_x11[src], '-geometry', "#{lines.first.length}x#{lines.length}", '-e', [ 'tput civis', # hide the cursor "cat #{sample_text_file.path.inspect}", # show sample text - "import -window $WINDOWID #{t.name.inspect}", # take a screenshot + "import -window $WINDOWID #{dst.inspect}", # take a screenshot ].join(' && ') end diff --git a/Tamzen10x20b.bdf b/bdf/Tamzen10x20b.bdf similarity index 100% rename from Tamzen10x20b.bdf rename to bdf/Tamzen10x20b.bdf diff --git a/Tamzen10x20r.bdf b/bdf/Tamzen10x20r.bdf similarity index 100% rename from Tamzen10x20r.bdf rename to bdf/Tamzen10x20r.bdf diff --git a/Tamzen5x9b.bdf b/bdf/Tamzen5x9b.bdf similarity index 100% rename from Tamzen5x9b.bdf rename to bdf/Tamzen5x9b.bdf diff --git a/Tamzen5x9r.bdf b/bdf/Tamzen5x9r.bdf similarity index 100% rename from Tamzen5x9r.bdf rename to bdf/Tamzen5x9r.bdf diff --git a/Tamzen6x12b.bdf b/bdf/Tamzen6x12b.bdf similarity index 100% rename from Tamzen6x12b.bdf rename to bdf/Tamzen6x12b.bdf diff --git a/Tamzen6x12r.bdf b/bdf/Tamzen6x12r.bdf similarity index 100% rename from Tamzen6x12r.bdf rename to bdf/Tamzen6x12r.bdf diff --git a/Tamzen7x13b.bdf b/bdf/Tamzen7x13b.bdf similarity index 100% rename from Tamzen7x13b.bdf rename to bdf/Tamzen7x13b.bdf diff --git a/Tamzen7x13r.bdf b/bdf/Tamzen7x13r.bdf similarity index 100% rename from Tamzen7x13r.bdf rename to bdf/Tamzen7x13r.bdf diff --git a/Tamzen7x14b.bdf b/bdf/Tamzen7x14b.bdf similarity index 100% rename from Tamzen7x14b.bdf rename to bdf/Tamzen7x14b.bdf diff --git a/Tamzen7x14r.bdf b/bdf/Tamzen7x14r.bdf similarity index 100% rename from Tamzen7x14r.bdf rename to bdf/Tamzen7x14r.bdf diff --git a/Tamzen8x15b.bdf b/bdf/Tamzen8x15b.bdf similarity index 100% rename from Tamzen8x15b.bdf rename to bdf/Tamzen8x15b.bdf diff --git a/Tamzen8x15r.bdf b/bdf/Tamzen8x15r.bdf similarity index 100% rename from Tamzen8x15r.bdf rename to bdf/Tamzen8x15r.bdf diff --git a/Tamzen8x16b.bdf b/bdf/Tamzen8x16b.bdf similarity index 100% rename from Tamzen8x16b.bdf rename to bdf/Tamzen8x16b.bdf diff --git a/Tamzen8x16r.bdf b/bdf/Tamzen8x16r.bdf similarity index 100% rename from Tamzen8x16r.bdf rename to bdf/Tamzen8x16r.bdf diff --git a/TamzenForPowerline10x20b.bdf b/bdf/TamzenForPowerline10x20b.bdf similarity index 100% rename from TamzenForPowerline10x20b.bdf rename to bdf/TamzenForPowerline10x20b.bdf diff --git a/TamzenForPowerline10x20r.bdf b/bdf/TamzenForPowerline10x20r.bdf similarity index 100% rename from TamzenForPowerline10x20r.bdf rename to bdf/TamzenForPowerline10x20r.bdf diff --git a/TamzenForPowerline5x9b.bdf b/bdf/TamzenForPowerline5x9b.bdf similarity index 100% rename from TamzenForPowerline5x9b.bdf rename to bdf/TamzenForPowerline5x9b.bdf diff --git a/TamzenForPowerline5x9r.bdf b/bdf/TamzenForPowerline5x9r.bdf similarity index 100% rename from TamzenForPowerline5x9r.bdf rename to bdf/TamzenForPowerline5x9r.bdf diff --git a/TamzenForPowerline6x12b.bdf b/bdf/TamzenForPowerline6x12b.bdf similarity index 100% rename from TamzenForPowerline6x12b.bdf rename to bdf/TamzenForPowerline6x12b.bdf diff --git a/TamzenForPowerline6x12r.bdf b/bdf/TamzenForPowerline6x12r.bdf similarity index 100% rename from TamzenForPowerline6x12r.bdf rename to bdf/TamzenForPowerline6x12r.bdf diff --git a/TamzenForPowerline7x13b.bdf b/bdf/TamzenForPowerline7x13b.bdf similarity index 100% rename from TamzenForPowerline7x13b.bdf rename to bdf/TamzenForPowerline7x13b.bdf diff --git a/TamzenForPowerline7x13r.bdf b/bdf/TamzenForPowerline7x13r.bdf similarity index 100% rename from TamzenForPowerline7x13r.bdf rename to bdf/TamzenForPowerline7x13r.bdf diff --git a/TamzenForPowerline7x14b.bdf b/bdf/TamzenForPowerline7x14b.bdf similarity index 100% rename from TamzenForPowerline7x14b.bdf rename to bdf/TamzenForPowerline7x14b.bdf diff --git a/TamzenForPowerline7x14r.bdf b/bdf/TamzenForPowerline7x14r.bdf similarity index 100% rename from TamzenForPowerline7x14r.bdf rename to bdf/TamzenForPowerline7x14r.bdf diff --git a/TamzenForPowerline8x15b.bdf b/bdf/TamzenForPowerline8x15b.bdf similarity index 100% rename from TamzenForPowerline8x15b.bdf rename to bdf/TamzenForPowerline8x15b.bdf diff --git a/TamzenForPowerline8x15r.bdf b/bdf/TamzenForPowerline8x15r.bdf similarity index 100% rename from TamzenForPowerline8x15r.bdf rename to bdf/TamzenForPowerline8x15r.bdf diff --git a/TamzenForPowerline8x16b.bdf b/bdf/TamzenForPowerline8x16b.bdf similarity index 100% rename from TamzenForPowerline8x16b.bdf rename to bdf/TamzenForPowerline8x16b.bdf diff --git a/TamzenForPowerline8x16r.bdf b/bdf/TamzenForPowerline8x16r.bdf similarity index 100% rename from TamzenForPowerline8x16r.bdf rename to bdf/TamzenForPowerline8x16r.bdf diff --git a/fonts.dir b/bdf/fonts.dir similarity index 100% rename from fonts.dir rename to bdf/fonts.dir diff --git a/Tamzen10x20b.png b/png/Tamzen10x20b.png similarity index 100% rename from Tamzen10x20b.png rename to png/Tamzen10x20b.png diff --git a/Tamzen10x20r.png b/png/Tamzen10x20r.png similarity index 100% rename from Tamzen10x20r.png rename to png/Tamzen10x20r.png diff --git a/Tamzen5x9b.png b/png/Tamzen5x9b.png similarity index 100% rename from Tamzen5x9b.png rename to png/Tamzen5x9b.png diff --git a/Tamzen5x9r.png b/png/Tamzen5x9r.png similarity index 100% rename from Tamzen5x9r.png rename to png/Tamzen5x9r.png diff --git a/Tamzen6x12b.png b/png/Tamzen6x12b.png similarity index 100% rename from Tamzen6x12b.png rename to png/Tamzen6x12b.png diff --git a/Tamzen6x12r.png b/png/Tamzen6x12r.png similarity index 100% rename from Tamzen6x12r.png rename to png/Tamzen6x12r.png diff --git a/Tamzen7x13b.png b/png/Tamzen7x13b.png similarity index 100% rename from Tamzen7x13b.png rename to png/Tamzen7x13b.png diff --git a/Tamzen7x13r.png b/png/Tamzen7x13r.png similarity index 100% rename from Tamzen7x13r.png rename to png/Tamzen7x13r.png diff --git a/Tamzen7x14b.png b/png/Tamzen7x14b.png similarity index 100% rename from Tamzen7x14b.png rename to png/Tamzen7x14b.png diff --git a/Tamzen7x14r.png b/png/Tamzen7x14r.png similarity index 100% rename from Tamzen7x14r.png rename to png/Tamzen7x14r.png diff --git a/Tamzen8x15b.png b/png/Tamzen8x15b.png similarity index 100% rename from Tamzen8x15b.png rename to png/Tamzen8x15b.png diff --git a/Tamzen8x15r.png b/png/Tamzen8x15r.png similarity index 100% rename from Tamzen8x15r.png rename to png/Tamzen8x15r.png diff --git a/Tamzen8x16b.png b/png/Tamzen8x16b.png similarity index 100% rename from Tamzen8x16b.png rename to png/Tamzen8x16b.png diff --git a/Tamzen8x16r.png b/png/Tamzen8x16r.png similarity index 100% rename from Tamzen8x16r.png rename to png/Tamzen8x16r.png diff --git a/TamzenForPowerline10x20b.png b/png/TamzenForPowerline10x20b.png similarity index 100% rename from TamzenForPowerline10x20b.png rename to png/TamzenForPowerline10x20b.png diff --git a/TamzenForPowerline10x20r.png b/png/TamzenForPowerline10x20r.png similarity index 100% rename from TamzenForPowerline10x20r.png rename to png/TamzenForPowerline10x20r.png diff --git a/TamzenForPowerline5x9b.png b/png/TamzenForPowerline5x9b.png similarity index 100% rename from TamzenForPowerline5x9b.png rename to png/TamzenForPowerline5x9b.png diff --git a/TamzenForPowerline5x9r.png b/png/TamzenForPowerline5x9r.png similarity index 100% rename from TamzenForPowerline5x9r.png rename to png/TamzenForPowerline5x9r.png diff --git a/TamzenForPowerline6x12b.png b/png/TamzenForPowerline6x12b.png similarity index 100% rename from TamzenForPowerline6x12b.png rename to png/TamzenForPowerline6x12b.png diff --git a/TamzenForPowerline6x12r.png b/png/TamzenForPowerline6x12r.png similarity index 100% rename from TamzenForPowerline6x12r.png rename to png/TamzenForPowerline6x12r.png diff --git a/TamzenForPowerline7x13b.png b/png/TamzenForPowerline7x13b.png similarity index 100% rename from TamzenForPowerline7x13b.png rename to png/TamzenForPowerline7x13b.png diff --git a/TamzenForPowerline7x13r.png b/png/TamzenForPowerline7x13r.png similarity index 100% rename from TamzenForPowerline7x13r.png rename to png/TamzenForPowerline7x13r.png diff --git a/TamzenForPowerline7x14b.png b/png/TamzenForPowerline7x14b.png similarity index 100% rename from TamzenForPowerline7x14b.png rename to png/TamzenForPowerline7x14b.png diff --git a/TamzenForPowerline7x14r.png b/png/TamzenForPowerline7x14r.png similarity index 100% rename from TamzenForPowerline7x14r.png rename to png/TamzenForPowerline7x14r.png diff --git a/TamzenForPowerline8x15b.png b/png/TamzenForPowerline8x15b.png similarity index 100% rename from TamzenForPowerline8x15b.png rename to png/TamzenForPowerline8x15b.png diff --git a/TamzenForPowerline8x15r.png b/png/TamzenForPowerline8x15r.png similarity index 100% rename from TamzenForPowerline8x15r.png rename to png/TamzenForPowerline8x15r.png diff --git a/TamzenForPowerline8x16b.png b/png/TamzenForPowerline8x16b.png similarity index 100% rename from TamzenForPowerline8x16b.png rename to png/TamzenForPowerline8x16b.png diff --git a/TamzenForPowerline8x16r.png b/png/TamzenForPowerline8x16r.png similarity index 100% rename from TamzenForPowerline8x16r.png rename to png/TamzenForPowerline8x16r.png