Explorar el Código

🐛 Change font for selected language (#22381)

Scott Lahteine hace 2 años
padre
commit
b34a009bb1
No account linked to committer's email address
Se han modificado 39 ficheros con 1095 adiciones y 1000 borrados
  1. 0
    3
      Marlin/src/core/multi_language.h
  2. 23
    0
      Marlin/src/lcd/dogm/fontdata/langdata.h
  3. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_an.h
  4. 12
    11
      Marlin/src/lcd/dogm/fontdata/langdata_bg.h
  5. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_ca.h
  6. 13
    12
      Marlin/src/lcd/dogm/fontdata/langdata_cz.h
  7. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_da.h
  8. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_de.h
  9. 14
    13
      Marlin/src/lcd/dogm/fontdata/langdata_el.h
  10. 14
    13
      Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
  11. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_en.h
  12. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_es.h
  13. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_eu.h
  14. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_fi.h
  15. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_fr.h
  16. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_gl.h
  17. 9
    8
      Marlin/src/lcd/dogm/fontdata/langdata_hr.h
  18. 5
    4
      Marlin/src/lcd/dogm/fontdata/langdata_hu.h
  19. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_it.h
  20. 16
    15
      Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
  21. 110
    109
      Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
  22. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_nl.h
  23. 10
    9
      Marlin/src/lcd/dogm/fontdata/langdata_pl.h
  24. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_pt.h
  25. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
  26. 4
    3
      Marlin/src/lcd/dogm/fontdata/langdata_ro.h
  27. 8
    7
      Marlin/src/lcd/dogm/fontdata/langdata_ru.h
  28. 11
    10
      Marlin/src/lcd/dogm/fontdata/langdata_sk.h
  29. 7
    6
      Marlin/src/lcd/dogm/fontdata/langdata_test.h
  30. 7
    6
      Marlin/src/lcd/dogm/fontdata/langdata_tr.h
  31. 12
    11
      Marlin/src/lcd/dogm/fontdata/langdata_uk.h
  32. 49
    48
      Marlin/src/lcd/dogm/fontdata/langdata_vi.h
  33. 360
    359
      Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
  34. 303
    302
      Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
  35. 35
    1
      Marlin/src/lcd/dogm/marlinui_DOGM.cpp
  36. 3
    0
      Marlin/src/lcd/dogm/u8g_fontutf8.h
  37. 1
    1
      Marlin/src/lcd/language/language_zh_CN.h
  38. 8
    0
      Marlin/src/lcd/marlinui.cpp
  39. 5
    7
      Marlin/src/lcd/marlinui.h

+ 0
- 3
Marlin/src/core/multi_language.h Ver fichero

@@ -42,15 +42,12 @@ typedef const char Language_Str[];
42 42
 #ifndef LCD_LANGUAGE_2
43 43
   #define LCD_LANGUAGE_2 LCD_LANGUAGE
44 44
 #endif
45
-
46 45
 #ifndef LCD_LANGUAGE_3
47 46
   #define LCD_LANGUAGE_3 LCD_LANGUAGE_2
48 47
 #endif
49
-
50 48
 #ifndef LCD_LANGUAGE_4
51 49
   #define LCD_LANGUAGE_4 LCD_LANGUAGE_3
52 50
 #endif
53
-
54 51
 #ifndef LCD_LANGUAGE_5
55 52
   #define LCD_LANGUAGE_5 LCD_LANGUAGE_4
56 53
 #endif

+ 23
- 0
Marlin/src/lcd/dogm/fontdata/langdata.h Ver fichero

@@ -0,0 +1,23 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * This program is free software: you can redistribute it and/or modify
6
+ * it under the terms of the GNU General Public License as published by
7
+ * the Free Software Foundation, either version 3 of the License, or
8
+ * (at your option) any later version.
9
+ *
10
+ * This program is distributed in the hope that it will be useful,
11
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
+ * GNU General Public License for more details.
14
+ *
15
+ * You should have received a copy of the GNU General Public License
16
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
17
+ *
18
+ */
19
+#pragma once
20
+
21
+#include <U8glib-HAL.h>
22
+
23
+#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_an.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_an[] PROGMEM = {};

+ 12
- 11
Marlin/src/lcd/dogm/fontdata/langdata_bg.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_8_144_149[96] U8G_FONT_SECTION("fontpage_8_144_149") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xFF,0x00,
@@ -64,14 +66,13 @@ const u8g_fntpgm_uint8_t fontpage_8_206_207[39] U8G_FONT_SECTION("fontpage_8_206
64 66
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xA8,0xE8,0xA8,0x90,0x04,0x05,0x05,0x06,
65 67
   0x01,0x00,0x70,0x90,0x70,0x50,0x90};
66 68
 
67
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
68
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
69
-    FONTDATA_ITEM(8, 144, 149, fontpage_8_144_149), // 'А' -- 'Е'
70
-    FONTDATA_ITEM(8, 151, 152, fontpage_8_151_152), // 'З' -- 'И'
71
-    FONTDATA_ITEM(8, 154, 164, fontpage_8_154_164), // 'К' -- 'Ф'
72
-    FONTDATA_ITEM(8, 166, 166, fontpage_8_166_166), // 'Ц' -- 'Ц'
73
-    FONTDATA_ITEM(8, 175, 195, fontpage_8_175_195), // 'Я' -- 'у'
74
-    FONTDATA_ITEM(8, 197, 200, fontpage_8_197_200), // 'х' -- 'ш'
75
-    FONTDATA_ITEM(8, 202, 202, fontpage_8_202_202), // 'ъ' -- 'ъ'
76
-    FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
69
+static const uxg_fontinfo_t g_fontinfo_bg[] PROGMEM = {
70
+  FONTDATA_ITEM(8, 144, 149, fontpage_8_144_149), // 'А' -- 'Е'
71
+  FONTDATA_ITEM(8, 151, 152, fontpage_8_151_152), // 'З' -- 'И'
72
+  FONTDATA_ITEM(8, 154, 164, fontpage_8_154_164), // 'К' -- 'Ф'
73
+  FONTDATA_ITEM(8, 166, 166, fontpage_8_166_166), // 'Ц' -- 'Ц'
74
+  FONTDATA_ITEM(8, 175, 195, fontpage_8_175_195), // 'Я' -- 'у'
75
+  FONTDATA_ITEM(8, 197, 200, fontpage_8_197_200), // 'х' -- 'ш'
76
+  FONTDATA_ITEM(8, 202, 202, fontpage_8_202_202), // 'ъ' -- 'ъ'
77
+  FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
77 78
 };

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_ca.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_ca[] PROGMEM = {};

+ 13
- 12
Marlin/src/lcd/dogm/fontdata/langdata_cz.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8D,0x00,0x0A,0x00,0x00,
@@ -40,15 +42,14 @@ const u8g_fntpgm_uint8_t fontpage_2_253_254[47] U8G_FONT_SECTION("fontpage_2_253
40 42
   0x00,0x05,0x0A,0x0A,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x08,0x10,0x20,0x40,0x80,
41 43
   0xF8,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
42 44
 
43
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
44
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
45
-    FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
46
-    FONTDATA_ITEM(2, 143, 143, fontpage_2_143_143), // 'ď' -- 'ď'
47
-    FONTDATA_ITEM(2, 154, 155, fontpage_2_154_155), // 'Ě' -- 'ě'
48
-    FONTDATA_ITEM(2, 200, 200, fontpage_2_200_200), // 'ň' -- 'ň'
49
-    FONTDATA_ITEM(2, 216, 217, fontpage_2_216_217), // 'Ř' -- 'ř'
50
-    FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
51
-    FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
52
-    FONTDATA_ITEM(2, 239, 239, fontpage_2_239_239), // 'ů' -- 'ů'
53
-    FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
45
+static const uxg_fontinfo_t g_fontinfo_cz[] PROGMEM = {
46
+  FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
47
+  FONTDATA_ITEM(2, 143, 143, fontpage_2_143_143), // 'ď' -- 'ď'
48
+  FONTDATA_ITEM(2, 154, 155, fontpage_2_154_155), // 'Ě' -- 'ě'
49
+  FONTDATA_ITEM(2, 200, 200, fontpage_2_200_200), // 'ň' -- 'ň'
50
+  FONTDATA_ITEM(2, 216, 217, fontpage_2_216_217), // 'Ř' -- 'ř'
51
+  FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
52
+  FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
53
+  FONTDATA_ITEM(2, 239, 239, fontpage_2_239_239), // 'ů' -- 'ů'
54
+  FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
54 55
 };

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_da.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_da[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_de.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_de[] PROGMEM = {};

+ 14
- 13
Marlin/src/lcd/dogm/fontdata/langdata_el.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
@@ -75,16 +77,15 @@ const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_1
75 77
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA6,0xA6,0x00,0x01,0x00,0x00,
76 78
   0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xA8};
77 79
 
78
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
79
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
80
-    FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
81
-    FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
82
-    FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
83
-    FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
84
-    FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
85
-    FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
86
-    FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
87
-    FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
88
-    FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
89
-    FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
80
+static const uxg_fontinfo_t g_fontinfo_el[] PROGMEM = {
81
+  FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
82
+  FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
83
+  FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
84
+  FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
85
+  FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
86
+  FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
87
+  FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
88
+  FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
89
+  FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
90
+  FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
90 91
 };

+ 14
- 13
Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
@@ -75,16 +77,15 @@ const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_1
75 77
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA6,0xA6,0x00,0x01,0x00,0x00,
76 78
   0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xA8};
77 79
 
78
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
79
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
80
-    FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
81
-    FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
82
-    FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
83
-    FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
84
-    FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
85
-    FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
86
-    FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
87
-    FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
88
-    FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
89
-    FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
80
+static const uxg_fontinfo_t g_fontinfo_el_gr[] PROGMEM = {
81
+  FONTDATA_ITEM(7, 136, 136, fontpage_7_136_136), // 'Έ' -- 'Έ'
82
+  FONTDATA_ITEM(7, 145, 157, fontpage_7_145_157), // 'Α' -- 'Ν'
83
+  FONTDATA_ITEM(7, 159, 161, fontpage_7_159_161), // 'Ο' -- 'Ρ'
84
+  FONTDATA_ITEM(7, 163, 167, fontpage_7_163_167), // 'Σ' -- 'Χ'
85
+  FONTDATA_ITEM(7, 172, 175, fontpage_7_172_175), // 'ά' -- 'ί'
86
+  FONTDATA_ITEM(7, 177, 181, fontpage_7_177_181), // 'α' -- 'ε'
87
+  FONTDATA_ITEM(7, 183, 199, fontpage_7_183_199), // 'η' -- 'χ'
88
+  FONTDATA_ITEM(7, 201, 201, fontpage_7_201_201), // 'ω' -- 'ω'
89
+  FONTDATA_ITEM(7, 204, 206, fontpage_7_204_206), // 'ό' -- 'ώ'
90
+  FONTDATA_ITEM(64, 166, 166, fontpage_64_166_166), // '…' -- '…'
90 91
 };

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_en.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_en[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_es.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_es[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_eu.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_eu[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_fi.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_fi[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_fr.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_fr[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_gl.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_gl[] PROGMEM = {};

+ 9
- 8
Marlin/src/lcd/dogm/fontdata/langdata_hr.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00,
@@ -22,11 +24,10 @@ const u8g_fntpgm_uint8_t fontpage_2_254_254[31] U8G_FONT_SECTION("fontpage_2_254
22 24
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFE,0xFE,0x00,0x08,0x00,0x00,
23 25
   0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
24 26
 
25
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
26
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
27
-    FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
28
-    FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
29
-    FONTDATA_ITEM(2, 145, 145, fontpage_2_145_145), // 'đ' -- 'đ'
30
-    FONTDATA_ITEM(2, 225, 225, fontpage_2_225_225), // 'š' -- 'š'
31
-    FONTDATA_ITEM(2, 254, 254, fontpage_2_254_254), // 'ž' -- 'ž'
27
+static const uxg_fontinfo_t g_fontinfo_hr[] PROGMEM = {
28
+  FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
29
+  FONTDATA_ITEM(2, 140, 141, fontpage_2_140_141), // 'Č' -- 'č'
30
+  FONTDATA_ITEM(2, 145, 145, fontpage_2_145_145), // 'đ' -- 'đ'
31
+  FONTDATA_ITEM(2, 225, 225, fontpage_2_225_225), // 'š' -- 'š'
32
+  FONTDATA_ITEM(2, 254, 254, fontpage_2_254_254), // 'ž' -- 'ž'
32 33
 };

+ 5
- 4
Marlin/src/lcd/dogm/fontdata/langdata_hu.h Ver fichero

@@ -3,13 +3,14 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_2_241_241[31] U8G_FONT_SECTION("fontpage_2_241_241") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x08,0x00,0x00,
10 12
   0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x48,0x90,0x00,0x88,0x88,0x88,0x88,0x70};
11 13
 
12
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
13
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
14
-    FONTDATA_ITEM(2, 241, 241, fontpage_2_241_241), // 'ű' -- 'ű'
14
+static const uxg_fontinfo_t g_fontinfo_hu[] PROGMEM = {
15
+  FONTDATA_ITEM(2, 241, 241, fontpage_2_241_241), // 'ű' -- 'ű'
15 16
 };

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_it.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_it[] PROGMEM = {};

+ 16
- 15
Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_97_161_164[65] U8G_FONT_SECTION("fontpage_97_161_164") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA1,0xA4,0x00,0x07,0x00,0x00,
@@ -94,18 +96,17 @@ const u8g_fntpgm_uint8_t fontpage_97_252_252[25] U8G_FONT_SECTION("fontpage_97_2
94 96
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFC,0xFC,0x00,0x05,0x00,0x00,
95 97
   0x00,0x05,0x02,0x02,0x06,0x00,0x03,0x80,0x78};
96 98
 
97
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
98
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
99
-    FONTDATA_ITEM(97, 161, 164, fontpage_97_161_164), // 'ァ' -- 'イ'
100
-    FONTDATA_ITEM(97, 166, 166, fontpage_97_166_166), // 'ウ' -- 'ウ'
101
-    FONTDATA_ITEM(97, 168, 168, fontpage_97_168_168), // 'エ' -- 'エ'
102
-    FONTDATA_ITEM(97, 170, 187, fontpage_97_170_187), // 'オ' -- 'セ'
103
-    FONTDATA_ITEM(97, 189, 193, fontpage_97_189_193), // 'ソ' -- 'チ'
104
-    FONTDATA_ITEM(97, 195, 211, fontpage_97_195_211), // 'ッ' -- 'ビ'
105
-    FONTDATA_ITEM(97, 213, 217, fontpage_97_213_217), // 'フ' -- 'ベ'
106
-    FONTDATA_ITEM(97, 219, 220, fontpage_97_219_220), // 'ホ' -- 'ボ'
107
-    FONTDATA_ITEM(97, 222, 223, fontpage_97_222_223), // 'マ' -- 'ミ'
108
-    FONTDATA_ITEM(97, 225, 237, fontpage_97_225_237), // 'メ' -- 'ロ'
109
-    FONTDATA_ITEM(97, 242, 243, fontpage_97_242_243), // 'ヲ' -- 'ン'
110
-    FONTDATA_ITEM(97, 252, 252, fontpage_97_252_252), // 'ー' -- 'ー'
99
+static const uxg_fontinfo_t g_fontinfo_jp_kana[] PROGMEM = {
100
+  FONTDATA_ITEM(97, 161, 164, fontpage_97_161_164), // 'ァ' -- 'イ'
101
+  FONTDATA_ITEM(97, 166, 166, fontpage_97_166_166), // 'ウ' -- 'ウ'
102
+  FONTDATA_ITEM(97, 168, 168, fontpage_97_168_168), // 'エ' -- 'エ'
103
+  FONTDATA_ITEM(97, 170, 187, fontpage_97_170_187), // 'オ' -- 'セ'
104
+  FONTDATA_ITEM(97, 189, 193, fontpage_97_189_193), // 'ソ' -- 'チ'
105
+  FONTDATA_ITEM(97, 195, 211, fontpage_97_195_211), // 'ッ' -- 'ビ'
106
+  FONTDATA_ITEM(97, 213, 217, fontpage_97_213_217), // 'フ' -- 'ベ'
107
+  FONTDATA_ITEM(97, 219, 220, fontpage_97_219_220), // 'ホ' -- 'ボ'
108
+  FONTDATA_ITEM(97, 222, 223, fontpage_97_222_223), // 'マ' -- 'ミ'
109
+  FONTDATA_ITEM(97, 225, 237, fontpage_97_225_237), // 'メ' -- 'ロ'
110
+  FONTDATA_ITEM(97, 242, 243, fontpage_97_242_243), // 'ヲ' -- 'ン'
111
+  FONTDATA_ITEM(97, 252, 252, fontpage_97_252_252), // 'ー' -- 'ー'
111 112
 };

+ 110
- 109
Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = {
9 11
   0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00,
@@ -436,112 +438,111 @@ const u8g_fntpgm_uint8_t fontpage_431_136_136[34] U8G_FONT_SECTION("fontpage_431
436 438
   0x00,0x08,0x0B,0x0B,0x0A,0x01,0xFE,0x71,0x01,0xFD,0x01,0x71,0x49,0x89,0x49,0x71,
437 439
   0x01,0x01};
438 440
 
439
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
440
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
441
-    FONTDATA_ITEM(344, 240, 240, fontpage_344_240_240), // '거' -- '거'
442
-    FONTDATA_ITEM(345, 224, 224, fontpage_345_224_224), // '고' -- '고'
443
-    FONTDATA_ITEM(347, 248, 248, fontpage_347_248_248), // '그' -- '그'
444
-    FONTDATA_ITEM(348, 137, 137, fontpage_348_137_137), // '급' -- '급'
445
-    FONTDATA_ITEM(348, 176, 176, fontpage_348_176_176), // '기' -- '기'
446
-    FONTDATA_ITEM(348, 197, 197, fontpage_348_197_197), // '깅' -- '깅'
447
-    FONTDATA_ITEM(352, 196, 196, fontpage_352_196_196), // '끄' -- '끄'
448
-    FONTDATA_ITEM(353, 180, 180, fontpage_353_180_180), // '내' -- '내'
449
-    FONTDATA_ITEM(354, 248, 248, fontpage_354_248_248), // '노' -- '노'
450
-    FONTDATA_ITEM(356, 132, 132, fontpage_356_132_132), // '누' -- '누'
451
-    FONTDATA_ITEM(356, 244, 244, fontpage_356_244_244), // '뉴' -- '뉴'
452
-    FONTDATA_ITEM(357, 200, 200, fontpage_357_200_200), // '니' -- '니'
453
-    FONTDATA_ITEM(357, 228, 228, fontpage_357_228_228), // '다' -- '다'
454
-    FONTDATA_ITEM(357, 249, 249, fontpage_357_249_249), // '당' -- '당'
455
-    FONTDATA_ITEM(359, 196, 196, fontpage_359_196_196), // '도' -- '도'
456
-    FONTDATA_ITEM(359, 204, 204, fontpage_359_204_204), // '돌' -- '돌'
457
-    FONTDATA_ITEM(359, 217, 217, fontpage_359_217_217), // '동' -- '동'
458
-    FONTDATA_ITEM(360, 152, 152, fontpage_360_152_152), // '되' -- '되'
459
-    FONTDATA_ITEM(360, 156, 156, fontpage_360_156_156), // '된' -- '된'
460
-    FONTDATA_ITEM(360, 168, 168, fontpage_360_168_168), // '됨' -- '됨'
461
-    FONTDATA_ITEM(361, 164, 164, fontpage_361_164_164), // '뒤' -- '뒤'
462
-    FONTDATA_ITEM(361, 220, 220, fontpage_361_220_220), // '드' -- '드'
463
-    FONTDATA_ITEM(362, 148, 148, fontpage_362_148_148), // '디' -- '디'
464
-    FONTDATA_ITEM(366, 252, 252, fontpage_366_252_252), // '라' -- '라'
465
-    FONTDATA_ITEM(367, 236, 236, fontpage_367_236_236), // '러' -- '러'
466
-    FONTDATA_ITEM(368, 136, 136, fontpage_368_136_136), // '레' -- '레'
467
-    FONTDATA_ITEM(368, 165, 165, fontpage_368_165_165), // '력' -- '력'
468
-    FONTDATA_ITEM(368, 220, 220, fontpage_368_220_220), // '로' -- '로'
469
-    FONTDATA_ITEM(369, 204, 204, fontpage_369_204_204), // '료' -- '료'
470
-    FONTDATA_ITEM(370, 244, 244, fontpage_370_244_244), // '르' -- '르'
471
-    FONTDATA_ITEM(371, 172, 172, fontpage_371_172_172), // '리' -- '리'
472
-    FONTDATA_ITEM(371, 176, 176, fontpage_371_176_176), // '린' -- '린'
473
-    FONTDATA_ITEM(371, 189, 189, fontpage_371_189_189), // '립' -- '립'
474
-    FONTDATA_ITEM(371, 193, 193, fontpage_371_193_193), // '링' -- '링'
475
-    FONTDATA_ITEM(372, 200, 200, fontpage_372_200_200), // '멈' -- '멈'
476
-    FONTDATA_ITEM(372, 212, 212, fontpage_372_212_212), // '메' -- '메'
477
-    FONTDATA_ITEM(372, 244, 244, fontpage_372_244_244), // '면' -- '면'
478
-    FONTDATA_ITEM(373, 168, 168, fontpage_373_168_168), // '모' -- '모'
479
-    FONTDATA_ITEM(373, 187, 187, fontpage_373_187_187), // '못' -- '못'
480
-    FONTDATA_ITEM(375, 248, 248, fontpage_375_248_248), // '미' -- '미'
481
-    FONTDATA_ITEM(376, 128, 128, fontpage_376_128_128), // '밀' -- '밀'
482
-    FONTDATA_ITEM(376, 148, 148, fontpage_376_148_148), // '바' -- '바'
483
-    FONTDATA_ITEM(377, 132, 132, fontpage_377_132_132), // '버' -- '버'
484
-    FONTDATA_ITEM(377, 160, 160, fontpage_377_160_160), // '베' -- '베'
485
-    FONTDATA_ITEM(377, 168, 168, fontpage_377_168_168), // '벨' -- '벨'
486
-    FONTDATA_ITEM(377, 248, 248, fontpage_377_248_248), // '본' -- '본'
487
-    FONTDATA_ITEM(380, 196, 196, fontpage_380_196_196), // '비' -- '비'
488
-    FONTDATA_ITEM(385, 172, 172, fontpage_385_172_172), // '사' -- '사'
489
-    FONTDATA_ITEM(385, 189, 189, fontpage_385_189_189), // '삽' -- '삽'
490
-    FONTDATA_ITEM(385, 200, 200, fontpage_385_200_200), // '새' -- '새'
491
-    FONTDATA_ITEM(386, 164, 164, fontpage_386_164_164), // '설' -- '설'
492
-    FONTDATA_ITEM(387, 140, 141, fontpage_387_140_141), // '소' -- '속'
493
-    FONTDATA_ITEM(389, 164, 164, fontpage_389_164_164), // '스' -- '스'
494
-    FONTDATA_ITEM(389, 172, 172, fontpage_389_172_172), // '슬' -- '슬'
495
-    FONTDATA_ITEM(389, 220, 221, fontpage_389_220_221), // '시' -- '식'
496
-    FONTDATA_ITEM(395, 180, 180, fontpage_395_180_180), // '어' -- '어'
497
-    FONTDATA_ITEM(395, 198, 198, fontpage_395_198_198), // '없' -- '없'
498
-    FONTDATA_ITEM(395, 209, 209, fontpage_395_209_209), // '엑' -- '엑'
499
-    FONTDATA_ITEM(395, 212, 212, fontpage_395_212_212), // '엔' -- '엔'
500
-    FONTDATA_ITEM(395, 244, 244, fontpage_395_244_244), // '열' -- '열'
501
-    FONTDATA_ITEM(396, 136, 136, fontpage_396_136_136), // '예' -- '예'
502
-    FONTDATA_ITEM(396, 164, 164, fontpage_396_164_164), // '오' -- '오'
503
-    FONTDATA_ITEM(396, 168, 168, fontpage_396_168_168), // '온' -- '온'
504
-    FONTDATA_ITEM(396, 196, 196, fontpage_396_196_196), // '완' -- '완'
505
-    FONTDATA_ITEM(397, 208, 208, fontpage_397_208_208), // '원' -- '원'
506
-    FONTDATA_ITEM(398, 132, 132, fontpage_398_132_132), // '위' -- '위'
507
-    FONTDATA_ITEM(398, 188, 188, fontpage_398_188_188), // '으' -- '으'
508
-    FONTDATA_ITEM(398, 204, 204, fontpage_398_204_204), // '음' -- '음'
509
-    FONTDATA_ITEM(398, 244, 244, fontpage_398_244_244), // '이' -- '이'
510
-    FONTDATA_ITEM(398, 252, 253, fontpage_398_252_253), // '일' -- '읽'
511
-    FONTDATA_ITEM(399, 133, 133, fontpage_399_133_133), // '입' -- '입'
512
-    FONTDATA_ITEM(399, 144, 145, fontpage_399_144_145), // '자' -- '작'
513
-    FONTDATA_ITEM(399, 152, 152, fontpage_399_152_152), // '잘' -- '잘'
514
-    FONTDATA_ITEM(399, 165, 165, fontpage_399_165_165), // '장' -- '장'
515
-    FONTDATA_ITEM(399, 172, 172, fontpage_399_172_172), // '재' -- '재'
516
-    FONTDATA_ITEM(400, 128, 128, fontpage_400_128_128), // '저' -- '저'
517
-    FONTDATA_ITEM(400, 132, 132, fontpage_400_132_132), // '전' -- '전'
518
-    FONTDATA_ITEM(400, 149, 149, fontpage_400_149_149), // '정' -- '정'
519
-    FONTDATA_ITEM(400, 156, 156, fontpage_400_156_156), // '제' -- '제'
520
-    FONTDATA_ITEM(401, 253, 253, fontpage_401_253_253), // '죽' -- '죽'
521
-    FONTDATA_ITEM(402, 128, 128, fontpage_402_128_128), // '준' -- '준'
522
-    FONTDATA_ITEM(402, 145, 145, fontpage_402_145_145), // '중' -- '중'
523
-    FONTDATA_ITEM(403, 144, 144, fontpage_403_144_144), // '즐' -- '즐'
524
-    FONTDATA_ITEM(403, 192, 192, fontpage_403_192_192), // '지' -- '지'
525
-    FONTDATA_ITEM(409, 152, 152, fontpage_409_152_152), // '처' -- '처'
526
-    FONTDATA_ITEM(410, 136, 136, fontpage_410_136_136), // '초' -- '초'
527
-    FONTDATA_ITEM(411, 149, 149, fontpage_411_149_149), // '축' -- '축'
528
-    FONTDATA_ITEM(411, 156, 156, fontpage_411_156_156), // '출' -- '출'
529
-    FONTDATA_ITEM(411, 164, 164, fontpage_411_164_164), // '춤' -- '춤'
530
-    FONTDATA_ITEM(411, 232, 232, fontpage_411_232_232), // '취' -- '취'
531
-    FONTDATA_ITEM(412, 216, 216, fontpage_412_216_216), // '치' -- '치'
532
-    FONTDATA_ITEM(412, 232, 232, fontpage_412_232_232), // '침' -- '침'
533
-    FONTDATA_ITEM(412, 244, 244, fontpage_412_244_244), // '카' -- '카'
534
-    FONTDATA_ITEM(414, 156, 156, fontpage_414_156_156), // '켜' -- '켜'
535
-    FONTDATA_ITEM(417, 209, 209, fontpage_417_209_209), // '탑' -- '탑'
536
-    FONTDATA_ITEM(418, 176, 176, fontpage_418_176_176), // '터' -- '터'
537
-    FONTDATA_ITEM(418, 204, 204, fontpage_418_204_204), // '테' -- '테'
538
-    FONTDATA_ITEM(419, 160, 160, fontpage_419_160_160), // '토' -- '토'
539
-    FONTDATA_ITEM(421, 184, 184, fontpage_421_184_184), // '트' -- '트'
540
-    FONTDATA_ITEM(423, 156, 156, fontpage_423_156_156), // '펜' -- '펜'
541
-    FONTDATA_ITEM(426, 132, 132, fontpage_426_132_132), // '프' -- '프'
542
-    FONTDATA_ITEM(426, 216, 216, fontpage_426_216_216), // '하' -- '하'
543
-    FONTDATA_ITEM(426, 233, 233, fontpage_426_233_233), // '합' -- '합'
544
-    FONTDATA_ITEM(428, 200, 200, fontpage_428_200_200), // '홈' -- '홈'
545
-    FONTDATA_ITEM(428, 212, 212, fontpage_428_212_212), // '화' -- '화'
546
-    FONTDATA_ITEM(431, 136, 136, fontpage_431_136_136), // '히' -- '히'
441
+static const uxg_fontinfo_t g_fontinfo_ko_KR[] PROGMEM = {
442
+  FONTDATA_ITEM(344, 240, 240, fontpage_344_240_240), // '거' -- '거'
443
+  FONTDATA_ITEM(345, 224, 224, fontpage_345_224_224), // '고' -- '고'
444
+  FONTDATA_ITEM(347, 248, 248, fontpage_347_248_248), // '그' -- '그'
445
+  FONTDATA_ITEM(348, 137, 137, fontpage_348_137_137), // '급' -- '급'
446
+  FONTDATA_ITEM(348, 176, 176, fontpage_348_176_176), // '기' -- '기'
447
+  FONTDATA_ITEM(348, 197, 197, fontpage_348_197_197), // '깅' -- '깅'
448
+  FONTDATA_ITEM(352, 196, 196, fontpage_352_196_196), // '끄' -- '끄'
449
+  FONTDATA_ITEM(353, 180, 180, fontpage_353_180_180), // '내' -- '내'
450
+  FONTDATA_ITEM(354, 248, 248, fontpage_354_248_248), // '노' -- '노'
451
+  FONTDATA_ITEM(356, 132, 132, fontpage_356_132_132), // '누' -- '누'
452
+  FONTDATA_ITEM(356, 244, 244, fontpage_356_244_244), // '뉴' -- '뉴'
453
+  FONTDATA_ITEM(357, 200, 200, fontpage_357_200_200), // '니' -- '니'
454
+  FONTDATA_ITEM(357, 228, 228, fontpage_357_228_228), // '다' -- '다'
455
+  FONTDATA_ITEM(357, 249, 249, fontpage_357_249_249), // '당' -- '당'
456
+  FONTDATA_ITEM(359, 196, 196, fontpage_359_196_196), // '도' -- '도'
457
+  FONTDATA_ITEM(359, 204, 204, fontpage_359_204_204), // '돌' -- '돌'
458
+  FONTDATA_ITEM(359, 217, 217, fontpage_359_217_217), // '동' -- '동'
459
+  FONTDATA_ITEM(360, 152, 152, fontpage_360_152_152), // '되' -- '되'
460
+  FONTDATA_ITEM(360, 156, 156, fontpage_360_156_156), // '된' -- '된'
461
+  FONTDATA_ITEM(360, 168, 168, fontpage_360_168_168), // '됨' -- '됨'
462
+  FONTDATA_ITEM(361, 164, 164, fontpage_361_164_164), // '뒤' -- '뒤'
463
+  FONTDATA_ITEM(361, 220, 220, fontpage_361_220_220), // '드' -- '드'
464
+  FONTDATA_ITEM(362, 148, 148, fontpage_362_148_148), // '디' -- '디'
465
+  FONTDATA_ITEM(366, 252, 252, fontpage_366_252_252), // '라' -- '라'
466
+  FONTDATA_ITEM(367, 236, 236, fontpage_367_236_236), // '러' -- '러'
467
+  FONTDATA_ITEM(368, 136, 136, fontpage_368_136_136), // '레' -- '레'
468
+  FONTDATA_ITEM(368, 165, 165, fontpage_368_165_165), // '력' -- '력'
469
+  FONTDATA_ITEM(368, 220, 220, fontpage_368_220_220), // '로' -- '로'
470
+  FONTDATA_ITEM(369, 204, 204, fontpage_369_204_204), // '료' -- '료'
471
+  FONTDATA_ITEM(370, 244, 244, fontpage_370_244_244), // '르' -- '르'
472
+  FONTDATA_ITEM(371, 172, 172, fontpage_371_172_172), // '리' -- '리'
473
+  FONTDATA_ITEM(371, 176, 176, fontpage_371_176_176), // '린' -- '린'
474
+  FONTDATA_ITEM(371, 189, 189, fontpage_371_189_189), // '립' -- '립'
475
+  FONTDATA_ITEM(371, 193, 193, fontpage_371_193_193), // '링' -- '링'
476
+  FONTDATA_ITEM(372, 200, 200, fontpage_372_200_200), // '멈' -- '멈'
477
+  FONTDATA_ITEM(372, 212, 212, fontpage_372_212_212), // '메' -- '메'
478
+  FONTDATA_ITEM(372, 244, 244, fontpage_372_244_244), // '면' -- '면'
479
+  FONTDATA_ITEM(373, 168, 168, fontpage_373_168_168), // '모' -- '모'
480
+  FONTDATA_ITEM(373, 187, 187, fontpage_373_187_187), // '못' -- '못'
481
+  FONTDATA_ITEM(375, 248, 248, fontpage_375_248_248), // '미' -- '미'
482
+  FONTDATA_ITEM(376, 128, 128, fontpage_376_128_128), // '밀' -- '밀'
483
+  FONTDATA_ITEM(376, 148, 148, fontpage_376_148_148), // '바' -- '바'
484
+  FONTDATA_ITEM(377, 132, 132, fontpage_377_132_132), // '버' -- '버'
485
+  FONTDATA_ITEM(377, 160, 160, fontpage_377_160_160), // '베' -- '베'
486
+  FONTDATA_ITEM(377, 168, 168, fontpage_377_168_168), // '벨' -- '벨'
487
+  FONTDATA_ITEM(377, 248, 248, fontpage_377_248_248), // '본' -- '본'
488
+  FONTDATA_ITEM(380, 196, 196, fontpage_380_196_196), // '비' -- '비'
489
+  FONTDATA_ITEM(385, 172, 172, fontpage_385_172_172), // '사' -- '사'
490
+  FONTDATA_ITEM(385, 189, 189, fontpage_385_189_189), // '삽' -- '삽'
491
+  FONTDATA_ITEM(385, 200, 200, fontpage_385_200_200), // '새' -- '새'
492
+  FONTDATA_ITEM(386, 164, 164, fontpage_386_164_164), // '설' -- '설'
493
+  FONTDATA_ITEM(387, 140, 141, fontpage_387_140_141), // '소' -- '속'
494
+  FONTDATA_ITEM(389, 164, 164, fontpage_389_164_164), // '스' -- '스'
495
+  FONTDATA_ITEM(389, 172, 172, fontpage_389_172_172), // '슬' -- '슬'
496
+  FONTDATA_ITEM(389, 220, 221, fontpage_389_220_221), // '시' -- '식'
497
+  FONTDATA_ITEM(395, 180, 180, fontpage_395_180_180), // '어' -- '어'
498
+  FONTDATA_ITEM(395, 198, 198, fontpage_395_198_198), // '없' -- '없'
499
+  FONTDATA_ITEM(395, 209, 209, fontpage_395_209_209), // '엑' -- '엑'
500
+  FONTDATA_ITEM(395, 212, 212, fontpage_395_212_212), // '엔' -- '엔'
501
+  FONTDATA_ITEM(395, 244, 244, fontpage_395_244_244), // '열' -- '열'
502
+  FONTDATA_ITEM(396, 136, 136, fontpage_396_136_136), // '예' -- '예'
503
+  FONTDATA_ITEM(396, 164, 164, fontpage_396_164_164), // '오' -- '오'
504
+  FONTDATA_ITEM(396, 168, 168, fontpage_396_168_168), // '온' -- '온'
505
+  FONTDATA_ITEM(396, 196, 196, fontpage_396_196_196), // '완' -- '완'
506
+  FONTDATA_ITEM(397, 208, 208, fontpage_397_208_208), // '원' -- '원'
507
+  FONTDATA_ITEM(398, 132, 132, fontpage_398_132_132), // '위' -- '위'
508
+  FONTDATA_ITEM(398, 188, 188, fontpage_398_188_188), // '으' -- '으'
509
+  FONTDATA_ITEM(398, 204, 204, fontpage_398_204_204), // '음' -- '음'
510
+  FONTDATA_ITEM(398, 244, 244, fontpage_398_244_244), // '이' -- '이'
511
+  FONTDATA_ITEM(398, 252, 253, fontpage_398_252_253), // '일' -- '읽'
512
+  FONTDATA_ITEM(399, 133, 133, fontpage_399_133_133), // '입' -- '입'
513
+  FONTDATA_ITEM(399, 144, 145, fontpage_399_144_145), // '자' -- '작'
514
+  FONTDATA_ITEM(399, 152, 152, fontpage_399_152_152), // '잘' -- '잘'
515
+  FONTDATA_ITEM(399, 165, 165, fontpage_399_165_165), // '장' -- '장'
516
+  FONTDATA_ITEM(399, 172, 172, fontpage_399_172_172), // '재' -- '재'
517
+  FONTDATA_ITEM(400, 128, 128, fontpage_400_128_128), // '저' -- '저'
518
+  FONTDATA_ITEM(400, 132, 132, fontpage_400_132_132), // '전' -- '전'
519
+  FONTDATA_ITEM(400, 149, 149, fontpage_400_149_149), // '정' -- '정'
520
+  FONTDATA_ITEM(400, 156, 156, fontpage_400_156_156), // '제' -- '제'
521
+  FONTDATA_ITEM(401, 253, 253, fontpage_401_253_253), // '죽' -- '죽'
522
+  FONTDATA_ITEM(402, 128, 128, fontpage_402_128_128), // '준' -- '준'
523
+  FONTDATA_ITEM(402, 145, 145, fontpage_402_145_145), // '중' -- '중'
524
+  FONTDATA_ITEM(403, 144, 144, fontpage_403_144_144), // '즐' -- '즐'
525
+  FONTDATA_ITEM(403, 192, 192, fontpage_403_192_192), // '지' -- '지'
526
+  FONTDATA_ITEM(409, 152, 152, fontpage_409_152_152), // '처' -- '처'
527
+  FONTDATA_ITEM(410, 136, 136, fontpage_410_136_136), // '초' -- '초'
528
+  FONTDATA_ITEM(411, 149, 149, fontpage_411_149_149), // '축' -- '축'
529
+  FONTDATA_ITEM(411, 156, 156, fontpage_411_156_156), // '출' -- '출'
530
+  FONTDATA_ITEM(411, 164, 164, fontpage_411_164_164), // '춤' -- '춤'
531
+  FONTDATA_ITEM(411, 232, 232, fontpage_411_232_232), // '취' -- '취'
532
+  FONTDATA_ITEM(412, 216, 216, fontpage_412_216_216), // '치' -- '치'
533
+  FONTDATA_ITEM(412, 232, 232, fontpage_412_232_232), // '침' -- '침'
534
+  FONTDATA_ITEM(412, 244, 244, fontpage_412_244_244), // '카' -- '카'
535
+  FONTDATA_ITEM(414, 156, 156, fontpage_414_156_156), // '켜' -- '켜'
536
+  FONTDATA_ITEM(417, 209, 209, fontpage_417_209_209), // '탑' -- '탑'
537
+  FONTDATA_ITEM(418, 176, 176, fontpage_418_176_176), // '터' -- '터'
538
+  FONTDATA_ITEM(418, 204, 204, fontpage_418_204_204), // '테' -- '테'
539
+  FONTDATA_ITEM(419, 160, 160, fontpage_419_160_160), // '토' -- '토'
540
+  FONTDATA_ITEM(421, 184, 184, fontpage_421_184_184), // '트' -- '트'
541
+  FONTDATA_ITEM(423, 156, 156, fontpage_423_156_156), // '펜' -- '펜'
542
+  FONTDATA_ITEM(426, 132, 132, fontpage_426_132_132), // '프' -- '프'
543
+  FONTDATA_ITEM(426, 216, 216, fontpage_426_216_216), // '하' -- '하'
544
+  FONTDATA_ITEM(426, 233, 233, fontpage_426_233_233), // '합' -- '합'
545
+  FONTDATA_ITEM(428, 200, 200, fontpage_428_200_200), // '홈' -- '홈'
546
+  FONTDATA_ITEM(428, 212, 212, fontpage_428_212_212), // '화' -- '화'
547
+  FONTDATA_ITEM(431, 136, 136, fontpage_431_136_136), // '히' -- '히'
547 548
 };

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_nl.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_nl[] PROGMEM = {};

+ 10
- 9
Marlin/src/lcd/dogm/fontdata/langdata_pl.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_2_132_133[45] U8G_FONT_SECTION("fontpage_2_132_133") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x84,0x85,0x00,0x07,0xFE,0x00,
@@ -29,12 +31,11 @@ const u8g_fntpgm_uint8_t fontpage_2_252_252[30] U8G_FONT_SECTION("fontpage_2_252
29 31
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xFC,0xFC,0x00,0x07,0x00,0x00,
30 32
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
31 33
 
32
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
33
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
34
-    FONTDATA_ITEM(2, 132, 133, fontpage_2_132_133), // 'Ą' -- 'ą'
35
-    FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
36
-    FONTDATA_ITEM(2, 153, 153, fontpage_2_153_153), // 'ę' -- 'ę'
37
-    FONTDATA_ITEM(2, 193, 196, fontpage_2_193_196), // 'Ł' -- 'ń'
38
-    FONTDATA_ITEM(2, 218, 219, fontpage_2_218_219), // 'Ś' -- 'ś'
39
-    FONTDATA_ITEM(2, 252, 252, fontpage_2_252_252), // 'ż' -- 'ż'
34
+static const uxg_fontinfo_t g_fontinfo_pl[] PROGMEM = {
35
+  FONTDATA_ITEM(2, 132, 133, fontpage_2_132_133), // 'Ą' -- 'ą'
36
+  FONTDATA_ITEM(2, 135, 135, fontpage_2_135_135), // 'ć' -- 'ć'
37
+  FONTDATA_ITEM(2, 153, 153, fontpage_2_153_153), // 'ę' -- 'ę'
38
+  FONTDATA_ITEM(2, 193, 196, fontpage_2_193_196), // 'Ł' -- 'ń'
39
+  FONTDATA_ITEM(2, 218, 219, fontpage_2_218_219), // 'Ś' -- 'ś'
40
+  FONTDATA_ITEM(2, 252, 252, fontpage_2_252_252), // 'ż' -- 'ż'
40 41
 };

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_pt.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_pt[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_pt_br[] PROGMEM = {};

+ 4
- 3
Marlin/src/lcd/dogm/fontdata/langdata_ro.h Ver fichero

@@ -3,7 +3,8 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7 7
 
8
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
9
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
8
+#include "langdata.h"
9
+
10
+static const uxg_fontinfo_t g_fontinfo_ro[] PROGMEM = {};

+ 8
- 7
Marlin/src/lcd/dogm/fontdata/langdata_ru.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_8_144_168[348] U8G_FONT_SECTION("fontpage_8_144_168") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0xA8,0x00,0x0A,0xFE,0x00,
@@ -64,10 +66,9 @@ const u8g_fntpgm_uint8_t fontpage_8_209_209[30] U8G_FONT_SECTION("fontpage_8_209
64 66
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xD1,0xD1,0x00,0x07,0x00,0x00,
65 67
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0xF0,0x80,0x70};
66 68
 
67
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
68
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
69
-    FONTDATA_ITEM(8, 144, 168, fontpage_8_144_168), // 'А' -- 'Ш'
70
-    FONTDATA_ITEM(8, 171, 173, fontpage_8_171_173), // 'Ы' -- 'Э'
71
-    FONTDATA_ITEM(8, 175, 207, fontpage_8_175_207), // 'Я' -- 'я'
72
-    FONTDATA_ITEM(8, 209, 209, fontpage_8_209_209), // 'ё' -- 'ё'
69
+static const uxg_fontinfo_t g_fontinfo_ru[] PROGMEM = {
70
+  FONTDATA_ITEM(8, 144, 168, fontpage_8_144_168), // 'А' -- 'Ш'
71
+  FONTDATA_ITEM(8, 171, 173, fontpage_8_171_173), // 'Ы' -- 'Э'
72
+  FONTDATA_ITEM(8, 175, 207, fontpage_8_175_207), // 'Я' -- 'я'
73
+  FONTDATA_ITEM(8, 209, 209, fontpage_8_209_209), // 'ё' -- 'ё'
73 74
 };

+ 11
- 10
Marlin/src/lcd/dogm/fontdata/langdata_sk.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8F,0x00,0x0A,0x00,0x00,
@@ -37,13 +39,12 @@ const u8g_fntpgm_uint8_t fontpage_2_253_254[47] U8G_FONT_SECTION("fontpage_2_253
37 39
   0x00,0x05,0x0A,0x0A,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x08,0x10,0x20,0x40,0x80,
38 40
   0xF8,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xF8,0x10,0x20,0x40,0xF8};
39 41
 
40
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
41
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
42
-    FONTDATA_ITEM(2, 140, 143, fontpage_2_140_143), // 'Č' -- 'ď'
43
-    FONTDATA_ITEM(2, 186, 186, fontpage_2_186_186), // 'ĺ' -- 'ĺ'
44
-    FONTDATA_ITEM(2, 189, 190, fontpage_2_189_190), // 'Ľ' -- 'ľ'
45
-    FONTDATA_ITEM(2, 199, 200, fontpage_2_199_200), // 'Ň' -- 'ň'
46
-    FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
47
-    FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
48
-    FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
42
+static const uxg_fontinfo_t g_fontinfo_sk[] PROGMEM = {
43
+  FONTDATA_ITEM(2, 140, 143, fontpage_2_140_143), // 'Č' -- 'ď'
44
+  FONTDATA_ITEM(2, 186, 186, fontpage_2_186_186), // 'ĺ' -- 'ĺ'
45
+  FONTDATA_ITEM(2, 189, 190, fontpage_2_189_190), // 'Ľ' -- 'ľ'
46
+  FONTDATA_ITEM(2, 199, 200, fontpage_2_199_200), // 'Ň' -- 'ň'
47
+  FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
48
+  FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
49
+  FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
49 50
 };

+ 7
- 6
Marlin/src/lcd/dogm/fontdata/langdata_test.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x00,0x0A,0xFE,0x00,
@@ -223,9 +225,8 @@ const u8g_fntpgm_uint8_t fontpage_97_193_255[822] U8G_FONT_SECTION("fontpage_97_
223 225
   0x06,0x00,0x02,0x28,0x28,0x00,0x80,0x60,0x10,0x08,0x05,0x06,0x06,0x06,0x00,0x00,
224 226
   0xF8,0x08,0x08,0x08,0x08,0x08};
225 227
 
226
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
227
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
228
-    FONTDATA_ITEM(8, 128, 255, fontpage_8_128_255), // 'Ѐ' -- 'ѿ'
229
-    FONTDATA_ITEM(97, 129, 191, fontpage_97_129_191), // 'め' -- 'タ'
230
-    FONTDATA_ITEM(97, 193, 255, fontpage_97_193_255), // 'チ' -- 'ヿ'
228
+static const uxg_fontinfo_t g_fontinfo_test[] PROGMEM = {
229
+  FONTDATA_ITEM(8, 128, 255, fontpage_8_128_255), // 'Ѐ' -- 'ѿ'
230
+  FONTDATA_ITEM(97, 129, 191, fontpage_97_129_191), // 'め' -- 'タ'
231
+  FONTDATA_ITEM(97, 193, 255, fontpage_97_193_255), // 'チ' -- 'ヿ'
231 232
 };

+ 7
- 6
Marlin/src/lcd/dogm/fontdata/langdata_tr.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_2_158_159[49] U8G_FONT_SECTION("fontpage_2_158_159") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9E,0x9F,0x00,0x0A,0xFE,0x00,
@@ -19,9 +21,8 @@ const u8g_fntpgm_uint8_t fontpage_2_222_223[45] U8G_FONT_SECTION("fontpage_2_222
19 21
   0x00,0x05,0x09,0x09,0x06,0x00,0xFE,0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x10,0x60,
20 22
   0x05,0x07,0x07,0x06,0x00,0xFE,0x78,0x80,0x70,0x08,0xF0,0x10,0x60};
21 23
 
22
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
23
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
24
-    FONTDATA_ITEM(2, 158, 159, fontpage_2_158_159), // 'Ğ' -- 'ğ'
25
-    FONTDATA_ITEM(2, 176, 177, fontpage_2_176_177), // 'İ' -- 'ı'
26
-    FONTDATA_ITEM(2, 222, 223, fontpage_2_222_223), // 'Ş' -- 'ş'
24
+static const uxg_fontinfo_t g_fontinfo_tr[] PROGMEM = {
25
+  FONTDATA_ITEM(2, 158, 159, fontpage_2_158_159), // 'Ğ' -- 'ğ'
26
+  FONTDATA_ITEM(2, 176, 177, fontpage_2_176_177), // 'İ' -- 'ı'
27
+  FONTDATA_ITEM(2, 222, 223, fontpage_2_222_223), // 'Ş' -- 'ş'
27 28
 };

+ 12
- 11
Marlin/src/lcd/dogm/fontdata/langdata_uk.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_8_134_134[30] U8G_FONT_SECTION("fontpage_8_134_134") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00,
@@ -72,14 +74,13 @@ const u8g_fntpgm_uint8_t fontpage_8_214_215[41] U8G_FONT_SECTION("fontpage_8_214
72 74
   0x00,0x03,0x06,0x06,0x06,0x01,0x00,0x40,0x00,0xC0,0x40,0x40,0xE0,0x03,0x06,0x06,
73 75
   0x06,0x01,0x00,0xA0,0x00,0xC0,0x40,0x40,0xE0};
74 76
 
75
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
76
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
77
-    FONTDATA_ITEM(8, 134, 134, fontpage_8_134_134), // 'І' -- 'І'
78
-    FONTDATA_ITEM(8, 144, 169, fontpage_8_144_169), // 'А' -- 'Щ'
79
-    FONTDATA_ITEM(8, 172, 172, fontpage_8_172_172), // 'Ь' -- 'Ь'
80
-    FONTDATA_ITEM(8, 175, 201, fontpage_8_175_201), // 'Я' -- 'щ'
81
-    FONTDATA_ITEM(8, 204, 204, fontpage_8_204_204), // 'ь' -- 'ь'
82
-    FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
83
-    FONTDATA_ITEM(8, 212, 212, fontpage_8_212_212), // 'є' -- 'є'
84
-    FONTDATA_ITEM(8, 214, 215, fontpage_8_214_215), // 'і' -- 'ї'
77
+static const uxg_fontinfo_t g_fontinfo_uk[] PROGMEM = {
78
+  FONTDATA_ITEM(8, 134, 134, fontpage_8_134_134), // 'І' -- 'І'
79
+  FONTDATA_ITEM(8, 144, 169, fontpage_8_144_169), // 'А' -- 'Щ'
80
+  FONTDATA_ITEM(8, 172, 172, fontpage_8_172_172), // 'Ь' -- 'Ь'
81
+  FONTDATA_ITEM(8, 175, 201, fontpage_8_175_201), // 'Я' -- 'щ'
82
+  FONTDATA_ITEM(8, 204, 204, fontpage_8_204_204), // 'ь' -- 'ь'
83
+  FONTDATA_ITEM(8, 206, 207, fontpage_8_206_207), // 'ю' -- 'я'
84
+  FONTDATA_ITEM(8, 212, 212, fontpage_8_212_212), // 'є' -- 'є'
85
+  FONTDATA_ITEM(8, 214, 215, fontpage_8_214_215), // 'і' -- 'ї'
85 86
 };

+ 49
- 48
Marlin/src/lcd/dogm/fontdata/langdata_vi.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_2_131_131[31] U8G_FONT_SECTION("fontpage_2_131_131") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x83,0x83,0x00,0x08,0x00,0x00,
@@ -177,51 +179,50 @@ const u8g_fntpgm_uint8_t fontpage_61_241_241[32] U8G_FONT_SECTION("fontpage_61_2
177 179
   0x00,0x06,0x09,0x09,0x07,0x00,0xFE,0x0C,0x04,0x88,0x88,0x88,0x88,0x70,0x00,0x20
178 180
   };
179 181
 
180
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
181
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
182
-    FONTDATA_ITEM(2, 131, 131, fontpage_2_131_131), // 'ă' -- 'ă'
183
-    FONTDATA_ITEM(2, 144, 145, fontpage_2_144_145), // 'Đ' -- 'đ'
184
-    FONTDATA_ITEM(2, 169, 169, fontpage_2_169_169), // 'ĩ' -- 'ĩ'
185
-    FONTDATA_ITEM(3, 161, 161, fontpage_3_161_161), // 'ơ' -- 'ơ'
186
-    FONTDATA_ITEM(3, 175, 176, fontpage_3_175_176), // 'Ư' -- 'ư'
187
-    FONTDATA_ITEM(6, 131, 131, fontpage_6_131_131), // '̃' -- '̃'
188
-    FONTDATA_ITEM(6, 137, 137, fontpage_6_137_137), // '̉' -- '̉'
189
-    FONTDATA_ITEM(6, 163, 163, fontpage_6_163_163), // '̣' -- '̣'
190
-    FONTDATA_ITEM(6, 192, 193, fontpage_6_192_193), // '̀' -- '́'
191
-    FONTDATA_ITEM(61, 161, 161, fontpage_61_161_161), // 'ạ' -- 'ạ'
192
-    FONTDATA_ITEM(61, 163, 163, fontpage_61_163_163), // 'ả' -- 'ả'
193
-    FONTDATA_ITEM(61, 165, 165, fontpage_61_165_165), // 'ấ' -- 'ấ'
194
-    FONTDATA_ITEM(61, 167, 167, fontpage_61_167_167), // 'ầ' -- 'ầ'
195
-    FONTDATA_ITEM(61, 169, 169, fontpage_61_169_169), // 'ẩ' -- 'ẩ'
196
-    FONTDATA_ITEM(61, 173, 173, fontpage_61_173_173), // 'ậ' -- 'ậ'
197
-    FONTDATA_ITEM(61, 175, 175, fontpage_61_175_175), // 'ắ' -- 'ắ'
198
-    FONTDATA_ITEM(61, 177, 177, fontpage_61_177_177), // 'ằ' -- 'ằ'
199
-    FONTDATA_ITEM(61, 179, 179, fontpage_61_179_179), // 'ẳ' -- 'ẳ'
200
-    FONTDATA_ITEM(61, 181, 181, fontpage_61_181_181), // 'ẵ' -- 'ẵ'
201
-    FONTDATA_ITEM(61, 183, 183, fontpage_61_183_183), // 'ặ' -- 'ặ'
202
-    FONTDATA_ITEM(61, 191, 191, fontpage_61_191_191), // 'ế' -- 'ế'
203
-    FONTDATA_ITEM(61, 193, 193, fontpage_61_193_193), // 'ề' -- 'ề'
204
-    FONTDATA_ITEM(61, 195, 195, fontpage_61_195_195), // 'ể' -- 'ể'
205
-    FONTDATA_ITEM(61, 199, 199, fontpage_61_199_199), // 'ệ' -- 'ệ'
206
-    FONTDATA_ITEM(61, 201, 201, fontpage_61_201_201), // 'ỉ' -- 'ỉ'
207
-    FONTDATA_ITEM(61, 203, 203, fontpage_61_203_203), // 'ị' -- 'ị'
208
-    FONTDATA_ITEM(61, 205, 205, fontpage_61_205_205), // 'ọ' -- 'ọ'
209
-    FONTDATA_ITEM(61, 207, 207, fontpage_61_207_207), // 'ỏ' -- 'ỏ'
210
-    FONTDATA_ITEM(61, 209, 209, fontpage_61_209_209), // 'ố' -- 'ố'
211
-    FONTDATA_ITEM(61, 211, 211, fontpage_61_211_211), // 'ồ' -- 'ồ'
212
-    FONTDATA_ITEM(61, 213, 213, fontpage_61_213_213), // 'ổ' -- 'ổ'
213
-    FONTDATA_ITEM(61, 215, 215, fontpage_61_215_215), // 'ỗ' -- 'ỗ'
214
-    FONTDATA_ITEM(61, 217, 217, fontpage_61_217_217), // 'ộ' -- 'ộ'
215
-    FONTDATA_ITEM(61, 219, 219, fontpage_61_219_219), // 'ớ' -- 'ớ'
216
-    FONTDATA_ITEM(61, 221, 221, fontpage_61_221_221), // 'ờ' -- 'ờ'
217
-    FONTDATA_ITEM(61, 223, 223, fontpage_61_223_223), // 'ở' -- 'ở'
218
-    FONTDATA_ITEM(61, 225, 225, fontpage_61_225_225), // 'ỡ' -- 'ỡ'
219
-    FONTDATA_ITEM(61, 227, 227, fontpage_61_227_227), // 'ợ' -- 'ợ'
220
-    FONTDATA_ITEM(61, 229, 229, fontpage_61_229_229), // 'ụ' -- 'ụ'
221
-    FONTDATA_ITEM(61, 231, 231, fontpage_61_231_231), // 'ủ' -- 'ủ'
222
-    FONTDATA_ITEM(61, 233, 233, fontpage_61_233_233), // 'ứ' -- 'ứ'
223
-    FONTDATA_ITEM(61, 235, 235, fontpage_61_235_235), // 'ừ' -- 'ừ'
224
-    FONTDATA_ITEM(61, 237, 237, fontpage_61_237_237), // 'ử' -- 'ử'
225
-    FONTDATA_ITEM(61, 239, 239, fontpage_61_239_239), // 'ữ' -- 'ữ'
226
-    FONTDATA_ITEM(61, 241, 241, fontpage_61_241_241), // 'ự' -- 'ự'
182
+static const uxg_fontinfo_t g_fontinfo_vi[] PROGMEM = {
183
+  FONTDATA_ITEM(2, 131, 131, fontpage_2_131_131), // 'ă' -- 'ă'
184
+  FONTDATA_ITEM(2, 144, 145, fontpage_2_144_145), // 'Đ' -- 'đ'
185
+  FONTDATA_ITEM(2, 169, 169, fontpage_2_169_169), // 'ĩ' -- 'ĩ'
186
+  FONTDATA_ITEM(3, 161, 161, fontpage_3_161_161), // 'ơ' -- 'ơ'
187
+  FONTDATA_ITEM(3, 175, 176, fontpage_3_175_176), // 'Ư' -- 'ư'
188
+  FONTDATA_ITEM(6, 131, 131, fontpage_6_131_131), // '̃' -- '̃'
189
+  FONTDATA_ITEM(6, 137, 137, fontpage_6_137_137), // '̉' -- '̉'
190
+  FONTDATA_ITEM(6, 163, 163, fontpage_6_163_163), // '̣' -- '̣'
191
+  FONTDATA_ITEM(6, 192, 193, fontpage_6_192_193), // '̀' -- '́'
192
+  FONTDATA_ITEM(61, 161, 161, fontpage_61_161_161), // 'ạ' -- 'ạ'
193
+  FONTDATA_ITEM(61, 163, 163, fontpage_61_163_163), // 'ả' -- 'ả'
194
+  FONTDATA_ITEM(61, 165, 165, fontpage_61_165_165), // 'ấ' -- 'ấ'
195
+  FONTDATA_ITEM(61, 167, 167, fontpage_61_167_167), // 'ầ' -- 'ầ'
196
+  FONTDATA_ITEM(61, 169, 169, fontpage_61_169_169), // 'ẩ' -- 'ẩ'
197
+  FONTDATA_ITEM(61, 173, 173, fontpage_61_173_173), // 'ậ' -- 'ậ'
198
+  FONTDATA_ITEM(61, 175, 175, fontpage_61_175_175), // 'ắ' -- 'ắ'
199
+  FONTDATA_ITEM(61, 177, 177, fontpage_61_177_177), // 'ằ' -- 'ằ'
200
+  FONTDATA_ITEM(61, 179, 179, fontpage_61_179_179), // 'ẳ' -- 'ẳ'
201
+  FONTDATA_ITEM(61, 181, 181, fontpage_61_181_181), // 'ẵ' -- 'ẵ'
202
+  FONTDATA_ITEM(61, 183, 183, fontpage_61_183_183), // 'ặ' -- 'ặ'
203
+  FONTDATA_ITEM(61, 191, 191, fontpage_61_191_191), // 'ế' -- 'ế'
204
+  FONTDATA_ITEM(61, 193, 193, fontpage_61_193_193), // 'ề' -- 'ề'
205
+  FONTDATA_ITEM(61, 195, 195, fontpage_61_195_195), // 'ể' -- 'ể'
206
+  FONTDATA_ITEM(61, 199, 199, fontpage_61_199_199), // 'ệ' -- 'ệ'
207
+  FONTDATA_ITEM(61, 201, 201, fontpage_61_201_201), // 'ỉ' -- 'ỉ'
208
+  FONTDATA_ITEM(61, 203, 203, fontpage_61_203_203), // 'ị' -- 'ị'
209
+  FONTDATA_ITEM(61, 205, 205, fontpage_61_205_205), // 'ọ' -- 'ọ'
210
+  FONTDATA_ITEM(61, 207, 207, fontpage_61_207_207), // 'ỏ' -- 'ỏ'
211
+  FONTDATA_ITEM(61, 209, 209, fontpage_61_209_209), // 'ố' -- 'ố'
212
+  FONTDATA_ITEM(61, 211, 211, fontpage_61_211_211), // 'ồ' -- 'ồ'
213
+  FONTDATA_ITEM(61, 213, 213, fontpage_61_213_213), // 'ổ' -- 'ổ'
214
+  FONTDATA_ITEM(61, 215, 215, fontpage_61_215_215), // 'ỗ' -- 'ỗ'
215
+  FONTDATA_ITEM(61, 217, 217, fontpage_61_217_217), // 'ộ' -- 'ộ'
216
+  FONTDATA_ITEM(61, 219, 219, fontpage_61_219_219), // 'ớ' -- 'ớ'
217
+  FONTDATA_ITEM(61, 221, 221, fontpage_61_221_221), // 'ờ' -- 'ờ'
218
+  FONTDATA_ITEM(61, 223, 223, fontpage_61_223_223), // 'ở' -- 'ở'
219
+  FONTDATA_ITEM(61, 225, 225, fontpage_61_225_225), // 'ỡ' -- 'ỡ'
220
+  FONTDATA_ITEM(61, 227, 227, fontpage_61_227_227), // 'ợ' -- 'ợ'
221
+  FONTDATA_ITEM(61, 229, 229, fontpage_61_229_229), // 'ụ' -- 'ụ'
222
+  FONTDATA_ITEM(61, 231, 231, fontpage_61_231_231), // 'ủ' -- 'ủ'
223
+  FONTDATA_ITEM(61, 233, 233, fontpage_61_233_233), // 'ứ' -- 'ứ'
224
+  FONTDATA_ITEM(61, 235, 235, fontpage_61_235_235), // 'ừ' -- 'ừ'
225
+  FONTDATA_ITEM(61, 237, 237, fontpage_61_237_237), // 'ử' -- 'ử'
226
+  FONTDATA_ITEM(61, 239, 239, fontpage_61_239_239), // 'ữ' -- 'ữ'
227
+  FONTDATA_ITEM(61, 241, 241, fontpage_61_241_241), // 'ự' -- 'ự'
227 228
 };

+ 360
- 359
Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_64_157_157[26] U8G_FONT_SECTION("fontpage_64_157_157") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9D,0x9D,0x00,0x07,0x00,0x00,
@@ -1462,362 +1464,361 @@ const u8g_fntpgm_uint8_t fontpage_510_154_154[30] U8G_FONT_SECTION("fontpage_510
1462 1464
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9A,0x9A,0x00,0x08,0x00,0x00,
1463 1465
   0x00,0x02,0x07,0x07,0x0C,0x06,0x01,0xC0,0xC0,0x00,0x00,0x00,0xC0,0xC0};
1464 1466
 
1465
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
1466
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
1467
-    FONTDATA_ITEM(64, 157, 157, fontpage_64_157_157), // '”' -- '”'
1468
-    FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
1469
-    FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
1470
-    FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
1471
-    FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
1472
-    FONTDATA_ITEM(156, 147, 147, fontpage_156_147_147), // '专' -- '专'
1473
-    FONTDATA_ITEM(156, 157, 157, fontpage_156_157_157), // '丝' -- '丝'
1474
-    FONTDATA_ITEM(156, 170, 170, fontpage_156_170_170), // '个' -- '个'
1475
-    FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
1476
-    FONTDATA_ITEM(156, 186, 187, fontpage_156_186_187), // '为' -- '主'
1477
-    FONTDATA_ITEM(156, 201, 201, fontpage_156_201_201), // '义' -- '义'
1478
-    FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
1479
-    FONTDATA_ITEM(157, 134, 134, fontpage_157_134_134), // '了' -- '了'
1480
-    FONTDATA_ITEM(157, 140, 140, fontpage_157_140_140), // '二' -- '二'
1481
-    FONTDATA_ITEM(157, 142, 142, fontpage_157_142_142), // '于' -- '于'
1482
-    FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
1483
-    FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
1484
-    FONTDATA_ITEM(157, 206, 206, fontpage_157_206_206), // '从' -- '从'
1485
-    FONTDATA_ITEM(157, 228, 229, fontpage_157_228_229), // '令' -- '以'
1486
-    FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
1487
-    FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
1488
-    FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
1489
-    FONTDATA_ITEM(158, 160, 160, fontpage_158_160_160), // '传' -- '传'
1490
-    FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
1491
-    FONTDATA_ITEM(158, 211, 211, fontpage_158_211_211), // '体' -- '体'
1492
-    FONTDATA_ITEM(158, 217, 217, fontpage_158_217_217), // '余' -- '余'
1493
-    FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
1494
-    FONTDATA_ITEM(158, 255, 255, fontpage_158_255_255), // '使' -- '使'
1495
-    FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
1496
-    FONTDATA_ITEM(159, 181, 181, fontpage_159_181_181), // '侵' -- '侵'
1497
-    FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
1498
-    FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
1499
-    FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
1500
-    FONTDATA_ITEM(160, 190, 190, fontpage_160_190_190), // '倾' -- '倾'
1501
-    FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
1502
-    FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
1503
-    FONTDATA_ITEM(161, 168, 168, fontpage_161_168_168), // '储' -- '储'
1504
-    FONTDATA_ITEM(161, 207, 207, fontpage_161_207_207), // '像' -- '像'
1505
-    FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
1506
-    FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
1507
-    FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
1508
-    FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
1509
-    FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
1510
-    FONTDATA_ITEM(162, 243, 243, fontpage_162_243_243), // '关' -- '关'
1511
-    FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
1512
-    FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
1513
-    FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
1514
-    FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
1515
-    FONTDATA_ITEM(163, 250, 251, fontpage_163_250_251), // '出' -- '击'
1516
-    FONTDATA_ITEM(164, 134, 135, fontpage_164_134_135), // '分' -- '切'
1517
-    FONTDATA_ITEM(164, 155, 155, fontpage_164_155_155), // '创' -- '创'
1518
-    FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
1519
-    FONTDATA_ITEM(164, 171, 171, fontpage_164_171_171), // '别' -- '别'
1520
-    FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
1521
-    FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
1522
-    FONTDATA_ITEM(164, 242, 242, fontpage_164_242_242), // '割' -- '割'
1523
-    FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
1524
-    FONTDATA_ITEM(165, 159, 160, fontpage_165_159_160), // '功' -- '加'
1525
-    FONTDATA_ITEM(165, 168, 168, fontpage_165_168_168), // '动' -- '动'
1526
-    FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
1527
-    FONTDATA_ITEM(166, 199, 199, fontpage_166_199_199), // '升' -- '升'
1528
-    FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
1529
-    FONTDATA_ITEM(166, 207, 207, fontpage_166_207_207), // '协' -- '协'
1530
-    FONTDATA_ITEM(166, 213, 213, fontpage_166_213_213), // '单' -- '单'
1531
-    FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
1532
-    FONTDATA_ITEM(166, 240, 241, fontpage_166_240_241), // '印' -- '危'
1533
-    FONTDATA_ITEM(166, 244, 244, fontpage_166_244_244), // '却' -- '却'
1534
-    FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
1535
-    FONTDATA_ITEM(167, 139, 139, fontpage_167_139_139), // '压' -- '压'
1536
-    FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
1537
-    FONTDATA_ITEM(167, 204, 205, fontpage_167_204_205), // '双' -- '反'
1538
-    FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
1539
-    FONTDATA_ITEM(167, 216, 216, fontpage_167_216_216), // '变' -- '变'
1540
-    FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
1541
-    FONTDATA_ITEM(168, 131, 131, fontpage_168_131_131), // '吃' -- '吃'
1542
-    FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
1543
-    FONTDATA_ITEM(168, 141, 142, fontpage_168_141_142), // '名' -- '后'
1544
-    FONTDATA_ITEM(168, 145, 145, fontpage_168_145_145), // '向' -- '向'
1545
-    FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
1546
-    FONTDATA_ITEM(168, 175, 175, fontpage_168_175_175), // '启' -- '启'
1547
-    FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
1548
-    FONTDATA_ITEM(168, 232, 232, fontpage_168_232_232), // '周' -- '周'
1549
-    FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
1550
-    FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
1551
-    FONTDATA_ITEM(169, 205, 205, fontpage_169_205_205), // '响' -- '响'
1552
-    FONTDATA_ITEM(171, 183, 183, fontpage_171_183_183), // '喷' -- '喷'
1553
-    FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
1554
-    FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
1555
-    FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
1556
-    FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
1557
-    FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
1558
-    FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
1559
-    FONTDATA_ITEM(173, 254, 254, fontpage_173_254_254), // '图' -- '图'
1560
-    FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
1561
-    FONTDATA_ITEM(174, 207, 207, fontpage_174_207_207), // '坏' -- '坏'
1562
-    FONTDATA_ITEM(174, 215, 215, fontpage_174_215_215), // '块' -- '块'
1563
-    FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
1564
-    FONTDATA_ITEM(175, 171, 171, fontpage_175_171_171), // '垫' -- '垫'
1565
-    FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
1566
-    FONTDATA_ITEM(177, 243, 243, fontpage_177_243_243), // '壳' -- '壳'
1567
-    FONTDATA_ITEM(178, 135, 135, fontpage_178_135_135), // '备' -- '备'
1568
-    FONTDATA_ITEM(178, 141, 141, fontpage_178_141_141), // '复' -- '复'
1569
-    FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
1570
-    FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
1571
-    FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
1572
-    FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
1573
-    FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
1574
-    FONTDATA_ITEM(178, 180, 180, fontpage_178_180_180), // '头' -- '头'
1575
-    FONTDATA_ITEM(178, 253, 253, fontpage_178_253_253), // '好' -- '好'
1576
-    FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
1577
-    FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
1578
-    FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
1579
-    FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
1580
-    FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
1581
-    FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
1582
-    FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
1583
-    FONTDATA_ITEM(183, 171, 171, fontpage_183_171_171), // '宫' -- '宫'
1584
-    FONTDATA_ITEM(183, 249, 249, fontpage_183_249_249), // '对' -- '对'
1585
-    FONTDATA_ITEM(184, 134, 134, fontpage_184_134_134), // '将' -- '将'
1586
-    FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
1587
-    FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
1588
-    FONTDATA_ITEM(184, 207, 207, fontpage_184_207_207), // '屏' -- '屏'
1589
-    FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
1590
-    FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
1591
-    FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
1592
-    FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
1593
-    FONTDATA_ITEM(188, 246, 246, fontpage_188_246_246), // '并' -- '并'
1594
-    FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
1595
-    FONTDATA_ITEM(189, 148, 148, fontpage_189_148_148), // '应' -- '应'
1596
-    FONTDATA_ITEM(189, 159, 159, fontpage_189_159_159), // '废' -- '废'
1597
-    FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
1598
-    FONTDATA_ITEM(190, 128, 128, fontpage_190_128_128), // '开' -- '开'
1599
-    FONTDATA_ITEM(190, 131, 131, fontpage_190_131_131), // '弃' -- '弃'
1600
-    FONTDATA_ITEM(190, 143, 143, fontpage_190_143_143), // '式' -- '式'
1601
-    FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
1602
-    FONTDATA_ITEM(190, 185, 185, fontpage_190_185_185), // '弹' -- '弹'
1603
-    FONTDATA_ITEM(190, 210, 210, fontpage_190_210_210), // '归' -- '归'
1604
-    FONTDATA_ITEM(191, 132, 133, fontpage_191_132_133), // '径' -- '待'
1605
-    FONTDATA_ITEM(191, 170, 170, fontpage_191_170_170), // '循' -- '循'
1606
-    FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
1607
-    FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
1608
-    FONTDATA_ITEM(191, 253, 253, fontpage_191_253_253), // '忽' -- '忽'
1609
-    FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
1610
-    FONTDATA_ITEM(192, 187, 187, fontpage_192_187_187), // '总' -- '总'
1611
-    FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
1612
-    FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
1613
-    FONTDATA_ITEM(194, 159, 159, fontpage_194_159_159), // '感' -- '感'
1614
-    FONTDATA_ITEM(196, 143, 144, fontpage_196_143_144), // '戏' -- '成'
1615
-    FONTDATA_ITEM(196, 183, 183, fontpage_196_183_183), // '户' -- '户'
1616
-    FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
1617
-    FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
1618
-    FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
1619
-    FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
1620
-    FONTDATA_ITEM(196, 231, 231, fontpage_196_231_231), // '执' -- '执'
1621
-    FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
1622
-    FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
1623
-    FONTDATA_ITEM(197, 165, 165, fontpage_197_165_165), // '报' -- '报'
1624
-    FONTDATA_ITEM(197, 172, 172, fontpage_197_172_172), // '抬' -- '抬'
1625
-    FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
1626
-    FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
1627
-    FONTDATA_ITEM(197, 233, 233, fontpage_197_233_233), // '择' -- '择'
1628
-    FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
1629
-    FONTDATA_ITEM(198, 161, 161, fontpage_198_161_161), // '挡' -- '挡'
1630
-    FONTDATA_ITEM(198, 164, 164, fontpage_198_164_164), // '挤' -- '挤'
1631
-    FONTDATA_ITEM(198, 223, 223, fontpage_198_223_223), // '损' -- '损'
1632
-    FONTDATA_ITEM(198, 226, 226, fontpage_198_226_226), // '换' -- '换'
1633
-    FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
1634
-    FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
1635
-    FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
1636
-    FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
1637
-    FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
1638
-    FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
1639
-    FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
1640
-    FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
1641
-    FONTDATA_ITEM(202, 240, 240, fontpage_202_240_240), // '数' -- '数'
1642
-    FONTDATA_ITEM(202, 242, 242, fontpage_202_242_242), // '敲' -- '敲'
1643
-    FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
1644
-    FONTDATA_ITEM(203, 135, 135, fontpage_203_135_135), // '文' -- '文'
1645
-    FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
1646
-    FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
1647
-    FONTDATA_ITEM(203, 173, 173, fontpage_203_173_173), // '断' -- '断'
1648
-    FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
1649
-    FONTDATA_ITEM(203, 185, 185, fontpage_203_185_185), // '方' -- '方'
1650
-    FONTDATA_ITEM(203, 224, 224, fontpage_203_224_224), // '无' -- '无'
1651
-    FONTDATA_ITEM(203, 246, 246, fontpage_203_246_246), // '时' -- '时'
1652
-    FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
1653
-    FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
1654
-    FONTDATA_ITEM(205, 130, 130, fontpage_205_130_130), // '暂' -- '暂'
1655
-    FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
1656
-    FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
1657
-    FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
1658
-    FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
1659
-    FONTDATA_ITEM(206, 159, 159, fontpage_206_159_159), // '期' -- '期'
1660
-    FONTDATA_ITEM(206, 186, 186, fontpage_206_186_186), // '机' -- '机'
1661
-    FONTDATA_ITEM(206, 192, 192, fontpage_206_192_192), // '杀' -- '杀'
1662
-    FONTDATA_ITEM(206, 223, 223, fontpage_206_223_223), // '束' -- '束'
1663
-    FONTDATA_ITEM(206, 225, 225, fontpage_206_225_225), // '条' -- '条'
1664
-    FONTDATA_ITEM(206, 229, 229, fontpage_206_229_229), // '来' -- '来'
1665
-    FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
1666
-    FONTDATA_ITEM(207, 151, 151, fontpage_207_151_151), // '林' -- '林'
1667
-    FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
1668
-    FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
1669
-    FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
1670
-    FONTDATA_ITEM(209, 175, 175, fontpage_209_175_175), // '梯' -- '梯'
1671
-    FONTDATA_ITEM(209, 192, 192, fontpage_209_192_192), // '检' -- '检'
1672
-    FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
1673
-    FONTDATA_ITEM(212, 161, 161, fontpage_212_161_161), // '模' -- '模'
1674
-    FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
1675
-    FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
1676
-    FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
1677
-    FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
1678
-    FONTDATA_ITEM(217, 161, 161, fontpage_217_161_161), // '没' -- '没'
1679
-    FONTDATA_ITEM(217, 226, 226, fontpage_217_226_226), // '波' -- '波'
1680
-    FONTDATA_ITEM(217, 232, 232, fontpage_217_232_232), // '注' -- '注'
1681
-    FONTDATA_ITEM(218, 151, 151, fontpage_218_151_151), // '洗' -- '洗'
1682
-    FONTDATA_ITEM(218, 187, 187, fontpage_218_187_187), // '活' -- '活'
1683
-    FONTDATA_ITEM(218, 193, 193, fontpage_218_193_193), // '流' -- '流'
1684
-    FONTDATA_ITEM(218, 203, 203, fontpage_218_203_203), // '测' -- '测'
1685
-    FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
1686
-    FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
1687
-    FONTDATA_ITEM(219, 247, 247, fontpage_219_247_247), // '混' -- '混'
1688
-    FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
1689
-    FONTDATA_ITEM(220, 169, 169, fontpage_220_169_169), // '温' -- '温'
1690
-    FONTDATA_ITEM(220, 184, 184, fontpage_220_184_184), // '游' -- '游'
1691
-    FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
1692
-    FONTDATA_ITEM(221, 162, 162, fontpage_221_162_162), // '溢' -- '溢'
1693
-    FONTDATA_ITEM(221, 209, 209, fontpage_221_209_209), // '滑' -- '滑'
1694
-    FONTDATA_ITEM(222, 143, 143, fontpage_222_143_143), // '漏' -- '漏'
1695
-    FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
1696
-    FONTDATA_ITEM(224, 239, 239, fontpage_224_239_239), // '灯' -- '灯'
1697
-    FONTDATA_ITEM(225, 185, 185, fontpage_225_185_185), // '点' -- '点'
1698
-    FONTDATA_ITEM(225, 237, 237, fontpage_225_237_237), // '热' -- '热'
1699
-    FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
1700
-    FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
1701
-    FONTDATA_ITEM(228, 249, 249, fontpage_228_249_249), // '特' -- '特'
1702
-    FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
1703
-    FONTDATA_ITEM(231, 175, 175, fontpage_231_175_175), // '环' -- '环'
1704
-    FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
1705
-    FONTDATA_ITEM(234, 181, 181, fontpage_234_181_181), // '电' -- '电'
1706
-    FONTDATA_ITEM(234, 229, 229, fontpage_234_229_229), // '略' -- '略'
1707
-    FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
1708
-    FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
1709
-    FONTDATA_ITEM(237, 209, 209, fontpage_237_209_209), // '监' -- '监'
1710
-    FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
1711
-    FONTDATA_ITEM(238, 129, 129, fontpage_238_129_129), // '省' -- '省'
1712
-    FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
1713
-    FONTDATA_ITEM(240, 238, 238, fontpage_240_238_238), // '确' -- '确'
1714
-    FONTDATA_ITEM(243, 187, 187, fontpage_243_187_187), // '离' -- '离'
1715
-    FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
1716
-    FONTDATA_ITEM(244, 250, 250, fontpage_244_250_250), // '空' -- '空'
1717
-    FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
1718
-    FONTDATA_ITEM(246, 172, 172, fontpage_246_172_172), // '第' -- '第'
1719
-    FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
1720
-    FONTDATA_ITEM(247, 128, 128, fontpage_247_128_128), // '简' -- '简'
1721
-    FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
1722
-    FONTDATA_ITEM(248, 251, 251, fontpage_248_251_251), // '类' -- '类'
1723
-    FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
1724
-    FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
1725
-    FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
1726
-    FONTDATA_ITEM(253, 167, 167, fontpage_253_167_167), // '级' -- '级'
1727
-    FONTDATA_ITEM(253, 191, 191, fontpage_253_191_191), // '线' -- '线'
1728
-    FONTDATA_ITEM(253, 198, 198, fontpage_253_198_198), // '细' -- '细'
1729
-    FONTDATA_ITEM(253, 200, 200, fontpage_253_200_200), // '终' -- '终'
1730
-    FONTDATA_ITEM(253, 211, 211, fontpage_253_211_211), // '结' -- '结'
1731
-    FONTDATA_ITEM(253, 217, 217, fontpage_253_217_217), // '给' -- '给'
1732
-    FONTDATA_ITEM(253, 223, 223, fontpage_253_223_223), // '统' -- '统'
1733
-    FONTDATA_ITEM(253, 231, 231, fontpage_253_231_231), // '继' -- '继'
1734
-    FONTDATA_ITEM(253, 234, 234, fontpage_253_234_234), // '绪' -- '绪'
1735
-    FONTDATA_ITEM(253, 237, 237, fontpage_253_237_237), // '续' -- '续'
1736
-    FONTDATA_ITEM(253, 255, 255, fontpage_253_255_255), // '绿' -- '绿'
1737
-    FONTDATA_ITEM(254, 150, 150, fontpage_254_150_150), // '编' -- '编'
1738
-    FONTDATA_ITEM(254, 186, 186, fontpage_254_186_186), // '缺' -- '缺'
1739
-    FONTDATA_ITEM(254, 209, 209, fontpage_254_209_209), // '网' -- '网'
1740
-    FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
1741
-    FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
1742
-    FONTDATA_ITEM(256, 133, 133, fontpage_256_133_133), // '者' -- '者'
1743
-    FONTDATA_ITEM(256, 234, 234, fontpage_256_234_234), // '聪' -- '聪'
1744
-    FONTDATA_ITEM(257, 253, 253, fontpage_257_253_253), // '能' -- '能'
1745
-    FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
1746
-    FONTDATA_ITEM(259, 243, 243, fontpage_259_243_243), // '至' -- '至'
1747
-    FONTDATA_ITEM(263, 220, 220, fontpage_263_220_220), // '菜' -- '菜'
1748
-    FONTDATA_ITEM(265, 221, 221, fontpage_265_221_221), // '蓝' -- '蓝'
1749
-    FONTDATA_ITEM(269, 199, 199, fontpage_269_199_199), // '蛇' -- '蛇'
1750
-    FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
1751
-    FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
1752
-    FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
1753
-    FONTDATA_ITEM(275, 129, 129, fontpage_275_129_129), // '要' -- '要'
1754
-    FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
1755
-    FONTDATA_ITEM(279, 161, 161, fontpage_279_161_161), // '计' -- '计'
1756
-    FONTDATA_ITEM(279, 174, 174, fontpage_279_174_174), // '议' -- '议'
1757
-    FONTDATA_ITEM(279, 190, 190, fontpage_279_190_190), // '设' -- '设'
1758
-    FONTDATA_ITEM(279, 213, 213, fontpage_279_213_213), // '试' -- '试'
1759
-    FONTDATA_ITEM(279, 239, 239, fontpage_279_239_239), // '误' -- '误'
1760
-    FONTDATA_ITEM(279, 247, 247, fontpage_279_247_247), // '请' -- '请'
1761
-    FONTDATA_ITEM(279, 251, 251, fontpage_279_251_251), // '读' -- '读'
1762
-    FONTDATA_ITEM(280, 131, 131, fontpage_280_131_131), // '调' -- '调'
1763
-    FONTDATA_ITEM(282, 165, 165, fontpage_282_165_165), // '败' -- '败'
1764
-    FONTDATA_ITEM(282, 170, 170, fontpage_282_170_170), // '贪' -- '贪'
1765
-    FONTDATA_ITEM(282, 247, 247, fontpage_282_247_247), // '起' -- '起'
1766
-    FONTDATA_ITEM(283, 133, 133, fontpage_283_133_133), // '超' -- '超'
1767
-    FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
1768
-    FONTDATA_ITEM(286, 236, 236, fontpage_286_236_236), // '转' -- '转'
1769
-    FONTDATA_ITEM(286, 239, 239, fontpage_286_239_239), // '软' -- '软'
1770
-    FONTDATA_ITEM(286, 244, 244, fontpage_286_244_244), // '轴' -- '轴'
1771
-    FONTDATA_ITEM(286, 253, 253, fontpage_286_253_253), // '载' -- '载'
1772
-    FONTDATA_ITEM(287, 145, 145, fontpage_287_145_145), // '辑' -- '辑'
1773
-    FONTDATA_ITEM(287, 147, 147, fontpage_287_147_147), // '输' -- '输'
1774
-    FONTDATA_ITEM(287, 185, 185, fontpage_287_185_185), // '边' -- '边'
1775
-    FONTDATA_ITEM(287, 193, 193, fontpage_287_193_193), // '迁' -- '迁'
1776
-    FONTDATA_ITEM(287, 208, 209, fontpage_287_208_209), // '运' -- '近'
1777
-    FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
1778
-    FONTDATA_ITEM(287, 216, 216, fontpage_287_216_216), // '还' -- '还'
1779
-    FONTDATA_ITEM(287, 219, 219, fontpage_287_219_219), // '进' -- '进'
1780
-    FONTDATA_ITEM(287, 222, 222, fontpage_287_222_222), // '连' -- '连'
1781
-    FONTDATA_ITEM(287, 247, 247, fontpage_287_247_247), // '迷' -- '迷'
1782
-    FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
1783
-    FONTDATA_ITEM(288, 137, 137, fontpage_288_137_137), // '选' -- '选'
1784
-    FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
1785
-    FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
1786
-    FONTDATA_ITEM(290, 205, 205, fontpage_290_205_205), // '配' -- '配'
1787
-    FONTDATA_ITEM(291, 202, 202, fontpage_291_202_202), // '释' -- '释'
1788
-    FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
1789
-    FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
1790
-    FONTDATA_ITEM(297, 136, 136, fontpage_297_136_136), // '针' -- '针'
1791
-    FONTDATA_ITEM(297, 174, 174, fontpage_297_174_174), // '钮' -- '钮'
1792
-    FONTDATA_ITEM(298, 153, 153, fontpage_298_153_153), // '错' -- '错'
1793
-    FONTDATA_ITEM(298, 220, 220, fontpage_298_220_220), // '镜' -- '镜'
1794
-    FONTDATA_ITEM(298, 255, 255, fontpage_298_255_255), // '长' -- '长'
1795
-    FONTDATA_ITEM(299, 237, 237, fontpage_299_237_237), // '闭' -- '闭'
1796
-    FONTDATA_ITEM(299, 242, 242, fontpage_299_242_242), // '闲' -- '闲'
1797
-    FONTDATA_ITEM(299, 244, 244, fontpage_299_244_244), // '间' -- '间'
1798
-    FONTDATA_ITEM(300, 136, 136, fontpage_300_136_136), // '阈' -- '阈'
1799
-    FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
1800
-    FONTDATA_ITEM(300, 208, 208, fontpage_300_208_208), // '限' -- '限'
1801
-    FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
1802
-    FONTDATA_ITEM(300, 233, 233, fontpage_300_233_233), // '险' -- '险'
1803
-    FONTDATA_ITEM(301, 246, 246, fontpage_301_246_246), // '零' -- '零'
1804
-    FONTDATA_ITEM(302, 128, 128, fontpage_302_128_128), // '需' -- '需'
1805
-    FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
1806
-    FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
1807
-    FONTDATA_ITEM(302, 224, 224, fontpage_302_224_224), // '靠' -- '靠'
1808
-    FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
1809
-    FONTDATA_ITEM(304, 245, 245, fontpage_304_245_245), // '页' -- '页'
1810
-    FONTDATA_ITEM(304, 249, 249, fontpage_304_249_249), // '项' -- '项'
1811
-    FONTDATA_ITEM(305, 132, 132, fontpage_305_132_132), // '预' -- '预'
1812
-    FONTDATA_ITEM(305, 145, 145, fontpage_305_145_145), // '频' -- '频'
1813
-    FONTDATA_ITEM(305, 157, 157, fontpage_305_157_157), // '额' -- '额'
1814
-    FONTDATA_ITEM(305, 206, 206, fontpage_305_206_206), // '风' -- '风'
1815
-    FONTDATA_ITEM(306, 241, 241, fontpage_306_241_241), // '饱' -- '饱'
1816
-    FONTDATA_ITEM(308, 236, 236, fontpage_308_236_236), // '马' -- '马'
1817
-    FONTDATA_ITEM(308, 241, 241, fontpage_308_241_241), // '驱' -- '驱'
1818
-    FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
1819
-    FONTDATA_ITEM(317, 196, 196, fontpage_317_196_196), // '黄' -- '黄'
1820
-    FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
1821
-    FONTDATA_ITEM(318, 208, 208, fontpage_318_208_208), // '齐' -- '齐'
1822
-    FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // ':' -- ':'
1467
+static const uxg_fontinfo_t g_fontinfo_zh_CN[] PROGMEM = {
1468
+  FONTDATA_ITEM(64, 157, 157, fontpage_64_157_157), // '”' -- '”'
1469
+  FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
1470
+  FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
1471
+  FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
1472
+  FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
1473
+  FONTDATA_ITEM(156, 147, 147, fontpage_156_147_147), // '专' -- '专'
1474
+  FONTDATA_ITEM(156, 157, 157, fontpage_156_157_157), // '丝' -- '丝'
1475
+  FONTDATA_ITEM(156, 170, 170, fontpage_156_170_170), // '个' -- '个'
1476
+  FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
1477
+  FONTDATA_ITEM(156, 186, 187, fontpage_156_186_187), // '为' -- '主'
1478
+  FONTDATA_ITEM(156, 201, 201, fontpage_156_201_201), // '义' -- '义'
1479
+  FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
1480
+  FONTDATA_ITEM(157, 134, 134, fontpage_157_134_134), // '了' -- '了'
1481
+  FONTDATA_ITEM(157, 140, 140, fontpage_157_140_140), // '二' -- '二'
1482
+  FONTDATA_ITEM(157, 142, 142, fontpage_157_142_142), // '于' -- '于'
1483
+  FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
1484
+  FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
1485
+  FONTDATA_ITEM(157, 206, 206, fontpage_157_206_206), // '从' -- '从'
1486
+  FONTDATA_ITEM(157, 228, 229, fontpage_157_228_229), // '令' -- '以'
1487
+  FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
1488
+  FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
1489
+  FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
1490
+  FONTDATA_ITEM(158, 160, 160, fontpage_158_160_160), // '传' -- '传'
1491
+  FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
1492
+  FONTDATA_ITEM(158, 211, 211, fontpage_158_211_211), // '体' -- '体'
1493
+  FONTDATA_ITEM(158, 217, 217, fontpage_158_217_217), // '余' -- '余'
1494
+  FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
1495
+  FONTDATA_ITEM(158, 255, 255, fontpage_158_255_255), // '使' -- '使'
1496
+  FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
1497
+  FONTDATA_ITEM(159, 181, 181, fontpage_159_181_181), // '侵' -- '侵'
1498
+  FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
1499
+  FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
1500
+  FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
1501
+  FONTDATA_ITEM(160, 190, 190, fontpage_160_190_190), // '倾' -- '倾'
1502
+  FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
1503
+  FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
1504
+  FONTDATA_ITEM(161, 168, 168, fontpage_161_168_168), // '储' -- '储'
1505
+  FONTDATA_ITEM(161, 207, 207, fontpage_161_207_207), // '像' -- '像'
1506
+  FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
1507
+  FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
1508
+  FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
1509
+  FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
1510
+  FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
1511
+  FONTDATA_ITEM(162, 243, 243, fontpage_162_243_243), // '关' -- '关'
1512
+  FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
1513
+  FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
1514
+  FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
1515
+  FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
1516
+  FONTDATA_ITEM(163, 250, 251, fontpage_163_250_251), // '出' -- '击'
1517
+  FONTDATA_ITEM(164, 134, 135, fontpage_164_134_135), // '分' -- '切'
1518
+  FONTDATA_ITEM(164, 155, 155, fontpage_164_155_155), // '创' -- '创'
1519
+  FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
1520
+  FONTDATA_ITEM(164, 171, 171, fontpage_164_171_171), // '别' -- '别'
1521
+  FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
1522
+  FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
1523
+  FONTDATA_ITEM(164, 242, 242, fontpage_164_242_242), // '割' -- '割'
1524
+  FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
1525
+  FONTDATA_ITEM(165, 159, 160, fontpage_165_159_160), // '功' -- '加'
1526
+  FONTDATA_ITEM(165, 168, 168, fontpage_165_168_168), // '动' -- '动'
1527
+  FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
1528
+  FONTDATA_ITEM(166, 199, 199, fontpage_166_199_199), // '升' -- '升'
1529
+  FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
1530
+  FONTDATA_ITEM(166, 207, 207, fontpage_166_207_207), // '协' -- '协'
1531
+  FONTDATA_ITEM(166, 213, 213, fontpage_166_213_213), // '单' -- '单'
1532
+  FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
1533
+  FONTDATA_ITEM(166, 240, 241, fontpage_166_240_241), // '印' -- '危'
1534
+  FONTDATA_ITEM(166, 244, 244, fontpage_166_244_244), // '却' -- '却'
1535
+  FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
1536
+  FONTDATA_ITEM(167, 139, 139, fontpage_167_139_139), // '压' -- '压'
1537
+  FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
1538
+  FONTDATA_ITEM(167, 204, 205, fontpage_167_204_205), // '双' -- '反'
1539
+  FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
1540
+  FONTDATA_ITEM(167, 216, 216, fontpage_167_216_216), // '变' -- '变'
1541
+  FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
1542
+  FONTDATA_ITEM(168, 131, 131, fontpage_168_131_131), // '吃' -- '吃'
1543
+  FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
1544
+  FONTDATA_ITEM(168, 141, 142, fontpage_168_141_142), // '名' -- '后'
1545
+  FONTDATA_ITEM(168, 145, 145, fontpage_168_145_145), // '向' -- '向'
1546
+  FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
1547
+  FONTDATA_ITEM(168, 175, 175, fontpage_168_175_175), // '启' -- '启'
1548
+  FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
1549
+  FONTDATA_ITEM(168, 232, 232, fontpage_168_232_232), // '周' -- '周'
1550
+  FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
1551
+  FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
1552
+  FONTDATA_ITEM(169, 205, 205, fontpage_169_205_205), // '响' -- '响'
1553
+  FONTDATA_ITEM(171, 183, 183, fontpage_171_183_183), // '喷' -- '喷'
1554
+  FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
1555
+  FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
1556
+  FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
1557
+  FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
1558
+  FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
1559
+  FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
1560
+  FONTDATA_ITEM(173, 254, 254, fontpage_173_254_254), // '图' -- '图'
1561
+  FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
1562
+  FONTDATA_ITEM(174, 207, 207, fontpage_174_207_207), // '坏' -- '坏'
1563
+  FONTDATA_ITEM(174, 215, 215, fontpage_174_215_215), // '块' -- '块'
1564
+  FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
1565
+  FONTDATA_ITEM(175, 171, 171, fontpage_175_171_171), // '垫' -- '垫'
1566
+  FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
1567
+  FONTDATA_ITEM(177, 243, 243, fontpage_177_243_243), // '壳' -- '壳'
1568
+  FONTDATA_ITEM(178, 135, 135, fontpage_178_135_135), // '备' -- '备'
1569
+  FONTDATA_ITEM(178, 141, 141, fontpage_178_141_141), // '复' -- '复'
1570
+  FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
1571
+  FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
1572
+  FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
1573
+  FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
1574
+  FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
1575
+  FONTDATA_ITEM(178, 180, 180, fontpage_178_180_180), // '头' -- '头'
1576
+  FONTDATA_ITEM(178, 253, 253, fontpage_178_253_253), // '好' -- '好'
1577
+  FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
1578
+  FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
1579
+  FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
1580
+  FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
1581
+  FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
1582
+  FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
1583
+  FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
1584
+  FONTDATA_ITEM(183, 171, 171, fontpage_183_171_171), // '宫' -- '宫'
1585
+  FONTDATA_ITEM(183, 249, 249, fontpage_183_249_249), // '对' -- '对'
1586
+  FONTDATA_ITEM(184, 134, 134, fontpage_184_134_134), // '将' -- '将'
1587
+  FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
1588
+  FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
1589
+  FONTDATA_ITEM(184, 207, 207, fontpage_184_207_207), // '屏' -- '屏'
1590
+  FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
1591
+  FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
1592
+  FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
1593
+  FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
1594
+  FONTDATA_ITEM(188, 246, 246, fontpage_188_246_246), // '并' -- '并'
1595
+  FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
1596
+  FONTDATA_ITEM(189, 148, 148, fontpage_189_148_148), // '应' -- '应'
1597
+  FONTDATA_ITEM(189, 159, 159, fontpage_189_159_159), // '废' -- '废'
1598
+  FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
1599
+  FONTDATA_ITEM(190, 128, 128, fontpage_190_128_128), // '开' -- '开'
1600
+  FONTDATA_ITEM(190, 131, 131, fontpage_190_131_131), // '弃' -- '弃'
1601
+  FONTDATA_ITEM(190, 143, 143, fontpage_190_143_143), // '式' -- '式'
1602
+  FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
1603
+  FONTDATA_ITEM(190, 185, 185, fontpage_190_185_185), // '弹' -- '弹'
1604
+  FONTDATA_ITEM(190, 210, 210, fontpage_190_210_210), // '归' -- '归'
1605
+  FONTDATA_ITEM(191, 132, 133, fontpage_191_132_133), // '径' -- '待'
1606
+  FONTDATA_ITEM(191, 170, 170, fontpage_191_170_170), // '循' -- '循'
1607
+  FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
1608
+  FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
1609
+  FONTDATA_ITEM(191, 253, 253, fontpage_191_253_253), // '忽' -- '忽'
1610
+  FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
1611
+  FONTDATA_ITEM(192, 187, 187, fontpage_192_187_187), // '总' -- '总'
1612
+  FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
1613
+  FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
1614
+  FONTDATA_ITEM(194, 159, 159, fontpage_194_159_159), // '感' -- '感'
1615
+  FONTDATA_ITEM(196, 143, 144, fontpage_196_143_144), // '戏' -- '成'
1616
+  FONTDATA_ITEM(196, 183, 183, fontpage_196_183_183), // '户' -- '户'
1617
+  FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
1618
+  FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
1619
+  FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
1620
+  FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
1621
+  FONTDATA_ITEM(196, 231, 231, fontpage_196_231_231), // '执' -- '执'
1622
+  FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
1623
+  FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
1624
+  FONTDATA_ITEM(197, 165, 165, fontpage_197_165_165), // '报' -- '报'
1625
+  FONTDATA_ITEM(197, 172, 172, fontpage_197_172_172), // '抬' -- '抬'
1626
+  FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
1627
+  FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
1628
+  FONTDATA_ITEM(197, 233, 233, fontpage_197_233_233), // '择' -- '择'
1629
+  FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
1630
+  FONTDATA_ITEM(198, 161, 161, fontpage_198_161_161), // '挡' -- '挡'
1631
+  FONTDATA_ITEM(198, 164, 164, fontpage_198_164_164), // '挤' -- '挤'
1632
+  FONTDATA_ITEM(198, 223, 223, fontpage_198_223_223), // '损' -- '损'
1633
+  FONTDATA_ITEM(198, 226, 226, fontpage_198_226_226), // '换' -- '换'
1634
+  FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
1635
+  FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
1636
+  FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
1637
+  FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
1638
+  FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
1639
+  FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
1640
+  FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
1641
+  FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
1642
+  FONTDATA_ITEM(202, 240, 240, fontpage_202_240_240), // '数' -- '数'
1643
+  FONTDATA_ITEM(202, 242, 242, fontpage_202_242_242), // '敲' -- '敲'
1644
+  FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
1645
+  FONTDATA_ITEM(203, 135, 135, fontpage_203_135_135), // '文' -- '文'
1646
+  FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
1647
+  FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
1648
+  FONTDATA_ITEM(203, 173, 173, fontpage_203_173_173), // '断' -- '断'
1649
+  FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
1650
+  FONTDATA_ITEM(203, 185, 185, fontpage_203_185_185), // '方' -- '方'
1651
+  FONTDATA_ITEM(203, 224, 224, fontpage_203_224_224), // '无' -- '无'
1652
+  FONTDATA_ITEM(203, 246, 246, fontpage_203_246_246), // '时' -- '时'
1653
+  FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
1654
+  FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
1655
+  FONTDATA_ITEM(205, 130, 130, fontpage_205_130_130), // '暂' -- '暂'
1656
+  FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
1657
+  FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
1658
+  FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
1659
+  FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
1660
+  FONTDATA_ITEM(206, 159, 159, fontpage_206_159_159), // '期' -- '期'
1661
+  FONTDATA_ITEM(206, 186, 186, fontpage_206_186_186), // '机' -- '机'
1662
+  FONTDATA_ITEM(206, 192, 192, fontpage_206_192_192), // '杀' -- '杀'
1663
+  FONTDATA_ITEM(206, 223, 223, fontpage_206_223_223), // '束' -- '束'
1664
+  FONTDATA_ITEM(206, 225, 225, fontpage_206_225_225), // '条' -- '条'
1665
+  FONTDATA_ITEM(206, 229, 229, fontpage_206_229_229), // '来' -- '来'
1666
+  FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
1667
+  FONTDATA_ITEM(207, 151, 151, fontpage_207_151_151), // '林' -- '林'
1668
+  FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
1669
+  FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
1670
+  FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
1671
+  FONTDATA_ITEM(209, 175, 175, fontpage_209_175_175), // '梯' -- '梯'
1672
+  FONTDATA_ITEM(209, 192, 192, fontpage_209_192_192), // '检' -- '检'
1673
+  FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
1674
+  FONTDATA_ITEM(212, 161, 161, fontpage_212_161_161), // '模' -- '模'
1675
+  FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
1676
+  FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
1677
+  FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
1678
+  FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
1679
+  FONTDATA_ITEM(217, 161, 161, fontpage_217_161_161), // '没' -- '没'
1680
+  FONTDATA_ITEM(217, 226, 226, fontpage_217_226_226), // '波' -- '波'
1681
+  FONTDATA_ITEM(217, 232, 232, fontpage_217_232_232), // '注' -- '注'
1682
+  FONTDATA_ITEM(218, 151, 151, fontpage_218_151_151), // '洗' -- '洗'
1683
+  FONTDATA_ITEM(218, 187, 187, fontpage_218_187_187), // '活' -- '活'
1684
+  FONTDATA_ITEM(218, 193, 193, fontpage_218_193_193), // '流' -- '流'
1685
+  FONTDATA_ITEM(218, 203, 203, fontpage_218_203_203), // '测' -- '测'
1686
+  FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
1687
+  FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
1688
+  FONTDATA_ITEM(219, 247, 247, fontpage_219_247_247), // '混' -- '混'
1689
+  FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
1690
+  FONTDATA_ITEM(220, 169, 169, fontpage_220_169_169), // '温' -- '温'
1691
+  FONTDATA_ITEM(220, 184, 184, fontpage_220_184_184), // '游' -- '游'
1692
+  FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
1693
+  FONTDATA_ITEM(221, 162, 162, fontpage_221_162_162), // '溢' -- '溢'
1694
+  FONTDATA_ITEM(221, 209, 209, fontpage_221_209_209), // '滑' -- '滑'
1695
+  FONTDATA_ITEM(222, 143, 143, fontpage_222_143_143), // '漏' -- '漏'
1696
+  FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
1697
+  FONTDATA_ITEM(224, 239, 239, fontpage_224_239_239), // '灯' -- '灯'
1698
+  FONTDATA_ITEM(225, 185, 185, fontpage_225_185_185), // '点' -- '点'
1699
+  FONTDATA_ITEM(225, 237, 237, fontpage_225_237_237), // '热' -- '热'
1700
+  FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
1701
+  FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
1702
+  FONTDATA_ITEM(228, 249, 249, fontpage_228_249_249), // '特' -- '特'
1703
+  FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
1704
+  FONTDATA_ITEM(231, 175, 175, fontpage_231_175_175), // '环' -- '环'
1705
+  FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
1706
+  FONTDATA_ITEM(234, 181, 181, fontpage_234_181_181), // '电' -- '电'
1707
+  FONTDATA_ITEM(234, 229, 229, fontpage_234_229_229), // '略' -- '略'
1708
+  FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
1709
+  FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
1710
+  FONTDATA_ITEM(237, 209, 209, fontpage_237_209_209), // '监' -- '监'
1711
+  FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
1712
+  FONTDATA_ITEM(238, 129, 129, fontpage_238_129_129), // '省' -- '省'
1713
+  FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
1714
+  FONTDATA_ITEM(240, 238, 238, fontpage_240_238_238), // '确' -- '确'
1715
+  FONTDATA_ITEM(243, 187, 187, fontpage_243_187_187), // '离' -- '离'
1716
+  FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
1717
+  FONTDATA_ITEM(244, 250, 250, fontpage_244_250_250), // '空' -- '空'
1718
+  FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
1719
+  FONTDATA_ITEM(246, 172, 172, fontpage_246_172_172), // '第' -- '第'
1720
+  FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
1721
+  FONTDATA_ITEM(247, 128, 128, fontpage_247_128_128), // '简' -- '简'
1722
+  FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
1723
+  FONTDATA_ITEM(248, 251, 251, fontpage_248_251_251), // '类' -- '类'
1724
+  FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
1725
+  FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
1726
+  FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
1727
+  FONTDATA_ITEM(253, 167, 167, fontpage_253_167_167), // '级' -- '级'
1728
+  FONTDATA_ITEM(253, 191, 191, fontpage_253_191_191), // '线' -- '线'
1729
+  FONTDATA_ITEM(253, 198, 198, fontpage_253_198_198), // '细' -- '细'
1730
+  FONTDATA_ITEM(253, 200, 200, fontpage_253_200_200), // '终' -- '终'
1731
+  FONTDATA_ITEM(253, 211, 211, fontpage_253_211_211), // '结' -- '结'
1732
+  FONTDATA_ITEM(253, 217, 217, fontpage_253_217_217), // '给' -- '给'
1733
+  FONTDATA_ITEM(253, 223, 223, fontpage_253_223_223), // '统' -- '统'
1734
+  FONTDATA_ITEM(253, 231, 231, fontpage_253_231_231), // '继' -- '继'
1735
+  FONTDATA_ITEM(253, 234, 234, fontpage_253_234_234), // '绪' -- '绪'
1736
+  FONTDATA_ITEM(253, 237, 237, fontpage_253_237_237), // '续' -- '续'
1737
+  FONTDATA_ITEM(253, 255, 255, fontpage_253_255_255), // '绿' -- '绿'
1738
+  FONTDATA_ITEM(254, 150, 150, fontpage_254_150_150), // '编' -- '编'
1739
+  FONTDATA_ITEM(254, 186, 186, fontpage_254_186_186), // '缺' -- '缺'
1740
+  FONTDATA_ITEM(254, 209, 209, fontpage_254_209_209), // '网' -- '网'
1741
+  FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
1742
+  FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
1743
+  FONTDATA_ITEM(256, 133, 133, fontpage_256_133_133), // '者' -- '者'
1744
+  FONTDATA_ITEM(256, 234, 234, fontpage_256_234_234), // '聪' -- '聪'
1745
+  FONTDATA_ITEM(257, 253, 253, fontpage_257_253_253), // '能' -- '能'
1746
+  FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
1747
+  FONTDATA_ITEM(259, 243, 243, fontpage_259_243_243), // '至' -- '至'
1748
+  FONTDATA_ITEM(263, 220, 220, fontpage_263_220_220), // '菜' -- '菜'
1749
+  FONTDATA_ITEM(265, 221, 221, fontpage_265_221_221), // '蓝' -- '蓝'
1750
+  FONTDATA_ITEM(269, 199, 199, fontpage_269_199_199), // '蛇' -- '蛇'
1751
+  FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
1752
+  FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
1753
+  FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
1754
+  FONTDATA_ITEM(275, 129, 129, fontpage_275_129_129), // '要' -- '要'
1755
+  FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
1756
+  FONTDATA_ITEM(279, 161, 161, fontpage_279_161_161), // '计' -- '计'
1757
+  FONTDATA_ITEM(279, 174, 174, fontpage_279_174_174), // '议' -- '议'
1758
+  FONTDATA_ITEM(279, 190, 190, fontpage_279_190_190), // '设' -- '设'
1759
+  FONTDATA_ITEM(279, 213, 213, fontpage_279_213_213), // '试' -- '试'
1760
+  FONTDATA_ITEM(279, 239, 239, fontpage_279_239_239), // '误' -- '误'
1761
+  FONTDATA_ITEM(279, 247, 247, fontpage_279_247_247), // '请' -- '请'
1762
+  FONTDATA_ITEM(279, 251, 251, fontpage_279_251_251), // '读' -- '读'
1763
+  FONTDATA_ITEM(280, 131, 131, fontpage_280_131_131), // '调' -- '调'
1764
+  FONTDATA_ITEM(282, 165, 165, fontpage_282_165_165), // '败' -- '败'
1765
+  FONTDATA_ITEM(282, 170, 170, fontpage_282_170_170), // '贪' -- '贪'
1766
+  FONTDATA_ITEM(282, 247, 247, fontpage_282_247_247), // '起' -- '起'
1767
+  FONTDATA_ITEM(283, 133, 133, fontpage_283_133_133), // '超' -- '超'
1768
+  FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
1769
+  FONTDATA_ITEM(286, 236, 236, fontpage_286_236_236), // '转' -- '转'
1770
+  FONTDATA_ITEM(286, 239, 239, fontpage_286_239_239), // '软' -- '软'
1771
+  FONTDATA_ITEM(286, 244, 244, fontpage_286_244_244), // '轴' -- '轴'
1772
+  FONTDATA_ITEM(286, 253, 253, fontpage_286_253_253), // '载' -- '载'
1773
+  FONTDATA_ITEM(287, 145, 145, fontpage_287_145_145), // '辑' -- '辑'
1774
+  FONTDATA_ITEM(287, 147, 147, fontpage_287_147_147), // '输' -- '输'
1775
+  FONTDATA_ITEM(287, 185, 185, fontpage_287_185_185), // '边' -- '边'
1776
+  FONTDATA_ITEM(287, 193, 193, fontpage_287_193_193), // '迁' -- '迁'
1777
+  FONTDATA_ITEM(287, 208, 209, fontpage_287_208_209), // '运' -- '近'
1778
+  FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
1779
+  FONTDATA_ITEM(287, 216, 216, fontpage_287_216_216), // '还' -- '还'
1780
+  FONTDATA_ITEM(287, 219, 219, fontpage_287_219_219), // '进' -- '进'
1781
+  FONTDATA_ITEM(287, 222, 222, fontpage_287_222_222), // '连' -- '连'
1782
+  FONTDATA_ITEM(287, 247, 247, fontpage_287_247_247), // '迷' -- '迷'
1783
+  FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
1784
+  FONTDATA_ITEM(288, 137, 137, fontpage_288_137_137), // '选' -- '选'
1785
+  FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
1786
+  FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
1787
+  FONTDATA_ITEM(290, 205, 205, fontpage_290_205_205), // '配' -- '配'
1788
+  FONTDATA_ITEM(291, 202, 202, fontpage_291_202_202), // '释' -- '释'
1789
+  FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
1790
+  FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
1791
+  FONTDATA_ITEM(297, 136, 136, fontpage_297_136_136), // '针' -- '针'
1792
+  FONTDATA_ITEM(297, 174, 174, fontpage_297_174_174), // '钮' -- '钮'
1793
+  FONTDATA_ITEM(298, 153, 153, fontpage_298_153_153), // '错' -- '错'
1794
+  FONTDATA_ITEM(298, 220, 220, fontpage_298_220_220), // '镜' -- '镜'
1795
+  FONTDATA_ITEM(298, 255, 255, fontpage_298_255_255), // '长' -- '长'
1796
+  FONTDATA_ITEM(299, 237, 237, fontpage_299_237_237), // '闭' -- '闭'
1797
+  FONTDATA_ITEM(299, 242, 242, fontpage_299_242_242), // '闲' -- '闲'
1798
+  FONTDATA_ITEM(299, 244, 244, fontpage_299_244_244), // '间' -- '间'
1799
+  FONTDATA_ITEM(300, 136, 136, fontpage_300_136_136), // '阈' -- '阈'
1800
+  FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
1801
+  FONTDATA_ITEM(300, 208, 208, fontpage_300_208_208), // '限' -- '限'
1802
+  FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
1803
+  FONTDATA_ITEM(300, 233, 233, fontpage_300_233_233), // '险' -- '险'
1804
+  FONTDATA_ITEM(301, 246, 246, fontpage_301_246_246), // '零' -- '零'
1805
+  FONTDATA_ITEM(302, 128, 128, fontpage_302_128_128), // '需' -- '需'
1806
+  FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
1807
+  FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
1808
+  FONTDATA_ITEM(302, 224, 224, fontpage_302_224_224), // '靠' -- '靠'
1809
+  FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
1810
+  FONTDATA_ITEM(304, 245, 245, fontpage_304_245_245), // '页' -- '页'
1811
+  FONTDATA_ITEM(304, 249, 249, fontpage_304_249_249), // '项' -- '项'
1812
+  FONTDATA_ITEM(305, 132, 132, fontpage_305_132_132), // '预' -- '预'
1813
+  FONTDATA_ITEM(305, 145, 145, fontpage_305_145_145), // '频' -- '频'
1814
+  FONTDATA_ITEM(305, 157, 157, fontpage_305_157_157), // '额' -- '额'
1815
+  FONTDATA_ITEM(305, 206, 206, fontpage_305_206_206), // '风' -- '风'
1816
+  FONTDATA_ITEM(306, 241, 241, fontpage_306_241_241), // '饱' -- '饱'
1817
+  FONTDATA_ITEM(308, 236, 236, fontpage_308_236_236), // '马' -- '马'
1818
+  FONTDATA_ITEM(308, 241, 241, fontpage_308_241_241), // '驱' -- '驱'
1819
+  FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
1820
+  FONTDATA_ITEM(317, 196, 196, fontpage_317_196_196), // '黄' -- '黄'
1821
+  FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
1822
+  FONTDATA_ITEM(318, 208, 208, fontpage_318_208_208), // '齐' -- '齐'
1823
+  FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // ':' -- ':'
1823 1824
 };

+ 303
- 302
Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h Ver fichero

@@ -3,7 +3,9 @@
3 3
  * Contents will be REPLACED by future processing!
4 4
  * Use genallfont.sh to generate font data for updated languages.
5 5
  */
6
-#include <U8glib-HAL.h>
6
+#pragma once
7
+
8
+#include "langdata.h"
7 9
 
8 10
 const u8g_fntpgm_uint8_t fontpage_69_191_191[28] U8G_FONT_SECTION("fontpage_69_191_191") = {
9 11
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x05,0x00,0x00,
@@ -1217,305 +1219,304 @@ const u8g_fntpgm_uint8_t fontpage_510_154_154[30] U8G_FONT_SECTION("fontpage_510
1217 1219
   0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9A,0x9A,0x00,0x08,0x00,0x00,
1218 1220
   0x00,0x02,0x07,0x07,0x0C,0x06,0x01,0xC0,0xC0,0x00,0x00,0x00,0xC0,0xC0};
1219 1221
 
1220
-#define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
1221
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
1222
-    FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
1223
-    FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
1224
-    FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
1225
-    FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
1226
-    FONTDATA_ITEM(156, 166, 166, fontpage_156_166_166), // '並' -- '並'
1227
-    FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
1228
-    FONTDATA_ITEM(156, 187, 187, fontpage_156_187_187), // '主' -- '主'
1229
-    FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
1230
-    FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
1231
-    FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
1232
-    FONTDATA_ITEM(157, 228, 228, fontpage_157_228_228), // '令' -- '令'
1233
-    FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
1234
-    FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
1235
-    FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
1236
-    FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
1237
-    FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
1238
-    FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
1239
-    FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
1240
-    FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
1241
-    FONTDATA_ITEM(160, 139, 139, fontpage_160_139_139), // '個' -- '個'
1242
-    FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
1243
-    FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
1244
-    FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
1245
-    FONTDATA_ITEM(160, 245, 245, fontpage_160_245_245), // '偵' -- '偵'
1246
-    FONTDATA_ITEM(161, 153, 153, fontpage_161_153_153), // '備' -- '備'
1247
-    FONTDATA_ITEM(161, 179, 179, fontpage_161_179_179), // '傳' -- '傳'
1248
-    FONTDATA_ITEM(161, 190, 190, fontpage_161_190_190), // '傾' -- '傾'
1249
-    FONTDATA_ITEM(162, 178, 178, fontpage_162_178_178), // '儲' -- '儲'
1250
-    FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
1251
-    FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
1252
-    FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
1253
-    FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
1254
-    FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
1255
-    FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
1256
-    FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
1257
-    FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
1258
-    FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
1259
-    FONTDATA_ITEM(163, 250, 250, fontpage_163_250_250), // '出' -- '出'
1260
-    FONTDATA_ITEM(164, 134, 134, fontpage_164_134_134), // '分' -- '分'
1261
-    FONTDATA_ITEM(164, 151, 151, fontpage_164_151_151), // '列' -- '列'
1262
-    FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
1263
-    FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
1264
-    FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
1265
-    FONTDATA_ITEM(164, 245, 245, fontpage_164_245_245), // '創' -- '創'
1266
-    FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
1267
-    FONTDATA_ITEM(165, 160, 160, fontpage_165_160_160), // '加' -- '加'
1268
-    FONTDATA_ITEM(165, 213, 213, fontpage_165_213_213), // '動' -- '動'
1269
-    FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
1270
-    FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
1271
-    FONTDATA_ITEM(166, 212, 212, fontpage_166_212_212), // '協' -- '協'
1272
-    FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
1273
-    FONTDATA_ITEM(166, 240, 240, fontpage_166_240_240), // '印' -- '印'
1274
-    FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
1275
-    FONTDATA_ITEM(166, 251, 251, fontpage_166_251_251), // '卻' -- '卻'
1276
-    FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
1277
-    FONTDATA_ITEM(167, 205, 205, fontpage_167_205_205), // '反' -- '反'
1278
-    FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
1279
-    FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
1280
-    FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
1281
-    FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
1282
-    FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
1283
-    FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
1284
-    FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
1285
-    FONTDATA_ITEM(170, 223, 223, fontpage_170_223_223), // '啟' -- '啟'
1286
-    FONTDATA_ITEM(171, 174, 174, fontpage_171_174_174), // '單' -- '單'
1287
-    FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
1288
-    FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
1289
-    FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
1290
-    FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
1291
-    FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
1292
-    FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
1293
-    FONTDATA_ITEM(174, 150, 150, fontpage_174_150_150), // '圖' -- '圖'
1294
-    FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
1295
-    FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
1296
-    FONTDATA_ITEM(175, 247, 247, fontpage_175_247_247), // '執' -- '執'
1297
-    FONTDATA_ITEM(176, 202, 202, fontpage_176_202_202), // '塊' -- '塊'
1298
-    FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
1299
-    FONTDATA_ITEM(177, 138, 138, fontpage_177_138_138), // '墊' -- '墊'
1300
-    FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
1301
-    FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
1302
-    FONTDATA_ITEM(178, 160, 160, fontpage_178_160_160), // '夠' -- '夠'
1303
-    FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
1304
-    FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
1305
-    FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
1306
-    FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
1307
-    FONTDATA_ITEM(181, 146, 146, fontpage_181_146_146), // '媒' -- '媒'
1308
-    FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
1309
-    FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
1310
-    FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
1311
-    FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
1312
-    FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
1313
-    FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
1314
-    FONTDATA_ITEM(183, 185, 185, fontpage_183_185_185), // '容' -- '容'
1315
-    FONTDATA_ITEM(184, 141, 141, fontpage_184_141_141), // '對' -- '對'
1316
-    FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
1317
-    FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
1318
-    FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
1319
-    FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
1320
-    FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
1321
-    FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
1322
-    FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
1323
-    FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
1324
-    FONTDATA_ITEM(189, 226, 226, fontpage_189_226_226), // '廢' -- '廢'
1325
-    FONTDATA_ITEM(189, 250, 250, fontpage_189_250_250), // '建' -- '建'
1326
-    FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
1327
-    FONTDATA_ITEM(191, 133, 133, fontpage_191_133_133), // '待' -- '待'
1328
-    FONTDATA_ITEM(191, 140, 140, fontpage_191_140_140), // '後' -- '後'
1329
-    FONTDATA_ITEM(191, 145, 145, fontpage_191_145_145), // '徑' -- '徑'
1330
-    FONTDATA_ITEM(191, 158, 158, fontpage_191_158_158), // '從' -- '從'
1331
-    FONTDATA_ITEM(191, 169, 169, fontpage_191_169_169), // '復' -- '復'
1332
-    FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
1333
-    FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
1334
-    FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
1335
-    FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
1336
-    FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
1337
-    FONTDATA_ITEM(195, 182, 182, fontpage_195_182_182), // '憶' -- '憶'
1338
-    FONTDATA_ITEM(195, 201, 201, fontpage_195_201_201), // '應' -- '應'
1339
-    FONTDATA_ITEM(196, 144, 144, fontpage_196_144_144), // '成' -- '成'
1340
-    FONTDATA_ITEM(196, 182, 182, fontpage_196_182_182), // '戶' -- '戶'
1341
-    FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
1342
-    FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
1343
-    FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
1344
-    FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
1345
-    FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
1346
-    FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
1347
-    FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
1348
-    FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
1349
-    FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
1350
-    FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
1351
-    FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
1352
-    FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
1353
-    FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
1354
-    FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
1355
-    FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
1356
-    FONTDATA_ITEM(199, 219, 219, fontpage_199_219_219), // '換' -- '換'
1357
-    FONTDATA_ITEM(201, 199, 199, fontpage_201_199_199), // '擇' -- '擇'
1358
-    FONTDATA_ITEM(201, 202, 203, fontpage_201_202_203), // '擊' -- '擋'
1359
-    FONTDATA_ITEM(201, 224, 224, fontpage_201_224_224), // '擠' -- '擠'
1360
-    FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
1361
-    FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
1362
-    FONTDATA_ITEM(202, 215, 215, fontpage_202_215_215), // '敗' -- '敗'
1363
-    FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
1364
-    FONTDATA_ITEM(202, 248, 248, fontpage_202_248_248), // '數' -- '數'
1365
-    FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
1366
-    FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
1367
-    FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
1368
-    FONTDATA_ITEM(203, 183, 183, fontpage_203_183_183), // '斷' -- '斷'
1369
-    FONTDATA_ITEM(203, 188, 188, fontpage_203_188_188), // '於' -- '於'
1370
-    FONTDATA_ITEM(204, 135, 135, fontpage_204_135_135), // '昇' -- '昇'
1371
-    FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
1372
-    FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
1373
-    FONTDATA_ITEM(204, 194, 194, fontpage_204_194_194), // '時' -- '時'
1374
-    FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
1375
-    FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
1376
-    FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
1377
-    FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
1378
-    FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
1379
-    FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
1380
-    FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
1381
-    FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
1382
-    FONTDATA_ITEM(209, 157, 157, fontpage_209_157_157), // '條' -- '條'
1383
-    FONTDATA_ITEM(209, 196, 196, fontpage_209_196_196), // '棄' -- '棄'
1384
-    FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
1385
-    FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
1386
-    FONTDATA_ITEM(212, 223, 223, fontpage_212_223_223), // '機' -- '機'
1387
-    FONTDATA_ITEM(213, 162, 162, fontpage_213_162_162), // '檢' -- '檢'
1388
-    FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
1389
-    FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
1390
-    FONTDATA_ITEM(214, 248, 248, fontpage_214_248_248), // '歸' -- '歸'
1391
-    FONTDATA_ITEM(215, 188, 188, fontpage_215_188_188), // '殼' -- '殼'
1392
-    FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
1393
-    FONTDATA_ITEM(217, 146, 146, fontpage_217_146_146), // '沒' -- '沒'
1394
-    FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
1395
-    FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
1396
-    FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
1397
-    FONTDATA_ITEM(220, 172, 172, fontpage_220_172_172), // '測' -- '測'
1398
-    FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
1399
-    FONTDATA_ITEM(221, 150, 150, fontpage_221_150_150), // '準' -- '準'
1400
-    FONTDATA_ITEM(221, 171, 171, fontpage_221_171_171), // '溫' -- '溫'
1401
-    FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
1402
-    FONTDATA_ITEM(226, 161, 161, fontpage_226_161_161), // '無' -- '無'
1403
-    FONTDATA_ITEM(227, 177, 177, fontpage_227_177_177), // '熱' -- '熱'
1404
-    FONTDATA_ITEM(227, 200, 200, fontpage_227_200_200), // '燈' -- '燈'
1405
-    FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
1406
-    FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
1407
-    FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
1408
-    FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
1409
-    FONTDATA_ITEM(234, 204, 204, fontpage_234_204_204), // '界' -- '界'
1410
-    FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
1411
-    FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
1412
-    FONTDATA_ITEM(237, 227, 227, fontpage_237_227_227), // '監' -- '監'
1413
-    FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
1414
-    FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
1415
-    FONTDATA_ITEM(240, 141, 141, fontpage_240_141_141), // '砍' -- '砍'
1416
-    FONTDATA_ITEM(241, 186, 186, fontpage_241_186_186), // '確' -- '確'
1417
-    FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
1418
-    FONTDATA_ITEM(244, 205, 205, fontpage_244_205_205), // '積' -- '積'
1419
-    FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
1420
-    FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
1421
-    FONTDATA_ITEM(247, 161, 161, fontpage_247_161_161), // '管' -- '管'
1422
-    FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
1423
-    FONTDATA_ITEM(249, 251, 251, fontpage_249_251_251), // '系' -- '系'
1424
-    FONTDATA_ITEM(250, 133, 133, fontpage_250_133_133), // '紅' -- '紅'
1425
-    FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
1426
-    FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
1427
-    FONTDATA_ITEM(250, 176, 176, fontpage_250_176_176), // '細' -- '細'
1428
-    FONTDATA_ITEM(250, 194, 194, fontpage_250_194_194), // '終' -- '終'
1429
-    FONTDATA_ITEM(250, 241, 242, fontpage_250_241_242), // '統' -- '絲'
1430
-    FONTDATA_ITEM(251, 160, 160, fontpage_251_160_160), // '綠' -- '綠'
1431
-    FONTDATA_ITEM(251, 178, 178, fontpage_251_178_178), // '網' -- '網'
1432
-    FONTDATA_ITEM(251, 210, 210, fontpage_251_210_210), // '緒' -- '緒'
1433
-    FONTDATA_ITEM(251, 218, 218, fontpage_251_218_218), // '線' -- '線'
1434
-    FONTDATA_ITEM(251, 232, 232, fontpage_251_232_232), // '編' -- '編'
1435
-    FONTDATA_ITEM(252, 174, 174, fontpage_252_174_174), // '縮' -- '縮'
1436
-    FONTDATA_ITEM(252, 189, 189, fontpage_252_189_189), // '總' -- '總'
1437
-    FONTDATA_ITEM(252, 252, 252, fontpage_252_252_252), // '繼' -- '繼'
1438
-    FONTDATA_ITEM(253, 140, 140, fontpage_253_140_140), // '續' -- '續'
1439
-    FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
1440
-    FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
1441
-    FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
1442
-    FONTDATA_ITEM(256, 240, 240, fontpage_256_240_240), // '聰' -- '聰'
1443
-    FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
1444
-    FONTDATA_ITEM(267, 205, 205, fontpage_267_205_205), // '藍' -- '藍'
1445
-    FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
1446
-    FONTDATA_ITEM(272, 232, 232, fontpage_272_232_232), // '表' -- '表'
1447
-    FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
1448
-    FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
1449
-    FONTDATA_ITEM(273, 221, 221, fontpage_273_221_221), // '裝' -- '裝'
1450
-    FONTDATA_ITEM(274, 135, 135, fontpage_274_135_135), // '複' -- '複'
1451
-    FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
1452
-    FONTDATA_ITEM(276, 136, 136, fontpage_276_136_136), // '計' -- '計'
1453
-    FONTDATA_ITEM(276, 138, 138, fontpage_276_138_138), // '訊' -- '訊'
1454
-    FONTDATA_ITEM(276, 152, 152, fontpage_276_152_152), // '記' -- '記'
1455
-    FONTDATA_ITEM(276, 173, 173, fontpage_276_173_173), // '設' -- '設'
1456
-    FONTDATA_ITEM(276, 230, 230, fontpage_276_230_230), // '試' -- '試'
1457
-    FONTDATA_ITEM(277, 141, 141, fontpage_277_141_141), // '認' -- '認'
1458
-    FONTDATA_ITEM(277, 164, 164, fontpage_277_164_164), // '誤' -- '誤'
1459
-    FONTDATA_ITEM(277, 191, 191, fontpage_277_191_191), // '調' -- '調'
1460
-    FONTDATA_ITEM(277, 203, 203, fontpage_277_203_203), // '請' -- '請'
1461
-    FONTDATA_ITEM(278, 240, 240, fontpage_278_240_240), // '議' -- '議'
1462
-    FONTDATA_ITEM(279, 128, 128, fontpage_279_128_128), // '讀' -- '讀'
1463
-    FONTDATA_ITEM(279, 138, 138, fontpage_279_138_138), // '變' -- '變'
1464
-    FONTDATA_ITEM(281, 199, 199, fontpage_281_199_199), // '資' -- '資'
1465
-    FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
1466
-    FONTDATA_ITEM(285, 202, 202, fontpage_285_202_202), // '車' -- '車'
1467
-    FONTDATA_ITEM(285, 223, 223, fontpage_285_223_223), // '軟' -- '軟'
1468
-    FONTDATA_ITEM(285, 248, 248, fontpage_285_248_248), // '軸' -- '軸'
1469
-    FONTDATA_ITEM(286, 137, 137, fontpage_286_137_137), // '載' -- '載'
1470
-    FONTDATA_ITEM(286, 175, 175, fontpage_286_175_175), // '輯' -- '輯'
1471
-    FONTDATA_ITEM(286, 184, 184, fontpage_286_184_184), // '輸' -- '輸'
1472
-    FONTDATA_ITEM(286, 201, 201, fontpage_286_201_201), // '轉' -- '轉'
1473
-    FONTDATA_ITEM(287, 209, 209, fontpage_287_209_209), // '近' -- '近'
1474
-    FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
1475
-    FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
1476
-    FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
1477
-    FONTDATA_ITEM(288, 163, 163, fontpage_288_163_163), // '連' -- '連'
1478
-    FONTDATA_ITEM(288, 178, 178, fontpage_288_178_178), // '進' -- '進'
1479
-    FONTDATA_ITEM(288, 203, 203, fontpage_288_203_203), // '運' -- '運'
1480
-    FONTDATA_ITEM(288, 212, 212, fontpage_288_212_212), // '達' -- '達'
1481
-    FONTDATA_ITEM(288, 248, 248, fontpage_288_248_248), // '選' -- '選'
1482
-    FONTDATA_ITEM(289, 132, 132, fontpage_289_132_132), // '還' -- '還'
1483
-    FONTDATA_ITEM(289, 138, 138, fontpage_289_138_138), // '邊' -- '邊'
1484
-    FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
1485
-    FONTDATA_ITEM(291, 203, 203, fontpage_291_203_203), // '釋' -- '釋'
1486
-    FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
1487
-    FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
1488
-    FONTDATA_ITEM(291, 221, 221, fontpage_291_221_221), // '針' -- '針'
1489
-    FONTDATA_ITEM(292, 149, 149, fontpage_292_149_149), // '鈕' -- '鈕'
1490
-    FONTDATA_ITEM(294, 175, 175, fontpage_294_175_175), // '錯' -- '錯'
1491
-    FONTDATA_ITEM(294, 245, 245, fontpage_294_245_245), // '鍵' -- '鍵'
1492
-    FONTDATA_ITEM(298, 247, 247, fontpage_298_247_247), // '長' -- '長'
1493
-    FONTDATA_ITEM(299, 137, 137, fontpage_299_137_137), // '閉' -- '閉'
1494
-    FONTDATA_ITEM(299, 139, 139, fontpage_299_139_139), // '開' -- '開'
1495
-    FONTDATA_ITEM(299, 147, 147, fontpage_299_147_147), // '間' -- '間'
1496
-    FONTDATA_ITEM(299, 220, 220, fontpage_299_220_220), // '關' -- '關'
1497
-    FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
1498
-    FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
1499
-    FONTDATA_ITEM(301, 142, 142, fontpage_301_142_142), // '階' -- '階'
1500
-    FONTDATA_ITEM(301, 217, 217, fontpage_301_217_217), // '雙' -- '雙'
1501
-    FONTDATA_ITEM(301, 226, 226, fontpage_301_226_226), // '離' -- '離'
1502
-    FONTDATA_ITEM(301, 251, 251, fontpage_301_251_251), // '電' -- '電'
1503
-    FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
1504
-    FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
1505
-    FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
1506
-    FONTDATA_ITEM(304, 133, 133, fontpage_304_133_133), // '項' -- '項'
1507
-    FONTDATA_ITEM(304, 144, 144, fontpage_304_144_144), // '預' -- '預'
1508
-    FONTDATA_ITEM(304, 205, 205, fontpage_304_205_205), // '額' -- '額'
1509
-    FONTDATA_ITEM(304, 222, 222, fontpage_304_222_222), // '類' -- '類'
1510
-    FONTDATA_ITEM(305, 168, 168, fontpage_305_168_168), // '風' -- '風'
1511
-    FONTDATA_ITEM(305, 253, 253, fontpage_305_253_253), // '飽' -- '飽'
1512
-    FONTDATA_ITEM(306, 152, 152, fontpage_306_152_152), // '餘' -- '餘'
1513
-    FONTDATA_ITEM(307, 172, 172, fontpage_307_172_172), // '馬' -- '馬'
1514
-    FONTDATA_ITEM(308, 197, 197, fontpage_308_197_197), // '驅' -- '驅'
1515
-    FONTDATA_ITEM(309, 212, 212, fontpage_309_212_212), // '體' -- '體'
1516
-    FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
1517
-    FONTDATA_ITEM(317, 195, 195, fontpage_317_195_195), // '黃' -- '黃'
1518
-    FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
1519
-    FONTDATA_ITEM(318, 202, 202, fontpage_318_202_202), // '齊' -- '齊'
1520
-    FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // ':' -- ':'
1222
+static const uxg_fontinfo_t g_fontinfo_zh_TW[] PROGMEM = {
1223
+  FONTDATA_ITEM(69, 191, 191, fontpage_69_191_191), // '⊿' -- '⊿'
1224
+  FONTDATA_ITEM(156, 128, 128, fontpage_156_128_128), // '一' -- '一'
1225
+  FONTDATA_ITEM(156, 137, 139, fontpage_156_137_139), // '三' -- '下'
1226
+  FONTDATA_ITEM(156, 141, 141, fontpage_156_141_141), // '不' -- '不'
1227
+  FONTDATA_ITEM(156, 166, 166, fontpage_156_166_166), // '並' -- '並'
1228
+  FONTDATA_ITEM(156, 173, 173, fontpage_156_173_173), // '中' -- '中'
1229
+  FONTDATA_ITEM(156, 187, 187, fontpage_156_187_187), // '主' -- '主'
1230
+  FONTDATA_ITEM(156, 203, 203, fontpage_156_203_203), // '之' -- '之'
1231
+  FONTDATA_ITEM(157, 164, 164, fontpage_157_164_164), // '交' -- '交'
1232
+  FONTDATA_ITEM(157, 174, 174, fontpage_157_174_174), // '亮' -- '亮'
1233
+  FONTDATA_ITEM(157, 228, 228, fontpage_157_228_228), // '令' -- '令'
1234
+  FONTDATA_ITEM(157, 246, 246, fontpage_157_246_246), // '件' -- '件'
1235
+  FONTDATA_ITEM(157, 253, 253, fontpage_157_253_253), // '份' -- '份'
1236
+  FONTDATA_ITEM(158, 145, 145, fontpage_158_145_145), // '休' -- '休'
1237
+  FONTDATA_ITEM(158, 205, 206, fontpage_158_205_206), // '位' -- '低'
1238
+  FONTDATA_ITEM(158, 220, 220, fontpage_158_220_220), // '作' -- '作'
1239
+  FONTDATA_ITEM(159, 155, 155, fontpage_159_155_155), // '供' -- '供'
1240
+  FONTDATA_ITEM(159, 221, 221, fontpage_159_221_221), // '保' -- '保'
1241
+  FONTDATA_ITEM(159, 225, 225, fontpage_159_225_225), // '信' -- '信'
1242
+  FONTDATA_ITEM(160, 139, 139, fontpage_160_139_139), // '個' -- '個'
1243
+  FONTDATA_ITEM(160, 188, 188, fontpage_160_188_188), // '值' -- '值'
1244
+  FONTDATA_ITEM(160, 207, 207, fontpage_160_207_207), // '偏' -- '偏'
1245
+  FONTDATA_ITEM(160, 220, 220, fontpage_160_220_220), // '停' -- '停'
1246
+  FONTDATA_ITEM(160, 245, 245, fontpage_160_245_245), // '偵' -- '偵'
1247
+  FONTDATA_ITEM(161, 153, 153, fontpage_161_153_153), // '備' -- '備'
1248
+  FONTDATA_ITEM(161, 179, 179, fontpage_161_179_179), // '傳' -- '傳'
1249
+  FONTDATA_ITEM(161, 190, 190, fontpage_161_190_190), // '傾' -- '傾'
1250
+  FONTDATA_ITEM(162, 178, 178, fontpage_162_178_178), // '儲' -- '儲'
1251
+  FONTDATA_ITEM(162, 197, 197, fontpage_162_197_197), // '充' -- '充'
1252
+  FONTDATA_ITEM(162, 200, 201, fontpage_162_200_201), // '先' -- '光'
1253
+  FONTDATA_ITEM(162, 229, 229, fontpage_162_229_229), // '入' -- '入'
1254
+  FONTDATA_ITEM(162, 232, 232, fontpage_162_232_232), // '全' -- '全'
1255
+  FONTDATA_ITEM(162, 241, 241, fontpage_162_241_241), // '共' -- '共'
1256
+  FONTDATA_ITEM(162, 247, 247, fontpage_162_247_247), // '具' -- '具'
1257
+  FONTDATA_ITEM(163, 151, 151, fontpage_163_151_151), // '冗' -- '冗'
1258
+  FONTDATA_ITEM(163, 183, 183, fontpage_163_183_183), // '冷' -- '冷'
1259
+  FONTDATA_ITEM(163, 198, 198, fontpage_163_198_198), // '准' -- '准'
1260
+  FONTDATA_ITEM(163, 250, 250, fontpage_163_250_250), // '出' -- '出'
1261
+  FONTDATA_ITEM(164, 134, 134, fontpage_164_134_134), // '分' -- '分'
1262
+  FONTDATA_ITEM(164, 151, 151, fontpage_164_151_151), // '列' -- '列'
1263
+  FONTDATA_ITEM(164, 157, 157, fontpage_164_157_157), // '初' -- '初'
1264
+  FONTDATA_ITEM(164, 176, 176, fontpage_164_176_176), // '到' -- '到'
1265
+  FONTDATA_ITEM(164, 182, 183, fontpage_164_182_183), // '制' -- '刷'
1266
+  FONTDATA_ITEM(164, 245, 245, fontpage_164_245_245), // '創' -- '創'
1267
+  FONTDATA_ITEM(165, 155, 155, fontpage_165_155_155), // '力' -- '力'
1268
+  FONTDATA_ITEM(165, 160, 160, fontpage_165_160_160), // '加' -- '加'
1269
+  FONTDATA_ITEM(165, 213, 213, fontpage_165_213_213), // '動' -- '動'
1270
+  FONTDATA_ITEM(166, 150, 150, fontpage_166_150_150), // '化' -- '化'
1271
+  FONTDATA_ITEM(166, 202, 202, fontpage_166_202_202), // '半' -- '半'
1272
+  FONTDATA_ITEM(166, 212, 212, fontpage_166_212_212), // '協' -- '協'
1273
+  FONTDATA_ITEM(166, 225, 225, fontpage_166_225_225), // '卡' -- '卡'
1274
+  FONTDATA_ITEM(166, 240, 240, fontpage_166_240_240), // '印' -- '印'
1275
+  FONTDATA_ITEM(166, 248, 248, fontpage_166_248_248), // '卸' -- '卸'
1276
+  FONTDATA_ITEM(166, 251, 251, fontpage_166_251_251), // '卻' -- '卻'
1277
+  FONTDATA_ITEM(167, 159, 159, fontpage_167_159_159), // '原' -- '原'
1278
+  FONTDATA_ITEM(167, 205, 205, fontpage_167_205_205), // '反' -- '反'
1279
+  FONTDATA_ITEM(167, 214, 214, fontpage_167_214_214), // '取' -- '取'
1280
+  FONTDATA_ITEM(167, 240, 240, fontpage_167_240_240), // '台' -- '台'
1281
+  FONTDATA_ITEM(168, 136, 136, fontpage_168_136_136), // '合' -- '合'
1282
+  FONTDATA_ITEM(168, 166, 166, fontpage_168_166_166), // '否' -- '否'
1283
+  FONTDATA_ITEM(168, 202, 202, fontpage_168_202_202), // '告' -- '告'
1284
+  FONTDATA_ITEM(168, 253, 253, fontpage_168_253_253), // '命' -- '命'
1285
+  FONTDATA_ITEM(169, 140, 140, fontpage_169_140_140), // '和' -- '和'
1286
+  FONTDATA_ITEM(170, 223, 223, fontpage_170_223_223), // '啟' -- '啟'
1287
+  FONTDATA_ITEM(171, 174, 174, fontpage_171_174_174), // '單' -- '單'
1288
+  FONTDATA_ITEM(172, 180, 180, fontpage_172_180_180), // '嘴' -- '嘴'
1289
+  FONTDATA_ITEM(172, 232, 232, fontpage_172_232_232), // '器' -- '器'
1290
+  FONTDATA_ITEM(172, 244, 244, fontpage_172_244_244), // '噴' -- '噴'
1291
+  FONTDATA_ITEM(173, 222, 222, fontpage_173_222_222), // '回' -- '回'
1292
+  FONTDATA_ITEM(173, 224, 224, fontpage_173_224_224), // '因' -- '因'
1293
+  FONTDATA_ITEM(173, 250, 250, fontpage_173_250_250), // '固' -- '固'
1294
+  FONTDATA_ITEM(174, 150, 150, fontpage_174_150_150), // '圖' -- '圖'
1295
+  FONTDATA_ITEM(174, 168, 168, fontpage_174_168_168), // '在' -- '在'
1296
+  FONTDATA_ITEM(175, 139, 139, fontpage_175_139_139), // '型' -- '型'
1297
+  FONTDATA_ITEM(175, 247, 247, fontpage_175_247_247), // '執' -- '執'
1298
+  FONTDATA_ITEM(176, 202, 202, fontpage_176_202_202), // '塊' -- '塊'
1299
+  FONTDATA_ITEM(176, 235, 235, fontpage_176_235_235), // '填' -- '填'
1300
+  FONTDATA_ITEM(177, 138, 138, fontpage_177_138_138), // '墊' -- '墊'
1301
+  FONTDATA_ITEM(178, 150, 150, fontpage_178_150_150), // '外' -- '外'
1302
+  FONTDATA_ITEM(178, 154, 154, fontpage_178_154_154), // '多' -- '多'
1303
+  FONTDATA_ITEM(178, 160, 160, fontpage_178_160_160), // '夠' -- '夠'
1304
+  FONTDATA_ITEM(178, 167, 167, fontpage_178_167_167), // '大' -- '大'
1305
+  FONTDATA_ITEM(178, 169, 170, fontpage_178_169_170), // '天' -- '太'
1306
+  FONTDATA_ITEM(178, 177, 177, fontpage_178_177_177), // '失' -- '失'
1307
+  FONTDATA_ITEM(179, 203, 203, fontpage_179_203_203), // '始' -- '始'
1308
+  FONTDATA_ITEM(181, 146, 146, fontpage_181_146_146), // '媒' -- '媒'
1309
+  FONTDATA_ITEM(182, 208, 208, fontpage_182_208_208), // '子' -- '子'
1310
+  FONTDATA_ITEM(182, 216, 216, fontpage_182_216_216), // '存' -- '存'
1311
+  FONTDATA_ITEM(183, 137, 137, fontpage_183_137_137), // '安' -- '安'
1312
+  FONTDATA_ITEM(183, 140, 140, fontpage_183_140_140), // '完' -- '完'
1313
+  FONTDATA_ITEM(183, 154, 154, fontpage_183_154_154), // '定' -- '定'
1314
+  FONTDATA_ITEM(183, 162, 162, fontpage_183_162_162), // '客' -- '客'
1315
+  FONTDATA_ITEM(183, 185, 185, fontpage_183_185_185), // '容' -- '容'
1316
+  FONTDATA_ITEM(184, 141, 141, fontpage_184_141_141), // '對' -- '對'
1317
+  FONTDATA_ITEM(184, 143, 143, fontpage_184_143_143), // '小' -- '小'
1318
+  FONTDATA_ITEM(184, 177, 177, fontpage_184_177_177), // '就' -- '就'
1319
+  FONTDATA_ITEM(187, 229, 229, fontpage_187_229_229), // '工' -- '工'
1320
+  FONTDATA_ITEM(187, 238, 238, fontpage_187_238_238), // '差' -- '差'
1321
+  FONTDATA_ITEM(187, 242, 242, fontpage_187_242_242), // '已' -- '已'
1322
+  FONTDATA_ITEM(188, 243, 243, fontpage_188_243_243), // '平' -- '平'
1323
+  FONTDATA_ITEM(189, 138, 138, fontpage_189_138_138), // '床' -- '床'
1324
+  FONTDATA_ITEM(189, 166, 166, fontpage_189_166_166), // '度' -- '度'
1325
+  FONTDATA_ITEM(189, 226, 226, fontpage_189_226_226), // '廢' -- '廢'
1326
+  FONTDATA_ITEM(189, 250, 250, fontpage_189_250_250), // '建' -- '建'
1327
+  FONTDATA_ITEM(190, 149, 149, fontpage_190_149_149), // '引' -- '引'
1328
+  FONTDATA_ITEM(191, 133, 133, fontpage_191_133_133), // '待' -- '待'
1329
+  FONTDATA_ITEM(191, 140, 140, fontpage_191_140_140), // '後' -- '後'
1330
+  FONTDATA_ITEM(191, 145, 145, fontpage_191_145_145), // '徑' -- '徑'
1331
+  FONTDATA_ITEM(191, 158, 158, fontpage_191_158_158), // '從' -- '從'
1332
+  FONTDATA_ITEM(191, 169, 169, fontpage_191_169_169), // '復' -- '復'
1333
+  FONTDATA_ITEM(191, 174, 174, fontpage_191_174_174), // '微' -- '微'
1334
+  FONTDATA_ITEM(191, 195, 195, fontpage_191_195_195), // '心' -- '心'
1335
+  FONTDATA_ITEM(192, 167, 167, fontpage_192_167_167), // '性' -- '性'
1336
+  FONTDATA_ITEM(192, 226, 226, fontpage_192_226_226), // '恢' -- '恢'
1337
+  FONTDATA_ITEM(192, 239, 239, fontpage_192_239_239), // '息' -- '息'
1338
+  FONTDATA_ITEM(195, 182, 182, fontpage_195_182_182), // '憶' -- '憶'
1339
+  FONTDATA_ITEM(195, 201, 201, fontpage_195_201_201), // '應' -- '應'
1340
+  FONTDATA_ITEM(196, 144, 144, fontpage_196_144_144), // '成' -- '成'
1341
+  FONTDATA_ITEM(196, 182, 182, fontpage_196_182_182), // '戶' -- '戶'
1342
+  FONTDATA_ITEM(196, 192, 192, fontpage_196_192_192), // '所' -- '所'
1343
+  FONTDATA_ITEM(196, 199, 199, fontpage_196_199_199), // '扇' -- '扇'
1344
+  FONTDATA_ITEM(196, 203, 203, fontpage_196_203_203), // '手' -- '手'
1345
+  FONTDATA_ITEM(196, 211, 211, fontpage_196_211_211), // '打' -- '打'
1346
+  FONTDATA_ITEM(196, 249, 249, fontpage_196_249_249), // '批' -- '批'
1347
+  FONTDATA_ITEM(197, 150, 150, fontpage_197_150_150), // '抖' -- '抖'
1348
+  FONTDATA_ITEM(197, 189, 189, fontpage_197_189_189), // '抽' -- '抽'
1349
+  FONTDATA_ITEM(197, 212, 212, fontpage_197_212_212), // '拔' -- '拔'
1350
+  FONTDATA_ITEM(198, 137, 137, fontpage_198_137_137), // '按' -- '按'
1351
+  FONTDATA_ITEM(199, 137, 137, fontpage_199_137_137), // '掉' -- '掉'
1352
+  FONTDATA_ITEM(199, 162, 162, fontpage_199_162_162), // '探' -- '探'
1353
+  FONTDATA_ITEM(199, 165, 165, fontpage_199_165_165), // '接' -- '接'
1354
+  FONTDATA_ITEM(199, 167, 167, fontpage_199_167_167), // '控' -- '控'
1355
+  FONTDATA_ITEM(199, 208, 208, fontpage_199_208_208), // '提' -- '提'
1356
+  FONTDATA_ITEM(199, 210, 210, fontpage_199_210_210), // '插' -- '插'
1357
+  FONTDATA_ITEM(199, 219, 219, fontpage_199_219_219), // '換' -- '換'
1358
+  FONTDATA_ITEM(201, 199, 199, fontpage_201_199_199), // '擇' -- '擇'
1359
+  FONTDATA_ITEM(201, 202, 203, fontpage_201_202_203), // '擊' -- '擋'
1360
+  FONTDATA_ITEM(201, 224, 224, fontpage_201_224_224), // '擠' -- '擠'
1361
+  FONTDATA_ITEM(202, 182, 182, fontpage_202_182_182), // '收' -- '收'
1362
+  FONTDATA_ITEM(202, 190, 190, fontpage_202_190_190), // '放' -- '放'
1363
+  FONTDATA_ITEM(202, 215, 215, fontpage_202_215_215), // '敗' -- '敗'
1364
+  FONTDATA_ITEM(202, 244, 244, fontpage_202_244_244), // '整' -- '整'
1365
+  FONTDATA_ITEM(202, 248, 248, fontpage_202_248_248), // '數' -- '數'
1366
+  FONTDATA_ITEM(203, 153, 153, fontpage_203_153_153), // '料' -- '料'
1367
+  FONTDATA_ITEM(203, 156, 156, fontpage_203_156_156), // '斜' -- '斜'
1368
+  FONTDATA_ITEM(203, 176, 176, fontpage_203_176_176), // '新' -- '新'
1369
+  FONTDATA_ITEM(203, 183, 183, fontpage_203_183_183), // '斷' -- '斷'
1370
+  FONTDATA_ITEM(203, 188, 188, fontpage_203_188_188), // '於' -- '於'
1371
+  FONTDATA_ITEM(204, 135, 135, fontpage_204_135_135), // '昇' -- '昇'
1372
+  FONTDATA_ITEM(204, 142, 142, fontpage_204_142_142), // '明' -- '明'
1373
+  FONTDATA_ITEM(204, 175, 175, fontpage_204_175_175), // '是' -- '是'
1374
+  FONTDATA_ITEM(204, 194, 194, fontpage_204_194_194), // '時' -- '時'
1375
+  FONTDATA_ITEM(205, 171, 171, fontpage_205_171_171), // '暫' -- '暫'
1376
+  FONTDATA_ITEM(205, 244, 244, fontpage_205_244_244), // '更' -- '更'
1377
+  FONTDATA_ITEM(206, 128, 128, fontpage_206_128_128), // '最' -- '最'
1378
+  FONTDATA_ITEM(206, 137, 137, fontpage_206_137_137), // '有' -- '有'
1379
+  FONTDATA_ITEM(206, 255, 255, fontpage_206_255_255), // '板' -- '板'
1380
+  FONTDATA_ITEM(207, 241, 241, fontpage_207_241_241), // '柱' -- '柱'
1381
+  FONTDATA_ITEM(208, 161, 161, fontpage_208_161_161), // '校' -- '校'
1382
+  FONTDATA_ITEM(208, 188, 188, fontpage_208_188_188), // '格' -- '格'
1383
+  FONTDATA_ITEM(209, 157, 157, fontpage_209_157_157), // '條' -- '條'
1384
+  FONTDATA_ITEM(209, 196, 196, fontpage_209_196_196), // '棄' -- '棄'
1385
+  FONTDATA_ITEM(211, 253, 253, fontpage_211_253_253), // '槽' -- '槽'
1386
+  FONTDATA_ITEM(212, 217, 217, fontpage_212_217_217), // '橙' -- '橙'
1387
+  FONTDATA_ITEM(212, 223, 223, fontpage_212_223_223), // '機' -- '機'
1388
+  FONTDATA_ITEM(213, 162, 162, fontpage_213_162_162), // '檢' -- '檢'
1389
+  FONTDATA_ITEM(214, 226, 227, fontpage_214_226_227), // '止' -- '正'
1390
+  FONTDATA_ITEM(214, 229, 229, fontpage_214_229_229), // '步' -- '步'
1391
+  FONTDATA_ITEM(214, 248, 248, fontpage_214_248_248), // '歸' -- '歸'
1392
+  FONTDATA_ITEM(215, 188, 188, fontpage_215_188_188), // '殼' -- '殼'
1393
+  FONTDATA_ITEM(215, 212, 212, fontpage_215_212_212), // '比' -- '比'
1394
+  FONTDATA_ITEM(217, 146, 146, fontpage_217_146_146), // '沒' -- '沒'
1395
+  FONTDATA_ITEM(219, 136, 136, fontpage_219_136_136), // '消' -- '消'
1396
+  FONTDATA_ITEM(219, 225, 225, fontpage_219_225_225), // '淡' -- '淡'
1397
+  FONTDATA_ITEM(220, 133, 133, fontpage_220_133_133), // '清' -- '清'
1398
+  FONTDATA_ITEM(220, 172, 172, fontpage_220_172_172), // '測' -- '測'
1399
+  FONTDATA_ITEM(221, 144, 144, fontpage_221_144_144), // '源' -- '源'
1400
+  FONTDATA_ITEM(221, 150, 150, fontpage_221_150_150), // '準' -- '準'
1401
+  FONTDATA_ITEM(221, 171, 171, fontpage_221_171_171), // '溫' -- '溫'
1402
+  FONTDATA_ITEM(223, 192, 192, fontpage_223_192_192), // '激' -- '激'
1403
+  FONTDATA_ITEM(226, 161, 161, fontpage_226_161_161), // '無' -- '無'
1404
+  FONTDATA_ITEM(227, 177, 177, fontpage_227_177_177), // '熱' -- '熱'
1405
+  FONTDATA_ITEM(227, 200, 200, fontpage_227_200_200), // '燈' -- '燈'
1406
+  FONTDATA_ITEM(228, 199, 199, fontpage_228_199_199), // '片' -- '片'
1407
+  FONTDATA_ITEM(228, 233, 233, fontpage_228_233_233), // '物' -- '物'
1408
+  FONTDATA_ITEM(231, 135, 135, fontpage_231_135_135), // '率' -- '率'
1409
+  FONTDATA_ITEM(234, 168, 168, fontpage_234_168_168), // '用' -- '用'
1410
+  FONTDATA_ITEM(234, 204, 204, fontpage_234_204_204), // '界' -- '界'
1411
+  FONTDATA_ITEM(236, 253, 253, fontpage_236_253_253), // '白' -- '白'
1412
+  FONTDATA_ITEM(237, 132, 132, fontpage_237_132_132), // '的' -- '的'
1413
+  FONTDATA_ITEM(237, 227, 227, fontpage_237_227_227), // '監' -- '監'
1414
+  FONTDATA_ITEM(237, 244, 244, fontpage_237_244_244), // '直' -- '直'
1415
+  FONTDATA_ITEM(238, 160, 160, fontpage_238_160_160), // '眠' -- '眠'
1416
+  FONTDATA_ITEM(240, 141, 141, fontpage_240_141_141), // '砍' -- '砍'
1417
+  FONTDATA_ITEM(241, 186, 186, fontpage_241_186_186), // '確' -- '確'
1418
+  FONTDATA_ITEM(243, 251, 251, fontpage_243_251_251), // '移' -- '移'
1419
+  FONTDATA_ITEM(244, 205, 205, fontpage_244_205_205), // '積' -- '積'
1420
+  FONTDATA_ITEM(245, 239, 239, fontpage_245_239_239), // '端' -- '端'
1421
+  FONTDATA_ITEM(246, 201, 201, fontpage_246_201_201), // '等' -- '等'
1422
+  FONTDATA_ITEM(247, 161, 161, fontpage_247_161_161), // '管' -- '管'
1423
+  FONTDATA_ITEM(247, 177, 177, fontpage_247_177_177), // '箱' -- '箱'
1424
+  FONTDATA_ITEM(249, 251, 251, fontpage_249_251_251), // '系' -- '系'
1425
+  FONTDATA_ITEM(250, 133, 133, fontpage_250_133_133), // '紅' -- '紅'
1426
+  FONTDATA_ITEM(250, 162, 162, fontpage_250_162_162), // '索' -- '索'
1427
+  FONTDATA_ITEM(250, 171, 171, fontpage_250_171_171), // '紫' -- '紫'
1428
+  FONTDATA_ITEM(250, 176, 176, fontpage_250_176_176), // '細' -- '細'
1429
+  FONTDATA_ITEM(250, 194, 194, fontpage_250_194_194), // '終' -- '終'
1430
+  FONTDATA_ITEM(250, 241, 242, fontpage_250_241_242), // '統' -- '絲'
1431
+  FONTDATA_ITEM(251, 160, 160, fontpage_251_160_160), // '綠' -- '綠'
1432
+  FONTDATA_ITEM(251, 178, 178, fontpage_251_178_178), // '網' -- '網'
1433
+  FONTDATA_ITEM(251, 210, 210, fontpage_251_210_210), // '緒' -- '緒'
1434
+  FONTDATA_ITEM(251, 218, 218, fontpage_251_218_218), // '線' -- '線'
1435
+  FONTDATA_ITEM(251, 232, 232, fontpage_251_232_232), // '編' -- '編'
1436
+  FONTDATA_ITEM(252, 174, 174, fontpage_252_174_174), // '縮' -- '縮'
1437
+  FONTDATA_ITEM(252, 189, 189, fontpage_252_189_189), // '總' -- '總'
1438
+  FONTDATA_ITEM(252, 252, 252, fontpage_252_252_252), // '繼' -- '繼'
1439
+  FONTDATA_ITEM(253, 140, 140, fontpage_253_140_140), // '續' -- '續'
1440
+  FONTDATA_ITEM(253, 162, 162, fontpage_253_162_162), // '红' -- '红'
1441
+  FONTDATA_ITEM(254, 238, 238, fontpage_254_238_238), // '置' -- '置'
1442
+  FONTDATA_ITEM(254, 242, 242, fontpage_254_242_242), // '署' -- '署'
1443
+  FONTDATA_ITEM(256, 240, 240, fontpage_256_240_240), // '聰' -- '聰'
1444
+  FONTDATA_ITEM(259, 234, 234, fontpage_259_234_234), // '自' -- '自'
1445
+  FONTDATA_ITEM(267, 205, 205, fontpage_267_205_205), // '藍' -- '藍'
1446
+  FONTDATA_ITEM(272, 204, 204, fontpage_272_204_204), // '行' -- '行'
1447
+  FONTDATA_ITEM(272, 232, 232, fontpage_272_232_232), // '表' -- '表'
1448
+  FONTDATA_ITEM(273, 171, 171, fontpage_273_171_171), // '被' -- '被'
1449
+  FONTDATA_ITEM(273, 197, 197, fontpage_273_197_197), // '装' -- '装'
1450
+  FONTDATA_ITEM(273, 221, 221, fontpage_273_221_221), // '裝' -- '裝'
1451
+  FONTDATA_ITEM(274, 135, 135, fontpage_274_135_135), // '複' -- '複'
1452
+  FONTDATA_ITEM(275, 210, 210, fontpage_275_210_210), // '角' -- '角'
1453
+  FONTDATA_ITEM(276, 136, 136, fontpage_276_136_136), // '計' -- '計'
1454
+  FONTDATA_ITEM(276, 138, 138, fontpage_276_138_138), // '訊' -- '訊'
1455
+  FONTDATA_ITEM(276, 152, 152, fontpage_276_152_152), // '記' -- '記'
1456
+  FONTDATA_ITEM(276, 173, 173, fontpage_276_173_173), // '設' -- '設'
1457
+  FONTDATA_ITEM(276, 230, 230, fontpage_276_230_230), // '試' -- '試'
1458
+  FONTDATA_ITEM(277, 141, 141, fontpage_277_141_141), // '認' -- '認'
1459
+  FONTDATA_ITEM(277, 164, 164, fontpage_277_164_164), // '誤' -- '誤'
1460
+  FONTDATA_ITEM(277, 191, 191, fontpage_277_191_191), // '調' -- '調'
1461
+  FONTDATA_ITEM(277, 203, 203, fontpage_277_203_203), // '請' -- '請'
1462
+  FONTDATA_ITEM(278, 240, 240, fontpage_278_240_240), // '議' -- '議'
1463
+  FONTDATA_ITEM(279, 128, 128, fontpage_279_128_128), // '讀' -- '讀'
1464
+  FONTDATA_ITEM(279, 138, 138, fontpage_279_138_138), // '變' -- '變'
1465
+  FONTDATA_ITEM(281, 199, 199, fontpage_281_199_199), // '資' -- '資'
1466
+  FONTDATA_ITEM(283, 221, 221, fontpage_283_221_221), // '距' -- '距'
1467
+  FONTDATA_ITEM(285, 202, 202, fontpage_285_202_202), // '車' -- '車'
1468
+  FONTDATA_ITEM(285, 223, 223, fontpage_285_223_223), // '軟' -- '軟'
1469
+  FONTDATA_ITEM(285, 248, 248, fontpage_285_248_248), // '軸' -- '軸'
1470
+  FONTDATA_ITEM(286, 137, 137, fontpage_286_137_137), // '載' -- '載'
1471
+  FONTDATA_ITEM(286, 175, 175, fontpage_286_175_175), // '輯' -- '輯'
1472
+  FONTDATA_ITEM(286, 184, 184, fontpage_286_184_184), // '輸' -- '輸'
1473
+  FONTDATA_ITEM(286, 201, 201, fontpage_286_201_201), // '轉' -- '轉'
1474
+  FONTDATA_ITEM(287, 209, 209, fontpage_287_209_209), // '近' -- '近'
1475
+  FONTDATA_ITEM(287, 212, 212, fontpage_287_212_212), // '返' -- '返'
1476
+  FONTDATA_ITEM(288, 128, 128, fontpage_288_128_128), // '退' -- '退'
1477
+  FONTDATA_ITEM(288, 159, 159, fontpage_288_159_159), // '速' -- '速'
1478
+  FONTDATA_ITEM(288, 163, 163, fontpage_288_163_163), // '連' -- '連'
1479
+  FONTDATA_ITEM(288, 178, 178, fontpage_288_178_178), // '進' -- '進'
1480
+  FONTDATA_ITEM(288, 203, 203, fontpage_288_203_203), // '運' -- '運'
1481
+  FONTDATA_ITEM(288, 212, 212, fontpage_288_212_212), // '達' -- '達'
1482
+  FONTDATA_ITEM(288, 248, 248, fontpage_288_248_248), // '選' -- '選'
1483
+  FONTDATA_ITEM(289, 132, 132, fontpage_289_132_132), // '還' -- '還'
1484
+  FONTDATA_ITEM(289, 138, 138, fontpage_289_138_138), // '邊' -- '邊'
1485
+  FONTDATA_ITEM(289, 232, 232, fontpage_289_232_232), // '部' -- '部'
1486
+  FONTDATA_ITEM(291, 203, 203, fontpage_291_203_203), // '釋' -- '釋'
1487
+  FONTDATA_ITEM(291, 205, 205, fontpage_291_205_205), // '重' -- '重'
1488
+  FONTDATA_ITEM(291, 207, 207, fontpage_291_207_207), // '量' -- '量'
1489
+  FONTDATA_ITEM(291, 221, 221, fontpage_291_221_221), // '針' -- '針'
1490
+  FONTDATA_ITEM(292, 149, 149, fontpage_292_149_149), // '鈕' -- '鈕'
1491
+  FONTDATA_ITEM(294, 175, 175, fontpage_294_175_175), // '錯' -- '錯'
1492
+  FONTDATA_ITEM(294, 245, 245, fontpage_294_245_245), // '鍵' -- '鍵'
1493
+  FONTDATA_ITEM(298, 247, 247, fontpage_298_247_247), // '長' -- '長'
1494
+  FONTDATA_ITEM(299, 137, 137, fontpage_299_137_137), // '閉' -- '閉'
1495
+  FONTDATA_ITEM(299, 139, 139, fontpage_299_139_139), // '開' -- '開'
1496
+  FONTDATA_ITEM(299, 147, 147, fontpage_299_147_147), // '間' -- '間'
1497
+  FONTDATA_ITEM(299, 220, 220, fontpage_299_220_220), // '關' -- '關'
1498
+  FONTDATA_ITEM(300, 205, 205, fontpage_300_205_205), // '降' -- '降'
1499
+  FONTDATA_ITEM(300, 228, 228, fontpage_300_228_228), // '除' -- '除'
1500
+  FONTDATA_ITEM(301, 142, 142, fontpage_301_142_142), // '階' -- '階'
1501
+  FONTDATA_ITEM(301, 217, 217, fontpage_301_217_217), // '雙' -- '雙'
1502
+  FONTDATA_ITEM(301, 226, 226, fontpage_301_226_226), // '離' -- '離'
1503
+  FONTDATA_ITEM(301, 251, 251, fontpage_301_251_251), // '電' -- '電'
1504
+  FONTDATA_ITEM(302, 210, 210, fontpage_302_210_210), // '青' -- '青'
1505
+  FONTDATA_ITEM(302, 222, 222, fontpage_302_222_222), // '非' -- '非'
1506
+  FONTDATA_ITEM(302, 226, 226, fontpage_302_226_226), // '面' -- '面'
1507
+  FONTDATA_ITEM(304, 133, 133, fontpage_304_133_133), // '項' -- '項'
1508
+  FONTDATA_ITEM(304, 144, 144, fontpage_304_144_144), // '預' -- '預'
1509
+  FONTDATA_ITEM(304, 205, 205, fontpage_304_205_205), // '額' -- '額'
1510
+  FONTDATA_ITEM(304, 222, 222, fontpage_304_222_222), // '類' -- '類'
1511
+  FONTDATA_ITEM(305, 168, 168, fontpage_305_168_168), // '風' -- '風'
1512
+  FONTDATA_ITEM(305, 253, 253, fontpage_305_253_253), // '飽' -- '飽'
1513
+  FONTDATA_ITEM(306, 152, 152, fontpage_306_152_152), // '餘' -- '餘'
1514
+  FONTDATA_ITEM(307, 172, 172, fontpage_307_172_172), // '馬' -- '馬'
1515
+  FONTDATA_ITEM(308, 197, 197, fontpage_308_197_197), // '驅' -- '驅'
1516
+  FONTDATA_ITEM(309, 212, 212, fontpage_309_212_212), // '體' -- '體'
1517
+  FONTDATA_ITEM(309, 216, 216, fontpage_309_216_216), // '高' -- '高'
1518
+  FONTDATA_ITEM(317, 195, 195, fontpage_317_195_195), // '黃' -- '黃'
1519
+  FONTDATA_ITEM(317, 222, 222, fontpage_317_222_222), // '點' -- '點'
1520
+  FONTDATA_ITEM(318, 202, 202, fontpage_318_202_202), // '齊' -- '齊'
1521
+  FONTDATA_ITEM(510, 154, 154, fontpage_510_154_154), // ':' -- ':'
1521 1522
 };

+ 35
- 1
Marlin/src/lcd/dogm/marlinui_DOGM.cpp Ver fichero

@@ -79,6 +79,18 @@
79 79
 U8G_CLASS u8g;
80 80
 
81 81
 #include LANGUAGE_DATA_INCL(LCD_LANGUAGE)
82
+#ifdef LCD_LANGUAGE_2
83
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_2)
84
+#endif
85
+#ifdef LCD_LANGUAGE_3
86
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_3)
87
+#endif
88
+#ifdef LCD_LANGUAGE_4
89
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_4)
90
+#endif
91
+#ifdef LCD_LANGUAGE_5
92
+  #include LANGUAGE_DATA_INCL(LCD_LANGUAGE_5)
93
+#endif
82 94
 
83 95
 #if HAS_LCD_CONTRAST
84 96
 
@@ -293,7 +305,29 @@ void MarlinUI::init_lcd() {
293 305
   TERN_(LCD_SCREEN_ROT_180, u8g.setRot180());
294 306
   TERN_(LCD_SCREEN_ROT_270, u8g.setRot270());
295 307
 
296
-  uxg_SetUtf8Fonts(g_fontinfo, COUNT(g_fontinfo));
308
+  update_language_font();
309
+}
310
+
311
+void MarlinUI::update_language_font() {
312
+  #if HAS_MULTI_LANGUAGE
313
+    switch (language) {
314
+      default: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE), COUNT(LANG_FONT_INFO(LCD_LANGUAGE))); break;
315
+      #ifdef LCD_LANGUAGE_2
316
+        case 1: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_2), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_2))); break;
317
+      #endif
318
+      #ifdef LCD_LANGUAGE_3
319
+        case 2: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_3), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_3))); break;
320
+      #endif
321
+      #ifdef LCD_LANGUAGE_4
322
+        case 3: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_4), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_4))); break;
323
+      #endif
324
+      #ifdef LCD_LANGUAGE_5
325
+        case 4: uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE_5), COUNT(LANG_FONT_INFO(LCD_LANGUAGE_5))); break;
326
+      #endif
327
+    }
328
+  #else
329
+    uxg_SetUtf8Fonts(LANG_FONT_INFO(LCD_LANGUAGE), COUNT(LANG_FONT_INFO(LCD_LANGUAGE)));
330
+  #endif
297 331
 }
