bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #5298 from AnHardt/fonts-unterlaengen

Browse Source 
Change font decent to -1 for tr and gr
This commit is contained in:
Scott Lahteine 2016-11-25 20:01:11 -06:00 committed by GitHub
commit 679d37f83f
6 changed files with 269 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Marlin/dogm_font_data_ISO10646_1_tr.h
View File

@ -1,17 +1,39 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
/* /*
Fontname: ISO10646-1-tr Fontname: ISO10646-1-tr
Copyright: M.Sutas, public domain Copyright: public domain
Capital A Height: 7, '1' Height: 7 Capital A Height: 7, '1' Height: 7
Calculated Max Values w= 5 h= 9 x= 2 y= 7 dx= 6 dy= 0 ascent= 8 len= 9 Calculated Max Values w= 5 h= 9 x= 2 y= 7 dx= 6 dy= 0 ascent= 8 len= 9
Font Bounding box w= 6 h= 9 x= 0 y=-2 Font Bounding box w= 6 h= 9 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0 Calculated Min Values x= 0 y=-1 dx= 0 dy= 0
Pure Font ascent = 7 descent=-1 Pure Font ascent = 7 descent=-1
X Font ascent = 7 descent=-1 X Font ascent = 7 descent=-1
Max Font ascent = 8 descent=-2 Max Font ascent = 8 descent=-1
*/ */
#include "U8glib.h" #include "U8glib.h"
const u8g_fntpgm_uint8_t ISO10646_TR[2591] U8G_SECTION(".progmem.ISO10646_TR") = { const u8g_fntpgm_uint8_t ISO10646_TR[2591] U8G_SECTION(".progmem.ISO10646_TR") = {
0,6,9,0,254,7,1,146,3,33,32,255,255,8,254,7, 0,6,9,0,254,7,1,146,3,33,32,255,255,8,255,7,
255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128, 255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6, 128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6,
0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,32, 0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,32,
@ -144,7 +166,7 @@ const u8g_fntpgm_uint8_t ISO10646_TR[2591] U8G_SECTION(".progmem.ISO10646_TR") =
0,16,32,136,136,136,136,136,112,5,8,8,6,0,0,32, 0,16,32,136,136,136,136,136,112,5,8,8,6,0,0,32,
80,0,136,136,136,136,112,5,8,8,6,0,0,80,0,136, 80,0,136,136,136,136,112,5,8,8,6,0,0,80,0,136,
136,136,136,136,112,1,7,7,6,2,0,128,0,128,128,128, 136,136,136,136,112,1,7,7,6,2,0,128,0,128,128,128,
128,128,5,9,9,6,0,254,120,128,128,112,8,8,240,32, 128,128,5,9,9,6,0,255,120,128,128,112,8,8,240,32,
96,4,8,8,6,1,255,96,144,144,160,144,144,224,128,5, 96,4,8,8,6,1,255,96,144,144,160,144,144,224,128,5,
8,8,6,0,0,64,32,0,112,8,120,136,120,5,8,8, 8,8,6,0,0,64,32,0,112,8,120,136,120,5,8,8,
6,0,0,16,32,0,112,8,120,136,120,5,8,8,6,0, 6,0,0,16,32,0,112,8,120,136,120,5,8,8,6,0,
@ -152,7 +174,7 @@ const u8g_fntpgm_uint8_t ISO10646_TR[2591] U8G_SECTION(".progmem.ISO10646_TR") =
144,0,112,8,120,136,120,5,7,7,6,0,0,80,0,112, 144,0,112,8,120,136,120,5,7,7,6,0,0,80,0,112,
8,120,136,120,5,8,8,6,0,0,32,80,32,112,8,120, 8,120,136,120,5,8,8,6,0,0,32,80,32,112,8,120,
136,120,5,6,6,6,0,0,208,40,120,160,168,80,5,7, 136,120,5,6,6,6,0,0,208,40,120,160,168,80,5,7,
7,6,0,254,112,128,128,136,112,32,96,5,8,8,6,0, 7,6,0,255,112,128,128,136,112,32,96,5,8,8,6,0,
0,64,32,0,112,136,248,128,112,5,8,8,6,0,0,16, 0,64,32,0,112,136,248,128,112,5,8,8,6,0,0,16,
32,0,112,136,248,128,112,5,8,8,6,0,0,32,80,0, 32,0,112,136,248,128,112,5,8,8,6,0,0,32,80,0,
112,136,248,128,112,5,7,7,6,0,0,80,0,112,136,248, 112,136,248,128,112,5,7,7,6,0,0,80,0,112,136,248,
@ -171,5 +193,5 @@ const u8g_fntpgm_uint8_t ISO10646_TR[2591] U8G_SECTION(".progmem.ISO10646_TR") =
5,8,8,6,0,0,16,32,0,136,136,136,152,104,5,8, 5,8,8,6,0,0,16,32,0,136,136,136,152,104,5,8,
8,6,0,0,32,80,0,136,136,136,152,104,5,7,7,6, 8,6,0,0,32,80,0,136,136,136,152,104,5,7,7,6,
0,0,80,0,136,136,136,152,104,1,5,5,6,2,0,128, 0,0,80,0,136,136,136,152,104,1,5,5,6,2,0,128,
128,128,128,128,5,7,7,6,0,254,112,128,112,8,240,32, 128,128,128,128,5,7,7,6,0,255,112,128,112,8,240,32,
96,5,8,8,6,0,255,80,0,136,136,136,120,8,112}; 96,5,8,8,6,0,255,80,0,136,136,136,120,8,112};

