Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

font: add unicode_list_length and glyph_id_ofs_list_length

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-05-28 12:10:50 +02:00
parent 0acabe460c
commit d94075ac92
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lv_fonts/lv_font_template.c
View File

@ -58,16 +58,19 @@ static uint8_t glyph_id_ofs_list_3 = {32, 45, 66};
static const lv_font_fmt_txt_cmap_t cmaps[] =
{
{
.range_start = 0x280, .range_length = 124, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_FULL,
.glyph_id_start = 223, .unicode_list = unicode_list_1, .glyph_id_ofs_list = glyph_id_ofs_list_1
.range_start = 0x280, .range_length = 124, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_FULL,
.glyph_id_start = 223, .glyph_id_ofs_list = glyph_id_ofs_list_1, .glyph_id_ofs_list = 23,
.unicode_list = unicode_list_1, .unicode_list_length = 8,
},
{
.range_start = 0x20, .range_length = 112, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY,
.glyph_id_start = 456, .unicode_list = NULL, .glyph_id_ofs_list = NULL
.range_start = 0x20, .range_length = 112, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY,
.glyph_id_start = 456, .glyph_id_ofs_list = NULL, .glyph_id_ofs_list_length = 0,
.unicode_list = NULL, .unicode_list_length = 22,
},
{
.range_start = 0x560, .range_length = 7654, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL,
.glyph_id_start = 756, .unicode_list = NULL, .glyph_id_ofs_list = glyph_id_ofs_list_3
.range_start = 0x560, .range_length = 7654, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_FULL,
.glyph_id_start = 756, .glyph_id_ofs_list = glyph_id_ofs_list_3, .glyph_id_ofs_list_length = 23,
.unicode_list = NULL, .unicode_list_length = 0,
},
};

2
src/lv_misc/lv_font_fmt/lv_font_fmt_txt.h
View File

@ -99,11 +99,13 @@ typedef struct {
*/
uint16_t * unicode_list;
uint32_t unicode_list_length;
/* if(type == LV_FONT_FMT_TXT_CMAP_FORMAT0_...) it's `uint8_t *`
* if(type == LV_FONT_FMT_TXT_CMAP_SPARSE_...) it's `uint16_t *`
*/
const void * glyph_id_ofs_list;
uint32_t glyph_id_ofs_list_length;
}lv_font_fmt_txt_cmap_t;
/*Describe glyph pairs for kerning*/