Skip to content

Commit

Permalink
Complete the main Cyrillic block (0x0400 - 0x045F).
Browse files Browse the repository at this point in the history
  • Loading branch information
@savask @mniip
savask authored and mniip committed May 12, 2018
1 parent b5c742f commit a48c8de
Showing 1 changed file with 58 additions and 30 deletions.
88 changes: 58 additions & 30 deletions data/font.cpp
View file
Expand Up @@ -130,6 +130,20 @@ extern const unsigned char font_data[] = {
0x04, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x1C, 0x00, 0x07, 0xEF, 0x32, 0x00, 0x03, 0xF0, 0x0B, 0x03, 0x30, 0x10, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0xDC, 0x01, 0x00, 0xFF, 0x32, 0x00, 0x03, 0xF0, 0x0B, 0x03, 0x30, 0x10, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x02, 0x30, 0x00, 0x30, 0x00, 0xF0, 0x1F, 0x30, 0x34, 0x30, 0x34, 0x30, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0xC0, 0x00, 0x02, 0xFF, 0x77, 0x00, 0x07, 0x70, 0x00, 0x07, 0x70, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xF4, 0xD1, 0x34, 0x03, 0xF1, 0x0B, 0x03, 0x70, 0x34, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xFC, 0xB1, 0x31, 0x07, 0xD0, 0x0F, 0x90, 0x23, 0x34, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x1D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x33, 0x00, 0x1D, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xD0, 0x01, 0x0C, 0xC0, 0x00, 0x0C, 0xC0, 0x10, 0x0D, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00,
0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xFF, 0x00, 0x70, 0x30, 0x00, 0x0C, 0x0C, 0x00, 0x03, 0xFF, 0xC1, 0xC0, 0xD0, 0x30, 0x30, 0x34, 0x0B, 0xFC, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x03, 0x30, 0x30, 0x00, 0x03, 0x03, 0xF0, 0xFF, 0x1F, 0x03, 0x43, 0x33, 0x30, 0x34, 0x47, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x02, 0x30, 0x00, 0x30, 0x00, 0xF0, 0x0F, 0x30, 0x34, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0xC0, 0x00, 0x02, 0x47, 0x33, 0x0D, 0xB7, 0xF0, 0x02, 0xB3, 0x30, 0x2C, 0x47, 0x0B, 0x00, 0x00, 0x00, 0x00,
0x07, 0x30, 0x00, 0x20, 0x70, 0xD0, 0x0C, 0x3C, 0xC3, 0xCD, 0x28, 0x73, 0xC3, 0x3C, 0x30, 0x07, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x30, 0x0C, 0xA0, 0xE0, 0xC0, 0x30, 0x30, 0x1C, 0x0C, 0xFD, 0x03, 0xD0, 0x00, 0x34, 0xF0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x47, 0x33, 0x30, 0x03, 0x33, 0x30, 0x03, 0x33, 0x30, 0xFF, 0x03, 0x03, 0x20, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x74, 0xD0, 0x1D, 0x47, 0x33, 0x30, 0xFF, 0x33, 0x30, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xFF, 0x31, 0x00, 0x03, 0xF0, 0x1F, 0x43, 0x33, 0x34, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0xBF, 0x30, 0x38, 0x43, 0xF3, 0x1F, 0x43, 0x33, 0x34, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00,
Expand Down Expand Up @@ -196,6 +210,20 @@ extern const unsigned char font_data[] = {
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x1C, 0xD3, 0xCF, 0x30, 0xD3, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x70, 0x40, 0x03, 0x00, 0x7D, 0x0C, 0xF3, 0xCB, 0x00, 0xBD, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xD0, 0x0D, 0x00, 0x7D, 0x0C, 0xF3, 0xCB, 0x00, 0xBD, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x0C, 0xF0, 0x0B, 0x0C, 0xC0, 0x1F, 0x8C, 0xC3, 0x30, 0x1C, 0x03, 0x34, 0xD0, 0x01, 0x00,
0x05, 0x00, 0xC0, 0x80, 0x00, 0x00, 0xFF, 0x1C, 0x30, 0xC0, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x5C, 0xF2, 0xC2, 0x20, 0x3C, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x0C, 0xC1, 0x43, 0x30, 0x3F, 0x00, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x04, 0x1C, 0x00, 0x0D, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x00, 0x33, 0x00, 0x0D, 0x0C, 0x0C, 0x1D, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x00, 0x30, 0x00, 0x34, 0x30, 0x30, 0x30, 0x30, 0x1E, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x00, 0xDC, 0x00, 0xCC, 0x1F, 0xCD, 0x35, 0xCB, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC7, 0x00, 0xC3, 0x00, 0xFF, 0x1F, 0xC3, 0x34, 0xD3, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00, 0x0C, 0xF0, 0x0B, 0x0C, 0xC0, 0x1F, 0x8C, 0xC3, 0x30, 0x1C, 0x03, 0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00, 0x03, 0x02, 0xD3, 0xDC, 0xF1, 0xC1, 0x1C, 0xC7, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0xC0, 0x00, 0x08, 0xC7, 0x8D, 0xB3, 0xCF, 0x33, 0xC7, 0x01, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x30, 0x0C, 0x0A, 0xC3, 0x0C, 0x73, 0x4C, 0x37, 0x74, 0xC0, 0xF0, 0x01, 0x00,
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0C, 0x33, 0xCC, 0x35, 0xFF, 0x30, 0x80, 0x00, 0x00,
0x08, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x1F, 0x00, 0x7F, 0x00, 0xFF, 0x01, 0xFF, 0x07, 0xFF, 0x1F, 0xFF, 0x7F, 0xFF, 0x1B, 0xBF, 0x01, 0x1B, 0x00,
0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xFF, 0x00, 0x00, 0xF8, 0xF0, 0x3F, 0xEE, 0x2C, 0x30, 0xCB, 0x0B, 0x30, 0x42, 0xC3, 0x33, 0x00, 0x03, 0x30, 0x00, 0xF3, 0x33, 0x00, 0x03, 0x30, 0x00, 0xFF, 0x3F, 0x00,
0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0xCB, 0x00, 0x00, 0xEE, 0xC0, 0xFF, 0xF8, 0xB0, 0xC0, 0xFF, 0x2C, 0xC0, 0x00, 0x0C, 0xCF, 0x00, 0x0C, 0xC0, 0x00, 0xCC, 0xCF, 0x00, 0x0C, 0xC0, 0x00, 0xFC, 0xFF,
Expand Down Expand Up @@ -345,41 +373,41 @@ extern const unsigned short font_ptrs[] = {
0x0778, 0x0788, 0x0798, 0x07A5, 0x07B5, 0x07C2, 0x07D2, 0x07E2,
0x07F5, 0x0805, 0x0815, 0x0825, 0x0832, 0x0839, 0x0846, 0x0859,

0x0866, 0x0879,

0x088C, 0x089F, 0x08B2, 0x08C5, 0x08D8, 0x08EE, 0x0901, 0x091A,
0x092D, 0x0943, 0x0959, 0x096C, 0x0982, 0x099B, 0x09AE, 0x09C4,
0x09D7, 0x09EA, 0x09FD, 0x0A10, 0x0A26, 0x0A45, 0x0A5B, 0x0A71,
0x0A87, 0x0AA6, 0x0AC8, 0x0AE1, 0x0AFA, 0x0B0D, 0x0B20, 0x0B3C,
0x0B4F, 0x0B5F, 0x0B72, 0x0B82, 0x0B92, 0x0BA5, 0x0BB5, 0x0BCE,
0x0BDE, 0x0BEE, 0x0BFE, 0x0C0E, 0x0C1E, 0x0C34, 0x0C44, 0x0C54,
0x0C64, 0x0C74, 0x0C84, 0x0C97, 0x0CA7, 0x0CBA, 0x0CCA, 0x0CDA,
0x0CEA, 0x0CFD, 0x0D10, 0x0D23, 0x0D39, 0x0D49, 0x0D59, 0x0D6F,
0x0D7F, 0x0D8F,
0x0866, 0x0879, 0x088C, 0x08A5, 0x08B8, 0x08CB, 0x08DE, 0x08EB,
0x08F8, 0x090B, 0x092D, 0x094C, 0x0965, 0x0978, 0x098E, 0x09A4,
0x09B7, 0x09CA, 0x09DD, 0x09F0, 0x0A03, 0x0A19, 0x0A2C, 0x0A45,
0x0A58, 0x0A6E, 0x0A84, 0x0A97, 0x0AAD, 0x0AC6, 0x0AD9, 0x0AEF,
0x0B02, 0x0B15, 0x0B28, 0x0B3B, 0x0B51, 0x0B70, 0x0B86, 0x0B9C,
0x0BB2, 0x0BD1, 0x0BF3, 0x0C0C, 0x0C25, 0x0C38, 0x0C4B, 0x0C67,
0x0C7A, 0x0C8A, 0x0C9D, 0x0CAD, 0x0CBD, 0x0CD0, 0x0CE0, 0x0CF9,
0x0D09, 0x0D19, 0x0D29, 0x0D39, 0x0D49, 0x0D5F, 0x0D6F, 0x0D7F,
0x0D8F, 0x0D9F, 0x0DAF, 0x0DC2, 0x0DD2, 0x0DE5, 0x0DF5, 0x0E05,
0x0E15, 0x0E28, 0x0E3B, 0x0E4E, 0x0E64, 0x0E74, 0x0E84, 0x0E9A,
0x0EAA, 0x0EBA, 0x0ECA, 0x0EDD, 0x0EED, 0x0EFD, 0x0F0D, 0x0F1A,
0x0F27, 0x0F34, 0x0F4D, 0x0F66, 0x0F79, 0x0F89, 0x0F99, 0x0FA9,

0x0D9F, 0x0DB8, 0x0DDD, 0x0E02, 0x0E21, 0x0E46, 0x0E65, 0x0E84,
0x0EA3, 0x0EC2, 0x0EE1, 0x0F00, 0x0F1F, 0x0F44, 0x0F57, 0x0F76,
0x0F95, 0x0FB4, 0x0FD3, 0x0FEC, 0x100E, 0x1030, 0x1055, 0x107A,
0x1096, 0x10B2, 0x10CE, 0x10EA, 0x1106, 0x1122, 0x113E, 0x115A,
0x1176, 0x1192, 0x11AE, 0x11CD, 0x11EF, 0x1211, 0x122A, 0x1249,
0x1268, 0x1287, 0x12A6, 0x12C2, 0x12CF, 0x12D9, 0x12E3, 0x12F3,
0x1303, 0x1313, 0x1323, 0x1333, 0x1343, 0x1353, 0x1363, 0x1373,
0x1383, 0x1393, 0x13A0, 0x13AA, 0x13B4, 0x13C4, 0x13D7, 0x13EA,
0x1409, 0x1428, 0x1447, 0x1466, 0x1485, 0x14A4, 0x14C3, 0x14E2,
0x1501, 0x1520, 0x153F, 0x155E, 0x157D, 0x159C, 0x15BB, 0x15DA,
0x15F6, 0x1615, 0x1634, 0x1653, 0x1672, 0x1691, 0x16B0, 0x16CF,
0x16EE, 0x16FE, 0x1717, 0x1733, 0x1752, 0x1771, 0x1790, 0x17AF,
0x17CE, 0x17F0, 0x180F, 0x182E, 0x184D, 0x1872, 0x1891, 0x18B0,
0x18CF, 0x18E2, 0x18F5, 0x1908, 0x191B, 0x192E, 0x1941, 0x1954,
0x1967, 0x197A, 0x198D, 0x19A0, 0x19B3, 0x19C6, 0x19D9, 0x19EC,
0x19FF, 0x1A12, 0x1A25, 0x1A38, 0x1A4B, 0x1A5E, 0x1A71, 0x1A84,
0x0FB9, 0x0FD2, 0x0FF7, 0x101C, 0x103B, 0x1060, 0x107F, 0x109E,
0x10BD, 0x10DC, 0x10FB, 0x111A, 0x1139, 0x115E, 0x1171, 0x1190,
0x11AF, 0x11CE, 0x11ED, 0x1206, 0x1228, 0x124A, 0x126F, 0x1294,
0x12B0, 0x12CC, 0x12E8, 0x1304, 0x1320, 0x133C, 0x1358, 0x1374,
0x1390, 0x13AC, 0x13C8, 0x13E7, 0x1409, 0x142B, 0x1444, 0x1463,
0x1482, 0x14A1, 0x14C0, 0x14DC, 0x14E9, 0x14F3, 0x14FD, 0x150D,
0x151D, 0x152D, 0x153D, 0x154D, 0x155D, 0x156D, 0x157D, 0x158D,
0x159D, 0x15AD, 0x15BA, 0x15C4, 0x15CE, 0x15DE, 0x15F1, 0x1604,
0x1623, 0x1642, 0x1661, 0x1680, 0x169F, 0x16BE, 0x16DD, 0x16FC,
0x171B, 0x173A, 0x1759, 0x1778, 0x1797, 0x17B6, 0x17D5, 0x17F4,
0x1810, 0x182F, 0x184E, 0x186D, 0x188C, 0x18AB, 0x18CA, 0x18E9,
0x1908, 0x1918, 0x1931, 0x194D, 0x196C, 0x198B, 0x19AA, 0x19C9,
0x19E8, 0x1A0A, 0x1A29, 0x1A48, 0x1A67, 0x1A8C, 0x1AAB, 0x1ACA,
0x1AE9, 0x1AFC, 0x1B0F, 0x1B22, 0x1B35, 0x1B48, 0x1B5B, 0x1B6E,
0x1B81, 0x1B94, 0x1BA7, 0x1BBA, 0x1BCD, 0x1BE0, 0x1BF3, 0x1C06,
0x1C19, 0x1C2C, 0x1C3F, 0x1C52, 0x1C65, 0x1C78, 0x1C8B, 0x1C9E,

0x1A97,
0x1CB1,
};
extern const unsigned int font_ranges[][2] = {
{ 0x000000, 0x00007F },
{ 0x000400, 0x000401 },
{ 0x000410, 0x000451 },
{ 0x000400, 0x00045F },
{ 0x00E000, 0x00E07F },
{ 0x00FFFD, 0x00FFFD },
{ 0, 0 },
Expand Down

0 comments on commit a48c8de

Please sign in to comment.