298 332
 
299 333
 // The kill screen is displayed for unrecoverable conditions

+ 3
- 0
Marlin/src/lcd/dogm/u8g_fontutf8.h Ver fichero

@@ -35,3 +35,6 @@ int uxg_GetUtf8StrPixelWidth(u8g_t *pu8g, const char *utf8_msg);
35 35
 int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, PGM_P utf8_msg);
36 36
 
37 37
 #define uxg_GetFont(puxg) ((puxg)->font)
38
+
39
+#define _LANG_FONT_INFO(L) g_fontinfo_##L
40
+#define LANG_FONT_INFO(L) _LANG_FONT_INFO(L)

+ 1
- 1
Marlin/src/lcd/language/language_zh_CN.h Ver fichero

@@ -31,7 +31,7 @@ namespace Language_zh_CN {
31 31
   using namespace Language_en;  // Inherit undefined strings from English
32 32
 
33 33
   constexpr uint8_t    CHARSIZE                            = 3;
34
-  PROGMEM Language_Str LANGUAGE                            = _UxGT("简体中文");
34
+  PROGMEM Language_Str LANGUAGE                            = _UxGT("Simplified Chinese");
35 35
 
36 36
   PROGMEM Language_Str WELCOME_MSG                         = MACHINE_NAME _UxGT("已就绪.");     //" ready."
37 37
   PROGMEM Language_Str MSG_MARLIN                          = _UxGT("马林");

+ 8
- 0
Marlin/src/lcd/marlinui.cpp Ver fichero

@@ -88,6 +88,14 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
88 88
 
89 89
 #if HAS_MULTI_LANGUAGE
90 90
   uint8_t MarlinUI::language; // Initialized by settings.load()
91
+  void MarlinUI::set_language(const uint8_t lang) {
92
+    if (lang < NUM_LANGUAGES) {
93
+      language = lang;
94
+      TERN_(HAS_MARLINUI_U8GLIB, update_language_font());
95
+      return_to_status();
96
+      refresh();
97
+    }
98
+  }
91 99
 #endif
92 100
 
93 101
 #if ENABLED(SOUND_MENU_ITEM)

+ 5
- 7
Marlin/src/lcd/marlinui.h Ver fichero

@@ -200,13 +200,11 @@ public:
200 200
 
201 201
   #if HAS_MULTI_LANGUAGE
202 202
     static uint8_t language;
203
-    static inline void set_language(const uint8_t lang) {
204
-      if (lang < NUM_LANGUAGES) {
205
-        language = lang;
206
-        return_to_status();
207
-        refresh();
208
-      }
209
-    }
203
+    static void set_language(const uint8_t lang);
204
+  #endif
205
+
206
+  #if HAS_MARLINUI_U8GLIB
207
+    static void update_language_font();
210 208
   #endif
211 209
 
212 210
   #if ENABLED(SOUND_MENU_ITEM)

Loading…
Cancelar
Guardar