uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixing font names of newly added DejaVuSans20 and DejaVuSans20_aa

ugfx_release_2.6
Joel Bodenmann 2014-11-17 21:42:03 +01:00
parent fe00d3e090
commit fe976dac66
3 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfxconf.example.h
View File

@ -73,6 +73,7 @@
// #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE
@ -81,6 +82,7 @@
// #define GDISP_INCLUDE_FONT_FIXED_5X8 FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE

30
src/gdisp/fonts/DejaVuSans20.c
View File

@ -1,6 +1,6 @@
/* Start of automatically generated font definition for phpP3Zkdt. */
/* Start of automatically generated font definition for DejaVuSans20. */
#ifndef MF_RLEFONT_INTERNALS
#define MF_RLEFONT_INTERNALS
@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
static const uint8_t mf_rlefont_phpP3Zkdt_dictionary_data[320] = {
static const uint8_t mf_rlefont_DejaVuSans20_dictionary_data[320] = {
0x05, 0x0a, 0x81, 0x03, 0x17, 0x05, 0x81, 0x0b, 0x81, 0x84, 0x0b, 0x04, 0x83, 0x03, 0x82, 0x0b,
0x81, 0x02, 0x81, 0x02, 0x85, 0x12, 0x81, 0x0a, 0x80, 0x01, 0x80, 0x40, 0x18, 0x01, 0x87, 0x0b,
0x12, 0x81, 0x12, 0x81, 0x12, 0x81, 0x12, 0x81, 0x10, 0x04, 0x81, 0x1e, 0x11, 0x06, 0x81, 0x83,
@ -34,7 +34,7 @@ static const uint8_t mf_rlefont_phpP3Zkdt_dictionary_data[320] = {
0xaa, 0x34, 0x1c, 0x34, 0x9c, 0x38, 0x20, 0x37, 0xba, 0x34, 0x28, 0x34, 0x3b, 0x34, 0x39, 0x40,
};
static const uint16_t mf_rlefont_phpP3Zkdt_dictionary_offsets[110] = {
static const uint16_t mf_rlefont_DejaVuSans20_dictionary_offsets[110] = {
0x0000, 0x0001, 0x0004, 0x0005, 0x0009, 0x000b, 0x000d, 0x000f,
0x0011, 0x0014, 0x0015, 0x0018, 0x001b, 0x001d, 0x0020, 0x0028,
0x0029, 0x002b, 0x002c, 0x002d, 0x002f, 0x0031, 0x0033, 0x0036,
@ -51,7 +51,7 @@ static const uint16_t mf_rlefont_phpP3Zkdt_dictionary_offsets[110] = {
0x0135, 0x0137, 0x0139, 0x013b, 0x013e, 0x0140,
};
static const uint8_t mf_rlefont_phpP3Zkdt_glyph_data_0[1558] = {
static const uint8_t mf_rlefont_DejaVuSans20_glyph_data_0[1558] = {
0x06, 0x00, 0x10, 0x08, 0x1a, 0x83, 0x65, 0x22, 0x29, 0x70, 0x10, 0x0a, 0x3e, 0x80, 0x7b, 0xd0,
0x80, 0x7b, 0x5f, 0xfc, 0xb7, 0x10, 0x11, 0x1a, 0x5e, 0x5f, 0xea, 0x20, 0x1f, 0x8c, 0x38, 0xa6,
0x3d, 0x33, 0x6e, 0x33, 0x3e, 0xa7, 0x38, 0x5b, 0x38, 0xa6, 0x3d, 0x33, 0x6e, 0x33, 0x19, 0x3d,
@ -152,7 +152,7 @@ static const uint8_t mf_rlefont_phpP3Zkdt_glyph_data_0[1558] = {
0x3f, 0x42, 0x93, 0x43, 0xc2, 0x10,
};
static const uint16_t mf_rlefont_phpP3Zkdt_glyph_offsets_0[95] = {
static const uint16_t mf_rlefont_DejaVuSans20_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x000b, 0x0016, 0x0037, 0x0058, 0x0084, 0x00a7,
0x00aa, 0x00b7, 0x00c5, 0x00d9, 0x00e5, 0x00ed, 0x00f4, 0x00fa,
0x0104, 0x0114, 0x011f, 0x012f, 0x013d, 0x0155, 0x0165, 0x017d,
@ -167,11 +167,11 @@ static const uint16_t mf_rlefont_phpP3Zkdt_glyph_offsets_0[95] = {
0x05b1, 0x05c8, 0x05d9, 0x05e5, 0x05f5, 0x05fb, 0x060b,
};
static const struct mf_rlefont_char_range_s mf_rlefont_phpP3Zkdt_char_ranges[] = {
{32, 95, mf_rlefont_phpP3Zkdt_glyph_offsets_0, mf_rlefont_phpP3Zkdt_glyph_data_0},
static const struct mf_rlefont_char_range_s mf_rlefont_DejaVuSans20_char_ranges[] = {
{32, 95, mf_rlefont_DejaVuSans20_glyph_offsets_0, mf_rlefont_DejaVuSans20_glyph_data_0},
};
const struct mf_rlefont_s mf_rlefont_phpP3Zkdt = {
const struct mf_rlefont_s mf_rlefont_DejaVuSans20 = {
{
"DejaVu Sans Book 20",
"DejaVuSans20",
@ -188,24 +188,24 @@ const struct mf_rlefont_s mf_rlefont_phpP3Zkdt = {
&mf_rlefont_render_character,
},
4, /* version */
mf_rlefont_phpP3Zkdt_dictionary_data,
mf_rlefont_phpP3Zkdt_dictionary_offsets,
mf_rlefont_DejaVuSans20_dictionary_data,
mf_rlefont_DejaVuSans20_dictionary_offsets,
62, /* rle dict count */
109, /* total dict count */
1, /* char range count */
mf_rlefont_phpP3Zkdt_char_ranges,
mf_rlefont_DejaVuSans20_char_ranges,
};
#ifdef MF_INCLUDED_FONTS
/* List entry for searching fonts by name. */
static const struct mf_font_list_s mf_rlefont_phpP3Zkdt_listentry = {
static const struct mf_font_list_s mf_rlefont_DejaVuSans20_listentry = {
MF_INCLUDED_FONTS,
(struct mf_font_s*)&mf_rlefont_phpP3Zkdt
(struct mf_font_s*)&mf_rlefont_DejaVuSans20
};
#undef MF_INCLUDED_FONTS
#define MF_INCLUDED_FONTS (&mf_rlefont_phpP3Zkdt_listentry)
#define MF_INCLUDED_FONTS (&mf_rlefont_DejaVuSans20_listentry)
#endif
/* End of automatically generated font definition for phpP3Zkdt. */
/* End of automatically generated font definition for DejaVuSans20. */

32
src/gdisp/fonts/DejaVuSans20_aa.c
View File

@ -1,6 +1,6 @@
/* Start of automatically generated font definition for phpr8HlMQ. */
/* Start of automatically generated font definition for DejaVuSans24_aa. */
#ifndef MF_RLEFONT_INTERNALS
#define MF_RLEFONT_INTERNALS
@ -11,7 +11,7 @@
#error The font file is not compatible with this version of mcufont.
#endif
static const uint8_t mf_rlefont_phpr8HlMQ_dictionary_data[486] = {
static const uint8_t mf_rlefont_DejaVuSans24_aa_dictionary_data[486] = {
0x05, 0x0b, 0x09, 0x81, 0x12, 0x81, 0x81, 0x05, 0x81, 0x0b, 0x0d, 0x17, 0x10, 0x28, 0x0b, 0x86,
0x12, 0x81, 0x12, 0x81, 0x08, 0x0e, 0x06, 0x84, 0x40, 0x1d, 0x80, 0xce, 0x8b, 0x08, 0x8b, 0x15,
0x80, 0xc3, 0x80, 0xcb, 0xca, 0x81, 0x12, 0x0a, 0x02, 0x81, 0xc7, 0x41, 0x3e, 0x01, 0xc9, 0x80,
@ -45,7 +45,7 @@ static const uint8_t mf_rlefont_phpr8HlMQ_dictionary_data[486] = {
0x0f, 0x60, 0x08, 0x4e, 0x0d, 0x28,
};
static const uint16_t mf_rlefont_phpr8HlMQ_dictionary_offsets[156] = {
static const uint16_t mf_rlefont_DejaVuSans24_aa_dictionary_offsets[156] = {
0x0000, 0x0001, 0x0002, 0x0003, 0x0006, 0x000a, 0x000b, 0x000c,
0x000d, 0x000e, 0x0010, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018,
0x001a, 0x001c, 0x001f, 0x0020, 0x0022, 0x0024, 0x0026, 0x0027,
@ -68,7 +68,7 @@ static const uint16_t mf_rlefont_phpr8HlMQ_dictionary_offsets[156] = {
0x01e0, 0x01e2, 0x01e4, 0x01e6,
};
static const uint8_t mf_rlefont_phpr8HlMQ_glyph_data_0[3979] = {
static const uint8_t mf_rlefont_DejaVuSans24_aa_glyph_data_0[3979] = {
0x06, 0x00, 0x10, 0x08, 0x25, 0x22, 0x8a, 0x2e, 0x3d, 0x2e, 0x0d, 0x0d, 0x2e, 0x48, 0x20, 0x22,
0x10, 0x0a, 0x1e, 0xb7, 0x96, 0x96, 0x10, 0x11, 0x58, 0x50, 0x05, 0x6d, 0x30, 0x48, 0x1d, 0x09,
0xf5, 0x01, 0x6f, 0x1d, 0x0d, 0x0b, 0x30, 0x05, 0x6d, 0x37, 0x02, 0x0f, 0x07, 0x00, 0x33, 0x2f,
@ -320,7 +320,7 @@ static const uint8_t mf_rlefont_phpr8HlMQ_glyph_data_0[3979] = {
0x00, 0x01, 0x04, 0x08, 0x0c, 0x47, 0x55, 0x01, 0x25, 0x56, 0x10,
};
static const uint16_t mf_rlefont_phpr8HlMQ_glyph_offsets_0[95] = {
static const uint16_t mf_rlefont_DejaVuSans24_aa_glyph_offsets_0[95] = {
0x0000, 0x0003, 0x0011, 0x0017, 0x0066, 0x00ad, 0x0120, 0x017c,
0x017f, 0x01ac, 0x01db, 0x0207, 0x0210, 0x0219, 0x0222, 0x0227,
0x024f, 0x029c, 0x02af, 0x02e3, 0x031d, 0x034d, 0x0378, 0x03bb,
@ -335,14 +335,14 @@ static const uint16_t mf_rlefont_phpr8HlMQ_glyph_offsets_0[95] = {
0x0e5a, 0x0e95, 0x0eda, 0x0efc, 0x0f2f, 0x0f36, 0x0f69,
};
static const struct mf_rlefont_char_range_s mf_rlefont_phpr8HlMQ_char_ranges[] = {
{32, 95, mf_rlefont_phpr8HlMQ_glyph_offsets_0, mf_rlefont_phpr8HlMQ_glyph_data_0},
static const struct mf_rlefont_char_range_s mf_rlefont_DejaVuSans24_aa_char_ranges[] = {
{32, 95, mf_rlefont_DejaVuSans24_aa_glyph_offsets_0, mf_rlefont_DejaVuSans24_aa_glyph_data_0},
};
const struct mf_rlefont_s mf_rlefont_phpr8HlMQ = {
const struct mf_rlefont_s mf_rlefont_DejaVuSans24_aa = {
{
"DejaVu Sans Book 20",
"DejaVuSans20",
"DejaVuSans20_aa",
20, /* width */
21, /* height */
6, /* min x advance */
@ -356,24 +356,24 @@ const struct mf_rlefont_s mf_rlefont_phpr8HlMQ = {
&mf_rlefont_render_character,
},
4, /* version */
mf_rlefont_phpr8HlMQ_dictionary_data,
mf_rlefont_phpr8HlMQ_dictionary_offsets,
mf_rlefont_DejaVuSans24_aa_dictionary_data,
mf_rlefont_DejaVuSans24_aa_dictionary_offsets,
107, /* rle dict count */
155, /* total dict count */
1, /* char range count */
mf_rlefont_phpr8HlMQ_char_ranges,
mf_rlefont_DejaVuSans24_aa_char_ranges,
};
#ifdef MF_INCLUDED_FONTS
/* List entry for searching fonts by name. */
static const struct mf_font_list_s mf_rlefont_phpr8HlMQ_listentry = {
static const struct mf_font_list_s mf_rlefont_DejaVuSans24_aa_listentry = {
MF_INCLUDED_FONTS,
(struct mf_font_s*)&mf_rlefont_phpr8HlMQ
(struct mf_font_s*)&mf_rlefont_DejaVuSans24_aa
};
#undef MF_INCLUDED_FONTS
#define MF_INCLUDED_FONTS (&mf_rlefont_phpr8HlMQ_listentry)
#define MF_INCLUDED_FONTS (&mf_rlefont_DejaVuSans24_aa_listentry)
#endif
/* End of automatically generated font definition for phpr8HlMQ. */
/* End of automatically generated font definition for DejaVuSans24_aa. */