From ab974bee978332647c2917f8aec8a77b8dabd9c7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 17 Dec 2011 21:42:11 +0000 Subject: (svn r23582) -Fix [FS#4870]: add missing characters for certain languages and the large font -Codechange: don't remove large font glyphs because they are broken in the original font, just fix them up in openttd.grf using action A -Change: make extra characters more consistent with the original font All by PaulC. --- src/fontcache.cpp | 6 ++---- src/table/unicode.h | 22 ---------------------- 2 files changed, 2 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 3e3aaf02b..ad67b66d2 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -1276,13 +1276,11 @@ void InitializeUnicodeGlyphMap() for (uint i = 0; i < lengthof(_default_unicode_map); i++) { byte key = _default_unicode_map[i].key; - if (key == CLRA || key == CLRL) { + if (key == CLRA) { /* Clear the glyph. This happens if the glyph at this code point * is non-standard and should be accessed by an SCC_xxx enum * entry only. */ - if (key == CLRA || size == FS_LARGE) { - SetUnicodeGlyph(size, _default_unicode_map[i].code, 0); - } + SetUnicodeGlyph(size, _default_unicode_map[i].code, 0); } else { SpriteID sprite = base + key - ASCII_LETTERSTART; SetUnicodeGlyph(size, _default_unicode_map[i].code, sprite); diff --git a/src/table/unicode.h b/src/table/unicode.h index 862878e6f..a83a65861 100644 --- a/src/table/unicode.h +++ b/src/table/unicode.h @@ -15,7 +15,6 @@ struct DefaultUnicodeMapping { }; static const byte CLRA = 0; ///< Identifier to clear all glyphs at this codepoint -static const byte CLRL = 1; ///< Identifier to clear glyphs for large font at this codepoint /* Default unicode mapping table for sprite based glyphs. * This table allows us use unicode characters even though the glyphs don't @@ -24,39 +23,18 @@ static const byte CLRL = 1; ///< Identifier to clear glyphs for large font at th static const DefaultUnicodeMapping _default_unicode_map[] = { { 0x00A0, 0x20 }, // Non-breaking space / Up arrow - { 0x00A4, CLRL }, // Currency sign - { 0x00A6, CLRL }, // Broken bar - { 0x00A7, CLRL }, // Section sign - { 0x00A8, CLRL }, // Diaeresis - { 0x00A9, CLRL }, // Copyright sign { 0x00AA, CLRA }, // Feminine ordinal indicator / Down arrow { 0x00AC, CLRA }, // Not sign / Tick mark { 0x00AD, 0x20 }, // Soft hyphen / X mark { 0x00AF, CLRA }, // Macron / Right arrow - { 0x00B0, CLRL }, // Degree sign - { 0x00B1, CLRL }, // Plus-Minus sign - { 0x00B2, CLRL }, // Superscript 2 - { 0x00B3, CLRL }, // Superscript 3 { 0x00B4, CLRA }, // Acute accent / Train symbol { 0x00B5, CLRA }, // Micro sign / Truck symbol { 0x00B6, CLRA }, // Pilcrow sign / Bus symbol { 0x00B7, CLRA }, // Middle dot / Aircraft symbol { 0x00B8, CLRA }, // Cedilla / Ship symbol { 0x00B9, CLRA }, // Superscript 1 / Superscript -1 - { 0x00BA, CLRL }, // Masculine ordinal indicator { 0x00BC, CLRA }, // One quarter / Small up arrow { 0x00BD, CLRA }, // One half / Small down arrow - { 0x00BE, CLRL }, // Three quarters - { 0x00D0, CLRL }, // Capital letter eth - { 0x00D7, CLRL }, // Multiplication sign - { 0x00D8, CLRL }, // Capital letter O with stroke - { 0x00D9, CLRL }, // Capital letter U with grave - { 0x00DE, CLRL }, // Capital letter thorn - { 0x00E6, CLRL }, // Small letter ae - { 0x00F0, CLRL }, // Small letter eth - { 0x00F7, CLRL }, // Divison sign - { 0x00F8, CLRL }, // Small letter o with stroke - { 0x00FE, CLRL }, // Small letter thorn { 0x0178, 0x9F }, // Capital letter Y with diaeresis { 0x010D, 0x63 }, // Small letter c with caron }; -- cgit v1.2.3-70-g09d2