From 2f68d82238ff869b76b554fd8de61e3b6d06e8f9 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 26 Feb 2023 13:42:05 -0800 Subject: [PATCH] altos/draw: Move font files to subdirectory It looks like we might end up with a lot of these Signed-off-by: Keith Packard --- src/draw/Makefile | 40 ++++++++- src/draw/font-convert | 90 ++++++++++++------- src/draw/{ => fonts}/5x7.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-10.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-12.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-14.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-16.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-18.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-24.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-26.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-28.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-32.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-36.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-48.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-64.bdf | 0 .../{ => fonts}/BenguiatGothicStd-Bold-72.bdf | 0 .../BenguiatGothicStd-Medium-10.bdf | 0 .../BenguiatGothicStd-Medium-12.bdf | 0 .../BenguiatGothicStd-Medium-14.bdf | 0 .../BenguiatGothicStd-Medium-16.bdf | 0 .../BenguiatGothicStd-Medium-18.bdf | 0 .../BenguiatGothicStd-Medium-24.bdf | 0 .../BenguiatGothicStd-Medium-26.bdf | 0 .../BenguiatGothicStd-Medium-28.bdf | 0 .../BenguiatGothicStd-Medium-32.bdf | 0 .../BenguiatGothicStd-Medium-36.bdf | 0 .../BenguiatGothicStd-Medium-48.bdf | 0 .../BenguiatGothicStd-Medium-64.bdf | 0 .../BenguiatGothicStd-Medium-72.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-10.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-12.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-14.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-16.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-18.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-24.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-26.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-28.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-32.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-36.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-48.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-64.bdf | 0 src/draw/{ => fonts}/FrutigerLT-Roman-72.bdf | 0 42 files changed, 98 insertions(+), 32 deletions(-) rename src/draw/{ => fonts}/5x7.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-10.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-12.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-14.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-16.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-18.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-24.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-26.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-28.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-32.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-36.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-48.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-64.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Bold-72.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-10.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-12.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-14.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-16.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-18.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-24.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-26.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-28.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-32.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-36.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-48.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-64.bdf (100%) rename src/draw/{ => fonts}/BenguiatGothicStd-Medium-72.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-10.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-12.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-14.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-16.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-18.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-24.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-26.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-28.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-32.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-36.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-48.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-64.bdf (100%) rename src/draw/{ => fonts}/FrutigerLT-Roman-72.bdf (100%) diff --git a/src/draw/Makefile b/src/draw/Makefile index 46771f1f..c2e72bcd 100644 --- a/src/draw/Makefile +++ b/src/draw/Makefile @@ -1,19 +1,57 @@ +TOPDIR=.. +include $(TOPDIR)/Makefile.defs + +vpath %.bdf fonts + +BITMAP_SIZES = 10, 12, 14, 16, 18, 24, 26, 28, 32, 36, 48, 64, 72 + BDFS=\ + BenguiatGothicStd-Bold-10.bdf \ + BenguiatGothicStd-Bold-12.bdf \ + BenguiatGothicStd-Bold-14.bdf \ + BenguiatGothicStd-Bold-16.bdf \ + BenguiatGothicStd-Bold-18.bdf \ + BenguiatGothicStd-Bold-24.bdf \ + BenguiatGothicStd-Bold-26.bdf \ + BenguiatGothicStd-Bold-28.bdf \ + BenguiatGothicStd-Bold-32.bdf \ + BenguiatGothicStd-Bold-36.bdf \ + BenguiatGothicStd-Bold-48.bdf \ + BenguiatGothicStd-Bold-64.bdf \ + BenguiatGothicStd-Bold-72.bdf \ + BenguiatGothicStd-Medium-10.bdf \ + BenguiatGothicStd-Medium-12.bdf \ + BenguiatGothicStd-Medium-14.bdf \ + BenguiatGothicStd-Medium-16.bdf \ + BenguiatGothicStd-Medium-18.bdf \ + BenguiatGothicStd-Medium-24.bdf \ + BenguiatGothicStd-Medium-26.bdf \ + BenguiatGothicStd-Medium-28.bdf \ + BenguiatGothicStd-Medium-32.bdf \ + BenguiatGothicStd-Medium-36.bdf \ + BenguiatGothicStd-Medium-48.bdf \ + BenguiatGothicStd-Medium-64.bdf \ + BenguiatGothicStd-Medium-72.bdf \ FrutigerLT-Roman-10.bdf \ FrutigerLT-Roman-12.bdf \ FrutigerLT-Roman-14.bdf \ + FrutigerLT-Roman-16.bdf \ FrutigerLT-Roman-18.bdf \ FrutigerLT-Roman-24.bdf \ + FrutigerLT-Roman-26.bdf \ + FrutigerLT-Roman-28.bdf \ + FrutigerLT-Roman-32.bdf \ FrutigerLT-Roman-36.bdf \ FrutigerLT-Roman-48.bdf \ FrutigerLT-Roman-64.bdf \ + FrutigerLT-Roman-72.bdf FONT_SRCS=$(BDFS:.bdf=.c) .SUFFIXES: .bdf .c .bdf.c: - nickle font-convert $*.bdf > $@ + nickle font-convert -o $@ $< all: ao_font.h ao_logo.h draw-test diff --git a/src/draw/font-convert b/src/draw/font-convert index f47ccc9c..d295c181 100755 --- a/src/draw/font-convert +++ b/src/draw/font-convert @@ -1,5 +1,8 @@ #!/usr/bin/nickle +autoimport ParseArgs +import File; + typedef struct { int[] bytes; int width; @@ -98,7 +101,7 @@ flip_byte(int x) return dest; } -void print_font(font_t font, string font_name) { +void print_font(file out, font_t font, string font_name) { int width = font.glyphs[0].width; int height = font.glyphs[0].height; int max_width = width; @@ -135,35 +138,35 @@ void print_font(font_t font, string font_name) { if (pos[i] == -1) pos[i] = pos[font.default_char]; - printf("#include \"ao_draw.h\"\n"); - printf("static const uint8_t %s_bytes[%d] = {", font_name, dim(bytes)); + fprintf(out, "#include \"ao_draw.h\"\n"); + fprintf(out, "static const uint8_t %s_bytes[%d] = {", font_name, dim(bytes)); for (int b = 0; b < dim(bytes); b++) { if ((b & 15) == 0) - printf("\n\t"); + fprintf(out, "\n\t"); else - printf(" "); - printf("0x%02x,", flip_byte(bytes[b])); + fprintf(out, " "); + fprintf(out, "0x%02x,", flip_byte(bytes[b])); } - printf("\n};\n\n"); + fprintf(out, "\n};\n\n"); - printf("static const uint16_t %s_pos[%d] = {", font_name, dim(pos)); + fprintf(out, "static const uint16_t %s_pos[%d] = {", font_name, dim(pos)); for (int i = 0; i < dim(pos); i++) { if ((i & 7) == 0) - printf("\n\t"); + fprintf(out, "\n\t"); else - printf(" "); - printf("%6d,", pos[i]); + fprintf(out, " "); + fprintf(out, "%6d,", pos[i]); } - printf("\n};\n\n"); + fprintf(out, "\n};\n\n"); - printf("#define GLYPH_WIDTH_MAX %d\n", max_width); - printf("#define GLYPH_HEIGHT_MAX %d\n", max_height); + fprintf(out, "#define GLYPH_WIDTH_MAX %d\n", max_width); + fprintf(out, "#define GLYPH_HEIGHT_MAX %d\n", max_height); if (fixed_size) { - printf("#define GLYPH_WIDTH %d\n", width); - printf("#define GLYPH_HEIGHT %d\n", height); - printf("#define GLYPH_ASCENT %d\n", font.ascent); + fprintf(out, "#define GLYPH_WIDTH %d\n", width); + fprintf(out, "#define GLYPH_HEIGHT %d\n", height); + fprintf(out, "#define GLYPH_ASCENT %d\n", font.ascent); } else { - printf("static const struct ao_glyph_metrics %s_metrics[%d] = {\n", font_name, dim(pos)); + fprintf(out, "static const struct ao_glyph_metrics %s_metrics[%d] = {\n", font_name, dim(pos)); for (int i = 0; i < dim(pos); i++) { int g = 0; for (int j = 0; j < dim(font.glyphs); j++) { @@ -177,21 +180,21 @@ void print_font(font_t font, string font_name) { c = sprintf("%c", i); else c = sprintf("%02x", i); - printf(" { .width = %d, .height = %d, .x_off = %d, .y_off = %d, .advance = %d }, /* %s */\n", + fprintf(out, " { .width = %d, .height = %d, .x_off = %d, .y_off = %d, .advance = %d }, /* %s */\n", font.glyphs[g].width, font.glyphs[g].height, font.glyphs[g].x_off, font.glyphs[g].y_off, font.glyphs[g].advance, c); } - printf("};\n"); + fprintf(out, "};\n"); } - printf("const struct ao_font %s_font = {\n", font_name); - printf("\t.bytes = %s_bytes,\n", font_name); - printf("\t.pos = %s_pos,\n", font_name); + fprintf(out, "const struct ao_font %s_font = {\n", font_name); + fprintf(out, "\t.bytes = %s_bytes,\n", font_name); + fprintf(out, "\t.pos = %s_pos,\n", font_name); if (!fixed_size) - printf("\t.metrics = %s_metrics,\n", font_name); - printf("\t.max_width = %d,\n", max_width); - printf("\t.max_height = %d,\n", max_height); - printf("\t.ascent = %d,\n", font.ascent); - printf("};\n"); + fprintf(out, "\t.metrics = %s_metrics,\n", font_name); + fprintf(out, "\t.max_width = %d,\n", max_width); + fprintf(out, "\t.max_height = %d,\n", max_height); + fprintf(out, "\t.ascent = %d,\n", font.ascent); + fprintf(out, "};\n"); } string @@ -212,12 +215,37 @@ to_c(string a) } void -do_font(string name) +do_font(string name, file out) { twixt (file f = File::open(name, "r"); File::close(f)) { font_t font = read_font(f); - print_font(font, to_c(name)); + print_font(out, font, to_c(name)); } } -do_font(argv[1]); +argdesc argd = { + args = { + { + .var = (arg_var.arg_string) &(string output), + .name = "output", + .abbr = 'o', + .expr_name = "file", + .desc = "Output file name" + }, + }, + posn_args = { + { + var = (arg_var.arg_string) &(string input), + name = "input", + } + } +}; + +parseargs(&argd, &argv) + +if (is_uninit(&output)) + do_font(input, stdout); +else { + twixt(file f = File::open(output, "w"); File::close(f)) + do_font(input, f); +} diff --git a/src/draw/5x7.bdf b/src/draw/fonts/5x7.bdf similarity index 100% rename from src/draw/5x7.bdf rename to src/draw/fonts/5x7.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-10.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-10.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-10.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-10.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-12.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-12.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-12.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-12.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-14.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-14.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-14.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-14.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-16.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-16.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-16.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-16.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-18.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-18.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-18.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-18.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-24.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-24.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-24.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-24.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-26.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-26.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-26.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-26.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-28.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-28.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-28.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-28.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-32.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-32.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-32.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-32.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-36.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-36.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-36.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-36.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-48.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-48.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-48.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-48.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-64.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-64.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-64.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-64.bdf diff --git a/src/draw/BenguiatGothicStd-Bold-72.bdf b/src/draw/fonts/BenguiatGothicStd-Bold-72.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Bold-72.bdf rename to src/draw/fonts/BenguiatGothicStd-Bold-72.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-10.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-10.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-10.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-10.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-12.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-12.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-12.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-12.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-14.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-14.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-14.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-14.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-16.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-16.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-16.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-16.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-18.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-18.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-18.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-18.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-24.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-24.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-24.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-24.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-26.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-26.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-26.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-26.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-28.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-28.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-28.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-28.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-32.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-32.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-32.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-32.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-36.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-36.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-36.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-36.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-48.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-48.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-48.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-48.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-64.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-64.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-64.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-64.bdf diff --git a/src/draw/BenguiatGothicStd-Medium-72.bdf b/src/draw/fonts/BenguiatGothicStd-Medium-72.bdf similarity index 100% rename from src/draw/BenguiatGothicStd-Medium-72.bdf rename to src/draw/fonts/BenguiatGothicStd-Medium-72.bdf diff --git a/src/draw/FrutigerLT-Roman-10.bdf b/src/draw/fonts/FrutigerLT-Roman-10.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-10.bdf rename to src/draw/fonts/FrutigerLT-Roman-10.bdf diff --git a/src/draw/FrutigerLT-Roman-12.bdf b/src/draw/fonts/FrutigerLT-Roman-12.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-12.bdf rename to src/draw/fonts/FrutigerLT-Roman-12.bdf diff --git a/src/draw/FrutigerLT-Roman-14.bdf b/src/draw/fonts/FrutigerLT-Roman-14.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-14.bdf rename to src/draw/fonts/FrutigerLT-Roman-14.bdf diff --git a/src/draw/FrutigerLT-Roman-16.bdf b/src/draw/fonts/FrutigerLT-Roman-16.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-16.bdf rename to src/draw/fonts/FrutigerLT-Roman-16.bdf diff --git a/src/draw/FrutigerLT-Roman-18.bdf b/src/draw/fonts/FrutigerLT-Roman-18.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-18.bdf rename to src/draw/fonts/FrutigerLT-Roman-18.bdf diff --git a/src/draw/FrutigerLT-Roman-24.bdf b/src/draw/fonts/FrutigerLT-Roman-24.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-24.bdf rename to src/draw/fonts/FrutigerLT-Roman-24.bdf diff --git a/src/draw/FrutigerLT-Roman-26.bdf b/src/draw/fonts/FrutigerLT-Roman-26.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-26.bdf rename to src/draw/fonts/FrutigerLT-Roman-26.bdf diff --git a/src/draw/FrutigerLT-Roman-28.bdf b/src/draw/fonts/FrutigerLT-Roman-28.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-28.bdf rename to src/draw/fonts/FrutigerLT-Roman-28.bdf diff --git a/src/draw/FrutigerLT-Roman-32.bdf b/src/draw/fonts/FrutigerLT-Roman-32.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-32.bdf rename to src/draw/fonts/FrutigerLT-Roman-32.bdf diff --git a/src/draw/FrutigerLT-Roman-36.bdf b/src/draw/fonts/FrutigerLT-Roman-36.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-36.bdf rename to src/draw/fonts/FrutigerLT-Roman-36.bdf diff --git a/src/draw/FrutigerLT-Roman-48.bdf b/src/draw/fonts/FrutigerLT-Roman-48.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-48.bdf rename to src/draw/fonts/FrutigerLT-Roman-48.bdf diff --git a/src/draw/FrutigerLT-Roman-64.bdf b/src/draw/fonts/FrutigerLT-Roman-64.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-64.bdf rename to src/draw/fonts/FrutigerLT-Roman-64.bdf diff --git a/src/draw/FrutigerLT-Roman-72.bdf b/src/draw/fonts/FrutigerLT-Roman-72.bdf similarity index 100% rename from src/draw/FrutigerLT-Roman-72.bdf rename to src/draw/fonts/FrutigerLT-Roman-72.bdf -- 2.30.2