139
Marlin/dogm_font_data_ISO10646_Greek.h
View File

@ -24,16 +24,16 @@
Fontname: ISO10646_4_Greek Fontname: ISO10646_4_Greek
Copyright: A. Hardtung, public domain Copyright: A. Hardtung, public domain
Capital A Height: 7, '1' Height: 7 Capital A Height: 7, '1' Height: 7
Calculated Max Values w= 5 h=10 x= 2 y= 6 dx= 6 dy= 0 ascent= 8 len=10 Calculated Max Values w= 5 h= 9 x= 2 y= 6 dx= 6 dy= 0 ascent= 8 len= 9
Font Bounding box w= 6 h= 9 x= 0 y=-2 Font Bounding box w= 6 h= 9 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0 Calculated Min Values x= 0 y=-1 dx= 0 dy= 0
Pure Font ascent = 7 descent=-1 Pure Font ascent = 7 descent=-1
X Font ascent = 7 descent=-1 X Font ascent = 7 descent=-1
Max Font ascent = 8 descent=-2 Max Font ascent = 8 descent=-1
*/ */
#include <U8glib.h> #include <U8glib.h>
const u8g_fntpgm_uint8_t ISO10646_Greek_5x7[2728] U8G_SECTION(".progmem.ISO10646_Greek_5x7") = { const u8g_fntpgm_uint8_t ISO10646_Greek_5x7[2715] U8G_SECTION(".progmem.ISO10646_Greek_5x7") = {
0,6,9,0,254,7,1,145,3,32,32,255,255,8,254,7, 0,6,9,0,254,7,1,145,3,32,32,255,255,8,255,7,
255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128, 255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6, 128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6,
0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,32, 0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,32,
@ -139,68 +139,67 @@ const u8g_fntpgm_uint8_t ISO10646_Greek_5x7[2728] U8G_SECTION(".progmem.ISO10646
80,80,216,3,8,8,6,1,0,160,0,224,64,64,64,64, 80,80,216,3,8,8,6,1,0,160,0,224,64,64,64,64,
224,5,8,8,6,0,0,80,0,136,136,136,80,32,32,5, 224,5,8,8,6,0,0,80,0,136,136,136,80,32,32,5,
8,8,6,0,0,32,64,8,104,152,144,144,104,5,8,8, 8,8,6,0,0,32,64,8,104,152,144,144,104,5,8,8,
6,0,0,32,64,0,112,136,224,136,112,5,10,10,6,0, 6,0,0,32,64,0,112,136,224,136,112,5,9,9,6,0,
254,32,64,0,112,136,136,136,136,8,8,2,8,8,6,1, 255,32,64,0,112,136,136,136,136,8,2,8,8,6,1,0,
0,64,128,0,128,128,128,128,64,5,8,8,6,0,0,16, 64,128,0,128,128,128,128,64,5,8,8,6,0,0,16,32,
32,80,0,136,136,136,112,5,6,6,6,0,0,8,104,152, 80,0,136,136,136,112,5,6,6,6,0,0,8,104,152,144,
144,144,104,4,7,7,6,0,254,96,144,240,144,224,128,128, 144,104,4,6,6,6,0,255,96,144,240,144,224,128,5,6,
5,6,6,6,0,255,136,72,80,32,32,64,5,6,6,6, 6,6,0,255,136,72,80,32,32,64,5,6,6,6,0,0,
0,0,48,64,112,136,136,112,5,5,5,6,0,0,112,136, 48,64,112,136,136,112,5,5,5,6,0,0,112,136,224,136,
224,136,112,5,9,9,6,0,254,128,112,64,128,128,128,112, 112,5,8,8,6,0,255,128,112,64,128,128,112,8,112,5,
8,112,5,7,7,6,0,254,184,200,136,136,136,8,8,5, 6,6,6,0,255,184,200,136,136,136,8,5,5,5,6,0,
5,5,6,0,0,112,136,248,136,112,3,5,5,6,1,0, 0,112,136,248,136,112,3,5,5,6,1,0,128,128,128,128,
128,128,128,128,96,4,5,5,6,0,0,144,160,192,160,144, 96,4,5,5,6,0,0,144,160,192,160,144,5,6,6,6,
5,6,6,6,0,0,64,32,32,80,80,136,5,7,7,6, 0,0,64,32,32,80,80,136,5,6,6,6,0,255,136,136,
0,254,136,136,136,216,168,128,128,5,5,5,6,0,0,136, 136,216,168,128,5,5,5,6,0,0,136,136,80,96,32,5,
136,80,96,32,5,10,10,6,0,254,128,224,128,112,32,64, 9,9,6,0,255,128,224,128,112,32,64,240,8,112,5,5,
128,112,8,112,5,5,5,6,0,0,112,136,136,136,112,5, 5,6,0,0,112,136,136,136,112,5,5,5,6,0,0,248,
5,5,6,0,0,248,80,80,80,80,5,7,7,6,0,254, 80,80,80,80,5,6,6,6,0,255,112,136,136,200,176,128,
112,136,136,200,176,128,128,5,7,7,6,0,254,48,64,128, 5,7,7,6,0,255,48,64,128,64,48,8,112,5,5,5,
64,48,8,112,5,5,5,6,0,0,104,144,144,144,96,4, 6,0,0,104,144,144,144,96,4,5,5,6,0,0,240,64,
5,5,6,0,0,240,64,64,64,48,5,5,5,6,0,0, 64,64,48,5,5,5,6,0,0,136,136,144,144,224,5,7,
136,136,144,144,224,5,8,8,6,0,254,48,168,168,168,168, 7,6,0,255,32,168,168,168,112,32,32,5,6,6,6,0,
112,32,32,5,6,6,6,0,255,136,80,32,32,80,136,5, 255,136,80,32,32,80,136,5,6,6,6,0,255,168,168,168,
7,7,6,0,254,168,168,168,168,112,32,32,5,5,5,6, 168,112,32,5,5,5,6,0,0,80,136,136,168,112,4,7,
0,0,80,136,136,168,112,4,7,7,6,0,0,160,0,64, 7,6,0,0,160,0,64,64,64,64,48,5,7,7,6,0,
64,64,64,48,5,7,7,6,0,0,80,0,136,136,144,144, 0,80,0,136,136,144,144,224,4,8,8,6,0,0,32,64,
224,4,8,8,6,0,0,32,64,0,96,144,144,144,96,5, 0,96,144,144,144,96,5,8,8,6,0,0,32,64,0,136,
8,8,6,0,0,32,64,0,136,136,144,144,96,5,8,8, 136,144,144,96,5,8,8,6,0,0,32,64,0,80,136,136,
6,0,0,32,64,0,80,136,136,168,112,5,7,7,6,0, 168,112,5,7,7,6,0,255,144,160,192,160,144,136,16,5,
255,144,160,192,160,144,136,16,5,8,8,6,0,0,96,144, 8,8,6,0,0,96,144,160,128,240,136,136,112,5,7,7,
160,128,240,136,136,112,5,7,7,6,0,0,112,80,56,144, 6,0,0,112,80,56,144,144,144,96,5,6,6,6,0,0,
144,144,96,5,6,6,6,0,0,152,80,32,32,32,32,5, 152,80,32,32,32,32,5,8,8,6,0,0,64,128,152,80,
8,8,6,0,0,64,128,152,80,32,32,32,32,5,8,8, 32,32,32,32,5,8,8,6,0,0,80,0,152,80,32,32,
6,0,0,80,0,152,80,32,32,32,32,5,7,7,6,0, 32,32,5,7,7,6,0,255,48,168,168,168,168,112,32,5,
255,48,168,168,168,168,112,32,5,5,5,6,0,0,248,80, 5,5,6,0,0,248,80,80,80,88,5,6,6,6,0,255,
80,80,88,5,6,6,6,0,255,136,80,112,80,136,16,5, 136,80,112,80,136,16,5,7,7,6,0,255,112,136,136,136,
7,7,6,0,255,112,136,136,136,112,32,112,5,6,6,6, 112,32,112,5,6,6,6,0,255,112,136,136,112,32,112,5,
0,255,112,136,136,112,32,112,5,6,6,6,0,0,112,136, 6,6,6,0,0,112,136,128,112,32,112,5,7,7,6,0,
128,112,32,112,5,7,7,6,0,254,8,112,128,128,112,16, 255,8,8,112,128,112,16,96,5,6,6,6,0,0,248,128,
96,5,6,6,6,0,0,248,128,128,240,128,128,4,5,5, 128,240,128,128,4,5,5,6,0,0,240,128,224,128,128,5,
6,0,0,240,128,224,128,128,5,6,6,6,0,0,248,0, 6,6,6,0,0,248,0,0,112,0,248,4,5,5,6,0,
0,112,0,248,4,5,5,6,0,0,64,128,240,16,32,5, 0,64,128,240,16,32,5,7,7,6,0,0,224,80,40,40,
7,7,6,0,0,224,80,40,40,8,8,16,5,7,7,6, 8,8,16,5,7,7,6,0,0,192,32,80,40,8,8,8,
0,0,192,32,80,40,8,8,8,5,8,8,6,0,254,168, 5,7,7,6,0,255,168,168,168,168,88,8,112,5,6,6,
168,168,168,168,88,8,112,5,7,7,6,0,254,168,168,168, 6,0,255,168,168,168,88,8,112,5,6,6,6,0,0,104,
168,88,8,112,5,6,6,6,0,0,104,136,136,120,8,8, 136,136,120,8,8,5,6,6,6,0,255,104,136,136,120,8,
5,6,6,6,0,255,104,136,136,120,8,8,4,8,8,6, 8,4,8,8,6,0,255,128,224,144,144,144,144,32,192,5,
0,254,128,224,144,144,144,144,32,192,5,5,5,6,0,0, 5,5,6,0,0,104,144,112,16,224,5,6,6,6,0,0,
104,144,112,16,224,5,6,6,6,0,0,96,144,16,96,136, 96,144,16,96,136,112,4,6,6,6,0,0,96,144,16,96,
112,4,6,6,6,0,0,96,144,16,96,128,112,5,6,6, 128,112,5,6,6,6,0,0,136,80,32,80,136,248,5,5,
6,0,0,136,80,32,80,136,248,5,5,5,6,0,0,136, 5,6,0,0,136,80,32,80,112,5,6,6,6,0,0,120,
80,32,80,112,5,6,6,6,0,0,120,128,240,136,136,112, 128,240,136,136,112,4,5,5,6,0,0,240,128,224,144,96,
4,5,5,6,0,0,240,128,224,144,96,3,6,6,6,1, 3,6,6,6,1,0,64,224,64,64,64,64,3,6,6,6,
0,64,224,64,64,64,64,3,6,6,6,1,255,64,224,64, 1,255,64,224,64,64,64,128,5,5,5,6,0,0,136,80,
64,64,128,5,5,5,6,0,0,136,80,112,80,136,5,7, 112,80,136,5,6,6,6,0,255,112,136,136,240,128,112,4,
7,6,0,254,112,136,136,136,240,128,112,4,5,5,6,0, 5,5,6,0,0,112,128,128,128,112,2,8,8,6,1,255,
0,112,128,128,128,112,2,8,8,6,1,255,64,0,192,64, 64,0,192,64,64,64,64,128,5,7,7,6,0,0,112,136,
64,64,64,128,5,7,7,6,0,0,112,136,136,248,136,136, 136,248,136,136,112,4,5,5,6,0,0,112,128,224,128,112,
112,4,5,5,6,0,0,112,128,224,128,112,4,5,5,6, 4,5,5,6,0,0,224,16,112,16,224,5,7,7,6,0,
0,0,224,16,112,16,224,5,7,7,6,0,0,128,240,136, 0,128,240,136,136,136,240,128,4,7,7,6,0,255,128,224,
136,136,240,128,4,7,7,6,0,255,128,224,144,144,144,224, 144,144,144,224,128,5,6,6,6,0,0,112,136,128,128,136,
128,5,6,6,6,0,0,112,136,128,128,136,112,5,6,6, 112,5,6,6,6,0,0,136,216,168,136,136,136,5,6,6,
6,0,0,136,216,168,136,136,136,5,7,7,6,0,254,136, 6,0,255,136,216,168,136,136,128,5,8,8,6,0,255,112,
216,168,136,136,128,128,5,8,8,6,0,254,112,136,136,136, 136,136,136,112,64,224,64,5,6,6,6,0,0,112,136,8,
112,64,224,64,5,6,6,6,0,0,112,136,8,8,136,112, 8,136,112,5,6,6,6,0,0,112,136,160,128,136,112,5,
5,6,6,6,0,0,112,136,160,128,136,112,5,6,6,6, 6,6,6,0,0,112,136,40,8,136,112};
0,0,112,136,40,8,136,112};

4
Marlin/language_el-gr.h
View File

@ -30,8 +30,8 @@
#ifndef LANGUAGE_EL_GR_H #ifndef LANGUAGE_EL_GR_H
#define LANGUAGE_EL_GR_H #define LANGUAGE_EL_GR_H
//#define MAPPER_CECF #define MAPPER_CECF
//#define DISPLAY_CHARSET_ISO10646_GREEK #define DISPLAY_CHARSET_ISO10646_GREEK
#define WELCOME_MSG MACHINE_NAME " έτοιμο." #define WELCOME_MSG MACHINE_NAME " έτοιμο."
#define MSG_SD_INSERTED "Εισαγωγή κάρτας" #define MSG_SD_INSERTED "Εισαγωγή κάρτας"

BIN
buildroot/share/fonts/ISO10646-1-tr.fon
View File

Binary file not shown.

BIN
buildroot/share/fonts/ISO10646-4_Greek.fon
View File

Binary file not shown.

1
buildroot/share/fonts/make_fonts.bat
View File

@ -3,6 +3,7 @@
.\bdf2u8g.exe -b 32 -e 255 HD44780_C.bdf HD44780_C_5x7 dogm_font_data_HD44780_C.h .\bdf2u8g.exe -b 32 -e 255 HD44780_C.bdf HD44780_C_5x7 dogm_font_data_HD44780_C.h
.\bdf2u8g.exe -b 32 -e 255 HD44780_J.bdf HD44780_J_5x7 dogm_font_data_HD44780_J.h .\bdf2u8g.exe -b 32 -e 255 HD44780_J.bdf HD44780_J_5x7 dogm_font_data_HD44780_J.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646-1.bdf ISO10646_1_5x7 dogm_font_data_ISO10646_1.h .\bdf2u8g.exe -b 32 -e 255 ISO10646-1.bdf ISO10646_1_5x7 dogm_font_data_ISO10646_1.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646-1-tr.bdf ISO10646_1_tr_5x7 dogm_font_data_ISO10646_1-tr.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646_5_Cyrillic.bdf ISO10646_5_Cyrillic_5x7 dogm_font_data_ISO10646_5_Cyrillic.h .\bdf2u8g.exe -b 32 -e 255 ISO10646_5_Cyrillic.bdf ISO10646_5_Cyrillic_5x7 dogm_font_data_ISO10646_5_Cyrillic.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646_Kana.bdf ISO10646_Kana_5x7 dogm_font_data_ISO10646_Kana.h .\bdf2u8g.exe -b 32 -e 255 ISO10646_Kana.bdf ISO10646_Kana_5x7 dogm_font_data_ISO10646_Kana.h
.\bdf2u8g.exe -b 32 -e 255 ISO10646_CN.bdf ISO10646_CN dogm_font_data_ISO10646_CN.h .\bdf2u8g.exe -b 32 -e 255 ISO10646_CN.bdf ISO10646_CN dogm_font_data_ISO10646_CN.h