forked from len0rd/rockbox
Greg Haerr's new loadable font. No more #ifdef font-style, removed old
propfont and loadable font code. New font file format. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2269 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
5ed78ea80c
commit
93b231c693
29 changed files with 5528 additions and 1120 deletions
|
@ -4,8 +4,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
|
||||
|
||||
#if 0
|
||||
const unsigned char char_gen_6x8[][5] =
|
||||
{
|
||||
{ 0x00,0x00,0x00,0x00,0x00 },
|
||||
|
@ -205,7 +204,9 @@ const unsigned char char_gen_8x12[][14] =
|
|||
{ 0x04,0x00,0x06,0x00,0x02,0x00,0x06,0x00,0x04,0x00,0x06,0x00,0x02,0x00 },
|
||||
{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }
|
||||
};
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
|
||||
const unsigned char char_gen_12x16[][22] =
|
||||
{
|
||||
{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
|
||||
|
@ -305,246 +306,5 @@ const unsigned char char_gen_12x16[][22] =
|
|||
{ 0x10,0x00,0x18,0x00,0x0c,0x00,0x04,0x00,0x0c,0x00,0x18,0x00,0x10,0x00,0x18,0x00,0x0c,0x00,0x04,0x00,0x00,0x00 },
|
||||
{ 0xff,0x3f,0xff,0x3f,0xff,0x3f,0xff,0x3f,0xff,0x3f,0xff,0x3f,0xff,0x3f,0xff,0x3f,0xff,0x3f,0xff,0x3f,0x00,0x00 }
|
||||
};
|
||||
|
||||
#ifdef LCD_PROPFONTS
|
||||
|
||||
|
||||
unsigned char char_dw_8x8_prop[][9] = {
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37 } /* */,
|
||||
{ 0xbe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17 } /* ! */,
|
||||
{ 0xe,0x0,0xe,0x0,0x0,0x0,0x0,0x0,0x37 } /* " */,
|
||||
{ 0x28,0x7c,0x28,0x7c,0x28,0x0,0x0,0x0,0x56 } /* # */,
|
||||
{ 0x48,0x54,0xfe,0x54,0x24,0x0,0x0,0x0,0x57 } /* $ */,
|
||||
{ 0x88,0x40,0x20,0x10,0x88,0x0,0x0,0x0,0x55 } /* % */,
|
||||
{ 0x6c,0x92,0x92,0xaa,0x44,0xa0,0x0,0x0,0x67 } /* & */,
|
||||
{ 0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17 } /* ' */,
|
||||
{ 0x7c,0x82,0x0,0x0,0x0,0x0,0x0,0x0,0x27 } /* ( */,
|
||||
{ 0x82,0x7c,0x0,0x0,0x0,0x0,0x0,0x0,0x27 } /* ) */,
|
||||
{ 0x54,0x38,0x7c,0x38,0x54,0x0,0x0,0x0,0x56 } /* * */,
|
||||
{ 0x10,0x10,0x7c,0x10,0x10,0x0,0x0,0x0,0x56 } /* + */,
|
||||
{ 0x80,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x22 } /* , */,
|
||||
{ 0x10,0x10,0x10,0x10,0x10,0x0,0x0,0x0,0x45 } /* - */,
|
||||
{ 0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11 } /* . */,
|
||||
{ 0x80,0x40,0x20,0x10,0x8,0x4,0x2,0x0,0x77 } /* / */,
|
||||
{ 0x7c,0x82,0x82,0x7c,0x0,0x0,0x0,0x0,0x47 } /* 0 */,
|
||||
{ 0x84,0xfe,0x80,0x0,0x0,0x0,0x0,0x0,0x37 } /* 1 */,
|
||||
{ 0xe4,0x92,0x92,0x8c,0x0,0x0,0x0,0x0,0x47 } /* 2 */,
|
||||
{ 0x44,0x92,0x92,0x6c,0x0,0x0,0x0,0x0,0x47 } /* 3 */,
|
||||
{ 0x1e,0x10,0x10,0xfe,0x0,0x0,0x0,0x0,0x47 } /* 4 */,
|
||||
{ 0x4e,0x92,0x92,0x62,0x0,0x0,0x0,0x0,0x47 } /* 5 */,
|
||||
{ 0x7c,0x92,0x92,0x60,0x0,0x0,0x0,0x0,0x47 } /* 6 */,
|
||||
{ 0x2,0x12,0x12,0xfe,0x0,0x0,0x0,0x0,0x47 } /* 7 */,
|
||||
{ 0x6c,0x92,0x92,0x6c,0x0,0x0,0x0,0x0,0x47 } /* 8 */,
|
||||
{ 0xc,0x92,0x92,0x7c,0x0,0x0,0x0,0x0,0x47 } /* 9 */,
|
||||
{ 0x44,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x16 } /* : */,
|
||||
{ 0x80,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0x26 } /* ; */,
|
||||
{ 0x10,0x28,0x44,0x0,0x0,0x0,0x0,0x0,0x36 } /* < */,
|
||||
{ 0x28,0x28,0x28,0x28,0x28,0x0,0x0,0x0,0x55 } /* = */,
|
||||
{ 0x44,0x28,0x10,0x0,0x0,0x0,0x0,0x0,0x36 } /* > */,
|
||||
{ 0xb2,0x12,0x12,0xc,0x0,0x0,0x0,0x0,0x47 } /* ? */,
|
||||
{ 0x60,0x94,0x94,0x94,0xa4,0x48,0x30,0x0,0x76 } /* @ */,
|
||||
{ 0xfc,0x22,0x22,0xfc,0x0,0x0,0x0,0x0,0x47 } /* A */,
|
||||
{ 0xfe,0x92,0x92,0x6c,0x0,0x0,0x0,0x0,0x47 } /* B */,
|
||||
{ 0x7c,0x82,0x82,0x44,0x0,0x0,0x0,0x0,0x47 } /* C */,
|
||||
{ 0xfe,0x82,0x82,0x7c,0x0,0x0,0x0,0x0,0x47 } /* D */,
|
||||
{ 0xfe,0x92,0x92,0x82,0x0,0x0,0x0,0x0,0x47 } /* E */,
|
||||
{ 0xfe,0x12,0x12,0x2,0x0,0x0,0x0,0x0,0x47 } /* F */,
|
||||
{ 0x7c,0x82,0x92,0xf2,0x0,0x0,0x0,0x0,0x47 } /* G */,
|
||||
{ 0xfe,0x10,0x10,0xfe,0x0,0x0,0x0,0x0,0x47 } /* H */,
|
||||
{ 0x82,0xfe,0x82,0x0,0x0,0x0,0x0,0x0,0x37 } /* I */,
|
||||
{ 0x42,0x82,0x82,0x7e,0x0,0x0,0x0,0x0,0x47 } /* J */,
|
||||
{ 0xfe,0x10,0x28,0xc6,0x0,0x0,0x0,0x0,0x47 } /* K */,
|
||||
{ 0xfe,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0x47 } /* L */,
|
||||
{ 0xfe,0x4,0x18,0x4,0xfe,0x0,0x0,0x0,0x57 } /* M */,
|
||||
{ 0xfe,0x2,0x2,0xfc,0x0,0x0,0x0,0x0,0x47 } /* N */,
|
||||
{ 0x7c,0x82,0x82,0x7c,0x0,0x0,0x0,0x0,0x47 } /* O */,
|
||||
{ 0xfe,0x12,0x12,0xc,0x0,0x0,0x0,0x0,0x47 } /* P */,
|
||||
{ 0x7c,0x82,0xa2,0x7c,0x40,0x80,0x0,0x0,0x67 } /* Q */,
|
||||
{ 0xfe,0x12,0x12,0xec,0x0,0x0,0x0,0x0,0x47 } /* R */,
|
||||
{ 0x8c,0x92,0x92,0x62,0x0,0x0,0x0,0x0,0x47 } /* S */,
|
||||
{ 0x2,0x2,0xfe,0x2,0x2,0x0,0x0,0x0,0x57 } /* T */,
|
||||
{ 0x7e,0x80,0x80,0x7e,0x0,0x0,0x0,0x0,0x47 } /* U */,
|
||||
{ 0x3e,0x40,0x80,0x40,0x3e,0x0,0x0,0x0,0x57 } /* V */,
|
||||
{ 0xfe,0x40,0x30,0x40,0xfe,0x0,0x0,0x0,0x57 } /* W */,
|
||||
{ 0xc6,0x28,0x10,0x28,0xc6,0x0,0x0,0x0,0x57 } /* X */,
|
||||
{ 0xe,0x10,0xe0,0x10,0xe,0x0,0x0,0x0,0x57 } /* Y */,
|
||||
{ 0xe2,0x92,0x92,0x8e,0x0,0x0,0x0,0x0,0x47 } /* Z */,
|
||||
{ 0xfe,0x82,0x0,0x0,0x0,0x0,0x0,0x0,0x27 } /* [ */,
|
||||
{ 0x2,0x4,0x8,0x10,0x20,0x40,0x80,0x0,0x77 } /* \ */,
|
||||
{ 0x82,0xfe,0x0,0x0,0x0,0x0,0x0,0x0,0x27 } /* ] */,
|
||||
{ 0x8,0x4,0x2,0x4,0x8,0x0,0x0,0x0,0x57 } /* ^ */,
|
||||
{ 0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x15 } /* _ */,
|
||||
{ 0x6,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x27 } /* ` */,
|
||||
{ 0x40,0xa8,0xa8,0xa8,0xf0,0x0,0x0,0x0,0x55 } /* a */,
|
||||
{ 0xfe,0x90,0x90,0x60,0x0,0x0,0x0,0x0,0x47 } /* b */,
|
||||
{ 0x70,0x88,0x88,0x88,0x0,0x0,0x0,0x0,0x45 } /* c */,
|
||||
{ 0x60,0x90,0x90,0xfe,0x0,0x0,0x0,0x0,0x47 } /* d */,
|
||||
{ 0x70,0xa8,0xa8,0xa8,0x10,0x0,0x0,0x0,0x55 } /* e */,
|
||||
{ 0x10,0xfc,0x12,0x2,0x0,0x0,0x0,0x0,0x47 } /* f */,
|
||||
{ 0x10,0xa8,0xa8,0xa8,0x78,0x0,0x0,0x0,0x55 } /* g */,
|
||||
{ 0xfe,0x10,0x10,0xe0,0x0,0x0,0x0,0x0,0x47 } /* h */,
|
||||
{ 0x88,0xfa,0x80,0x0,0x0,0x0,0x0,0x0,0x37 } /* i */,
|
||||
{ 0x40,0x80,0x88,0x7a,0x0,0x0,0x0,0x0,0x47 } /* j */,
|
||||
{ 0xfe,0x20,0x50,0x88,0x0,0x0,0x0,0x0,0x47 } /* k */,
|
||||
{ 0x82,0xfe,0x80,0x0,0x0,0x0,0x0,0x0,0x37 } /* l */,
|
||||
{ 0xf8,0x8,0x70,0x8,0xf8,0x0,0x0,0x0,0x55 } /* m */,
|
||||
{ 0xf8,0x8,0x8,0xf0,0x0,0x0,0x0,0x0,0x45 } /* n */,
|
||||
{ 0x70,0x88,0x88,0x70,0x0,0x0,0x0,0x0,0x45 } /* o */,
|
||||
{ 0xf8,0x28,0x28,0x10,0x0,0x0,0x0,0x0,0x45 } /* p */,
|
||||
{ 0x10,0x28,0x28,0xf8,0x0,0x0,0x0,0x0,0x45 } /* q */,
|
||||
{ 0xf8,0x10,0x8,0x8,0x0,0x0,0x0,0x0,0x45 } /* r */,
|
||||
{ 0x90,0xa8,0xa8,0x48,0x0,0x0,0x0,0x0,0x45 } /* s */,
|
||||
{ 0x8,0xfe,0x8,0x0,0x0,0x0,0x0,0x0,0x37 } /* t */,
|
||||
{ 0x78,0x80,0x80,0x78,0x0,0x0,0x0,0x0,0x45 } /* u */,
|
||||
{ 0x38,0x40,0x80,0x40,0x38,0x0,0x0,0x0,0x55 } /* v */,
|
||||
{ 0xf8,0x80,0x60,0x80,0xf8,0x0,0x0,0x0,0x55 } /* w */,
|
||||
{ 0xd8,0x20,0xd8,0x0,0x0,0x0,0x0,0x0,0x35 } /* x */,
|
||||
{ 0x18,0xa0,0xa0,0x78,0x0,0x0,0x0,0x0,0x45 } /* y */,
|
||||
{ 0xc8,0xa8,0x98,0x0,0x0,0x0,0x0,0x0,0x35 } /* z 0x7a */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x7b */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x7c */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x7d */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x7e */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x7f */,
|
||||
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x80 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x81 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x82 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x83 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x85 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x86 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x87 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x88 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x89 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x8a */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x8b */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x8c */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x8d */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x8e */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x8f */,
|
||||
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x90 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x91 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x92 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x93 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x95 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x96 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x97 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x98 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x99 */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x9a */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x9b */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x9c */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x9d */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x9e */,
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x00 } /* 0x9f */,
|
||||
|
||||
{ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37 } /* */,
|
||||
{ 0xfa,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17 } /* ¡ */,
|
||||
{ 0x38,0x44,0xfe,0x44,0x28,0x0,0x0,0x0,0x57 } /* ¢ */,
|
||||
{ 0x90,0x7c,0x92,0x82,0x82,0x44,0x0,0x0,0x67 } /* £ */,
|
||||
{ 0x44,0x38,0x28,0x38,0x44,0x0,0x0,0x0,0x55 } /* ¤ */,
|
||||
{ 0x2a,0x2c,0xf8,0x2c,0x2a,0x0,0x0,0x0,0x57 } /* ¥ */,
|
||||
{ 0xee,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17 } /* ¦ */,
|
||||
{ 0x94,0xaa,0xaa,0x52,0x0,0x0,0x0,0x0,0x47 } /* § */,
|
||||
{ 0x2,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x47 } /* ¨ */,
|
||||
{ 0x7c,0x82,0xba,0xaa,0xaa,0x82,0x7c,0x0,0x77 } /* © */,
|
||||
{ 0x0,0x32,0x2a,0x2a,0x3e,0x20,0x0,0x0,0x57 } /* ª */,
|
||||
{ 0x10,0x28,0x54,0x28,0x44,0x0,0x0,0x0,0x56 } /* « */,
|
||||
{ 0x2,0x2,0x2,0x2,0x6,0x0,0x0,0x0,0x57 } /* ¬ */,
|
||||
{ 0x8,0x8,0x8,0x8,0x8,0x0,0x0,0x0,0x55 } /* */,
|
||||
{ 0x7c,0x82,0xfa,0xaa,0xda,0x82,0x7c,0x0,0x77 } /* ® */,
|
||||
{ 0x8,0x8,0x8,0x8,0x8,0x8,0x0,0x0,0x65 } /* */,
|
||||
{ 0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x0,0x77 } /* ¯ */,
|
||||
{ 0x4,0xa,0xa,0x4,0x0,0x0,0x0,0x0,0x47 } /* ° */,
|
||||
{ 0x24,0x24,0x2e,0x24,0x24,0x0,0x0,0x0,0x57 } /* ± */,
|
||||
{ 0x1a,0x1a,0x16,0x10,0x0,0x0,0x0,0x0,0x47 } /* ² */,
|
||||
{ 0x12,0x16,0x1e,0x0,0x0,0x0,0x0,0x0,0x37 } /* ³ */,
|
||||
{ 0x4,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x27 } /* ´ */,
|
||||
{ 0x1e,0x8,0x8,0x6,0x0,0x0,0x0,0x0,0x47 } /* µ */,
|
||||
{ 0xc,0xe,0x1e,0xfe,0x2,0xfe,0x0,0x0,0x67 } /* ¶ */,
|
||||
{ 0x10,0x38,0x38,0x10,0x0,0x0,0x0,0x0,0x45 } /* · */,
|
||||
{ 0x0,0x0,0x40,0x80,0x0,0x0,0x0,0x0,0x42 } /* ¸ */,
|
||||
{ 0xa,0xe,0x8,0x0,0x0,0x0,0x0,0x0,0x17 } /* ¹ */,
|
||||
{ 0x4,0xa,0xa,0x4,0x0,0x0,0x0,0x0,0x47 } /* º */,
|
||||
{ 0x44,0x28,0x54,0x28,0x10,0x0,0x0,0x0,0x56 } /* » */,
|
||||
{ 0x2e,0x10,0x8,0x34,0x22,0x70,0x0,0x0,0x67 } /* ¼ */,
|
||||
{ 0x2e,0x10,0x8,0xd4,0xd2,0xb0,0x80,0x0,0x77 } /* ½ */,
|
||||
{ 0x52,0x36,0x1e,0x68,0x44,0xe2,0x0,0x0,0x67 } /* |