What changed, and why it matters
This commit adds a user-facing option to scramble the numeric PIN keypad layout on the Keystone 3 hardware wallet. When enabled, the digits appear in a random order each time, making it harder for someone watching or filming the screen to guess the PIN from finger positions. It is a security-hardening feature, not a fix for an active vulnerability, and it is off by default.
No immediate action required. Treat as a normal feature addition. If auditing, verify that the shuffle uses a cryptographically appropriate random source and that the setting cannot be toggled without authentication when the device is locked.
Security signals we found
Adds optional randomized PIN pad to mitigate shoulder-surfing / side-channel attacks
Randomization is opt-in and defaults to off
Uses existing Fisher-Yates shuffle on digit labels
Adds persistent setting stored in device settings JSON
Removes debug print statements from recovery-mode switch function
Evidence from the diff
The patch introduces a new persistent device setting random_pin_pad (stored in JSON device settings with default 0), getter/setter APIs, a system-settings UI toggle, and wiring so the PIN-entry and lock-screen keyboards call GuiUpdateNumKeyBoardMap(btnm, randomPinPad). If the setting is true, the existing ShuffleNumKeyBoardMap Fisher-Yates shuffle is applied; otherwise a new fixed default map is used. Font assets for Chinese, Korean, Russian and i18n strings are updated to label the toggle. A minor unrelated cleanup removes debug printf/PrintArray calls from SetRecoveryModeSwitch, and a whitespace-only change appears in an ETH batch transaction file.
Changed components
src/device_setting.hsrc/device_settings.csrc/ui/gui_components/gui_keyboard.csrc/ui/gui_components/gui_keyboard.hsrc/ui/gui_views/gui_lock_view.csrc/ui/gui_views/gui_views.hsrc/ui/gui_widgets/gui_enter_passcode.csrc/ui/gui_widgets/gui_enter_passcode.hsrc/ui/gui_widgets/gui_lock_widgets.csrc/ui/gui_widgets/gui_lock_widgets.hsrc/ui/gui_widgets/gui_system_setting_widgets.csrc/ui/lv_i18n/data.csvsrc/ui/lv_i18n/lv_i18n.csrc/ui/gui_assets/font/cn/cnText.csrc/ui/gui_assets/font/ko/koText.csrc/ui/gui_assets/font/ru/ruText.cInspect captured patch +551 / −384
diff --git a/src/device_setting.h b/src/device_setting.h
index 4bbb179..c5b9406 100644
--- a/src/device_setting.h
+++ b/src/device_setting.h
@@ -28,6 +28,9 @@ void SetAutoPowerOff(uint32_t autoPowerOff);
uint32_t GetVibration(void);
void SetVibration(uint32_t vibration);
+uint32_t GetRandomPinPad(void);
+void SetRandomPinPad(uint32_t random);
+
uint32_t GetPermitSign(void);
void SetPermitSign(uint32_t permitSign);
diff --git a/src/device_settings.c b/src/device_settings.c
index e1b8e39..8f335ec 100644
--- a/src/device_settings.c
+++ b/src/device_settings.c
@@ -35,6 +35,7 @@
#define KEY_AUTO_LOCK_SCREEN "auto_lock_screen"
#define KEY_AUTO_POWER_OFF "auto_power_off"
#define KEY_VIBRATION "vibration"
+#define KEY_RANDOM_PIN_PAD "random_pin_pad"
#define KEY_PERMIT_SIGN "permit_sign"
#define KEY_DARK_MODE "dark_mode"
#define KEY_USB_SWITCH "usb_switch"
@@ -48,6 +49,7 @@
#define DEFAULT_AUTO_LOCK_SCREEN 60
#define DEFAULT_AUTO_POWER_OFF 0
#define DEFAULT_VIBRATION 1
+#define DEFAULT_RANDOM_PIN_PAD 0
#define DEFAULT_PERMIT_SIGN 0
#define DEFAULT_DARK_MODE 1
#define DEFAULT_USB_SWITCH 1
@@ -59,6 +61,7 @@ typedef struct {
uint32_t autoLockScreen;
uint32_t autoPowerOff;
uint32_t vibration;
+ uint32_t randomPinPad;
uint32_t permitSign;
uint32_t darkMode;
uint32_t usbSwitch;
@@ -127,6 +130,7 @@ void DeviceSettingsInit(void)
g_deviceSettings.autoLockScreen = DEFAULT_AUTO_LOCK_SCREEN;
g_deviceSettings.autoPowerOff = DEFAULT_AUTO_POWER_OFF;
g_deviceSettings.vibration = DEFAULT_VIBRATION;
+ g_deviceSettings.randomPinPad = DEFAULT_RANDOM_PIN_PAD;
g_deviceSettings.permitSign = DEFAULT_PERMIT_SIGN;
g_deviceSettings.darkMode = DEFAULT_DARK_MODE;
g_deviceSettings.usbSwitch = DEFAULT_USB_SWITCH;
@@ -277,6 +281,16 @@ void SetVibration(uint32_t vibration)
g_deviceSettings.vibration = vibration;
}
+uint32_t GetRandomPinPad(void)
+{
+ return g_deviceSettings.randomPinPad;
+}
+
+void SetRandomPinPad(uint32_t randomPinPad)
+{
+ g_deviceSettings.randomPinPad = randomPinPad;
+}
+
uint32_t GetPermitSign(void)
{
return g_deviceSettings.permitSign;
@@ -367,8 +381,6 @@ void SetRecoveryModeSwitch(bool isSet)
memset(g_bootParam.recoveryModeSwitch, 0, sizeof(g_bootParam.recoveryModeSwitch));
}
SaveBootParam();
- PrintArray("g_bootParam.recoveryModeSwitch", g_bootParam.recoveryModeSwitch, sizeof(g_bootParam.recoveryModeSwitch));
- printf("get recovery mode switch=%d\n", GetRecoveryModeSwitch());
}
bool IsUpdateSuccess(void)
@@ -547,6 +559,7 @@ static bool GetDeviceSettingsFromJsonString(const char *string)
g_deviceSettings.autoLockScreen = GetIntValue(rootJson, KEY_AUTO_LOCK_SCREEN, DEFAULT_AUTO_LOCK_SCREEN);
g_deviceSettings.autoPowerOff = GetIntValue(rootJson, KEY_AUTO_POWER_OFF, DEFAULT_AUTO_POWER_OFF);
g_deviceSettings.vibration = GetIntValue(rootJson, KEY_VIBRATION, DEFAULT_VIBRATION);
+ g_deviceSettings.randomPinPad = GetIntValue(rootJson, KEY_RANDOM_PIN_PAD, DEFAULT_RANDOM_PIN_PAD);
g_deviceSettings.permitSign = GetIntValue(rootJson, KEY_PERMIT_SIGN, DEFAULT_PERMIT_SIGN);
g_deviceSettings.darkMode = GetIntValue(rootJson, KEY_DARK_MODE, DEFAULT_DARK_MODE);
g_deviceSettings.usbSwitch = GetIntValue(rootJson, KEY_USB_SWITCH, DEFAULT_USB_SWITCH);
@@ -573,6 +586,7 @@ static char *GetJsonStringFromDeviceSettings(void)
cJSON_AddItemToObject(rootJson, KEY_AUTO_LOCK_SCREEN, cJSON_CreateNumber(g_deviceSettings.autoLockScreen));
cJSON_AddItemToObject(rootJson, KEY_AUTO_POWER_OFF, cJSON_CreateNumber(g_deviceSettings.autoPowerOff));
cJSON_AddItemToObject(rootJson, KEY_VIBRATION, cJSON_CreateNumber(g_deviceSettings.vibration));
+ cJSON_AddItemToObject(rootJson, KEY_RANDOM_PIN_PAD, cJSON_CreateNumber(g_deviceSettings.randomPinPad));
cJSON_AddItemToObject(rootJson, KEY_PERMIT_SIGN, cJSON_CreateNumber(g_deviceSettings.permitSign));
cJSON_AddItemToObject(rootJson, KEY_DARK_MODE, cJSON_CreateNumber(g_deviceSettings.darkMode));
cJSON_AddItemToObject(rootJson, KEY_USB_SWITCH, cJSON_CreateNumber(g_deviceSettings.usbSwitch));
diff --git a/src/ui/gui_assets/font/cn/cnText.c b/src/ui/gui_assets/font/cn/cnText.c
index 57abdad..7e3f744 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
@@ -3875,6 +3875,26 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x3, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xc0,
0x0, 0x0,
+ /* U+673A "机" */
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3c,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x3c, 0x0, 0xff,
+ 0xfe, 0x0, 0x0, 0x3c, 0x0, 0xff, 0xff, 0x0,
+ 0x0, 0x3c, 0x0, 0xe0, 0xf, 0x0, 0x0, 0x3c,
+ 0x0, 0xe0, 0xf, 0x0, 0x3f, 0xff, 0xf8, 0xe0,
+ 0xf, 0x0, 0x2a, 0xbe, 0xa4, 0xe0, 0xf, 0x0,
+ 0x0, 0x3c, 0x0, 0xe0, 0xf, 0x0, 0x0, 0xbc,
+ 0x0, 0xe0, 0xf, 0x0, 0x0, 0xfe, 0x0, 0xe0,
+ 0xf, 0x0, 0x1, 0xff, 0x40, 0xe0, 0xf, 0x0,
+ 0x2, 0xfe, 0xd0, 0xe0, 0xf, 0x0, 0x3, 0x7c,
+ 0xf0, 0xe0, 0xf, 0x0, 0xb, 0x3c, 0x35, 0xd0,
+ 0xf, 0x0, 0x1e, 0x3c, 0x1, 0xd0, 0xf, 0x0,
+ 0x3c, 0x3c, 0x2, 0xc0, 0xf, 0x0, 0x34, 0x3c,
+ 0x3, 0xc0, 0xf, 0xd, 0x10, 0x3c, 0x7, 0x40,
+ 0xf, 0xd, 0x0, 0x3c, 0xf, 0x0, 0xf, 0xd,
+ 0x0, 0x3c, 0x1e, 0x0, 0xf, 0xd, 0x0, 0x3c,
+ 0x3c, 0x0, 0xb, 0xbc, 0x0, 0x3c, 0x30, 0x0,
+ 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+
/* U+6761 "条" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x78, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0,
@@ -5909,6 +5929,26 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x0, 0x2f, 0xd0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0,
+ /* U+968F "随" */
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0xe, 0x0, 0x3, 0xff, 0xc0, 0x0, 0x34,
+ 0x0, 0xe, 0x5f, 0xe0, 0xaa, 0xea, 0xa4, 0x38,
+ 0x35, 0xd3, 0xff, 0xff, 0xf0, 0xe1, 0xc2, 0xc0,
+ 0x74, 0x0, 0x3, 0x8b, 0x3, 0x43, 0xc0, 0x0,
+ 0xe, 0x38, 0x0, 0x2f, 0xff, 0xf0, 0x39, 0xc0,
+ 0x1, 0xfd, 0x57, 0xc0, 0xe3, 0x40, 0xf, 0xf0,
+ 0xb, 0x3, 0x8b, 0x7f, 0xb6, 0xd5, 0x7c, 0xe,
+ 0xe, 0xae, 0xb, 0xff, 0xf0, 0x38, 0x38, 0x38,
+ 0x2c, 0x2, 0xc0, 0xe0, 0xb0, 0xe0, 0xb0, 0xb,
+ 0x3, 0x82, 0xc3, 0x82, 0xff, 0xfc, 0xe, 0xe,
+ 0xe, 0xb, 0x55, 0xf0, 0x3a, 0xf4, 0x38, 0x2c,
+ 0x2, 0xc0, 0xe6, 0x40, 0xe0, 0xb0, 0xb, 0x3,
+ 0x80, 0x7, 0x82, 0xc1, 0xfc, 0xe, 0x0, 0x7f,
+ 0x45, 0x1, 0x40, 0x38, 0x3, 0x87, 0x80, 0x0,
+ 0x0, 0xe0, 0x3c, 0x7, 0xe9, 0x6a, 0xc3, 0x80,
+ 0x50, 0x2, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0,
+
/* U+9699 "隙" */
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x38, 0x0, 0x3, 0xff, 0xe0, 0x60, 0xe1,
@@ -6295,120 +6335,122 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 25478, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 25610, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 25748, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 25892, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26030, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26168, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26306, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26444, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 26588, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26726, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 25892, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26036, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26174, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26312, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26450, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26588, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 26732, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 26870, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 27014, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27158, .adv_w = 384, .box_w = 22, .box_h = 20, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 27268, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 27389, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 27527, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 27660, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 27793, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 27931, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28064, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28197, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28335, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 28468, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28600, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 28738, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 28876, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 29002, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 29123, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 29244, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 3, .ofs_y = -2},
- {.bitmap_index = 29365, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
- {.bitmap_index = 29473, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 29599, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 29737, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 29864, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30002, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30129, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30261, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30388, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30526, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30659, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30792, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 30925, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31063, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31190, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 31317, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
- {.bitmap_index = 31438, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31576, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 31709, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31847, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 31985, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32123, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 32256, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 32383, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 32516, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 32649, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 32793, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 32926, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 33064, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 33191, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 33324, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 33456, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 33561, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 33682, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 33809, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 33942, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
- {.bitmap_index = 34050, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 34177, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 34315, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 34447, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34574, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34707, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34834, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 34967, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 35094, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 35226, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 35353, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 35480, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 35618, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 35751, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 35884, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 36022, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 36155, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 36287, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 36425, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 36546, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 36690, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.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 = 23, .box_h = 24, .ofs_x = 1, .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 = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 37381, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 37525, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 37652, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 37796, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 37923, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 38061, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 38199, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 38337, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 38458, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
- {.bitmap_index = 38590, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 38723, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 38855, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 38993, .adv_w = 384, .box_w = 24, .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 = 27158, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27302, .adv_w = 384, .box_w = 22, .box_h = 20, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 27412, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 27533, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 27671, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 27804, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 27937, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 28075, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28208, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28341, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28479, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 28612, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28744, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 28882, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 29020, .adv_w = 384, .box_w = 24, .box_h = 21, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 29146, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 29267, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 29388, .adv_w = 384, .box_w = 21, .box_h = 23, .ofs_x = 3, .ofs_y = -2},
+ {.bitmap_index = 29509, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
+ {.bitmap_index = 29617, .adv_w = 384, .box_w = 21, .box_h = 24, .ofs_x = 2, .ofs_y = -3},
+ {.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 = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30670, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30803, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30936, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 31069, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 31207, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31334, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 31461, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -1},
+ {.bitmap_index = 31582, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 31720, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 31853, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.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 = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 32400, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 32527, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 32660, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 32793, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 32937, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33070, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 33208, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 33335, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33468, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33600, .adv_w = 384, .box_w = 20, .box_h = 21, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 33705, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 33826, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 33953, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 34086, .adv_w = 384, .box_w = 18, .box_h = 24, .ofs_x = 3, .ofs_y = -3},
+ {.bitmap_index = 34194, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 34321, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 34459, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 34591, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 34718, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 34851, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 34978, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 35111, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 35238, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 35370, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 35497, .adv_w = 384, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 35624, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 35762, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 35895, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 36028, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 36166, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 36299, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 36431, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 36569, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 36690, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 36834, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 36972, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37116, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 37254, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37398, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 37525, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37669, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 37796, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 37940, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 38067, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 38205, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 38343, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 38481, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 38602, .adv_w = 384, .box_w = 24, .box_h = 22, .ofs_x = 0, .ofs_y = -1},
+ {.bitmap_index = 38734, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 38867, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 38999, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 39137, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 39281, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 39419, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 39563, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 39673, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 39788, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 39926, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 40064, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 40185, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 40329, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
- {.bitmap_index = 40473, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 40600, .adv_w = 384, .box_w = 5, .box_h = 9, .ofs_x = 3, .ofs_y = -3},
- {.bitmap_index = 40612, .adv_w = 384, .box_w = 4, .box_h = 17, .ofs_x = 4, .ofs_y = -1},
- {.bitmap_index = 40629, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 0, .ofs_y = -1}
+ {.bitmap_index = 39563, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 39707, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 39817, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 39932, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .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 = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 40467, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 40611, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
+ {.bitmap_index = 40755, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 40882, .adv_w = 384, .box_w = 5, .box_h = 9, .ofs_x = 3, .ofs_y = -3},
+ {.bitmap_index = 40894, .adv_w = 384, .box_w = 4, .box_h = 17, .ofs_x = 4, .ofs_y = -1},
+ {.bitmap_index = 40911, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 0, .ofs_y = -1}
};
/*---------------------
@@ -6436,22 +6478,22 @@ static const uint16_t unicode_list_1[] = {
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, 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, 0x7655, 0x7742, 0x774a, 0x775e,
- 0x77cb, 0x7897, 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, 0x95f6, 0x97d2, 0x97fa, 0x99e9, 0x9a0d, 0xfe69,
- 0xfe77, 0xfe7c
+ 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, 0x7655, 0x7742, 0x774a,
+ 0x775e, 0x77cb, 0x7897, 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
};
/*Collect the unicode lists and glyph_id offsets*/
@@ -6462,7 +6504,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
},
{
.range_start = 163, .range_length = 65149, .glyph_id_start = 96,
- .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 282, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+ .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 284, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@@ -6520,7 +6562,7 @@ static const uint8_t kern_left_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0
+ 0, 0, 0, 0
};
/*Map glyph_ids to kern right classes*/
@@ -6572,7 +6614,7 @@ static const uint8_t kern_right_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0
+ 0, 0, 0, 0
};
/*Kern values between classes*/
diff --git a/src/ui/gui_assets/font/ko/koText.c b/src/ui/gui_assets/font/ko/koText.c
index bb6aed2..5ef1347 100644
--- a/src/ui/gui_assets/font/ko/koText.c
+++ b/src/ui/gui_assets/font/ko/koText.c
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 24 px
* Bpp: 2
- * Opts: --bpp 2 --size 24 --no-compress --font NotoSansKR-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€原生가간갑강개갭거건검겠결경계고공과관구국그글금기까내너네넷념노는니다단당대더덧데도동되된드디딩또뛰라락란래랜러레렛려력렸로료루류르른를름리린림립마만맷메면명모무문미밀및바반받밝방배백버번법변보복본부분붙브블비빠사삭산상새색생샤서선설섬성세션소속손송수스습시식신실십싱아안않알암압액약어언얼업없엇에엔여연예오옵완요용우움워원월웨웹위유으은을음의이인일임입있잊자작잘잠장재잭전점정제져조종주준중즈증지진차체초총추출취치카캔켜코크큰키타탐태택터테템토톤튜트파패펌페포표프플피필하한할함합해행허현형호화확환 --format lvgl -o ../gui_assets/font/ko/koText.c
+ * Opts: --bpp 2 --size 24 --no-compress --font NotoSansKR-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€原生가간갑강개갭거건검겠결경계고공과관구국그글금기까내너네넷념노는니다단당대더덤덧데도동되된드디딩또뛰라락란래랜러레렛려력렸로료루류르른를름리린림립마만맷메면명모무문미밀및바반받밝방배백버번법변보복본부분붙브블비빠사삭산상새색생샤서선설섬성세션소속손송수스습시식신실십싱아안않알암압액약어언얼업없엇에엔여연예오옵완요용우움워원월웨웹위유으은을음의이인일임입있잊자작잘잠장재잭전점정제져조종주준중즈증지진차체초총추출취치카캔켜코크큰키타탐태택터테템토톤튜트파패펌페포표프플피필하한할함합해행허현형호화확환 --format lvgl -o ../gui_assets/font/ko/koText.c
******************************************************************************/
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
@@ -1470,6 +1470,20 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0x3c, 0x0, 0x0, 0x0, 0xf, 0x0, 0x0, 0x0,
0x3, 0xc0, 0x0, 0x0, 0x0, 0xf0,
+ /* U+B364 "덤" */
+ 0x0, 0x0, 0x0, 0x3, 0xda, 0xaa, 0xa8, 0x0,
+ 0xff, 0xff, 0xff, 0x0, 0x3f, 0xc0, 0x0, 0x0,
+ 0xf, 0xf0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0xa,
+ 0xaa, 0xff, 0x0, 0x3, 0xff, 0xff, 0xc0, 0x0,
+ 0x0, 0xf, 0xf0, 0x0, 0x0, 0x3, 0xfc, 0x0,
+ 0x6, 0x0, 0xff, 0xff, 0xff, 0xd0, 0x3e, 0xaa,
+ 0xa9, 0x40, 0xf, 0x0, 0x0, 0x0, 0x2, 0x80,
+ 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xfc,
+ 0xf, 0xaa, 0xaa, 0xaf, 0x3, 0xc0, 0x0, 0x3,
+ 0xc0, 0xf0, 0x0, 0x0, 0xf0, 0x3c, 0x0, 0x0,
+ 0x3c, 0xf, 0x0, 0x0, 0xf, 0x3, 0xea, 0xaa,
+ 0xab, 0xc0, 0xff, 0xff, 0xff, 0xf0,
+
/* U+B367 "덧" */
0x0, 0x0, 0x0, 0x2, 0x81, 0xaa, 0xaa, 0x80,
0xf, 0xf, 0xff, 0xff, 0x0, 0x3c, 0x3c, 0x0,
@@ -4944,217 +4958,218 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 8570, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 8680, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 8785, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 8879, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 8984, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 9083, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 9178, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 9283, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 9382, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 9487, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 9572, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 9671, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 9770, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 9855, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 9960, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 10070, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 10180, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 10290, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 10395, .adv_w = 353, .box_w = 18, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 10499, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 10604, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 10709, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 10814, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 10919, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 11018, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 11128, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 11218, .adv_w = 353, .box_w = 21, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 11313, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 11418, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 11534, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 11629, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 11739, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 11849, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 11959, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12053, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12152, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 8879, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 8973, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 9078, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 9177, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 9272, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 9377, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 9476, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 9581, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 9666, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 9765, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 9864, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 9949, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 10054, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 10164, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 10274, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 10384, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 10489, .adv_w = 353, .box_w = 18, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 10593, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 10698, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 10803, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 10908, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 11013, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 11112, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 11222, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 11312, .adv_w = 353, .box_w = 21, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 11407, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 11512, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 11628, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 11723, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 11833, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 11943, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 12053, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 12147, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 12246, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12340, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12450, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12560, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12670, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 12775, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12874, .adv_w = 353, .box_w = 18, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 12978, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 13073, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 13178, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 13283, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13377, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13476, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13581, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13691, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13801, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 13911, .adv_w = 353, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
- {.bitmap_index = 14026, .adv_w = 353, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 14141, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 14246, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 14345, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 14444, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 14543, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 14637, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 14736, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 14831, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 14941, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15046, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15151, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15261, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15371, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 15461, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15571, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 15665, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 15786, .adv_w = 353, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 15907, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16023, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16139, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16255, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 16365, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16470, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16575, .adv_w = 353, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 16702, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16801, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 16906, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17011, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17116, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17221, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 17331, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17436, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 17531, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17641, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17757, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17873, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 17983, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 18073, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18183, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 18288, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18387, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18492, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18597, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18696, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18801, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 18917, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19033, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19149, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19265, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19381, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19497, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19602, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19718, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19823, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 19928, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20033, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20132, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
- {.bitmap_index = 20253, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20363, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20468, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20573, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20678, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20783, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 20888, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 20983, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21093, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21209, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 21304, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21414, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21519, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21629, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21734, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21839, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 21944, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 22054, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22159, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22258, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22363, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 22453, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22563, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22673, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22783, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22882, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 22981, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23086, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23191, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23296, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23401, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23511, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23621, .adv_w = 353, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 23742, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23858, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 23974, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 24090, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 24211, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 24321, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 24426, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 24531, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 24641, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 24746, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 24856, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 24966, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 25056, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 25161, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 25266, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 25371, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 25476, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 25561, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 25666, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 25771, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 25876, .adv_w = 353, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 25997, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26102, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 26197, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26307, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26417, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26527, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 26632, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26731, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26847, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 26952, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 27051, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 27136, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 27221, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 27326, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 27431, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 27541, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 27651, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 27750, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 27849, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 27943, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 28042, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
- {.bitmap_index = 28141, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 28231, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 28341, .adv_w = 353, .box_w = 21, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 28452, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 28542, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 28658, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 28768, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 28878, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 28988, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
- {.bitmap_index = 29073, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 29163, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 29253, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29363, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29468, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29573, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29689, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29805, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 29926, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 30047, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 30168, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 30273, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 30378, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30483, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30593, .adv_w = 353, .box_w = 20, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
- {.bitmap_index = 30708, .adv_w = 353, .box_w = 20, .box_h = 20, .ofs_x = 1, .ofs_y = 0},
- {.bitmap_index = 30808, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 30924, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
- {.bitmap_index = 31045, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2}
+ {.bitmap_index = 12340, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 12434, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 12544, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 12654, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 12764, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 12869, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 12968, .adv_w = 353, .box_w = 18, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13072, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 13167, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 13272, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 13377, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13471, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13570, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13675, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13785, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 13895, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 14005, .adv_w = 353, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
+ {.bitmap_index = 14120, .adv_w = 353, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 14235, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 14340, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 14439, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 14538, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 14637, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 14731, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 14830, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 14925, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15035, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15140, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15245, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15355, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15465, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 15555, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15665, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 15759, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 15880, .adv_w = 353, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 16001, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 16117, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 16233, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 16349, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 16459, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 16564, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 16669, .adv_w = 353, .box_w = 22, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 16796, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 16895, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17000, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17105, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17210, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17315, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 17425, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17530, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 17625, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17735, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17851, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 17967, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18077, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 18167, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18277, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 18382, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18481, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18586, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18691, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18790, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 18895, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19011, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19127, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19243, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19359, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19475, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19591, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19696, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19812, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 19917, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20022, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20127, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20226, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -3},
+ {.bitmap_index = 20347, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20457, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20562, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20667, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20772, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20877, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 20982, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 21077, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21187, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21303, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 21398, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21508, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21613, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21723, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21828, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 21933, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22038, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 22148, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22253, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22352, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22457, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 22547, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22657, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22767, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22877, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 22976, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23075, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23180, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23285, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23390, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23495, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23605, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23715, .adv_w = 353, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 23836, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 23952, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 24068, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 24184, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 24305, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 24415, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 24520, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 24625, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 24735, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 24840, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 24950, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 25060, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 25150, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 25255, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 25360, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 25465, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 25570, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 25655, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 25760, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 25865, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 25970, .adv_w = 353, .box_w = 22, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26091, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 26196, .adv_w = 353, .box_w = 20, .box_h = 19, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 26291, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 26401, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 26511, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 26621, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 26726, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 26825, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 26941, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 27046, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 27145, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 27230, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 27315, .adv_w = 353, .box_w = 20, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 27420, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 27525, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 27635, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 27745, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 27844, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 27943, .adv_w = 353, .box_w = 17, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 28037, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 28136, .adv_w = 353, .box_w = 18, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
+ {.bitmap_index = 28235, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 28325, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 28435, .adv_w = 353, .box_w = 21, .box_h = 21, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 28546, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 28636, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 28752, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 28862, .adv_w = 353, .box_w = 19, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 28972, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 29082, .adv_w = 353, .box_w = 20, .box_h = 17, .ofs_x = 1, .ofs_y = 1},
+ {.bitmap_index = 29167, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 29257, .adv_w = 353, .box_w = 20, .box_h = 18, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 29347, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 29457, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 29562, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 29667, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 29783, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 29899, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 30020, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 30141, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 30262, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 30367, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 30472, .adv_w = 353, .box_w = 19, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30577, .adv_w = 353, .box_w = 20, .box_h = 22, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30687, .adv_w = 353, .box_w = 20, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
+ {.bitmap_index = 30802, .adv_w = 353, .box_w = 20, .box_h = 20, .ofs_x = 1, .ofs_y = 0},
+ {.bitmap_index = 30902, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 31018, .adv_w = 353, .box_w = 21, .box_h = 23, .ofs_x = 1, .ofs_y = -2},
+ {.bitmap_index = 31139, .adv_w = 353, .box_w = 21, .box_h = 22, .ofs_x = 1, .ofs_y = -2}
};
/*---------------------
@@ -5167,33 +5182,33 @@ static const uint16_t unicode_list_1[] = {
0xac0d, 0xac1a, 0xac21, 0xac3d, 0xac52, 0xac59, 0xac5d, 0xacc9,
0xacca, 0xad55, 0xad5d, 0xad65, 0xad8d, 0xada9, 0xb011, 0xb065,
0xb081, 0xb094, 0xb0ad, 0xb0d5, 0xb1f1, 0xb225, 0xb241, 0xb245,
- 0xb256, 0xb25d, 0xb2b1, 0xb2c4, 0xb2cd, 0xb321, 0xb336, 0xb375,
- 0xb379, 0xb439, 0xb471, 0xb486, 0xb56d, 0xb64d, 0xb6d9, 0xb6da,
- 0xb6dd, 0xb6f5, 0xb6f9, 0xb749, 0xb765, 0xb778, 0xb781, 0xb782,
- 0xb795, 0xb7b9, 0xb829, 0xb845, 0xb8b5, 0xb8d1, 0xb8d5, 0xb8d9,
- 0xb8e1, 0xb909, 0xb90d, 0xb919, 0xb91a, 0xb925, 0xb929, 0xb954,
- 0xb9b1, 0xb9d1, 0xb9e2, 0xba05, 0xba91, 0xba95, 0xbb55, 0xbb5d,
- 0xbb6c, 0xbb71, 0xbb75, 0xbb78, 0xbb7a, 0xbb86, 0xbb8d, 0xbb8e,
- 0xbbe1, 0xbbe5, 0xbbf2, 0xbc1d, 0xbc51, 0xbc52, 0xbc55, 0xbcdd,
- 0xbce1, 0xbcf6, 0xbd69, 0xbd71, 0xbda1, 0xbdbd, 0xc009, 0xc00a,
- 0xc00d, 0xc01e, 0xc025, 0xc026, 0xc03a, 0xc041, 0xc079, 0xc07d,
- 0xc081, 0xc089, 0xc08e, 0xc095, 0xc0b5, 0xc0e9, 0xc0ea, 0xc0ed,
- 0xc0fe, 0xc175, 0xc201, 0xc212, 0xc239, 0xc23a, 0xc23d, 0xc241,
- 0xc24a, 0xc24e, 0xc4a1, 0xc4a5, 0xc4a7, 0xc4a9, 0xc4b1, 0xc4b2,
- 0xc4be, 0xc4da, 0xc511, 0xc515, 0xc519, 0xc522, 0xc523, 0xc524,
- 0xc52d, 0xc531, 0xc549, 0xc54d, 0xc565, 0xc581, 0xc592, 0xc5a1,
- 0xc5f1, 0xc606, 0xc60d, 0xc61d, 0xc629, 0xc62d, 0xc631, 0xc645,
- 0xc656, 0xc661, 0xc67d, 0xc699, 0xc69d, 0xc6a1, 0xc6a9, 0xc6b5,
- 0xc6d1, 0xc6d5, 0xc6d9, 0xc6e1, 0xc6e2, 0xc6e5, 0xc6e7, 0xc6ed,
- 0xc6ee, 0xc6f5, 0xc6fd, 0xc702, 0xc709, 0xc70a, 0xc761, 0xc76d,
- 0xc772, 0xc779, 0xc795, 0xc7cd, 0xc7e2, 0xc859, 0xc85d, 0xc86e,
- 0xc8e5, 0xc8fa, 0xc91d, 0xc921, 0xcb85, 0xcc11, 0xcc65, 0xcc7a,
- 0xccf1, 0xccf9, 0xcd45, 0xcdb5, 0xcdd1, 0xcdf1, 0xce79, 0xceb1,
- 0xcfc9, 0xcfcd, 0xd001, 0xd01d, 0xd02d, 0xd039, 0xd03a, 0xd08d,
- 0xd0a9, 0xd0b9, 0xd0fd, 0xd101, 0xd1f9, 0xd215, 0xd269, 0xd285,
- 0xd2e9, 0xd2f5, 0xd349, 0xd3b9, 0xd461, 0xd469, 0xd499, 0xd4a1,
- 0xd4b5, 0xd4b9, 0xd4bd, 0xd4c5, 0xd4c6, 0xd4d1, 0xd4e6, 0xd525,
- 0xd561, 0xd572, 0xd595, 0xd5b1, 0xd5b2, 0xd5b5
+ 0xb256, 0xb25d, 0xb2b1, 0xb2c1, 0xb2c4, 0xb2cd, 0xb321, 0xb336,
+ 0xb375, 0xb379, 0xb439, 0xb471, 0xb486, 0xb56d, 0xb64d, 0xb6d9,
+ 0xb6da, 0xb6dd, 0xb6f5, 0xb6f9, 0xb749, 0xb765, 0xb778, 0xb781,
+ 0xb782, 0xb795, 0xb7b9, 0xb829, 0xb845, 0xb8b5, 0xb8d1, 0xb8d5,
+ 0xb8d9, 0xb8e1, 0xb909, 0xb90d, 0xb919, 0xb91a, 0xb925, 0xb929,
+ 0xb954, 0xb9b1, 0xb9d1, 0xb9e2, 0xba05, 0xba91, 0xba95, 0xbb55,
+ 0xbb5d, 0xbb6c, 0xbb71, 0xbb75, 0xbb78, 0xbb7a, 0xbb86, 0xbb8d,
+ 0xbb8e, 0xbbe1, 0xbbe5, 0xbbf2, 0xbc1d, 0xbc51, 0xbc52, 0xbc55,
+ 0xbcdd, 0xbce1, 0xbcf6, 0xbd69, 0xbd71, 0xbda1, 0xbdbd, 0xc009,
+ 0xc00a, 0xc00d, 0xc01e, 0xc025, 0xc026, 0xc03a, 0xc041, 0xc079,
+ 0xc07d, 0xc081, 0xc089, 0xc08e, 0xc095, 0xc0b5, 0xc0e9, 0xc0ea,
+ 0xc0ed, 0xc0fe, 0xc175, 0xc201, 0xc212, 0xc239, 0xc23a, 0xc23d,
+ 0xc241, 0xc24a, 0xc24e, 0xc4a1, 0xc4a5, 0xc4a7, 0xc4a9, 0xc4b1,
+ 0xc4b2, 0xc4be, 0xc4da, 0xc511, 0xc515, 0xc519, 0xc522, 0xc523,
+ 0xc524, 0xc52d, 0xc531, 0xc549, 0xc54d, 0xc565, 0xc581, 0xc592,
+ 0xc5a1, 0xc5f1, 0xc606, 0xc60d, 0xc61d, 0xc629, 0xc62d, 0xc631,
+ 0xc645, 0xc656, 0xc661, 0xc67d, 0xc699, 0xc69d, 0xc6a1, 0xc6a9,
+ 0xc6b5, 0xc6d1, 0xc6d5, 0xc6d9, 0xc6e1, 0xc6e2, 0xc6e5, 0xc6e7,
+ 0xc6ed, 0xc6ee, 0xc6f5, 0xc6fd, 0xc702, 0xc709, 0xc70a, 0xc761,
+ 0xc76d, 0xc772, 0xc779, 0xc795, 0xc7cd, 0xc7e2, 0xc859, 0xc85d,
+ 0xc86e, 0xc8e5, 0xc8fa, 0xc91d, 0xc921, 0xcb85, 0xcc11, 0xcc65,
+ 0xcc7a, 0xccf1, 0xccf9, 0xcd45, 0xcdb5, 0xcdd1, 0xcdf1, 0xce79,
+ 0xceb1, 0xcfc9, 0xcfcd, 0xd001, 0xd01d, 0xd02d, 0xd039, 0xd03a,
+ 0xd08d, 0xd0a9, 0xd0b9, 0xd0fd, 0xd101, 0xd1f9, 0xd215, 0xd269,
+ 0xd285, 0xd2e9, 0xd2f5, 0xd349, 0xd3b9, 0xd461, 0xd469, 0xd499,
+ 0xd4a1, 0xd4b5, 0xd4b9, 0xd4bd, 0xd4c5, 0xd4c6, 0xd4d1, 0xd4e6,
+ 0xd525, 0xd561, 0xd572, 0xd595, 0xd5b1, 0xd5b2, 0xd5b5
};
/*Collect the unicode lists and glyph_id offsets*/
@@ -5204,7 +5219,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
},
{
.range_start = 163, .range_length = 54710, .glyph_id_start = 96,
- .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 254, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+ .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 255, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};
@@ -5258,7 +5273,7 @@ static const uint8_t kern_left_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0
};
/*Map glyph_ids to kern right classes*/
@@ -5306,7 +5321,7 @@ static const uint8_t kern_right_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0
};
/*Kern values between classes*/
diff --git a/src/ui/gui_assets/font/ru/ruText.c b/src/ui/gui_assets/font/ru/ruText.c
index 280f099..252fc6b 100644
--- a/src/ui/gui_assets/font/ru/ruText.c
+++ b/src/ui/gui_assets/font/ru/ruText.c
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 24 px
* Bpp: 2
- * Opts: --bpp 2 --size 24 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·АБВДЗИКМНОПРСТУФХЧШЭЯабвгдежзийклмнопрстуфхцчшщыьэюя€네브이티 --format lvgl -o ../gui_assets/font/ru/ruText.c
+ * Opts: --bpp 2 --size 24 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·АБВДЗИКМНОПРСТУФХЧШЭЯабвгдежзийклмнопрстуфхцчшщыьэюя€密机码随네브이티 --format lvgl -o ../gui_assets/font/ru/ruText.c
******************************************************************************/
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
diff --git a/src/ui/gui_components/gui_keyboard.c b/src/ui/gui_components/gui_keyboard.c
index 900e5bf..a852438 100644
--- a/src/ui/gui_components/gui_keyboard.c
+++ b/src/ui/gui_components/gui_keyboard.c
@@ -33,6 +33,13 @@
static void KbTextAreaHandler(lv_event_t *e);
+static const char *g_numBtnmMapDefault[] = {
+ "1", "2", "3", "\n",
+ "4", "5", "6", "\n",
+ "7", "8", "9", "\n",
+ " ", "0", USR_SYMBOL_DELETE, '\0'
+};
+
static const char *g_numBtnmMap[] = {
"1", "2", "3", "\n",
"4", "5", "6", "\n",
@@ -484,14 +491,17 @@ static void ShuffleNumKeyBoardMap(const char **map)
digits[i] = digits[r];
digits[r] = tmp;
}
-
for (int i = 0; i < n; i++) map[digitIdx[i]] = digits[i];
}
-void GuiUpdateNumKeyBoardMap(lv_obj_t *btnm)
+void GuiUpdateNumKeyBoardMap(lv_obj_t *btnm, bool randomPinPad)
{
- ShuffleNumKeyBoardMap((const char **)g_numBtnmMap);
- lv_btnmatrix_set_map(btnm, (const char **)g_numBtnmMap);
+ if (randomPinPad) {
+ ShuffleNumKeyBoardMap((const char **)g_numBtnmMap);
+ lv_btnmatrix_set_map(btnm, (const char **)g_numBtnmMap);
+ } else {
+ lv_btnmatrix_set_map(btnm, (const char **)g_numBtnmMapDefault);
+ }
}
void *GuiCreateNumKeyboard(lv_obj_t *parent, lv_event_cb_t cb, NUM_KEYBOARD_ENUM numMode, void *param)
@@ -502,8 +512,7 @@ void *GuiCreateNumKeyboard(lv_obj_t *parent, lv_event_cb_t cb, NUM_KEYBOARD_ENUM
switch (numMode) {
case NUM_KEYBOARD_PIN:
lv_obj_add_style(btnm, &g_numBtnmStyle, LV_PART_ITEMS);
- ShuffleNumKeyBoardMap((const char **)g_numBtnmMap);
- lv_btnmatrix_set_map(btnm, (const char **)g_numBtnmMap);
+ GuiUpdateNumKeyBoardMap(btnm, !!GetRandomPinPad());
lv_obj_align(btnm, LV_ALIGN_TOP_MID, 0, 490 - GUI_MAIN_AREA_OFFSET);
lv_obj_set_style_bg_color(btnm, DARK_BG_COLOR, LV_PART_MAIN);
lv_btnmatrix_set_ctrl_map(btnm, g_numBtnmMapCtrl);
diff --git a/src/ui/gui_components/gui_keyboard.h b/src/ui/gui_components/gui_keyboard.h
index e464418..5ce728e 100644
--- a/src/ui/gui_components/gui_keyboard.h
+++ b/src/ui/gui_components/gui_keyboard.h
@@ -61,7 +61,7 @@ void GuiDeleteKeyBoard(KeyBoard_t *kb);
void GuiKeyBoardRestoreDefault(KeyBoard_t *keyBoard);
void *GuiCreateNumKeyboard(lv_obj_t *parent, lv_event_cb_t cb, NUM_KEYBOARD_ENUM numMode, void *param);
void GuiUpdateSsbKeyBoard(lv_obj_t *btnm, uint8_t memberCnt);
-void GuiUpdateNumKeyBoardMap(lv_obj_t *btnm);
+void GuiUpdateNumKeyBoardMap(lv_obj_t *btnm, bool randomPinPad);
// full keyboard
void *GuiCreateFullKeyBoard(lv_obj_t *parent, lv_event_cb_t kbCb, lv_keyboard_user_mode_t keyMode, void *param);
diff --git a/src/ui/gui_views/gui_lock_view.c b/src/ui/gui_views/gui_lock_view.c
index e0f09c4..0a08b16 100644
--- a/src/ui/gui_views/gui_lock_view.c
+++ b/src/ui/gui_views/gui_lock_view.c
@@ -108,6 +108,12 @@ int32_t GuiLockViewEventProcess(void *self, uint16_t usEvent, void *param, uint1
case GUI_EVENT_CHANGE_LANGUAGE:
GuiLockViewRefreshLanguage();
break;
+ case SIG_UPDATE_NUM_KEYBOARD_MAP:
+ GuiLockScreenShuffleNumKeyBoardMap();
+ break;
+ case SIG_SET_NUM_KEYBOARD_MAP_DEFAULT:
+ GuiLockScreenSetNumKeyBoardMapDefault();
+ break;
default:
return ERR_GUI_UNHANDLED;
}
diff --git a/src/ui/gui_views/gui_views.h b/src/ui/gui_views/gui_views.h
index 00d77fb..c55c612 100644
--- a/src/ui/gui_views/gui_views.h
+++ b/src/ui/gui_views/gui_views.h
@@ -48,6 +48,8 @@ typedef enum {
SIG_EXTENDED_PUBLIC_KEY_NOT_MATCH,
SIG_START_GENERATE_XPUB,
SIG_END_GENERATE_XPUB,
+ SIG_UPDATE_NUM_KEYBOARD_MAP,
+ SIG_SET_NUM_KEYBOARD_MAP_DEFAULT,
SIG_LOCK_VIEW_BUTT,
SIG_CLEAR_HOME_PAGE_INDEX,
diff --git a/src/ui/gui_widgets/gui_enter_passcode.c b/src/ui/gui_widgets/gui_enter_passcode.c
index f6d784a..64b682b 100644
--- a/src/ui/gui_widgets/gui_enter_passcode.c
+++ b/src/ui/gui_widgets/gui_enter_passcode.c
@@ -13,6 +13,7 @@
#include "account_manager.h"
#include "gui_keyboard_hintbox.h"
#include "drv_mpu.h"
+#include "device_setting.h"
typedef enum {
PASSWORD_STRENGTH_LEN,
@@ -338,7 +339,14 @@ static void PassWordPinSwitchHandler(lv_event_t *e)
void GuiShuffleNumKeyBoardMap(GuiEnterPasscodeItem_t *item)
{
- GuiUpdateNumKeyBoardMap(item->btnm);
+ if (!!GetRandomPinPad()) {
+ GuiUpdateNumKeyBoardMap(item->btnm, true);
+ }
+}
+
+void GuiSetNumKeyBoardMapDefault(GuiEnterPasscodeItem_t *item)
+{
+ GuiUpdateNumKeyBoardMap(item->btnm, false);
}
void GuiCreateEnterVerify(GuiEnterPasscodeItem_t *item, EnterPassCodeParam_t *passCodeParam)
diff --git a/src/ui/gui_widgets/gui_enter_passcode.h b/src/ui/gui_widgets/gui_enter_passcode.h
index 77a9781..62bdbce 100644
--- a/src/ui/gui_widgets/gui_enter_passcode.h
+++ b/src/ui/gui_widgets/gui_enter_passcode.h
@@ -51,6 +51,7 @@ void GuiFingerPrintStatus(GuiEnterPasscodeItem_t *item, bool en, uint8_t errCnt)
void PassWordPinSwitch(GuiEnterPasscodeItem_t *item);
void GuiEnterPassLabelRefresh(void);
void GuiShuffleNumKeyBoardMap(GuiEnterPasscodeItem_t *item);
+void GuiSetNumKeyBoardMapDefault(GuiEnterPasscodeItem_t *item);
#endif /* _GUI_ENTER_PASSCODE_H */
diff --git a/src/ui/gui_widgets/gui_lock_widgets.c b/src/ui/gui_widgets/gui_lock_widgets.c
index 13277b9..419acbd 100644
--- a/src/ui/gui_widgets/gui_lock_widgets.c
+++ b/src/ui/gui_widgets/gui_lock_widgets.c
@@ -223,6 +223,16 @@ void GuiLockScreenTurnOn(void *param)
GuilockScreenRefresh();
}
+void GuiLockScreenSetNumKeyBoardMapDefault(void)
+{
+ GuiSetNumKeyBoardMapDefault(g_verifyLock);
+}
+
+void GuiLockScreenShuffleNumKeyBoardMap(void)
+{
+ GuiShuffleNumKeyBoardMap(g_verifyLock);
+}
+
void GuiLockScreenTurnOff(void)
{
static uint16_t single = SIG_LOCK_VIEW_VERIFY_PIN;
diff --git a/src/ui/gui_widgets/gui_lock_widgets.h b/src/ui/gui_widgets/gui_lock_widgets.h
index d7ae7b6..aa0ce9e 100644
--- a/src/ui/gui_widgets/gui_lock_widgets.h
+++ b/src/ui/gui_widgets/gui_lock_widgets.h
@@ -29,6 +29,8 @@ void GuiFpRecognizeResult(bool en);
void GuiLockScreenPasscodeSwitch(bool isPin);
void GuiLockScreenSetFirstUnlock(void);
void GuiLockViewRefreshLanguage(void);
+void GuiLockScreenSetNumKeyBoardMapDefault(void);
+void GuiLockScreenShuffleNumKeyBoardMap(void);
void GuiLockScreenErrorCount(void *param);
void GuiLockScreenToHome(void);
diff --git a/src/ui/gui_widgets/gui_system_setting_widgets.c b/src/ui/gui_widgets/gui_system_setting_widgets.c
index 1176bda..abb8949 100644
--- a/src/ui/gui_widgets/gui_system_setting_widgets.c
+++ b/src/ui/gui_widgets/gui_system_setting_widgets.c
@@ -20,6 +20,7 @@
static lv_obj_t *g_container;
static lv_obj_t *g_vibrationSw;
+static lv_obj_t *g_randomPinPadSw;
static lv_obj_t *g_bootSecureSw;
static lv_obj_t *g_recoveryModeSw;
@@ -35,6 +36,8 @@ static void GuiShowKeyBoardDialog(lv_obj_t *parent);
static void DispalyHandler(lv_event_t *e);
static void VibrationHandler(lv_event_t *e);
static void VibrationSwitchHandler(lv_event_t * e);
+static void RandomPinPadHandler(lv_event_t *e);
+static void RandomPinPadSwitchHandler(lv_event_t * e);
void GuiCreateLanguageWidget(lv_obj_t *parent, uint16_t offset);
void OpenForgetPasswordHandler(lv_event_t *e);
static void OpenLanguageSelectHandler(lv_event_t *e);
@@ -102,6 +105,23 @@ void GuiSystemSettingEntranceWidget(lv_obj_t *parent)
lv_obj_align(button, LV_ALIGN_DEFAULT, 12, offset);
offset += 100;
+ g_randomPinPadSw = lv_switch_create(parent);
+ lv_obj_add_event_cb(g_randomPinPadSw, RandomPinPadSwitchHandler, LV_EVENT_VALUE_CHANGED, NULL);
+ lv_obj_set_style_bg_color(g_randomPinPadSw, ORANGE_COLOR, LV_STATE_CHECKED | LV_PART_INDICATOR);
+ lv_obj_set_style_bg_color(g_randomPinPadSw, WHITE_COLOR, LV_PART_MAIN);
+ lv_obj_set_style_bg_opa(g_randomPinPadSw, LV_OPA_30, LV_PART_MAIN);
+ if (GetRandomPinPad()) {
+ lv_obj_add_state(g_randomPinPadSw, LV_STATE_CHECKED);
+ } else {
+ lv_obj_clear_state(g_randomPinPadSw, LV_STATE_CHECKED);
+ }
+ tableSwitch[0].obj = GuiCreateTextLabel(parent, _("system_settings_random_pin_pad"));
+ tableSwitch[1].obj = g_randomPinPadSw;
+ button = GuiCreateButton(parent, 456, 84, tableSwitch, NUMBER_OF_ARRAYS(tableSwitch),
+ RandomPinPadHandler, NULL);
+ lv_obj_align(button, LV_ALIGN_DEFAULT, 12, offset);
+ offset += 100;
+
#ifdef WEB3_VERSION
// permit sign
g_permitSw = lv_switch_create(parent);
@@ -300,6 +320,33 @@ static void VibrationSwitchHandler(lv_event_t * e)
}
}
+static void RandomPinPadHandler(lv_event_t *e)
+{
+ if (lv_obj_has_state(g_randomPinPadSw, LV_STATE_CHECKED)) {
+ lv_obj_clear_state(g_randomPinPadSw, LV_STATE_CHECKED);
+ } else {
+ lv_obj_add_state(g_randomPinPadSw, LV_STATE_CHECKED);
+ }
+ lv_event_send(g_randomPinPadSw, LV_EVENT_VALUE_CHANGED, NULL);
+}
+
+static void RandomPinPadSwitchHandler(lv_event_t * e)
+{
+ lv_event_code_t code = lv_event_get_code(e);
+ lv_obj_t * obj = lv_event_get_target(e);
+
+ if (code == LV_EVENT_VALUE_CHANGED) {
+ if (lv_obj_has_state(obj, LV_STATE_CHECKED)) {
+ SetRandomPinPad(1);
+ GuiEmitSignal(SIG_UPDATE_NUM_KEYBOARD_MAP, NULL, 0);
+ } else {
+ SetRandomPinPad(0);
+ GuiEmitSignal(SIG_SET_NUM_KEYBOARD_MAP_DEFAULT, NULL, 0);
+ }
+ }
+ SaveDeviceSettings();
+}
+
static void DestroyLanguagePageWidgetHandler(lv_event_t *e)
{
diff --git a/src/ui/gui_widgets/multi/web3/gui_eth_batch_tx_widgets.c b/src/ui/gui_widgets/multi/web3/gui_eth_batch_tx_widgets.c
index b174e63..ecbad5a 100644
--- a/src/ui/gui_widgets/multi/web3/gui_eth_batch_tx_widgets.c
+++ b/src/ui/gui_widgets/multi/web3/gui_eth_batch_tx_widgets.c
@@ -689,7 +689,7 @@ static void GuiRenderSwapOverview(lv_obj_t *parent)
Erc20Contract_t *erc20Contract = FindErc20Contract(g_swapkitContractData->data->swap_in_asset);
bool is_eth = strcmp(g_swapkitContractData->data->swap_in_asset, "0x0000000000000000000000000000000000000000") == 0;
if (is_eth) {
- erc20Contract = malloc(sizeof(Erc20Contract_t));
+ erc20Contract = malloc(sizeof(Erc20Contract_t));
erc20Contract->symbol = malloc(strlen(g_currentNetwork.symbol) + 1);
strcpy_s(erc20Contract->symbol, strlen(g_currentNetwork.symbol) + 1, g_currentNetwork.symbol);
erc20Contract->decimals = 18;
diff --git a/src/ui/lv_i18n/data.csv b/src/ui/lv_i18n/data.csv
index 163d61b..4962130 100644
--- a/src/ui/lv_i18n/data.csv
+++ b/src/ui/lv_i18n/data.csv
@@ -253,6 +253,7 @@ device setting,24,device_setting_mid_btn,Device Settings,Настройки ус
,24,wallet_settings_delete_loading_title,Deleting,Удаление,삭제중,删除中......,Borrando,Löschen,削除中
,24,wallet_deleting,Deleting Wallet,Удаление,삭제중,删除中......,Borrando,Löschen,削除中
System Settings,24,system_settings_vabiration,Vibration,Вибрация,진동,振动,Vibración,Vibration,振動
+,24,system_settings_random_pin_pad,Random Pin Pad,随机密码,랜덤 비밀번호,随机密码,Pin aleatorio,Zufälliger Pin,ランダムパスコード
,24,system_settings_screen_lock_title,Display & Lock Screen,Дисплей и блокировка,디스플레이 & 잠금 화면,显示/锁定屏幕,Pantalla de visualización y bloqueo,Anzeige & Sperrbildschirm,ディスプレイ&ロック画面
,24,system_settings_screen_lock_brightness,Brightness,Яркость,화면 밝기,亮度,Brillo,Helligkeit,輝度
,24,system_settings_screen_lock_auto_lock,Auto Lock,Блокировка,자동 잠금 시간,自动锁屏,Bloqueo automático,Automatische Verriegelung,自動ロック
diff --git a/src/ui/lv_i18n/lv_i18n.c b/src/ui/lv_i18n/lv_i18n.c
index 1486ac2..c715509 100644
--- a/src/ui/lv_i18n/lv_i18n.c
+++ b/src/ui/lv_i18n/lv_i18n.c
@@ -795,6 +795,7 @@ const static lv_i18n_phrase_t en_singulars[] = {
{"switch_account", "Switch Account"},
{"switch_address", "Switch Address"},
{"system_settings_permit_switch", "Permit Signing"},
+ {"system_settings_random_pin_pad", "Random Pin Pad"},
{"system_settings_screen_lock_auto_lock", "Auto Lock"},
{"system_settings_screen_lock_auto_lock_10mins", "10 minutes"},
{"system_settings_screen_lock_auto_lock_15secs", "15 seconds"},
@@ -1739,6 +1740,7 @@ const static lv_i18n_phrase_t de_singulars[] = {
{"switch_account", "Konto wechseln"},
{"switch_address", "Adresse wechseln"},
{"system_settings_permit_switch", "Permit-Signierung"},
+ {"system_settings_random_pin_pad", "Zufälliger Pin"},
{"system_settings_screen_lock_auto_lock", "Automatische Verriegelung"},
{"system_settings_screen_lock_auto_lock_10mins", "10 Minuten"},
{"system_settings_screen_lock_auto_lock_15secs", "15 Sekunden"},
@@ -2683,6 +2685,7 @@ const static lv_i18n_phrase_t es_singulars[] = {
{"switch_account", "Cambiar cuenta"},
{"switch_address", "Cambiar dirección"},
{"system_settings_permit_switch", "Firma de Permit"},
+ {"system_settings_random_pin_pad", "Pin aleatorio"},
{"system_settings_screen_lock_auto_lock", "Bloqueo automático"},
{"system_settings_screen_lock_auto_lock_10mins", "10 minutos"},
{"system_settings_screen_lock_auto_lock_15secs", "15 segundos"},
@@ -3624,6 +3627,7 @@ const static lv_i18n_phrase_t ja_singulars[] = {
{"switch_account", "スイッチアカウント"},
{"switch_address", "スイッチアドレス"},
{"system_settings_permit_switch", "Permit署名"},
+ {"system_settings_random_pin_pad", "ランダムパスコード"},
{"system_settings_screen_lock_auto_lock", "自動ロック"},
{"system_settings_screen_lock_auto_lock_10mins", "10分"},
{"system_settings_screen_lock_auto_lock_15secs", "15秒"},
@@ -4563,6 +4567,7 @@ const static lv_i18n_phrase_t ko_singulars[] = {
{"switch_account", "계정 전환"},
{"switch_address", "주소 전환"},
{"system_settings_permit_switch", "Permit 서명"},
+ {"system_settings_random_pin_pad", "랜덤 비밀번호"},
{"system_settings_screen_lock_auto_lock", "자동 잠금 시간"},
{"system_settings_screen_lock_auto_lock_10mins", "10분"},
{"system_settings_screen_lock_auto_lock_15secs", "15초"},
@@ -5502,6 +5507,7 @@ const static lv_i18n_phrase_t ru_singulars[] = {
{"switch_account", "Сменить счет"},
{"switch_address", "Сменить адрес"},
{"system_settings_permit_switch", "Подписание Permit"},
+ {"system_settings_random_pin_pad", "随机密码"},
{"system_settings_screen_lock_auto_lock", "Блокировка"},
{"system_settings_screen_lock_auto_lock_10mins", "10 минут"},
{"system_settings_screen_lock_auto_lock_15secs", "15 секунд"},
@@ -6449,6 +6455,7 @@ const static lv_i18n_phrase_t zh_cn_singulars[] = {
{"switch_account", "更换账户"},
{"switch_address", "更换地址"},
{"system_settings_permit_switch", "Permit 签名"},
+ {"system_settings_random_pin_pad", "随机密码"},
{"system_settings_screen_lock_auto_lock", "自动锁屏"},
{"system_settings_screen_lock_auto_lock_10mins", "10分钟"},
{"system_settings_screen_lock_auto_lock_15secs", "15秒"},
Why this scored 20/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.