From 7e69f72db661ec4a50ed911e3a8b0ae3feb00bcf Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 16 Mar 2015 17:27:27 +0100 Subject: [PATCH] Moved font directory. Updated README.fonts --- Marlin/{scripts/Fonts => fonts}/HD44780_C.fon | Bin Marlin/{scripts/Fonts => fonts}/HD44780_J.fon | Bin Marlin/{scripts/Fonts => fonts}/HD44780_W.fon | Bin .../Fonts => fonts}/ISO10646-5_Cyrillic.fon | Bin Marlin/{scripts/Fonts => fonts}/ISO10646_Kana.fon | Bin Marlin/{scripts/Fonts => fonts}/Marlin_symbols.fon | Bin Marlin/{scripts/Fonts => fonts}/README.fonts | 2 +- Marlin/{scripts/Fonts => fonts}/bdf2u8g.exe | Bin Marlin/{scripts/Fonts => fonts}/make_fonts.bat | 0 9 files changed, 1 insertion(+), 1 deletion(-) rename Marlin/{scripts/Fonts => fonts}/HD44780_C.fon (100%) rename Marlin/{scripts/Fonts => fonts}/HD44780_J.fon (100%) rename Marlin/{scripts/Fonts => fonts}/HD44780_W.fon (100%) rename Marlin/{scripts/Fonts => fonts}/ISO10646-5_Cyrillic.fon (100%) rename Marlin/{scripts/Fonts => fonts}/ISO10646_Kana.fon (100%) rename Marlin/{scripts/Fonts => fonts}/Marlin_symbols.fon (100%) rename Marlin/{scripts/Fonts => fonts}/README.fonts (78%) rename Marlin/{scripts/Fonts => fonts}/bdf2u8g.exe (100%) rename Marlin/{scripts/Fonts => fonts}/make_fonts.bat (100%) diff --git a/Marlin/scripts/Fonts/HD44780_C.fon b/Marlin/fonts/HD44780_C.fon similarity index 100% rename from Marlin/scripts/Fonts/HD44780_C.fon rename to Marlin/fonts/HD44780_C.fon diff --git a/Marlin/scripts/Fonts/HD44780_J.fon b/Marlin/fonts/HD44780_J.fon similarity index 100% rename from Marlin/scripts/Fonts/HD44780_J.fon rename to Marlin/fonts/HD44780_J.fon diff --git a/Marlin/scripts/Fonts/HD44780_W.fon b/Marlin/fonts/HD44780_W.fon similarity index 100% rename from Marlin/scripts/Fonts/HD44780_W.fon rename to Marlin/fonts/HD44780_W.fon diff --git a/Marlin/scripts/Fonts/ISO10646-5_Cyrillic.fon b/Marlin/fonts/ISO10646-5_Cyrillic.fon similarity index 100% rename from Marlin/scripts/Fonts/ISO10646-5_Cyrillic.fon rename to Marlin/fonts/ISO10646-5_Cyrillic.fon diff --git a/Marlin/scripts/Fonts/ISO10646_Kana.fon b/Marlin/fonts/ISO10646_Kana.fon similarity index 100% rename from Marlin/scripts/Fonts/ISO10646_Kana.fon rename to Marlin/fonts/ISO10646_Kana.fon diff --git a/Marlin/scripts/Fonts/Marlin_symbols.fon b/Marlin/fonts/Marlin_symbols.fon similarity index 100% rename from Marlin/scripts/Fonts/Marlin_symbols.fon rename to Marlin/fonts/Marlin_symbols.fon diff --git a/Marlin/scripts/Fonts/README.fonts b/Marlin/fonts/README.fonts similarity index 78% rename from Marlin/scripts/Fonts/README.fonts rename to Marlin/fonts/README.fonts index 976cdb749..0bfc9e988 100644 --- a/Marlin/scripts/Fonts/README.fonts +++ b/Marlin/fonts/README.fonts @@ -1,6 +1,6 @@ The fonts are created with Fony.exe (http://hukka.ncn.fi/?fony) because Fontforge didn't do what I want (probably lack off experience). In Fony export the fonts to bdf-format. Maybe another one can edit them with Fontforge. Then run make_fonts.bat what calls bdf2u8g.exe with the needed parameters to produce the .h files. -The .h files must be edited to replace '#include "u8g.h"' with '#include ' and moved to the main directory. +The .h files must be edited to replace '#include "u8g.h"' with '#include ', replace 'U8G_FONT_SECTION' with 'U8G_SECTION', inset '.progmem.' right behind the first '"' and moved to the main directory. Especially the Kana and Cyrillic fonts should be revised by someone who knows what he/she does. I am only a west-European with very little knowledge about this scripts. diff --git a/Marlin/scripts/Fonts/bdf2u8g.exe b/Marlin/fonts/bdf2u8g.exe similarity index 100% rename from Marlin/scripts/Fonts/bdf2u8g.exe rename to Marlin/fonts/bdf2u8g.exe diff --git a/Marlin/scripts/Fonts/make_fonts.bat b/Marlin/fonts/make_fonts.bat similarity index 100% rename from Marlin/scripts/Fonts/make_fonts.bat rename to Marlin/fonts/make_fonts.bat