colorlcd: some utf8 fixes

This commit is contained in:
Raphael Coeffic
2022-06-11 15:38:08 +02:00
committed by Raphael Coeffic
parent d5c737b042
commit 98194b0142
19 changed files with 14665 additions and 2367 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+585 -200
View File
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 9 px
* Bpp: 4
* Opts: --no-prefilter --bpp 4 --size 9 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_9.c --force-fast-kern-format
* Opts: --no-prefilter --bpp 4 --size 9 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xC0-0xFF --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_9.c --force-fast-kern-format
******************************************************************************/
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
@@ -557,42 +557,334 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+00B0 "°" */
0x19, 0x56, 0x39, 0x19, 0x50,
/* U+00C0 "À" */
0x1, 0x50, 0xe, 0xa2, 0x0, 0xd2, 0xe0, 0x1a,
0xec, 0x1, 0x23, 0x41, 0x0, 0x28, 0x4e, 0x0,
0x1d, 0x76, 0xd0, 0x56, 0x0, 0x41, 0xd9, 0x0,
0x12, 0x40,
/* U+00C1 "Á" */
0x0, 0x98, 0x40, 0x23, 0x80, 0xd, 0x2e, 0x1,
0xae, 0xc0, 0x12, 0x34, 0x10, 0x2, 0x84, 0xe0,
0x1, 0xd7, 0x6d, 0x5, 0x60, 0x4, 0x1d, 0x90,
0x1, 0x24,
/* U+00C2 "Â" */
0x0, 0x19, 0x80, 0x21, 0x99, 0x0, 0x69, 0x70,
0xd, 0x76, 0x0, 0x91, 0xa0, 0x80, 0x14, 0x27,
0x0, 0xe, 0xbb, 0x68, 0x2b, 0x0, 0x20, 0xec,
0x80, 0x9, 0x20,
/* U+00C3 "Ã" */
0x3, 0x99, 0x18, 0x5, 0x2e, 0x1, 0xae, 0xc0,
0x12, 0x34, 0x10, 0x2, 0x84, 0xe0, 0x1, 0xd7,
0x6d, 0x5, 0x60, 0x4, 0x1d, 0x90, 0x1, 0x24,
/* U+00C4 "Ä" */
0x5, 0x53, 0x18, 0x5, 0x2e, 0x1, 0xae, 0xc0,
0x12, 0x34, 0x10, 0x2, 0x84, 0xe0, 0x1, 0xd7,
0x6d, 0x5, 0x60, 0x4, 0x1d, 0x90, 0x1, 0x24,
/* U+00C5 "Å" */
0x0, 0x32, 0x80, 0x66, 0x50, 0xd, 0x2e, 0x1,
0xae, 0xc0, 0x12, 0x34, 0x10, 0x2, 0x84, 0xe0,
0x1, 0xd7, 0x6d, 0x5, 0x60, 0x4, 0x1d, 0x90,
0x1, 0x24,
/* U+00C6 "Æ" */
0x0, 0xcf, 0xf7, 0x6a, 0x0, 0xc3, 0x9a, 0x1,
0xf4, 0xbe, 0x0, 0x78, 0xb8, 0x32, 0xec, 0xc0,
0x15, 0x40, 0x58, 0x80, 0x63, 0xfd, 0xce, 0x10,
0xd, 0x8a, 0x0, 0xab, 0xb8, 0x80,
/* U+00C7 "Ç" */
0x6, 0xcb, 0x80, 0x2c, 0x0, 0x51, 0xb3, 0x80,
0x4, 0x4e, 0xc0, 0x19, 0x9c, 0x0, 0x22, 0x2c,
0x0, 0x51, 0x82, 0xe6, 0x1c, 0x2, 0x39, 0x0,
0xc7, 0x20, 0x0,
/* U+00C8 "È" */
0x3, 0x30, 0x6, 0xb0, 0x2, 0x75, 0xda, 0x12,
0x40, 0x24, 0x90, 0x9, 0x3a, 0xec, 0x88, 0x90,
0x9, 0x24, 0x2, 0x4e, 0xbb, 0x48,
/* U+00C9 "É" */
0x0, 0x98, 0x2, 0x75, 0x4, 0xeb, 0xb4, 0x24,
0x80, 0x49, 0x20, 0x12, 0x75, 0xd9, 0x11, 0x20,
0x12, 0x48, 0x4, 0x9d, 0x76, 0x90,
/* U+00CA "Ê" */
0x0, 0x28, 0x80, 0x12, 0x24, 0x13, 0xae, 0xd0,
0x92, 0x1, 0x24, 0x80, 0x49, 0xd7, 0x64, 0x44,
0x80, 0x49, 0x20, 0x12, 0x75, 0xda, 0x40,
/* U+00CB "Ë" */
0x8, 0x29, 0x14, 0xeb, 0xb4, 0x24, 0x80, 0x49,
0x20, 0x12, 0x75, 0xd9, 0x11, 0x20, 0x12, 0x48,
0x4, 0x9d, 0x76, 0x90,
/* U+00CC "Ì" */
0x7, 0x0, 0x33, 0x0, 0xe8, 0xe, 0x80, 0xe8,
0xe, 0x80, 0xe8, 0xe, 0x80, 0xe8,
/* U+00CD "Í" */
0x4, 0x30, 0xa0, 0x3a, 0x3, 0xa0, 0x3a, 0x3,
0xa0, 0x3a, 0x3, 0xa0, 0x3a, 0x0,
/* U+00CE "Î" */
0x1, 0x50, 0x5, 0x41, 0x81, 0xd0, 0x0, 0xe8,
0x0, 0x74, 0x0, 0x3a, 0x0, 0x1d, 0x0, 0xe,
0x80, 0x7, 0x40,
/* U+00CF "Ï" */
0x19, 0x27, 0x3, 0xa0, 0x1, 0xd0, 0x0, 0xe8,
0x0, 0x74, 0x0, 0x3a, 0x0, 0x1d, 0x0, 0xe,
0x80,
/* U+00D0 "Ð" */
0x2e, 0xbc, 0x40, 0x2b, 0x0, 0x60, 0x95, 0x80,
0x19, 0x97, 0xd2, 0xa, 0xe5, 0x60, 0x7, 0x62,
0xb0, 0x6, 0x9, 0x75, 0xe2, 0x0,
/* U+00D1 "Ñ" */
0x1, 0x99, 0x28, 0x26, 0x80, 0xa, 0x93, 0xdc,
0xa, 0x92, 0x74, 0x4a, 0x92, 0x52, 0x8a, 0x92,
0x42, 0x9e, 0x92, 0x40, 0x7a, 0x92, 0x40, 0xf,
0x40,
/* U+00D2 "Ò" */
0x0, 0x30, 0x7, 0x42, 0x0, 0x4b, 0x98, 0x70,
0x2c, 0x0, 0x52, 0x33, 0x80, 0x12, 0x5d, 0x40,
0x5, 0x4c, 0xe0, 0x4, 0x92, 0xc0, 0x5, 0x20,
0x2e, 0x62, 0x0,
/* U+00D3 "Ó" */
0x0, 0x94, 0x80, 0x21, 0xa0, 0x9, 0x73, 0xe,
0x5, 0x80, 0xa, 0x46, 0x70, 0x2, 0x4b, 0xa8,
0x0, 0xa9, 0x9c, 0x0, 0x92, 0x58, 0x0, 0xa4,
0x5, 0xcc, 0x40, 0x0,
/* U+00D4 "Ô" */
0x0, 0x12, 0x0, 0x6a, 0x82, 0x0, 0x2e, 0x61,
0xc0, 0xb0, 0x1, 0x48, 0xce, 0x0, 0x49, 0x75,
0x0, 0x15, 0x33, 0x80, 0x12, 0x4b, 0x0, 0x14,
0x80, 0xb9, 0x88, 0x0,
/* U+00D5 "Õ" */
0x2, 0x99, 0x20, 0x1, 0x73, 0xe, 0x5, 0x80,
0xa, 0x46, 0x70, 0x2, 0x4b, 0xa8, 0x0, 0xa9,
0x9c, 0x0, 0x92, 0x58, 0x0, 0xa4, 0x5, 0xcc,
0x40, 0x0,
/* U+00D6 "Ö" */
0x2, 0x74, 0x60, 0x2, 0xe6, 0x1c, 0xb, 0x0,
0x14, 0x8c, 0xe0, 0x4, 0x97, 0x50, 0x1, 0x53,
0x38, 0x1, 0x24, 0xb0, 0x1, 0x48, 0xb, 0x98,
0x80,
/* U+00D7 "×" */
0x0, 0xe5, 0x70, 0xb1, 0x9, 0xd5, 0x0, 0x56,
0x30, 0x2b, 0x85, 0x10, 0x7, 0x0,
/* U+00D8 "Ø" */
0x5, 0xcc, 0x53, 0x16, 0x0, 0x39, 0x19, 0xc1,
0xdd, 0x2e, 0xa3, 0x5, 0x4a, 0xf0, 0x29, 0x23,
0xac, 0x14, 0x81, 0x79, 0x88, 0x1, 0x30, 0xc,
/* U+00D9 "Ù" */
0x1, 0x50, 0xe, 0xa2, 0x0, 0x33, 0x80, 0x25,
0x19, 0xc0, 0x12, 0x8c, 0xe0, 0x9, 0x46, 0x70,
0x4, 0xa3, 0x38, 0x2, 0x4c, 0xd4, 0x0, 0xc1,
0x8, 0xbc, 0x60,
/* U+00DA "Ú" */
0x0, 0x98, 0x40, 0x23, 0x80, 0x3, 0x38, 0x2,
0x51, 0x9c, 0x1, 0x28, 0xce, 0x0, 0x94, 0x67,
0x0, 0x4a, 0x33, 0x80, 0x24, 0xcd, 0x40, 0xc,
0x10, 0x8b, 0xc6, 0x0,
/* U+00DB "Û" */
0x0, 0x21, 0x0, 0x45, 0x32, 0x0, 0x33, 0x80,
0x25, 0x19, 0xc0, 0x12, 0x8c, 0xe0, 0x9, 0x46,
0x70, 0x4, 0xa3, 0x38, 0x2, 0x4c, 0xd4, 0x0,
0xc1, 0x8, 0xbc, 0x60,
/* U+00DC "Ü" */
0x5, 0x53, 0x98, 0x33, 0x80, 0x25, 0x19, 0xc0,
0x12, 0x8c, 0xe0, 0x9, 0x46, 0x70, 0x4, 0xa3,
0x38, 0x2, 0x4c, 0xd4, 0x0, 0xc1, 0x8, 0xbc,
0x60,
/* U+00DD "Ý" */
0x0, 0x98, 0x3, 0x3a, 0x80, 0x2d, 0x0, 0x1a,
0x27, 0x80, 0xd2, 0x0, 0xa4, 0xd1, 0x0, 0x1f,
0xc0, 0x6, 0xc2, 0x0, 0xd6, 0x20, 0x1a, 0xc4,
0x0,
/* U+00DE "Þ" */
0x48, 0x0, 0x92, 0x0, 0x24, 0xda, 0xa1, 0x24,
0x0, 0xe2, 0x40, 0xe, 0x26, 0xd5, 0x9, 0x20,
0x2,
/* U+00DF "ß" */
0xb, 0xb4, 0x2, 0xc0, 0x68, 0x33, 0xa, 0xc1,
0x98, 0xb2, 0xc, 0xc0, 0xa6, 0x68, 0x1, 0xac,
0xca, 0xa4, 0x0,
/* U+00E0 "à" */
0x6, 0x70, 0xc, 0x60, 0x1, 0xab, 0xa0, 0x23,
0xa, 0x30, 0x99, 0x69, 0xbb, 0x5, 0x19, 0xb2,
0xec, 0x80,
/* U+00E1 "á" */
0x0, 0x2c, 0x0, 0x46, 0x1, 0x55, 0xd0, 0x12,
0x5, 0x18, 0x4c, 0xb4, 0xdd, 0x82, 0x8c, 0xd9,
0x76, 0x40,
/* U+00E2 "â" */
0x3, 0xb3, 0x0, 0x18, 0x18, 0x2, 0xae, 0x80,
0x90, 0x28, 0xc2, 0x65, 0xa6, 0xec, 0x14, 0x66,
0xcb, 0xb2, 0x0,
/* U+00E3 "ã" */
0x0, 0xf4, 0x54, 0x80, 0x7d, 0x57, 0x40, 0x48,
0x14, 0x61, 0x32, 0xd3, 0x76, 0xa, 0x33, 0x65,
0xd9, 0x0,
/* U+00E4 "ä" */
0xa, 0xa, 0x0, 0xfa, 0xae, 0x80, 0x90, 0x28,
0xc2, 0x65, 0xa6, 0xec, 0x14, 0x66, 0xcb, 0xb2,
0x0,
/* U+00E5 "å" */
0x1, 0x72, 0x0, 0x29, 0x38, 0x0, 0x5c, 0x80,
0x15, 0x74, 0x4, 0x81, 0x46, 0x13, 0x2d, 0x37,
0x60, 0xa3, 0x36, 0x5d, 0x90,
/* U+00E6 "æ" */
0x2b, 0xb4, 0xd5, 0xc0, 0x21, 0x86, 0x28, 0x51,
0x12, 0xa9, 0xd5, 0x4b, 0x39, 0x40, 0xb4, 0x0,
0x93, 0x2d, 0xea, 0x96, 0x0,
/* U+00E7 "ç" */
0xa, 0xba, 0x6, 0x60, 0x29, 0xc9, 0x80, 0x4c,
0xc0, 0x42, 0xa, 0xba, 0x0, 0xac, 0x40, 0x2a,
0x10,
/* U+00E8 "è" */
0x7, 0x60, 0xc, 0x80, 0x14, 0xdd, 0x3, 0x38,
0x42, 0x4e, 0x5d, 0x95, 0x98, 0x2, 0x0, 0xab,
0xa1,
/* U+00E9 "é" */
0x0, 0x33, 0x0, 0x23, 0x0, 0xa6, 0xe8, 0x19,
0xc2, 0x12, 0x72, 0xec, 0xac, 0xc0, 0x10, 0x5,
0x5d, 0x8,
/* U+00EA "ê" */
0x3, 0xb3, 0x0, 0x18, 0x10, 0x2, 0x6e, 0x81,
0x9c, 0x21, 0x27, 0x2e, 0xca, 0xcc, 0x1, 0x0,
0x55, 0xd0, 0x80,
/* U+00EB "ë" */
0xa, 0xa, 0x0, 0xfa, 0x6e, 0x81, 0x9c, 0x21,
0x27, 0x2e, 0xca, 0xcc, 0x1, 0x0, 0x55, 0xd0,
0x80,
/* U+00EC "ì" */
0xb, 0x10, 0x12, 0x5, 0x80, 0x58, 0x5, 0x80,
0x58, 0x5, 0x80,
/* U+00ED "í" */
0xb, 0x21, 0x20, 0x58, 0x5, 0x80, 0x58, 0x5,
0x80, 0x58, 0x0,
/* U+00EE "î" */
0x8, 0x90, 0x1, 0x8, 0x81, 0x60, 0x0, 0xb0,
0x0, 0x58, 0x0, 0x2c, 0x0, 0x16, 0x0,
/* U+00EF "ï" */
0x27, 0x46, 0x0, 0xe5, 0x80, 0x2, 0xc0, 0x1,
0x60, 0x0, 0xb0, 0x0, 0x58, 0x0,
/* U+00F0 "ð" */
0x5, 0x20, 0x9, 0x37, 0x4, 0x5, 0xf0, 0x81,
0xae, 0xd0, 0x74, 0x7, 0x4c, 0xc0, 0x2a, 0x49,
0x5, 0x70, 0x8b, 0xa0,
/* U+00F1 "ñ" */
0x0, 0xf4, 0xd4, 0x80, 0x79, 0xae, 0xd8, 0x2d,
0x1, 0xa, 0xcc, 0x7, 0x56, 0x60, 0x3a, 0xb3,
0x1, 0xd4,
/* U+00F2 "ò" */
0x6, 0x70, 0xc, 0x80, 0x15, 0x5d, 0xb, 0x38,
0x2c, 0x49, 0x80, 0xdb, 0x30, 0x16, 0x2, 0xae,
0xc0,
/* U+00F3 "ó" */
0x0, 0x33, 0x80, 0x46, 0x1, 0x55, 0xd0, 0xb3,
0x82, 0xc4, 0x98, 0xd, 0xb3, 0x1, 0x60, 0x2a,
0xec, 0x0,
/* U+00F4 "ô" */
0x3, 0xb3, 0x0, 0x18, 0x18, 0x2, 0xae, 0x85,
0x9c, 0x16, 0x24, 0xc0, 0x6d, 0x98, 0xb, 0x1,
0x57, 0x60,
/* U+00F5 "õ" */
0x0, 0xf4, 0xd4, 0x80, 0x7d, 0x57, 0x42, 0xce,
0xb, 0x12, 0x60, 0x36, 0xcc, 0x5, 0x80, 0xab,
0xb0, 0x0,
/* U+00F6 "ö" */
0xa, 0xa, 0x0, 0xfa, 0xae, 0x85, 0x9c, 0x16,
0x24, 0xc0, 0x6d, 0x98, 0xb, 0x1, 0x57, 0x60,
/* U+00F7 "÷" */
0x0, 0x58, 0x7, 0xd3, 0xbb, 0x48, 0x7, 0xd6,
0x0,
/* U+00F8 "ø" */
0x0, 0x88, 0x42, 0xaf, 0x81, 0x9c, 0xea, 0x20,
0x70, 0x56, 0xd2, 0xaa, 0x80, 0xdb, 0xb0, 0x1,
0x0, 0x20,
/* U+00F9 "ù" */
0x6, 0x60, 0x6, 0x30, 0x3, 0x30, 0x1d, 0x59,
0x80, 0xea, 0xcc, 0x7, 0x55, 0x38, 0x42, 0x8e,
0x5e, 0x28,
/* U+00FA "ú" */
0x0, 0x3b, 0x0, 0x46, 0x0, 0x66, 0x3, 0xab,
0x30, 0x1d, 0x59, 0x80, 0xea, 0xa7, 0x8, 0x51,
0xcb, 0xc5,
/* U+00FB "û" */
0x3, 0xb3, 0x0, 0x10, 0x10, 0x33, 0x1, 0xd5,
0x98, 0xe, 0xac, 0xc0, 0x75, 0x53, 0x84, 0x28,
0xe5, 0xe2, 0x80,
/* U+00FC "ü" */
0xa, 0xa, 0x0, 0xf3, 0x30, 0x1d, 0x59, 0x80,
0xea, 0xcc, 0x7, 0x55, 0x38, 0x42, 0x8e, 0x5e,
0x28,
/* U+00FD "ý" */
0x0, 0x51, 0x80, 0x44, 0x0, 0xb2, 0xd, 0x6,
0x72, 0xa0, 0x1c, 0x75, 0x0, 0x5e, 0x80, 0x4b,
0x40, 0x13, 0x28, 0x1, 0xec, 0x2,
/* U+00FE "þ" */
0x57, 0x0, 0x95, 0xc0, 0x25, 0xcb, 0xc1, 0x58,
0x5, 0x85, 0x70, 0x2a, 0x58, 0x5, 0x85, 0xca,
0xc1, 0x57, 0x0, 0x95, 0xc0, 0x20,
/* U+00FF "ÿ" */
0x19, 0x28, 0x0, 0xf5, 0x90, 0x68, 0x33, 0x95,
0x0, 0xe3, 0xa8, 0x2, 0xf4, 0x2, 0x5a, 0x0,
0x99, 0x40, 0xf, 0x60, 0x10,
/* U+2022 "•" */
0x3e, 0x33, 0x71, 0x80,
@@ -1103,90 +1395,146 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 1890, .adv_w = 144, .box_w = 8, .box_h = 8, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1918, .adv_w = 144, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1939, .adv_w = 54, .box_w = 3, .box_h = 3, .ofs_x = 0, .ofs_y = 4},
{.bitmap_index = 1944, .adv_w = 94, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 1968, .adv_w = 99, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 1993, .adv_w = 93, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2018, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2037, .adv_w = 78, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2054, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2070, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2087, .adv_w = 49, .box_w = 3, .box_h = 2, .ofs_x = 0, .ofs_y = 2},
{.bitmap_index = 2091, .adv_w = 144, .box_w = 10, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 2135, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2165, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2200, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2227, .adv_w = 99, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2252, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2292, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2330, .adv_w = 162, .box_w = 11, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2376, .adv_w = 144, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 2413, .adv_w = 162, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2444, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2482, .adv_w = 72, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2499, .adv_w = 108, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2522, .adv_w = 162, .box_w = 11, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2565, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2591, .adv_w = 99, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2622, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 2648, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2677, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2713, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2735, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 2761, .adv_w = 126, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 2795, .adv_w = 90, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2819, .adv_w = 90, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2844, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2871, .adv_w = 126, .box_w = 8, .box_h = 3, .ofs_x = 0, .ofs_y = 2},
{.bitmap_index = 2879, .adv_w = 162, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2917, .adv_w = 180, .box_w = 13, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 2970, .adv_w = 162, .box_w = 12, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 3016, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3054, .adv_w = 126, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 3073, .adv_w = 126, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 3092, .adv_w = 180, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3136, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3150, .adv_w = 144, .box_w = 10, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3188, .adv_w = 144, .box_w = 10, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 3226, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3261, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3297, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3328, .adv_w = 126, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3348, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3371, .adv_w = 90, .box_w = 7, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 3401, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3439, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3469, .adv_w = 162, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3504, .adv_w = 144, .box_w = 11, .box_h = 11, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 3544, .adv_w = 108, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3569, .adv_w = 180, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3611, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3639, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3669, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3700, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3729, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3756, .adv_w = 180, .box_w = 12, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3791, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3831, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3867, .adv_w = 144, .box_w = 10, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 3906, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3945, .adv_w = 108, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3972, .adv_w = 145, .box_w = 10, .box_h = 7, .ofs_x = 0, .ofs_y = 0}
{.bitmap_index = 1944, .adv_w = 94, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 1970, .adv_w = 94, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 1996, .adv_w = 94, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2023, .adv_w = 94, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2047, .adv_w = 94, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2071, .adv_w = 94, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2097, .adv_w = 135, .box_w = 10, .box_h = 7, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 2127, .adv_w = 94, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2154, .adv_w = 82, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2176, .adv_w = 82, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2198, .adv_w = 82, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2221, .adv_w = 82, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2241, .adv_w = 39, .box_w = 3, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 2255, .adv_w = 39, .box_w = 3, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2269, .adv_w = 39, .box_w = 4, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 2288, .adv_w = 39, .box_w = 4, .box_h = 8, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 2305, .adv_w = 97, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2327, .adv_w = 103, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2352, .adv_w = 99, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2379, .adv_w = 99, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2407, .adv_w = 99, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2435, .adv_w = 99, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2461, .adv_w = 99, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2486, .adv_w = 77, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2500, .adv_w = 99, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 2524, .adv_w = 93, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2551, .adv_w = 93, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2579, .adv_w = 93, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2607, .adv_w = 93, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2632, .adv_w = 86, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2657, .adv_w = 85, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2674, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2693, .adv_w = 78, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2711, .adv_w = 78, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2729, .adv_w = 78, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2748, .adv_w = 78, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2766, .adv_w = 78, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2783, .adv_w = 78, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2804, .adv_w = 122, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2825, .adv_w = 75, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 2842, .adv_w = 76, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2859, .adv_w = 76, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2877, .adv_w = 76, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2896, .adv_w = 76, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2913, .adv_w = 36, .box_w = 3, .box_h = 7, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 2924, .adv_w = 36, .box_w = 3, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2935, .adv_w = 36, .box_w = 4, .box_h = 7, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 2950, .adv_w = 36, .box_w = 4, .box_h = 7, .ofs_x = -1, .ofs_y = 0},
{.bitmap_index = 2964, .adv_w = 84, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 2984, .adv_w = 79, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3002, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3019, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3037, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3055, .adv_w = 82, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3073, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3089, .adv_w = 82, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 3098, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3116, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3134, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3152, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3171, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3188, .adv_w = 68, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3210, .adv_w = 83, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3232, .adv_w = 68, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3253, .adv_w = 49, .box_w = 3, .box_h = 2, .ofs_x = 0, .ofs_y = 2},
{.bitmap_index = 3257, .adv_w = 144, .box_w = 10, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 3301, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3331, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3366, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3393, .adv_w = 99, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3418, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3458, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3496, .adv_w = 162, .box_w = 11, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3542, .adv_w = 144, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 3579, .adv_w = 162, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3610, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3648, .adv_w = 72, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3665, .adv_w = 108, .box_w = 7, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3688, .adv_w = 162, .box_w = 11, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3731, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 3757, .adv_w = 99, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3788, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 3814, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 3843, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3879, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3901, .adv_w = 126, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -1},
{.bitmap_index = 3927, .adv_w = 126, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = -1},
{.bitmap_index = 3961, .adv_w = 90, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 3985, .adv_w = 90, .box_w = 6, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4010, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4037, .adv_w = 126, .box_w = 8, .box_h = 3, .ofs_x = 0, .ofs_y = 2},
{.bitmap_index = 4045, .adv_w = 162, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4083, .adv_w = 180, .box_w = 13, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4136, .adv_w = 162, .box_w = 12, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4182, .adv_w = 144, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4220, .adv_w = 126, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 4239, .adv_w = 126, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 1},
{.bitmap_index = 4258, .adv_w = 180, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4302, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4316, .adv_w = 144, .box_w = 10, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4354, .adv_w = 144, .box_w = 10, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4392, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4427, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4463, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4494, .adv_w = 126, .box_w = 8, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4514, .adv_w = 144, .box_w = 9, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4537, .adv_w = 90, .box_w = 7, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4567, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4605, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4635, .adv_w = 162, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4670, .adv_w = 144, .box_w = 11, .box_h = 11, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 4710, .adv_w = 108, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4735, .adv_w = 180, .box_w = 12, .box_h = 9, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4777, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4805, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4835, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4866, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4895, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 4922, .adv_w = 180, .box_w = 12, .box_h = 8, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 4957, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 4997, .adv_w = 126, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5033, .adv_w = 144, .box_w = 10, .box_h = 10, .ofs_x = -1, .ofs_y = -2},
{.bitmap_index = 5072, .adv_w = 180, .box_w = 12, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 5111, .adv_w = 108, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 5138, .adv_w = 145, .box_w = 10, .box_h = 7, .ofs_x = 0, .ofs_y = 0}
};
/*---------------------
* CHARACTER MAPPING
*--------------------*/
static const uint16_t unicode_list_2[] = {
0x0, 0x14, 0x26, 0x2c, 0x2f, 0x34, 0x46, 0x4c,
0x1f72, 0xef51, 0xef58, 0xef5b, 0xef5c, 0xef5d, 0xef61, 0xef63,
0xef65, 0xef69, 0xef6c, 0xef71, 0xef76, 0xef77, 0xef78, 0xef8e,
0xef93, 0xef98, 0xef9b, 0xef9c, 0xef9d, 0xefa1, 0xefa2, 0xefa3,
0xefa4, 0xefb7, 0xefb8, 0xefbe, 0xefc0, 0xefc1, 0xefc4, 0xefc7,
0xefc8, 0xefc9, 0xefcb, 0xefe3, 0xefe5, 0xf014, 0xf015, 0xf017,
0xf019, 0xf030, 0xf037, 0xf03a, 0xf043, 0xf06c, 0xf074, 0xf0ab,
0xf13b, 0xf190, 0xf191, 0xf192, 0xf193, 0xf194, 0xf1d7, 0xf1e3,
0xf23d, 0xf254, 0xf4aa, 0xf712, 0xf7f2
static const uint16_t unicode_list_4[] = {
0x0, 0xcfdf, 0xcfe6, 0xcfe9, 0xcfea, 0xcfeb, 0xcfef, 0xcff1,
0xcff3, 0xcff7, 0xcffa, 0xcfff, 0xd004, 0xd005, 0xd006, 0xd01c,
0xd021, 0xd026, 0xd029, 0xd02a, 0xd02b, 0xd02f, 0xd030, 0xd031,
0xd032, 0xd045, 0xd046, 0xd04c, 0xd04e, 0xd04f, 0xd052, 0xd055,
0xd056, 0xd057, 0xd059, 0xd071, 0xd073, 0xd0a2, 0xd0a3, 0xd0a5,
0xd0a7, 0xd0be, 0xd0c5, 0xd0c8, 0xd0d1, 0xd0fa, 0xd102, 0xd139,
0xd1c9, 0xd21e, 0xd21f, 0xd220, 0xd221, 0xd222, 0xd265, 0xd271,
0xd2cb, 0xd2e2, 0xd538, 0xd7a0, 0xd880
};
/*Collect the unicode lists and glyph_id offsets*/
@@ -1201,8 +1549,16 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
},
{
.range_start = 176, .range_length = 63475, .glyph_id_start = 117,
.unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 69, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.range_start = 176, .range_length = 1, .glyph_id_start = 117,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
},
{
.range_start = 192, .range_length = 64, .glyph_id_start = 118,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
},
{
.range_start = 8226, .range_length = 55425, .glyph_id_start = 182,
.unicode_list = unicode_list_4, .glyph_id_ofs_list = NULL, .list_length = 61, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@@ -1228,8 +1584,15 @@ static const uint8_t kern_left_class_mapping[] =
37, 38, 36, 39, 40, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 6, 9,
13, 0, 26, 33, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 6, 6,
6, 6, 6, 6, 0, 8, 10, 10,
10, 10, 12, 12, 12, 12, 9, 12,
9, 9, 9, 9, 9, 0, 0, 13,
13, 13, 13, 23, 0, 0, 26, 26,
26, 26, 26, 26, 0, 28, 29, 29,
29, 29, 0, 0, 0, 0, 0, 31,
33, 33, 33, 33, 33, 0, 0, 0,
0, 0, 0, 36, 27, 36, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -1237,7 +1600,7 @@ static const uint8_t kern_left_class_mapping[] =
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0
0, 0, 0
};
/*Map glyph_ids to kern right classes*/
@@ -1257,8 +1620,15 @@ static const uint8_t kern_right_class_mapping[] =
32, 33, 31, 34, 0, 0, 35, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 10, 11,
15, 0, 22, 26, 30, 36, 0, 0,
0, 0, 0, 0, 0, 0, 10, 10,
10, 10, 10, 10, 36, 11, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
11, 11, 11, 11, 11, 0, 11, 15,
15, 15, 15, 19, 0, 0, 22, 22,
22, 22, 22, 22, 37, 23, 23, 23,
23, 23, 0, 0, 0, 0, 0, 25,
26, 26, 26, 26, 26, 0, 38, 30,
30, 30, 30, 31, 0, 31, 39, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -1266,7 +1636,7 @@ static const uint8_t kern_right_class_mapping[] =
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0
0, 0, 0
};
/*Kern values between classes*/
@@ -1276,180 +1646,195 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0, -3, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -8, 0, 0,
0, 0, 0, 0, 0, -8, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -4, -4, 0, -1, -4, 0, -6,
0, 0, 0, 1, 0, 0, 0, 0,
-8, 0, 0, 0, 0, 0, 0, 0,
-8, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, -4, -4, 0, -1,
-4, 0, -6, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1,
1, 0, 2, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -12, 0, 0,
0, 0, 0, 0, 0, 1, 1, 0,
2, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -12, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, -16,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, -16, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -8, 0, 0,
0, 0, 0, 0, -4, 0, -1, 0,
0, -9, -1, -6, -5, 0, -7, 0,
0, 0, 0, 0, 0, -1, 0, 0,
-1, -1, -4, -2, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -2, 0, -2,
0, 0, -4, 0, 0, 0, 0, 0,
0, 0, 0, 0, -8, 0, 0, 0,
0, 0, 0, -4, 0, -1, 0, 0,
-9, -1, -6, -5, 0, -7, 0, 0,
0, 0, 0, 0, -1, 0, 0, -1,
-1, -4, -2, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, -2,
0, -2, 0, 0, -4, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -2, 0, 0, 0, 0, 0, 0,
-1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, -2, 0, 0, 0,
0, 0, 0, 0, 0, 0, -2, 0,
0, 0, 0, 0, 0, -1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, -1, 0, 0, 0, 0,
0, 0, 0, 0, 0, -7, 0, 0,
0, -1, 0, 0, 0, -2, 0, -2,
0, -2, -3, -2, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, -2, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, -1, -1, 0,
-1, 0, 0, 0, -1, -2, -2, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 1, 0, 0, 0, 0, 0, 0,
0, 0, -1, -1, 0, -1, 0, 0,
0, -1, -2, -2, 0, 0, 0, 0,
0, 0, 0, 0, 0, -16, 0, 0,
0, -12, 0, -19, 0, 1, 0, 0,
0, 0, 0, 0, 0, -2, -1, 0,
0, -1, -2, 0, 0, -2, -2, 0,
0, 0, 0, -16, 0, 0, 0, -12,
0, -19, 0, 1, 0, 0, 0, 0,
0, 0, 0, -2, -1, 0, 0, -1,
-2, 0, 0, -2, -2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 0,
0, -2, 0, 0, 0, 1, -2, 0,
0, 0, 0, 0, 0, 0, 1, 0,
0, 0, -2, 0, 0, 0, 1, -2,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -2, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -2, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -4, 0, 0, 0, -2, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -2, 0, -2, -2, 0, 0,
0, -2, -3, -4, 0, 0, 0, 0,
0, -24, 0, 0, 0, 0, 0, 0,
0, 1, -5, 0, 0, -19, -4, -12,
-10, 0, -17, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -3, -9, -6,
0, -4, 0, 0, 0, -2, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -23, 0, 0, 0, -10, 0, -14,
0, 0, 0, 0, 0, -2, 0, -2,
0, -1, -1, 0, 0, -1, 0, 0,
1, 0, 1, 0, 0, 0, 0, 0,
0, -2, 0, -2, -2, 0, 0, 0,
-2, -3, -4, 0, 0, 0, 0, 0,
0, 0, 0, -24, 0, 0, 0, 0,
0, 0, 0, 1, -5, 0, 0, -19,
-4, -12, -10, 0, -17, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, -3,
-9, -6, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -23, 0,
0, 0, -10, 0, -14, 0, 0, 0,
0, 0, -2, 0, -2, 0, -1, -1,
0, 0, -1, 0, 0, 1, 0, 1,
0, 0, 0, 0, -7, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -3, 0, -2,
-1, 0, -2, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -6, 0, -1, 0, 0, -3, 0,
0, 0, 0, 0, -6, 0, -1, 0,
0, -3, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -3, 0,
0, 0, 0, -15, -16, 0, 0, -6,
-2, -17, -1, 1, 0, 1, 1, 0,
1, 0, 0, -8, -7, 0, -8, -7,
-5, -8, 0, -7, -5, -4, -5, -4,
0, -13, -8, -7, 0, 0, 0, 0,
1, 0, -16, -3, 0, 0, -5, -1,
0, 0, 0, 0, 0, 0, 0, 0,
-3, 0, 0, 0, 0, -15, -16, 0,
0, -6, -2, -17, -1, 1, 0, 1,
1, 0, 1, 0, 0, -8, -7, 0,
-8, -7, -5, -8, 0, -7, -5, -4,
-5, -4, 0, 0, 0, 0, 0, 1,
0, -16, -3, 0, 0, -5, -1, 0,
0, 1, -3, -3, 0, 0, -3, -2,
0, 0, -2, -1, 0, 0, 0, 1,
0, 0, 0, 0, 0, 0, 0, 1,
0, -9, -4, 0, 0, -3, 0, 0,
0, 1, 0, 0, 0, 0, 0, 0,
1, -2, -2, 0, 0, -2, -1, 0,
0, -1, 0, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
1, -3, -3, 0, 0, -3, -2, 0,
0, -2, -1, 0, 0, 0, 1, 0,
0, 0, 0, 1, 0, -9, -4, 0,
0, -3, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 1, -2, -2, 0,
0, -2, -1, 0, 0, -1, 0, 0,
0, -3, 0, 0, 0, -2, 0, 0,
0, 0, 1, 0, 0, 0, 0, 0,
0, 0, -3, 0, 0, 0, -2, 0,
0, 0, 0, 1, 0, 0, 0, 0,
0, 0, -2, 0, 0, -1, 0, 0,
0, -1, -2, 0, 0, 0, 0, 0,
0, 0, -2, 1, -3, -15, -4, 0,
0, -7, -2, -7, -1, 1, -7, 1,
1, 1, 1, 0, 1, -5, -5, -2,
-3, -5, -3, -4, -2, -3, -1, 0,
-2, -2, 1, -3, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, -2, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -1, 0, 0, -1, 0, 0,
0, -1, -2, -2, 0, 0, 0, 0,
0, -2, 0, 0, -1, 0, 0, 0,
-1, -2, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, -2, 1, -3, -15,
-4, 0, 0, -7, -2, -7, -1, 1,
-7, 1, 1, 1, 1, 0, 1, -5,
-5, -2, -3, -5, -3, -4, -2, -3,
-1, 0, -2, -2, 1, -7, -4, -4,
-3, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, -2, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, -1,
0, 0, -1, 0, 0, 0, -1, -2,
-2, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, -1, 0, 0, -1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -5, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
-5, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -1, 0, 0,
0, 0, 0, 0, 0, 0, 0, -2,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, -1, 0, -1, -1,
0, 0, 0, 0, 0, 0, -1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1,
0, -2, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -1, 0,
-1, -1, 0, 0, 0, -1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -1, 0,
0, 0, 0, 0, 0, 1, 0, 1,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
1, 0, -2, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 0,
0, -7, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, -7, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, -1,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -10, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -1, 0,
-1, -1, 0, 0, 0, 1, 0, 0,
0, -9, 0, 0, 0, 0, 0, 0,
-1, -1, 0, 0, 0, 0, 0, 0,
1, 0, 0, 0, -9, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -3, -1, 1, 0, -1, 0, 0,
4, 0, 1, 1, 0, 0, 0, 0,
0, 0, 0, 0, -3, -1, 1, 0,
-1, 0, 0, 4, 0, 1, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 0,
0, -8, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -1, -1, 1, 0, -1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, -9, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -1, 0, 0, -1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, -1, 0,
0, -1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, -1,
0, 0, -1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 0,
0, 0, -8, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, -1, -1, 1, 0, -1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -9, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, -1, 0, 0, -1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
-1, 0, 0, -1, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, -1, 0, 0, -1,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0
};
@@ -1462,7 +1847,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes =
.left_class_mapping = kern_left_class_mapping,
.right_class_mapping = kern_right_class_mapping,
.left_class_cnt = 40,
.right_class_cnt = 36,
.right_class_cnt = 39,
};
/*--------------------
@@ -1481,7 +1866,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.cmaps = cmaps,
.kern_dsc = &kern_classes,
.kern_scale = 16,
.cmap_num = 3,
.cmap_num = 5,
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 2,
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+7 -2
View File
@@ -9,13 +9,18 @@ SYMBOLS="61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473
EXTRA_FONT="EdgeTX/extra.ttf"
EXTRA_SYM="0x80-0x94"
ASCII="0x20-0x7F"
DEGREE="0xB0"
BULLET="0x2022"
LATIN1="0xC0-0xFF"
function make_font() {
local name=$1
local ttf=$2
local size=$3
lv_font_conv --no-prefilter --bpp 4 --size ${size} \
--font ${TTF_DIR}${ttf} -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC \
--font EdgeTX/extra.ttf -r 0x80-0x94 \
--font ${TTF_DIR}${ttf} -r ${ASCII},${DEGREE},${BULLET},${LATIN1} \
--font EdgeTX/extra.ttf -r ${EXTRA_SYM} \
--font ${SYMBOLS_FONT} -r ${SYMBOLS} \
--format lvgl -o lv_font_${name}_${size}.c --force-fast-kern-format
}
+6 -8
View File
@@ -38,21 +38,19 @@
std::string switchWarninglabel(swsrc_t index)
{
static const char switchPositions[] = {
' ',
CHAR_UP,
'-',
CHAR_DOWN
static const char *switchPositions[] = {
" ",
STR_CHAR_UP,
"-",
STR_CHAR_DOWN,
};
return TEXT_AT_INDEX(STR_VSRCRAW,
(index + MIXSRC_FIRST_SWITCH - MIXSRC_Rud + 1)) +
std::string(
&switchPositions[g_model.switchWarningState >> (3 * index) & 0x07],
1);
switchPositions[g_model.switchWarningState >> (3 * index) & 0x07]);
}
class ChannelFailsafeBargraph: public Window {
public:
ChannelFailsafeBargraph(Window * parent, const rect_t & rect, uint8_t moduleIdx, uint8_t channel):
+4 -4
View File
@@ -48,11 +48,11 @@ class SwitchDynamicLabel: public StaticText {
std::string label()
{
static const char switchPositions[] = {
CHAR_UP,
'-',
CHAR_DOWN
STR_CHAR_UP,
"-",
STR_CHAR_DOWN
};
return TEXT_AT_INDEX(STR_VSRCRAW, (index + MIXSRC_FIRST_SWITCH - MIXSRC_Rud + 1)) + std::string(&switchPositions[lastpos], 1);
return TEXT_AT_INDEX(STR_VSRCRAW, (index + MIXSRC_FIRST_SWITCH - MIXSRC_Rud + 1)) + std::string(switchPositions[lastpos]);
}
void update()
+12 -12
View File
@@ -35,24 +35,24 @@ class SourceChoiceMenuToolbar : public MenuToolbar<SourceChoice>
SourceChoiceMenuToolbar(SourceChoice * choice, Menu * menu):
MenuToolbar<SourceChoice>(choice, menu)
{
addButton(CHAR_INPUT, MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT);
addButton(STR_CHAR_INPUT, MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT);
#if defined(LUA_MODEL_SCRIPTS)
addButton(CHAR_LUA, MIXSRC_LAST_LUA, MIXSRC_FIRST_LUA);
addButton(STR_CHAR_LUA, MIXSRC_LAST_LUA, MIXSRC_FIRST_LUA);
#endif
addButton(CHAR_STICK, MIXSRC_FIRST_STICK, MIXSRC_LAST_STICK);
addButton(CHAR_POT, MIXSRC_FIRST_POT, MIXSRC_LAST_POT);
addButton(CHAR_FUNCTION, MIXSRC_MAX, MIXSRC_MAX);
addButton(STR_CHAR_STICK, MIXSRC_FIRST_STICK, MIXSRC_LAST_STICK);
addButton(STR_CHAR_POT, MIXSRC_FIRST_POT, MIXSRC_LAST_POT);
addButton(STR_CHAR_FUNCTION, MIXSRC_MAX, MIXSRC_MAX);
#if defined(HELI)
addButton(CHAR_CYC, MIXSRC_FIRST_HELI, MIXSRC_LAST_HELI);
addButton(STR_CHAR_CYC, MIXSRC_FIRST_HELI, MIXSRC_LAST_HELI);
#endif
addButton(CHAR_TRIM, MIXSRC_FIRST_TRIM, MIXSRC_LAST_TRIM);
addButton(CHAR_SWITCH, MIXSRC_FIRST_SWITCH, MIXSRC_LAST_SWITCH);
addButton(CHAR_TRAINER, MIXSRC_FIRST_TRAINER, MIXSRC_LAST_TRAINER);
addButton(CHAR_CHANNEL, MIXSRC_FIRST_CH, MIXSRC_LAST_CH);
addButton(STR_CHAR_TRIM, MIXSRC_FIRST_TRIM, MIXSRC_LAST_TRIM);
addButton(STR_CHAR_SWITCH, MIXSRC_FIRST_SWITCH, MIXSRC_LAST_SWITCH);
addButton(STR_CHAR_TRAINER, MIXSRC_FIRST_TRAINER, MIXSRC_LAST_TRAINER);
addButton(STR_CHAR_CHANNEL, MIXSRC_FIRST_CH, MIXSRC_LAST_CH);
#if defined(GVARS)
addButton(CHAR_SLIDER, MIXSRC_LAST_GVAR, MIXSRC_FIRST_GVAR);
addButton(STR_CHAR_SLIDER, MIXSRC_LAST_GVAR, MIXSRC_FIRST_GVAR);
#endif
addButton(CHAR_TELEMETRY, MIXSRC_FIRST_TELEM, MIXSRC_LAST_TELEM);
addButton(STR_CHAR_TELEMETRY, MIXSRC_FIRST_TELEM, MIXSRC_LAST_TELEM);
}
};
+3 -3
View File
@@ -34,9 +34,9 @@ class SwitchChoiceMenuToolbar : public MenuToolbar<SwitchChoice>
SwitchChoiceMenuToolbar(SwitchChoice* choice, Menu* menu) :
MenuToolbar<SwitchChoice>(choice, menu)
{
addButton(CHAR_SWITCH, SWSRC_FIRST_SWITCH, SWSRC_LAST_SWITCH);
addButton(CHAR_TRIM, SWSRC_FIRST_TRIM, SWSRC_LAST_TRIM);
addButton(CHAR_SWITCH, SWSRC_FIRST_LOGICAL_SWITCH,
addButton(STR_CHAR_SWITCH, SWSRC_FIRST_SWITCH, SWSRC_LAST_SWITCH);
addButton(STR_CHAR_TRIM, SWSRC_FIRST_TRIM, SWSRC_LAST_TRIM);
addButton(STR_CHAR_SWITCH, SWSRC_FIRST_LOGICAL_SWITCH,
SWSRC_LAST_LOGICAL_SWITCH);
}
};
+5 -2
View File
@@ -228,12 +228,15 @@ void ViewTextWindow::sdReadTextFileBlock(const char *filename, int &lines_count)
} else if (c != '\\' && escape > 0 && escape < sizeof(escape_chars)) {
escape_chars[escape - 1] = c;
if (escape == 2 && !strncmp(escape_chars, "up", 2)) {
c = CHAR_UP;
lines[current_line - textVerticalOffset][line_length++] = STR_CHAR_UP[0];
c = STR_CHAR_UP[1];
} else if (escape == 2 && !strncmp(escape_chars, "dn", 2)) {
c = CHAR_DOWN;
lines[current_line - textVerticalOffset][line_length++] = STR_CHAR_DOWN[0];
c = STR_CHAR_DOWN[1];
} else if (escape == 3) {
int val = atoi(escape_chars);
if (val >= 200 && val < 225) {
lines[current_line - textVerticalOffset][line_length++] = '\302';
c = '\200' + val - 200;
}
} else {