From 9523658467b444caec37de6357964635e99938e0 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 4 Jun 2014 14:37:31 +0100 Subject: Fix number of many characters from the Geometric Shapes block. --- framebuffer/GEN_font_internal.c | 50 +++++----- framebuffer/res/fonts/glyph_data | 192 +++++++++++++++++++-------------------- 2 files changed, 121 insertions(+), 121 deletions(-) (limited to 'framebuffer') diff --git a/framebuffer/GEN_font_internal.c b/framebuffer/GEN_font_internal.c index 087cf52b4..df63bbb2c 100644 --- a/framebuffer/GEN_font_internal.c +++ b/framebuffer/GEN_font_internal.c @@ -682,27 +682,33 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x047D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0481, 0x0482, + 0x0483, 0x0484, 0x0485, 0x0486, + 0x0487, 0x0488, 0x0485, 0x0486, + 0x0489, 0x048A, 0x048B, 0x048C, + 0x048D, 0x048E, 0x048F, 0x0490, + 0x048D, 0x048E, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0491, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0481, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x047A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0494, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x047A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0484, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -710,13 +716,13 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0495, 0x0496, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0485, 0x0486, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -746,12 +752,6 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0487, 0x0488, - 0x0489, 0x048A, 0x048B, 0x048C, - 0x048D, 0x048E, 0x048B, 0x048C, - 0x048F, 0x0490, 0x0491, 0x0492, - 0x0493, 0x0494, 0x0495, 0x0496, - 0x0493, 0x0494, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2005,7 +2005,7 @@ const uint16_t fb_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0482, + 0x0000, 0x0000, 0x0000, 0x0492, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2810,7 +2810,7 @@ const uint16_t fb_bold_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0481, + 0x0000, 0x0000, 0x0000, 0x0491, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -3615,7 +3615,7 @@ const uint16_t fb_bold_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0483, + 0x0000, 0x0000, 0x0000, 0x0493, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -6066,18 +6066,6 @@ const uint8_t font_glyph_data[19344] = { 0x3E, 0x3E, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x3E, 0x7C, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x7E, - 0x66, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x3F, - 0x33, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x7E, - 0x72, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x38, 0x7C, 0x28, 0x44, 0x28, 0x54, - 0x82, 0x82, 0x82, 0x82, 0x44, 0x38, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0xAA, - 0x82, 0xBA, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x38, 0x7C, 0xFE, 0xD6, - 0xFE, 0xBA, 0xC6, 0x7C, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x7C, 0x7C, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x28, @@ -6110,6 +6098,18 @@ const uint8_t font_glyph_data[19344] = { 0x7C, 0x1C, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1C, 0x64, 0x64, 0x1C, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x7E, + 0x66, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x3F, + 0x33, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x7E, + 0x72, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x7C, 0x28, 0x44, 0x28, 0x54, + 0x82, 0x82, 0x82, 0x82, 0x44, 0x38, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0xAA, + 0x82, 0xBA, 0x92, 0x44, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x38, 0x7C, 0xFE, 0xD6, + 0xFE, 0xBA, 0xC6, 0x7C, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x18, 0x18, 0xD8, 0xF0, 0x70, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x06, 0x06, 0x0C, diff --git a/framebuffer/res/fonts/glyph_data b/framebuffer/res/fonts/glyph_data index 58a0c62c8..c4bb2b1cb 100644 --- a/framebuffer/res/fonts/glyph_data +++ b/framebuffer/res/fonts/glyph_data @@ -8613,83 +8613,7 @@ U+25AA - BLACK SMALL SQUARE ........ ........ ........ ........ ........ ........ ........ ........ ----------------------------------------------------- -U+25CB - WHITE CIRCLE -- - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ ........ ........ - ........ ........ ........ ........ - ........ ........ ........ ........ - ........ ........ ........ ........ - ........ ........ ........ ........ - ........ ........ ........ ........ - ..####.. ...####. ..####.. ...####. - .######. ..###### .######. .######. - .##..##. ..##..## .##..##. .###..#. - .##..##. .##..##. .##..##. .##..##. - .######. .######. .######. .######. - ..####.. ..####.. ..####.. ..####.. - ........ ........ ........ ........ - ........ ........ ........ ........ - ........ ........ ........ ........ - ........ ........ ........ ........ ------------------------------------------------------ -U+2603 - SNOWMAN -- - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ - ........ - ..###... - .#####.. - ..#.#... - .#...#.. - ..#.#... - .#.#.#.. - #.....#. - #.....#. - #.....#. - #.....#. - .#...#.. - ..###... - ........ - ........ ------------------------------------------------------ -U+263A - WHITE SMILING FACE -- - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ - ........ - ........ - ........ - ..###... - .#...#.. - #.....#. - #.#.#.#. - #.....#. - #.###.#. - #..#..#. - .#...#.. - ..###... - ........ - ........ - ........ ------------------------------------------------------ -U+263B - BLACK SMILING FACE -- - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ - ........ - ........ - ........ - ..###... - .#####.. - #######. - ##.#.##. - #######. - #.###.#. - ##...##. - .#####.. - ..###... - ........ - ........ - ........ ------------------------------------------------------ -U+26B2 - BLACK UP-POINTING TRIANGLE +U+25B2 - BLACK UP-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8708,7 +8632,7 @@ U+26B2 - BLACK UP-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26B3 - WHITE UP-POINTING TRIANGLE +U+25B3 - WHITE UP-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8727,7 +8651,7 @@ U+26B3 - WHITE UP-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26B4 - BLACK UP-POINTING SMALL TRIANGLE +U+25B4 - BLACK UP-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8746,7 +8670,7 @@ U+26B4 - BLACK UP-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26B5 - WHITE UP-POINTING SMALL TRIANGLE +U+25B5 - WHITE UP-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8765,7 +8689,7 @@ U+26B5 - WHITE UP-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26B6 - BLACK RIGHT-POINTING TRIANGLE +U+25B6 - BLACK RIGHT-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8784,7 +8708,7 @@ U+26B6 - BLACK RIGHT-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26B7 - WHITE RIGHT-POINTING TRIANGLE +U+25B7 - WHITE RIGHT-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8803,7 +8727,7 @@ U+26B7 - WHITE RIGHT-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26B8 - BLACK RIGHT-POINTING SMALL TRIANGLE +U+25B8 - BLACK RIGHT-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8822,7 +8746,7 @@ U+26B8 - BLACK RIGHT-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26B9 - WHITE RIGHT-POINTING SMALL TRIANGLE +U+25B9 - WHITE RIGHT-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8841,7 +8765,7 @@ U+26B9 - WHITE RIGHT-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26BA - BLACK RIGHT-POINTING POINTER +U+25BA - BLACK RIGHT-POINTING POINTER - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8860,7 +8784,7 @@ U+26BA - BLACK RIGHT-POINTING POINTER ........ ........ ----------------------------------------------------- -U+26BB - WHITE RIGHT-POINTING POINTER +U+25BB - WHITE RIGHT-POINTING POINTER - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8879,7 +8803,7 @@ U+26BB - WHITE RIGHT-POINTING POINTER ........ ........ ----------------------------------------------------- -U+26BC - BLACK DOWN-POINTING TRIANGLE +U+25BC - BLACK DOWN-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8898,7 +8822,7 @@ U+26BC - BLACK DOWN-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26BD - WHITE DOWN-POINTING TRIANGLE +U+25BD - WHITE DOWN-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8917,7 +8841,7 @@ U+26BD - WHITE DOWN-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26BE - BLACK DOWN-POINTING SMALL TRIANGLE +U+25BE - BLACK DOWN-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8936,7 +8860,7 @@ U+26BE - BLACK DOWN-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26BF - WHITE DOWN-POINTING SMALL TRIANGLE +U+25BF - WHITE DOWN-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8955,7 +8879,7 @@ U+26BF - WHITE DOWN-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26C0 - BLACK LEFT-POINTING TRIANGLE +U+25C0 - BLACK LEFT-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8974,7 +8898,7 @@ U+26C0 - BLACK LEFT-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26C1 - WHITE LEFT-POINTING TRIANGLE +U+25C1 - WHITE LEFT-POINTING TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -8993,7 +8917,7 @@ U+26C1 - WHITE LEFT-POINTING TRIANGLE ........ ........ ----------------------------------------------------- -U+26C2 - BLACK LEFT-POINTING SMALL TRIANGLE +U+25C2 - BLACK LEFT-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -9012,7 +8936,7 @@ U+26C2 - BLACK LEFT-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26C3 - WHITE LEFT-POINTING SMALL TRIANGLE +U+25C3 - WHITE LEFT-POINTING SMALL TRIANGLE - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -9031,7 +8955,7 @@ U+26C3 - WHITE LEFT-POINTING SMALL TRIANGLE ........ ........ ----------------------------------------------------- -U+26C4 - BLACK LEFT-POINTING POINTER +U+25C4 - BLACK LEFT-POINTING POINTER - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -9050,7 +8974,7 @@ U+26C4 - BLACK LEFT-POINTING POINTER ........ ........ ----------------------------------------------------- -U+26C5 - WHITE LEFT-POINTING POINTER +U+25C5 - WHITE LEFT-POINTING POINTER - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ @@ -9069,6 +8993,82 @@ U+26C5 - WHITE LEFT-POINTING POINTER ........ ........ ----------------------------------------------------- +U+25CB - WHITE CIRCLE +- - - - - - - - - - - - - - - - - - - - - - - - - - - + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ..####.. ...####. ..####.. ...####. + .######. ..###### .######. .######. + .##..##. ..##..## .##..##. .###..#. + .##..##. .##..##. .##..##. .##..##. + .######. .######. .######. .######. + ..####.. ..####.. ..####.. ..####.. + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ +----------------------------------------------------- +U+2603 - SNOWMAN +- - - - - - - - - - - - - - - - - - - - - - - - - - - + ........ + ........ + ..###... + .#####.. + ..#.#... + .#...#.. + ..#.#... + .#.#.#.. + #.....#. + #.....#. + #.....#. + #.....#. + .#...#.. + ..###... + ........ + ........ +----------------------------------------------------- +U+263A - WHITE SMILING FACE +- - - - - - - - - - - - - - - - - - - - - - - - - - - + ........ + ........ + ........ + ........ + ..###... + .#...#.. + #.....#. + #.#.#.#. + #.....#. + #.###.#. + #..#..#. + .#...#.. + ..###... + ........ + ........ + ........ +----------------------------------------------------- +U+263B - BLACK SMILING FACE +- - - - - - - - - - - - - - - - - - - - - - - - - - - + ........ + ........ + ........ + ........ + ..###... + .#####.. + #######. + ##.#.##. + #######. + #.###.#. + ##...##. + .#####.. + ..###... + ........ + ........ + ........ +----------------------------------------------------- U+2713 - CHECK MARK - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ ........ ........ ........ -- cgit v1.2.3