From 2511dab4245ebf591273ccf38d74a7d0f005b300 Mon Sep 17 00:00:00 2001 From: GammaTendonNine Date: Thu, 12 Nov 2020 13:13:34 -0600 Subject: [PATCH] Revert "Quick fix for language loading: "case: ')' contained in string"" This reverts commit fc43915b3ddf2608e6de29d6f42d8566791c8047. --- src/text/txtconv.c | 195 +++++++++++++++------------------------------ 1 file changed, 66 insertions(+), 129 deletions(-) diff --git a/src/text/txtconv.c b/src/text/txtconv.c index 8c10bfe2..ead3e377 100644 --- a/src/text/txtconv.c +++ b/src/text/txtconv.c @@ -3,136 +3,73 @@ #include #include "txtconv.h" -struct Character charmap[512] = { - {"0", {0x0, NULL}}, {"{65296}", {0x0, NULL}}, {"1", {0x1, NULL}}, {"{65297}", {0x1, NULL}}, {"2", {0x2, NULL}}, {"{65298}", {0x2, NULL}}, {"3", {0x3, NULL}}, {"{65299}", {0x3, NULL}}, {"4", {0x4, NULL}}, - {"{65300}", {0x4, NULL}}, {"5", {0x5, NULL}}, {"{65301}", {0x5, NULL}}, {"6", {0x6, NULL}}, {"{65302}", {0x6, NULL}}, {"7", {0x7, NULL}}, {"{65303}", {0x7, NULL}}, {"8", {0x8, NULL}}, {"{65304}", {0x8, NULL}}, - {"9", {0x9, NULL}}, {"{65305}", {0x9, NULL}}, {"A", {0xa, NULL}}, {"{65313}", {0xa, NULL}}, {"B", {0xb, NULL}}, {"{65314}", {0xb, NULL}}, {"C", {0xc, NULL}}, {"{65315}", {0xc, NULL}}, {"D", {0xd, NULL}}, - {"{65316}", {0xd, NULL}}, {"E", {0xe, NULL}}, {"{65317}", {0xe, NULL}}, {"F", {0xf, NULL}}, {"{65318}", {0xf, NULL}}, {"G", {0x10, NULL}}, {"{65319}", {0x10, NULL}}, {"H", {0x11, NULL}}, {"{65320}", {0x11, NULL}}, - {"I", {0x12, NULL}}, {"{65321}", {0x12, NULL}}, {"J", {0x13, NULL}}, {"{65322}", {0x13, NULL}}, {"K", {0x14, NULL}}, {"{65323}", {0x14, NULL}}, {"L", {0x15, NULL}}, {"{65324}", {0x15, NULL}}, {"M", {0x16, NULL}}, - {"{65325}", {0x16, NULL}}, {"N", {0x17, NULL}}, {"{65326}", {0x17, NULL}}, {"O", {0x18, NULL}}, {"{65327}", {0x18, NULL}}, {"P", {0x19, NULL}}, {"{65328}", {0x19, NULL}}, {"Q", {0x1a, NULL}}, {"{65329}", {0x1a, NULL}}, - {"R", {0x1b, NULL}}, {"{65330}", {0x1b, NULL}}, {"S", {0x1c, NULL}}, {"{65331}", {0x1c, NULL}}, {"T", {0x1d, NULL}}, {"{65332}", {0x1d, NULL}}, {"U", {0x1e, NULL}}, {"{65333}", {0x1e, NULL}}, {"V", {0x1f, NULL}}, - {"{65334}", {0x1f, NULL}}, {"W", {0x20, NULL}}, {"{65335}", {0x20, NULL}}, {"X", {0x21, NULL}}, {"{65336}", {0x21, NULL}}, {"Y", {0x22, NULL}}, {"{65337}", {0x22, NULL}}, {"Z", {0x23, NULL}}, {"{65338}", {0x23, NULL}}, - {"a", {0x24, NULL}}, {"{65345}", {0x24, NULL}}, {"b", {0x25, NULL}}, {"{65346}", {0x25, NULL}}, {"c", {0x26, NULL}}, {"{65347}", {0x26, NULL}}, {"d", {0x27, NULL}}, {"{65348}", {0x27, NULL}}, {"e", {0x28, NULL}}, - {"{65349}", {0x28, NULL}}, {"f", {0x29, NULL}}, {"{65350}", {0x29, NULL}}, {"g", {0x2a, NULL}}, {"{65351}", {0x2a, NULL}}, {"h", {0x2b, NULL}}, {"{65352}", {0x2b, NULL}}, {"i", {0x2c, NULL}}, {"{65353}", {0x2c, NULL}}, - {"j", {0x2d, NULL}}, {"{65354}", {0x2d, NULL}}, {"k", {0x2e, NULL}}, {"{65355}", {0x2e, NULL}}, {"l", {0x2f, NULL}}, {"{65356}", {0x2f, NULL}}, {"m", {0x30, NULL}}, {"{65357}", {0x30, NULL}}, {"n", {0x31, NULL}}, - {"{65358}", {0x31, NULL}}, {"o", {0x32, NULL}}, {"{65359}", {0x32, NULL}}, {"p", {0x33, NULL}}, {"{65360}", {0x33, NULL}}, {"q", {0x34, NULL}}, {"{65361}", {0x34, NULL}}, {"r", {0x35, NULL}}, {"{65362}", {0x35, NULL}}, - {"s", {0x36, NULL}}, {"{65363}", {0x36, NULL}}, {"t", {0x37, NULL}}, {"{65364}", {0x37, NULL}}, {"u", {0x38, NULL}}, {"{65365}", {0x38, NULL}}, {"v", {0x39, NULL}}, {"{65366}", {0x39, NULL}}, {"w", {0x3a, NULL}}, - {"{65367}", {0x3a, NULL}}, {"x", {0x3b, NULL}}, {"{65368}", {0x3b, NULL}}, {"y", {0x3c, NULL}}, {"{65369}", {0x3c, NULL}}, {"z", {0x3d, NULL}}, {"{65370}", {0x3d, NULL}}, {"'", {0x3e, NULL}}, {"{65287}", {0x3e, NULL}}, - {".", {0x3f, NULL}}, {"{65294}", {0x3f, NULL}}, {",", {0x6f, NULL}}, {"{65292}", {0x6f, NULL}}, {"-", {0x9f, NULL}}, {"{65293}", {0x9f, NULL}}, {"(", {0xe1, NULL}}, {"{65288}", {0xe1, NULL}}, {")(", {0xe2, NULL}}, - {"）（", {0xe2, NULL}}, {")", {0xe3, NULL}}, {"{65289}", {0xe3, NULL}}, {"+", {0xe4, NULL}}, {"{65291}", {0xe4, NULL}}, {"&", {0xe5, NULL}}, {"{65286}", {0xe5, NULL}}, {":", {0xe6, NULL}}, {"{65306}", {0xe6, NULL}}, - {"!", {0xf2, NULL}}, {"{65281}", {0xf2, NULL}}, {"%", {0xf3, NULL}}, {"{65285}", {0xf3, NULL}}, {"?", {0xf4, NULL}}, {"{65311}", {0xf4, NULL}}, {"~", {0xf7, NULL}}, {"{65374}", {0xf7, NULL}}, {" ", {0x9e, NULL}}, - {"{12288}", {0x9e, NULL}}, {"\n", {0xfe, NULL}}, {"{12443}", {0xf0, NULL}}, {"{12444}", {0xf1, NULL}}, {"{12302}", {0xf5, NULL}}, {"{12303}", {0xf6, NULL}}, {"{08230}", {0xf8, NULL}}, {"{08596}", {0xe4, NULL}}, {"$", {0xf9, NULL}}, - {"{09733}", {0xfa, NULL}}, {"{00215}", {0xfb, NULL}}, {"{12539}", {0xfc, NULL}}, {"{09734}", {0xfd, NULL}}, {"^", {0x50, NULL}}, {"|", {0x51, NULL}}, {"<", {0x52, NULL}}, {">", {0x53, NULL}}, {"[%]", {0xe0, NULL}}, - {"[A]", {0x54, NULL}}, {"[B]", {0x55, NULL}}, {"[C]", {0x56, NULL}}, {"[Z]", {0x57, NULL}}, {"[R]", {0x58, NULL}}, {"/", {0xd0, NULL}}, {"the", {0xd1, NULL}}, {"you", {0xd2, NULL}}, {"{09786}", {0x40, 0x41}}, - +struct Character charmap[358] = { + {"0", {0x0, NULL}}, {"1", {0x1, NULL}}, {"{65297}", {0x1, NULL}}, {"2", {0x2, NULL}}, {"{65298}", {0x2, NULL}}, {"3", {0x3, NULL}}, {"{65299}", {0x3, NULL}}, {"4", {0x4, NULL}}, {"{65300}", {0x4, NULL}}, {"5", {0x5, NULL}}, + {"{65301}", {0x5, NULL}}, {"6", {0x6, NULL}}, {"{65302}", {0x6, NULL}}, {"7", {0x7, NULL}}, {"{65303}", {0x7, NULL}}, {"8", {0x8, NULL}}, {"{65304}", {0x8, NULL}}, {"9", {0x9, NULL}}, {"{65305}", {0x9, NULL}}, + {"A", {0xa, NULL}}, {"{65313}", {0xa, NULL}}, {"B", {0xb, NULL}}, {"{65314}", {0xb, NULL}}, {"C", {0xc, NULL}}, {"{65315}", {0xc, NULL}}, {"D", {0xd, NULL}}, {"{65316}", {0xd, NULL}}, {"E", {0xe, NULL}}, + {"{65317}", {0xe, NULL}}, {"F", {0xf, NULL}}, {"{65318}", {0xf, NULL}}, {"G", {0x10, NULL}}, {"{65319}", {0x10, NULL}}, {"H", {0x11, NULL}}, {"{65320}", {0x11, NULL}}, {"I", {0x12, NULL}}, {"{65321}", {0x12, NULL}}, + {"J", {0x13, NULL}}, {"{65322}", {0x13, NULL}}, {"K", {0x14, NULL}}, {"{65323}", {0x14, NULL}}, {"L", {0x15, NULL}}, {"{65324}", {0x15, NULL}}, {"M", {0x16, NULL}}, {"{65325}", {0x16, NULL}}, {"N", {0x17, NULL}}, + {"{65326}", {0x17, NULL}}, {"O", {0x18, NULL}}, {"{65327}", {0x18, NULL}}, {"P", {0x19, NULL}}, {"{65328}", {0x19, NULL}}, {"Q", {0x1a, NULL}}, {"{65329}", {0x1a, NULL}}, {"R", {0x1b, NULL}}, {"{65330}", {0x1b, NULL}}, + {"S", {0x1c, NULL}}, {"{65331}", {0x1c, NULL}}, {"T", {0x1d, NULL}}, {"{65332}", {0x1d, NULL}}, {"U", {0x1e, NULL}}, {"{65333}", {0x1e, NULL}}, {"V", {0x1f, NULL}}, {"{65334}", {0x1f, NULL}}, {"W", {0x20, NULL}}, + {"{65335}", {0x20, NULL}}, {"X", {0x21, NULL}}, {"{65336}", {0x21, NULL}}, {"Y", {0x22, NULL}}, {"{65337}", {0x22, NULL}}, {"Z", {0x23, NULL}}, {"{65338}", {0x23, NULL}}, {"a", {0x24, NULL}}, {"b", {0x25, NULL}}, + {"c", {0x26, NULL}}, {"d", {0x27, NULL}}, {"e", {0x28, NULL}}, {"f", {0x29, NULL}}, {"g", {0x2a, NULL}}, {"h", {0x2b, NULL}}, {"i", {0x2c, NULL}}, {"j", {0x2d, NULL}}, {"k", {0x2e, NULL}}, + {"l", {0x2f, NULL}}, {"m", {0x30, NULL}}, {"n", {0x31, NULL}}, {"o", {0x32, NULL}}, {"p", {0x33, NULL}}, {"q", {0x34, NULL}}, {"r", {0x35, NULL}}, {"s", {0x36, NULL}}, {"t", {0x37, NULL}}, + {"u", {0x38, NULL}}, {"v", {0x39, NULL}}, {"w", {0x3a, NULL}}, {"x", {0x3b, NULL}}, {"y", {0x3c, NULL}}, {"z", {0x3d, NULL}}, {"'", {0x3e, NULL}}, {".", {0x3f, NULL}}, {"{09786}", {0x40, 0x41}}, + {"{12354}", {0x40, NULL}}, {"{12356}", {0x41, NULL}}, {"{12358}", {0x42, NULL}}, {"{12360}", {0x43, NULL}}, {"{12362}", {0x44, NULL}}, {"{12363}", {0x45, NULL}}, {"{12365}", {0x46, NULL}}, {"{12367}", {0x47, NULL}}, {"{12369}", {0x48, NULL}}, + {"{12371}", {0x49, NULL}}, {"{12373}", {0x4a, NULL}}, {"{12375}", {0x4b, NULL}}, {"{12377}", {0x4c, NULL}}, {"{12379}", {0x4d, NULL}}, {"{12381}", {0x4e, NULL}}, {"{12383}", {0x4f, NULL}}, {"{12385}", {0x50, NULL}}, {"{12388}", {0x51, NULL}}, + {"{12390}", {0x52, NULL}}, {"{12392}", {0x53, NULL}}, {"{12394}", {0x54, NULL}}, {"{12395}", {0x55, NULL}}, {"{12396}", {0x56, NULL}}, {"{12397}", {0x57, NULL}}, {"{12398}", {0x58, NULL}}, {"{12399}", {0x59, NULL}}, {"{12402}", {0x5a, NULL}}, + {"{12405}", {0x5b, NULL}}, {"{12408}", {0x5c, NULL}}, {"{12411}", {0x5d, NULL}}, {"{12414}", {0x5e, NULL}}, {"{12415}", {0x5f, NULL}}, {"{12416}", {0x60, NULL}}, {"{12417}", {0x61, NULL}}, {"{12418}", {0x62, NULL}}, {"{12420}", {0x63, NULL}}, + {"{12422}", {0x64, NULL}}, {"{12424}", {0x65, NULL}}, {"{12425}", {0x66, NULL}}, {"{12426}", {0x67, NULL}}, {"{12427}", {0x68, NULL}}, {"{12428}", {0x69, NULL}}, {"{12429}", {0x6a, NULL}}, {"{12431}", {0x6b, NULL}}, {"{12434}", {0x6c, NULL}}, + {"{12435}", {0x6d, NULL}}, {"{12290}", {0x6e, NULL}}, {",", {0x6f, NULL}}, {"{12289}", {0x6f, NULL}}, {"{12450}", {0x70, NULL}}, {"{12452}", {0x71, NULL}}, {"{12454}", {0x72, NULL}}, {"{12456}", {0x73, NULL}}, {"{12458}", {0x74, NULL}}, + {"{12459}", {0x75, NULL}}, {"{12461}", {0x76, NULL}}, {"{12463}", {0x77, NULL}}, {"{12465}", {0x78, NULL}}, {"{12467}", {0x79, NULL}}, {"{12469}", {0x7a, NULL}}, {"{12471}", {0x7b, NULL}}, {"{12473}", {0x7c, NULL}}, {"{12475}", {0x7d, NULL}}, + {"{12477}", {0x7e, NULL}}, {"{12479}", {0x7f, NULL}}, {"{12481}", {0x80, NULL}}, {"{12484}", {0x81, NULL}}, {"{12486}", {0x82, NULL}}, {"{12488}", {0x83, NULL}}, {"{12490}", {0x84, NULL}}, {"{12491}", {0x85, NULL}}, {"{12492}", {0x86, NULL}}, + {"{12493}", {0x87, NULL}}, {"{12494}", {0x88, NULL}}, {"{12495}", {0x89, NULL}}, {"{12498}", {0x8a, NULL}}, {"{12501}", {0x8b, NULL}}, {"{12504}", {0x8c, NULL}}, {"{12507}", {0x8d, NULL}}, {"{12510}", {0x8e, NULL}}, {"{12511}", {0x8f, NULL}}, + {"{12512}", {0x90, NULL}}, {"{12513}", {0x91, NULL}}, {"{12514}", {0x92, NULL}}, {"{12516}", {0x93, NULL}}, {"{12518}", {0x94, NULL}}, {"{12520}", {0x95, NULL}}, {"{12521}", {0x96, NULL}}, {"{12522}", {0x97, NULL}}, {"{12523}", {0x98, NULL}}, + {"{12524}", {0x99, NULL}}, {"{12525}", {0x9a, NULL}}, {"{12527}", {0x9b, NULL}}, {"{12530}", {0x9c, NULL}}, {"{12531}", {0x9d, NULL}}, {" ", {0x9e, NULL}}, {"{12288}", {0x9e, NULL}}, {"-", {0x9f, NULL}}, {"{12540}", {0x9f, NULL}}, + {"{12359}", {0xa0, NULL}}, {"{12387}", {0xa1, NULL}}, {"{12419}", {0xa2, NULL}}, {"{12421}", {0xa3, NULL}}, {"{12423}", {0xa4, NULL}}, {"{12353}", {0xa5, NULL}}, {"{12355}", {0xa6, NULL}}, {"{12357}", {0xa7, NULL}}, {"{12361}", {0xa8, NULL}}, + {"{12455}", {0xd0, NULL}}, {"{12483}", {0xd1, NULL}}, {"{12515}", {0xd2, NULL}}, {"{12517}", {0xd3, NULL}}, {"{12519}", {0xd4, NULL}}, {"{12449}", {0xd5, NULL}}, {"{12451}", {0xd6, NULL}}, {"{12453}", {0xd7, NULL}}, {"{12457}", {0xd8, NULL}}, + {"[%]", {0xe0, NULL}}, {"(", {0xe1, NULL}}, {"{65288}", {0xe1, NULL}}, {")(", {0xe2, NULL}}, {"）（", {0xe2, NULL}}, {")", {0xe3, NULL}}, {"{65289}", {0xe3, NULL}}, {"+", {0xe4, NULL}}, {"{08596}", {0xe4, NULL}}, + {"&", {0xe5, NULL}}, {":", {0xe6, NULL}}, {"{12443}", {0xf0, NULL}}, {"{12444}", {0xf1, NULL}}, {"!", {0xf2, NULL}}, {"{65281}", {0xf2, NULL}}, {"%", {0xf3, NULL}}, {"{65285}", {0xf3, NULL}}, {"?", {0xf4, NULL}}, + {"{65311}", {0xf4, NULL}}, {"{12302}", {0xf5, NULL}}, {"{12303}", {0xf6, NULL}}, {"~", {0xf7, NULL}}, {"{65374}", {0xf7, NULL}}, {"{08230}", {0xf8, NULL}}, {"$", {0xf9, NULL}}, {"{09733}", {0xfa, NULL}}, {"{00215}", {0xfb, NULL}}, + {"{12539}", {0xfc, NULL}}, {"{09734}", {0xfd, NULL}}, {"\n", {0xfe, NULL}}, {"{12364}", {0xf0, 0xf0}}, {"{12366}", {0xf0, 0xf0}}, {"{12368}", {0xf0, 0xf0}}, {"{12370}", {0xf0, 0xf0}}, {"{12372}", {0xf0, 0xf0}}, {"{12374}", {0xf0, 0xf0}}, + {"{12376}", {0xf0, 0xf0}}, {"{12378}", {0xf0, 0xf0}}, {"{12380}", {0xf0, 0xf0}}, {"{12382}", {0xf0, 0xf0}}, {"{12384}", {0xf0, 0xf0}}, {"{12386}", {0xf0, 0xf0}}, {"{12389}", {0xf0, 0xf0}}, {"{12391}", {0xf0, 0xf0}}, {"{12393}", {0xf0, 0xf0}}, + {"{12400}", {0xf0, 0xf0}}, {"{12403}", {0xf0, 0xf0}}, {"{12406}", {0xf0, 0xf0}}, {"{12409}", {0xf0, 0xf0}}, {"{12412}", {0xf0, 0xf0}}, {"{12460}", {0xf0, 0xf0}}, {"{12462}", {0xf0, 0xf0}}, {"{12464}", {0xf0, 0xf0}}, {"{12466}", {0xf0, 0xf0}}, + {"{12468}", {0xf0, 0xf0}}, {"{12470}", {0xf0, 0xf0}}, {"{12472}", {0xf0, 0xf0}}, {"{12474}", {0xf0, 0xf0}}, {"{12476}", {0xf0, 0xf0}}, {"{12478}", {0xf0, 0xf0}}, {"{12480}", {0xf0, 0xf0}}, {"{12482}", {0xf0, 0xf0}}, {"{12485}", {0xf0, 0xf0}}, + {"{12487}", {0xf0, 0xf0}}, {"{12489}", {0xf0, 0xf0}}, {"{12496}", {0xf0, 0xf0}}, {"{12499}", {0xf0, 0xf0}}, {"{12502}", {0xf0, 0xf0}}, {"{12505}", {0xf0, 0xf0}}, {"{12508}", {0xf0, 0xf0}}, {"{12401}", {0xf1, 0xf1}}, {"{12404}", {0xf1, 0xf1}}, + {"{12407}", {0xf1, 0xf1}}, {"{12410}", {0xf1, 0xf1}}, {"{12413}", {0xf1, 0xf1}}, {"{12497}", {0xf1, 0xf1}}, {"{12500}", {0xf1, 0xf1}}, {"{12503}", {0xf1, 0xf1}}, {"{12506}", {0xf1, 0xf1}}, {"{12509}", {0xf1, 0xf1}}, {"^", {0x50, NULL}}, + {"|", {0x51, NULL}}, {"<", {0x52, NULL}}, {">", {0x53, NULL}}, {"[A]", {0x54, NULL}}, {"[B]", {0x55, NULL}}, {"[C]", {0x56, NULL}}, {"[Z]", {0x57, NULL}}, {"[R]", {0x58, NULL}}, {"/", {0xd0, NULL}}, + {"the", {0xd1, NULL}}, {"you", {0xd2, NULL}}, {"{00224}", {0x60, NULL}}, {"{00226}", {0x61, NULL}}, {"{00228}", {0x62, NULL}}, {"{00192}", {0x64, NULL}}, {"{00194}", {0x65, NULL}}, {"{00196}", {0x66, NULL}}, {"{00232}", {0x70, NULL}}, + {"{00234}", {0x71, NULL}}, {"{00235}", {0x72, NULL}}, {"{00200}", {0x74, NULL}}, {"{00202}", {0x75, NULL}}, {"{00203}", {0x76, NULL}}, {"{00249}", {0x80, NULL}}, {"{00251}", {0x81, NULL}}, + {"{00217}", {0x84, NULL}}, {"{00219}", {0x85, NULL}}, {"{00244}", {0x91, NULL}}, {"{00246}", {0x92, NULL}}, {"{00212}", {0x95, NULL}}, {"{00214}", {0x96, NULL}}, {"{00238}", {0xa1, NULL}}, + {"{00239}", {0xa2, NULL}}, {"{00223}", {0xec, NULL}}, {"{00199}", {0xed, NULL}}, {"{00231}", {0xee, NULL}}, {"{08222}", {0xf0, NULL}}, // SPECIAL CHARACTERS - {"{00161}", {66, NULL}}, // INVERTED EXCLAMATION MARK - {"{00191}", {67, NULL}}, // INVERTED QUESTION MARK - {"{00192}", {68, NULL}}, // LATIN CAPITAL LETTER A WITH GRAVE - {"{00193}", {69, NULL}}, // LATIN CAPITAL LETTER A WITH ACUTE - {"{00194}", {70, NULL}}, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX - {"{00195}", {71, NULL}}, // LATIN CAPITAL LETTER A WITH TILDE - {"{00196}", {72, NULL}}, // LATIN CAPITAL LETTER A WITH DIAERESIS - {"{00197}", {73, NULL}}, // LATIN CAPITAL LETTER A WITH RING ABOVE - {"{00198}", {74, NULL}}, // LATIN CAPITAL LETTER AE - {"{00199}", {75, NULL}}, // LATIN CAPITAL LETTER C WITH CEDILLA - {"{00200}", {76, NULL}}, // LATIN CAPITAL LETTER E WITH GRAVE - {"{00201}", {77, NULL}}, // LATIN CAPITAL LETTER E WITH ACUTE - {"{00202}", {78, NULL}}, // LATIN CAPITAL LETTER E WITH CIRCUMFLEX - {"{00203}", {79, NULL}}, // LATIN CAPITAL LETTER E WITH DIAERESIS - //////////// - {"{00204}", {89, NULL}}, // LATIN CAPITAL LETTER I WITH GRAVE - {"{00205}", {90, NULL}}, // LATIN CAPITAL LETTER I WITH ACUTE - {"{00206}", {91, NULL}}, // LATIN CAPITAL LETTER I WITH CIRCUMFLEX - {"{00207}", {92, NULL}}, // LATIN CAPITAL LETTER I WITH DIAERESIS - {"{00208}", {93, NULL}}, // LATIN CAPITAL LETTER ETH - {"{00209}", {94, NULL}}, // LATIN CAPITAL LETTER N WITH TILDE - {"{00210}", {95, NULL}}, // LATIN CAPITAL LETTER O WITH GRAVE - {"{00211}", {96, NULL}}, // LATIN CAPITAL LETTER O WITH ACUTE - {"{00212}", {97, NULL}}, // LATIN CAPITAL LETTER O WITH CIRCUMFLEX - {"{00213}", {98, NULL}}, // LATIN CAPITAL LETTER O WITH TILDE - {"{00214}", {99, NULL}}, // LATIN CAPITAL LETTER O WITH DIAERESIS - /////////// - {"{00216}", {100, NULL}}, // LATIN CAPITAL LETTER O WITH STROKE] - {"{00217}", {101, NULL}}, // LATIN CAPITAL LETTER U WITH GRAVE - {"{00218}", {102, NULL}}, // LATIN CAPITAL LETTER U WITH ACUTE - {"{00219}", {103, NULL}}, // LATIN CAPITAL LETTER U WITH CIRCUMFLEX - {"{00220}", {104, NULL}}, // LATIN CAPITAL LETTER U WITH DIAERESIS - {"{00221}", {105, NULL}}, // LATIN CAPITAL LETTER Y WITH ACUTE - {"{00222}", {106, NULL}}, // LATIN CAPITAL LETTER THORN - {"{00223}", {107, NULL}}, // LATIN SMALL LETTER SHARP S = Eszett - {"{00224}", {108, NULL}}, // LATIN SMALL LETTER A WITH GRAVE - {"{00225}", {109, NULL}}, // LATIN SMALL LETTER A WITH ACUTE - {"{00226}", {110, NULL}}, // LATIN SMALL LETTER A WITH CIRCUMFLEX - ///////////// - {"{00227}", {112, NULL}}, // LATIN SMALL LETTER A WITH TILDE - {"{00228}", {113, NULL}}, // LATIN SMALL LETTER A WITH DIAERESIS - {"{00229}", {114, NULL}}, // LATIN SMALL LETTER A WITH RING ABOVE - {"{00230}", {115, NULL}}, // LATIN SMALL LETTER AE - {"{00231}", {116, NULL}}, // LATIN SMALL LETTER C WITH CEDILLA - {"{00232}", {117, NULL}}, // LATIN SMALL LETTER E WITH GRAVE - {"{00233}", {118, NULL}}, // LATIN SMALL LETTER E WITH ACUTE - {"{00234}", {119, NULL}}, // LATIN SMALL LETTER E WITH CIRCUMFLEX - {"{00235}", {120, NULL}}, // LATIN SMALL LETTER E WITH DIAERESIS - {"{00236}", {121, NULL}}, // LATIN SMALL LETTER I WITH GRAVE - {"{00237}", {122, NULL}}, // LATIN SMALL LETTER I WITH ACUTE - {"{00238}", {123, NULL}}, // LATIN SMALL LETTER I WITH CIRCUMFLEX - {"{00239}", {124, NULL}}, // LATIN SMALL LETTER I WITH DIAERESIS - {"{00240}", {125, NULL}}, // LATIN SMALL LETTER ETH - {"{00241}", {126, NULL}}, // LATIN SMALL LETTER N WITH TILDE - {"{00242}", {127, NULL}}, // LATIN SMALL LETTER O WITH GRAVE - {"{00243}", {128, NULL}}, // LATIN SMALL LETTER O WITH ACUTE - {"{00244}", {129, NULL}}, // LATIN SMALL LETTER O WITH CIRCUMFLEX - {"{00245}", {130, NULL}}, // LATIN SMALL LETTER O WITH TILDE - {"{00246}", {131, NULL}}, // LATIN SMALL LETTER O WITH DIAERESIS - /////////// - {"{00248}", {132, NULL}}, // LATIN SMALL LETTER O WITH STROKE - {"{00249}", {133, NULL}}, // LATIN SMALL LETTER U WITH GRAVE - {"{00250}", {134, NULL}}, // LATIN SMALL LETTER U WITH ACUTE - {"{00251}", {135, NULL}}, // LATIN SMALL LETTER U WITH CIRCUMFLEX - {"{00252}", {136, NULL}}, // LATIN SMALL LETTER U WITH DIAERESIS - {"{00253}", {137, NULL}}, // LATIN SMALL LETTER Y WITH ACUTE - {"{00254}", {138, NULL}}, // LATIN SMALL LETTER THORN - {"{00255}", {139, NULL}}, // LATIN SMALL LETTER Y WITH DIAERESIS - /////////// - {"{00260}", {140, NULL}}, // LATIN CAPITAL LETTER A WITH OGONEK - {"{00261}", {141, NULL}}, // LATIN SMALL LETTER A WITH OGONEK - {"{00262}", {142, NULL}}, // LATIN CAPITAL LETTER C WITH ACUTE - {"{00263}", {143, NULL}}, // LATIN SMALL LETTER C WITH ACUTE - /////////// - {"{00280}", {144, NULL}}, // LATIN CAPITAL LETTER E WITH OGONEK - {"{00281}", {145, NULL}}, // LATIN SMALL LETTER E WITH OGONEK - /////////// - {"{00286}", {146, NULL}}, // LATIN CAPITAL LETTER G WITH BREVE - {"{00287}", {147, NULL}}, // LATIN SMALL LETTER G WITH BREVE - /////////// - {"{00304}", {148, NULL}}, // LATIN CAPITAL LETTER S WITH CEDILLA - {"{00305}", {149, NULL}}, // LATIN SMALL LETTER S WITH CEDILLA - /////////// - {"{00321}", {150, NULL}}, // LATIN CAPITAL LETTER L WITH STROKE - {"{00322}", {151, NULL}}, // LATIN SMALL LETTER L WITH STROKE - {"{00323}", {152, NULL}}, // LATIN CAPITAL LETTER N WITH ACUTE - {"{00324}", {153, NULL}}, // LATIN SMALL LETTER N WITH ACUTE - /////////// - {"{00338}", {154, NULL}}, // LATIN CAPITAL LIGATURE OE - {"{00339}", {155, NULL}}, // LATIN SMALL LIGATURE OE - /////////// - {"{00346}", {156, NULL}}, // LATIN CAPITAL LETTER S WITH ACUTE - {"{00347}", {157, NULL}}, // LATIN SMALL LETTER S WITH ACUTE - ///////////////////////// - {"{00350}", {160, NULL}}, // LATIN CAPITAL LETTER I WITH DOT ABOVE - {"{00351}", {161, NULL}}, // LATIN SMALL LETTER DOTLESS I - /////////// - {"{00376}", {162, NULL}}, // LATIN CAPITAL LETTER Y WITH DIAERESIS - {"{00377}", {163, NULL}}, // LATIN CAPITAL LETTER Z WITH ACUTE - {"{00378}", {164, NULL}}, // LATIN SMALL LETTER Z WITH ACUTE - {"{00379}", {165, NULL}}, // LATIN CAPITAL LETTER Z WITH DOT ABOVE - ///////////// - {"{00380}", {166, NULL}}, // LATIN SMALL LETTER Z WITH DOT ABOVE - /////////// - {"{07838}", {167, NULL}}, // LATIN EXTENDED ADDITIONAL = small eszett - //////////////////////// + {"{00225}", {112, NULL}}, + {"{00233}", {113, NULL}}, + {"{00237}", {114, NULL}}, + {"{00243}", {115, NULL}}, + {"{00250}", {116, NULL}}, + {"{00193}", {117, NULL}}, + {"{00201}", {118, NULL}}, + {"{00205}", {119, NULL}}, + {"{00211}", {120, NULL}}, + {"{00218}", {121, NULL}}, + {"{00241}", {122, NULL}}, + {"{00209}", {123, NULL}}, + {"{00252}", {124, NULL}}, + {"{00220}", {125, NULL}}, + {"{00191}", {126, NULL}}, + {"{00161}", {127, NULL}}, + +// *MISSING* SPECIAL CHARACTERS WITH SUBSTITIONS +// *NOTE: when adding characters here, don't forget to increment charmap size +// (value is number of '}}' in this file minus 1) + {"{00227}", {0x24, NULL}}, // latin small letter a with tilde (PT_br) + {"{00195}", {0x0a, NULL}}, // latin capital letter A with tilde (PT_br) + {"{00245}", {0x32, NULL}}, // latin small letter o with tilde (PT_br) + {"{00213}", {0x18, NULL}}, // latin capital letter O with tilde (PT_br) + {"{00236}", {0x2c, NULL}}, // latin small letter i with grave (ES_es) + {"{07765}", {0x33, NULL}} // latin small letter p with acute (ES_la) }; struct Character getCharacter(char *ch){ @@ -216,7 +153,7 @@ u8 *getTranslatedText(char *txt){ } else { ctm = getCharacter(")"); if(ctm.txt != NULL){ - tmp[cid - shiftArr] = ctm.value[0]; + tmp[cid] = ctm.value[0]; } } memset(tmpIcon, 0, sizeof(tmpIcon));