(svn r11981) -Fix [FS#1698]: Use unicode glyph mapping to fix up missing/shuffled sprites in original data files instead of shuffling or skipping

sprites directly. Some required glyphs were not loaded.
-Fix: Large capital U with grave (Ù) along with some other glyphs are broken in the original data files, so do no display them.

2 files changed, 48 insertions, 8 deletions

diff --git a/src/table/control_codes.h b/src/table/control_codes.h
index 5c1ae73e7..1af7befd7 100644
--- a/src/table/control_codes.h
+++ b/src/table/control_codes.h
@@ -116,18 +116,19 @@ enum StringControlCode {
 	 * These are mapped to the original glyphs */
 	SCC_LESSTHAN       = SCC_SPRITE_START + 0x3C,
 	SCC_GREATERTHAN    = SCC_SPRITE_START + 0x3E,
-	SCC_UPARROW        = SCC_SPRITE_START + 0x80,
-	SCC_SMALLUPARROW   = SCC_SPRITE_START + 0x90,
-	SCC_SMALLDOWNARROW = SCC_SPRITE_START + 0x91,
-	SCC_TRAIN          = SCC_SPRITE_START + 0x94,
-	SCC_LORRY          = SCC_SPRITE_START + 0x95,
-	SCC_BUS            = SCC_SPRITE_START + 0x96,
-	SCC_PLANE          = SCC_SPRITE_START + 0x97,
-	SCC_SHIP           = SCC_SPRITE_START + 0x98,
+	SCC_UPARROW        = SCC_SPRITE_START + 0xA0,
 	SCC_DOWNARROW      = SCC_SPRITE_START + 0xAA,
 	SCC_CHECKMARK      = SCC_SPRITE_START + 0xAC,
 	SCC_CROSS          = SCC_SPRITE_START + 0xAD,
 	SCC_RIGHTARROW     = SCC_SPRITE_START + 0xAF,
+	SCC_TRAIN          = SCC_SPRITE_START + 0xB4,
+	SCC_LORRY          = SCC_SPRITE_START + 0xB5,
+	SCC_BUS            = SCC_SPRITE_START + 0xB6,
+	SCC_PLANE          = SCC_SPRITE_START + 0xB7,
+	SCC_SHIP           = SCC_SPRITE_START + 0xB8,
+	SCC_SUPERSCRIPT_M1 = SCC_SPRITE_START + 0xB9,
+	SCC_SMALLUPARROW   = SCC_SPRITE_START + 0xBC,
+	SCC_SMALLDOWNARROW = SCC_SPRITE_START + 0xBD,
 };
 
 #endif /* CONTROL_CODES_H */
diff --git a/src/table/unicode.h b/src/table/unicode.h
index 01831fa2b..d6ed30f7b 100644
--- a/src/table/unicode.h
+++ b/src/table/unicode.h
@@ -6,6 +6,10 @@ struct DefaultUnicodeMapping {
 	byte key;   ///< Character index of sprite
 };
 
+enum {
+	CLRA = 0, ///< Identifier to clear all glyphs at this codepoint
+	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
@@ -13,5 +17,40 @@ struct DefaultUnicodeMapping {
  * This is not used for FreeType rendering */
 
 static 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 */
 };