CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring superscripts slightly lower in BDF fonts

Browse Source
This commit is contained in:
Scott Lahteine 2018-11-23 18:04:56 -06:00
parent 8a0992d921
commit 82c96c971e
4 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
View File

@ -1,9 +1,6 @@
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2018 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 * 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 * it under the terms of the GNU General Public License as published by
@ -35,7 +32,6 @@
X Font ascent = 8 descent=-2 X Font ascent = 8 descent=-2
Max Font ascent = 8 descent=-2 Max Font ascent = 8 descent=-2
*/ */
const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = { const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08, 0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05, 0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
@ -233,12 +229,12 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[2651] U8G_FONT_SECTION("ISO10646_1_5x7")
0xf8,0x08,0x08,0x03,0x01,0x01,0x06,0x01,0x03,0xe0,0x06,0x07,0x07,0x06,0x00,0x00, 0xf8,0x08,0x08,0x03,0x01,0x01,0x06,0x01,0x03,0xe0,0x06,0x07,0x07,0x06,0x00,0x00,
0x78,0x84,0xb4,0xa4,0xa4,0x84,0x78,0x05,0x01,0x01,0x06,0x00,0x07,0xf8,0x04,0x04, 0x78,0x84,0xb4,0xa4,0xa4,0x84,0x78,0x05,0x01,0x01,0x06,0x00,0x07,0xf8,0x04,0x04,
0x04,0x06,0x01,0x05,0x60,0x90,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20, 0x04,0x06,0x01,0x05,0x60,0x90,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
0xf8,0x20,0x20,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x05,0x40,0xa0,0x20,0x40,0xe0, 0xf8,0x20,0x20,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x04,0x40,0xa0,0x20,0x40,0xe0,
0x03,0x05,0x05,0x06,0x01,0x05,0xc0,0x20,0x40,0x20,0xc0,0x03,0x03,0x03,0x06,0x01, 0x03,0x05,0x05,0x06,0x01,0x04,0xc0,0x20,0x40,0x20,0xc0,0x03,0x03,0x03,0x06,0x01,
0x05,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80, 0x05,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80,
0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x78,0xe8,0xe8,0xe8,0x68,0x28,0x28,0x28,0x02, 0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x78,0xe8,0xe8,0xe8,0x68,0x28,0x28,0x28,0x02,
0x02,0x02,0x06,0x02,0x03,0xc0,0xc0,0x03,0x02,0x02,0x06,0x01,0xfe,0x20,0xc0,0x03, 0x02,0x02,0x06,0x02,0x03,0xc0,0xc0,0x03,0x02,0x02,0x06,0x01,0xfe,0x20,0xc0,0x03,
0x05,0x05,0x06,0x01,0x05,0x40,0xc0,0x40,0x40,0xe0,0x03,0x05,0x05,0x06,0x01,0x05, 0x05,0x05,0x06,0x01,0x04,0x40,0xc0,0x40,0x40,0xe0,0x03,0x05,0x05,0x06,0x01,0x05,
0x40,0xa0,0x40,0x00,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0x50,0x28,0x50,0xa0, 0x40,0xa0,0x40,0x00,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0x50,0x28,0x50,0xa0,
0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xb0,0x50,0x78,0x10, 0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xb0,0x50,0x78,0x10,
0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xa8,0x08,0x10,0x38, 0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xa8,0x08,0x10,0x38,

26
buildroot/share/fonts/marlin-6x12-1.bdf
View File

@ -1646,7 +1646,7 @@ STARTCHAR twosuperior
ENCODING 178 ENCODING 178
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -1658,7 +1658,7 @@ STARTCHAR threesuperior
ENCODING 179 ENCODING 179
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
C0 C0
20 20
@ -1727,7 +1727,7 @@ STARTCHAR onesuperior
ENCODING 185 ENCODING 185
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
C0 C0
@ -26792,7 +26792,7 @@ STARTCHAR zerosuperior
ENCODING 8304 ENCODING 8304
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -26816,7 +26816,7 @@ STARTCHAR foursuperior
ENCODING 8308 ENCODING 8308
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
80 80
80 80
@ -26828,7 +26828,7 @@ STARTCHAR fivesuperior
ENCODING 8309 ENCODING 8309
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
E0 E0
80 80
@ -26840,7 +26840,7 @@ STARTCHAR sixsuperior
ENCODING 8310 ENCODING 8310
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
60 60
80 80
@ -26852,7 +26852,7 @@ STARTCHAR sevensuperior
ENCODING 8311 ENCODING 8311
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
E0 E0
20 20
@ -26864,7 +26864,7 @@ STARTCHAR eightsuperior
ENCODING 8312 ENCODING 8312
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -26876,7 +26876,7 @@ STARTCHAR ninesuperior
ENCODING 8313 ENCODING 8313
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -26916,7 +26916,7 @@ STARTCHAR parenleftsuperior
ENCODING 8317 ENCODING 8317
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 2 5 1 5 BBX 2 5 1 4
BITMAP BITMAP
40 40
80 80
@ -26928,7 +26928,7 @@ STARTCHAR parenrightsuperior
ENCODING 8318 ENCODING 8318
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 2 5 1 5 BBX 2 5 1 4
BITMAP BITMAP
80 80
40 40
@ -26940,7 +26940,7 @@ STARTCHAR nsuperior
ENCODING 8319 ENCODING 8319
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 4 1 5 BBX 3 4 1 4
BITMAP BITMAP
C0 C0
A0 A0

26
buildroot/share/fonts/marlin-6x12-2.bdf
View File

@ -1644,7 +1644,7 @@ STARTCHAR twosuperior
ENCODING 178 ENCODING 178
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -1656,7 +1656,7 @@ STARTCHAR threesuperior
ENCODING 179 ENCODING 179
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
C0 C0
20 20
@ -1725,7 +1725,7 @@ STARTCHAR onesuperior
ENCODING 185 ENCODING 185
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
C0 C0
@ -26790,7 +26790,7 @@ STARTCHAR zerosuperior
ENCODING 8304 ENCODING 8304
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -26814,7 +26814,7 @@ STARTCHAR foursuperior
ENCODING 8308 ENCODING 8308
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
80 80
80 80
@ -26826,7 +26826,7 @@ STARTCHAR fivesuperior
ENCODING 8309 ENCODING 8309
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
E0 E0
80 80
@ -26838,7 +26838,7 @@ STARTCHAR sixsuperior
ENCODING 8310 ENCODING 8310
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
60 60
80 80
@ -26850,7 +26850,7 @@ STARTCHAR sevensuperior
ENCODING 8311 ENCODING 8311
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
E0 E0
20 20
@ -26862,7 +26862,7 @@ STARTCHAR eightsuperior
ENCODING 8312 ENCODING 8312
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -26874,7 +26874,7 @@ STARTCHAR ninesuperior
ENCODING 8313 ENCODING 8313
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -26914,7 +26914,7 @@ STARTCHAR parenleftsuperior
ENCODING 8317 ENCODING 8317
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 2 5 1 5 BBX 2 5 1 4
BITMAP BITMAP
40 40
80 80
@ -26926,7 +26926,7 @@ STARTCHAR parenrightsuperior
ENCODING 8318 ENCODING 8318
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 2 5 1 5 BBX 2 5 1 4
BITMAP BITMAP
80 80
40 40
@ -26938,7 +26938,7 @@ STARTCHAR nsuperior
ENCODING 8319 ENCODING 8319
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 4 1 5 BBX 3 4 1 4
BITMAP BITMAP
C0 C0
A0 A0

26
buildroot/share/fonts/marlin-6x12-3.bdf
View File

@ -1644,7 +1644,7 @@ STARTCHAR twosuperior
ENCODING 178 ENCODING 178
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -1656,7 +1656,7 @@ STARTCHAR threesuperior
ENCODING 179 ENCODING 179
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
C0 C0
20 20
@ -1725,7 +1725,7 @@ STARTCHAR onesuperior
ENCODING 185 ENCODING 185
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
C0 C0
@ -27124,7 +27124,7 @@ STARTCHAR zerosuperior
ENCODING 8304 ENCODING 8304
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -27148,7 +27148,7 @@ STARTCHAR foursuperior
ENCODING 8308 ENCODING 8308
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
80 80
80 80
@ -27160,7 +27160,7 @@ STARTCHAR fivesuperior
ENCODING 8309 ENCODING 8309
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
E0 E0
80 80
@ -27172,7 +27172,7 @@ STARTCHAR sixsuperior
ENCODING 8310 ENCODING 8310
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
60 60
80 80
@ -27184,7 +27184,7 @@ STARTCHAR sevensuperior
ENCODING 8311 ENCODING 8311
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
E0 E0
20 20
@ -27196,7 +27196,7 @@ STARTCHAR eightsuperior
ENCODING 8312 ENCODING 8312
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -27208,7 +27208,7 @@ STARTCHAR ninesuperior
ENCODING 8313 ENCODING 8313
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 5 1 5 BBX 3 5 1 4
BITMAP BITMAP
40 40
A0 A0
@ -27248,7 +27248,7 @@ STARTCHAR parenleftsuperior
ENCODING 8317 ENCODING 8317
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 2 5 1 5 BBX 2 5 1 4
BITMAP BITMAP
40 40
80 80
@ -27260,7 +27260,7 @@ STARTCHAR parenrightsuperior
ENCODING 8318 ENCODING 8318
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 2 5 1 5 BBX 2 5 1 4
BITMAP BITMAP
80 80
40 40
@ -27272,7 +27272,7 @@ STARTCHAR nsuperior
ENCODING 8319 ENCODING 8319
SWIDTH 480 0 SWIDTH 480 0
DWIDTH 6 0 DWIDTH 6 0
BBX 3 4 1 5 BBX 3 4 1 4
BITMAP BITMAP
C0 C0
A0 A0