What changed, and why it matters
This commit is a routine update of the on-device font files for multiple languages (Chinese, German, Spanish, Japanese, Korean, Russian). It adds a few new characters, tweaks some glyph bitmaps, and adjusts the generated font metadata to match newer LVGL version conventions. There is nothing in the changes that affects security, cryptography, wallet logic, or user data handling.
No security action required. Treat as a normal localization/UI asset update.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit regenerates LVGL bitmap font C source files under src/ui/gui_assets/font/{cn,de,es,ja,ko,ru}/. Changes include: updated glyph bitmap byte arrays, added/removed characters in the –symbols lists (e.g., Chinese characters 猜, 若, 及, 弱, 芯), updated unicode_list arrays, increased list_length counts, and LVGL version-guard changes replacing LV_VERSION_CHECK(8,0,0) with LVGL_VERSION_MAJOR checks and adding fallback/user_data fields. These are purely asset/metadata changes for UI text rendering.
Changed components
src/ui/gui_assets/font/cn/cnIllustrate.csrc/ui/gui_assets/font/cn/cnLittleTitle.csrc/ui/gui_assets/font/cn/cnText.csrc/ui/gui_assets/font/cn/cnTitle.csrc/ui/gui_assets/font/de/deIllustrate.csrc/ui/gui_assets/font/de/deLittleTitle.csrc/ui/gui_assets/font/de/deText.csrc/ui/gui_assets/font/de/deTitle.csrc/ui/gui_assets/font/es/esIllustrate.csrc/ui/gui_assets/font/es/esLittleTitle.csrc/ui/gui_assets/font/es/esText.csrc/ui/gui_assets/font/es/esTitle.csrc/ui/gui_assets/font/ja/jaIllustrate.csrc/ui/gui_assets/font/ja/jaLittleTitle.csrc/ui/gui_assets/font/ja/jaText.csrc/ui/gui_assets/font/ja/jaTitle.csrc/ui/gui_assets/font/ko/koIllustrate.csrc/ui/gui_assets/font/ko/koLittleTitle.csrc/ui/gui_assets/font/ko/koText.csrc/ui/gui_assets/font/ko/koTitle.csrc/ui/gui_assets/font/ru/ruIllustrate.csrc/ui/gui_assets/font/ru/ruLittleTitle.csrc/ui/gui_assets/font/ru/ruText.csrc/ui/gui_assets/font/ru/ruTitle.cInspect captured patch +1955 / −1521
diff --git a/src/ui/gui_assets/font/cn/cnIllustrate.c b/src/ui/gui_assets/font/cn/cnIllustrate.c
index adc684d..e14395e 100644
--- a/src/ui/gui_assets/font/cn/cnIllustrate.c
+++ b/src/ui/gui_assets/font/cn/cnIllustrate.c
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 20 px
* Bpp: 2
- * Opts: --bpp 2 --size 20 --no-compress --font NotoSansSC-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·“”€、。一三上下不与专且业东丢个中为主久么义之乏也了予争二于些交产享人什仅仍从仔他付代令以们件任份优会传但位低体何余作你使例供保信修倒值做停储像充免入全公共关其具兼内册再写决况准凭出击分切列则创初删利别到制前剩功加务动助励勿包化匙匹区匿升单卡危即原参及反发取受口另只可合同名后吗否含启告员味命和品哈响善器回因团固图在地场址坊块型域基境增备复外多够大天太失头奖套好如妥始威子字存学它安完官定实审容密对寻导将小少尚尝就屏展属岁嵌差己已币希帐带帮常幕年并广序应底度建开异式引弱强当录影彻彼往径待律得循微心必志忘快态性总恢息您情想意感慎成我或户所手才打托执扩扫批找技投护抬押担拥择括拭持指按振损换据捷授接推掷描提插摄撤播操擦支收改攻放政效敏教数整文断新方旁无既日旦时明易映是显景晰智暴更曾最有服望期未本术机权条来松构析果架某查标校核根格框案检概模次欢款止正此步段母每比气永求池没法泛注洞派流测消涉添清渡港湿源溯滑满漏潜点然照熵片版牢物特状独率环现理生用由电留疑白的目直相看真着知短码破硬确示票禁离私种秒积称移程稍空立站笔符第等策签简算管篡类系索约级纹线组细终经给络统继续维缆编缝缺网罗置署老考者而联股胁能脑自至致节芯花英荐莱获藏虑行衍表被装西要见观规觉解言警计认让议记许设访证识词试该详语误说请调谨象负财责败账货质费资赌赔起超越足路身转软轻载较输辖达过迎运这进连述追送适逆选途通速造遇遵避邀邮部都酌配采释重量金钟钥钮钱铸链销锁错长门闭问间队防限除险随隐隔隙障难零需露非面页项顺须预题额风香验骰高默(),:;? --format lvgl -o ../gui_assets/font/cn/cnIllustrate.c
+ * Opts: --bpp 2 --size 20 --no-compress --font NotoSansSC-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·“”€、。一三上下不与专且业东丢个中为主久么义之乏也了予争二于些交产享人什仅仍从仔他付代令以们件任份优会传但位低体何余作你使例供保信修倒值做停储像充免入全公共关其具兼内册再写决况准凭出击分切列则创初删利别到制前剩功加务动助励勿包化匙匹区匿升单卡危即原参及反发取受口另只可合同名后吗否含启告员味命和品哈响善器回因团固图在地场址坊块型域基境增备复外多够大天太失头奖套好如妥始威子字存学它安完官定实审容密对寻导将小少尚尝就屏展属岁嵌差己已币希帐带帮常幕年并广序应底度建开异式引弱强当录影彻彼往径待律得循微心必志忘快态性总恢息您情想意感慎成我或户所手才打托执扩扫批找技投护抬押担拥择括拭持指按振损换据捷授接推掷描提插摄撤播操擦支收改攻放政效敏教数整文断新方旁无既日旦时明易映是显景晰智暴更曾最有服望期未本术机权条来松构析果架某查标校核根格框案检概模次欢款止正此步段母每比气永求池没法泛注洞派流测消涉添清渡港湿源溯滑满漏潜点然照熵片版牢物特状独猜率环现理生用由电留疑白的目直相看真着知短码破硬确示票禁离私种秒积称移程稍空立站笔符第等策签简算管篡类系索约级纹线组细终经给络统继续维缆编缝缺网罗置署老考者而联股胁能脑自至致节芯花若英荐莱获藏虑行衍表被装西要见观规觉解言警计认让议记许设访证识词试该详语误说请调谨象负财责败账货质费资赌赔起超越足路身转软轻载较输辖达过迎运这进连述追送适逆选途通速造遇遵避邀邮部都酌配采释重量金钟钥钮钱铸链销锁错长门闭问间队防限除险随隐隔隙障难零需露非面页项顺须预题额风香验骰高默(),:;? --format lvgl -o ../gui_assets/font/cn/cnIllustrate.c
******************************************************************************/
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
@@ -341,7 +341,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+0052 "R" */
0xff, 0xfe, 0x3, 0xd5, 0xbf, 0xf, 0x0, 0x2d,
0x3c, 0x0, 0x38, 0xf0, 0x0, 0xe3, 0xc0, 0xb,
- 0x4f, 0x1, 0xbc, 0x3f, 0xff, 0x80, 0xf5, 0xb8,
+ 0x8f, 0x1, 0xbc, 0x3f, 0xff, 0x80, 0xf5, 0xb8,
0x3, 0xc0, 0xb4, 0xf, 0x0, 0xf0, 0x3c, 0x2,
0xe0, 0xf0, 0x3, 0xc3, 0xc0, 0x7, 0xc0,
@@ -3520,7 +3520,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x2, 0xc0, 0x0, 0x0, 0x3f, 0xff, 0xff,
0xfc, 0x0, 0x55, 0x79, 0x55, 0x50, 0x0, 0x2,
0xc0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xe1,
- 0x55, 0xf5, 0x55, 0x55, 0x40, 0x3, 0x80, 0x0,
+ 0x55, 0xf9, 0x55, 0x55, 0x40, 0x3, 0x80, 0x0,
0x0, 0x0, 0x3f, 0xff, 0xff, 0xd0, 0x3, 0xc5,
0x5f, 0x55, 0x0, 0x3d, 0x0, 0x38, 0x0, 0xb,
0xc0, 0x0, 0xe0, 0x0, 0x28, 0x7f, 0xff, 0xff,
@@ -4208,7 +4208,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+611F "感" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
- 0xca, 0x0, 0x0, 0x0, 0x1, 0xc2, 0xc0, 0x7,
+ 0xcb, 0x0, 0x0, 0x0, 0x1, 0xc2, 0xc0, 0x7,
0xff, 0xff, 0xff, 0xfc, 0x7, 0x55, 0x55, 0xe5,
0x54, 0x7, 0x0, 0x0, 0xd0, 0x50, 0x7, 0x3f,
0xfc, 0xe0, 0xe0, 0xb, 0x0, 0x0, 0xb1, 0xc0,
@@ -4285,7 +4285,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0xe, 0x2, 0xd5, 0x55, 0x57, 0x80, 0xbf,
0xff, 0xff, 0xe0, 0x2c, 0x0, 0x0, 0x38, 0xe,
0x0, 0x0, 0x5, 0x3, 0x80, 0x0, 0x0, 0x0,
- 0xd0, 0x0, 0x0, 0x0, 0xb0, 0x0, 0x0, 0x0,
+ 0xd0, 0x0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x0,
0x3c, 0x0, 0x0, 0x0, 0x1d, 0x0, 0x0, 0x0,
0xf, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0,
0x0,
@@ -4714,7 +4714,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x9, 0xd, 0x0, 0x3, 0x43, 0xff, 0xff, 0xfc,
0x3, 0x41, 0x56, 0x95, 0x50, 0x3, 0xa4, 0x3,
0x40, 0x0, 0x1b, 0xf5, 0x5b, 0x55, 0x54, 0x7f,
- 0x87, 0xff, 0xff, 0xfc, 0x13, 0x40, 0x38, 0x3,
+ 0x87, 0xff, 0xff, 0xfc, 0x13, 0x40, 0x3c, 0x3,
0x40, 0x3, 0x40, 0x70, 0xb, 0x0, 0x3, 0x40,
0xfe, 0xe, 0x0, 0x3, 0x40, 0xb, 0xfc, 0x0,
0x3, 0x40, 0x2, 0xff, 0x40, 0x17, 0x41, 0xbf,
@@ -6383,6 +6383,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0xb2, 0xbf, 0xff, 0xf8, 0x5, 0xe3, 0xfe,
0x90, 0x2c, 0x1f, 0x81, 0x0, 0x0, 0x18,
+ /* U+731C "猜" */
+ 0x0, 0x4, 0x0, 0x60, 0x0, 0x3c, 0x2c, 0x0,
+ 0xb0, 0x0, 0xf, 0x74, 0xff, 0xff, 0xf4, 0x3,
+ 0xe0, 0x0, 0xb0, 0x0, 0x7, 0xc0, 0xbf, 0xff,
+ 0xf0, 0x2d, 0xe0, 0x0, 0xb0, 0x0, 0x20, 0xb2,
+ 0xff, 0xff, 0xfc, 0x0, 0x71, 0x55, 0x55, 0x54,
+ 0x0, 0xb4, 0x0, 0x0, 0x0, 0x1, 0xf4, 0x7f,
+ 0xff, 0xe0, 0x7, 0xb4, 0x70, 0x0, 0xe0, 0x1e,
+ 0x34, 0x7f, 0xff, 0xe0, 0x78, 0x34, 0x70, 0x0,
+ 0xe0, 0x10, 0x34, 0x70, 0x0, 0xe0, 0x0, 0x34,
+ 0x7f, 0xff, 0xe0, 0x0, 0x34, 0x70, 0x0, 0xe0,
+ 0x0, 0x70, 0x70, 0x0, 0xe0, 0x15, 0xf0, 0x70,
+ 0xb, 0xd0, 0x1f, 0xc0, 0x0, 0x0, 0x0,
+
/* U+7387 "率" */
0x0, 0x0, 0xa0, 0x0, 0x0, 0x0, 0xb, 0x0,
0x0, 0x7f, 0xff, 0xff, 0xff, 0xf1, 0x55, 0x6e,
@@ -6995,7 +7009,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xff, 0xf8,
/* U+7B80 "简" */
- 0x0, 0x90, 0x0, 0x80, 0x0, 0xb, 0x0, 0xb,
+ 0x0, 0x80, 0x0, 0x80, 0x0, 0xb, 0x0, 0xb,
0x0, 0x0, 0x3f, 0xfe, 0x3f, 0xff, 0x42, 0xd7,
0x43, 0xc7, 0x80, 0x2d, 0xe, 0x1c, 0x7, 0x0,
0x55, 0x0, 0x0, 0x4, 0x0, 0x2c, 0x3f, 0xff,
@@ -7176,7 +7190,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+7EC8 "终" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xa0, 0x2,
0xc0, 0x0, 0x0, 0xe0, 0x3, 0x80, 0x0, 0x2,
- 0xc0, 0xf, 0xff, 0xe0, 0x3, 0x80, 0x1e, 0x56,
+ 0xc0, 0xb, 0xff, 0xe0, 0x3, 0x80, 0x1e, 0x56,
0xe0, 0xb, 0x4, 0x7f, 0x2, 0xc0, 0xd, 0xf,
0xe3, 0xcb, 0x40, 0x3d, 0x7c, 0x40, 0xfd, 0x0,
0x3f, 0xf0, 0x0, 0xbc, 0x0, 0x0, 0xd0, 0x3,
@@ -7185,7 +7199,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x3a, 0x40, 0x0, 0x2f, 0x0, 0x0, 0x0,
0x0, 0x2, 0x0, 0x0, 0x5, 0x19, 0x0, 0x0,
0x1b, 0xff, 0x1b, 0xe4, 0x0, 0x3e, 0x40, 0x0,
- 0x6f, 0x40, 0x0, 0x0, 0x0, 0x2, 0xe0, 0x0,
+ 0x6f, 0x80, 0x0, 0x0, 0x0, 0x2, 0xe0, 0x0,
0x0, 0x0, 0x0, 0x0,
/* U+7ECF "经" */
@@ -7596,6 +7610,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xf0, 0xb, 0x0, 0x3f, 0xff, 0x40, 0x2c, 0x0,
0x0, 0x0, 0x0,
+ /* U+82E5 "若" */
+ 0x0, 0x1c, 0x0, 0x30, 0x0, 0x0, 0x70, 0x0,
+ 0xd0, 0x2, 0xff, 0xff, 0xff, 0xff, 0xc5, 0x5b,
+ 0x95, 0x6e, 0x55, 0x0, 0x1c, 0x0, 0x34, 0x0,
+ 0x0, 0x13, 0xc0, 0x40, 0x0, 0x0, 0xd, 0x0,
+ 0x0, 0xf, 0xff, 0xff, 0xff, 0xff, 0x15, 0x5b,
+ 0x95, 0x55, 0x54, 0x0, 0x3c, 0x0, 0x0, 0x0,
+ 0x2, 0xc0, 0x0, 0x0, 0x0, 0x2f, 0xff, 0xff,
+ 0xf0, 0x2, 0xfd, 0x55, 0x56, 0xc0, 0x3e, 0xe0,
+ 0x0, 0x7, 0x3, 0xd3, 0x80, 0x0, 0x1c, 0x0,
+ 0xe, 0x0, 0x0, 0x70, 0x0, 0x3f, 0xff, 0xff,
+ 0xc0, 0x0, 0xf5, 0x55, 0x5b, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0,
+
/* U+82F1 "英" */
0x0, 0x1c, 0x0, 0x70, 0x0, 0x0, 0x2c, 0x0,
0x70, 0x0, 0x2f, 0xff, 0xff, 0xff, 0xf4, 0x15,
@@ -7775,7 +7803,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0xf, 0xff, 0xff, 0xff, 0xff, 0x55, 0xb9,
0x55, 0xf5, 0x50, 0xe, 0x0, 0x1d, 0x0, 0x3,
0xf9, 0x7, 0x80, 0x0, 0x6, 0xff, 0xf0, 0x0,
- 0x0, 0x1b, 0xef, 0xf8, 0x7, 0xff, 0x90, 0x6,
+ 0x0, 0x1b, 0xeb, 0xf8, 0x7, 0xff, 0x90, 0x6,
0xfc, 0x25, 0x0, 0x0, 0x1, 0x40,
/* U+89C1 "见" */
@@ -8283,7 +8311,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x1c, 0x0, 0x0, 0x3d, 0x0, 0xe0,
0x0, 0x0, 0x2f, 0x4b, 0xff, 0xff, 0x40, 0x8,
0x74, 0x34, 0x2c, 0x0, 0x3, 0x42, 0xe0, 0xd0,
- 0x0, 0x60, 0xe, 0xd0, 0x0, 0x7f, 0x81, 0xe1,
+ 0x0, 0x60, 0xe, 0xd0, 0x0, 0x7f, 0x81, 0xf1,
0xe0, 0xf, 0x90, 0x2e, 0x0, 0xf9, 0x0, 0x3,
0xd0, 0x0, 0x74, 0x1, 0x59, 0x55, 0x55, 0x0,
0x1f, 0xff, 0xff, 0xf8, 0x0, 0x70, 0x5, 0x0,
@@ -8553,7 +8581,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x90, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xb, 0xff, 0xff, 0xfc, 0x3f, 0xc1,
0x5f, 0x55, 0x54, 0x16, 0xc0, 0xe, 0x8, 0x0,
- 0x1, 0xc0, 0x2c, 0xe, 0x0, 0x1, 0xc0, 0x34,
+ 0x1, 0xc0, 0x2c, 0xf, 0x0, 0x1, 0xc0, 0x34,
0x7, 0x40, 0x1, 0xc0, 0xf0, 0x2, 0xc0, 0x1,
0xc2, 0xd1, 0x5a, 0xd0, 0x1, 0xc3, 0xff, 0xff,
0xf0, 0x1, 0xc1, 0x94, 0x0, 0x34, 0x7, 0xe0,
@@ -8794,7 +8822,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xcd, 0x3, 0x1e, 0xa8, 0x0, 0xcf, 0xff, 0x2e,
0xb8, 0x0, 0xd, 0x3, 0x34, 0x30, 0x0, 0xf,
0xff, 0xb0, 0x70, 0x2a, 0x80, 0x70, 0xa8, 0xb0,
- 0x3f, 0xc5, 0x75, 0xd, 0xe0, 0x2, 0xdf, 0xff,
+ 0x3f, 0xc5, 0x75, 0xd, 0xa0, 0x2, 0xdf, 0xff,
0x47, 0xd0, 0x2, 0xc2, 0xc0, 0x3, 0xc0, 0x2,
0xc3, 0xff, 0x3, 0xd0, 0x2, 0xc3, 0x83, 0x7,
0xb0, 0x2, 0xcb, 0x3, 0x1d, 0x34, 0x2, 0xdd,
@@ -9224,7 +9252,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x2c, 0x0, 0x0, 0x2c, 0x70, 0xe1, 0xff, 0xff,
0xc7, 0x7, 0x0, 0x0, 0x2c, 0x70, 0x30, 0x0,
0x2, 0xc7, 0x3, 0x3f, 0xff, 0xfc, 0x71, 0xb0,
- 0x9, 0x0, 0x7, 0x3d, 0x6, 0x78, 0x30, 0x70,
+ 0x9, 0x0, 0x7, 0x3d, 0x6, 0x38, 0x30, 0x70,
0xb, 0x70, 0xe2, 0xc7, 0x0, 0xd7, 0x0, 0x5d,
0x70, 0x2c, 0x75, 0x5d, 0xb7, 0x0, 0x43, 0xff,
0xc0, 0x70, 0x0, 0x0, 0x0, 0x0,
@@ -10093,240 +10121,242 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 40745, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 40840, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 40935, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 41030, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 41116, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 41202, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 41292, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 41377, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 41463, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 41544, .adv_w = 320, .box_w = 16, .box_h = 19, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 41620, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 2, .ofs_y = -1},
- {.bitmap_index = 41701, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 41787, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 41882, .adv_w = 320, .box_w = 15, .box_h = 19, .ofs_x = 3, .ofs_y = -2},
- {.bitmap_index = 41954, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 42040, .adv_w = 320, .box_w = 14, .box_h = 17, .ofs_x = 3, .ofs_y = -1},
- {.bitmap_index = 42100, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 42190, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 42281, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 42372, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 42458, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 42553, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 42648, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 42743, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 42829, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 42929, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 43024, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 43115, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 43206, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 43301, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 43401, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 43487, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 43582, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 43673, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 43764, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 43859, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 43950, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 44050, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 41030, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 41125, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 41211, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 41297, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 41387, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 41472, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 41558, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 41639, .adv_w = 320, .box_w = 16, .box_h = 19, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 41715, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 2, .ofs_y = -1},
+ {.bitmap_index = 41796, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 41882, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 41977, .adv_w = 320, .box_w = 15, .box_h = 19, .ofs_x = 3, .ofs_y = -2},
+ {.bitmap_index = 42049, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 42135, .adv_w = 320, .box_w = 14, .box_h = 17, .ofs_x = 3, .ofs_y = -1},
+ {.bitmap_index = 42195, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 42285, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 42376, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 42467, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 42553, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 42648, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 42743, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 42838, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 42924, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 43024, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 43119, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 43210, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 43301, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 43396, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 43496, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 43582, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 43677, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 43768, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 43859, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 43954, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 44045, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 44145, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 44240, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 44321, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 44402, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 44497, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 44583, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 44674, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 44769, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 44869, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 44964, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 45054, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 45145, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 44240, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 44335, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 44416, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 44497, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 44592, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 44678, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 44769, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 44864, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 44964, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 45059, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 45149, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 45240, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 45335, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 45430, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 45521, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 45607, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 45693, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 45784, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 45335, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 45430, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 45525, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 45616, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 45702, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 45788, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 45879, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 45974, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 46065, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 46155, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 46241, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 46341, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 46436, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 46536, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 46631, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 46726, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 46812, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 45974, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 46069, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 46160, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 46250, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 46336, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 46436, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 46531, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 46631, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 46726, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 46821, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 46907, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 47002, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 47097, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 47183, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 47097, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 47192, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 47278, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 47373, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 47454, .adv_w = 320, .box_w = 17, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 47531, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 47612, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 47703, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 47789, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 47880, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 47971, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 48057, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 48157, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 47373, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 47468, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 47549, .adv_w = 320, .box_w = 17, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 47626, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 47707, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 47798, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 47884, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 47975, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 48066, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 48152, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 48252, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 48347, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 48442, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 48537, .adv_w = 320, .box_w = 15, .box_h = 19, .ofs_x = 3, .ofs_y = -2},
- {.bitmap_index = 48609, .adv_w = 320, .box_w = 18, .box_h = 17, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 48686, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 48781, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 48872, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 48958, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 49049, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 49144, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 49239, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 49334, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 49429, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 49529, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 49624, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 49719, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 49819, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 49914, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 50009, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 50104, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 50185, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 50271, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 50357, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 50447, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 50542, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 50628, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 50728, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 50819, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 50914, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 51009, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 51104, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 48347, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 48442, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 48537, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 48632, .adv_w = 320, .box_w = 15, .box_h = 19, .ofs_x = 3, .ofs_y = -2},
+ {.bitmap_index = 48704, .adv_w = 320, .box_w = 18, .box_h = 17, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 48781, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 48876, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 48967, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 49053, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 49144, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 49235, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 49330, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 49425, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 49520, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 49615, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 49715, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 49810, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 49905, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 50005, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 50100, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 50195, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 50290, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 50371, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 50457, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 50543, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 50633, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 50728, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 50814, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 50914, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 51005, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 51100, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 51195, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 51290, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 51380, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 51475, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 51290, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 51381, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 51476, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
{.bitmap_index = 51566, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 51661, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 51747, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 51838, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 51928, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 52019, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 52114, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 52214, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 52309, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 52400, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 52491, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 52582, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 52668, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 52759, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 52850, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 52936, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53027, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53118, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53213, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53308, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 51661, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 51752, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 51847, .adv_w = 320, .box_w = 19, .box_h = 18, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 51933, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 52024, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 52114, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 52205, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 52300, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 52400, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 52495, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 52586, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 52677, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 52768, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 52854, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 52945, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53036, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 53122, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53213, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53304, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 53399, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 53494, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53585, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53676, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53771, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 53871, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 53966, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54061, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54156, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54246, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54341, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53585, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53680, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53771, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53862, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 53957, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 54057, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 54152, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 54247, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 54342, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 54432, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54527, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54627, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 54717, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 54808, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54903, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 54998, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 55093, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55188, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55283, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55378, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55468, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55563, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55658, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55758, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55853, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 55953, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56053, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56148, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56243, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56338, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56433, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56528, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56623, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56718, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56813, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 56908, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 57003, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 57098, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 57184, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 57270, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 57365, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 57451, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 57542, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 57637, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 57732, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 57823, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 57908, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 57998, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 58089, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 58180, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 58275, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 58365, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 58465, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 58560, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 58655, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 58750, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 58845, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 58936, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 59026, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 59112, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 59198, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 59284, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 59374, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 59469, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 59564, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 59659, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 59750, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 59841, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 59927, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 60022, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 60117, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 60208, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 60303, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 60393, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 60479, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 60574, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 60665, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 60746, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 60827, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 60917, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 61012, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 54527, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 54618, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 54713, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 54813, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 54903, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 54994, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55089, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55184, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 55279, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55374, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55469, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55564, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55654, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55749, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55844, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 55944, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56039, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56139, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56239, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56334, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56429, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56524, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56619, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56714, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56809, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56904, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 56999, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 57094, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 57189, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 57284, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 57370, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 57456, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 57551, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 57637, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 57728, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 57823, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 57918, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 58009, .adv_w = 320, .box_w = 20, .box_h = 17, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 58094, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 58184, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 58275, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 58366, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 58461, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 58551, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 58651, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 58746, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 58841, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 58936, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 59031, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 59122, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 59212, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 59298, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 59384, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 59470, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 59560, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 59655, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 59750, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 59845, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 59936, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 60027, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 60113, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 60208, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 60303, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 60394, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 60489, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 60579, .adv_w = 320, .box_w = 18, .box_h = 19, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 60665, .adv_w = 320, .box_w = 19, .box_h = 20, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 60760, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 60851, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 60932, .adv_w = 320, .box_w = 18, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 61013, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 61103, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 61198, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 61293, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 61388, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 61478, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 61578, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 61673, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 61764, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 61854, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 61949, .adv_w = 320, .box_w = 7, .box_h = 20, .ofs_x = 13, .ofs_y = -2},
- {.bitmap_index = 61984, .adv_w = 320, .box_w = 7, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 62019, .adv_w = 320, .box_w = 5, .box_h = 8, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 62029, .adv_w = 320, .box_w = 4, .box_h = 14, .ofs_x = 3, .ofs_y = -1},
- {.bitmap_index = 62043, .adv_w = 320, .box_w = 5, .box_h = 17, .ofs_x = 2, .ofs_y = -4},
- {.bitmap_index = 62065, .adv_w = 320, .box_w = 10, .box_h = 17, .ofs_x = 0, .ofs_y = -1}
+ {.bitmap_index = 61198, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 61289, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 61384, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 61479, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 61574, .adv_w = 320, .box_w = 20, .box_h = 18, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 61664, .adv_w = 320, .box_w = 20, .box_h = 20, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 61764, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 61859, .adv_w = 320, .box_w = 19, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 61950, .adv_w = 320, .box_w = 18, .box_h = 20, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 62040, .adv_w = 320, .box_w = 20, .box_h = 19, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 62135, .adv_w = 320, .box_w = 7, .box_h = 20, .ofs_x = 13, .ofs_y = -2},
+ {.bitmap_index = 62170, .adv_w = 320, .box_w = 7, .box_h = 20, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 62205, .adv_w = 320, .box_w = 5, .box_h = 8, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 62215, .adv_w = 320, .box_w = 4, .box_h = 14, .ofs_x = 3, .ofs_y = -1},
+ {.bitmap_index = 62229, .adv_w = 320, .box_w = 5, .box_h = 17, .ofs_x = 2, .ofs_y = -4},
+ {.bitmap_index = 62251, .adv_w = 320, .box_w = 10, .box_h = 17, .ofs_x = 0, .ofs_y = -1}
};
/*---------------------
@@ -10386,47 +10416,48 @@ static const uint16_t unicode_list_1[] = {
0x6c7b, 0x6c9b, 0x6c9e, 0x6ca8, 0x6ce5, 0x6ce6, 0x6d58, 0x6d62,
0x6d7e, 0x6d8c, 0x6ddc, 0x6ded, 0x6e0c, 0x6e2e, 0x6e3e, 0x6e6c,
0x6eb9, 0x7016, 0x7093, 0x70c4, 0x7112, 0x71a4, 0x71a5, 0x71bf,
- 0x71c6, 0x71d6, 0x7213, 0x7249, 0x72e4, 0x730c, 0x730d, 0x7363,
- 0x747c, 0x7485, 0x748e, 0x7492, 0x74b6, 0x74ee, 0x75da, 0x75e1,
- 0x764b, 0x7651, 0x7655, 0x7668, 0x767c, 0x769d, 0x7742, 0x774a,
- 0x775e, 0x7791, 0x77c9, 0x77cb, 0x7897, 0x78c5, 0x78de, 0x7918,
- 0x791e, 0x792a, 0x792f, 0x794c, 0x794d, 0x7958, 0x7968, 0x796a,
- 0x79d7, 0x7a28, 0x7a36, 0x7a71, 0x7a83, 0x7a89, 0x7aa6, 0x7ab3,
- 0x7adb, 0x7add, 0x7af4, 0x7afe, 0x7b3e, 0x7bd8, 0x7c58, 0x7c7f,
- 0x7e03, 0x7e04, 0x7e16, 0x7e1c, 0x7e21, 0x7e23, 0x7e25, 0x7e2c,
- 0x7e36, 0x7e39, 0x7e3c, 0x7e44, 0x7e4a, 0x7e51, 0x7e63, 0x7e73,
- 0x7e7a, 0x7e97, 0x7eae, 0x7eb4, 0x7ecb, 0x7ecf, 0x7f5e, 0x7f60,
- 0x7f62, 0x7f69, 0x7fb1, 0x7ffe, 0x801e, 0x805a, 0x806e, 0x8147,
- 0x8150, 0x8151, 0x81df, 0x820c, 0x820e, 0x824e, 0x82ad, 0x830e,
- 0x8314, 0x852c, 0x85ae, 0x87a9, 0x87aa, 0x87c5, 0x8808, 0x8822,
- 0x88dc, 0x88de, 0x891e, 0x891f, 0x8921, 0x8926, 0x8940, 0x895d,
- 0x8ac3, 0x8afe, 0x8b01, 0x8b06, 0x8b0b, 0x8b0d, 0x8b15, 0x8b1b,
- 0x8b1c, 0x8b1e, 0x8b23, 0x8b2a, 0x8b32, 0x8b42, 0x8b43, 0x8b4a,
- 0x8b4c, 0x8b51, 0x8b54, 0x8b60, 0x8b85, 0x8bbe, 0x8c7c, 0x8c7f,
- 0x8c80, 0x8c82, 0x8c83, 0x8c84, 0x8c85, 0x8c96, 0x8ca1, 0x8ca9,
- 0x8cb1, 0x8cd4, 0x8ce2, 0x8ce7, 0x8d10, 0x8d4c, 0x8e08, 0x8ec9,
- 0x8ecc, 0x8ed8, 0x8eda, 0x8ee0, 0x8ef0, 0x8ef3, 0x8f1b, 0x8f24,
- 0x8f2b, 0x8f2d, 0x8f36, 0x8f38, 0x8f3b, 0x8f4d, 0x8f5a, 0x8f5e,
- 0x8f5f, 0x8f63, 0x8f66, 0x8f71, 0x8f77, 0x8f7c, 0x8f7d, 0x8fa4,
- 0x8fd2, 0x8fdc, 0x8fdd, 0x900b, 0x9045, 0x905a, 0x90a9, 0x90aa,
- 0x9124, 0x9127, 0x912a, 0x912c, 0x912e, 0x93fc, 0x9402, 0x940b,
- 0x940e, 0x9455, 0x945b, 0x945d, 0x945e, 0x9476, 0x94dc, 0x9545,
- 0x954a, 0x954b, 0x9551, 0x957c, 0x958f, 0x95ad, 0x95c1, 0x95c6,
- 0x95ec, 0x95ed, 0x95f1, 0x95f6, 0x95f9, 0x961b, 0x9653, 0x965d,
- 0x968f, 0x96bb, 0x96bf, 0x97d2, 0x97d6, 0x97d7, 0x97d8, 0x97e1,
- 0x97f5, 0x97fa, 0x982b, 0x98f6, 0x99e9, 0x9a0d, 0x9a35, 0x9e35,
- 0xfe65, 0xfe66, 0xfe69, 0xfe77, 0xfe78, 0xfe7c
+ 0x71c6, 0x71d6, 0x7213, 0x7249, 0x7279, 0x72e4, 0x730c, 0x730d,
+ 0x7363, 0x747c, 0x7485, 0x748e, 0x7492, 0x74b6, 0x74ee, 0x75da,
+ 0x75e1, 0x764b, 0x7651, 0x7655, 0x7668, 0x767c, 0x769d, 0x7742,
+ 0x774a, 0x775e, 0x7791, 0x77c9, 0x77cb, 0x7897, 0x78c5, 0x78de,
+ 0x7918, 0x791e, 0x792a, 0x792f, 0x794c, 0x794d, 0x7958, 0x7968,
+ 0x796a, 0x79d7, 0x7a28, 0x7a36, 0x7a71, 0x7a83, 0x7a89, 0x7aa6,
+ 0x7ab3, 0x7adb, 0x7add, 0x7af4, 0x7afe, 0x7b3e, 0x7bd8, 0x7c58,
+ 0x7c7f, 0x7e03, 0x7e04, 0x7e16, 0x7e1c, 0x7e21, 0x7e23, 0x7e25,
+ 0x7e2c, 0x7e36, 0x7e39, 0x7e3c, 0x7e44, 0x7e4a, 0x7e51, 0x7e63,
+ 0x7e73, 0x7e7a, 0x7e97, 0x7eae, 0x7eb4, 0x7ecb, 0x7ecf, 0x7f5e,
+ 0x7f60, 0x7f62, 0x7f69, 0x7fb1, 0x7ffe, 0x801e, 0x805a, 0x806e,
+ 0x8147, 0x8150, 0x8151, 0x81df, 0x820c, 0x820e, 0x8242, 0x824e,
+ 0x82ad, 0x830e, 0x8314, 0x852c, 0x85ae, 0x87a9, 0x87aa, 0x87c5,
+ 0x8808, 0x8822, 0x88dc, 0x88de, 0x891e, 0x891f, 0x8921, 0x8926,
+ 0x8940, 0x895d, 0x8ac3, 0x8afe, 0x8b01, 0x8b06, 0x8b0b, 0x8b0d,
+ 0x8b15, 0x8b1b, 0x8b1c, 0x8b1e, 0x8b23, 0x8b2a, 0x8b32, 0x8b42,
+ 0x8b43, 0x8b4a, 0x8b4c, 0x8b51, 0x8b54, 0x8b60, 0x8b85, 0x8bbe,
+ 0x8c7c, 0x8c7f, 0x8c80, 0x8c82, 0x8c83, 0x8c84, 0x8c85, 0x8c96,
+ 0x8ca1, 0x8ca9, 0x8cb1, 0x8cd4, 0x8ce2, 0x8ce7, 0x8d10, 0x8d4c,
+ 0x8e08, 0x8ec9, 0x8ecc, 0x8ed8, 0x8eda, 0x8ee0, 0x8ef0, 0x8ef3,
+ 0x8f1b, 0x8f24, 0x8f2b, 0x8f2d, 0x8f36, 0x8f38, 0x8f3b, 0x8f4d,
+ 0x8f5a, 0x8f5e, 0x8f5f, 0x8f63, 0x8f66, 0x8f71, 0x8f77, 0x8f7c,
+ 0x8f7d, 0x8fa4, 0x8fd2, 0x8fdc, 0x8fdd, 0x900b, 0x9045, 0x905a,
+ 0x90a9, 0x90aa, 0x9124, 0x9127, 0x912a, 0x912c, 0x912e, 0x93fc,
+ 0x9402, 0x940b, 0x940e, 0x9455, 0x945b, 0x945d, 0x945e, 0x9476,
+ 0x94dc, 0x9545, 0x954a, 0x954b, 0x9551, 0x957c, 0x958f, 0x95ad,
+ 0x95c1, 0x95c6, 0x95ec, 0x95ed, 0x95f1, 0x95f6, 0x95f9, 0x961b,
+ 0x9653, 0x965d, 0x968f, 0x96bb, 0x96bf, 0x97d2, 0x97d6, 0x97d7,
+ 0x97d8, 0x97e1, 0x97f5, 0x97fa, 0x982b, 0x98f6, 0x99e9, 0x9a0d,
+ 0x9a35, 0x9e35, 0xfe65, 0xfe66, 0xfe69, 0xfe77, 0xfe78, 0xfe7c
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
},
{
.range_start = 163, .range_length = 65149, .glyph_id_start = 96,
- .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 654, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+ .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 656, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@@ -10436,7 +10467,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {
+static const uint8_t kern_left_class_mapping[] =
+{
0, 0, 0, 1, 0, 0, 0, 0,
1, 2, 0, 0, 0, 3, 4, 3,
5, 0, 0, 0, 0, 0, 0, 0,
@@ -10530,11 +10562,12 @@ static const uint8_t kern_left_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0
};
/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {
+static const uint8_t kern_right_class_mapping[] =
+{
0, 0, 1, 2, 0, 0, 0, 0,
2, 0, 3, 4, 0, 5, 6, 7,
8, 0, 0, 0, 0, 0, 0, 0,
@@ -10628,11 +10661,12 @@ static const uint8_t kern_right_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0
};
/*Kern values between classes*/
-static const int8_t kern_class_values[] = {
+static const int8_t kern_class_values[] =
+{
0, 0, 0, 0, -42, 0, -42, 0,
0, 0, 0, -20, 0, -35, -4, 0,
0, 0, 0, -4, 0, 0, 0, 0,
@@ -10851,7 +10885,8 @@ static const int8_t kern_class_values[] = {
/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
+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,
@@ -10863,9 +10898,12 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -10879,18 +10917,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 1,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t cnIllustrate = {
#else
lv_font_t cnIllustrate = {
@@ -10906,7 +10945,11 @@ lv_font_t cnIllustrate = {
.underline_position = -2,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/cn/cnLittleTitle.c b/src/ui/gui_assets/font/cn/cnLittleTitle.c
index 9cd8a57..a3bf97c 100644
--- a/src/ui/gui_assets/font/cn/cnLittleTitle.c
+++ b/src/ui/gui_assets/font/cn/cnLittleTitle.c
@@ -3781,7 +3781,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -3798,7 +3799,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {
+static const uint8_t kern_left_class_mapping[] =
+{
0, 0, 0, 1, 0, 0, 0, 0,
1, 2, 0, 0, 0, 3, 4, 3,
5, 0, 0, 0, 0, 0, 0, 0,
@@ -3843,7 +3845,8 @@ static const uint8_t kern_left_class_mapping[] = {
};
/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {
+static const uint8_t kern_right_class_mapping[] =
+{
0, 0, 1, 2, 0, 0, 0, 0,
2, 0, 3, 4, 0, 5, 6, 7,
8, 0, 0, 0, 0, 0, 0, 0,
@@ -3888,7 +3891,8 @@ static const uint8_t kern_right_class_mapping[] = {
};
/*Kern values between classes*/
-static const int8_t kern_class_values[] = {
+static const int8_t kern_class_values[] =
+{
0, 0, 0, 0, -59, 0, -59, 0,
0, 0, 0, -28, 0, -48, -6, 0,
0, 0, 0, -6, 0, 0, 0, 0,
@@ -4107,7 +4111,8 @@ static const int8_t kern_class_values[] = {
/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
+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,
@@ -4119,9 +4124,12 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -4135,18 +4143,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 1,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t cnLittleTitle = {
#else
lv_font_t cnLittleTitle = {
@@ -4162,7 +4171,11 @@ lv_font_t cnLittleTitle = {
.underline_position = -3,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/cn/cnText.c b/src/ui/gui_assets/font/cn/cnText.c
index e46b3be..8cc5fee 100644
--- a/src/ui/gui_assets/font/cn/cnText.c
+++ b/src/ui/gui_assets/font/cn/cnText.c
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 24 px
* Bpp: 2
- * Opts: --bpp 2 --size 24 --no-compress --font NotoSansSC-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€、一三上不与个中为主么了二于互交产享亮什从代以件传体何作使例保信候允入全公共关准出分列创初删前办功加动助励包化升单卡即压取受变可号各同名后吗启和固在地址坊型基处备复多天太失奖好如始委子字安完定密导小屏展差已币帐幕广序度建开异式强当径待志忘快念态总恢息悉您情成我或户扩扫拒择持指振换捷接描播擦收改教数文新方日时明易是显暂更未本机条析查标校格检概模款正毕气永池派测消添熵片版状理生用电白的盘相知短码确示禁私种秒称移程稍立端签简算管类系级纹络绝统继续维网置署脚自要解言计认记许设访证词试详语误请败账资路跳软载输过这进连退选通道重金钟钥钱链锁错键闭问除随隙页额验骰,:? --format lvgl -o ../gui_assets/font/cn/cnText.c
+ * Opts: --bpp 2 --size 24 --no-compress --font NotoSansSC-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€、一三上不与个中为主么了二于互交产享亮什从代以件传体何作使例保信候允入全公共关准出分列创初删前办功加动助励包化升单卡即压及取受变可号各同名后吗启和固在地址坊型基处备复多天太失奖好如始委子字安完定密导小屏展差已币帐幕广序度建开异式弱强当径待志忘快念态总恢息悉您情成我或户扩扫拒择持指振换捷接描播擦收改教数文新方日时明易是显暂更未本机条析查标校格检概模款正毕气永池派测消添熵片版状理生用电白的盘相知短码确示禁私种秒称移程稍立端签简算管类系级纹络绝统继续维网置署脚自芯要解言计认记许设访证词试详语误请败账资路跳软载输过这进连退选通道重金钟钥钱链锁错键闭问除随隙页额验骰,:? --format lvgl -o ../gui_assets/font/cn/cnText.c
******************************************************************************/
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
@@ -1933,6 +1933,24 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x3c, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x4, 0x0,
0x0, 0x0, 0x0, 0x0,
+ /* U+53CA "及" */
+ 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0xf, 0xff,
+ 0xff, 0xff, 0x80, 0x0, 0x0, 0xb, 0x0, 0x7,
+ 0x40, 0x0, 0x0, 0xb, 0x40, 0xb, 0x0, 0x0,
+ 0x0, 0xb, 0x80, 0xf, 0x0, 0x0, 0x0, 0xb,
+ 0xc0, 0xe, 0x0, 0x0, 0x0, 0xf, 0xd0, 0x1f,
+ 0xff, 0xe0, 0x0, 0xf, 0xe0, 0x1a, 0xab, 0xe0,
+ 0x0, 0xf, 0xb0, 0x0, 0x2, 0xd0, 0x0, 0xf,
+ 0x78, 0x0, 0x3, 0xc0, 0x0, 0x1e, 0x3c, 0x0,
+ 0xb, 0x40, 0x0, 0x2d, 0x1f, 0x0, 0xf, 0x0,
+ 0x0, 0x3c, 0xb, 0x80, 0x3d, 0x0, 0x0, 0x7c,
+ 0x3, 0xd0, 0xb8, 0x0, 0x0, 0xf4, 0x0, 0xf6,
+ 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x7f, 0xc0, 0x0,
+ 0x3, 0xd0, 0x0, 0x3f, 0xc0, 0x0, 0xb, 0x80,
+ 0x2, 0xfb, 0xf8, 0x0, 0x2f, 0x0, 0x6f, 0xd0,
+ 0x7f, 0x90, 0x2c, 0x3, 0xfd, 0x0, 0xb, 0xfc,
+ 0x0, 0x2, 0x80, 0x0, 0x0, 0x60,
+
/* U+53D6 "取" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xff, 0xff,
0xf4, 0x0, 0x0, 0x5, 0xf5, 0x6e, 0x5a, 0xaa,
@@ -2395,7 +2413,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x80, 0x0, 0x0, 0x3f, 0xc0, 0xf, 0x40, 0x0,
0x3, 0xeb, 0xc0, 0x1f, 0x40, 0x0, 0x7e, 0xb,
0xc0, 0x2f, 0x40, 0xf, 0xd0, 0xb, 0xc0, 0x2f,
- 0xc1, 0xfc, 0x0, 0xb, 0x80, 0x1f, 0xc2, 0x40,
+ 0xc1, 0xfd, 0x0, 0xb, 0x80, 0x1f, 0xc2, 0x40,
0x0, 0x4, 0x0, 0x9, 0x0,
/* U+5931 "失" */
@@ -2929,6 +2947,24 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x40, 0x1, 0xf0, 0xe7, 0xe4, 0x0, 0x0, 0xb,
0xfd, 0x0, 0x0, 0x0, 0x0, 0x2f, 0x80,
+ /* U+5F31 "弱" */
+ 0x2a, 0xaa, 0x90, 0xaa, 0xaa, 0x43, 0xff, 0xfe,
+ 0x1f, 0xff, 0xf8, 0x0, 0x0, 0xe0, 0x0, 0x3,
+ 0x80, 0x0, 0xe, 0x0, 0x0, 0x38, 0x0, 0x0,
+ 0xe0, 0x0, 0x3, 0x81, 0xea, 0xae, 0x7, 0xaa,
+ 0xb8, 0x2f, 0xff, 0xe0, 0xbf, 0xff, 0x82, 0xc0,
+ 0x0, 0xf, 0x0, 0x0, 0x2c, 0x0, 0x0, 0xf0,
+ 0x0, 0x2, 0xc0, 0x0, 0xf, 0x0, 0x0, 0x3f,
+ 0xff, 0xf0, 0xff, 0xff, 0xc2, 0xaa, 0xaf, 0xa,
+ 0xaa, 0xbc, 0x14, 0x0, 0xf0, 0x50, 0x3, 0xc2,
+ 0xf9, 0xe, 0xb, 0xe0, 0x3c, 0x2, 0xf8, 0xe0,
+ 0xb, 0xd3, 0xc0, 0x2, 0x5e, 0x0, 0x9, 0x7c,
+ 0x0, 0x6f, 0xd0, 0x1, 0xbf, 0x81, 0xbf, 0xad,
+ 0x6, 0xfe, 0x78, 0xfe, 0x42, 0xc2, 0xf9, 0x7,
+ 0x45, 0x0, 0x3c, 0x4, 0x0, 0xb4, 0x0, 0xab,
+ 0xc0, 0x6, 0xaf, 0x0, 0xf, 0xf0, 0x0, 0xbf,
+ 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+
/* U+5F3A "强" */
0xbf, 0xff, 0xf, 0xff, 0xff, 0x1, 0xaa, 0xbc,
0x3e, 0xaa, 0xbc, 0x0, 0x0, 0xb0, 0xe0, 0x0,
@@ -3376,7 +3412,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x5f, 0x54, 0x0, 0xf1, 0x0, 0x0, 0xf, 0x0,
0x0, 0xff, 0x40, 0x0, 0xf, 0x0, 0x2f, 0xf9,
0x3f, 0xff, 0xff, 0xfc, 0x3e, 0xf0, 0x2a, 0xaa,
- 0xaf, 0xa8, 0x0, 0xf0, 0x1, 0x0, 0xf, 0x0,
+ 0xaf, 0xa8, 0x0, 0xf0, 0x1, 0x40, 0xf, 0x0,
0x0, 0xf0, 0x3, 0xc0, 0xf, 0x0, 0x0, 0xf0,
0x1, 0xe0, 0xf, 0x0, 0x0, 0xf0, 0x0, 0xb4,
0xf, 0x0, 0x0, 0xf0, 0x0, 0x38, 0xf, 0x0,
@@ -4249,7 +4285,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+71B5 "熵" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0xc0,
- 0x0, 0x34, 0x0, 0x0, 0xb, 0x0, 0x0, 0xf0,
+ 0x0, 0x38, 0x0, 0x0, 0xb, 0x0, 0x0, 0xf0,
0x0, 0x0, 0x2c, 0x1a, 0xaa, 0xfa, 0xa9, 0x0,
0xb0, 0xbf, 0xff, 0xff, 0xfc, 0x2, 0xc1, 0x6,
0x0, 0x34, 0x0, 0xcb, 0x2c, 0x1d, 0x1, 0xd0,
@@ -4296,7 +4332,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xab, 0xc0, 0xb0, 0x0, 0x2d, 0xd0, 0xf, 0x2,
0xc0, 0x0, 0xb3, 0x80, 0x38, 0xb, 0xaa, 0x42,
0xcb, 0x1, 0xd0, 0x2f, 0xfe, 0xb, 0x1c, 0xf,
- 0x0, 0xb0, 0x38, 0x3c, 0x38, 0x78, 0x3, 0xc0,
+ 0x0, 0xb0, 0x38, 0x2c, 0x38, 0x78, 0x3, 0xc0,
0xe0, 0xf0, 0xb3, 0xc0, 0xf, 0x3, 0x83, 0xc0,
0xfe, 0x0, 0x38, 0xe, 0xe, 0x2, 0xf0, 0x0,
0xe0, 0x38, 0x74, 0xf, 0xc0, 0x7, 0x40, 0xe2,
@@ -4933,7 +4969,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x1e, 0x0, 0x3e, 0xaa, 0x40, 0x0,
0xf0, 0x1, 0xff, 0xff, 0x0, 0x7, 0x40, 0xf,
0x0, 0xb4, 0x0, 0x3c, 0x1d, 0xb4, 0x7, 0x80,
- 0x2, 0xd0, 0xff, 0xea, 0xbe, 0xa4, 0x1f, 0x6f,
+ 0x2, 0xd0, 0xff, 0xea, 0xbe, 0xa4, 0x1f, 0x6b,
0x5f, 0xff, 0xff, 0xe0, 0xff, 0xfc, 0xe, 0xb,
0x3, 0x82, 0x93, 0xc0, 0x34, 0x2c, 0xe, 0x0,
0x2d, 0x0, 0xd0, 0xb0, 0x38, 0x1, 0xe0, 0x3,
@@ -5026,7 +5062,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xaa, 0xaa, 0xaa, 0xaa, 0xae, 0xff, 0xff, 0xff,
0xff, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xf, 0xf0,
0x0, 0x0, 0x0, 0xf, 0xf0, 0x2, 0xc0, 0xb,
- 0xf, 0xf2, 0x2, 0xc8, 0xf, 0xf, 0xf3, 0xc3,
+ 0xf, 0xf2, 0x2, 0xc4, 0xf, 0xf, 0xf3, 0xc3,
0xce, 0xe, 0xf, 0xf1, 0xe3, 0x87, 0x5d, 0xf,
0xf0, 0xbb, 0x42, 0xec, 0xf, 0xf0, 0x3f, 0x0,
0xfc, 0xf, 0xf0, 0xf, 0x0, 0x78, 0xf, 0xf0,
@@ -5109,6 +5145,25 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xaa, 0xaa, 0xbd, 0x38, 0x0, 0x0, 0x2, 0xd0,
0x0, 0x0, 0x0, 0x0,
+ /* U+82AF "芯" */
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe,
+ 0x0, 0xb, 0x0, 0x0, 0x0, 0x38, 0x0, 0x2c,
+ 0x0, 0x0, 0x0, 0xe0, 0x0, 0xf0, 0x0, 0x1f,
+ 0xff, 0xff, 0xff, 0xff, 0xf4, 0x6a, 0xaf, 0xaa,
+ 0xaf, 0xaa, 0x90, 0x0, 0x38, 0x0, 0x2c, 0x0,
+ 0x0, 0x0, 0xe0, 0x0, 0xb0, 0x0, 0x0, 0x1,
+ 0x7, 0x41, 0x40, 0x0, 0x0, 0x0, 0xf, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x2e, 0x0, 0x0, 0x0,
+ 0x0, 0x50, 0x3c, 0x0, 0x0, 0x0, 0x3, 0xc0,
+ 0xb4, 0x1, 0x0, 0x7, 0x4f, 0x0, 0xf0, 0x1e,
+ 0x0, 0x2c, 0x3c, 0x2, 0x80, 0x3c, 0x0, 0xf0,
+ 0xf0, 0x0, 0x0, 0xb4, 0x7, 0x83, 0xc0, 0x0,
+ 0x0, 0xf0, 0x2c, 0xf, 0x0, 0x0, 0x3, 0xc0,
+ 0xf0, 0x3c, 0x0, 0x7, 0x4b, 0x4b, 0x40, 0xf0,
+ 0x0, 0x1d, 0x1e, 0x1c, 0x3, 0xc0, 0x0, 0xb0,
+ 0x34, 0x0, 0xf, 0xff, 0xff, 0xc0, 0x0, 0x0,
+ 0xf, 0xff, 0xfd, 0x0, 0x0,
+
/* U+8981 "要" */
0x15, 0x55, 0x55, 0x55, 0x55, 0x47, 0xff, 0xff,
0xff, 0xff, 0xfd, 0x15, 0x57, 0xd5, 0x79, 0x55,
@@ -5628,7 +5683,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0xb0, 0x0, 0x0, 0xb, 0x80, 0x0, 0xf0,
0x0, 0x0, 0x3, 0xd0, 0xaa, 0xfa, 0xaa, 0xa0,
0x0, 0xf0, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x78,
- 0x3, 0xc0, 0x0, 0x0, 0x0, 0x10, 0xb, 0x42,
+ 0x3, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xb, 0x42,
0x80, 0x0, 0x0, 0x0, 0xf, 0x3, 0xc0, 0x0,
0x0, 0x0, 0x2d, 0x3, 0xc0, 0x0, 0x3f, 0xf0,
0x7e, 0xab, 0xea, 0x90, 0x2f, 0xf0, 0x3f, 0xff,
@@ -6251,227 +6306,230 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 11824, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 11951, .adv_w = 384, .box_w = 21, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 12062, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 12194, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 12327, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 12460, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 12598, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 12719, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 12846, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 12990, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13095, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 13210, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 13343, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 13459, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 13591, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 13712, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13822, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 13949, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 14087, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 14208, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 14352, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 14473, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 14611, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 14749, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 14893, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 15031, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15158, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15279, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15412, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 15550, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 15683, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 15821, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 15948, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 16086, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 16224, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 16345, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 16477, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16604, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 16736, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 16880, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 17018, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 17145, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 17283, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 17416, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 17549, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 17676, .adv_w = 384, .box_w = 21, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 17787, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17908, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 18046, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 18184, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 18317, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 18461, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18594, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 18738, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 18859, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 18986, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19113, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 19240, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 19355, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 19488, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 19632, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19759, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19892, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 20036, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 20169, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20302, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 20429, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 20567, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20700, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 20838, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 20971, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 21104, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 21248, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 21381, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21502, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 21628, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 21761, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 21887, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 22020, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22164, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22308, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22441, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22585, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22729, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22873, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23011, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23149, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23293, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23420, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23553, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23686, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23830, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 23968, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 24106, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 24239, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 24371, .adv_w = 384, .box_w = 16, .box_h = 22, .ofs_x = 4, .ofs_y = -3},
- {.bitmap_index = 24459, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 24586, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 24707, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 24834, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 24972, .adv_w = 384, .box_w = 24, .box_h = 20, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 25092, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 25224, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 25351, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 25483, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 25621, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 25765, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 25909, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26047, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26185, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26323, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26461, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26605, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26743, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26887, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27031, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27175, .adv_w = 384, .box_w = 22, .box_h = 20, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 27285, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 27406, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 27544, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27677, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 27810, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 27948, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28081, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28214, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28352, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 28485, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28617, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28755, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 28893, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 29019, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 29140, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 29261, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 3, .ofs_y = -2},
- {.bitmap_index = 29382, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
- {.bitmap_index = 29490, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 29616, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29743, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 29881, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30008, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30146, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30273, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30405, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30532, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30670, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30808, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30941, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31074, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31207, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31345, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31472, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 31599, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 31720, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31858, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31991, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32129, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32267, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32405, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 32538, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 32665, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 32798, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 32931, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 33075, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 33208, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 33346, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 33473, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 33606, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 33738, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 33843, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 33964, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 34091, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 34224, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
- {.bitmap_index = 34332, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 34459, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 34597, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 34729, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34856, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34989, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 35116, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 35249, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 35376, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 35508, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 35635, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 35762, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 35900, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 36033, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 36166, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 36304, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 36437, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 36569, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 36707, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 36828, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 36972, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 37110, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 37254, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 37392, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 37536, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 37663, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 37807, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 37934, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 38078, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 38205, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 38343, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 38481, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 38619, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 38740, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 38872, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 39005, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 39137, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 39275, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 39419, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 39557, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 39701, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 39845, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 39955, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 40070, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 40208, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 40346, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 40484, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 40605, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 40749, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 40893, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 41020, .adv_w = 384, .box_w = 5, .box_h = 9, .ofs_x = 3, .ofs_y = -3},
- {.bitmap_index = 41032, .adv_w = 384, .box_w = 4, .box_h = 17, .ofs_x = 4, .ofs_y = -1},
- {.bitmap_index = 41049, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 0, .ofs_y = -1}
+ {.bitmap_index = 12194, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 12320, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 12453, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 12586, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 12724, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 12845, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 12972, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 13116, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13221, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 13336, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 13469, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 13585, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 13717, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 13838, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13948, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 14075, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 14213, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 14334, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 14478, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 14599, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 14737, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 14875, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 15019, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 15157, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15284, .adv_w = 384, .box_w = 23, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15405, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15538, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 15676, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 15809, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 15947, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 16074, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 16212, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 16350, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 16471, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 16603, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 16730, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 16862, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 17006, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 17144, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 17271, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 17409, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 17542, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 17675, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 17802, .adv_w = 384, .box_w = 21, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 17913, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18034, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 18172, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 18310, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 18443, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 18587, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18720, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 18864, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 18985, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 19112, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19239, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 19366, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 19493, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 19608, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 19741, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 19885, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20012, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20145, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 20289, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 20422, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20555, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 20682, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 20820, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20953, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 21091, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 21224, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 21357, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 21501, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 21634, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21755, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 21881, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22014, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 22140, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 22273, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22417, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22561, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22694, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22838, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22982, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 23126, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 23264, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 23402, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 23546, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23673, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23806, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23939, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 24083, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 24221, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 24359, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 24492, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 24624, .adv_w = 384, .box_w = 16, .box_h = 22, .ofs_x = 4, .ofs_y = -3},
+ {.bitmap_index = 24712, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 24839, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 24960, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 25087, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 25225, .adv_w = 384, .box_w = 24, .box_h = 20, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 25345, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 25477, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 25604, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 25736, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 25874, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26018, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26162, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26300, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26438, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26576, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26714, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26858, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26996, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27140, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27284, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27428, .adv_w = 384, .box_w = 22, .box_h = 20, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 27538, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 27659, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 27797, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27930, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 28063, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 28201, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28334, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28467, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28605, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 28738, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28870, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29008, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 29146, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 29272, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 29393, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29514, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 3, .ofs_y = -2},
+ {.bitmap_index = 29635, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
+ {.bitmap_index = 29743, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 29869, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 29996, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30134, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30261, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30399, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30526, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30658, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30785, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30923, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31061, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31194, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31327, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 31460, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 31598, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31725, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 31852, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 31973, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32111, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 32244, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32382, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32520, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32658, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 32791, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 32918, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33051, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 33184, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 33328, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33461, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 33599, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 33726, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33859, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33991, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 34096, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 34217, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 34344, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 34477, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
+ {.bitmap_index = 34585, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 34718, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 34845, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 34983, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 35115, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 35242, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 35375, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 35502, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 35635, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 35762, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 35894, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 36021, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 36148, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 36286, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 36419, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 36552, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 36690, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 36823, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 36955, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37093, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 37214, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37358, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37496, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37640, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 37778, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37922, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 38049, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 38193, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 38320, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 38464, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 38591, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 38729, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 38867, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 39005, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 39126, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 39258, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 39391, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 39523, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 39661, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 39805, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 39943, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 40087, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 40231, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 40341, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 40456, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 40594, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 40732, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 40870, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 40991, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 41135, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 41279, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 41406, .adv_w = 384, .box_w = 5, .box_h = 9, .ofs_x = 3, .ofs_y = -3},
+ {.bitmap_index = 41418, .adv_w = 384, .box_w = 4, .box_h = 17, .ofs_x = 4, .ofs_y = -1},
+ {.bitmap_index = 41435, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 0, .ofs_y = -1}
};
/*---------------------
@@ -6487,45 +6545,46 @@ static const uint16_t unicode_list_1[] = {
0x50c9, 0x50ce, 0x50d0, 0x5123, 0x5157, 0x5163, 0x5174, 0x5178,
0x517a, 0x517d, 0x51aa, 0x51fb, 0x51fc, 0x51fd, 0x5205, 0x5206,
0x520e, 0x5262, 0x5273, 0x52a4, 0x52b2, 0x52be, 0x52d0, 0x52e8,
- 0x5333, 0x5334, 0x5335, 0x534c, 0x5354, 0x5361, 0x5369, 0x536a,
- 0x536b, 0x5374, 0x538c, 0x53e9, 0x5657, 0x5685, 0x568d, 0x569d,
- 0x56a7, 0x56e8, 0x5757, 0x5861, 0x5864, 0x586a, 0x5877, 0x5886,
- 0x5887, 0x588e, 0x58b3, 0x58da, 0x58df, 0x5928, 0x5931, 0x5aad,
- 0x5ab4, 0x5ae6, 0x5ae9, 0x5af7, 0x5b23, 0x5b59, 0x5b6c, 0x5bac,
- 0x5bb2, 0x5d4b, 0x5d4f, 0x5d5e, 0x5d6d, 0x5db2, 0x5ddc, 0x5dec,
- 0x5e03, 0x5e57, 0x5e5d, 0x5e5f, 0x5e6c, 0x5e97, 0x5eb0, 0x5ee1,
- 0x5ee2, 0x5f34, 0x5f35, 0x5f48, 0x5f52, 0x5f5e, 0x5f98, 0x5fbf,
- 0x5fcc, 0x5fe6, 0x6005, 0x6022, 0x616d, 0x616e, 0x6173, 0x6194,
- 0x61c6, 0x61c8, 0x622f, 0x6246, 0x625e, 0x6264, 0x628c, 0x62bf,
- 0x62d4, 0x6302, 0x632c, 0x640a, 0x6443, 0x6493, 0x6496, 0x64b6,
- 0x64cd, 0x64e4, 0x650d, 0x6516, 0x6542, 0x6553, 0x656b, 0x6570,
- 0x658c, 0x659b, 0x65df, 0x6651, 0x6687, 0x6689, 0x6697, 0x66be,
- 0x66ed, 0x6742, 0x6764, 0x677e, 0x6799, 0x681d, 0x68df, 0x697e,
- 0x6a9b, 0x6ac0, 0x6b32, 0x6b71, 0x6b95, 0x6bbd, 0x6c9b, 0x6ca8,
- 0x6ce5, 0x6d58, 0x7112, 0x71a4, 0x71a5, 0x7213, 0x7363, 0x747c,
- 0x7485, 0x7492, 0x75da, 0x75e1, 0x7635, 0x7655, 0x7742, 0x774a,
- 0x775e, 0x77cb, 0x7897, 0x78de, 0x791e, 0x792a, 0x792f, 0x794d,
- 0x7958, 0x7968, 0x796a, 0x7a28, 0x7a4c, 0x7adb, 0x7add, 0x7af4,
- 0x7afe, 0x7bd8, 0x7c58, 0x7e04, 0x7e16, 0x7e39, 0x7e3a, 0x7e3c,
- 0x7e44, 0x7e4a, 0x7e51, 0x7eae, 0x7ecb, 0x7ecf, 0x8077, 0x8147,
- 0x88de, 0x8940, 0x895d, 0x8afe, 0x8b01, 0x8b0d, 0x8b15, 0x8b1b,
- 0x8b1c, 0x8b1e, 0x8b2a, 0x8b32, 0x8b43, 0x8b4a, 0x8b4c, 0x8b54,
- 0x8c82, 0x8c83, 0x8ca1, 0x8d4c, 0x8d50, 0x8ecc, 0x8eda, 0x8ef0,
- 0x8f24, 0x8f36, 0x8f38, 0x8f3b, 0x8f5d, 0x8f66, 0x8f77, 0x8fb0,
- 0x912a, 0x912e, 0x93fc, 0x9402, 0x940e, 0x945b, 0x945e, 0x9476,
- 0x948b, 0x954a, 0x954b, 0x95c1, 0x95ec, 0x95f6, 0x97d2, 0x97fa,
- 0x99e9, 0x9a0d, 0xfe69, 0xfe77, 0xfe7c
+ 0x5327, 0x5333, 0x5334, 0x5335, 0x534c, 0x5354, 0x5361, 0x5369,
+ 0x536a, 0x536b, 0x5374, 0x538c, 0x53e9, 0x5657, 0x5685, 0x568d,
+ 0x569d, 0x56a7, 0x56e8, 0x5757, 0x5861, 0x5864, 0x586a, 0x5877,
+ 0x5886, 0x5887, 0x588e, 0x58b3, 0x58da, 0x58df, 0x5928, 0x5931,
+ 0x5aad, 0x5ab4, 0x5ae6, 0x5ae9, 0x5af7, 0x5b23, 0x5b59, 0x5b6c,
+ 0x5bac, 0x5bb2, 0x5d4b, 0x5d4f, 0x5d5e, 0x5d6d, 0x5db2, 0x5ddc,
+ 0x5dec, 0x5e03, 0x5e57, 0x5e5d, 0x5e5f, 0x5e6c, 0x5e8e, 0x5e97,
+ 0x5eb0, 0x5ee1, 0x5ee2, 0x5f34, 0x5f35, 0x5f48, 0x5f52, 0x5f5e,
+ 0x5f98, 0x5fbf, 0x5fcc, 0x5fe6, 0x6005, 0x6022, 0x616d, 0x616e,
+ 0x6173, 0x6194, 0x61c6, 0x61c8, 0x622f, 0x6246, 0x625e, 0x6264,
+ 0x628c, 0x62bf, 0x62d4, 0x6302, 0x632c, 0x640a, 0x6443, 0x6493,
+ 0x6496, 0x64b6, 0x64cd, 0x64e4, 0x650d, 0x6516, 0x6542, 0x6553,
+ 0x656b, 0x6570, 0x658c, 0x659b, 0x65df, 0x6651, 0x6687, 0x6689,
+ 0x6697, 0x66be, 0x66ed, 0x6742, 0x6764, 0x677e, 0x6799, 0x681d,
+ 0x68df, 0x697e, 0x6a9b, 0x6ac0, 0x6b32, 0x6b71, 0x6b95, 0x6bbd,
+ 0x6c9b, 0x6ca8, 0x6ce5, 0x6d58, 0x7112, 0x71a4, 0x71a5, 0x7213,
+ 0x7363, 0x747c, 0x7485, 0x7492, 0x75da, 0x75e1, 0x7635, 0x7655,
+ 0x7742, 0x774a, 0x775e, 0x77cb, 0x7897, 0x78de, 0x791e, 0x792a,
+ 0x792f, 0x794d, 0x7958, 0x7968, 0x796a, 0x7a28, 0x7a4c, 0x7adb,
+ 0x7add, 0x7af4, 0x7afe, 0x7bd8, 0x7c58, 0x7e04, 0x7e16, 0x7e39,
+ 0x7e3a, 0x7e3c, 0x7e44, 0x7e4a, 0x7e51, 0x7eae, 0x7ecb, 0x7ecf,
+ 0x8077, 0x8147, 0x820c, 0x88de, 0x8940, 0x895d, 0x8afe, 0x8b01,
+ 0x8b0d, 0x8b15, 0x8b1b, 0x8b1c, 0x8b1e, 0x8b2a, 0x8b32, 0x8b43,
+ 0x8b4a, 0x8b4c, 0x8b54, 0x8c82, 0x8c83, 0x8ca1, 0x8d4c, 0x8d50,
+ 0x8ecc, 0x8eda, 0x8ef0, 0x8f24, 0x8f36, 0x8f38, 0x8f3b, 0x8f5d,
+ 0x8f66, 0x8f77, 0x8fb0, 0x912a, 0x912e, 0x93fc, 0x9402, 0x940e,
+ 0x945b, 0x945e, 0x9476, 0x948b, 0x954a, 0x954b, 0x95c1, 0x95ec,
+ 0x95f6, 0x97d2, 0x97fa, 0x99e9, 0x9a0d, 0xfe69, 0xfe77, 0xfe7c
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
},
{
.range_start = 163, .range_length = 65149, .glyph_id_start = 96,
- .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 285, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+ .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 288, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@@ -6535,7 +6594,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {
+static const uint8_t kern_left_class_mapping[] =
+{
0, 0, 0, 1, 0, 0, 0, 0,
1, 2, 0, 0, 0, 3, 4, 3,
5, 0, 0, 0, 0, 0, 0, 0,
@@ -6583,11 +6643,12 @@ static const uint8_t kern_left_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0
};
/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {
+static const uint8_t kern_right_class_mapping[] =
+{
0, 0, 1, 2, 0, 0, 0, 0,
2, 0, 3, 4, 0, 5, 6, 7,
8, 0, 0, 0, 0, 0, 0, 0,
@@ -6635,11 +6696,12 @@ static const uint8_t kern_right_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0
};
/*Kern values between classes*/
-static const int8_t kern_class_values[] = {
+static const int8_t kern_class_values[] =
+{
0, 0, 0, 0, -50, 0, -50, 0,
0, 0, 0, -24, 0, -41, -5, 0,
0, 0, 0, -5, 0, 0, 0, 0,
@@ -6858,7 +6920,8 @@ static const int8_t kern_class_values[] = {
/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
+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,
@@ -6870,9 +6933,12 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -6886,18 +6952,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 1,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t cnText = {
#else
lv_font_t cnText = {
@@ -6913,7 +6980,11 @@ lv_font_t cnText = {
.underline_position = -3,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/cn/cnTitle.c b/src/ui/gui_assets/font/cn/cnTitle.c
index 0e94bba..fe92854 100644
--- a/src/ui/gui_assets/font/cn/cnTitle.c
+++ b/src/ui/gui_assets/font/cn/cnTitle.c
@@ -2071,7 +2071,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -2088,7 +2089,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {
+static const uint8_t kern_left_class_mapping[] =
+{
0, 0, 0, 1, 0, 0, 0, 0,
1, 2, 0, 0, 0, 3, 4, 3,
5, 0, 0, 0, 0, 0, 0, 0,
@@ -2112,7 +2114,8 @@ static const uint8_t kern_left_class_mapping[] = {
};
/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {
+static const uint8_t kern_right_class_mapping[] =
+{
0, 0, 1, 2, 0, 0, 0, 0,
2, 0, 3, 4, 0, 5, 6, 7,
8, 0, 0, 0, 0, 0, 0, 0,
@@ -2136,7 +2139,8 @@ static const uint8_t kern_right_class_mapping[] = {
};
/*Kern values between classes*/
-static const int8_t kern_class_values[] = {
+static const int8_t kern_class_values[] =
+{
0, 0, 0, 0, -75, 0, -75, 0,
0, 0, 0, -36, 0, -62, -8, 0,
0, 0, 0, -8, 0, 0, 0, 0,
@@ -2355,7 +2359,8 @@ static const int8_t kern_class_values[] = {
/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
+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,
@@ -2367,9 +2372,12 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -2383,18 +2391,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 1,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t cnTitle = {
#else
lv_font_t cnTitle = {
@@ -2410,7 +2419,11 @@ lv_font_t cnTitle = {
.underline_position = -4,
.underline_thickness = 2,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/de/deIllustrate.c b/src/ui/gui_assets/font/de/deIllustrate.c
index 97c5388..1c52ab3 100644
--- a/src/ui/gui_assets/font/de/deIllustrate.c
+++ b/src/ui/gui_assets/font/de/deIllustrate.c
@@ -456,7 +456,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+0062 "b" */
0x74, 0x0, 0x1, 0xd0, 0x0, 0x7, 0x40, 0x0,
0x1d, 0x0, 0x0, 0x75, 0xfe, 0x1, 0xfe, 0xaf,
- 0x7, 0xc0, 0x1e, 0x1e, 0x0, 0x3c, 0x74, 0x0,
+ 0x7, 0xc0, 0x1e, 0x1e, 0x0, 0x3c, 0x78, 0x0,
0xb1, 0xd0, 0x2, 0xc7, 0x80, 0xb, 0x1e, 0x0,
0x3c, 0x7c, 0x1, 0xe1, 0xee, 0x6f, 0x7, 0x1f,
0xe0, 0x0,
@@ -879,7 +879,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -896,9 +897,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -912,18 +916,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t deIllustrate = {
#else
lv_font_t deIllustrate = {
@@ -939,7 +944,11 @@ lv_font_t deIllustrate = {
.underline_position = -2,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/de/deLittleTitle.c b/src/ui/gui_assets/font/de/deLittleTitle.c
index 5ac08ca..79b278a 100644
--- a/src/ui/gui_assets/font/de/deLittleTitle.c
+++ b/src/ui/gui_assets/font/de/deLittleTitle.c
@@ -794,7 +794,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -811,9 +812,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -827,18 +831,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t deLittleTitle = {
#else
lv_font_t deLittleTitle = {
@@ -854,7 +859,11 @@ lv_font_t deLittleTitle = {
.underline_position = -3,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/de/deText.c b/src/ui/gui_assets/font/de/deText.c
index 1ad754d..0c3a26b 100644
--- a/src/ui/gui_assets/font/de/deText.c
+++ b/src/ui/gui_assets/font/de/deText.c
@@ -225,7 +225,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x1e, 0x0, 0x1,
0xfd, 0x0, 0x2f, 0xd0, 0x2, 0xf9, 0x0, 0x2f,
0x80, 0x0, 0xfc, 0x0, 0x0, 0x7f, 0x80, 0x0,
- 0x7, 0xf9, 0x0, 0x0, 0x2f, 0xd0, 0x0, 0x1,
+ 0x6, 0xf9, 0x0, 0x0, 0x2f, 0xd0, 0x0, 0x1,
0xfd, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x0,
/* U+003D "=" */
@@ -1001,7 +1001,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -1018,9 +1019,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -1034,18 +1038,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t deText = {
#else
lv_font_t deText = {
@@ -1061,7 +1066,11 @@ lv_font_t deText = {
.underline_position = -2,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/de/deTitle.c b/src/ui/gui_assets/font/de/deTitle.c
index 9fc5b3b..615dd2b 100644
--- a/src/ui/gui_assets/font/de/deTitle.c
+++ b/src/ui/gui_assets/font/de/deTitle.c
@@ -990,7 +990,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -1007,9 +1008,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -1023,18 +1027,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t deTitle = {
#else
lv_font_t deTitle = {
@@ -1050,7 +1055,11 @@ lv_font_t deTitle = {
.underline_position = -4,
.underline_thickness = 2,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/es/esIllustrate.c b/src/ui/gui_assets/font/es/esIllustrate.c
index 4ea2b66..5ba4b06 100644
--- a/src/ui/gui_assets/font/es/esIllustrate.c
+++ b/src/ui/gui_assets/font/es/esIllustrate.c
@@ -456,7 +456,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+0062 "b" */
0x74, 0x0, 0x1, 0xd0, 0x0, 0x7, 0x40, 0x0,
0x1d, 0x0, 0x0, 0x75, 0xfe, 0x1, 0xfe, 0xaf,
- 0x7, 0xc0, 0x1e, 0x1e, 0x0, 0x3c, 0x74, 0x0,
+ 0x7, 0xc0, 0x1e, 0x1e, 0x0, 0x3c, 0x78, 0x0,
0xb1, 0xd0, 0x2, 0xc7, 0x80, 0xb, 0x1e, 0x0,
0x3c, 0x7c, 0x1, 0xe1, 0xee, 0x6f, 0x7, 0x1f,
0xe0, 0x0,
@@ -876,7 +876,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -893,9 +894,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -909,18 +913,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t esIllustrate = {
#else
lv_font_t esIllustrate = {
@@ -936,7 +941,11 @@ lv_font_t esIllustrate = {
.underline_position = -2,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/es/esLittleTitle.c b/src/ui/gui_assets/font/es/esLittleTitle.c
index 4de5e44..d012410 100644
--- a/src/ui/gui_assets/font/es/esLittleTitle.c
+++ b/src/ui/gui_assets/font/es/esLittleTitle.c
@@ -803,7 +803,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -820,9 +821,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -836,18 +840,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t esLittleTitle = {
#else
lv_font_t esLittleTitle = {
@@ -863,7 +868,11 @@ lv_font_t esLittleTitle = {
.underline_position = -3,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/es/esText.c b/src/ui/gui_assets/font/es/esText.c
index ef3a703..fa48cfe 100644
--- a/src/ui/gui_assets/font/es/esText.c
+++ b/src/ui/gui_assets/font/es/esText.c
@@ -225,7 +225,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x1e, 0x0, 0x1,
0xfd, 0x0, 0x2f, 0xd0, 0x2, 0xf9, 0x0, 0x2f,
0x80, 0x0, 0xfc, 0x0, 0x0, 0x7f, 0x80, 0x0,
- 0x7, 0xf9, 0x0, 0x0, 0x2f, 0xd0, 0x0, 0x1,
+ 0x6, 0xf9, 0x0, 0x0, 0x2f, 0xd0, 0x0, 0x1,
0xfd, 0x0, 0x0, 0x1e, 0x0, 0x0, 0x0,
/* U+003D "=" */
@@ -1001,7 +1001,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -1018,9 +1019,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -1034,18 +1038,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t esText = {
#else
lv_font_t esText = {
@@ -1061,7 +1066,11 @@ lv_font_t esText = {
.underline_position = -2,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/es/esTitle.c b/src/ui/gui_assets/font/es/esTitle.c
index e2a370e..fd45951 100644
--- a/src/ui/gui_assets/font/es/esTitle.c
+++ b/src/ui/gui_assets/font/es/esTitle.c
@@ -990,7 +990,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -1007,9 +1008,12 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -1023,18 +1027,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t esTitle = {
#else
lv_font_t esTitle = {
@@ -1050,7 +1055,11 @@ lv_font_t esTitle = {
.underline_position = -4,
.underline_thickness = 2,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/ja/jaIllustrate.c b/src/ui/gui_assets/font/ja/jaIllustrate.c
index 4523475..2c8dcf4 100644
--- a/src/ui/gui_assets/font/ja/jaIllustrate.c
+++ b/src/ui/gui_assets/font/ja/jaIllustrate.c
@@ -341,7 +341,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+0052 "R" */
0xff, 0xfe, 0x3, 0xd5, 0xbf, 0xf, 0x0, 0x2d,
0x3c, 0x0, 0x38, 0xf0, 0x0, 0xe3, 0xc0, 0xb,
- 0x4f, 0x1, 0xbc, 0x3f, 0xff, 0x80, 0xf5, 0xb8,
+ 0x8f, 0x1, 0xbc, 0x3f, 0xff, 0x80, 0xf5, 0xb8,
0x3, 0xc0, 0xb4, 0xf, 0x0, 0xf0, 0x3c, 0x2,
0xe0, 0xf0, 0x3, 0xc3, 0xc0, 0x7, 0xc0,
@@ -1888,7 +1888,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xd, 0xc, 0x0, 0x7a, 0xf0, 0x3f, 0x40, 0xf,
0x7, 0xc0, 0x0, 0x3, 0xc0, 0x1f, 0x0, 0x0,
0xf4, 0x0, 0x7c, 0x0, 0x3e, 0x0, 0x2, 0xf0,
- 0xb, 0x80, 0x0, 0xb, 0x80, 0x20, 0x0, 0x0,
+ 0xb, 0x80, 0x0, 0xb, 0x80, 0x30, 0x0, 0x0,
0x2e, 0x0, 0x0, 0x0, 0x0, 0xf8, 0x0, 0x0,
0x0, 0x3, 0xd0, 0x0, 0x0, 0x0, 0xc, 0x0,
0x0, 0x0, 0x0, 0x0,
@@ -2392,7 +2392,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x2, 0xc0, 0x0, 0xd, 0x0, 0x2, 0xc0, 0x0,
0x2c, 0x0, 0x2, 0xc0, 0x80, 0x38, 0x0, 0x1,
0xdb, 0xc0, 0xfd, 0x0, 0x2, 0xfd, 0x2, 0xdf,
- 0x40, 0x2f, 0xd0, 0xb, 0x83, 0xd0, 0x38, 0x0,
+ 0x40, 0x2f, 0xd0, 0xb, 0x83, 0xd0, 0x39, 0x0,
0x3e, 0x0, 0xf0, 0x0, 0x2, 0xf4, 0x0, 0x3c,
0x0, 0xf, 0x80, 0x0, 0x1c, 0x0, 0x0, 0x0,
0x0, 0x0,
@@ -3202,7 +3202,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xbe, 0xaa, 0xa8, 0xff, 0xff, 0xff, 0xff, 0xe0,
0x0, 0x3c, 0x0, 0x0, 0x0, 0x1, 0xd0, 0x0,
0x0, 0x0, 0xf, 0x0, 0x3c, 0x0, 0x0, 0x38,
- 0x0, 0x38, 0x0, 0x2, 0xc0, 0x0, 0x78, 0x0,
+ 0x0, 0x3c, 0x0, 0x2, 0xc0, 0x0, 0x78, 0x0,
0xe, 0x0, 0x1, 0xf0, 0xb, 0xff, 0xff, 0xff,
0xf0, 0x3e, 0xaa, 0x95, 0x42, 0xd0, 0x0, 0x0,
0x0, 0x2, 0x0,
@@ -3562,7 +3562,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xf7, 0x0, 0x14, 0x0, 0x2d, 0xc7, 0xb, 0x2,
0x8b, 0x70, 0xd0, 0xc0, 0xd2, 0xdc, 0x2c, 0x38,
0xb0, 0xb7, 0x2, 0x0, 0x74, 0x2d, 0xc2, 0x40,
- 0x3c, 0xb, 0x70, 0xbd, 0x3c, 0x2, 0xdc, 0x2,
+ 0x3c, 0xb, 0x70, 0xbd, 0x2c, 0x2, 0xdc, 0x2,
0xfd, 0x0, 0xb7, 0x0, 0x3f, 0x80, 0x2d, 0xc0,
0x3d, 0x7d, 0xb, 0x70, 0xbc, 0x2, 0xe2, 0xdc,
0xf8, 0x0, 0x18, 0xb7, 0x0, 0x0, 0x0, 0x2d,
@@ -3621,7 +3621,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xe0, 0x2f, 0xff, 0xcb, 0x1e, 0xc0, 0x5, 0xb5,
0x4b, 0xf, 0x80, 0x0, 0x70, 0xb, 0xb, 0xc0,
0x0, 0x70, 0xb, 0x2e, 0xf0, 0x0, 0x70, 0xb,
- 0xb8, 0x7d, 0x0, 0x70, 0xb, 0x90, 0x1c, 0x0,
+ 0xb8, 0x7d, 0x0, 0x70, 0xb, 0x90, 0x18, 0x0,
0x0, 0x0, 0x0, 0x0,
/* U+5834 "場" */
@@ -3883,7 +3883,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x1a, 0xaa, 0xbe, 0xaa, 0xa4, 0x2e,
0xaa, 0xaa, 0xaa, 0xb8, 0x2c, 0x0, 0x0, 0x0,
0x38, 0x2c, 0x34, 0x0, 0x0, 0x34, 0x0, 0xb0,
- 0x2, 0xaa, 0x90, 0x0, 0xff, 0xe7, 0xaa, 0xd0,
+ 0x2, 0xaa, 0x90, 0x0, 0xff, 0xf7, 0xaa, 0xd0,
0x2, 0xd5, 0xe7, 0x0, 0xd0, 0x7, 0x40, 0xd7,
0x0, 0xd0, 0x1f, 0x81, 0xc7, 0x0, 0xd0, 0x39,
0xf3, 0x87, 0x0, 0xd0, 0x0, 0x3f, 0x7, 0xf,
@@ -4161,7 +4161,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0xd, 0x0, 0x0, 0x7,
0xff, 0xff, 0xff, 0xfc, 0xb, 0xaa, 0xaa, 0xaa,
0xa8, 0xb, 0x0, 0x0, 0x0, 0x0, 0xb, 0xf,
- 0xff, 0xff, 0x80, 0xb, 0x5, 0x55, 0x5f, 0x40,
+ 0xff, 0xff, 0xc0, 0xb, 0x5, 0x55, 0x5f, 0x40,
0xb, 0x0, 0x90, 0x2d, 0x0, 0xb, 0x0, 0xbe,
0xf0, 0x0, 0xb, 0x0, 0xb, 0xd0, 0x0, 0xb,
0x2a, 0xaa, 0xfa, 0xa4, 0xa, 0x7f, 0xff, 0xff,
@@ -4906,7 +4906,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+63A8 "推" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xc0, 0xd,
- 0x7, 0x0, 0x1, 0xc0, 0x1c, 0xb, 0x0, 0x1,
+ 0x3, 0x0, 0x1, 0xc0, 0x1c, 0xb, 0x0, 0x1,
0xc0, 0x2c, 0xe, 0x0, 0x1, 0xc0, 0x38, 0x1d,
0x0, 0x3f, 0xfc, 0xbf, 0xff, 0xfc, 0x16, 0xd4,
0xf0, 0x2c, 0x0, 0x1, 0xc3, 0xf0, 0x2c, 0x0,
@@ -5719,7 +5719,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0xe, 0xb, 0x0, 0x1, 0xe0, 0x2c, 0xb,
0x0, 0x0, 0x7d, 0x74, 0xb, 0x0, 0x0, 0xb,
0xe0, 0xb, 0x0, 0x0, 0x7, 0xf0, 0x7, 0x0,
- 0x0, 0x2e, 0x3d, 0x7, 0x4c, 0x0, 0xf8, 0xf,
+ 0x0, 0x2e, 0x3d, 0x3, 0x4c, 0x0, 0xf8, 0xf,
0x43, 0x8c, 0xb, 0xd0, 0x3, 0x82, 0xec, 0xe,
0x0, 0x0, 0x0, 0xb8, 0x0, 0x0, 0x0, 0x0,
0x0,
@@ -6574,7 +6574,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x2c, 0xd7, 0x0, 0xb8, 0x0, 0x28, 0xd3,
0x41, 0xfc, 0x0, 0x34, 0xd2, 0x47, 0xdf, 0x0,
0x70, 0xd0, 0x2f, 0x7, 0xd0, 0x0, 0xd1, 0xf8,
- 0x0, 0xfc, 0x0, 0xd0, 0xd0, 0x0, 0x28, 0x0,
+ 0x0, 0xf8, 0x0, 0xd0, 0xd0, 0x0, 0x28, 0x0,
0x0, 0x0, 0x0, 0x0,
/* U+7D1B "紛" */
@@ -9120,7 +9120,8 @@ static const uint16_t unicode_list_4[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -9149,7 +9150,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Pair left and right glyphs for kerning*/
-static const uint16_t kern_pair_glyph_ids[] = {
+static const uint16_t kern_pair_glyph_ids[] =
+{
3, 13,
3, 15,
3, 34,
@@ -10581,190 +10583,192 @@ static const uint16_t kern_pair_glyph_ids[] = {
/* Kerning between the respective left and right glyphs
* 4.4 format which needs to scaled with `kern_scale`*/
-static const int8_t kern_pair_values[] = {
+static const int8_t kern_pair_values[] =
+{
-42, -42, -20, -35, -4, -4, -12, -12,
- -12, -12, -12, -8, -42, -42, -20, -35,
- -4, -4, -12, -12, -12, -12, -12, -8,
- -8, 28, -35, -35, -50, -36, -8, -24,
- -13, -34, -5, -5, -5, 8, -5, -5,
- -17, -13, -9, -8, -8, -7, -18, -8,
- -4, -11, -24, -8, -10, -4, -6, -35,
- -35, -50, -36, -8, -24, -13, -34, -5,
- -5, -5, 8, -5, -5, -17, -13, -9,
- -8, -15, -4, -4, -29, -4, -4, -9,
- -12, -12, -12, -4, 8, 8, -12, -12,
- 2, -8, -19, -10, 0, -19, -10, 0,
- -20, -20, -35, -10, -3, -4, -4, -4,
- -4, -20, -6, -6, 1, -6, -4, -15,
- 7, -4, 7, -6, -3, -4, -2, -2,
- -4, -9, -12, -6, -6, -9, -3, -2,
- -2, -6, -2, -4, -6, -4, -4, -6,
- -8, -10, -11, -11, -4, -11, -11, -9,
- -7, -6, -2, -2, -2, -4, -4, -8,
- -11, -4, -6, -4, -6, -20, -13, -7,
- -4, -15, -9, -4, -3, -7, -8, -8,
- -6, -4, -4, -4, -4, -4, -4, -9,
- -4, -12, -4, -27, -27, -26, -14, -4,
- -4, -51, -4, -4, -8, 1, 1, -9,
- 0, -12, -13, -6, -6, -6, -9, -8,
- -8, -6, -8, -6, -8, -8, -4, -6,
- -8, -7, -10, -7, -11, -6, -11, -2,
- -8, -6, -2, -9, -9, -15, -8, -8,
- -15, -11, -4, -4, -8, -8, -8, -8,
- -4, -7, -6, -5, -4, -7, -4, -4,
- -4, -4, -4, -4, -13, -6, -8, -7,
- -7, -8, -6, -17, -32, -32, -55, -20,
- -12, -10, -10, -10, -10, -9, -44, -11,
- -28, -21, -28, -29, -5, -5, -5, -6,
- -2, -5, -5, -8, -4, -14, -13, -14,
- -34, -13, -7, -4, -15, -9, -4, -3,
- -7, -8, -8, -6, -4, -41, -13, -41,
- -29, -19, -53, -4, -10, -9, -4, -30,
- -16, -10, -10, -10, -12, -10, -10, -4,
- -6, -8, -4, -13, -7, -4, -15, -9,
- -4, -3, -7, -8, -8, -6, -4, -4,
- -11, -2, -7, -6, -6, 1, 1, -2,
- -1, -4, -2, -4, -4, -4, -2, -4,
- -4, -4, -4, -4, -7, 4, -6, -6,
- -8, -6, -9, -1, -5, -39, -27, -39,
- -33, -8, -8, -15, -9, -9, -46, -9,
- -9, -15, -8, -6, -20, -27, -24, -24,
- -24, -7, -27, -18, -18, -24, -18, -24,
- -18, -22, -7, -18, -13, -13, -15, -13,
- -28, -24, -7, -7, -12, -7, -18, -4,
- -2, -4, -6, -2, -4, -2, -4, -24,
- -8, -24, -18, -6, -4, -4, -27, -4,
- -4, -4, -4, 3, -8, -9, -6, -6,
- -6, -9, -8, -8, -6, -8, -6, -8,
- -5, -12, -4, -4, -6, -4, -10, -5,
- -13, -4, -13, -12, -3, -3, -25, -3,
- -3, -3, -3, -7, -5, -4, -4, -4,
- -4, -11, -7, -7, -1, -7, -7, -6,
- -8, -4, -4, -4, -4, -4, -7, -4,
- -4, -7, -4, -7, -6, -4, -7, -6,
- -15, -33, -24, -33, -25, -10, -10, -4,
- -6, -6, -6, -36, -6, -6, -6, -6,
- -4, -10, -25, -16, -16, -16, -22, -15,
- -15, -16, -15, -16, -15, -16, -11, -13,
- -6, -9, -13, -6, -18, -17, -13, -3,
- -8, -8, -13, -8, -8, -12, -4, -3,
- -3, -6, -7, -7, -9, -9, -9, -8,
- -6, -9, -9, -6, -9, -7, -7, -9,
- -7, -22, -8, 28, -32, -12, -20, -12,
- -27, 11, 25, -8, -4, 4, -20, -5,
- -9, -7, -2, -9, -6, -12, -12, -10,
- -4, 1, -4, -5, -21, -8, -2, -17,
- -10, -6, -2, -2, -7, -2, -2, -7,
- -2, -3, -8, -8, -6, -9, -4, -9,
- -9, -9, -4, -9, -9, -4, 1, 1,
- 2, 1, -6, -13, 3, -4, -8, -8,
- -9, -7, -4, -10, -8, -6, -2, -4,
- -4, 1, 1, -4, 1, -1, -2, 4,
- 13, 13, 17, -19, -6, -19, -6, 9,
- 16, 23, 16, 11, 20, 21, 17, -8,
- -4, -4, -4, -6, -4, -4, -4, -2,
- 4, -2, -6, 17, -8, 4, -13, 16,
- -14, -10, -6, 4, -6, -6, -6, -6,
- 12, -6, -6, -2, -2, 4, -6, 4,
- -4, -13, -4, -9, -4, -7, -9, 4,
- -16, 4, 4, 4, -5, -13, -5, -4,
- -7, -7, -7, -4, -4, -7, -7, -8,
- -6, -4, -4, -10, 2, -13, -4, -9,
- -4, -7, -13, -4, -9, -4, -7, -12,
- -12, -10, -4, 1, -4, -5, -21, -8,
- -2, -17, -10, -6, -2, -2, -7, -2,
- -2, -7, -2, -3, -12, -12, -10, -4,
- 1, -4, -5, -21, -8, -2, -17, -10,
- -6, -2, -2, -7, -2, -2, -7, -2,
- -3, -10, -8, -6, -12, -20, -9, -20,
- -13, 8, 8, -6, -20, -4, 4, -9,
- -4, -4, -4, -4, -4, -4, -2, 8,
- 6, 8, -2, -7, -19, 3, -5, -9,
- -4, -8, -8, 2, -10, 2, 3, 4,
- 4, -10, -6, -2, -9, -6, -6, -6,
- -4, -6, -6, -4, -8, -7, -8, -10,
- -8, -6, -12, -5, -13, -4, -13, -8,
- -5, -15, -8, -4, -6, -4, -8, -2,
- -2, -2, -4, -2, -2, -9, -5, -14,
- -14, -4, -2, -12, -9, -4, -6, -9,
- -4, -2, -2, -2, -4, -2, -2, -7,
- -6, -9, 2, -6, -4, 2, -4, -4,
- -4, -4, -2, -13, -6, -4, -13, -4,
- -7, -7, -7, -7, -7, -9, -1, -8,
- -13, -13, -6, -15, -8, -2, -2, -4,
- -8, -2, -2, -2, -4, -2, -2, -6,
- -9, -7, -10, -12, -9, -4, -4, -4,
- -3, -4, -4, -4, -2, -2, -5, -8,
- 28, -9, -9, -24, -10, -10, -21, -14,
- -8, -6, -6, -3, -6, -10, -10, -6,
- -19, -6, -6, -6, -10, -10, -10, -10,
- -10, -10, -16, -10, -22, -22, -10, -10,
- -6, -6, -6, -6, -6, -6, -13, -16,
- -6, -6, -16, -22, -16, -6, -13, -6,
- -16, -16, 6, 6, -13, -6, -10, -10,
- 13, -6, -10, -6, 3, 3, 10, -6,
- -16, -16, -22, -16, -6, -6, -6, -22,
- 3, 3, 3, 3, -13, -6, -6, -19,
- -19, -10, -10, -3, -6, -26, -32, -13,
- 3, 3, -6, -22, -22, -10, -19, -22,
- -29, -22, -32, -3, -16, -16, -22, -22,
- -22, -10, -19, -10, -10, -6, -19, -16,
- 10, -13, -13, -10, -10, -16, -10, -10,
- -10, -10, -10, -10, -10, -10, -10, -19,
- -6, -6, -6, -6, -16, -16, -6, -13,
- -13, -3, 6, -13, -10, -10, -10, -10,
- -10, -10, -13, -13, -10, -10, -10, -3,
- -16, -16, -16, -16, -10, -10, -10, -10,
- -10, -10, -10, -10, -10, -10, -10, -10,
- -6, -6, -6, -16, -16, -10, -10, -6,
- -6, -6, -6, -6, -6, -6, 3, 3,
- -6, -6, -10, -6, -6, 6, 3, -22,
- -22, -16, -16, -13, -13, -13, -13, -13,
- -10, -13, -10, -6, -10, -6, -6, -13,
- -13, -13, -6, -6, -10, -3, -10, -6,
- -10, -6, -6, -6, -10, -10, -13, -6,
- 3, -13, -13, -13, 3, 3, -6, -6,
- -10, -10, 3, -16, -6, -16, -16, -10,
- -16, -16, -32, -32, -6, -10, -6, -16,
- -16, -16, -13, -13, -6, -6, -6, -6,
- -29, -13, -13, -6, -6, -6, -6, -22,
- -16, -3, -13, -19, -6, -6, -3, -3,
- -6, -6, -10, -10, -13, -13, -6, -6,
- -6, -6, -6, -6, -6, -10, -6, -16,
- -16, -19, -19, -6, -6, -10, -6, -6,
- -13, -13, -10, -22, -10, -29, -26, -3,
- -13, -13, -10, -6, -13, -13, -19, -16,
- -16, -16, -26, -13, -10, -6, -22, -26,
- -6, -6, -6, -6, -26, -29, -6, -6,
- -6, -19, -13, -13, -13, -10, -10, -10,
- -22, -10, -6, -10, -13, -29, -29, -6,
- -6, -13, -13, -13, -6, -26, -22, -3,
- -6, -6, -6, -6, -10, -10, -10, -10,
- -10, -6, -6, -6, -19, -19, -19, -16,
- -22, -22, -22, -10, -6, -19, -19, -10,
- -6, -10, -10, -10, -10, -16, -10, 6,
- 6, -10, -10, -19, -16, -10, -6, -3,
- -3, -3, -10, -10, -19, -10, -6, -10,
- -10, -10, -22, -6, -6, -6, -13, -6,
- -6, -16, -16, -16, -10, -6, -6, -6,
- -6, -6, -6, -6, -13, -6, -6, -10,
- -6, -6, -6, -6, 10, 10, 10, 16,
- 10, 10, 16, -6, -13, -13, -6, -10,
- 6, -10, -10, -10, -10, -10, -10, -6,
- 6, 6, -16, -10, -10, -19, -19, -19,
- -16, -6, -6, -6, -6, -6, -6, -6,
- -6, -6, -6, -6, -6, -3, -3, -3,
- -10, -10, -19, -13, -10, -10, -6, -6,
- -6, -6, -19, -19, -10, -16, -3, -6,
- -6, -19, -19, -6, -6, -6, -16, -10,
- -10, -10, -6, -10, -3, -3, -19, -19,
- -13, -13, -13, -6, -6, -6, -6, -16,
- -16, -19, -6, -3, -3, -19, -19, -19,
- -10, -13, -16
- };
+ -12, -12, -12, -8, -42, -42, -20, -35,
+ -4, -4, -12, -12, -12, -12, -12, -8,
+ -8, 28, -35, -35, -50, -36, -8, -24,
+ -13, -34, -5, -5, -5, 8, -5, -5,
+ -17, -13, -9, -8, -8, -7, -18, -8,
+ -4, -11, -24, -8, -10, -4, -6, -35,
+ -35, -50, -36, -8, -24, -13, -34, -5,
+ -5, -5, 8, -5, -5, -17, -13, -9,
+ -8, -15, -4, -4, -29, -4, -4, -9,
+ -12, -12, -12, -4, 8, 8, -12, -12,
+ 2, -8, -19, -10, 0, -19, -10, 0,
+ -20, -20, -35, -10, -3, -4, -4, -4,
+ -4, -20, -6, -6, 1, -6, -4, -15,
+ 7, -4, 7, -6, -3, -4, -2, -2,
+ -4, -9, -12, -6, -6, -9, -3, -2,
+ -2, -6, -2, -4, -6, -4, -4, -6,
+ -8, -10, -11, -11, -4, -11, -11, -9,
+ -7, -6, -2, -2, -2, -4, -4, -8,
+ -11, -4, -6, -4, -6, -20, -13, -7,
+ -4, -15, -9, -4, -3, -7, -8, -8,
+ -6, -4, -4, -4, -4, -4, -4, -9,
+ -4, -12, -4, -27, -27, -26, -14, -4,
+ -4, -51, -4, -4, -8, 1, 1, -9,
+ 0, -12, -13, -6, -6, -6, -9, -8,
+ -8, -6, -8, -6, -8, -8, -4, -6,
+ -8, -7, -10, -7, -11, -6, -11, -2,
+ -8, -6, -2, -9, -9, -15, -8, -8,
+ -15, -11, -4, -4, -8, -8, -8, -8,
+ -4, -7, -6, -5, -4, -7, -4, -4,
+ -4, -4, -4, -4, -13, -6, -8, -7,
+ -7, -8, -6, -17, -32, -32, -55, -20,
+ -12, -10, -10, -10, -10, -9, -44, -11,
+ -28, -21, -28, -29, -5, -5, -5, -6,
+ -2, -5, -5, -8, -4, -14, -13, -14,
+ -34, -13, -7, -4, -15, -9, -4, -3,
+ -7, -8, -8, -6, -4, -41, -13, -41,
+ -29, -19, -53, -4, -10, -9, -4, -30,
+ -16, -10, -10, -10, -12, -10, -10, -4,
+ -6, -8, -4, -13, -7, -4, -15, -9,
+ -4, -3, -7, -8, -8, -6, -4, -4,
+ -11, -2, -7, -6, -6, 1, 1, -2,
+ -1, -4, -2, -4, -4, -4, -2, -4,
+ -4, -4, -4, -4, -7, 4, -6, -6,
+ -8, -6, -9, -1, -5, -39, -27, -39,
+ -33, -8, -8, -15, -9, -9, -46, -9,
+ -9, -15, -8, -6, -20, -27, -24, -24,
+ -24, -7, -27, -18, -18, -24, -18, -24,
+ -18, -22, -7, -18, -13, -13, -15, -13,
+ -28, -24, -7, -7, -12, -7, -18, -4,
+ -2, -4, -6, -2, -4, -2, -4, -24,
+ -8, -24, -18, -6, -4, -4, -27, -4,
+ -4, -4, -4, 3, -8, -9, -6, -6,
+ -6, -9, -8, -8, -6, -8, -6, -8,
+ -5, -12, -4, -4, -6, -4, -10, -5,
+ -13, -4, -13, -12, -3, -3, -25, -3,
+ -3, -3, -3, -7, -5, -4, -4, -4,
+ -4, -11, -7, -7, -1, -7, -7, -6,
+ -8, -4, -4, -4, -4, -4, -7, -4,
+ -4, -7, -4, -7, -6, -4, -7, -6,
+ -15, -33, -24, -33, -25, -10, -10, -4,
+ -6, -6, -6, -36, -6, -6, -6, -6,
+ -4, -10, -25, -16, -16, -16, -22, -15,
+ -15, -16, -15, -16, -15, -16, -11, -13,
+ -6, -9, -13, -6, -18, -17, -13, -3,
+ -8, -8, -13, -8, -8, -12, -4, -3,
+ -3, -6, -7, -7, -9, -9, -9, -8,
+ -6, -9, -9, -6, -9, -7, -7, -9,
+ -7, -22, -8, 28, -32, -12, -20, -12,
+ -27, 11, 25, -8, -4, 4, -20, -5,
+ -9, -7, -2, -9, -6, -12, -12, -10,
+ -4, 1, -4, -5, -21, -8, -2, -17,
+ -10, -6, -2, -2, -7, -2, -2, -7,
+ -2, -3, -8, -8, -6, -9, -4, -9,
+ -9, -9, -4, -9, -9, -4, 1, 1,
+ 2, 1, -6, -13, 3, -4, -8, -8,
+ -9, -7, -4, -10, -8, -6, -2, -4,
+ -4, 1, 1, -4, 1, -1, -2, 4,
+ 13, 13, 17, -19, -6, -19, -6, 9,
+ 16, 23, 16, 11, 20, 21, 17, -8,
+ -4, -4, -4, -6, -4, -4, -4, -2,
+ 4, -2, -6, 17, -8, 4, -13, 16,
+ -14, -10, -6, 4, -6, -6, -6, -6,
+ 12, -6, -6, -2, -2, 4, -6, 4,
+ -4, -13, -4, -9, -4, -7, -9, 4,
+ -16, 4, 4, 4, -5, -13, -5, -4,
+ -7, -7, -7, -4, -4, -7, -7, -8,
+ -6, -4, -4, -10, 2, -13, -4, -9,
+ -4, -7, -13, -4, -9, -4, -7, -12,
+ -12, -10, -4, 1, -4, -5, -21, -8,
+ -2, -17, -10, -6, -2, -2, -7, -2,
+ -2, -7, -2, -3, -12, -12, -10, -4,
+ 1, -4, -5, -21, -8, -2, -17, -10,
+ -6, -2, -2, -7, -2, -2, -7, -2,
+ -3, -10, -8, -6, -12, -20, -9, -20,
+ -13, 8, 8, -6, -20, -4, 4, -9,
+ -4, -4, -4, -4, -4, -4, -2, 8,
+ 6, 8, -2, -7, -19, 3, -5, -9,
+ -4, -8, -8, 2, -10, 2, 3, 4,
+ 4, -10, -6, -2, -9, -6, -6, -6,
+ -4, -6, -6, -4, -8, -7, -8, -10,
+ -8, -6, -12, -5, -13, -4, -13, -8,
+ -5, -15, -8, -4, -6, -4, -8, -2,
+ -2, -2, -4, -2, -2, -9, -5, -14,
+ -14, -4, -2, -12, -9, -4, -6, -9,
+ -4, -2, -2, -2, -4, -2, -2, -7,
+ -6, -9, 2, -6, -4, 2, -4, -4,
+ -4, -4, -2, -13, -6, -4, -13, -4,
+ -7, -7, -7, -7, -7, -9, -1, -8,
+ -13, -13, -6, -15, -8, -2, -2, -4,
+ -8, -2, -2, -2, -4, -2, -2, -6,
+ -9, -7, -10, -12, -9, -4, -4, -4,
+ -3, -4, -4, -4, -2, -2, -5, -8,
+ 28, -9, -9, -24, -10, -10, -21, -14,
+ -8, -6, -6, -3, -6, -10, -10, -6,
+ -19, -6, -6, -6, -10, -10, -10, -10,
+ -10, -10, -16, -10, -22, -22, -10, -10,
+ -6, -6, -6, -6, -6, -6, -13, -16,
+ -6, -6, -16, -22, -16, -6, -13, -6,
+ -16, -16, 6, 6, -13, -6, -10, -10,
+ 13, -6, -10, -6, 3, 3, 10, -6,
+ -16, -16, -22, -16, -6, -6, -6, -22,
+ 3, 3, 3, 3, -13, -6, -6, -19,
+ -19, -10, -10, -3, -6, -26, -32, -13,
+ 3, 3, -6, -22, -22, -10, -19, -22,
+ -29, -22, -32, -3, -16, -16, -22, -22,
+ -22, -10, -19, -10, -10, -6, -19, -16,
+ 10, -13, -13, -10, -10, -16, -10, -10,
+ -10, -10, -10, -10, -10, -10, -10, -19,
+ -6, -6, -6, -6, -16, -16, -6, -13,
+ -13, -3, 6, -13, -10, -10, -10, -10,
+ -10, -10, -13, -13, -10, -10, -10, -3,
+ -16, -16, -16, -16, -10, -10, -10, -10,
+ -10, -10, -10, -10, -10, -10, -10, -10,
+ -6, -6, -6, -16, -16, -10, -10, -6,
+ -6, -6, -6, -6, -6, -6, 3, 3,
+ -6, -6, -10, -6, -6, 6, 3, -22,
+ -22, -16, -16, -13, -13, -13, -13, -13,
+ -10, -13, -10, -6, -10, -6, -6, -13,
+ -13, -13, -6, -6, -10, -3, -10, -6,
+ -10, -6, -6, -6, -10, -10, -13, -6,
+ 3, -13, -13, -13, 3, 3, -6, -6,
+ -10, -10, 3, -16, -6, -16, -16, -10,
+ -16, -16, -32, -32, -6, -10, -6, -16,
+ -16, -16, -13, -13, -6, -6, -6, -6,
+ -29, -13, -13, -6, -6, -6, -6, -22,
+ -16, -3, -13, -19, -6, -6, -3, -3,
+ -6, -6, -10, -10, -13, -13, -6, -6,
+ -6, -6, -6, -6, -6, -10, -6, -16,
+ -16, -19, -19, -6, -6, -10, -6, -6,
+ -13, -13, -10, -22, -10, -29, -26, -3,
+ -13, -13, -10, -6, -13, -13, -19, -16,
+ -16, -16, -26, -13, -10, -6, -22, -26,
+ -6, -6, -6, -6, -26, -29, -6, -6,
+ -6, -19, -13, -13, -13, -10, -10, -10,
+ -22, -10, -6, -10, -13, -29, -29, -6,
+ -6, -13, -13, -13, -6, -26, -22, -3,
+ -6, -6, -6, -6, -10, -10, -10, -10,
+ -10, -6, -6, -6, -19, -19, -19, -16,
+ -22, -22, -22, -10, -6, -19, -19, -10,
+ -6, -10, -10, -10, -10, -16, -10, 6,
+ 6, -10, -10, -19, -16, -10, -6, -3,
+ -3, -3, -10, -10, -19, -10, -6, -10,
+ -10, -10, -22, -6, -6, -6, -13, -6,
+ -6, -16, -16, -16, -10, -6, -6, -6,
+ -6, -6, -6, -6, -13, -6, -6, -10,
+ -6, -6, -6, -6, 10, 10, 10, 16,
+ 10, 10, 16, -6, -13, -13, -6, -10,
+ 6, -10, -10, -10, -10, -10, -10, -6,
+ 6, 6, -16, -10, -10, -19, -19, -19,
+ -16, -6, -6, -6, -6, -6, -6, -6,
+ -6, -6, -6, -6, -6, -3, -3, -3,
+ -10, -10, -19, -13, -10, -10, -6, -6,
+ -6, -6, -19, -19, -10, -16, -3, -6,
+ -6, -19, -19, -6, -6, -6, -16, -10,
+ -10, -10, -6, -10, -3, -3, -19, -19,
+ -13, -13, -13, -6, -6, -6, -6, -16,
+ -16, -19, -6, -3, -3, -19, -19, -19,
+ -10, -13, -16
+};
/*Collect the kern pair's data in one place*/
-static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
+static const lv_font_fmt_txt_kern_pair_t kern_pairs =
+{
.glyph_ids = kern_pair_glyph_ids,
.values = kern_pair_values,
.pair_cnt = 1427,
@@ -10775,9 +10779,12 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -10791,18 +10798,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t jaIllustrate = {
#else
lv_font_t jaIllustrate = {
@@ -10818,7 +10826,11 @@ lv_font_t jaIllustrate = {
.underline_position = -2,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/ja/jaLittleTitle.c b/src/ui/gui_assets/font/ja/jaLittleTitle.c
index 7286bb2..690dfb7 100644
--- a/src/ui/gui_assets/font/ja/jaLittleTitle.c
+++ b/src/ui/gui_assets/font/ja/jaLittleTitle.c
@@ -3522,7 +3522,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -3539,7 +3540,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Pair left and right glyphs for kerning*/
-static const uint16_t kern_pair_glyph_ids[] = {
+static const uint16_t kern_pair_glyph_ids[] =
+{
3, 13,
3, 15,
3, 34,
@@ -4712,157 +4714,159 @@ static const uint16_t kern_pair_glyph_ids[] = {
/* Kerning between the respective left and right glyphs
* 4.4 format which needs to scaled with `kern_scale`*/
-static const int8_t kern_pair_values[] = {
+static const int8_t kern_pair_values[] =
+{
-59, -59, -28, -48, -6, -6, -17, -17,
- -17, -17, -17, -11, -59, -59, -28, -48,
- -6, -6, -17, -17, -17, -17, -17, -11,
- -11, 39, -48, -48, -69, -51, -11, -34,
- -18, -47, -7, -7, -7, 12, -7, -7,
- -24, -18, -12, -11, -11, -10, -25, -11,
- -6, -15, -34, -11, -14, -5, -8, -48,
- -48, -69, -51, -11, -34, -18, -47, -7,
- -7, -7, 12, -7, -7, -24, -18, -12,
- -11, -22, -6, -6, -41, -6, -6, -13,
- -17, -17, -17, -6, 12, 12, -17, -17,
- 3, -11, -26, -14, 0, -26, -14, 0,
- -28, -28, -48, -14, -4, -6, -6, -6,
- -6, -28, -9, -8, 1, -8, -5, -22,
- 10, -6, 10, -8, -4, -5, -3, -3,
- -5, -13, -17, -9, -8, -13, -4, -3,
- -3, -8, -3, -6, -8, -6, -6, -8,
- -11, -14, -15, -15, -6, -15, -15, -13,
- -10, -8, -3, -3, -3, -5, -6, -11,
- -15, -6, -8, -6, -8, -27, -18, -10,
- -6, -21, -13, -6, -4, -10, -11, -11,
- -8, -5, -6, -6, -6, -6, -6, -13,
- -6, -17, -6, -37, -37, -37, -20, -6,
- -6, -71, -6, -6, -11, 1, 1, -13,
- 0, -17, -18, -8, -8, -8, -13, -11,
- -11, -8, -11, -8, -11, -11, -6, -9,
- -11, -9, -14, -9, -16, -8, -15, -3,
- -11, -8, -3, -13, -13, -22, -12, -12,
- -22, -16, -5, -6, -11, -11, -11, -11,
- -5, -10, -8, -7, -6, -9, -5, -5,
- -5, -6, -5, -5, -18, -9, -11, -9,
- -9, -11, -8, -24, -44, -44, -77, -28,
- -17, -14, -14, -14, -14, -13, -61, -15,
- -39, -29, -39, -41, -7, -7, -7, -8,
- -3, -7, -7, -11, -6, -19, -18, -19,
- -47, -18, -10, -6, -21, -13, -6, -4,
- -10, -11, -11, -8, -5, -57, -18, -57,
- -40, -26, -75, -6, -13, -13, -6, -42,
- -23, -13, -13, -13, -17, -13, -13, -6,
- -8, -11, -5, -18, -10, -6, -21, -13,
- -6, -4, -10, -11, -11, -8, -5, -6,
- -16, -3, -10, -8, -8, 1, 2, -3,
- -2, -6, -3, -6, -6, -6, -3, -6,
- -6, -5, -5, -6, -9, 6, -8, -8,
- -11, -8, -13, -1, -7, -54, -38, -54,
- -47, -11, -11, -22, -13, -13, -65, -13,
- -13, -22, -11, -8, -28, -38, -34, -34,
- -34, -10, -38, -25, -25, -34, -25, -34,
- -25, -30, -10, -25, -18, -18, -22, -18,
- -39, -33, -9, -9, -17, -9, -25, -6,
- -3, -6, -8, -3, -6, -3, -5, -34,
- -11, -34, -25, -8, -6, -6, -38, -6,
- -6, -6, -6, 4, -11, -12, -9, -9,
- -9, -12, -11, -11, -9, -11, -9, -11,
- -7, -17, -6, -6, -9, -6, -14, -7,
- -18, -6, -18, -17, -4, -4, -34, -4,
- -4, -4, -4, -9, -8, -6, -6, -6,
- -6, -15, -10, -10, -2, -10, -10, -8,
- -11, -6, -6, -5, -5, -5, -9, -5,
- -5, -9, -6, -9, -8, -6, -9, -8,
- -22, -46, -34, -46, -35, -13, -13, -5,
- -8, -8, -8, -51, -8, -8, -9, -8,
- -6, -14, -35, -22, -22, -22, -31, -22,
- -22, -22, -22, -22, -22, -22, -15, -18,
- -8, -13, -18, -8, -25, -24, -18, -4,
- -11, -11, -18, -11, -11, -17, -6, -4,
- -4, -8, -9, -9, -12, -12, -12, -11,
- -9, -12, -12, -8, -13, -9, -9, -13,
- -9, -31, -11, 39, -44, -17, -28, -17,
- -38, 15, 35, -11, -6, 5, -28, -7,
- -13, -9, -3, -13, -8, -17, -17, -14,
- -6, 2, -6, -7, -30, -11, -3, -24,
- -14, -9, -2, -2, -10, -3, -3, -10,
- -3, -4, -11, -11, -8, -13, -6, -12,
- -12, -12, -6, -12, -12, -6, 2, 2,
- 3, 2, -8, -18, 4, -5, -11, -11,
- -13, -9, -6, -14, -11, -9, -2, -6,
- -6, 1, 1, -5, 1, -1, -3, 6,
- 19, 19, 24, -26, -8, -26, -9, 12,
- 22, 32, 22, 15, 29, 30, 24, -11,
- -6, -6, -6, -9, -6, -6, -6, -3,
- 5, -3, -8, 24, -11, 6, -18, 23,
- -19, -14, -8, 6, -9, -8, -8, -8,
- 17, -8, -8, -3, -3, 6, -8, 6,
- -5, -18, -5, -13, -6, -9, -12, 5,
- -22, 5, 5, 5, -7, -18, -7, -6,
- -10, -10, -10, -6, -6, -10, -10, -12,
- -8, -5, -5, -14, 3, -18, -5, -13,
- -6, -9, -18, -5, -13, -6, -9, -17,
- -17, -14, -6, 2, -6, -7, -30, -11,
- -3, -24, -14, -9, -2, -2, -10, -3,
- -3, -10, -3, -4, -17, -17, -14, -6,
- 2, -6, -7, -30, -11, -3, -24, -14,
- -9, -2, -2, -10, -3, -3, -10, -3,
- -4, -13, -11, -8, -17, -29, -13, -29,
- -18, 12, 12, -8, -28, -6, 5, -13,
- -6, -6, -6, -6, -6, -6, -3, 12,
- 9, 12, -3, -9, -26, 4, -7, -13,
- -6, -11, -11, 2, -14, 2, 4, 6,
- 6, -14, -8, -3, -12, -8, -8, -8,
- -6, -8, -8, -6, -11, -9, -11, -13,
- -11, -8, -17, -7, -18, -5, -18, -11,
- -7, -22, -11, -6, -8, -6, -11, -3,
- -3, -3, -6, -3, -3, -13, -7, -20,
- -20, -5, -3, -17, -13, -6, -8, -13,
- -6, -3, -3, -3, -6, -3, -3, -10,
- -8, -13, 2, -8, -5, 2, -6, -6,
- -6, -6, -3, -18, -9, -6, -18, -6,
- -10, -10, -10, -10, -10, -13, -2, -11,
- -18, -18, -9, -22, -11, -3, -3, -5,
- -11, -3, -3, -3, -6, -3, -3, -8,
- -13, -9, -14, -17, -13, -6, -6, -6,
- -4, -6, -6, -6, -3, -3, -7, -11,
- 39, -13, -13, -33, -14, -14, -30, -20,
- -11, -13, -13, -13, -13, -13, -22, -13,
- -13, -13, -9, -9, -9, -9, -18, -9,
- -31, -9, -13, -13, 18, -9, -22, -9,
- -9, -9, -27, -13, -13, -9, -36, 4,
- 4, -13, -31, -13, -13, -9, -18, -22,
- -13, -13, -13, -9, -9, -22, -9, -18,
- -18, -13, -13, -18, -13, -13, -13, -4,
- -13, -9, -9, -9, -9, 4, -13, -9,
- -9, -18, -13, -9, -9, -13, -13, -18,
- 4, -18, -9, -18, 4, -9, -13, -13,
- -22, -9, -22, -22, -22, -45, -9, -22,
- -22, -22, -18, -18, -9, -9, -18, -9,
- -9, -9, -31, -22, -4, -18, -27, -9,
- -4, -9, -9, -13, -13, -18, -18, -9,
- -9, -9, -9, -13, -22, -9, -18, -13,
- -13, -40, -4, -18, -18, -13, -9, -18,
- -18, -22, -22, -36, -18, -13, -31, -9,
- -9, -9, -18, -40, -9, -18, -18, -9,
- -36, -4, -9, -9, -13, -13, -13, -9,
- -9, -27, -27, -22, -31, -31, -13, -9,
- -13, -13, -22, 9, 9, -13, -27, -9,
- -4, -4, -36, -9, -13, -27, -13, -13,
- -31, -9, -9, -18, -9, 13, 13, 22,
- 13, 13, 22, -9, -18, -9, -13, 9,
- -13, -13, -13, -13, -9, 9, 9, -22,
- -27, -27, -27, -22, -9, -9, -9, -9,
- -9, -9, -9, -9, -9, -4, -4, -13,
- -13, -27, -13, -9, -9, -9, -9, -27,
- -13, -9, -9, -27, -9, -9, -9, -13,
- -13, -13, -9, -13, -4, -27, -27, -18,
- -18, -9, -9, -9, -9, -22, -22, -9,
- -4, -4, -27, -27, -27, -13, -18, -22
- };
+ -17, -17, -17, -11, -59, -59, -28, -48,
+ -6, -6, -17, -17, -17, -17, -17, -11,
+ -11, 39, -48, -48, -69, -51, -11, -34,
+ -18, -47, -7, -7, -7, 12, -7, -7,
+ -24, -18, -12, -11, -11, -10, -25, -11,
+ -6, -15, -34, -11, -14, -5, -8, -48,
+ -48, -69, -51, -11, -34, -18, -47, -7,
+ -7, -7, 12, -7, -7, -24, -18, -12,
+ -11, -22, -6, -6, -41, -6, -6, -13,
+ -17, -17, -17, -6, 12, 12, -17, -17,
+ 3, -11, -26, -14, 0, -26, -14, 0,
+ -28, -28, -48, -14, -4, -6, -6, -6,
+ -6, -28, -9, -8, 1, -8, -5, -22,
+ 10, -6, 10, -8, -4, -5, -3, -3,
+ -5, -13, -17, -9, -8, -13, -4, -3,
+ -3, -8, -3, -6, -8, -6, -6, -8,
+ -11, -14, -15, -15, -6, -15, -15, -13,
+ -10, -8, -3, -3, -3, -5, -6, -11,
+ -15, -6, -8, -6, -8, -27, -18, -10,
+ -6, -21, -13, -6, -4, -10, -11, -11,
+ -8, -5, -6, -6, -6, -6, -6, -13,
+ -6, -17, -6, -37, -37, -37, -20, -6,
+ -6, -71, -6, -6, -11, 1, 1, -13,
+ 0, -17, -18, -8, -8, -8, -13, -11,
+ -11, -8, -11, -8, -11, -11, -6, -9,
+ -11, -9, -14, -9, -16, -8, -15, -3,
+ -11, -8, -3, -13, -13, -22, -12, -12,
+ -22, -16, -5, -6, -11, -11, -11, -11,
+ -5, -10, -8, -7, -6, -9, -5, -5,
+ -5, -6, -5, -5, -18, -9, -11, -9,
+ -9, -11, -8, -24, -44, -44, -77, -28,
+ -17, -14, -14, -14, -14, -13, -61, -15,
+ -39, -29, -39, -41, -7, -7, -7, -8,
+ -3, -7, -7, -11, -6, -19, -18, -19,
+ -47, -18, -10, -6, -21, -13, -6, -4,
+ -10, -11, -11, -8, -5, -57, -18, -57,
+ -40, -26, -75, -6, -13, -13, -6, -42,
+ -23, -13, -13, -13, -17, -13, -13, -6,
+ -8, -11, -5, -18, -10, -6, -21, -13,
+ -6, -4, -10, -11, -11, -8, -5, -6,
+ -16, -3, -10, -8, -8, 1, 2, -3,
+ -2, -6, -3, -6, -6, -6, -3, -6,
+ -6, -5, -5, -6, -9, 6, -8, -8,
+ -11, -8, -13, -1, -7, -54, -38, -54,
+ -47, -11, -11, -22, -13, -13, -65, -13,
+ -13, -22, -11, -8, -28, -38, -34, -34,
+ -34, -10, -38, -25, -25, -34, -25, -34,
+ -25, -30, -10, -25, -18, -18, -22, -18,
+ -39, -33, -9, -9, -17, -9, -25, -6,
+ -3, -6, -8, -3, -6, -3, -5, -34,
+ -11, -34, -25, -8, -6, -6, -38, -6,
+ -6, -6, -6, 4, -11, -12, -9, -9,
+ -9, -12, -11, -11, -9, -11, -9, -11,
+ -7, -17, -6, -6, -9, -6, -14, -7,
+ -18, -6, -18, -17, -4, -4, -34, -4,
+ -4, -4, -4, -9, -8, -6, -6, -6,
+ -6, -15, -10, -10, -2, -10, -10, -8,
+ -11, -6, -6, -5, -5, -5, -9, -5,
+ -5, -9, -6, -9, -8, -6, -9, -8,
+ -22, -46, -34, -46, -35, -13, -13, -5,
+ -8, -8, -8, -51, -8, -8, -9, -8,
+ -6, -14, -35, -22, -22, -22, -31, -22,
+ -22, -22, -22, -22, -22, -22, -15, -18,
+ -8, -13, -18, -8, -25, -24, -18, -4,
+ -11, -11, -18, -11, -11, -17, -6, -4,
+ -4, -8, -9, -9, -12, -12, -12, -11,
+ -9, -12, -12, -8, -13, -9, -9, -13,
+ -9, -31, -11, 39, -44, -17, -28, -17,
+ -38, 15, 35, -11, -6, 5, -28, -7,
+ -13, -9, -3, -13, -8, -17, -17, -14,
+ -6, 2, -6, -7, -30, -11, -3, -24,
+ -14, -9, -2, -2, -10, -3, -3, -10,
+ -3, -4, -11, -11, -8, -13, -6, -12,
+ -12, -12, -6, -12, -12, -6, 2, 2,
+ 3, 2, -8, -18, 4, -5, -11, -11,
+ -13, -9, -6, -14, -11, -9, -2, -6,
+ -6, 1, 1, -5, 1, -1, -3, 6,
+ 19, 19, 24, -26, -8, -26, -9, 12,
+ 22, 32, 22, 15, 29, 30, 24, -11,
+ -6, -6, -6, -9, -6, -6, -6, -3,
+ 5, -3, -8, 24, -11, 6, -18, 23,
+ -19, -14, -8, 6, -9, -8, -8, -8,
+ 17, -8, -8, -3, -3, 6, -8, 6,
+ -5, -18, -5, -13, -6, -9, -12, 5,
+ -22, 5, 5, 5, -7, -18, -7, -6,
+ -10, -10, -10, -6, -6, -10, -10, -12,
+ -8, -5, -5, -14, 3, -18, -5, -13,
+ -6, -9, -18, -5, -13, -6, -9, -17,
+ -17, -14, -6, 2, -6, -7, -30, -11,
+ -3, -24, -14, -9, -2, -2, -10, -3,
+ -3, -10, -3, -4, -17, -17, -14, -6,
+ 2, -6, -7, -30, -11, -3, -24, -14,
+ -9, -2, -2, -10, -3, -3, -10, -3,
+ -4, -13, -11, -8, -17, -29, -13, -29,
+ -18, 12, 12, -8, -28, -6, 5, -13,
+ -6, -6, -6, -6, -6, -6, -3, 12,
+ 9, 12, -3, -9, -26, 4, -7, -13,
+ -6, -11, -11, 2, -14, 2, 4, 6,
+ 6, -14, -8, -3, -12, -8, -8, -8,
+ -6, -8, -8, -6, -11, -9, -11, -13,
+ -11, -8, -17, -7, -18, -5, -18, -11,
+ -7, -22, -11, -6, -8, -6, -11, -3,
+ -3, -3, -6, -3, -3, -13, -7, -20,
+ -20, -5, -3, -17, -13, -6, -8, -13,
+ -6, -3, -3, -3, -6, -3, -3, -10,
+ -8, -13, 2, -8, -5, 2, -6, -6,
+ -6, -6, -3, -18, -9, -6, -18, -6,
+ -10, -10, -10, -10, -10, -13, -2, -11,
+ -18, -18, -9, -22, -11, -3, -3, -5,
+ -11, -3, -3, -3, -6, -3, -3, -8,
+ -13, -9, -14, -17, -13, -6, -6, -6,
+ -4, -6, -6, -6, -3, -3, -7, -11,
+ 39, -13, -13, -33, -14, -14, -30, -20,
+ -11, -13, -13, -13, -13, -13, -22, -13,
+ -13, -13, -9, -9, -9, -9, -18, -9,
+ -31, -9, -13, -13, 18, -9, -22, -9,
+ -9, -9, -27, -13, -13, -9, -36, 4,
+ 4, -13, -31, -13, -13, -9, -18, -22,
+ -13, -13, -13, -9, -9, -22, -9, -18,
+ -18, -13, -13, -18, -13, -13, -13, -4,
+ -13, -9, -9, -9, -9, 4, -13, -9,
+ -9, -18, -13, -9, -9, -13, -13, -18,
+ 4, -18, -9, -18, 4, -9, -13, -13,
+ -22, -9, -22, -22, -22, -45, -9, -22,
+ -22, -22, -18, -18, -9, -9, -18, -9,
+ -9, -9, -31, -22, -4, -18, -27, -9,
+ -4, -9, -9, -13, -13, -18, -18, -9,
+ -9, -9, -9, -13, -22, -9, -18, -13,
+ -13, -40, -4, -18, -18, -13, -9, -18,
+ -18, -22, -22, -36, -18, -13, -31, -9,
+ -9, -9, -18, -40, -9, -18, -18, -9,
+ -36, -4, -9, -9, -13, -13, -13, -9,
+ -9, -27, -27, -22, -31, -31, -13, -9,
+ -13, -13, -22, 9, 9, -13, -27, -9,
+ -4, -4, -36, -9, -13, -27, -13, -13,
+ -31, -9, -9, -18, -9, 13, 13, 22,
+ 13, 13, 22, -9, -18, -9, -13, 9,
+ -13, -13, -13, -13, -9, 9, 9, -22,
+ -27, -27, -27, -22, -9, -9, -9, -9,
+ -9, -9, -9, -9, -9, -4, -4, -13,
+ -13, -27, -13, -9, -9, -9, -9, -27,
+ -13, -9, -9, -27, -9, -9, -9, -13,
+ -13, -13, -9, -13, -4, -27, -27, -18,
+ -18, -9, -9, -9, -9, -22, -22, -9,
+ -4, -4, -27, -27, -27, -13, -18, -22
+};
/*Collect the kern pair's data in one place*/
-static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
+static const lv_font_fmt_txt_kern_pair_t kern_pairs =
+{
.glyph_ids = kern_pair_glyph_ids,
.values = kern_pair_values,
.pair_cnt = 1168,
@@ -4873,9 +4877,12 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -4889,18 +4896,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t jaLittleTitle = {
#else
lv_font_t jaLittleTitle = {
@@ -4916,7 +4924,11 @@ lv_font_t jaLittleTitle = {
.underline_position = -3,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/ja/jaText.c b/src/ui/gui_assets/font/ja/jaText.c
index 442252a..759e015 100644
--- a/src/ui/gui_assets/font/ja/jaText.c
+++ b/src/ui/gui_assets/font/ja/jaText.c
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 24 px
* Bpp: 2
- * Opts: --bpp 2 --size 24 --no-compress --font NotoSansJP-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€、「」いおかきくぐけこさしすせぜただちっつてでとなにのはびまみめよらりるれわをんァアィイウェエォオカガキギクグコサザシジスズセソタダチッツテデトドナヌネノバパビピフブプベペポマミムメモャュョラリルレロワンー一上不中了互今任住何作使例保備入公共再分初利削力功加効動化単取受号合同名否器回圧在報変失始委定布度式引張強形待復忘情成所承択拒拡拭指振探接敗数新方日明時暗更有期本果検標機決法派済準点無現理生産用画留番異知確示私秒算管約紋索細終結続署自行表複規解言計設証試詳認語読財資起転輝輸辞込追送通違選酬金鍵開間除電面額&? --format lvgl -o ../gui_assets/font/ja/jaText.c
+ * Opts: --bpp 2 --size 24 --no-compress --font NotoSansJP-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€、「」いおかきくぐけこさしすせぜただちっつてでとなにのはびまみめよらりるれわをんァアィイウェエォオカガキギクグコサザシジスズセソタダチッツテデトドナヌネノバパビピフブプベペポマミムメモャュョラリルレロワンー一上不中了互今任住何作使例保備入公共再分初利削力功加効動化単及取受号合同名否器回圧在報変失始委定布度式引弱張強形待復忘情成所承択拒拡拭指振探接敗数新方日明時暗更有期本果検標機決法派済準点無現理生産用画留番異知確示私秒算管約紋索細終結続署脆自行表複規解言計設証試詳認語読財資起転輝輸辞込追送通違選酬金鍵開間除電面額&? --format lvgl -o ../gui_assets/font/ja/jaText.c
******************************************************************************/
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
@@ -2884,6 +2884,24 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xf, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0,
0x0, 0x0, 0x0, 0xf, 0x0, 0x0, 0x0,
+ /* U+53CA "及" */
+ 0xb, 0xff, 0xff, 0xff, 0x80, 0x0, 0xf, 0xff,
+ 0xff, 0xff, 0xc0, 0x0, 0x0, 0xb, 0x0, 0x7,
+ 0x80, 0x0, 0x0, 0xb, 0x40, 0xb, 0x40, 0x0,
+ 0x0, 0xb, 0x80, 0xf, 0x0, 0x0, 0x0, 0xb,
+ 0xc0, 0xf, 0x0, 0x0, 0x0, 0xf, 0xd0, 0x1f,
+ 0xff, 0xe0, 0x0, 0xf, 0xf0, 0x2e, 0xab, 0xe0,
+ 0x0, 0xf, 0xb0, 0x2c, 0x2, 0xd0, 0x0, 0xf,
+ 0x78, 0x0, 0x3, 0xc0, 0x0, 0x1e, 0x3c, 0x0,
+ 0xb, 0x40, 0x0, 0x2d, 0x1f, 0x0, 0xf, 0x0,
+ 0x0, 0x3c, 0xb, 0x80, 0x3d, 0x0, 0x0, 0x7c,
+ 0x3, 0xd0, 0xb8, 0x0, 0x0, 0xf4, 0x1, 0xf6,
+ 0xf0, 0x0, 0x1, 0xf0, 0x0, 0x7f, 0xc0, 0x0,
+ 0x3, 0xd0, 0x0, 0x3f, 0xc0, 0x0, 0xf, 0x80,
+ 0x2, 0xfb, 0xf8, 0x0, 0x2f, 0x0, 0x6f, 0xd0,
+ 0xbf, 0x90, 0x2c, 0x7, 0xfd, 0x0, 0xb, 0xfc,
+ 0x0, 0x2, 0x90, 0x0, 0x0, 0x64,
+
/* U+53D6 "取" */
0x2a, 0xaa, 0xaa, 0x40, 0x0, 0x0, 0x3f, 0xff,
0xff, 0x80, 0x0, 0x0, 0x3, 0xc0, 0x3c, 0xff,
@@ -3275,6 +3293,24 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x2c, 0x2, 0xff, 0x80, 0x0, 0x2c, 0x0, 0x0,
0x0, 0x0, 0x0,
+ /* U+5F31 "弱" */
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff,
+ 0x1f, 0xff, 0xfc, 0x2a, 0xaa, 0xf0, 0xaa, 0xab,
+ 0xc0, 0x0, 0xf, 0x0, 0x0, 0x3c, 0x0, 0x0,
+ 0xf0, 0x0, 0x3, 0xc0, 0x0, 0xf, 0x0, 0x0,
+ 0x3c, 0x1f, 0xff, 0xf0, 0xff, 0xff, 0xc1, 0xea,
+ 0xa9, 0xf, 0xaa, 0xa4, 0x2c, 0x0, 0x0, 0xe0,
+ 0x0, 0x3, 0xc0, 0x0, 0x1d, 0x0, 0x0, 0x3f,
+ 0xff, 0xf2, 0xff, 0xff, 0xc3, 0xea, 0xaf, 0x3e,
+ 0xaa, 0xbc, 0x29, 0x0, 0xf1, 0xa4, 0x2, 0xc0,
+ 0xb8, 0xf, 0x3, 0xd0, 0x3c, 0x2, 0xd0, 0xf0,
+ 0xf, 0x3, 0xc0, 0x8, 0xf, 0x0, 0x20, 0x3c,
+ 0x0, 0x6c, 0xe0, 0x2, 0xf3, 0xc1, 0xbf, 0x8e,
+ 0xb, 0xf9, 0x38, 0xbe, 0x41, 0xd3, 0xf4, 0x3,
+ 0x81, 0x0, 0x2d, 0x10, 0x0, 0x74, 0x0, 0xab,
+ 0xc0, 0x6, 0x6f, 0x0, 0xf, 0xf4, 0x0, 0xbf,
+ 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+
/* U+5F35 "張" */
0x0, 0x0, 0x1, 0x55, 0x55, 0x41, 0xff, 0xfc,
0x2f, 0xff, 0xff, 0x6, 0xaa, 0xf0, 0xb5, 0x55,
@@ -4524,6 +4560,26 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x0, 0xf0, 0x0, 0xb, 0xff, 0xff, 0xff,
0xc0, 0x0, 0x2c, 0x0, 0x0, 0xe, 0x0,
+ /* U+8106 "脆" */
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x38, 0x0, 0x0, 0xf, 0xff, 0x80, 0x78,
+ 0x0, 0x0, 0xf, 0xab, 0x80, 0xff, 0xff, 0x0,
+ 0xf, 0x3, 0x81, 0xe5, 0x6f, 0x0, 0xf, 0x3,
+ 0x83, 0xc0, 0x2d, 0x0, 0xf, 0x3, 0x87, 0x80,
+ 0x38, 0x0, 0xf, 0xab, 0x8f, 0xff, 0xff, 0xfc,
+ 0xf, 0xff, 0xbf, 0xaa, 0xaa, 0xa8, 0xf, 0x3,
+ 0xff, 0x0, 0x0, 0x0, 0xf, 0x3, 0x9b, 0x6,
+ 0xaa, 0x90, 0xf, 0x3, 0x8b, 0xf, 0xff, 0xe0,
+ 0xf, 0x3, 0x8b, 0xf, 0x0, 0xe0, 0xf, 0xff,
+ 0x8b, 0xf, 0x0, 0xe0, 0xf, 0xab, 0x8b, 0xf,
+ 0x0, 0xe0, 0xe, 0x3, 0x8b, 0xf, 0x0, 0xe0,
+ 0xe, 0x3, 0x8f, 0xf, 0x1f, 0xd0, 0xd, 0x3,
+ 0x8e, 0xf, 0x5, 0x0, 0x1d, 0x3, 0x8e, 0xf,
+ 0x0, 0x14, 0x1c, 0x3, 0x9d, 0xf, 0x0, 0x2c,
+ 0x2c, 0x3, 0xac, 0xf, 0x0, 0x2c, 0x38, 0x6b,
+ 0xb8, 0xf, 0xaa, 0xb8, 0x34, 0x7f, 0x70, 0x7,
+ 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+
/* U+81EA "自" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x0,
0x0, 0x0, 0x2, 0xd0, 0x0, 0x0, 0x0, 0x3c,
@@ -5502,130 +5558,133 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 18108, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 18240, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 18367, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 18493, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18626, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 18753, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18886, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 18991, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19112, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 19239, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 19377, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19493, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 19619, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19746, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 19890, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20023, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 20161, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 20299, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 20437, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 20570, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 20703, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 20841, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20968, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 21083, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 21216, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 21354, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 21492, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 21636, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 21774, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 21912, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 22045, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22189, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22327, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22459, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 22592, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 22730, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 22868, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 23006, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23139, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 23277, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23415, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23559, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 23697, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 23835, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 23973, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 24105, .adv_w = 384, .box_w = 16, .box_h = 22, .ofs_x = 4, .ofs_y = -3},
- {.bitmap_index = 24193, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 24314, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 24446, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 24573, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 24700, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 24827, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 24960, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 25098, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 25224, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 25368, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 25512, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 25650, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 25788, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 25926, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 26064, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26208, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26341, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26468, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26601, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26733, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 26859, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 26980, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27118, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27239, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 27355, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27488, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27626, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 27753, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 27880, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 28018, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28145, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28283, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28427, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28565, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28703, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28841, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28985, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29112, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 29245, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 29389, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 29527, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 29671, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 29798, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
- {.bitmap_index = 29906, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30044, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30182, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30320, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30458, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30602, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 30723, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30861, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30999, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31131, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31275, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31413, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31545, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31683, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31827, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31965, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 32092, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32236, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 32374, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 32506, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32650, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 32783, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32921, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 33059, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 33197, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 33335, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 33479, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 33617, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 33744, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 33876, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 34020, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 34135, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 34250, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 34388, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34515, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34631, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 34775, .adv_w = 384, .box_w = 17, .box_h = 19, .ofs_x = 4, .ofs_y = -1},
- {.bitmap_index = 34856, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 6, .ofs_y = -1}
+ {.bitmap_index = 18493, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 18619, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18752, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 18879, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19012, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 19117, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19238, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 19365, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 19503, .adv_w = 384, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19619, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 19745, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19872, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 20016, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20149, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 20287, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 20425, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 20563, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 20696, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 20829, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 20967, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21094, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 21209, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 21336, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 21469, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 21607, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 21745, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 21889, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 22027, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 22165, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 22298, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22442, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22580, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22712, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 22845, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 22983, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 23121, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 23259, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 23392, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 23530, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 23668, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 23812, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 23950, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 24088, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 24226, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 24358, .adv_w = 384, .box_w = 16, .box_h = 22, .ofs_x = 4, .ofs_y = -3},
+ {.bitmap_index = 24446, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 24567, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 24699, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 24826, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 24953, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 25080, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 25213, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 25351, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 25477, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 25621, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 25765, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 25903, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26041, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26179, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 26317, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26461, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26594, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 26721, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26854, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26986, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 27112, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 27233, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27371, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27492, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 27608, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27741, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27879, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 28006, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 28133, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 28271, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28398, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28536, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28680, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28818, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28956, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29094, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29238, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 29365, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 29498, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29642, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29780, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29924, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30051, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30195, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
+ {.bitmap_index = 30303, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30441, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30579, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30717, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30855, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 30999, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 31120, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31258, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 31396, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31528, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 31672, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31810, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31942, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32080, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32224, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 32362, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 32489, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32633, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 32771, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 32903, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 33047, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 33180, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 33318, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 33456, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 33594, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 33732, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 33876, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 34014, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 34141, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 34273, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 34417, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 34532, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 34647, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 34785, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 34912, .adv_w = 384, .box_w = 22, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 35028, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 35172, .adv_w = 384, .box_w = 17, .box_h = 19, .ofs_x = 4, .ofs_y = -1},
+ {.bitmap_index = 35253, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 6, .ofs_y = -1}
};
/*---------------------
@@ -5659,26 +5718,28 @@ static const uint16_t unicode_list_3[] = {
0x1da3, 0x1ddb, 0x1e0c, 0x1e60, 0x1e66, 0x1e6d, 0x1e90, 0x1e9c,
0x1eee, 0x1faa, 0x2076, 0x207d, 0x2082, 0x209e, 0x2117, 0x212e,
0x213a, 0x215b, 0x21ac, 0x21b0, 0x21b1, 0x21ca, 0x21e6, 0x2227,
- 0x2269, 0x22e7, 0x22e8, 0x2308, 0x2319, 0x231d, 0x231e, 0x2337,
- 0x2579, 0x25ef, 0x2638, 0x2639, 0x2742, 0x281a, 0x2842, 0x28dc,
- 0x28e5, 0x2aab, 0x2d14, 0x2db7, 0x2e20, 0x2e26, 0x2e46, 0x2e48,
- 0x2e73, 0x2e96, 0x2eba, 0x2ee9, 0x2fd6, 0x3121, 0x3151, 0x3190,
- 0x31af, 0x31e3, 0x31f2, 0x31fe, 0x3218, 0x3240, 0x32b3, 0x32b6,
- 0x3468, 0x3481, 0x34c1, 0x34ca, 0x34f6, 0x351f, 0x3553, 0x35a8,
- 0x3605, 0x361a, 0x3630, 0x363d, 0x36ad, 0x382d, 0x392a, 0x3970,
- 0x3b8b, 0x3be6, 0x3c4f, 0x3d19, 0x3da7, 0x3fca, 0x4032, 0x430f,
- 0x4317, 0x4430, 0x4434, 0x4439, 0x444c, 0x446a, 0x447b, 0x4481,
- 0x46f6, 0x47cb, 0x484b, 0x48d2, 0x48e3, 0x4aa8, 0x4ab2, 0x4c15,
- 0x4c1c, 0x4c33, 0x4c41, 0x4c53, 0x4c61, 0x4cab, 0x4e83, 0x50fb,
- 0x575d, 0x5779, 0x5818, 0x58a0, 0x58f4, 0x5911, 0x5919, 0x593e,
- 0x594d, 0x5977, 0x5984, 0x599e, 0x59af, 0x59be, 0x5bb2, 0x5bd8,
- 0x5c88, 0x5df3, 0x5e2e, 0x5e49, 0x5eaf, 0x5ecd, 0x5f0e, 0x5f12,
- 0x5f2b, 0x5f66, 0x5f89, 0x607d, 0x60e2, 0x6286, 0x649c, 0x64a4,
- 0x6575, 0x660c, 0x6673, 0x675e, 0xce17, 0xce30
+ 0x2269, 0x22db, 0x22e7, 0x22e8, 0x2308, 0x2319, 0x231d, 0x231e,
+ 0x2337, 0x2579, 0x25ef, 0x2638, 0x2639, 0x2742, 0x281a, 0x2842,
+ 0x28dc, 0x28e5, 0x2aab, 0x2d14, 0x2db7, 0x2e20, 0x2e26, 0x2e42,
+ 0x2e46, 0x2e48, 0x2e73, 0x2e96, 0x2eba, 0x2ee9, 0x2fd6, 0x3121,
+ 0x3151, 0x3190, 0x31af, 0x31e3, 0x31f2, 0x31fe, 0x3218, 0x3240,
+ 0x32b3, 0x32b6, 0x3468, 0x3481, 0x34c1, 0x34ca, 0x34f6, 0x351f,
+ 0x3553, 0x35a8, 0x3605, 0x361a, 0x3630, 0x363d, 0x36ad, 0x382d,
+ 0x392a, 0x3970, 0x3b8b, 0x3be6, 0x3c4f, 0x3d19, 0x3da7, 0x3fca,
+ 0x4032, 0x430f, 0x4317, 0x4430, 0x4434, 0x4439, 0x444c, 0x446a,
+ 0x447b, 0x4481, 0x46f6, 0x47cb, 0x484b, 0x48d2, 0x48e3, 0x4aa8,
+ 0x4ab2, 0x4c15, 0x4c1c, 0x4c33, 0x4c41, 0x4c53, 0x4c61, 0x4cab,
+ 0x4e83, 0x5017, 0x50fb, 0x575d, 0x5779, 0x5818, 0x58a0, 0x58f4,
+ 0x5911, 0x5919, 0x593e, 0x594d, 0x5977, 0x5984, 0x599e, 0x59af,
+ 0x59be, 0x5bb2, 0x5bd8, 0x5c88, 0x5df3, 0x5e2e, 0x5e49, 0x5eaf,
+ 0x5ecd, 0x5f0e, 0x5f12, 0x5f2b, 0x5f66, 0x5f89, 0x607d, 0x60e2,
+ 0x6286, 0x649c, 0x64a4, 0x6575, 0x660c, 0x6673, 0x675e, 0xce17,
+ 0xce30
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -5693,7 +5754,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
},
{
.range_start = 12527, .range_length = 52785, .glyph_id_start = 200,
- .unicode_list = unicode_list_3, .glyph_id_ofs_list = NULL, .list_length = 158, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+ .unicode_list = unicode_list_3, .glyph_id_ofs_list = NULL, .list_length = 161, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@@ -5703,7 +5764,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Pair left and right glyphs for kerning*/
-static const uint16_t kern_pair_glyph_ids[] = {
+static const uint16_t kern_pair_glyph_ids[] =
+{
3, 13,
3, 15,
3, 34,
@@ -6937,165 +6999,167 @@ static const uint16_t kern_pair_glyph_ids[] = {
/* Kerning between the respective left and right glyphs
* 4.4 format which needs to scaled with `kern_scale`*/
-static const int8_t kern_pair_values[] = {
+static const int8_t kern_pair_values[] =
+{
-50, -50, -24, -41, -5, -5, -14, -14,
- -14, -14, -14, -10, -50, -50, -24, -41,
- -5, -5, -14, -14, -14, -14, -14, -10,
- -10, 33, -41, -41, -60, -43, -10, -29,
- -15, -41, -6, -6, -6, 10, -6, -6,
- -21, -15, -10, -10, -10, -8, -21, -9,
- -5, -13, -29, -10, -12, -4, -7, -41,
- -41, -60, -43, -10, -29, -15, -41, -6,
- -6, -6, 10, -6, -6, -21, -15, -10,
- -10, -18, -5, -5, -35, -5, -5, -11,
- -15, -15, -15, -5, 10, 10, -15, -15,
- 3, -10, -23, -12, 0, -23, -12, 0,
- -24, -24, -41, -12, -3, -5, -5, -5,
- -5, -24, -8, -7, 1, -7, -4, -18,
- 9, -5, 9, -7, -3, -4, -3, -3,
- -4, -11, -14, -8, -7, -11, -3, -3,
- -3, -7, -3, -5, -7, -5, -5, -7,
- -10, -12, -13, -13, -5, -13, -13, -11,
- -8, -7, -3, -3, -3, -4, -5, -10,
- -13, -5, -7, -5, -7, -23, -16, -8,
- -5, -18, -11, -5, -3, -8, -10, -10,
- -7, -4, -5, -5, -5, -5, -5, -11,
- -5, -14, -5, -32, -32, -31, -17, -5,
- -5, -61, -5, -5, -10, 1, 1, -11,
- 0, -14, -15, -7, -7, -7, -11, -10,
- -10, -7, -10, -7, -10, -10, -5, -8,
- -10, -8, -12, -8, -13, -7, -13, -3,
- -10, -7, -3, -11, -11, -18, -10, -10,
- -18, -13, -4, -5, -10, -10, -10, -10,
- -5, -8, -7, -6, -5, -8, -4, -4,
- -4, -5, -4, -4, -15, -7, -10, -8,
- -8, -10, -7, -21, -38, -38, -66, -24,
- -15, -12, -12, -12, -12, -11, -53, -13,
- -34, -25, -33, -35, -6, -6, -6, -7,
- -3, -6, -6, -10, -5, -17, -15, -17,
- -41, -16, -8, -5, -18, -11, -5, -3,
- -8, -10, -10, -7, -4, -49, -15, -49,
- -35, -23, -64, -5, -12, -11, -5, -36,
- -20, -12, -12, -12, -14, -12, -12, -5,
- -7, -10, -4, -16, -8, -5, -18, -11,
- -5, -3, -8, -10, -10, -7, -4, -5,
- -13, -3, -8, -7, -7, 1, 2, -3,
- -2, -5, -3, -5, -5, -5, -3, -5,
- -5, -4, -4, -5, -8, 5, -7, -7,
- -10, -7, -11, -1, -6, -46, -32, -46,
- -40, -10, -10, -18, -11, -11, -56, -11,
- -11, -18, -10, -7, -24, -32, -29, -29,
- -29, -8, -32, -21, -21, -29, -21, -29,
- -21, -26, -8, -21, -15, -16, -18, -15,
- -33, -28, -8, -8, -15, -8, -21, -5,
- -3, -5, -7, -3, -5, -3, -4, -29,
- -9, -29, -22, -7, -5, -5, -32, -5,
- -5, -5, -5, 3, -9, -10, -7, -7,
- -7, -10, -10, -10, -7, -10, -7, -10,
- -6, -14, -5, -5, -7, -5, -12, -6,
- -15, -5, -15, -14, -3, -3, -30, -3,
- -3, -3, -3, -8, -7, -5, -5, -5,
- -5, -13, -8, -8, -2, -8, -8, -7,
- -10, -5, -5, -4, -4, -4, -8, -4,
- -4, -8, -5, -8, -7, -5, -8, -7,
- -18, -40, -29, -40, -30, -12, -12, -4,
- -7, -7, -7, -44, -7, -7, -8, -7,
- -5, -12, -30, -19, -19, -19, -27, -18,
- -18, -19, -18, -19, -18, -19, -13, -15,
- -7, -11, -15, -7, -21, -21, -16, -3,
- -10, -10, -15, -10, -10, -14, -5, -3,
- -3, -7, -8, -8, -10, -10, -10, -10,
- -7, -10, -10, -7, -11, -8, -8, -11,
- -8, -27, -10, 33, -38, -14, -24, -14,
- -32, 13, 30, -10, -5, 5, -24, -6,
- -11, -8, -3, -11, -7, -14, -14, -12,
- -5, 2, -5, -6, -26, -9, -3, -21,
- -12, -7, -2, -2, -8, -3, -3, -8,
- -3, -3, -10, -10, -7, -11, -5, -10,
- -10, -10, -5, -10, -10, -5, 2, 2,
- 2, 2, -7, -16, 3, -4, -10, -10,
- -11, -8, -5, -12, -10, -7, -2, -5,
- -5, 1, 1, -4, 1, -1, -3, 5,
- 16, 16, 20, -23, -7, -23, -7, 10,
- 19, 28, 19, 13, 25, 26, 20, -10,
- -5, -5, -5, -7, -5, -5, -5, -3,
- 5, -3, -7, 20, -10, 5, -15, 20,
- -17, -12, -7, 5, -8, -7, -7, -7,
- 15, -7, -7, -3, -3, 5, -7, 5,
- -4, -16, -4, -11, -5, -8, -10, 5,
- -19, 5, 5, 5, -6, -16, -6, -5,
- -9, -9, -9, -5, -5, -9, -9, -10,
- -7, -4, -4, -12, 2, -16, -4, -11,
- -5, -8, -16, -4, -11, -5, -8, -14,
- -14, -12, -5, 2, -5, -6, -26, -9,
- -3, -21, -12, -7, -2, -2, -8, -3,
- -3, -8, -3, -3, -14, -14, -12, -5,
- 2, -5, -6, -26, -9, -3, -21, -12,
- -7, -2, -2, -8, -3, -3, -8, -3,
- -3, -12, -10, -7, -14, -25, -11, -25,
- -16, 10, 10, -7, -24, -5, 5, -11,
- -5, -5, -5, -5, -5, -5, -3, 10,
- 7, 10, -3, -8, -23, 3, -6, -11,
- -5, -10, -10, 2, -12, 2, 3, 5,
- 5, -12, -7, -3, -10, -7, -7, -7,
- -5, -7, -7, -5, -10, -8, -10, -12,
- -10, -7, -14, -6, -15, -4, -15, -10,
- -6, -18, -10, -5, -7, -5, -10, -3,
- -3, -3, -5, -3, -3, -11, -6, -17,
- -17, -4, -3, -14, -11, -5, -7, -11,
- -5, -3, -3, -3, -5, -3, -3, -8,
- -7, -11, 2, -7, -4, 2, -5, -5,
- -5, -5, -3, -15, -7, -5, -15, -5,
- -8, -8, -8, -8, -8, -11, -2, -10,
- -15, -15, -7, -18, -10, -3, -3, -4,
- -10, -3, -3, -3, -5, -3, -3, -7,
- -11, -8, -12, -14, -11, -5, -5, -5,
- -3, -5, -5, -5, -3, -3, -6, -10,
- 33, -11, -11, -28, -12, -12, -25, -17,
- -10, -12, -12, -8, -8, -15, -19, -27,
- -15, -8, -12, -12, 15, -8, -12, 4,
- 4, 12, -8, -19, -8, -8, -27, -8,
- -23, -12, -12, -8, -31, -15, 4, 4,
- -12, -23, -27, -35, 8, 12, 12, -12,
- -12, -8, -19, 12, -15, -19, -12, -12,
- -12, -12, -23, -8, -8, -19, -8, -15,
- 8, -15, -12, -12, -12, -15, -12, -12,
- -12, -4, -12, -8, -8, -8, -8, 4,
- -12, -8, -8, -15, -12, -12, -15, -12,
- -8, -12, -8, -8, -8, -12, -12, -15,
- 4, -15, -8, -15, 4, -8, -12, -12,
- -19, -8, -19, -19, -19, -38, -8, -19,
- -19, -19, -15, -15, -8, -8, -8, -35,
- -15, -8, -8, -8, -8, -27, -19, -4,
- -15, -23, -8, -4, -8, -8, -12, -12,
- -15, -15, -8, -8, -8, -8, -8, -12,
- -19, -23, -8, -8, -12, -8, -8, -15,
- -12, -27, -12, -12, -15, -35, -4, -15,
- -15, -12, -8, -15, -15, -23, -19, -19,
- -31, -15, -12, -27, -8, -8, -8, -8,
- -15, -35, -8, -8, -15, -15, -8, -31,
- -4, -8, -8, -8, -12, -12, -12, -8,
- -8, -8, -23, -23, -19, -27, -27, -27,
- -12, -8, -23, -12, -8, -12, -12, -12,
- -19, 8, 8, -12, -12, -23, -12, -8,
- -4, -4, -31, -8, -12, -23, -12, -12,
- -12, -27, -8, -8, -15, -8, -19, -19,
- -12, -8, -8, -8, -8, -8, -15, -8,
- -12, -8, -8, -8, 12, 12, 19, 12,
- 12, 19, -8, -15, -8, -12, 8, -12,
- -12, -12, -12, -8, 8, 8, -19, -12,
- -23, -23, -23, -19, -8, -8, -8, -8,
- -8, -8, -8, -8, -8, -8, -4, -4,
- -12, -12, -23, -12, -12, -8, -8, -8,
- -8, -23, -12, -19, -8, -8, -23, -8,
- -8, -8, -19, -12, -12, -12, -8, -12,
- -4, -23, -23, -15, -15, -8, -8, -8,
- -8, -19, -19, -8, -23, -4, -4, -23,
- -23, -23, -12, -15, -19
- };
+ -14, -14, -14, -10, -50, -50, -24, -41,
+ -5, -5, -14, -14, -14, -14, -14, -10,
+ -10, 33, -41, -41, -60, -43, -10, -29,
+ -15, -41, -6, -6, -6, 10, -6, -6,
+ -21, -15, -10, -10, -10, -8, -21, -9,
+ -5, -13, -29, -10, -12, -4, -7, -41,
+ -41, -60, -43, -10, -29, -15, -41, -6,
+ -6, -6, 10, -6, -6, -21, -15, -10,
+ -10, -18, -5, -5, -35, -5, -5, -11,
+ -15, -15, -15, -5, 10, 10, -15, -15,
+ 3, -10, -23, -12, 0, -23, -12, 0,
+ -24, -24, -41, -12, -3, -5, -5, -5,
+ -5, -24, -8, -7, 1, -7, -4, -18,
+ 9, -5, 9, -7, -3, -4, -3, -3,
+ -4, -11, -14, -8, -7, -11, -3, -3,
+ -3, -7, -3, -5, -7, -5, -5, -7,
+ -10, -12, -13, -13, -5, -13, -13, -11,
+ -8, -7, -3, -3, -3, -4, -5, -10,
+ -13, -5, -7, -5, -7, -23, -16, -8,
+ -5, -18, -11, -5, -3, -8, -10, -10,
+ -7, -4, -5, -5, -5, -5, -5, -11,
+ -5, -14, -5, -32, -32, -31, -17, -5,
+ -5, -61, -5, -5, -10, 1, 1, -11,
+ 0, -14, -15, -7, -7, -7, -11, -10,
+ -10, -7, -10, -7, -10, -10, -5, -8,
+ -10, -8, -12, -8, -13, -7, -13, -3,
+ -10, -7, -3, -11, -11, -18, -10, -10,
+ -18, -13, -4, -5, -10, -10, -10, -10,
+ -5, -8, -7, -6, -5, -8, -4, -4,
+ -4, -5, -4, -4, -15, -7, -10, -8,
+ -8, -10, -7, -21, -38, -38, -66, -24,
+ -15, -12, -12, -12, -12, -11, -53, -13,
+ -34, -25, -33, -35, -6, -6, -6, -7,
+ -3, -6, -6, -10, -5, -17, -15, -17,
+ -41, -16, -8, -5, -18, -11, -5, -3,
+ -8, -10, -10, -7, -4, -49, -15, -49,
+ -35, -23, -64, -5, -12, -11, -5, -36,
+ -20, -12, -12, -12, -14, -12, -12, -5,
+ -7, -10, -4, -16, -8, -5, -18, -11,
+ -5, -3, -8, -10, -10, -7, -4, -5,
+ -13, -3, -8, -7, -7, 1, 2, -3,
+ -2, -5, -3, -5, -5, -5, -3, -5,
+ -5, -4, -4, -5, -8, 5, -7, -7,
+ -10, -7, -11, -1, -6, -46, -32, -46,
+ -40, -10, -10, -18, -11, -11, -56, -11,
+ -11, -18, -10, -7, -24, -32, -29, -29,
+ -29, -8, -32, -21, -21, -29, -21, -29,
+ -21, -26, -8, -21, -15, -16, -18, -15,
+ -33, -28, -8, -8, -15, -8, -21, -5,
+ -3, -5, -7, -3, -5, -3, -4, -29,
+ -9, -29, -22, -7, -5, -5, -32, -5,
+ -5, -5, -5, 3, -9, -10, -7, -7,
+ -7, -10, -10, -10, -7, -10, -7, -10,
+ -6, -14, -5, -5, -7, -5, -12, -6,
+ -15, -5, -15, -14, -3, -3, -30, -3,
+ -3, -3, -3, -8, -7, -5, -5, -5,
+ -5, -13, -8, -8, -2, -8, -8, -7,
+ -10, -5, -5, -4, -4, -4, -8, -4,
+ -4, -8, -5, -8, -7, -5, -8, -7,
+ -18, -40, -29, -40, -30, -12, -12, -4,
+ -7, -7, -7, -44, -7, -7, -8, -7,
+ -5, -12, -30, -19, -19, -19, -27, -18,
+ -18, -19, -18, -19, -18, -19, -13, -15,
+ -7, -11, -15, -7, -21, -21, -16, -3,
+ -10, -10, -15, -10, -10, -14, -5, -3,
+ -3, -7, -8, -8, -10, -10, -10, -10,
+ -7, -10, -10, -7, -11, -8, -8, -11,
+ -8, -27, -10, 33, -38, -14, -24, -14,
+ -32, 13, 30, -10, -5, 5, -24, -6,
+ -11, -8, -3, -11, -7, -14, -14, -12,
+ -5, 2, -5, -6, -26, -9, -3, -21,
+ -12, -7, -2, -2, -8, -3, -3, -8,
+ -3, -3, -10, -10, -7, -11, -5, -10,
+ -10, -10, -5, -10, -10, -5, 2, 2,
+ 2, 2, -7, -16, 3, -4, -10, -10,
+ -11, -8, -5, -12, -10, -7, -2, -5,
+ -5, 1, 1, -4, 1, -1, -3, 5,
+ 16, 16, 20, -23, -7, -23, -7, 10,
+ 19, 28, 19, 13, 25, 26, 20, -10,
+ -5, -5, -5, -7, -5, -5, -5, -3,
+ 5, -3, -7, 20, -10, 5, -15, 20,
+ -17, -12, -7, 5, -8, -7, -7, -7,
+ 15, -7, -7, -3, -3, 5, -7, 5,
+ -4, -16, -4, -11, -5, -8, -10, 5,
+ -19, 5, 5, 5, -6, -16, -6, -5,
+ -9, -9, -9, -5, -5, -9, -9, -10,
+ -7, -4, -4, -12, 2, -16, -4, -11,
+ -5, -8, -16, -4, -11, -5, -8, -14,
+ -14, -12, -5, 2, -5, -6, -26, -9,
+ -3, -21, -12, -7, -2, -2, -8, -3,
+ -3, -8, -3, -3, -14, -14, -12, -5,
+ 2, -5, -6, -26, -9, -3, -21, -12,
+ -7, -2, -2, -8, -3, -3, -8, -3,
+ -3, -12, -10, -7, -14, -25, -11, -25,
+ -16, 10, 10, -7, -24, -5, 5, -11,
+ -5, -5, -5, -5, -5, -5, -3, 10,
+ 7, 10, -3, -8, -23, 3, -6, -11,
+ -5, -10, -10, 2, -12, 2, 3, 5,
+ 5, -12, -7, -3, -10, -7, -7, -7,
+ -5, -7, -7, -5, -10, -8, -10, -12,
+ -10, -7, -14, -6, -15, -4, -15, -10,
+ -6, -18, -10, -5, -7, -5, -10, -3,
+ -3, -3, -5, -3, -3, -11, -6, -17,
+ -17, -4, -3, -14, -11, -5, -7, -11,
+ -5, -3, -3, -3, -5, -3, -3, -8,
+ -7, -11, 2, -7, -4, 2, -5, -5,
+ -5, -5, -3, -15, -7, -5, -15, -5,
+ -8, -8, -8, -8, -8, -11, -2, -10,
+ -15, -15, -7, -18, -10, -3, -3, -4,
+ -10, -3, -3, -3, -5, -3, -3, -7,
+ -11, -8, -12, -14, -11, -5, -5, -5,
+ -3, -5, -5, -5, -3, -3, -6, -10,
+ 33, -11, -11, -28, -12, -12, -25, -17,
+ -10, -12, -12, -8, -8, -15, -19, -27,
+ -15, -8, -12, -12, 15, -8, -12, 4,
+ 4, 12, -8, -19, -8, -8, -27, -8,
+ -23, -12, -12, -8, -31, -15, 4, 4,
+ -12, -23, -27, -35, 8, 12, 12, -12,
+ -12, -8, -19, 12, -15, -19, -12, -12,
+ -12, -12, -23, -8, -8, -19, -8, -15,
+ 8, -15, -12, -12, -12, -15, -12, -12,
+ -12, -4, -12, -8, -8, -8, -8, 4,
+ -12, -8, -8, -15, -12, -12, -15, -12,
+ -8, -12, -8, -8, -8, -12, -12, -15,
+ 4, -15, -8, -15, 4, -8, -12, -12,
+ -19, -8, -19, -19, -19, -38, -8, -19,
+ -19, -19, -15, -15, -8, -8, -8, -35,
+ -15, -8, -8, -8, -8, -27, -19, -4,
+ -15, -23, -8, -4, -8, -8, -12, -12,
+ -15, -15, -8, -8, -8, -8, -8, -12,
+ -19, -23, -8, -8, -12, -8, -8, -15,
+ -12, -27, -12, -12, -15, -35, -4, -15,
+ -15, -12, -8, -15, -15, -23, -19, -19,
+ -31, -15, -12, -27, -8, -8, -8, -8,
+ -15, -35, -8, -8, -15, -15, -8, -31,
+ -4, -8, -8, -8, -12, -12, -12, -8,
+ -8, -8, -23, -23, -19, -27, -27, -27,
+ -12, -8, -23, -12, -8, -12, -12, -12,
+ -19, 8, 8, -12, -12, -23, -12, -8,
+ -4, -4, -31, -8, -12, -23, -12, -12,
+ -12, -27, -8, -8, -15, -8, -19, -19,
+ -12, -8, -8, -8, -8, -8, -15, -8,
+ -12, -8, -8, -8, 12, 12, 19, 12,
+ 12, 19, -8, -15, -8, -12, 8, -12,
+ -12, -12, -12, -8, 8, 8, -19, -12,
+ -23, -23, -23, -19, -8, -8, -8, -8,
+ -8, -8, -8, -8, -8, -8, -4, -4,
+ -12, -12, -23, -12, -12, -8, -8, -8,
+ -8, -23, -12, -19, -8, -8, -23, -8,
+ -8, -8, -19, -12, -12, -12, -8, -12,
+ -4, -23, -23, -15, -15, -8, -8, -8,
+ -8, -19, -19, -8, -23, -4, -4, -23,
+ -23, -23, -12, -15, -19
+};
/*Collect the kern pair's data in one place*/
-static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
+static const lv_font_fmt_txt_kern_pair_t kern_pairs =
+{
.glyph_ids = kern_pair_glyph_ids,
.values = kern_pair_values,
.pair_cnt = 1229,
@@ -7106,9 +7170,12 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -7122,18 +7189,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t jaText = {
#else
lv_font_t jaText = {
@@ -7149,7 +7217,11 @@ lv_font_t jaText = {
.underline_position = -3,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/ja/jaTitle.c b/src/ui/gui_assets/font/ja/jaTitle.c
index bc2d12c..2916137 100644
--- a/src/ui/gui_assets/font/ja/jaTitle.c
+++ b/src/ui/gui_assets/font/ja/jaTitle.c
@@ -2337,7 +2337,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -2354,7 +2355,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Pair left and right glyphs for kerning*/
-static const uint8_t kern_pair_glyph_ids[] = {
+static const uint8_t kern_pair_glyph_ids[] =
+{
3, 13,
3, 15,
3, 34,
@@ -3362,137 +3364,139 @@ static const uint8_t kern_pair_glyph_ids[] = {
/* Kerning between the respective left and right glyphs
* 4.4 format which needs to scaled with `kern_scale`*/
-static const int8_t kern_pair_values[] = {
+static const int8_t kern_pair_values[] =
+{
-75, -75, -36, -62, -8, -8, -21, -21,
- -21, -21, -21, -14, -75, -75, -36, -62,
- -8, -8, -21, -21, -21, -21, -21, -14,
- -14, 50, -62, -62, -89, -65, -14, -43,
- -23, -61, -9, -9, -9, 15, -9, -9,
- -31, -23, -16, -14, -14, -13, -32, -14,
- -8, -19, -44, -14, -18, -6, -10, -62,
- -62, -89, -65, -14, -43, -23, -61, -9,
- -9, -9, 15, -9, -9, -31, -23, -16,
- -14, -28, -8, -8, -53, -8, -8, -17,
- -22, -22, -22, -8, 15, 15, -22, -22,
- 4, -14, -34, -18, 1, -34, -18, 1,
- -36, -36, -62, -18, -5, -8, -8, -8,
- -8, -36, -12, -10, 1, -10, -6, -28,
- 13, -8, 13, -10, -5, -6, -4, -4,
- -6, -17, -21, -12, -10, -17, -5, -4,
- -4, -10, -4, -8, -10, -8, -8, -10,
- -14, -18, -20, -20, -8, -20, -20, -17,
- -13, -10, -4, -4, -4, -6, -8, -14,
- -19, -8, -10, -8, -10, -35, -24, -13,
- -8, -27, -17, -8, -5, -13, -14, -14,
- -10, -6, -8, -8, -8, -8, -8, -17,
- -8, -21, -8, -48, -48, -47, -26, -8,
- -8, -91, -8, -8, -14, 1, 1, -17,
- -1, -21, -23, -10, -10, -10, -17, -14,
- -14, -10, -14, -10, -14, -14, -8, -12,
- -14, -12, -18, -12, -20, -10, -19, -4,
- -14, -10, -4, -17, -17, -28, -15, -15,
- -28, -20, -6, -8, -14, -14, -14, -14,
- -7, -13, -10, -9, -8, -12, -6, -6,
- -6, -8, -6, -6, -23, -11, -14, -12,
- -12, -14, -10, -31, -57, -57, -99, -36,
- -22, -18, -18, -18, -18, -16, -79, -20,
- -51, -37, -50, -53, -9, -9, -9, -10,
- -4, -9, -9, -14, -8, -25, -23, -25,
- -61, -24, -13, -8, -27, -17, -8, -5,
- -13, -14, -14, -10, -6, -74, -23, -74,
- -52, -34, -96, -8, -17, -17, -8, -54,
- -29, -17, -17, -17, -21, -17, -17, -8,
- -10, -14, -6, -24, -13, -8, -27, -17,
- -8, -5, -13, -14, -14, -10, -6, -8,
- -20, -4, -13, -10, -10, 2, 2, -4,
- -2, -8, -4, -8, -8, -8, -4, -8,
- -8, -6, -6, -8, -12, 7, -10, -10,
- -14, -10, -17, -2, -9, -70, -48, -70,
- -60, -14, -14, -28, -17, -17, -84, -17,
- -17, -28, -14, -10, -36, -48, -44, -44,
- -44, -13, -48, -32, -32, -44, -32, -44,
- -32, -39, -13, -32, -23, -24, -28, -23,
- -50, -43, -12, -12, -22, -12, -32, -8,
- -4, -8, -10, -4, -8, -4, -6, -43,
- -14, -43, -32, -10, -8, -8, -48, -8,
- -8, -8, -8, 5, -14, -16, -11, -11,
- -11, -16, -14, -14, -11, -14, -11, -14,
- -9, -21, -7, -7, -11, -7, -18, -9,
- -23, -8, -23, -21, -5, -5, -44, -5,
- -5, -5, -5, -12, -10, -8, -8, -8,
- -8, -19, -13, -13, -2, -13, -13, -10,
- -14, -8, -8, -6, -6, -6, -12, -6,
- -6, -12, -8, -12, -10, -8, -12, -10,
- -28, -59, -44, -59, -45, -17, -17, -6,
- -10, -10, -10, -66, -10, -10, -12, -10,
- -8, -18, -45, -28, -28, -28, -40, -28,
- -28, -28, -28, -28, -28, -28, -20, -23,
- -10, -17, -23, -10, -32, -31, -24, -5,
- -14, -14, -23, -14, -14, -21, -8, -5,
- -5, -10, -12, -12, -16, -16, -16, -14,
- -11, -16, -16, -10, -17, -12, -12, -17,
- -12, -40, -14, 50, -57, -21, -36, -21,
- -48, 20, 46, -14, -8, 7, -36, -9,
- -17, -12, -4, -17, -10, -21, -21, -18,
- -8, 2, -8, -9, -39, -14, -4, -31,
- -18, -11, -3, -3, -13, -4, -4, -13,
- -4, -5, -14, -14, -10, -17, -8, -16,
- -16, -16, -8, -16, -16, -8, 2, 2,
- 3, 2, -10, -24, 5, -6, -14, -14,
- -17, -12, -8, -18, -14, -11, -3, -8,
- -8, 2, 2, -6, 2, -1, -4, 7,
- 24, 24, 31, -34, -10, -34, -11, 16,
- 28, 41, 28, 20, 37, 39, 31, -14,
- -8, -8, -8, -11, -8, -8, -8, -4,
- 7, -4, -10, 31, -14, 7, -23, 29,
- -25, -18, -10, 7, -12, -10, -10, -10,
- 22, -10, -10, -4, -4, 8, -10, 7,
- -6, -24, -6, -17, -8, -12, -16, 7,
- -28, 7, 7, 7, -9, -24, -9, -8,
- -13, -13, -13, -8, -8, -13, -13, -15,
- -10, -6, -6, -18, 3, -24, -6, -17,
- -8, -12, -24, -6, -17, -8, -12, -21,
- -21, -18, -8, 2, -8, -9, -39, -14,
- -4, -31, -18, -11, -3, -3, -13, -4,
- -4, -13, -4, -5, -21, -21, -18, -8,
- 2, -8, -9, -39, -14, -4, -31, -18,
- -11, -3, -3, -13, -4, -4, -13, -4,
- -5, -17, -14, -10, -21, -37, -17, -37,
- -24, 15, 15, -10, -36, -8, 7, -17,
- -8, -8, -8, -8, -8, -8, -4, 15,
- 11, 15, -4, -12, -34, 5, -9, -17,
- -8, -14, -14, 3, -18, 3, 5, 7,
- 7, -18, -10, -4, -16, -10, -10, -10,
- -8, -10, -10, -8, -14, -12, -14, -17,
- -14, -10, -21, -9, -23, -6, -23, -14,
- -9, -28, -14, -7, -10, -8, -14, -4,
- -4, -4, -8, -4, -4, -17, -9, -26,
- -26, -6, -4, -21, -17, -7, -10, -17,
- -8, -4, -4, -4, -8, -4, -4, -13,
- -10, -16, 3, -10, -6, 3, -8, -8,
- -8, -8, -4, -23, -11, -8, -23, -8,
- -13, -13, -13, -13, -13, -17, -2, -14,
- -23, -23, -11, -28, -14, -4, -4, -6,
- -14, -4, -4, -4, -8, -4, -4, -10,
- -17, -12, -18, -21, -17, -8, -8, -8,
- -5, -8, -8, -8, -4, -4, -9, -14,
- 50, -17, -17, -43, -18, -18, -38, -26,
- -14, -17, -17, -12, -12, -17, -12, 6,
- -17, -17, -17, -12, -12, -12, -17, -23,
- -29, -29, -29, -23, -12, -23, -12, -40,
- -6, -23, -35, -12, -12, -17, -12, -12,
- -12, -12, -12, -17, -17, -17, -6, -23,
- -23, -17, -29, -29, -46, -17, -12, -12,
- -12, -23, -12, -23, -23, -12, -17, -17,
- -17, -12, -12, -12, 17, 17, 29, 17,
- 17, 29, -17, 12, -35, -35, -12, -12,
- -12, -12, -12, -12, -12, -17, -17, -12,
- -35, -23, -12, -12, -29, -6, -6, -35,
- -35, -17, -29
- };
+ -21, -21, -21, -14, -75, -75, -36, -62,
+ -8, -8, -21, -21, -21, -21, -21, -14,
+ -14, 50, -62, -62, -89, -65, -14, -43,
+ -23, -61, -9, -9, -9, 15, -9, -9,
+ -31, -23, -16, -14, -14, -13, -32, -14,
+ -8, -19, -44, -14, -18, -6, -10, -62,
+ -62, -89, -65, -14, -43, -23, -61, -9,
+ -9, -9, 15, -9, -9, -31, -23, -16,
+ -14, -28, -8, -8, -53, -8, -8, -17,
+ -22, -22, -22, -8, 15, 15, -22, -22,
+ 4, -14, -34, -18, 1, -34, -18, 1,
+ -36, -36, -62, -18, -5, -8, -8, -8,
+ -8, -36, -12, -10, 1, -10, -6, -28,
+ 13, -8, 13, -10, -5, -6, -4, -4,
+ -6, -17, -21, -12, -10, -17, -5, -4,
+ -4, -10, -4, -8, -10, -8, -8, -10,
+ -14, -18, -20, -20, -8, -20, -20, -17,
+ -13, -10, -4, -4, -4, -6, -8, -14,
+ -19, -8, -10, -8, -10, -35, -24, -13,
+ -8, -27, -17, -8, -5, -13, -14, -14,
+ -10, -6, -8, -8, -8, -8, -8, -17,
+ -8, -21, -8, -48, -48, -47, -26, -8,
+ -8, -91, -8, -8, -14, 1, 1, -17,
+ -1, -21, -23, -10, -10, -10, -17, -14,
+ -14, -10, -14, -10, -14, -14, -8, -12,
+ -14, -12, -18, -12, -20, -10, -19, -4,
+ -14, -10, -4, -17, -17, -28, -15, -15,
+ -28, -20, -6, -8, -14, -14, -14, -14,
+ -7, -13, -10, -9, -8, -12, -6, -6,
+ -6, -8, -6, -6, -23, -11, -14, -12,
+ -12, -14, -10, -31, -57, -57, -99, -36,
+ -22, -18, -18, -18, -18, -16, -79, -20,
+ -51, -37, -50, -53, -9, -9, -9, -10,
+ -4, -9, -9, -14, -8, -25, -23, -25,
+ -61, -24, -13, -8, -27, -17, -8, -5,
+ -13, -14, -14, -10, -6, -74, -23, -74,
+ -52, -34, -96, -8, -17, -17, -8, -54,
+ -29, -17, -17, -17, -21, -17, -17, -8,
+ -10, -14, -6, -24, -13, -8, -27, -17,
+ -8, -5, -13, -14, -14, -10, -6, -8,
+ -20, -4, -13, -10, -10, 2, 2, -4,
+ -2, -8, -4, -8, -8, -8, -4, -8,
+ -8, -6, -6, -8, -12, 7, -10, -10,
+ -14, -10, -17, -2, -9, -70, -48, -70,
+ -60, -14, -14, -28, -17, -17, -84, -17,
+ -17, -28, -14, -10, -36, -48, -44, -44,
+ -44, -13, -48, -32, -32, -44, -32, -44,
+ -32, -39, -13, -32, -23, -24, -28, -23,
+ -50, -43, -12, -12, -22, -12, -32, -8,
+ -4, -8, -10, -4, -8, -4, -6, -43,
+ -14, -43, -32, -10, -8, -8, -48, -8,
+ -8, -8, -8, 5, -14, -16, -11, -11,
+ -11, -16, -14, -14, -11, -14, -11, -14,
+ -9, -21, -7, -7, -11, -7, -18, -9,
+ -23, -8, -23, -21, -5, -5, -44, -5,
+ -5, -5, -5, -12, -10, -8, -8, -8,
+ -8, -19, -13, -13, -2, -13, -13, -10,
+ -14, -8, -8, -6, -6, -6, -12, -6,
+ -6, -12, -8, -12, -10, -8, -12, -10,
+ -28, -59, -44, -59, -45, -17, -17, -6,
+ -10, -10, -10, -66, -10, -10, -12, -10,
+ -8, -18, -45, -28, -28, -28, -40, -28,
+ -28, -28, -28, -28, -28, -28, -20, -23,
+ -10, -17, -23, -10, -32, -31, -24, -5,
+ -14, -14, -23, -14, -14, -21, -8, -5,
+ -5, -10, -12, -12, -16, -16, -16, -14,
+ -11, -16, -16, -10, -17, -12, -12, -17,
+ -12, -40, -14, 50, -57, -21, -36, -21,
+ -48, 20, 46, -14, -8, 7, -36, -9,
+ -17, -12, -4, -17, -10, -21, -21, -18,
+ -8, 2, -8, -9, -39, -14, -4, -31,
+ -18, -11, -3, -3, -13, -4, -4, -13,
+ -4, -5, -14, -14, -10, -17, -8, -16,
+ -16, -16, -8, -16, -16, -8, 2, 2,
+ 3, 2, -10, -24, 5, -6, -14, -14,
+ -17, -12, -8, -18, -14, -11, -3, -8,
+ -8, 2, 2, -6, 2, -1, -4, 7,
+ 24, 24, 31, -34, -10, -34, -11, 16,
+ 28, 41, 28, 20, 37, 39, 31, -14,
+ -8, -8, -8, -11, -8, -8, -8, -4,
+ 7, -4, -10, 31, -14, 7, -23, 29,
+ -25, -18, -10, 7, -12, -10, -10, -10,
+ 22, -10, -10, -4, -4, 8, -10, 7,
+ -6, -24, -6, -17, -8, -12, -16, 7,
+ -28, 7, 7, 7, -9, -24, -9, -8,
+ -13, -13, -13, -8, -8, -13, -13, -15,
+ -10, -6, -6, -18, 3, -24, -6, -17,
+ -8, -12, -24, -6, -17, -8, -12, -21,
+ -21, -18, -8, 2, -8, -9, -39, -14,
+ -4, -31, -18, -11, -3, -3, -13, -4,
+ -4, -13, -4, -5, -21, -21, -18, -8,
+ 2, -8, -9, -39, -14, -4, -31, -18,
+ -11, -3, -3, -13, -4, -4, -13, -4,
+ -5, -17, -14, -10, -21, -37, -17, -37,
+ -24, 15, 15, -10, -36, -8, 7, -17,
+ -8, -8, -8, -8, -8, -8, -4, 15,
+ 11, 15, -4, -12, -34, 5, -9, -17,
+ -8, -14, -14, 3, -18, 3, 5, 7,
+ 7, -18, -10, -4, -16, -10, -10, -10,
+ -8, -10, -10, -8, -14, -12, -14, -17,
+ -14, -10, -21, -9, -23, -6, -23, -14,
+ -9, -28, -14, -7, -10, -8, -14, -4,
+ -4, -4, -8, -4, -4, -17, -9, -26,
+ -26, -6, -4, -21, -17, -7, -10, -17,
+ -8, -4, -4, -4, -8, -4, -4, -13,
+ -10, -16, 3, -10, -6, 3, -8, -8,
+ -8, -8, -4, -23, -11, -8, -23, -8,
+ -13, -13, -13, -13, -13, -17, -2, -14,
+ -23, -23, -11, -28, -14, -4, -4, -6,
+ -14, -4, -4, -4, -8, -4, -4, -10,
+ -17, -12, -18, -21, -17, -8, -8, -8,
+ -5, -8, -8, -8, -4, -4, -9, -14,
+ 50, -17, -17, -43, -18, -18, -38, -26,
+ -14, -17, -17, -12, -12, -17, -12, 6,
+ -17, -17, -17, -12, -12, -12, -17, -23,
+ -29, -29, -29, -23, -12, -23, -12, -40,
+ -6, -23, -35, -12, -12, -17, -12, -12,
+ -12, -12, -12, -17, -17, -17, -6, -23,
+ -23, -17, -29, -29, -46, -17, -12, -12,
+ -12, -23, -12, -23, -23, -12, -17, -17,
+ -17, -12, -12, -12, 17, 17, 29, 17,
+ 17, 29, -17, 12, -35, -35, -12, -12,
+ -12, -12, -12, -12, -12, -17, -17, -12,
+ -35, -23, -12, -12, -29, -6, -6, -35,
+ -35, -17, -29
+};
/*Collect the kern pair's data in one place*/
-static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
+static const lv_font_fmt_txt_kern_pair_t kern_pairs =
+{
.glyph_ids = kern_pair_glyph_ids,
.values = kern_pair_values,
.pair_cnt = 1003,
@@ -3503,9 +3507,12 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -3519,18 +3526,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t jaTitle = {
#else
lv_font_t jaTitle = {
@@ -3546,7 +3554,11 @@ lv_font_t jaTitle = {
.underline_position = -4,
.underline_thickness = 2,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/ko/koIllustrate.c b/src/ui/gui_assets/font/ko/koIllustrate.c
index 6d8bf7b..74922b4 100644
--- a/src/ui/gui_assets/font/ko/koIllustrate.c
+++ b/src/ui/gui_assets/font/ko/koIllustrate.c
@@ -341,7 +341,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+0052 "R" */
0xff, 0xfe, 0x3, 0xd5, 0xbf, 0xf, 0x0, 0x2d,
0x3c, 0x0, 0x38, 0xf0, 0x0, 0xe3, 0xc0, 0xb,
- 0x4f, 0x1, 0xbc, 0x3f, 0xff, 0x80, 0xf5, 0xb8,
+ 0x8f, 0x1, 0xbc, 0x3f, 0xff, 0x80, 0xf5, 0xb8,
0x3, 0xc0, 0xb4, 0xf, 0x0, 0xf0, 0x3c, 0x2,
0xe0, 0xf0, 0x3, 0xc3, 0xc0, 0x7, 0xc0,
@@ -967,7 +967,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+ACF5 "공" */
0x5, 0x55, 0x55, 0x50, 0x3, 0xff, 0xff, 0xfd,
0x0, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x0,
- 0xd0, 0x0, 0x1, 0x40, 0x74, 0x0, 0x0, 0xe0,
+ 0xd0, 0x0, 0x1, 0x40, 0x34, 0x0, 0x0, 0xe0,
0x1d, 0x0, 0x0, 0x38, 0x7, 0x0, 0x0, 0xe,
0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0x95, 0x55,
0x55, 0x55, 0x40, 0x0, 0x0, 0x0, 0x0, 0x6,
@@ -4204,7 +4204,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
/* U+C778 "인" */
0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x38,
0x7, 0xfd, 0x0, 0x38, 0x2f, 0x5b, 0x80, 0x38,
- 0x38, 0x1, 0xd0, 0x38, 0xb0, 0x0, 0xe0, 0x38,
+ 0x38, 0x1, 0xd0, 0x38, 0xb0, 0x0, 0xf0, 0x38,
0xb0, 0x0, 0xf0, 0x38, 0x70, 0x0, 0xe0, 0x38,
0x3c, 0x2, 0xd0, 0x38, 0x1f, 0xaf, 0x80, 0x38,
0x2, 0xf9, 0x0, 0x38, 0x0, 0x0, 0x0, 0x38,
@@ -4986,7 +4986,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x80, 0x3, 0xc0, 0xf, 0x0, 0xf, 0x0, 0x7c,
0x0, 0x3c, 0x2, 0xf4, 0x0, 0xf0, 0xe, 0xf0,
0x3, 0xc0, 0xb1, 0xe0, 0xf, 0xb, 0x42, 0xe0,
- 0x3c, 0xb8, 0x2, 0xf0, 0xf7, 0x80, 0x2, 0xc3,
+ 0x3c, 0xb8, 0x2, 0xf0, 0xf7, 0x80, 0x1, 0xc3,
0xc0, 0x0, 0x0, 0xf, 0x0, 0x0, 0x0, 0x3c,
0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x3, 0xc0,
@@ -6641,7 +6641,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -6658,7 +6659,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {
+static const uint8_t kern_left_class_mapping[] =
+{
0, 0, 0, 1, 0, 0, 0, 0,
1, 2, 0, 0, 0, 3, 4, 3,
5, 0, 0, 0, 0, 0, 0, 0,
@@ -6732,7 +6734,8 @@ static const uint8_t kern_left_class_mapping[] = {
};
/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {
+static const uint8_t kern_right_class_mapping[] =
+{
0, 0, 1, 2, 0, 0, 0, 0,
2, 0, 3, 4, 0, 5, 6, 7,
8, 0, 0, 0, 0, 0, 0, 0,
@@ -6806,7 +6809,8 @@ static const uint8_t kern_right_class_mapping[] = {
};
/*Kern values between classes*/
-static const int8_t kern_class_values[] = {
+static const int8_t kern_class_values[] =
+{
0, 0, 0, 0, -42, 0, -42, 0,
0, 0, 0, -20, 0, -35, -4, 0,
0, 0, 0, -4, 0, 0, 0, 0,
@@ -7036,7 +7040,8 @@ static const int8_t kern_class_values[] = {
/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
+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,
@@ -7048,9 +7053,12 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -7064,18 +7072,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 2,
.kern_classes = 1,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR >= 8
const lv_font_t koIllustrate = {
#else
lv_font_t koIllustrate = {
@@ -7091,7 +7100,11 @@ lv_font_t koIllustrate = {
.underline_position = -2,
.underline_thickness = 1,
#endif
- .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+ .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
+ .fallback = NULL,
+#endif
+ .user_data = NULL,
};
diff --git a/src/ui/gui_assets/font/ko/koLittleTitle.c b/src/ui/gui_assets/font/ko/koLittleTitle.c
index 9a5809f..e6a8a74 100644
--- a/src/ui/gui_assets/font/ko/koLittleTitle.c
+++ b/src/ui/gui_assets/font/ko/koLittleTitle.c
@@ -3221,7 +3221,8 @@ static const uint16_t unicode_list_1[] = {
};
/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] = {
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
{
.range_start = 32, .range_length = 95, .glyph_id_start = 1,
.unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
@@ -3238,7 +3239,8 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
/*Map glyph_ids to kern left classes*/
-static const uint8_t kern_left_class_mapping[] = {
+static const uint8_t kern_left_class_mapping[] =
+{
0, 0, 0, 1, 0, 0, 0, 0,
1, 2, 0, 0, 0, 3, 4, 3,
5, 0, 0, 0, 0, 0, 0, 0,
@@ -3281,7 +3283,8 @@ static const uint8_t kern_left_class_mapping[] = {
};
/*Map glyph_ids to kern right classes*/
-static const uint8_t kern_right_class_mapping[] = {
+static const uint8_t kern_right_class_mapping[] =
+{
0, 0, 1, 2, 0, 0, 0, 0,
2, 0, 3, 4, 0, 5, 6, 7,
8, 0, 0, 0, 0, 0, 0, 0,
@@ -3324,7 +3327,8 @@ static const uint8_t kern_right_class_mapping[] = {
};
/*Kern values between classes*/
-static const int8_t kern_class_values[] = {
+static const int8_t kern_class_values[] =
+{
0, 0, 0, 0, -59, 0, -59, 0,
0, 0, 0, -28, 0, -48, -6, 0,
0, 0, 0, -6, 0, 0, 0, 0,
@@ -3554,7 +3558,8 @@ static const int8_t kern_class_values[] = {
/*Collect the kern class' data in one place*/
-static const lv_font_fmt_txt_kern_classes_t kern_classes = {
+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,
@@ -3566,9 +3571,12 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
+#endif
+
+#if LVGL_VERSION_MAJOR >= 8
static const lv_font_fmt_txt_dsc_t font_dsc = {
#else
static lv_font_fmt_txt_dsc_t font_dsc = {
@@ -3582,18 +3590,19 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 1,
.bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
+#if LVGL_VERSION_MAJOR == 8
.cache = &cache
#endif
};
+
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize aWhy this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.