work with themes
This commit is contained in:
parent
ef55ef2519
commit
ad170a8aa7
@ -1,5 +1,5 @@
|
||||
function (make_font fontSize)
|
||||
execute_process(COMMAND podman run -v /home/marc/rgb_lcd/components/domotic_display/fonts:/app -w /app lvfontconv lv_font_conv --bpp 4 --size ${fontSize} --no-compress --font Montserrat-Medium.ttf --symbols "0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/" --format lvgl -o montserrat_medium_${fontSize}.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575)
|
||||
execute_process(COMMAND podman run -v /home/marc/rgb_lcd/components/domotic_display/fonts:/app -w /app lvfontconv lv_font_conv --bpp 4 --size ${fontSize} --no-compress --font Montserrat-Medium.ttf --symbols "0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/-" --format lvgl -o montserrat_medium_${fontSize}.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575)
|
||||
endfunction()
|
||||
|
||||
make_font(12)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*******************************************************************************
|
||||
* Size: 12 px
|
||||
* Bpp: 4
|
||||
* Opts: --bpp 4 --size 12 --no-compress --font Montserrat-Medium.ttf --symbols 0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/ --format lvgl -o montserrat_medium_12.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575
|
||||
* Opts: --bpp 4 --size 12 --no-compress --font Montserrat-Medium.ttf --symbols 0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/- --format lvgl -o montserrat_medium_12.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||
@ -48,6 +48,9 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
/* U+002C "," */
|
||||
0x18, 0x4, 0xf1, 0xd, 0x3, 0x80,
|
||||
|
||||
/* U+002D "-" */
|
||||
0x4f, 0xfd, 0x2, 0x22,
|
||||
|
||||
/* U+002E "." */
|
||||
0x2a, 0x4, 0xd0,
|
||||
|
||||
@ -556,79 +559,80 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
{.bitmap_index = 49, .adv_w = 65, .box_w = 3, .box_h = 13, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 69, .adv_w = 65, .box_w = 3, .box_h = 13, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 89, .adv_w = 44, .box_w = 3, .box_h = 4, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 95, .adv_w = 44, .box_w = 3, .box_h = 2, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 98, .adv_w = 68, .box_w = 6, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
|
||||
{.bitmap_index = 137, .adv_w = 128, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 173, .adv_w = 71, .box_w = 4, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 191, .adv_w = 110, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 223, .adv_w = 110, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 255, .adv_w = 128, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 291, .adv_w = 110, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 323, .adv_w = 118, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 359, .adv_w = 115, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 391, .adv_w = 124, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 427, .adv_w = 118, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 459, .adv_w = 44, .box_w = 3, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 470, .adv_w = 141, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 515, .adv_w = 145, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 551, .adv_w = 139, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 592, .adv_w = 159, .box_w = 9, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 633, .adv_w = 129, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 665, .adv_w = 122, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 697, .adv_w = 148, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 738, .adv_w = 156, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 774, .adv_w = 60, .box_w = 2, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 783, .adv_w = 98, .box_w = 6, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 810, .adv_w = 138, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 846, .adv_w = 114, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 878, .adv_w = 183, .box_w = 10, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 923, .adv_w = 156, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 959, .adv_w = 161, .box_w = 10, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1004, .adv_w = 139, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1040, .adv_w = 161, .box_w = 10, .box_h = 12, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 1100, .adv_w = 140, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1136, .adv_w = 119, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1168, .adv_w = 113, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1200, .adv_w = 152, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1236, .adv_w = 137, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1281, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1344, .adv_w = 129, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1380, .adv_w = 124, .box_w = 9, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1421, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1457, .adv_w = 115, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1482, .adv_w = 131, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1517, .adv_w = 110, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1542, .adv_w = 131, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1582, .adv_w = 118, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1607, .adv_w = 68, .box_w = 5, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1632, .adv_w = 132, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 1672, .adv_w = 131, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1707, .adv_w = 54, .box_w = 3, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1722, .adv_w = 55, .box_w = 5, .box_h = 13, .ofs_x = -2, .ofs_y = -3},
|
||||
{.bitmap_index = 1755, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1790, .adv_w = 54, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1800, .adv_w = 203, .box_w = 11, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1839, .adv_w = 131, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1864, .adv_w = 122, .box_w = 8, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1892, .adv_w = 131, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 1927, .adv_w = 131, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 1967, .adv_w = 79, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1981, .adv_w = 96, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2002, .adv_w = 79, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2025, .adv_w = 130, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2050, .adv_w = 107, .box_w = 8, .box_h = 7, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 2078, .adv_w = 173, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2117, .adv_w = 106, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2142, .adv_w = 107, .box_w = 8, .box_h = 10, .ofs_x = -1, .ofs_y = -3},
|
||||
{.bitmap_index = 2182, .adv_w = 100, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2203, .adv_w = 80, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 5},
|
||||
{.bitmap_index = 2216, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2251, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2286, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2321, .adv_w = 130, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2356, .adv_w = 216, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 2454, .adv_w = 240, .box_w = 15, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 2537, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}
|
||||
{.bitmap_index = 95, .adv_w = 74, .box_w = 4, .box_h = 2, .ofs_x = 0, .ofs_y = 2},
|
||||
{.bitmap_index = 99, .adv_w = 44, .box_w = 3, .box_h = 2, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 102, .adv_w = 68, .box_w = 6, .box_h = 13, .ofs_x = -1, .ofs_y = -1},
|
||||
{.bitmap_index = 141, .adv_w = 128, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 177, .adv_w = 71, .box_w = 4, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 195, .adv_w = 110, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 227, .adv_w = 110, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 259, .adv_w = 128, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 295, .adv_w = 110, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 327, .adv_w = 118, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 363, .adv_w = 115, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 395, .adv_w = 124, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 431, .adv_w = 118, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 463, .adv_w = 44, .box_w = 3, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 474, .adv_w = 141, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 519, .adv_w = 145, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 555, .adv_w = 139, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 596, .adv_w = 159, .box_w = 9, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 637, .adv_w = 129, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 669, .adv_w = 122, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 701, .adv_w = 148, .box_w = 9, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 742, .adv_w = 156, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 778, .adv_w = 60, .box_w = 2, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 787, .adv_w = 98, .box_w = 6, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 814, .adv_w = 138, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 850, .adv_w = 114, .box_w = 7, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 882, .adv_w = 183, .box_w = 10, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 927, .adv_w = 156, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 963, .adv_w = 161, .box_w = 10, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1008, .adv_w = 139, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1044, .adv_w = 161, .box_w = 10, .box_h = 12, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 1104, .adv_w = 140, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1140, .adv_w = 119, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1172, .adv_w = 113, .box_w = 7, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1204, .adv_w = 152, .box_w = 8, .box_h = 9, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1240, .adv_w = 137, .box_w = 10, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1285, .adv_w = 216, .box_w = 14, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1348, .adv_w = 129, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1384, .adv_w = 124, .box_w = 9, .box_h = 9, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1425, .adv_w = 126, .box_w = 8, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1461, .adv_w = 115, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1486, .adv_w = 131, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1521, .adv_w = 110, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1546, .adv_w = 131, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1586, .adv_w = 118, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1611, .adv_w = 68, .box_w = 5, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1636, .adv_w = 132, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 1676, .adv_w = 131, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1711, .adv_w = 54, .box_w = 3, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1726, .adv_w = 55, .box_w = 5, .box_h = 13, .ofs_x = -2, .ofs_y = -3},
|
||||
{.bitmap_index = 1759, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1794, .adv_w = 54, .box_w = 2, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1804, .adv_w = 203, .box_w = 11, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1843, .adv_w = 131, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1868, .adv_w = 122, .box_w = 8, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1896, .adv_w = 131, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 1931, .adv_w = 131, .box_w = 8, .box_h = 10, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 1971, .adv_w = 79, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1985, .adv_w = 96, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2006, .adv_w = 79, .box_w = 5, .box_h = 9, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2029, .adv_w = 130, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2054, .adv_w = 107, .box_w = 8, .box_h = 7, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 2082, .adv_w = 173, .box_w = 11, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2121, .adv_w = 106, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2146, .adv_w = 107, .box_w = 8, .box_h = 10, .ofs_x = -1, .ofs_y = -3},
|
||||
{.bitmap_index = 2186, .adv_w = 100, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2207, .adv_w = 80, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 5},
|
||||
{.bitmap_index = 2220, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2255, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2290, .adv_w = 118, .box_w = 7, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2325, .adv_w = 130, .box_w = 7, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2360, .adv_w = 216, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 2458, .adv_w = 240, .box_w = 15, .box_h = 11, .ofs_x = 0, .ofs_y = -1},
|
||||
{.bitmap_index = 2541, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = -2}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
@ -637,12 +641,10 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
|
||||
static const uint8_t glyph_id_ofs_list_0[] = {
|
||||
0, 0, 0, 0, 0, 1, 0, 2,
|
||||
3, 4, 0, 0, 5, 0, 6, 7,
|
||||
8, 9, 10, 11, 12, 13, 14, 15,
|
||||
16, 17, 18
|
||||
3, 4
|
||||
};
|
||||
|
||||
static const uint16_t unicode_list_3[] = {
|
||||
static const uint16_t unicode_list_4[] = {
|
||||
0x0, 0x38, 0x39, 0x3a, 0x4b, 0xef65, 0xf012, 0xf4c5
|
||||
};
|
||||
|
||||
@ -650,20 +652,24 @@ static const uint16_t unicode_list_3[] = {
|
||||
static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
{
|
||||
{
|
||||
.range_start = 32, .range_length = 27, .glyph_id_start = 1,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_0, .list_length = 27, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL
|
||||
.range_start = 32, .range_length = 10, .glyph_id_start = 1,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_0, .list_length = 10, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL
|
||||
},
|
||||
{
|
||||
.range_start = 65, .range_length = 26, .glyph_id_start = 20,
|
||||
.range_start = 44, .range_length = 15, .glyph_id_start = 6,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 97, .range_length = 26, .glyph_id_start = 46,
|
||||
.range_start = 65, .range_length = 26, .glyph_id_start = 21,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 176, .range_length = 62662, .glyph_id_start = 72,
|
||||
.unicode_list = unicode_list_3, .glyph_id_ofs_list = NULL, .list_length = 8, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
.range_start = 97, .range_length = 26, .glyph_id_start = 47,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 176, .range_length = 62662, .glyph_id_start = 73,
|
||||
.unicode_list = unicode_list_4, .glyph_id_ofs_list = NULL, .list_length = 8, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
}
|
||||
};
|
||||
|
||||
@ -675,142 +681,152 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
/*Map glyph_ids to kern left classes*/
|
||||
static const uint8_t kern_left_class_mapping[] =
|
||||
{
|
||||
0, 0, 1, 2, 3, 4, 5, 5,
|
||||
6, 7, 0, 8, 9, 10, 11, 12,
|
||||
13, 14, 7, 15, 16, 17, 18, 19,
|
||||
20, 21, 22, 23, 23, 24, 25, 26,
|
||||
23, 23, 19, 27, 28, 29, 30, 31,
|
||||
24, 32, 32, 33, 34, 35, 36, 37,
|
||||
38, 39, 40, 41, 42, 36, 42, 42,
|
||||
43, 39, 36, 36, 37, 37, 44, 45,
|
||||
46, 47, 42, 48, 48, 49, 48, 50,
|
||||
51, 40, 40, 40, 42, 0, 0, 0
|
||||
0, 0, 1, 2, 3, 4, 5, 6,
|
||||
5, 7, 8, 0, 9, 10, 11, 12,
|
||||
13, 14, 15, 8, 16, 17, 18, 19,
|
||||
20, 21, 22, 23, 24, 24, 25, 26,
|
||||
27, 24, 24, 20, 28, 29, 30, 31,
|
||||
32, 25, 33, 33, 34, 35, 36, 37,
|
||||
38, 39, 40, 41, 42, 43, 37, 43,
|
||||
43, 44, 40, 37, 37, 38, 38, 45,
|
||||
46, 47, 48, 43, 49, 49, 50, 49,
|
||||
51, 52, 41, 41, 41, 43, 0, 0,
|
||||
0
|
||||
};
|
||||
|
||||
/*Map glyph_ids to kern right classes*/
|
||||
static const uint8_t kern_right_class_mapping[] =
|
||||
{
|
||||
0, 0, 1, 2, 3, 4, 5, 5,
|
||||
6, 7, 8, 9, 10, 11, 12, 7,
|
||||
13, 14, 15, 16, 17, 18, 19, 18,
|
||||
18, 18, 19, 18, 18, 20, 18, 18,
|
||||
18, 18, 19, 18, 19, 18, 21, 22,
|
||||
23, 24, 24, 25, 26, 27, 28, 29,
|
||||
30, 30, 30, 0, 30, 29, 31, 32,
|
||||
29, 29, 33, 33, 30, 33, 30, 33,
|
||||
34, 35, 36, 37, 37, 38, 37, 39,
|
||||
40, 30, 30, 30, 36, 0, 0, 0
|
||||
0, 0, 1, 2, 3, 4, 5, 6,
|
||||
5, 7, 8, 9, 10, 11, 12, 13,
|
||||
8, 14, 15, 16, 17, 18, 19, 20,
|
||||
19, 19, 19, 20, 19, 19, 21, 19,
|
||||
19, 19, 19, 20, 19, 20, 19, 22,
|
||||
23, 24, 25, 25, 26, 27, 28, 29,
|
||||
30, 31, 31, 31, 0, 31, 30, 32,
|
||||
33, 30, 30, 34, 34, 31, 34, 31,
|
||||
34, 35, 36, 37, 38, 38, 39, 38,
|
||||
40, 41, 31, 31, 31, 37, 0, 0,
|
||||
0
|
||||
};
|
||||
|
||||
/*Kern values between classes*/
|
||||
static const int8_t kern_class_values[] =
|
||||
{
|
||||
-23, -5, 0, -4, 6, 0, 0, -4,
|
||||
2, 2, 6, 4, -3, 4, 0, 0,
|
||||
-23, -5, 0, -4, 6, 4, 0, 0,
|
||||
-4, 2, 2, 6, 4, -3, 4, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -5,
|
||||
5, 9, 0, 0, -11, -12, 1, 9,
|
||||
4, 3, -8, 1, 9, 1, 8, 2,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-5, 5, 9, 0, 0, -11, 0, -12,
|
||||
1, 9, 4, 3, -8, 1, 9, 1,
|
||||
8, 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, 4,
|
||||
0, 0, 0, 0, 0, 6, 0, 2,
|
||||
0, 0, -4, 0, 0, 0, 0, 0,
|
||||
0, 4, 0, 0, 0, 0, 0, 0,
|
||||
6, 0, 2, 0, 0, -4, 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, -7, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -7, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -12, -11, 0, 0,
|
||||
0, -1, 19, -2, -2, 2, 2, -2,
|
||||
0, -2, 2, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-12, -11, 0, 0, 0, 19, -2, -2,
|
||||
2, 2, -2, 0, -2, 2, 0, 0,
|
||||
0, 0, 0, 0, -12, -7, 0, 0,
|
||||
0, -1, 1, 0, 1, -3, -2, -4,
|
||||
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, -12,
|
||||
0, 12, 0, 6, -19, -13, -4, 6,
|
||||
0, 0, -13, 0, 2, -4, 0, -3,
|
||||
0, 0, 0, 0, 0, 0, 0, 12,
|
||||
0, 6, -19, -13, -13, -4, 6, 0,
|
||||
0, -13, 0, 2, -4, 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, 0, 9,
|
||||
0, 1, 0, 0, -2, -4, 0, -1,
|
||||
0, 0, 0, 0, 0, 0, 9, 0,
|
||||
1, 0, 0, -2, 1, -4, 0, -1,
|
||||
-1, -2, 0, 0, -1, 0, 0, 0,
|
||||
-2, 0, 0, -4, 0, -4, 0, -5,
|
||||
-6, -6, -4, 0, 0, 0, 0, -2,
|
||||
0, 0, 2, 0, 1, -2, 0, 1,
|
||||
2, 0, 0, 0, 2, 2, -1, 0,
|
||||
0, 0, -4, 0, -1, 0, 0, 0,
|
||||
1, 0, 0, 2, 0, -1, 0, -2,
|
||||
0, -3, 0, 0, 0, -2, 0, 0,
|
||||
0, 0, 0, -1, 1, -1, -1, 0,
|
||||
-2, -2, 0, 0, 0, 0, 0, 0,
|
||||
-1, -1, 0, -2, -2, 0, 0, 0,
|
||||
1, 0, 0, 0, 0, -1, 0, -2,
|
||||
-2, -2, 0, 0, 0, 0, 0, -1,
|
||||
0, 0, 0, 0, -1, -2, 0, -3,
|
||||
-6, -6, 0, 0, 4, 5, 0, -5,
|
||||
-1, -2, 0, -1, -9, 2, -1, 1,
|
||||
0, 0, 2, 1, -1, -10, 0, -10,
|
||||
-2, -17, -1, 5, 0, 2, 0, 0,
|
||||
0, 0, 0, 0, -3, -2, 0, -6,
|
||||
-2, 0, 0, 0, 0, 0, 0, 0,
|
||||
-1, -1, 0, -1, -2, 0, 0, 0,
|
||||
0, 0, 0, -2, 0, -2, 0, -1,
|
||||
-2, -2, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -2, -2, 0, -2,
|
||||
-4, -1, 0, 0, 2, 2, 0, 0,
|
||||
0, 0, 0, 0, -1, 0, 0, 0,
|
||||
1, 0, 0, 0, 0, -2, 0, -2,
|
||||
-1, -2, 0, 0, 0, 2, 0, -2,
|
||||
0, 0, 0, 0, -2, -3, 0, -4,
|
||||
1, 6, 0, 0, -10, -8, -4, 2,
|
||||
0, -2, -12, -3, 0, -3, 0, -4,
|
||||
-12, 0, -3, -5, -1, 0, 0, 1,
|
||||
-1, 2, -1, -7, 0, -10, -5, -4,
|
||||
-5, -6, -2, -5, 0, -4, -5, 1,
|
||||
-2, 1, 0, 0, 2, 0, 0, 0,
|
||||
2, 0, 0, 0, 2, -1, 2, -1,
|
||||
0, 0, 0, -4, 0, -1, 0, 0,
|
||||
0, 1, 0, 0, 2, 0, -1, 0,
|
||||
-2, 0, -3, 0, 0, 0, -2, 0,
|
||||
0, 0, 0, 0, -1, 1, -1, -1,
|
||||
0, -2, -2, 0, 0, 0, 0, 0,
|
||||
0, 0, -1, -1, 0, -2, -2, 0,
|
||||
0, 0, 1, 0, 0, 0, 0, -1,
|
||||
0, -2, -2, -2, 0, 0, 0, 0,
|
||||
0, -1, 0, 0, 0, 0, -1, -2,
|
||||
0, -3, -6, -6, 0, 0, 4, 2,
|
||||
5, 0, -5, -1, -2, 0, -1, -9,
|
||||
2, -1, 1, 0, 0, 2, 1, -1,
|
||||
-10, 0, -10, -2, -17, -1, 5, 0,
|
||||
2, 0, 0, 0, 0, 0, 0, -3,
|
||||
-2, 0, -6, -2, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -1, -1, 0, -1,
|
||||
-2, 0, 0, 0, 0, 0, 0, -2,
|
||||
0, -2, 0, -1, -2, -2, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-1, 0, 0, -1, 0, -2, 0, -3,
|
||||
-4, -4, -1, 0, 0, 0, 0, -2,
|
||||
0, 0, 0, 0, 1, -1, 0, 0,
|
||||
0, 2, 0, 0, 0, 9, 0, 0,
|
||||
-2, -2, 0, -2, -4, -1, 0, 0,
|
||||
2, 1, 2, 0, 0, 0, 0, 0,
|
||||
0, -1, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, -2, 0, -2, -1, -2, 0,
|
||||
0, 0, 2, 0, -2, 0, 0, 0,
|
||||
0, -2, -3, 0, -4, 1, 6, 0,
|
||||
0, -10, -10, -8, -4, 2, 0, -2,
|
||||
-12, -3, 0, -3, 0, -4, -12, 0,
|
||||
-3, -5, -1, 0, 0, 1, -1, 2,
|
||||
-1, -7, 0, -10, -5, -4, -5, -6,
|
||||
-2, -5, 0, -4, -5, 1, -2, 1,
|
||||
0, 0, 2, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -1,
|
||||
0, 0, -1, 0, -2, 0, -3, -4,
|
||||
-4, -1, 0, 0, 0, 0, -2, 0,
|
||||
0, 0, 0, 1, -1, 0, 0, 0,
|
||||
2, 0, 0, 0, 0, 9, 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, -8, 0, 0, 6, 6, -2, -8,
|
||||
0, 2, -3, 0, -10, -1, -2, 2,
|
||||
2, 0, -2, 3, 0, -7, -3, -7,
|
||||
-6, -8, 0, 0, 0, -1, 0, 0,
|
||||
0, -1, -1, -2, -5, -6, 0, -18,
|
||||
0, 0, 0, 0, 1, 0, 0, 0,
|
||||
0, -8, 0, 0, 6, -3, 6, -2,
|
||||
-8, 0, 2, -3, 0, -10, -1, -2,
|
||||
2, 2, 0, -2, 3, 0, -7, -3,
|
||||
-7, -6, -8, 0, 0, 0, -1, 0,
|
||||
0, 0, -1, -1, -2, -5, -6, 0,
|
||||
-18, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -2, 0, -1,
|
||||
-2, -3, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -2,
|
||||
0, -1, -2, -3, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 2, 0, -4, 2,
|
||||
-1, -1, -5, -2, 0, -2, -2, -1,
|
||||
-3, 0, -3, 0, -1, -2, -1, -1,
|
||||
-3, -2, 0, -1, 0, -4, 0, 0,
|
||||
0, -4, 0, -3, 0, -3, -3, 2,
|
||||
0, -3, 0, 2, -4, -4, 0, -2,
|
||||
-2, -2, 0, 0, 0, 0, 0, 0,
|
||||
-2, 0, 0, -3, 0, -2, 0, -4,
|
||||
-5, -6, -2, 0, 0, 0, 0, 15,
|
||||
0, 0, 1, 0, 0, -2, 0, 2,
|
||||
0, 0, 0, 0, 2, 0, -3, 0,
|
||||
-1, -2, -6, -1, -1, -1, -1, -1,
|
||||
0, 0, -1, 0, 0, 0, 0, -2,
|
||||
-2, -2, 0, -1, 0, -1, 0, 0,
|
||||
0, -1, -2, -1, -2, -2, -2, 0,
|
||||
0, 8, 0, -1, -2, -8, -2, 3,
|
||||
0, 0, -9, -3, 2, -3, 1, 0,
|
||||
-6, 0, -2, -3, -1, 1, 0, 0,
|
||||
-3, 0, 0, -4, 0, -3, -2, -3,
|
||||
-2, -2, 0, -3, 1, -4, -3, 6,
|
||||
0, 0, 0, 0, 2, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 2, -1,
|
||||
0, -4, 2, -1, -1, -5, -2, 0,
|
||||
-2, -2, -1, -3, 0, -3, 0, -1,
|
||||
-2, -1, -1, -3, -2, 0, -1, 0,
|
||||
-4, 0, 0, 0, -4, 0, -3, 0,
|
||||
-3, -3, 2, 0, -3, 0, 2, -4,
|
||||
1, -4, 0, -2, -2, -2, 0, 0,
|
||||
0, 0, 0, 0, -2, 0, 0, -3,
|
||||
0, -2, 0, -4, -5, -6, -2, 0,
|
||||
0, 0, 0, 15, 0, 0, 1, 0,
|
||||
0, -2, 0, 2, 0, 0, 0, 0,
|
||||
2, -4, 0, -3, 0, -1, -2, -6,
|
||||
-1, -1, -1, -1, -1, 0, 0, -1,
|
||||
0, 0, 0, 0, -2, -2, -2, 0,
|
||||
-1, 0, -1, 0, 0, 0, -1, -2,
|
||||
-1, -2, -2, -2, 0, 0, 8, 0,
|
||||
-1, -2, 0, -8, -2, 3, 0, 0,
|
||||
-9, -3, 2, -3, 1, 0, -6, 0,
|
||||
-2, -3, -1, 1, 0, 0, -3, 0,
|
||||
0, -4, 0, -3, -2, -3, -2, -2,
|
||||
0, -3, 1, -4, -3, 6, 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, 0,
|
||||
@ -820,146 +836,150 @@ static const int8_t kern_class_values[] =
|
||||
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, -2, -2, 0, 0,
|
||||
0, 0, 0, 0, -2, 0, -2, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-3, 0, 0, 0, 0, -2, 0, 0,
|
||||
-2, -2, 0, 0, 0, 0, 0, -1,
|
||||
0, 0, 0, 0, 0, -1, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, -4, 4,
|
||||
0, -1, -9, 0, 0, -4, -2, 0,
|
||||
-5, 0, -5, 0, -3, -8, -2, -8,
|
||||
-7, -9, 0, -2, 0, -4, -2, -1,
|
||||
-2, -3, -5, -3, -7, -8, -4, -2,
|
||||
0, 0, 0, 0, 6, 4, -4, -7,
|
||||
0, 1, -6, 0, -10, -1, -2, 4,
|
||||
1, 0, -2, 0, -1, -12, -2, -10,
|
||||
-2, -14, 0, 1, 0, -1, 0, 0,
|
||||
0, 0, -1, -1, -7, -1, 0, -12,
|
||||
0, 0, 0, -2, -5, -9, 0, 0,
|
||||
-1, -3, -6, -2, 0, -1, 0, 0,
|
||||
-9, -2, 0, -6, 0, -6, -2, -3,
|
||||
-5, -2, -3, -3, 0, -2, -4, -2,
|
||||
-4, 0, 1, 0, -1, -6, 0, 4,
|
||||
0, -3, 0, 2, -4, 8, 0, -2,
|
||||
-2, -2, 0, 0, 0, 0, 0, 0,
|
||||
-2, 0, 0, -3, 0, -2, 0, -4,
|
||||
-5, -6, -2, 0, 0, 0, 0, 15,
|
||||
0, 0, 1, 0, 0, -2, 0, 2,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -1, -4, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -2, 0, -2, 0, 0,
|
||||
-4, -2, 0, -1, 0, 0, 0, 0,
|
||||
0, 0, 1, 0, 0, 0, 0, 3,
|
||||
0, -6, 0, 0, 4, 0, 0, -2,
|
||||
0, -1, 2, 0, -2, 0, -2, -1,
|
||||
0, -3, 0, 0, 0, 0, -2, 0,
|
||||
0, -2, -2, 0, 0, 0, 0, 0,
|
||||
-1, 0, 0, 0, 0, 0, -1, 0,
|
||||
0, 0, 0, 0, 0, 0, -6, 1,
|
||||
-4, 4, 0, -1, -9, 0, 0, -4,
|
||||
-2, 0, -5, 0, -5, 0, -3, -8,
|
||||
-2, -8, -7, -9, 0, -2, 0, -4,
|
||||
-2, -1, -2, -3, -5, -3, -7, -8,
|
||||
-4, -2, 0, 0, 0, 0, 6, -2,
|
||||
4, -4, -7, 0, 1, -6, 0, -10,
|
||||
-1, -2, 4, 1, 0, -2, 0, -1,
|
||||
-12, -2, -10, -2, -14, 0, 1, 0,
|
||||
-1, 0, 0, 0, 0, -1, -1, -7,
|
||||
-1, 0, -12, 0, 0, 0, -2, -5,
|
||||
-1, -9, 0, 0, -1, -3, -6, -2,
|
||||
0, -1, 0, 0, -9, -2, 0, -6,
|
||||
0, -6, -2, -3, -5, -2, -3, -3,
|
||||
0, -2, -4, -2, -4, 0, 1, 0,
|
||||
-1, -6, 0, 4, 0, -3, 0, 2,
|
||||
-4, 1, 8, 0, -2, -2, -2, 0,
|
||||
0, 0, 0, 0, 0, -2, 0, 0,
|
||||
-2, -3, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -2, -2, 0, -3,
|
||||
0, 2, -3, 0, -6, -4, -4, 8,
|
||||
-3, 0, -2, 0, -4, -5, -6, -2,
|
||||
0, 0, 0, 0, 15, 0, 0, 1,
|
||||
0, 0, -2, 0, 2, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -1,
|
||||
-4, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -2, 0, -2, 0, 0, -4, -2,
|
||||
0, -1, 0, 0, 0, 0, 0, 0,
|
||||
1, 0, 0, 0, 0, 3, 0, -6,
|
||||
0, 0, 4, 3, 0, 0, -2, 0,
|
||||
-1, 2, 0, -2, 0, -2, -1, 0,
|
||||
0, 0, 0, 0, -2, 0, 0, -2,
|
||||
-3, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -2, -2, 0, -3, 0,
|
||||
2, -3, 0, -6, -6, -4, -4, 8,
|
||||
3, 2, -17, -1, 4, -2, 0, -2,
|
||||
-7, 0, -2, -2, -2, 2, -2, -2,
|
||||
-6, -2, 0, -5, 0, -11, -2, 6,
|
||||
-2, -7, 1, -2, -6, -6, -2, 8,
|
||||
0, 0, 0, 2, -7, -8, -5, 6,
|
||||
0, 1, -14, -2, 2, -3, -1, -4,
|
||||
-7, -3, -4, -3, -3, -2, 0, 0,
|
||||
-4, -4, -2, -11, 0, -11, -3, 0,
|
||||
-7, -11, -1, -6, -3, -6, -5, 5,
|
||||
0, 0, -2, 0, 0, 3, -6, 2,
|
||||
0, 0, -10, 0, -2, -4, -3, -1,
|
||||
-6, -4, -5, 0, -2, -6, -2, -4,
|
||||
-4, -6, -2, -3, 0, -6, -2, 0,
|
||||
-2, -4, -4, -5, -5, -7, -2, -4,
|
||||
0, 0, -2, 1, -7, -4, -6, 6,
|
||||
-2, 1, -18, -3, 4, -4, -3, -7,
|
||||
-8, -2, -6, -2, -3, -2, -2, -4,
|
||||
-6, -1, 0, -12, 0, -12, -4, 5,
|
||||
-7, -13, -4, -7, -8, -10, -6, 4,
|
||||
0, 0, 0, 0, 4, 1, -4, 4,
|
||||
0, 0, -6, -1, 0, -1, 0, 1,
|
||||
0, 0, -2, 0, 0, 0, 0, 0,
|
||||
-2, 0, 0, 0, 0, -2, 0, 0,
|
||||
0, 0, -1, -1, -2, 0, 0, 0,
|
||||
-5, 0, 0, 0, 0, 0, 0, -4,
|
||||
-1, 0, 0, 0, -4, 0, -2, 0,
|
||||
0, 0, 0, 2, -7, -4, -8, -5,
|
||||
6, 0, 1, -14, -2, 2, -3, -1,
|
||||
-4, -7, -3, -4, -3, -3, -2, 0,
|
||||
0, -4, -4, -2, -11, 0, -11, -3,
|
||||
0, -7, -11, -1, -6, -3, -6, -5,
|
||||
5, 0, 0, -2, 0, 0, -3, 3,
|
||||
-6, 2, 0, 0, -10, 0, -2, -4,
|
||||
-3, -1, -6, -4, -5, 0, -2, -6,
|
||||
-2, -4, -4, -6, -2, -3, 0, -6,
|
||||
-2, 0, -2, -4, -4, -5, -5, -7,
|
||||
-2, -4, 0, 0, -2, 1, -7, -6,
|
||||
-4, -6, 6, -2, 1, -18, -3, 4,
|
||||
-4, -3, -7, -8, -2, -6, -2, -3,
|
||||
-2, -2, -4, -6, -1, 0, -12, 0,
|
||||
-12, -4, 5, -7, -13, -4, -7, -8,
|
||||
-10, -6, 4, 0, 0, 0, 0, 4,
|
||||
-2, 1, -4, 4, 0, 0, -6, -1,
|
||||
0, -1, 0, 1, 0, 0, -2, 0,
|
||||
0, 0, 0, 0, -2, 0, 0, 0,
|
||||
0, -2, 0, 0, 0, 0, -1, -1,
|
||||
-2, 0, 0, 0, -5, 0, 0, 0,
|
||||
0, 0, 0, 0, -4, -1, 0, 0,
|
||||
0, -4, 0, -2, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, -2, 0, 0, -4,
|
||||
-5, -3, 0, 0, -2, 0, 0, -5,
|
||||
-2, -4, 0, 0, -5, 0, -2, 0,
|
||||
-2, 0, 0, 0, 0, -16, -4, -8,
|
||||
-2, -7, 0, -1, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -3, -3, -2, -3,
|
||||
0, 0, 0, -4, 4, 0, -1, -4,
|
||||
-1, -3, -4, 0, -2, -1, -1, 1,
|
||||
0, 0, -1, 0, 0, -17, -2, -3,
|
||||
0, -4, 0, 0, -1, -2, 0, 0,
|
||||
0, 0, 1, 0, -1, -3, -1, 3,
|
||||
0, 0, 1, 0, 0, 0, 0, 0,
|
||||
0, -2, 0, 0, -4, -5, -3, 0,
|
||||
0, -2, 2, 0, 0, -5, -2, -4,
|
||||
0, 0, -5, 0, -2, 0, -2, 0,
|
||||
0, 0, 0, -16, -4, -8, -2, -7,
|
||||
0, -1, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -3, -3, -2, -3, 0, 0,
|
||||
0, -4, 4, -2, 0, -1, -4, -1,
|
||||
-3, -4, 0, -2, -1, -1, 1, 0,
|
||||
0, -1, 0, 0, -17, -2, -3, 0,
|
||||
-4, 0, 0, -1, -2, 0, 0, 0,
|
||||
0, 1, 0, -1, -3, -1, 3, 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, 2, 0, 0, 0, 0, 0,
|
||||
-1, -4, 0, 0, 0, 0, 0, -5,
|
||||
-2, -4, 0, 0, -5, 0, -2, 0,
|
||||
0, 0, 0, 0, 0, -19, 0, -4,
|
||||
-7, -10, 0, -3, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -2, -3, -1, -3,
|
||||
3, 0, 0, 6, -2, -6, 2, 9,
|
||||
3, 4, -5, 2, 8, 2, 6, 4,
|
||||
-1, -4, 0, 0, 0, 2, 0, 0,
|
||||
-5, -2, -4, 0, 0, -5, 0, -2,
|
||||
0, 0, 0, 0, 0, 0, -19, 0,
|
||||
-4, -7, -10, 0, -3, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -2, -3, -1,
|
||||
-3, 3, 0, 0, 6, -2, -2, -6,
|
||||
2, 9, 3, 4, -5, 2, 8, 2,
|
||||
6, 4, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -2, 0, -2,
|
||||
15, 8, 15, 0, 0, 0, 2, 0,
|
||||
0, 7, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -1, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -3,
|
||||
-16, -2, -2, -8, -9, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -2, 0, -2, 15, 8,
|
||||
15, 0, 0, 0, 2, 0, 0, 7,
|
||||
0, 0, 0, 0, 0, 0, 0, -1,
|
||||
0, 0, 0, 0, 0, 0, 0, 2,
|
||||
-4, 0, -2, 2, 3, 2, -6, 0,
|
||||
0, -2, 2, 0, 0, 0, 0, 0,
|
||||
0, -5, 0, -2, -1, -4, 0, -2,
|
||||
0, -4, -1, 0, -1, -3, 0, -2,
|
||||
-5, -4, -2, 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, -3, -16, -2, -2,
|
||||
-8, -9, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 2, 0, -2, 2,
|
||||
3, 2, -6, 0, 0, -2, 2, 0,
|
||||
0, 0, 0, 0, 0, -5, 0, -2,
|
||||
-1, -4, 0, -2, 0, -4, -1, 0,
|
||||
-1, -3, 0, -2, -5, -4, -2, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -1,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -3, -16, -2, -2,
|
||||
-8, -9, 0, 0, 0, 0, 0, 10,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -2, -2, -2, -8, 1, -1,
|
||||
1, -1, -5, 0, 4, 0, 2, 1,
|
||||
-8, -2, -5, 0, -3, -7, -4, -5,
|
||||
-8, -7, 0, -2, -1, -2, -1, 0,
|
||||
-1, -1, 3, 0, 3, -1, 0, 6,
|
||||
0, 0, 0, 0, 0, 0, 0, -1,
|
||||
-2, -2, 0, 0, -5, 0, -1, 0,
|
||||
0, -3, -16, -2, -2, -8, -9, 0,
|
||||
0, 0, 0, 0, 10, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -2,
|
||||
-2, -2, -2, -8, 1, -1, 1, -1,
|
||||
-5, 0, 4, 0, 2, 1, -8, -2,
|
||||
-5, 0, -3, -7, -4, -5, -8, -7,
|
||||
0, -2, -1, -2, -1, 0, -1, -1,
|
||||
3, 0, 3, -1, 0, 6, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, -1, -2,
|
||||
-2, 0, 0, -5, 0, -1, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -2, -2, 0, -2,
|
||||
0, 0, 0, 0, 2, 0, -3, -4,
|
||||
0, 0, 0, -2, -2, 0, -2, 0,
|
||||
0, 0, 0, 2, -2, 0, -3, -4,
|
||||
-1, 0, -6, -1, -4, -1, -2, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -3, 0, 0,
|
||||
0, 0, -2, 0, -2, 0, 0, -1,
|
||||
0, 0, 0, 0, -6, -6, 1, 2,
|
||||
2, 0, -5, 1, 3, 1, 6, 1,
|
||||
-5, 0, -1, 0, -1, -8, 0, 0,
|
||||
-6, -5, 0, -3, 0, -3, 0, -3,
|
||||
0, -1, 3, 0, -2, -6, -2, 7,
|
||||
0, 0, 0, 0, 0, 2, -2, 2,
|
||||
0, 0, -6, 0, -1, -1, 0, -2,
|
||||
0, 0, -2, 0, -2, -8, -2, -4,
|
||||
0, -6, 0, -2, 0, -3, 0, 1,
|
||||
0, -2, 0, -2, -6, 0, -2, 2,
|
||||
0, 0, 0, 0, 1, 0, 0, -2,
|
||||
-1, 0, -2, 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, -2, -2, 0, 0,
|
||||
4, 4, 0, 0, -12, -11, 1, 8,
|
||||
6, 3, -8, 1, 8, 0, 7, 0,
|
||||
0, 0, 0, 0, -6, -2, -6, 1,
|
||||
2, 2, 0, -5, 1, 3, 1, 6,
|
||||
1, -5, 0, -1, 0, -1, -8, 0,
|
||||
0, -6, -5, 0, -3, 0, -3, 0,
|
||||
-3, 0, -1, 3, 0, -2, -6, -2,
|
||||
7, 0, 0, 0, 0, 0, -4, 2,
|
||||
-2, 2, 0, 0, -6, 0, -1, -1,
|
||||
0, -2, 0, 0, -2, 0, -2, -8,
|
||||
-2, -4, 0, -6, 0, -2, 0, -3,
|
||||
0, 1, 0, -2, 0, -2, -6, 0,
|
||||
-2, 2, 0, 0, 0, 0, 1, -2,
|
||||
0, 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
|
||||
-2, 0, 0, 0, 0, 0, 0, -2,
|
||||
-2, 0, 0, 4, 4, 0, 0, -12,
|
||||
0, -11, 1, 8, 6, 3, -8, 1,
|
||||
8, 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
|
||||
};
|
||||
|
||||
|
||||
@ -969,8 +989,8 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes =
|
||||
.class_pair_values = kern_class_values,
|
||||
.left_class_mapping = kern_left_class_mapping,
|
||||
.right_class_mapping = kern_right_class_mapping,
|
||||
.left_class_cnt = 51,
|
||||
.right_class_cnt = 40,
|
||||
.left_class_cnt = 52,
|
||||
.right_class_cnt = 41,
|
||||
};
|
||||
|
||||
/*--------------------
|
||||
@ -992,7 +1012,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
.cmaps = cmaps,
|
||||
.kern_dsc = &kern_classes,
|
||||
.kern_scale = 16,
|
||||
.cmap_num = 4,
|
||||
.cmap_num = 5,
|
||||
.bpp = 4,
|
||||
.kern_classes = 1,
|
||||
.bitmap_format = 0,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*******************************************************************************
|
||||
* Size: 18 px
|
||||
* Bpp: 4
|
||||
* Opts: --bpp 4 --size 18 --no-compress --font Montserrat-Medium.ttf --symbols 0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/ --format lvgl -o montserrat_medium_18.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575
|
||||
* Opts: --bpp 4 --size 18 --no-compress --font Montserrat-Medium.ttf --symbols 0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/- --format lvgl -o montserrat_medium_18.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||
@ -62,6 +62,9 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x1, 0x10, 0xe, 0xf1, 0xf, 0xf2, 0x7, 0xe0,
|
||||
0xb, 0x90, 0xe, 0x40,
|
||||
|
||||
/* U+002D "-" */
|
||||
0x88, 0x88, 0x7f, 0xff, 0xfe,
|
||||
|
||||
/* U+002E "." */
|
||||
0x5, 0x60, 0x1f, 0xf2, 0xc, 0xd0,
|
||||
|
||||
@ -912,79 +915,80 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
{.bitmap_index = 104, .adv_w = 97, .box_w = 5, .box_h = 18, .ofs_x = 1, .ofs_y = -4},
|
||||
{.bitmap_index = 149, .adv_w = 97, .box_w = 5, .box_h = 18, .ofs_x = 0, .ofs_y = -4},
|
||||
{.bitmap_index = 194, .adv_w = 65, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 206, .adv_w = 65, .box_w = 4, .box_h = 3, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 212, .adv_w = 101, .box_w = 8, .box_h = 18, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 284, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 362, .adv_w = 107, .box_w = 5, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 395, .adv_w = 165, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 460, .adv_w = 165, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 525, .adv_w = 193, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 603, .adv_w = 165, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 668, .adv_w = 178, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 740, .adv_w = 172, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 812, .adv_w = 185, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 884, .adv_w = 178, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 956, .adv_w = 65, .box_w = 4, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 976, .adv_w = 211, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1074, .adv_w = 218, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1152, .adv_w = 208, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1237, .adv_w = 238, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1322, .adv_w = 193, .box_w = 11, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1394, .adv_w = 183, .box_w = 10, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1459, .adv_w = 222, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1544, .adv_w = 234, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1622, .adv_w = 89, .box_w = 3, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1642, .adv_w = 148, .box_w = 9, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1701, .adv_w = 207, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1779, .adv_w = 171, .box_w = 10, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1844, .adv_w = 275, .box_w = 15, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1942, .adv_w = 234, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2020, .adv_w = 242, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2118, .adv_w = 208, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2196, .adv_w = 242, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 2316, .adv_w = 209, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2394, .adv_w = 179, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2466, .adv_w = 169, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2538, .adv_w = 228, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2616, .adv_w = 205, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 2707, .adv_w = 324, .box_w = 20, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2837, .adv_w = 194, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2915, .adv_w = 186, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 3000, .adv_w = 189, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3078, .adv_w = 172, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3128, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3205, .adv_w = 164, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3255, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3332, .adv_w = 176, .box_w = 11, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3387, .adv_w = 102, .box_w = 7, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3436, .adv_w = 199, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = -4},
|
||||
{.bitmap_index = 3513, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3583, .adv_w = 80, .box_w = 3, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3604, .adv_w = 82, .box_w = 6, .box_h = 18, .ofs_x = -2, .ofs_y = -4},
|
||||
{.bitmap_index = 3658, .adv_w = 177, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3735, .adv_w = 80, .box_w = 3, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3756, .adv_w = 304, .box_w = 17, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3841, .adv_w = 196, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3891, .adv_w = 183, .box_w = 11, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3946, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = -4},
|
||||
{.bitmap_index = 4023, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = -4},
|
||||
{.bitmap_index = 4100, .adv_w = 118, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 4130, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4175, .adv_w = 119, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4217, .adv_w = 195, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 4267, .adv_w = 161, .box_w = 12, .box_h = 10, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 4327, .adv_w = 259, .box_w = 17, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4412, .adv_w = 159, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4462, .adv_w = 161, .box_w = 12, .box_h = 14, .ofs_x = -1, .ofs_y = -4},
|
||||
{.bitmap_index = 4546, .adv_w = 150, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4591, .adv_w = 121, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 6},
|
||||
{.bitmap_index = 4616, .adv_w = 176, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4693, .adv_w = 176, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4770, .adv_w = 176, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4847, .adv_w = 195, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 4917, .adv_w = 324, .box_w = 21, .box_h = 19, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 5117, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5313, .adv_w = 288, .box_w = 18, .box_h = 19, .ofs_x = 0, .ofs_y = -3}
|
||||
{.bitmap_index = 206, .adv_w = 110, .box_w = 5, .box_h = 2, .ofs_x = 1, .ofs_y = 4},
|
||||
{.bitmap_index = 211, .adv_w = 65, .box_w = 4, .box_h = 3, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 217, .adv_w = 101, .box_w = 8, .box_h = 18, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 289, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 367, .adv_w = 107, .box_w = 5, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 400, .adv_w = 165, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 465, .adv_w = 165, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 530, .adv_w = 193, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 608, .adv_w = 165, .box_w = 10, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 673, .adv_w = 178, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 745, .adv_w = 172, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 817, .adv_w = 185, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 889, .adv_w = 178, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 961, .adv_w = 65, .box_w = 4, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 981, .adv_w = 211, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1079, .adv_w = 218, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1157, .adv_w = 208, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1242, .adv_w = 238, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1327, .adv_w = 193, .box_w = 11, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1399, .adv_w = 183, .box_w = 10, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1464, .adv_w = 222, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1549, .adv_w = 234, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1627, .adv_w = 89, .box_w = 3, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1647, .adv_w = 148, .box_w = 9, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1706, .adv_w = 207, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1784, .adv_w = 171, .box_w = 10, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1849, .adv_w = 275, .box_w = 15, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1947, .adv_w = 234, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2025, .adv_w = 242, .box_w = 15, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2123, .adv_w = 208, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2201, .adv_w = 242, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 2321, .adv_w = 209, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2399, .adv_w = 179, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2471, .adv_w = 169, .box_w = 11, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2543, .adv_w = 228, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2621, .adv_w = 205, .box_w = 14, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 2712, .adv_w = 324, .box_w = 20, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2842, .adv_w = 194, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 2920, .adv_w = 186, .box_w = 13, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 3005, .adv_w = 189, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3083, .adv_w = 172, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3133, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3210, .adv_w = 164, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3260, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3337, .adv_w = 176, .box_w = 11, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3392, .adv_w = 102, .box_w = 7, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3441, .adv_w = 199, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = -4},
|
||||
{.bitmap_index = 3518, .adv_w = 196, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3588, .adv_w = 80, .box_w = 3, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3609, .adv_w = 82, .box_w = 6, .box_h = 18, .ofs_x = -2, .ofs_y = -4},
|
||||
{.bitmap_index = 3663, .adv_w = 177, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3740, .adv_w = 80, .box_w = 3, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3761, .adv_w = 304, .box_w = 17, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3846, .adv_w = 196, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3896, .adv_w = 183, .box_w = 11, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 3951, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = -4},
|
||||
{.bitmap_index = 4028, .adv_w = 196, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = -4},
|
||||
{.bitmap_index = 4105, .adv_w = 118, .box_w = 6, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 4135, .adv_w = 144, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4180, .adv_w = 119, .box_w = 7, .box_h = 12, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4222, .adv_w = 195, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 4272, .adv_w = 161, .box_w = 12, .box_h = 10, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 4332, .adv_w = 259, .box_w = 17, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4417, .adv_w = 159, .box_w = 10, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4467, .adv_w = 161, .box_w = 12, .box_h = 14, .ofs_x = -1, .ofs_y = -4},
|
||||
{.bitmap_index = 4551, .adv_w = 150, .box_w = 9, .box_h = 10, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4596, .adv_w = 121, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 6},
|
||||
{.bitmap_index = 4621, .adv_w = 176, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4698, .adv_w = 176, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4775, .adv_w = 176, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4852, .adv_w = 195, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 4922, .adv_w = 324, .box_w = 21, .box_h = 19, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 5122, .adv_w = 360, .box_w = 23, .box_h = 17, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 5318, .adv_w = 288, .box_w = 18, .box_h = 19, .ofs_x = 0, .ofs_y = -3}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
@ -993,12 +997,10 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
|
||||
static const uint8_t glyph_id_ofs_list_0[] = {
|
||||
0, 0, 0, 0, 0, 1, 0, 2,
|
||||
3, 4, 0, 0, 5, 0, 6, 7,
|
||||
8, 9, 10, 11, 12, 13, 14, 15,
|
||||
16, 17, 18
|
||||
3, 4
|
||||
};
|
||||
|
||||
static const uint16_t unicode_list_3[] = {
|
||||
static const uint16_t unicode_list_4[] = {
|
||||
0x0, 0x38, 0x39, 0x3a, 0x4b, 0xef65, 0xf012, 0xf4c5
|
||||
};
|
||||
|
||||
@ -1006,20 +1008,24 @@ static const uint16_t unicode_list_3[] = {
|
||||
static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
{
|
||||
{
|
||||
.range_start = 32, .range_length = 27, .glyph_id_start = 1,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_0, .list_length = 27, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL
|
||||
.range_start = 32, .range_length = 10, .glyph_id_start = 1,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_0, .list_length = 10, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL
|
||||
},
|
||||
{
|
||||
.range_start = 65, .range_length = 26, .glyph_id_start = 20,
|
||||
.range_start = 44, .range_length = 15, .glyph_id_start = 6,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 97, .range_length = 26, .glyph_id_start = 46,
|
||||
.range_start = 65, .range_length = 26, .glyph_id_start = 21,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 176, .range_length = 62662, .glyph_id_start = 72,
|
||||
.unicode_list = unicode_list_3, .glyph_id_ofs_list = NULL, .list_length = 8, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
.range_start = 97, .range_length = 26, .glyph_id_start = 47,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 176, .range_length = 62662, .glyph_id_start = 73,
|
||||
.unicode_list = unicode_list_4, .glyph_id_ofs_list = NULL, .list_length = 8, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
}
|
||||
};
|
||||
|
||||
@ -1031,142 +1037,152 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
/*Map glyph_ids to kern left classes*/
|
||||
static const uint8_t kern_left_class_mapping[] =
|
||||
{
|
||||
0, 0, 1, 2, 3, 4, 5, 5,
|
||||
6, 7, 0, 8, 9, 10, 11, 12,
|
||||
13, 14, 7, 15, 16, 17, 18, 19,
|
||||
20, 21, 22, 23, 23, 24, 25, 26,
|
||||
23, 23, 19, 27, 28, 29, 30, 31,
|
||||
24, 32, 32, 33, 34, 35, 36, 37,
|
||||
38, 39, 40, 41, 42, 36, 42, 42,
|
||||
43, 39, 36, 36, 37, 37, 44, 45,
|
||||
46, 47, 42, 48, 48, 49, 48, 50,
|
||||
51, 40, 40, 40, 42, 0, 0, 0
|
||||
0, 0, 1, 2, 3, 4, 5, 6,
|
||||
5, 7, 8, 0, 9, 10, 11, 12,
|
||||
13, 14, 15, 8, 16, 17, 18, 19,
|
||||
20, 21, 22, 23, 24, 24, 25, 26,
|
||||
27, 24, 24, 20, 28, 29, 30, 31,
|
||||
32, 25, 33, 33, 34, 35, 36, 37,
|
||||
38, 39, 40, 41, 42, 43, 37, 43,
|
||||
43, 44, 40, 37, 37, 38, 38, 45,
|
||||
46, 47, 48, 43, 49, 49, 50, 49,
|
||||
51, 52, 41, 41, 41, 43, 0, 0,
|
||||
0
|
||||
};
|
||||
|
||||
/*Map glyph_ids to kern right classes*/
|
||||
static const uint8_t kern_right_class_mapping[] =
|
||||
{
|
||||
0, 0, 1, 2, 3, 4, 5, 5,
|
||||
6, 7, 8, 9, 10, 11, 12, 7,
|
||||
13, 14, 15, 16, 17, 18, 19, 18,
|
||||
18, 18, 19, 18, 18, 20, 18, 18,
|
||||
18, 18, 19, 18, 19, 18, 21, 22,
|
||||
23, 24, 24, 25, 26, 27, 28, 29,
|
||||
30, 30, 30, 0, 30, 29, 31, 32,
|
||||
29, 29, 33, 33, 30, 33, 30, 33,
|
||||
34, 35, 36, 37, 37, 38, 37, 39,
|
||||
40, 30, 30, 30, 36, 0, 0, 0
|
||||
0, 0, 1, 2, 3, 4, 5, 6,
|
||||
5, 7, 8, 9, 10, 11, 12, 13,
|
||||
8, 14, 15, 16, 17, 18, 19, 20,
|
||||
19, 19, 19, 20, 19, 19, 21, 19,
|
||||
19, 19, 19, 20, 19, 20, 19, 22,
|
||||
23, 24, 25, 25, 26, 27, 28, 29,
|
||||
30, 31, 31, 31, 0, 31, 30, 32,
|
||||
33, 30, 30, 34, 34, 31, 34, 31,
|
||||
34, 35, 36, 37, 38, 38, 39, 38,
|
||||
40, 41, 31, 31, 31, 37, 0, 0,
|
||||
0
|
||||
};
|
||||
|
||||
/*Kern values between classes*/
|
||||
static const int8_t kern_class_values[] =
|
||||
{
|
||||
-35, -8, 0, -6, 9, 0, 0, -6,
|
||||
3, 3, 10, 6, -5, 6, 0, 0,
|
||||
-35, -8, 0, -6, 9, 6, 0, 0,
|
||||
-6, 3, 3, 10, 6, -5, 6, 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,
|
||||
8, 13, 0, 0, -16, -17, 2, 14,
|
||||
6, 5, -12, 2, 14, 1, 12, 3,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-8, 8, 13, 0, 0, -16, 0, -17,
|
||||
2, 14, 6, 5, -12, 2, 14, 1,
|
||||
12, 3, 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, 0, 0, 0, 0, 10, 0, 3,
|
||||
0, 0, -6, 0, 0, 0, 0, 0,
|
||||
0, 6, 0, 0, 0, 0, 0, 0,
|
||||
10, 0, 3, 0, 0, -6, 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, -11, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -11, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -18, -16, 0, 0,
|
||||
0, -2, 29, -3, -4, 3, 3, -3,
|
||||
0, -4, 3, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-18, -16, 0, 0, 0, 29, -3, -4,
|
||||
3, 3, -3, 0, -4, 3, 0, 0,
|
||||
0, 0, 0, 0, -18, -11, 0, 0,
|
||||
0, -2, 1, 0, 2, -5, -4, -6,
|
||||
2, 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, 0, 0, 0, 0, 0, -18,
|
||||
0, 17, 0, 10, -28, -20, -6, 9,
|
||||
0, 0, -19, 0, 3, -7, 0, -4,
|
||||
0, 0, 0, 0, 0, 0, 0, 17,
|
||||
0, 10, -28, -20, -20, -6, 9, 0,
|
||||
0, -19, 0, 3, -7, 0, -4, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 14,
|
||||
0, 2, 0, 0, -3, -6, 0, -1,
|
||||
0, 0, 0, 0, 0, 0, 14, 0,
|
||||
2, 0, 0, -3, 2, -6, 0, -1,
|
||||
-1, -3, 0, 0, -2, 0, 0, 0,
|
||||
-2, 0, 0, -7, 0, -6, 0, -7,
|
||||
-10, -10, -5, 0, 0, 0, 0, -2,
|
||||
0, 0, 3, 0, 2, -3, 0, 1,
|
||||
3, 0, 0, 0, 3, 3, -1, 0,
|
||||
0, 0, -5, 0, -1, 0, 0, 0,
|
||||
1, 0, 0, 4, 0, -2, 0, -3,
|
||||
0, -5, 0, 0, 0, -3, 0, 0,
|
||||
0, 0, 0, -1, 1, -2, -2, 0,
|
||||
-3, -3, 0, 0, 0, 0, 0, 0,
|
||||
-1, -1, 0, -3, -3, 0, 0, 0,
|
||||
1, 0, 0, 0, 0, -2, 0, -3,
|
||||
-3, -3, 0, 0, 0, 0, 0, -2,
|
||||
0, 0, 0, 0, -2, -4, 0, -4,
|
||||
-9, -9, 0, 0, 6, 8, 0, -7,
|
||||
-1, -3, 0, -1, -14, 3, -2, 2,
|
||||
0, 0, 3, 1, -2, -15, 0, -15,
|
||||
-2, -25, -2, 8, 0, 4, 0, 0,
|
||||
0, 0, 1, 0, -5, -4, 0, -9,
|
||||
-3, 0, 0, 0, 0, 0, 0, 0,
|
||||
-1, -1, 0, -1, -4, 0, 0, 0,
|
||||
0, 0, 0, -3, 0, -3, 0, -2,
|
||||
-3, -2, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -2, -2, 0, -3,
|
||||
-6, -2, 0, 0, 3, 3, 0, 0,
|
||||
0, 0, 0, 0, -2, 0, 0, 0,
|
||||
2, 0, 0, 0, 0, -3, 0, -3,
|
||||
-2, -3, 0, 0, 0, 2, 0, -2,
|
||||
0, 0, 0, 0, -3, -4, 0, -5,
|
||||
1, 9, 0, 0, -15, -12, -6, 3,
|
||||
0, -2, -19, -5, 0, -5, 0, -6,
|
||||
-18, 0, -5, -8, -2, 0, 0, 1,
|
||||
-1, 2, -2, -11, 0, -14, -7, -6,
|
||||
-7, -9, -3, -8, -1, -5, -8, 2,
|
||||
-3, 1, 0, 0, 3, 0, 0, 0,
|
||||
3, 0, 0, 0, 3, -2, 3, -1,
|
||||
0, 0, 0, -5, 0, -1, 0, 0,
|
||||
0, 1, 0, 0, 4, 0, -2, 0,
|
||||
-3, 0, -5, 0, 0, 0, -3, 0,
|
||||
0, 0, 0, 0, -1, 1, -2, -2,
|
||||
0, -3, -3, 0, 0, 0, 0, 0,
|
||||
0, 0, -1, -1, 0, -3, -3, 0,
|
||||
0, 0, 1, 0, 0, 0, 0, -2,
|
||||
0, -3, -3, -3, 0, 0, 0, 0,
|
||||
0, -2, 0, 0, 0, 0, -2, -4,
|
||||
0, -4, -9, -9, 0, 0, 6, 3,
|
||||
8, 0, -7, -1, -3, 0, -1, -14,
|
||||
3, -2, 2, 0, 0, 3, 1, -2,
|
||||
-15, 0, -15, -2, -25, -2, 8, 0,
|
||||
4, 0, 0, 0, 0, 1, 0, -5,
|
||||
-4, 0, -9, -3, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -1, -1, 0, -1,
|
||||
-4, 0, 0, 0, 0, 0, 0, -3,
|
||||
0, -3, 0, -2, -3, -2, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-1, 0, 0, -1, 0, -3, 0, -5,
|
||||
-6, -6, -1, 0, 0, 0, 0, -2,
|
||||
0, 0, 0, 0, 1, -2, 0, 0,
|
||||
0, 3, 0, 0, 0, 14, 0, 0,
|
||||
-2, -2, 0, -3, -6, -2, 0, 0,
|
||||
3, 1, 3, 0, 0, 0, 0, 0,
|
||||
0, -2, 0, 0, 0, 2, 0, 0,
|
||||
0, 0, -3, 0, -3, -2, -3, 0,
|
||||
0, 0, 2, 0, -2, 0, 0, 0,
|
||||
0, -3, -4, 0, -5, 1, 9, 0,
|
||||
0, -15, -14, -12, -6, 3, 0, -2,
|
||||
-19, -5, 0, -5, 0, -6, -18, 0,
|
||||
-5, -8, -2, 0, 0, 1, -1, 2,
|
||||
-2, -11, 0, -14, -7, -6, -7, -9,
|
||||
-3, -8, -1, -5, -8, 2, -3, 1,
|
||||
0, 0, 3, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -1,
|
||||
0, 0, -1, 0, -3, 0, -5, -6,
|
||||
-6, -1, 0, 0, 0, 0, -2, 0,
|
||||
0, 0, 0, 1, -2, 0, 0, 0,
|
||||
3, 0, 0, 0, 0, 14, 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, -12, 0, 0, 10, 9, -2, -12,
|
||||
0, 3, -4, 0, -14, -1, -4, 3,
|
||||
4, 0, -3, 4, 0, -10, -4, -11,
|
||||
-10, -12, 0, 0, 0, -1, 0, 0,
|
||||
0, -1, -1, -3, -8, -10, -1, -27,
|
||||
0, 0, 0, 0, 1, 0, 0, 0,
|
||||
0, -12, 0, 0, 10, -5, 9, -2,
|
||||
-12, 0, 3, -4, 0, -14, -1, -4,
|
||||
3, 4, 0, -3, 4, 0, -10, -4,
|
||||
-11, -10, -12, 0, 0, 0, -1, 0,
|
||||
0, 0, -1, -1, -3, -8, -10, -1,
|
||||
-27, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -3, 0, -1,
|
||||
-3, -4, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -3,
|
||||
0, -1, -3, -4, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 4, 0, -6, 3,
|
||||
-2, -1, -7, -3, 0, -4, -3, -2,
|
||||
-5, 0, -4, 0, -1, -2, -1, -2,
|
||||
-5, -3, 0, -2, 0, -6, 0, 0,
|
||||
0, -6, 0, -5, 0, -5, -5, 3,
|
||||
0, -5, 0, 3, -6, -6, 0, -3,
|
||||
-3, -3, 0, 0, 0, 0, 0, 0,
|
||||
-3, 0, 0, -4, 0, -3, 0, -6,
|
||||
-7, -9, -2, 0, 0, 0, 0, 23,
|
||||
0, 0, 1, 0, 0, -4, 0, 3,
|
||||
0, 0, 0, 0, 3, 0, -4, 0,
|
||||
-2, -3, -9, -2, -2, -2, -1, -2,
|
||||
0, 0, -1, 0, 0, 0, 0, -3,
|
||||
-2, -2, 0, -2, 0, -2, 0, 0,
|
||||
0, -2, -3, -2, -3, -3, -3, 0,
|
||||
0, 12, 0, -2, -3, -12, -4, 4,
|
||||
0, 0, -14, -5, 3, -5, 2, 0,
|
||||
-9, 0, -2, -4, -1, 1, 0, 0,
|
||||
-5, 0, 0, -5, 0, -5, -3, -4,
|
||||
-3, -3, 0, -5, 1, -5, -5, 9,
|
||||
0, 0, 0, 0, 3, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 4, -1,
|
||||
0, -6, 3, -2, -1, -7, -3, 0,
|
||||
-4, -3, -2, -5, 0, -4, 0, -1,
|
||||
-2, -1, -2, -5, -3, 0, -2, 0,
|
||||
-6, 0, 0, 0, -6, 0, -5, 0,
|
||||
-5, -5, 3, 0, -5, 0, 3, -6,
|
||||
2, -6, 0, -3, -3, -3, 0, 0,
|
||||
0, 0, 0, 0, -3, 0, 0, -4,
|
||||
0, -3, 0, -6, -7, -9, -2, 0,
|
||||
0, 0, 0, 23, 0, 0, 1, 0,
|
||||
0, -4, 0, 3, 0, 0, 0, 0,
|
||||
3, -6, 0, -4, 0, -2, -3, -9,
|
||||
-2, -2, -2, -1, -2, 0, 0, -1,
|
||||
0, 0, 0, 0, -3, -2, -2, 0,
|
||||
-2, 0, -2, 0, 0, 0, -2, -3,
|
||||
-2, -3, -3, -3, 0, 0, 12, 0,
|
||||
-2, -3, 0, -12, -4, 4, 0, 0,
|
||||
-14, -5, 3, -5, 2, 0, -9, 0,
|
||||
-2, -4, -1, 1, 0, 0, -5, 0,
|
||||
0, -5, 0, -5, -3, -4, -3, -3,
|
||||
0, -5, 1, -5, -5, 9, 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, 0, 0, 0, 0, 0, 0,
|
||||
@ -1176,146 +1192,150 @@ static const int8_t kern_class_values[] =
|
||||
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, -2, -3, 0, 0,
|
||||
0, 0, 0, 0, -2, 0, -3, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-4, 0, 0, 0, 0, -4, 0, 0,
|
||||
-3, -3, 0, 0, 0, 0, 0, -1,
|
||||
0, 0, 0, 0, 0, -2, 0, 0,
|
||||
0, 0, 0, 0, 0, 2, -6, 6,
|
||||
1, -2, -14, 0, 0, -6, -3, 0,
|
||||
-8, 0, -7, 0, -4, -12, -3, -12,
|
||||
-11, -14, 0, -4, 0, -7, -3, -1,
|
||||
-3, -5, -8, -5, -11, -12, -7, -3,
|
||||
0, 0, 0, 0, 9, 6, -6, -11,
|
||||
0, 1, -9, 0, -14, -2, -3, 6,
|
||||
1, 0, -4, 0, -2, -19, -3, -15,
|
||||
-3, -21, 0, 1, 0, -2, 0, 0,
|
||||
0, 0, -1, -2, -11, -2, 0, -19,
|
||||
0, 0, 0, -3, -8, -14, 0, 0,
|
||||
-1, -4, -9, -3, 0, -2, 0, 0,
|
||||
-13, -3, 0, -10, 0, -9, -2, -5,
|
||||
-7, -3, -5, -4, 0, -3, -5, -3,
|
||||
-5, 0, 1, 0, -2, -10, 0, 6,
|
||||
0, -5, 0, 3, -6, 12, 0, -3,
|
||||
-3, -3, 0, 0, 0, 0, 0, 0,
|
||||
-3, 0, 0, -4, 0, -3, 0, -6,
|
||||
-7, -9, -2, 0, 0, 0, 0, 23,
|
||||
0, 0, 1, 0, 0, -4, 0, 3,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -2, -6, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -3, 0, -3, 0, 0,
|
||||
-6, -3, 0, -1, 0, 0, 0, 0,
|
||||
0, 0, 1, 0, 0, 0, 0, 4,
|
||||
0, -9, 0, 0, 6, 0, 0, -3,
|
||||
0, -2, 3, 0, -3, 0, -3, -1,
|
||||
0, -4, 0, 0, 0, 0, -4, 0,
|
||||
0, -3, -3, 0, 0, 0, 0, 0,
|
||||
-1, 0, 0, 0, 0, 0, -2, 0,
|
||||
0, 0, 0, 0, 0, 0, -10, 2,
|
||||
-6, 6, 1, -2, -14, 0, 0, -6,
|
||||
-3, 0, -8, 0, -7, 0, -4, -12,
|
||||
-3, -12, -11, -14, 0, -4, 0, -7,
|
||||
-3, -1, -3, -5, -8, -5, -11, -12,
|
||||
-7, -3, 0, 0, 0, 0, 9, -3,
|
||||
6, -6, -11, 0, 1, -9, 0, -14,
|
||||
-2, -3, 6, 1, 0, -4, 0, -2,
|
||||
-19, -3, -15, -3, -21, 0, 1, 0,
|
||||
-2, 0, 0, 0, 0, -1, -2, -11,
|
||||
-2, 0, -19, 0, 0, 0, -3, -8,
|
||||
-1, -14, 0, 0, -1, -4, -9, -3,
|
||||
0, -2, 0, 0, -13, -3, 0, -10,
|
||||
0, -9, -2, -5, -7, -3, -5, -4,
|
||||
0, -3, -5, -3, -5, 0, 1, 0,
|
||||
-2, -10, 0, 6, 0, -5, 0, 3,
|
||||
-6, 2, 12, 0, -3, -3, -3, 0,
|
||||
0, 0, 0, 0, 0, -3, 0, 0,
|
||||
-4, -4, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -3, -3, 0, -4,
|
||||
0, 2, -5, 0, -9, -6, -6, 12,
|
||||
-4, 0, -3, 0, -6, -7, -9, -2,
|
||||
0, 0, 0, 0, 23, 0, 0, 1,
|
||||
0, 0, -4, 0, 3, 0, 0, 0,
|
||||
0, 0, -1, 0, 0, 0, 0, -2,
|
||||
-6, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -3, 0, -3, 0, 0, -6, -3,
|
||||
0, -1, 0, 0, 0, 0, 0, 0,
|
||||
1, 0, 0, 0, 0, 4, 0, -9,
|
||||
0, 0, 6, 5, 0, 0, -3, 0,
|
||||
-2, 3, 0, -3, 0, -3, -1, 0,
|
||||
0, 0, 0, 0, -3, 0, 0, -4,
|
||||
-4, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -3, -3, 0, -4, 0,
|
||||
2, -5, 0, -9, -10, -6, -6, 12,
|
||||
5, 3, -25, -2, 6, -3, 0, -3,
|
||||
-10, 0, -3, -3, -3, 3, -4, -2,
|
||||
-9, -2, 0, -8, 0, -16, -4, 8,
|
||||
-4, -11, 1, -4, -10, -10, -3, 12,
|
||||
0, 0, 0, 2, -11, -12, -7, 9,
|
||||
0, 1, -21, -2, 3, -5, -2, -7,
|
||||
-11, -4, -6, -4, -4, -2, 0, 0,
|
||||
-7, -6, -3, -16, 0, -16, -4, 0,
|
||||
-10, -17, -1, -9, -5, -10, -8, 8,
|
||||
0, 0, -3, 0, 0, 5, -10, 3,
|
||||
0, 0, -15, 0, -3, -6, -5, -2,
|
||||
-10, -7, -7, 0, -4, -9, -3, -7,
|
||||
-5, -9, -3, -5, 0, -9, -3, 0,
|
||||
-3, -6, -7, -8, -8, -11, -4, -6,
|
||||
0, 0, -3, 2, -11, -6, -10, 10,
|
||||
-3, 1, -27, -5, 6, -6, -5, -11,
|
||||
-12, -3, -9, -3, -4, -2, -3, -6,
|
||||
-9, -1, 0, -19, 0, -17, -7, 7,
|
||||
-11, -20, -6, -10, -12, -14, -10, 6,
|
||||
0, 0, 0, 0, 6, 2, -5, 6,
|
||||
0, 0, -9, -1, 0, -1, 0, 1,
|
||||
0, 0, -2, 0, 0, 0, 0, 0,
|
||||
-3, 0, 0, 1, 0, -3, 0, 0,
|
||||
0, 0, -2, -2, -3, 0, 0, 0,
|
||||
-8, 0, 0, 0, 0, 0, 0, -6,
|
||||
-1, 0, 0, 0, -6, 0, -3, 0,
|
||||
0, 0, 0, 2, -11, -7, -12, -7,
|
||||
9, 0, 1, -21, -2, 3, -5, -2,
|
||||
-7, -11, -4, -6, -4, -4, -2, 0,
|
||||
0, -7, -6, -3, -16, 0, -16, -4,
|
||||
0, -10, -17, -1, -9, -5, -10, -8,
|
||||
8, 0, 0, -3, 0, 0, -5, 5,
|
||||
-10, 3, 0, 0, -15, 0, -3, -6,
|
||||
-5, -2, -10, -7, -7, 0, -4, -9,
|
||||
-3, -7, -5, -9, -3, -5, 0, -9,
|
||||
-3, 0, -3, -6, -7, -8, -8, -11,
|
||||
-4, -6, 0, 0, -3, 2, -11, -9,
|
||||
-6, -10, 10, -3, 1, -27, -5, 6,
|
||||
-6, -5, -11, -12, -3, -9, -3, -4,
|
||||
-2, -3, -6, -9, -1, 0, -19, 0,
|
||||
-17, -7, 7, -11, -20, -6, -10, -12,
|
||||
-14, -10, 6, 0, 0, 0, 0, 6,
|
||||
-3, 2, -5, 6, 0, 0, -9, -1,
|
||||
0, -1, 0, 1, 0, 0, -2, 0,
|
||||
0, 0, 0, 0, -3, 0, 0, 1,
|
||||
0, -3, 0, 0, 0, 0, -2, -2,
|
||||
-3, 0, 0, 0, -8, 0, 0, 0,
|
||||
0, 0, 0, 0, -6, -1, 0, 0,
|
||||
0, -6, 0, -3, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, -3, 0, 0, -5,
|
||||
-8, -4, 0, 0, -3, 0, 0, -8,
|
||||
-3, -7, 0, 0, -8, 0, -3, 0,
|
||||
-3, 0, 0, 0, 0, -23, -5, -12,
|
||||
-3, -10, 0, -1, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -4, -5, -2, -5,
|
||||
0, 0, 0, -6, 6, 0, -2, -7,
|
||||
-2, -5, -5, 0, -3, -1, -2, 2,
|
||||
0, 0, -1, 0, 0, -25, -2, -4,
|
||||
0, -6, 0, 0, -2, -2, 0, 0,
|
||||
0, 0, 2, 0, -2, -5, -2, 5,
|
||||
0, 0, 1, 0, 0, 0, 0, 0,
|
||||
0, -3, 0, 0, -5, -8, -4, 0,
|
||||
0, -3, 3, 0, 0, -8, -3, -7,
|
||||
0, 0, -8, 0, -3, 0, -3, 0,
|
||||
0, 0, 0, -23, -5, -12, -3, -10,
|
||||
0, -1, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -4, -5, -2, -5, 0, 0,
|
||||
0, -6, 6, -3, 0, -2, -7, -2,
|
||||
-5, -5, 0, -3, -1, -2, 2, 0,
|
||||
0, -1, 0, 0, -25, -2, -4, 0,
|
||||
-6, 0, 0, -2, -2, 0, 0, 0,
|
||||
0, 2, 0, -2, -5, -2, 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, 0, 0, 0, 0, 0,
|
||||
0, 0, 4, 0, 0, 0, 0, 0,
|
||||
-2, -6, 0, 0, 0, 0, 0, -8,
|
||||
-3, -6, 0, 0, -8, 0, -3, 0,
|
||||
0, 0, 0, 0, 0, -28, 0, -6,
|
||||
-11, -14, 0, -4, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -3, -4, -1, -4,
|
||||
5, 0, 0, 9, -3, -9, 3, 14,
|
||||
5, 6, -8, 3, 12, 3, 8, 6,
|
||||
-2, -6, 0, 0, 0, 3, 0, 0,
|
||||
-8, -3, -6, 0, 0, -8, 0, -3,
|
||||
0, 0, 0, 0, 0, 0, -28, 0,
|
||||
-6, -11, -14, 0, -4, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -3, -4, -1,
|
||||
-4, 5, 0, 0, 9, -3, -3, -9,
|
||||
3, 14, 5, 6, -8, 3, 12, 3,
|
||||
8, 6, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -3, 0, -2,
|
||||
23, 12, 23, 0, 0, 0, 3, 0,
|
||||
0, 11, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -2, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -5,
|
||||
-24, -3, -2, -12, -14, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -3, 0, -2, 23, 12,
|
||||
23, 0, 0, 0, 3, 0, 0, 11,
|
||||
0, 0, 0, 0, 0, 0, 0, -2,
|
||||
0, 0, 0, 0, 0, 0, 0, 3,
|
||||
-7, 0, -3, 2, 5, 3, -9, 0,
|
||||
-1, -2, 3, 0, 0, 0, 0, 0,
|
||||
0, -7, 0, -3, -2, -6, 0, -3,
|
||||
0, -6, -2, 0, -2, -5, 0, -3,
|
||||
-8, -6, -3, 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, -5, -24, -3, -2,
|
||||
-12, -14, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 3, 0, -3, 2,
|
||||
5, 3, -9, 0, -1, -2, 3, 0,
|
||||
0, 0, 0, 0, 0, -7, 0, -3,
|
||||
-2, -6, 0, -3, 0, -6, -2, 0,
|
||||
-2, -5, 0, -3, -8, -6, -3, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -2,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -5, -24, -3, -2,
|
||||
-12, -14, 0, 0, 0, 0, 0, 14,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -3, -3, -3, -12, 1, -2,
|
||||
1, -2, -8, 1, 6, 1, 2, 1,
|
||||
-12, -3, -7, 0, -5, -11, -5, -8,
|
||||
-12, -11, 0, -2, -2, -3, -2, 0,
|
||||
-2, -1, 4, 0, 4, -2, 0, 9,
|
||||
0, 0, 0, 0, 0, 0, 0, -2,
|
||||
-3, -3, 0, 0, -8, 0, -1, 0,
|
||||
0, -5, -24, -3, -2, -12, -14, 0,
|
||||
0, 0, 0, 0, 14, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -3,
|
||||
-3, -3, -3, -12, 1, -2, 1, -2,
|
||||
-8, 1, 6, 1, 2, 1, -12, -3,
|
||||
-7, 0, -5, -11, -5, -8, -12, -11,
|
||||
0, -2, -2, -3, -2, 0, -2, -1,
|
||||
4, 0, 4, -2, 0, 9, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, -2, -3,
|
||||
-3, 0, 0, -8, 0, -1, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -3, -3, 0, -4,
|
||||
0, 0, 0, 0, 3, 0, -5, -5,
|
||||
0, 0, 0, -3, -3, 0, -4, 0,
|
||||
0, 0, 0, 3, -3, 0, -5, -5,
|
||||
-2, 0, -8, -2, -6, -2, -3, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -5, 0, 0,
|
||||
0, 0, -4, 0, -3, 0, 0, -1,
|
||||
0, 0, 0, 0, -10, -9, 2, 3,
|
||||
3, -1, -8, 2, 4, 2, 9, 2,
|
||||
-8, 0, -2, 0, -2, -12, 0, 0,
|
||||
-9, -8, 0, -5, 0, -4, 0, -4,
|
||||
0, -2, 4, 0, -2, -9, -3, 11,
|
||||
0, 0, 0, 0, 0, 3, -3, 2,
|
||||
0, 0, -10, 0, -2, -1, 0, -3,
|
||||
0, 0, -2, 0, -3, -12, -3, -6,
|
||||
0, -9, 0, -3, 0, -5, 0, 2,
|
||||
0, -3, 0, -3, -9, 0, -3, 3,
|
||||
0, 0, 0, 0, 1, 0, 0, -3,
|
||||
-2, 0, -3, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -2, 0, 0,
|
||||
0, 0, 1, 0, -3, -3, 0, 0,
|
||||
7, 6, 0, 0, -18, -16, 1, 12,
|
||||
9, 5, -12, 2, 12, 0, 11, 0,
|
||||
0, 0, 0, 0, -10, -4, -9, 2,
|
||||
3, 3, -1, -8, 2, 4, 2, 9,
|
||||
2, -8, 0, -2, 0, -2, -12, 0,
|
||||
0, -9, -8, 0, -5, 0, -4, 0,
|
||||
-4, 0, -2, 4, 0, -2, -9, -3,
|
||||
11, 0, 0, 0, 0, 0, -7, 3,
|
||||
-3, 2, 0, 0, -10, 0, -2, -1,
|
||||
0, -3, 0, 0, -2, 0, -3, -12,
|
||||
-3, -6, 0, -9, 0, -3, 0, -5,
|
||||
0, 2, 0, -3, 0, -3, -9, 0,
|
||||
-3, 3, 0, 0, 0, 0, 1, -4,
|
||||
0, 0, -3, -2, 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, 0, 0, 0
|
||||
-2, 0, 0, 0, 0, 1, 0, -3,
|
||||
-3, 0, 0, 7, 6, 0, 0, -18,
|
||||
0, -16, 1, 12, 9, 5, -12, 2,
|
||||
12, 0, 11, 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
|
||||
};
|
||||
|
||||
|
||||
@ -1325,8 +1345,8 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes =
|
||||
.class_pair_values = kern_class_values,
|
||||
.left_class_mapping = kern_left_class_mapping,
|
||||
.right_class_mapping = kern_right_class_mapping,
|
||||
.left_class_cnt = 51,
|
||||
.right_class_cnt = 40,
|
||||
.left_class_cnt = 52,
|
||||
.right_class_cnt = 41,
|
||||
};
|
||||
|
||||
/*--------------------
|
||||
@ -1348,7 +1368,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
.cmaps = cmaps,
|
||||
.kern_dsc = &kern_classes,
|
||||
.kern_scale = 16,
|
||||
.cmap_num = 4,
|
||||
.cmap_num = 5,
|
||||
.bpp = 4,
|
||||
.kern_classes = 1,
|
||||
.bitmap_format = 0,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*******************************************************************************
|
||||
* Size: 24 px
|
||||
* Bpp: 4
|
||||
* Opts: --bpp 4 --size 24 --no-compress --font Montserrat-Medium.ttf --symbols 0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/ --format lvgl -o montserrat_medium_24.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575
|
||||
* Opts: --bpp 4 --size 24 --no-compress --font Montserrat-Medium.ttf --symbols 0123456789.°éèûCABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz %,'():ê/- --format lvgl -o montserrat_medium_24.c --font fa-solid-900.ttf --range 61461,0xf0c2,0xf575
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||
@ -78,6 +78,10 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
|
||||
0x3b, 0x80, 0xcf, 0xf3, 0xaf, 0xf3, 0xf, 0xe0,
|
||||
0x1f, 0x90, 0x5f, 0x40, 0x9e, 0x0,
|
||||
|
||||
/* U+002D "-" */
|
||||
0x0, 0x0, 0x0, 0xa, 0xff, 0xff, 0xfd, 0xaf,
|
||||
0xff, 0xff, 0xd0,
|
||||
|
||||
/* U+002E "." */
|
||||
0x4, 0x10, 0x9f, 0xf1, 0xdf, 0xf4, 0x6f, 0xb0,
|
||||
|
||||
@ -1354,79 +1358,80 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
{.bitmap_index = 181, .adv_w = 129, .box_w = 6, .box_h = 23, .ofs_x = 2, .ofs_y = -5},
|
||||
{.bitmap_index = 250, .adv_w = 130, .box_w = 6, .box_h = 23, .ofs_x = 0, .ofs_y = -5},
|
||||
{.bitmap_index = 319, .adv_w = 87, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -4},
|
||||
{.bitmap_index = 333, .adv_w = 87, .box_w = 4, .box_h = 4, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 341, .adv_w = 135, .box_w = 11, .box_h = 23, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 468, .adv_w = 256, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 587, .adv_w = 142, .box_w = 7, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 647, .adv_w = 220, .box_w = 13, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 758, .adv_w = 220, .box_w = 13, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 869, .adv_w = 257, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1005, .adv_w = 220, .box_w = 13, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1116, .adv_w = 237, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1235, .adv_w = 230, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1354, .adv_w = 247, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1473, .adv_w = 237, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1592, .adv_w = 87, .box_w = 4, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1618, .adv_w = 281, .box_w = 19, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1780, .adv_w = 291, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 1908, .adv_w = 278, .box_w = 16, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2044, .adv_w = 317, .box_w = 17, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2189, .adv_w = 257, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2300, .adv_w = 244, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2411, .adv_w = 296, .box_w = 16, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2547, .adv_w = 312, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2675, .adv_w = 119, .box_w = 3, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2701, .adv_w = 197, .box_w = 11, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 2795, .adv_w = 276, .box_w = 16, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2931, .adv_w = 228, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3042, .adv_w = 367, .box_w = 19, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3204, .adv_w = 312, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3332, .adv_w = 323, .box_w = 19, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3494, .adv_w = 277, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3622, .adv_w = 323, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 3812, .adv_w = 279, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3940, .adv_w = 238, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4059, .adv_w = 225, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4178, .adv_w = 304, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 4306, .adv_w = 273, .box_w = 19, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 4468, .adv_w = 432, .box_w = 27, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4698, .adv_w = 258, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4834, .adv_w = 248, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 4979, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5107, .adv_w = 230, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5185, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 5311, .adv_w = 219, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5389, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5515, .adv_w = 235, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5600, .adv_w = 136, .box_w = 10, .box_h = 18, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 5690, .adv_w = 265, .box_w = 14, .box_h = 18, .ofs_x = 1, .ofs_y = -5},
|
||||
{.bitmap_index = 5816, .adv_w = 262, .box_w = 13, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 5933, .adv_w = 107, .box_w = 4, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5969, .adv_w = 109, .box_w = 9, .box_h = 23, .ofs_x = -3, .ofs_y = -5},
|
||||
{.bitmap_index = 6073, .adv_w = 237, .box_w = 13, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6190, .adv_w = 107, .box_w = 3, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6217, .adv_w = 406, .box_w = 22, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6360, .adv_w = 262, .box_w = 13, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6445, .adv_w = 244, .box_w = 14, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 6536, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 2, .ofs_y = -5},
|
||||
{.bitmap_index = 6662, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 1, .ofs_y = -5},
|
||||
{.bitmap_index = 6788, .adv_w = 157, .box_w = 8, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6840, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 6918, .adv_w = 159, .box_w = 10, .box_h = 16, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 6998, .adv_w = 260, .box_w = 13, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 7083, .adv_w = 215, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 7181, .adv_w = 345, .box_w = 22, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 7324, .adv_w = 212, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 7409, .adv_w = 215, .box_w = 15, .box_h = 18, .ofs_x = -1, .ofs_y = -5},
|
||||
{.bitmap_index = 7544, .adv_w = 200, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 7622, .adv_w = 161, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = 9},
|
||||
{.bitmap_index = 7662, .adv_w = 235, .box_w = 13, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 7779, .adv_w = 235, .box_w = 13, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 7896, .adv_w = 235, .box_w = 13, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 8013, .adv_w = 260, .box_w = 13, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 8130, .adv_w = 432, .box_w = 28, .box_h = 25, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 8480, .adv_w = 480, .box_w = 30, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8810, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}
|
||||
{.bitmap_index = 333, .adv_w = 147, .box_w = 7, .box_h = 3, .ofs_x = 1, .ofs_y = 6},
|
||||
{.bitmap_index = 344, .adv_w = 87, .box_w = 4, .box_h = 4, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 352, .adv_w = 135, .box_w = 11, .box_h = 23, .ofs_x = -1, .ofs_y = -2},
|
||||
{.bitmap_index = 479, .adv_w = 256, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 598, .adv_w = 142, .box_w = 7, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 658, .adv_w = 220, .box_w = 13, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 769, .adv_w = 220, .box_w = 13, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 880, .adv_w = 257, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1016, .adv_w = 220, .box_w = 13, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1127, .adv_w = 237, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1246, .adv_w = 230, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1365, .adv_w = 247, .box_w = 14, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1484, .adv_w = 237, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 1603, .adv_w = 87, .box_w = 4, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 1629, .adv_w = 281, .box_w = 19, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 1791, .adv_w = 291, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 1919, .adv_w = 278, .box_w = 16, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2055, .adv_w = 317, .box_w = 17, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2200, .adv_w = 257, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2311, .adv_w = 244, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2422, .adv_w = 296, .box_w = 16, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 2558, .adv_w = 312, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2686, .adv_w = 119, .box_w = 3, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2712, .adv_w = 197, .box_w = 11, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 2806, .adv_w = 276, .box_w = 16, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 2942, .adv_w = 228, .box_w = 13, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3053, .adv_w = 367, .box_w = 19, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3215, .adv_w = 312, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3343, .adv_w = 323, .box_w = 19, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 3505, .adv_w = 277, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3633, .adv_w = 323, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
|
||||
{.bitmap_index = 3823, .adv_w = 279, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 3951, .adv_w = 238, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4070, .adv_w = 225, .box_w = 14, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4189, .adv_w = 304, .box_w = 15, .box_h = 17, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 4317, .adv_w = 273, .box_w = 19, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 4479, .adv_w = 432, .box_w = 27, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4709, .adv_w = 258, .box_w = 16, .box_h = 17, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 4845, .adv_w = 248, .box_w = 17, .box_h = 17, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 4990, .adv_w = 252, .box_w = 15, .box_h = 17, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5118, .adv_w = 230, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5196, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 5322, .adv_w = 219, .box_w = 12, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5400, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5526, .adv_w = 235, .box_w = 13, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5611, .adv_w = 136, .box_w = 10, .box_h = 18, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 5701, .adv_w = 265, .box_w = 14, .box_h = 18, .ofs_x = 1, .ofs_y = -5},
|
||||
{.bitmap_index = 5827, .adv_w = 262, .box_w = 13, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 5944, .adv_w = 107, .box_w = 4, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 5980, .adv_w = 109, .box_w = 9, .box_h = 23, .ofs_x = -3, .ofs_y = -5},
|
||||
{.bitmap_index = 6084, .adv_w = 237, .box_w = 13, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6201, .adv_w = 107, .box_w = 3, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6228, .adv_w = 406, .box_w = 22, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6371, .adv_w = 262, .box_w = 13, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6456, .adv_w = 244, .box_w = 14, .box_h = 13, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 6547, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 2, .ofs_y = -5},
|
||||
{.bitmap_index = 6673, .adv_w = 262, .box_w = 14, .box_h = 18, .ofs_x = 1, .ofs_y = -5},
|
||||
{.bitmap_index = 6799, .adv_w = 157, .box_w = 8, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 6851, .adv_w = 192, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 6929, .adv_w = 159, .box_w = 10, .box_h = 16, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 7009, .adv_w = 260, .box_w = 13, .box_h = 13, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 7094, .adv_w = 215, .box_w = 15, .box_h = 13, .ofs_x = -1, .ofs_y = 0},
|
||||
{.bitmap_index = 7192, .adv_w = 345, .box_w = 22, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 7335, .adv_w = 212, .box_w = 13, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 7420, .adv_w = 215, .box_w = 15, .box_h = 18, .ofs_x = -1, .ofs_y = -5},
|
||||
{.bitmap_index = 7555, .adv_w = 200, .box_w = 12, .box_h = 13, .ofs_x = 0, .ofs_y = 0},
|
||||
{.bitmap_index = 7633, .adv_w = 161, .box_w = 8, .box_h = 10, .ofs_x = 1, .ofs_y = 9},
|
||||
{.bitmap_index = 7673, .adv_w = 235, .box_w = 13, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 7790, .adv_w = 235, .box_w = 13, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 7907, .adv_w = 235, .box_w = 13, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
|
||||
{.bitmap_index = 8024, .adv_w = 260, .box_w = 13, .box_h = 18, .ofs_x = 2, .ofs_y = 0},
|
||||
{.bitmap_index = 8141, .adv_w = 432, .box_w = 28, .box_h = 25, .ofs_x = 0, .ofs_y = -3},
|
||||
{.bitmap_index = 8491, .adv_w = 480, .box_w = 30, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
|
||||
{.bitmap_index = 8821, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3}
|
||||
};
|
||||
|
||||
/*---------------------
|
||||
@ -1435,12 +1440,10 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
|
||||
|
||||
static const uint8_t glyph_id_ofs_list_0[] = {
|
||||
0, 0, 0, 0, 0, 1, 0, 2,
|
||||
3, 4, 0, 0, 5, 0, 6, 7,
|
||||
8, 9, 10, 11, 12, 13, 14, 15,
|
||||
16, 17, 18
|
||||
3, 4
|
||||
};
|
||||
|
||||
static const uint16_t unicode_list_3[] = {
|
||||
static const uint16_t unicode_list_4[] = {
|
||||
0x0, 0x38, 0x39, 0x3a, 0x4b, 0xef65, 0xf012, 0xf4c5
|
||||
};
|
||||
|
||||
@ -1448,20 +1451,24 @@ static const uint16_t unicode_list_3[] = {
|
||||
static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
{
|
||||
{
|
||||
.range_start = 32, .range_length = 27, .glyph_id_start = 1,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_0, .list_length = 27, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL
|
||||
.range_start = 32, .range_length = 10, .glyph_id_start = 1,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_0, .list_length = 10, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL
|
||||
},
|
||||
{
|
||||
.range_start = 65, .range_length = 26, .glyph_id_start = 20,
|
||||
.range_start = 44, .range_length = 15, .glyph_id_start = 6,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 97, .range_length = 26, .glyph_id_start = 46,
|
||||
.range_start = 65, .range_length = 26, .glyph_id_start = 21,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 176, .range_length = 62662, .glyph_id_start = 72,
|
||||
.unicode_list = unicode_list_3, .glyph_id_ofs_list = NULL, .list_length = 8, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
.range_start = 97, .range_length = 26, .glyph_id_start = 47,
|
||||
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
|
||||
},
|
||||
{
|
||||
.range_start = 176, .range_length = 62662, .glyph_id_start = 73,
|
||||
.unicode_list = unicode_list_4, .glyph_id_ofs_list = NULL, .list_length = 8, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
|
||||
}
|
||||
};
|
||||
|
||||
@ -1473,142 +1480,152 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
|
||||
/*Map glyph_ids to kern left classes*/
|
||||
static const uint8_t kern_left_class_mapping[] =
|
||||
{
|
||||
0, 0, 1, 2, 3, 4, 5, 5,
|
||||
6, 7, 0, 8, 9, 10, 11, 12,
|
||||
13, 14, 7, 15, 16, 17, 18, 19,
|
||||
20, 21, 22, 23, 23, 24, 25, 26,
|
||||
23, 23, 19, 27, 28, 29, 30, 31,
|
||||
24, 32, 32, 33, 34, 35, 36, 37,
|
||||
38, 39, 40, 41, 42, 36, 42, 42,
|
||||
43, 39, 36, 36, 37, 37, 44, 45,
|
||||
46, 47, 42, 48, 48, 49, 48, 50,
|
||||
51, 40, 40, 40, 42, 0, 0, 0
|
||||
0, 0, 1, 2, 3, 4, 5, 6,
|
||||
5, 7, 8, 0, 9, 10, 11, 12,
|
||||
13, 14, 15, 8, 16, 17, 18, 19,
|
||||
20, 21, 22, 23, 24, 24, 25, 26,
|
||||
27, 24, 24, 20, 28, 29, 30, 31,
|
||||
32, 25, 33, 33, 34, 35, 36, 37,
|
||||
38, 39, 40, 41, 42, 43, 37, 43,
|
||||
43, 44, 40, 37, 37, 38, 38, 45,
|
||||
46, 47, 48, 43, 49, 49, 50, 49,
|
||||
51, 52, 41, 41, 41, 43, 0, 0,
|
||||
0
|
||||
};
|
||||
|
||||
/*Map glyph_ids to kern right classes*/
|
||||
static const uint8_t kern_right_class_mapping[] =
|
||||
{
|
||||
0, 0, 1, 2, 3, 4, 5, 5,
|
||||
6, 7, 8, 9, 10, 11, 12, 7,
|
||||
13, 14, 15, 16, 17, 18, 19, 18,
|
||||
18, 18, 19, 18, 18, 20, 18, 18,
|
||||
18, 18, 19, 18, 19, 18, 21, 22,
|
||||
23, 24, 24, 25, 26, 27, 28, 29,
|
||||
30, 30, 30, 0, 30, 29, 31, 32,
|
||||
29, 29, 33, 33, 30, 33, 30, 33,
|
||||
34, 35, 36, 37, 37, 38, 37, 39,
|
||||
40, 30, 30, 30, 36, 0, 0, 0
|
||||
0, 0, 1, 2, 3, 4, 5, 6,
|
||||
5, 7, 8, 9, 10, 11, 12, 13,
|
||||
8, 14, 15, 16, 17, 18, 19, 20,
|
||||
19, 19, 19, 20, 19, 19, 21, 19,
|
||||
19, 19, 19, 20, 19, 20, 19, 22,
|
||||
23, 24, 25, 25, 26, 27, 28, 29,
|
||||
30, 31, 31, 31, 0, 31, 30, 32,
|
||||
33, 30, 30, 34, 34, 31, 34, 31,
|
||||
34, 35, 36, 37, 38, 38, 39, 38,
|
||||
40, 41, 31, 31, 31, 37, 0, 0,
|
||||
0
|
||||
};
|
||||
|
||||
/*Kern values between classes*/
|
||||
static const int8_t kern_class_values[] =
|
||||
{
|
||||
-46, -10, 0, -8, 12, 0, 0, -8,
|
||||
4, 4, 13, 8, -7, 8, 0, 0,
|
||||
-46, -10, 0, -8, 12, 8, 0, 0,
|
||||
-8, 4, 4, 13, 8, -7, 8, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -10,
|
||||
10, 17, 0, 0, -21, -23, 3, 18,
|
||||
8, 7, -15, 3, 19, 1, 16, 4,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-10, 10, 17, 0, 0, -21, 0, -23,
|
||||
3, 18, 8, 7, -15, 3, 19, 1,
|
||||
16, 4, 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, 13, 0, 4,
|
||||
0, 0, -8, 0, 0, 0, 0, 0,
|
||||
0, 8, 0, 0, 0, 0, 0, 0,
|
||||
13, 0, 4, 0, 0, -8, 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, -14, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -14, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -24, -21, 0, 0,
|
||||
0, -3, 38, -5, -5, 4, 4, -3,
|
||||
0, -5, 4, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-24, -21, 0, 0, 0, 38, -5, -5,
|
||||
4, 4, -3, 0, -5, 4, 0, 0,
|
||||
0, 0, 0, 0, -24, -14, 0, 0,
|
||||
0, -3, 1, 0, 3, -7, -5, -8,
|
||||
3, 0, -4, 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, -24,
|
||||
0, 23, 0, 13, -37, -26, -8, 12,
|
||||
0, 0, -26, 0, 5, -9, 0, -6,
|
||||
0, 0, 0, 0, 0, 0, 0, 23,
|
||||
0, 13, -37, -26, -26, -8, 12, 0,
|
||||
0, -26, 0, 5, -9, 0, -6, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 18,
|
||||
0, 3, 0, 0, -5, -8, 0, -1,
|
||||
0, 0, 0, 0, 0, 0, 18, 0,
|
||||
3, 0, 0, -5, 3, -8, 0, -1,
|
||||
-1, -4, 0, 0, -3, 0, 0, 0,
|
||||
-3, 0, 0, -9, 0, -8, 0, -10,
|
||||
-13, -13, -7, 0, 0, 0, 0, -3,
|
||||
0, 0, 4, 0, 3, -4, 0, 1,
|
||||
4, 0, 0, 0, 4, 4, -1, 0,
|
||||
0, 0, -7, 0, -1, 0, 0, 0,
|
||||
1, 0, 0, 5, 0, -3, 0, -5,
|
||||
0, -7, 0, 0, 0, -4, 0, 0,
|
||||
0, 0, 0, -1, 1, -3, -3, 0,
|
||||
-4, -4, 0, 0, 0, 0, 0, 0,
|
||||
-2, -2, 0, -4, -5, 0, 0, 0,
|
||||
1, 0, 0, 0, 0, -3, 0, -4,
|
||||
-4, -4, 0, 0, 0, 0, 0, -2,
|
||||
0, 0, 0, 0, -3, -5, 0, -6,
|
||||
-12, -12, 0, 0, 8, 10, 0, -10,
|
||||
-1, -5, 0, -1, -18, 4, -3, 3,
|
||||
0, 0, 4, 1, -3, -20, 0, -20,
|
||||
-3, -33, -3, 11, 0, 5, 0, 0,
|
||||
0, 0, 1, 0, -7, -5, 0, -12,
|
||||
-4, 0, 0, 0, 0, 0, 0, 0,
|
||||
-2, -2, 0, -2, -5, 0, 0, 0,
|
||||
0, 0, 0, -4, 0, -4, 0, -3,
|
||||
-5, -3, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -3, -3, 0, -5,
|
||||
-8, -3, 0, 0, 4, 4, 0, 0,
|
||||
0, 0, 0, 0, -3, 0, 0, 0,
|
||||
3, 0, 0, 0, 0, -4, 0, -4,
|
||||
-3, -5, 0, 0, 0, 3, 0, -3,
|
||||
0, 0, 0, 0, -4, -6, 0, -7,
|
||||
1, 12, 0, 0, -20, -16, -8, 4,
|
||||
0, -3, -25, -7, 0, -7, 0, -8,
|
||||
-25, 0, -7, -10, -3, 0, 0, 2,
|
||||
-1, 3, -3, -15, 0, -19, -9, -8,
|
||||
-9, -12, -5, -10, -1, -7, -10, 2,
|
||||
-4, 1, 0, 0, 4, 0, 0, 0,
|
||||
4, 0, 0, 0, 4, -3, 4, -1,
|
||||
0, 0, 0, -7, 0, -1, 0, 0,
|
||||
0, 1, 0, 0, 5, 0, -3, 0,
|
||||
-5, 0, -7, 0, 0, 0, -4, 0,
|
||||
0, 0, 0, 0, -1, 1, -3, -3,
|
||||
0, -4, -4, 0, 0, 0, 0, 0,
|
||||
0, 0, -2, -2, 0, -4, -5, 0,
|
||||
0, 0, 1, 0, 0, 0, 0, -3,
|
||||
0, -4, -4, -4, 0, 0, 0, 0,
|
||||
0, -2, 0, 0, 0, 0, -3, -5,
|
||||
0, -6, -12, -12, 0, 0, 8, 4,
|
||||
10, 0, -10, -1, -5, 0, -1, -18,
|
||||
4, -3, 3, 0, 0, 4, 1, -3,
|
||||
-20, 0, -20, -3, -33, -3, 11, 0,
|
||||
5, 0, 0, 0, 0, 1, 0, -7,
|
||||
-5, 0, -12, -4, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -2, -2, 0, -2,
|
||||
-5, 0, 0, 0, 0, 0, 0, -4,
|
||||
0, -4, 0, -3, -5, -3, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-2, 0, 0, -1, 0, -4, 0, -7,
|
||||
-8, -8, -1, 0, 0, 0, 0, -3,
|
||||
0, 0, 0, 0, 2, -2, 0, 0,
|
||||
0, 4, 0, 0, 0, 18, 0, 0,
|
||||
-3, -3, 0, -5, -8, -3, 0, 0,
|
||||
4, 2, 4, 0, 0, 0, 0, 0,
|
||||
0, -3, 0, 0, 0, 3, 0, 0,
|
||||
0, 0, -4, 0, -4, -3, -5, 0,
|
||||
0, 0, 3, 0, -3, 0, 0, 0,
|
||||
0, -4, -6, 0, -7, 1, 12, 0,
|
||||
0, -20, -19, -16, -8, 4, 0, -3,
|
||||
-25, -7, 0, -7, 0, -8, -25, 0,
|
||||
-7, -10, -3, 0, 0, 2, -1, 3,
|
||||
-3, -15, 0, -19, -9, -8, -9, -12,
|
||||
-5, -10, -1, -7, -10, 2, -4, 1,
|
||||
0, 0, 4, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -2,
|
||||
0, 0, -1, 0, -4, 0, -7, -8,
|
||||
-8, -1, 0, 0, 0, 0, -3, 0,
|
||||
0, 0, 0, 2, -2, 0, 0, 0,
|
||||
4, 0, 0, 0, 0, 18, 0, 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, 0, 0, 0, 0,
|
||||
0, -17, 0, 0, 13, 12, -3, -16,
|
||||
0, 4, -6, 0, -19, -2, -5, 4,
|
||||
5, 0, -4, 6, 0, -13, -6, -14,
|
||||
-13, -16, 0, 0, 0, -2, 0, 0,
|
||||
0, -2, -2, -4, -10, -13, -1, -36,
|
||||
0, 0, 0, 0, 1, 0, 0, 0,
|
||||
0, -17, 0, 0, 13, -7, 12, -3,
|
||||
-16, 0, 4, -6, 0, -19, -2, -5,
|
||||
4, 5, 0, -4, 6, 0, -13, -6,
|
||||
-14, -13, -16, 0, 0, 0, -2, 0,
|
||||
0, 0, -2, -2, -4, -10, -13, -1,
|
||||
-36, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -4, 0, -2,
|
||||
-4, -6, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -4,
|
||||
0, -2, -4, -6, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 5, 0, -8, 4,
|
||||
-3, -1, -10, -4, 0, -5, -4, -3,
|
||||
-7, 0, -6, 0, -1, -3, -1, -3,
|
||||
-7, -5, 0, -3, 0, -8, 0, 0,
|
||||
0, -8, 0, -7, 0, -7, -7, 4,
|
||||
0, -7, 0, 5, -8, -8, 0, -4,
|
||||
-4, -5, 0, 0, 0, 0, 0, 0,
|
||||
-4, 0, 0, -6, 0, -4, 0, -8,
|
||||
-10, -12, -3, 0, 0, 0, 0, 31,
|
||||
0, 0, 2, 0, 0, -5, 0, 4,
|
||||
0, 0, 0, 0, 4, 0, -5, 0,
|
||||
-3, -5, -12, -3, -3, -3, -1, -3,
|
||||
0, 0, -1, 0, 0, 0, 0, -4,
|
||||
-3, -3, 0, -3, 0, -3, 0, 0,
|
||||
0, -3, -5, -3, -3, -5, -3, 0,
|
||||
0, 15, 0, -3, -4, -16, -5, 6,
|
||||
0, 0, -18, -7, 4, -7, 3, 0,
|
||||
-12, 0, -3, -6, -1, 2, 0, 0,
|
||||
-7, 0, 0, -7, 0, -7, -4, -6,
|
||||
-4, -4, 0, -7, 2, -7, -7, 12,
|
||||
0, 0, 0, 0, 4, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 5, -1,
|
||||
0, -8, 4, -3, -1, -10, -4, 0,
|
||||
-5, -4, -3, -7, 0, -6, 0, -1,
|
||||
-3, -1, -3, -7, -5, 0, -3, 0,
|
||||
-8, 0, 0, 0, -8, 0, -7, 0,
|
||||
-7, -7, 4, 0, -7, 0, 5, -8,
|
||||
3, -8, 0, -4, -4, -5, 0, 0,
|
||||
0, 0, 0, 0, -4, 0, 0, -6,
|
||||
0, -4, 0, -8, -10, -12, -3, 0,
|
||||
0, 0, 0, 31, 0, 0, 2, 0,
|
||||
0, -5, 0, 4, 0, 0, 0, 0,
|
||||
4, -8, 0, -5, 0, -3, -5, -12,
|
||||
-3, -3, -3, -1, -3, 0, 0, -1,
|
||||
0, 0, 0, 0, -4, -3, -3, 0,
|
||||
-3, 0, -3, 0, 0, 0, -3, -5,
|
||||
-3, -3, -5, -3, 0, 0, 15, 0,
|
||||
-3, -4, 0, -16, -5, 6, 0, 0,
|
||||
-18, -7, 4, -7, 3, 0, -12, 0,
|
||||
-3, -6, -1, 2, 0, 0, -7, 0,
|
||||
0, -7, 0, -7, -4, -6, -4, -4,
|
||||
0, -7, 2, -7, -7, 12, 0, 0,
|
||||
0, 0, 4, 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,
|
||||
@ -1618,146 +1635,150 @@ static const int8_t kern_class_values[] =
|
||||
0, 0, 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, -3, -4, 0, 0,
|
||||
0, 0, 0, 0, -3, 0, -4, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
-6, 0, 0, 0, 0, -5, 0, 0,
|
||||
-4, -4, 0, 0, 0, 0, 0, -2,
|
||||
0, 0, 0, 0, 0, -3, 0, 0,
|
||||
0, 0, 0, 0, 0, 3, -8, 8,
|
||||
1, -3, -18, 0, 0, -8, -4, 0,
|
||||
-11, 0, -10, 0, -6, -17, -4, -15,
|
||||
-15, -18, 0, -5, 0, -9, -4, -1,
|
||||
-4, -7, -10, -7, -14, -16, -9, -4,
|
||||
0, 0, 0, 0, 12, 8, -8, -14,
|
||||
0, 1, -12, 0, -19, -3, -4, 8,
|
||||
1, 0, -5, 0, -3, -25, -5, -20,
|
||||
-4, -28, 0, 1, 0, -3, 0, 0,
|
||||
0, 0, -2, -3, -15, -3, 0, -25,
|
||||
0, 0, 0, -3, -11, -18, 0, 0,
|
||||
-2, -6, -12, -4, 0, -3, 0, 0,
|
||||
-17, -4, 0, -13, 0, -12, -3, -7,
|
||||
-10, -4, -7, -6, 0, -5, -7, -4,
|
||||
-7, 0, 2, 0, -3, -13, 0, 8,
|
||||
0, -7, 0, 5, -8, 16, 0, -4,
|
||||
-4, -5, 0, 0, 0, 0, 0, 0,
|
||||
-4, 0, 0, -6, 0, -4, 0, -8,
|
||||
-10, -12, -3, 0, 0, 0, 0, 31,
|
||||
0, 0, 2, 0, 0, -5, 0, 4,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -3, -8, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -4, 0, -4, 0, 0,
|
||||
-8, -4, 0, -2, 0, 0, 0, 0,
|
||||
0, 0, 2, 0, 0, 0, 0, 6,
|
||||
0, -12, 0, 0, 8, 0, 0, -4,
|
||||
0, -3, 4, 0, -4, 0, -4, -2,
|
||||
0, -6, 0, 0, 0, 0, -5, 0,
|
||||
0, -4, -4, 0, 0, 0, 0, 0,
|
||||
-2, 0, 0, 0, 0, 0, -3, 0,
|
||||
0, 0, 0, 0, 0, 0, -13, 3,
|
||||
-8, 8, 1, -3, -18, 0, 0, -8,
|
||||
-4, 0, -11, 0, -10, 0, -6, -17,
|
||||
-4, -15, -15, -18, 0, -5, 0, -9,
|
||||
-4, -1, -4, -7, -10, -7, -14, -16,
|
||||
-9, -4, 0, 0, 0, 0, 12, -3,
|
||||
8, -8, -14, 0, 1, -12, 0, -19,
|
||||
-3, -4, 8, 1, 0, -5, 0, -3,
|
||||
-25, -5, -20, -4, -28, 0, 1, 0,
|
||||
-3, 0, 0, 0, 0, -2, -3, -15,
|
||||
-3, 0, -25, 0, 0, 0, -3, -11,
|
||||
-1, -18, 0, 0, -2, -6, -12, -4,
|
||||
0, -3, 0, 0, -17, -4, 0, -13,
|
||||
0, -12, -3, -7, -10, -4, -7, -6,
|
||||
0, -5, -7, -4, -7, 0, 2, 0,
|
||||
-3, -13, 0, 8, 0, -7, 0, 5,
|
||||
-8, 3, 16, 0, -4, -4, -5, 0,
|
||||
0, 0, 0, 0, 0, -4, 0, 0,
|
||||
-5, -6, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -4, -4, 0, -6,
|
||||
0, 3, -6, 0, -12, -8, -8, 15,
|
||||
-6, 0, -4, 0, -8, -10, -12, -3,
|
||||
0, 0, 0, 0, 31, 0, 0, 2,
|
||||
0, 0, -5, 0, 4, 0, 0, 0,
|
||||
0, 0, -1, 0, 0, 0, 0, -3,
|
||||
-8, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, -4, 0, -4, 0, 0, -8, -4,
|
||||
0, -2, 0, 0, 0, 0, 0, 0,
|
||||
2, 0, 0, 0, 0, 6, 0, -12,
|
||||
0, 0, 8, 7, 0, 0, -4, 0,
|
||||
-3, 4, 0, -4, 0, -4, -2, 0,
|
||||
0, 0, 0, 0, -4, 0, 0, -5,
|
||||
-6, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -4, -4, 0, -6, 0,
|
||||
3, -6, 0, -12, -13, -8, -8, 15,
|
||||
7, 4, -33, -3, 8, -4, 0, -4,
|
||||
-13, 0, -4, -4, -3, 4, -5, -3,
|
||||
-12, -3, 0, -11, 0, -21, -5, 11,
|
||||
-5, -15, 1, -5, -13, -13, -4, 15,
|
||||
0, 0, 0, 3, -14, -15, -10, 12,
|
||||
0, 1, -28, -3, 4, -7, -3, -9,
|
||||
-14, -6, -8, -6, -6, -3, 0, 0,
|
||||
-9, -8, -4, -21, 0, -21, -5, 0,
|
||||
-13, -22, -1, -12, -7, -13, -11, 10,
|
||||
0, 0, -3, 0, 0, 7, -13, 4,
|
||||
0, 0, -20, 0, -4, -8, -7, -3,
|
||||
-13, -9, -10, 0, -5, -12, -4, -9,
|
||||
-7, -12, -4, -7, 0, -12, -4, 0,
|
||||
-4, -8, -9, -10, -11, -15, -5, -8,
|
||||
0, 0, -5, 2, -14, -8, -13, 13,
|
||||
-4, 2, -36, -7, 8, -8, -7, -14,
|
||||
-16, -5, -12, -4, -6, -3, -4, -8,
|
||||
-12, -1, 0, -25, 0, -23, -9, 9,
|
||||
-15, -26, -8, -13, -16, -19, -13, 8,
|
||||
0, 0, 0, 0, 8, 3, -7, 8,
|
||||
0, 0, -12, -1, 0, -1, 0, 1,
|
||||
0, 0, -3, 0, 0, 0, 0, 0,
|
||||
-4, 0, 0, 1, 0, -5, 0, 0,
|
||||
0, 0, -3, -3, -5, 0, 0, 0,
|
||||
-11, 0, 0, 0, 0, 0, 0, -8,
|
||||
-2, 0, 0, 0, -8, 0, -5, 0,
|
||||
0, 0, 0, 3, -14, -9, -15, -10,
|
||||
12, 0, 1, -28, -3, 4, -7, -3,
|
||||
-9, -14, -6, -8, -6, -6, -3, 0,
|
||||
0, -9, -8, -4, -21, 0, -21, -5,
|
||||
0, -13, -22, -1, -12, -7, -13, -11,
|
||||
10, 0, 0, -3, 0, 0, -7, 7,
|
||||
-13, 4, 0, 0, -20, 0, -4, -8,
|
||||
-7, -3, -13, -9, -10, 0, -5, -12,
|
||||
-4, -9, -7, -12, -4, -7, 0, -12,
|
||||
-4, 0, -4, -8, -9, -10, -11, -15,
|
||||
-5, -8, 0, 0, -5, 2, -14, -12,
|
||||
-8, -13, 13, -4, 2, -36, -7, 8,
|
||||
-8, -7, -14, -16, -5, -12, -4, -6,
|
||||
-3, -4, -8, -12, -1, 0, -25, 0,
|
||||
-23, -9, 9, -15, -26, -8, -13, -16,
|
||||
-19, -13, 8, 0, 0, 0, 0, 8,
|
||||
-5, 3, -7, 8, 0, 0, -12, -1,
|
||||
0, -1, 0, 1, 0, 0, -3, 0,
|
||||
0, 0, 0, 0, -4, 0, 0, 1,
|
||||
0, -5, 0, 0, 0, 0, -3, -3,
|
||||
-5, 0, 0, 0, -11, 0, 0, 0,
|
||||
0, 0, 0, 0, -8, -2, 0, 0,
|
||||
0, -8, 0, -5, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, -4, 0, 0, -7,
|
||||
-10, -6, 0, 0, -5, 0, 0, -10,
|
||||
-4, -9, 0, 0, -10, 0, -4, 0,
|
||||
-4, 0, 0, 0, 0, -31, -7, -15,
|
||||
-4, -14, 0, -2, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -6, -7, -3, -7,
|
||||
0, 0, 0, -8, 8, 0, -3, -9,
|
||||
-3, -7, -7, 0, -5, -2, -3, 3,
|
||||
0, 0, -1, 0, 0, -34, -3, -5,
|
||||
0, -8, 0, 0, -3, -3, 0, 0,
|
||||
0, 0, 3, 0, -3, -7, -3, 7,
|
||||
0, 0, 1, 0, 0, 0, 0, 0,
|
||||
0, -4, 0, 0, -7, -10, -6, 0,
|
||||
0, -5, 4, 0, 0, -10, -4, -9,
|
||||
0, 0, -10, 0, -4, 0, -4, 0,
|
||||
0, 0, 0, -31, -7, -15, -4, -14,
|
||||
0, -2, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -6, -7, -3, -7, 0, 0,
|
||||
0, -8, 8, -4, 0, -3, -9, -3,
|
||||
-7, -7, 0, -5, -2, -3, 3, 0,
|
||||
0, -1, 0, 0, -34, -3, -5, 0,
|
||||
-8, 0, 0, -3, -3, 0, 0, 0,
|
||||
0, 3, 0, -3, -7, -3, 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, 5, 0, 0, 0, 0, 0,
|
||||
-3, -8, 0, 0, 0, 0, 0, -10,
|
||||
-4, -8, 0, 0, -11, 0, -4, 0,
|
||||
0, 0, 0, 0, 0, -37, 0, -8,
|
||||
-14, -19, 0, -6, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -4, -6, -2, -6,
|
||||
7, 0, 0, 12, -4, -12, 5, 19,
|
||||
7, 8, -10, 5, 16, 5, 11, 8,
|
||||
-3, -8, 0, 0, 0, 4, 0, 0,
|
||||
-10, -4, -8, 0, 0, -11, 0, -4,
|
||||
0, 0, 0, 0, 0, 0, -37, 0,
|
||||
-8, -14, -19, 0, -6, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -4, -6, -2,
|
||||
-6, 7, 0, 0, 12, -4, -4, -12,
|
||||
5, 19, 7, 8, -10, 5, 16, 5,
|
||||
11, 8, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -4, 0, -3,
|
||||
31, 17, 31, 0, 0, 0, 4, 0,
|
||||
0, 14, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -3, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -6,
|
||||
-32, -5, -3, -16, -19, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, -4, 0, -3, 31, 17,
|
||||
31, 0, 0, 0, 4, 0, 0, 14,
|
||||
0, 0, 0, 0, 0, 0, 0, -3,
|
||||
0, 0, 0, 0, 0, 0, 0, 4,
|
||||
-9, 0, -4, 3, 7, 4, -12, 0,
|
||||
-1, -3, 4, 0, 0, 0, 0, 0,
|
||||
0, -10, 0, -3, -3, -8, 0, -4,
|
||||
0, -8, -3, 0, -3, -7, 0, -4,
|
||||
-11, -8, -5, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -3, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -6, -32, -5, -3,
|
||||
-16, -19, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 4, 0, -4, 3,
|
||||
7, 4, -12, 0, -1, -3, 4, 0,
|
||||
0, 0, 0, 0, 0, -10, 0, -3,
|
||||
-3, -8, 0, -4, 0, -8, -3, 0,
|
||||
-3, -7, 0, -4, -11, -8, -5, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -3,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -6, -32, -5, -3,
|
||||
-16, -19, 0, 0, 0, 0, 0, 19,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, -5, -3, -4, -15, 1, -2,
|
||||
1, -3, -10, 1, 8, 1, 3, 1,
|
||||
-15, -5, -9, 0, -6, -15, -7, -10,
|
||||
-16, -15, 0, -3, -3, -5, -3, 0,
|
||||
-3, -1, 6, 0, 6, -3, 0, 12,
|
||||
0, 0, 0, 0, 0, 0, 0, -3,
|
||||
-4, -4, 0, 0, -10, 0, -2, 0,
|
||||
0, -6, -32, -5, -3, -16, -19, 0,
|
||||
0, 0, 0, 0, 19, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, -5,
|
||||
-3, -4, -3, -15, 1, -2, 1, -3,
|
||||
-10, 1, 8, 1, 3, 1, -15, -5,
|
||||
-9, 0, -6, -15, -7, -10, -16, -15,
|
||||
0, -3, -3, -5, -3, 0, -3, -1,
|
||||
6, 0, 6, -3, 0, 12, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, -3, -4,
|
||||
-4, 0, 0, -10, 0, -2, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, -4, -4, 0, -5,
|
||||
0, 0, 0, 0, 4, 0, -7, -7,
|
||||
0, 0, 0, -4, -4, 0, -5, 0,
|
||||
0, 0, 0, 4, -4, 0, -7, -7,
|
||||
-3, 0, -11, -3, -8, -3, -5, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -7, 0, 0,
|
||||
0, 0, -5, 0, -4, 0, 0, -2,
|
||||
0, 0, 0, 0, -13, -12, 3, 4,
|
||||
4, -1, -11, 3, 6, 3, 12, 3,
|
||||
-10, 0, -3, 0, -3, -15, 0, 0,
|
||||
-12, -10, 0, -7, 0, -6, 0, -6,
|
||||
0, -3, 6, 0, -3, -12, -4, 14,
|
||||
0, 0, 0, 0, 0, 4, -4, 3,
|
||||
0, 0, -13, 0, -3, -1, 0, -4,
|
||||
0, 0, -3, 0, -3, -16, -5, -8,
|
||||
0, -12, 0, -4, 0, -7, 0, 2,
|
||||
0, -4, 0, -4, -12, 0, -4, 4,
|
||||
0, 0, 0, 0, 1, 0, 0, -5,
|
||||
-3, 0, -5, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, -3, 0, 0,
|
||||
0, 0, 1, 0, -4, -4, 0, 0,
|
||||
9, 8, 0, 0, -24, -22, 1, 17,
|
||||
12, 7, -15, 3, 16, 0, 14, 0,
|
||||
0, 0, 0, 0, -13, -5, -12, 3,
|
||||
4, 4, -1, -11, 3, 6, 3, 12,
|
||||
3, -10, 0, -3, 0, -3, -15, 0,
|
||||
0, -12, -10, 0, -7, 0, -6, 0,
|
||||
-6, 0, -3, 6, 0, -3, -12, -4,
|
||||
14, 0, 0, 0, 0, 0, -9, 4,
|
||||
-4, 3, 0, 0, -13, 0, -3, -1,
|
||||
0, -4, 0, 0, -3, 0, -3, -16,
|
||||
-5, -8, 0, -12, 0, -4, 0, -7,
|
||||
0, 2, 0, -4, 0, -4, -12, 0,
|
||||
-4, 4, 0, 0, 0, 0, 1, -5,
|
||||
0, 0, -5, -3, 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
|
||||
-3, 0, 0, 0, 0, 1, 0, -4,
|
||||
-4, 0, 0, 9, 8, 0, 0, -24,
|
||||
0, -22, 1, 17, 12, 7, -15, 3,
|
||||
16, 0, 14, 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
|
||||
};
|
||||
|
||||
|
||||
@ -1767,8 +1788,8 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes =
|
||||
.class_pair_values = kern_class_values,
|
||||
.left_class_mapping = kern_left_class_mapping,
|
||||
.right_class_mapping = kern_right_class_mapping,
|
||||
.left_class_cnt = 51,
|
||||
.right_class_cnt = 40,
|
||||
.left_class_cnt = 52,
|
||||
.right_class_cnt = 41,
|
||||
};
|
||||
|
||||
/*--------------------
|
||||
@ -1790,7 +1811,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
.cmaps = cmaps,
|
||||
.kern_dsc = &kern_classes,
|
||||
.kern_scale = 16,
|
||||
.cmap_num = 4,
|
||||
.cmap_num = 5,
|
||||
.bpp = 4,
|
||||
.kern_classes = 1,
|
||||
.bitmap_format = 0,
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#include "cJSON.h"
|
||||
#include "eventsManager.h"
|
||||
#include "bsp/esp-bsp.h"
|
||||
#include "lvgl_private.h"
|
||||
|
||||
|
||||
#define upEvent "monter"
|
||||
@ -96,7 +97,7 @@ lv_obj_t* lblEtatMachine;
|
||||
void drawIhm(void *xIHMEventQueueParam) {
|
||||
QueueHandle_t xIHMEventQueue = (QueueHandle_t)xIHMEventQueueParam;
|
||||
|
||||
init_display();
|
||||
init_display_ihm();
|
||||
|
||||
lv_subject_init_int(&wifiStatus, 0);
|
||||
lv_subject_add_observer_obj(&wifiStatus, wifiStatus_obs_cb, NULL, NULL);
|
||||
@ -228,7 +229,7 @@ static void event_handler(lv_event_t *e)
|
||||
}
|
||||
|
||||
|
||||
void init_display(){
|
||||
void init_display_ihm(){
|
||||
/*
|
||||
lvgl_port_cfg_t lvgl_cfg = ESP_LVGL_PORT_INIT_CONFIG();
|
||||
lvgl_cfg.task_priority=15;
|
||||
@ -1014,12 +1015,70 @@ void draw_tabVolets(lv_obj_t* parent)
|
||||
}
|
||||
}
|
||||
|
||||
/*Will be called when the styles of the base theme are already added
|
||||
to add new styles*/
|
||||
static void new_theme_apply_cb(lv_theme_t * th, lv_obj_t * obj)
|
||||
{
|
||||
LV_UNUSED(th);
|
||||
|
||||
if(lv_obj_check_type(obj, &lv_button_class)) {
|
||||
lv_obj_add_style(obj, &style_btn, 0);
|
||||
}
|
||||
}
|
||||
|
||||
lv_theme_t * lv_theme_create(void)
|
||||
{
|
||||
lv_theme_t * theme = lv_zalloc(sizeof(*theme));
|
||||
LV_ASSERT_MALLOC(theme);
|
||||
return theme;
|
||||
}
|
||||
|
||||
void lv_theme_copy(lv_theme_t * dst, const lv_theme_t * src)
|
||||
{
|
||||
if(!dst || !src) {
|
||||
LV_LOG_WARN("Refusing to copy null themes");
|
||||
return;
|
||||
}
|
||||
lv_memcpy(dst, src, sizeof(*src));
|
||||
}
|
||||
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/* Dessin IHM */
|
||||
/* ------------------------------------------------------------ */
|
||||
|
||||
LV_FONT_DECLARE(montserrat_medium_12);
|
||||
LV_FONT_DECLARE(montserrat_medium_18);
|
||||
LV_FONT_DECLARE(montserrat_medium_24);
|
||||
void draw_ihm()
|
||||
{
|
||||
|
||||
lv_display_t * display = lv_display_get_default();
|
||||
|
||||
/*Initialize the styles*/
|
||||
lv_style_init(&style_btn);
|
||||
lv_style_set_bg_color(&style_btn, lv_palette_main(LV_PALETTE_GREEN));
|
||||
lv_style_set_border_color(&style_btn, lv_palette_darken(LV_PALETTE_GREEN, 3));
|
||||
lv_style_set_border_width(&style_btn, 3);
|
||||
|
||||
/* Initialize the new theme with the current theme as its parent
|
||||
* The user is responsible for freeing the theme when it's no longer needed */
|
||||
lv_theme_t * th_act = lv_display_get_theme(NULL);
|
||||
lv_theme_t * th_new = lv_theme_create();
|
||||
lv_theme_copy(th_new, th_act);
|
||||
th_new->font_small=&montserrat_medium_12;
|
||||
th_new->font_normal=&montserrat_medium_18;
|
||||
th_new->font_large=&montserrat_medium_24;
|
||||
//lv_theme_default_deinit();
|
||||
//lv_theme_default_init(display,lv_palette_main(LV_PALETTE_GREEN),lv_palette_darken(LV_PALETTE_GREEN,3),false,&montserrat_medium_12);
|
||||
lv_theme_set_parent(th_new, th_act);
|
||||
|
||||
/*Set the style apply callback for the new theme*/
|
||||
lv_theme_set_apply_cb(th_new, new_theme_apply_cb);
|
||||
|
||||
/*Assign the new theme to the current display*/
|
||||
lv_display_set_theme(display, th_new);
|
||||
|
||||
|
||||
lv_subject_init_string(&tempExtSubj, tempExtStr, NULL, 6, "--");
|
||||
lv_subject_init_string(&tempIntSubj, tempIntStr, NULL, 6, "--");
|
||||
lv_subject_init_string(&hauteurCuveSubj, hauteurCuveStr, NULL, 9, "--");
|
||||
@ -1028,6 +1087,8 @@ void draw_ihm()
|
||||
// keys.clear();
|
||||
lv_obj_clean(lv_scr_act());
|
||||
|
||||
|
||||
|
||||
//Create a Tab view object
|
||||
tabview = lv_tabview_create(lv_screen_active());
|
||||
lv_tabview_set_tab_bar_position(tabview, LV_DIR_LEFT);
|
||||
@ -1054,14 +1115,14 @@ void draw_ihm()
|
||||
// lv_obj_set_style_bg_color(tab2b, lv_palette_lighten(LV_PALETTE_AMBER, 3), 0);
|
||||
lv_obj_set_style_bg_opa(tabVolets, LV_OPA_COVER, 0);
|
||||
|
||||
lv_style_init(&style_btn);
|
||||
//lv_style_init(&style_btn);
|
||||
|
||||
// lv_style_set_bg_color(&style_btn, lv_color_hex(0x115588));
|
||||
// lv_style_set_bg_opa(&style_btn, LV_OPA_50);
|
||||
// lv_style_set_border_width(&style_btn, 2);
|
||||
// lv_style_set_border_color(&style_btn, lv_color_black());
|
||||
lv_style_set_width(&style_btn, 80);
|
||||
lv_style_set_height(&style_btn, 100);
|
||||
//lv_style_set_width(&style_btn, 80);
|
||||
//lv_style_set_height(&style_btn, 100);
|
||||
|
||||
// Un style pour les conteneurs (température, cuve ...)
|
||||
lv_style_init(&style_container);
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
void app_main_display();
|
||||
void app_ota_display();
|
||||
void setOTAProgress(int value);
|
||||
void init_display();
|
||||
void init_display_ihm();
|
||||
|
||||
bool display_lock(const char *TAG);
|
||||
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
set(LV_BUILD_USE_KCONFIG ON)
|
||||
idf_component_register(SRCS "test_ihm.c" "../../ihm.c" "driver_backends.c" "sdl.c"
|
||||
idf_component_register(SRCS
|
||||
"test_ihm.c"
|
||||
"../../ihm.c"
|
||||
"driver_backends.c"
|
||||
"sdl.c"
|
||||
"../../fonts/montserrat_medium_12.c"
|
||||
"../../fonts/montserrat_medium_18.c"
|
||||
"../../fonts/montserrat_medium_24.c"
|
||||
INCLUDE_DIRS
|
||||
"../../include"
|
||||
WHOLE_ARCHIVE
|
||||
@ -13,7 +20,7 @@ idf_component_register(SRCS "test_ihm.c" "../../ihm.c" "driver_backends.c" "sdl.
|
||||
list(APPEND PKG_CONFIG_LIB ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES})
|
||||
list(APPEND PKG_CONFIG_INC ${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS})
|
||||
|
||||
target_compile_options(${COMPONENT_LIB} PUBLIC --coverage)
|
||||
target_compile_options(${COMPONENT_LIB} PUBLIC --coverage -DLV_LVGL_H_INCLUDE_SIMPLE)
|
||||
target_link_libraries(${COMPONENT_LIB} PUBLIC ${PKG_CONFIG_LIB} --coverage)
|
||||
target_include_directories(${COMPONENT_LIB} PRIVATE ${CMAKE_SOURCE_DIR}/mock ${PKG_CONFIG_INC})
|
||||
|
||||
|
||||
@ -115,7 +115,7 @@ int main(int argc, char const *argv[])
|
||||
{
|
||||
/* code */
|
||||
printf("hello\n");
|
||||
init_display();
|
||||
init_display_ihm();
|
||||
|
||||
/* Initialize LVGL. */
|
||||
lv_init();
|
||||
|
||||
25
main/main.c
25
main/main.c
@ -82,6 +82,29 @@ extern lv_subject_t tempExtSubj;
|
||||
extern lv_subject_t hauteurCuveSubj;
|
||||
extern lv_subject_t hauteurCuveEvolSubj;
|
||||
|
||||
void init_display(){
|
||||
lvgl_port_cfg_t lvgl_cfg = ESP_LVGL_PORT_INIT_CONFIG();
|
||||
lvgl_cfg.task_priority=15;
|
||||
bsp_display_cfg_t cfg = {
|
||||
.lvgl_port_cfg = lvgl_cfg,
|
||||
.buffer_size = 1024*600,//BSP_LCD_DRAW_BUFF_SIZE,
|
||||
.double_buffer = 1,
|
||||
.flags = {
|
||||
.buff_dma = false,
|
||||
.buff_spiram = false,
|
||||
.sw_rotate = true
|
||||
}
|
||||
};
|
||||
ESP_LOGE(TAG,"On demarre le display");
|
||||
lv_display_t *dsp = bsp_display_start_with_config(&cfg);
|
||||
//bsp_display_rotate(dsp,LV_DISP_ROTATION_180);
|
||||
|
||||
bsp_display_backlight_on();
|
||||
bsp_display_brightness_set(50);
|
||||
|
||||
mainState.display_init=true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief i2c master initialization
|
||||
*/
|
||||
@ -881,7 +904,7 @@ void app_main(void)
|
||||
|
||||
|
||||
startEvtManager();
|
||||
//init_display();
|
||||
init_display();
|
||||
const esp_timer_create_args_t periodic_timer_args = {
|
||||
.callback = &presence_timer_callback,
|
||||
/* name is optional, but may help identify the timer when debugging */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user