Remove ñ from fontTable

3d-gussner · Oct 11, 2023 · 8e0e79f · 8e0e79f
1 parent 512d768
commit 8e0e79f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/Firmware/FontTable.h b/Firmware/FontTable.h
@@ -39,24 +39,23 @@
 {0x43, {0x88, 0x88, 0x88, 0xF0, }, 'L'}, // index=0xA6, utf8='Ľ'
 {0x78, {0x12, 0xBC, 0x88, 0x80, }, 'n'}, // index=0xA7, utf8='ń'
 {0x78, {0x52, 0xBC, 0x88, 0x80, }, 'n'}, // index=0xA8, utf8='ň'
-{0x71, {0x69, 0x0B, 0xC8, 0x80, }, 'n'}, // index=0xA9, utf8='ñ'
-{0x38, {0x12, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAA, utf8='ó'
-{0x38, {0x42, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAB, utf8='ò'
-{0x38, {0x25, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAC, utf8='ô'
-{0x3A, {0x00, 0x79, 0xAC, 0x78, }, 'o'}, // index=0xAD, utf8='ø'
-{0x39, {0x49, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAE, utf8='ő'
-{0x08, {0x52, 0xBC, 0x88, 0x80, }, 'r'}, // index=0xAF, utf8='ř'
-{0x20, {0x12, 0x78, 0x70, 0xF0, }, 's'}, // index=0xB0, utf8='ś'
-{0x20, {0x52, 0x78, 0x70, 0xF0, }, 's'}, // index=0xB1, utf8='š'
-{0x10, {0x07, 0x87, 0x0F, 0x24, }, 's'}, // index=0xB2, utf8='ș'
-{0x60, {0x69, 0x9A, 0x98, 0x8B, }, '\xe2'}, // index=0xB3, utf8='ß'
-{0x23, {0x04, 0xE4, 0x44, 0x30, }, 't'}, // index=0xB4, utf8='ť'
-{0x10, {0x4E, 0x44, 0x43, 0x24, }, 't'}, // index=0xB5, utf8='ț'
-{0x01, {0xF2, 0x22, 0x20, 0x24, }, 'T'}, // index=0xB6, utf8='Ț'
-{0x7C, {0x12, 0x88, 0x89, 0x60, }, 'u'}, // index=0xB7, utf8='ú'
-{0x78, {0x25, 0x28, 0x89, 0x60, }, 'u'}, // index=0xB8, utf8='ů'
-{0x79, {0x49, 0x08, 0x89, 0x60, }, 'u'}, // index=0xB9, utf8='ű'
-{0x3C, {0x12, 0x88, 0x70, 0x70, }, 'y'}, // index=0xBA, utf8='ý'
-{0x44, {0x12, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBB, utf8='ź'
-{0x44, {0x52, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBC, utf8='ž'
-{0x44, {0x20, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBD, utf8='ż'
+{0x38, {0x12, 0x78, 0x88, 0x70, }, 'o'}, // index=0xA9, utf8='ó'
+{0x38, {0x42, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAA, utf8='ò'
+{0x38, {0x25, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAB, utf8='ô'
+{0x3A, {0x00, 0x79, 0xAC, 0x78, }, 'o'}, // index=0xAC, utf8='ø'
+{0x39, {0x49, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAD, utf8='ő'
+{0x08, {0x52, 0xBC, 0x88, 0x80, }, 'r'}, // index=0xAE, utf8='ř'
+{0x20, {0x12, 0x78, 0x70, 0xF0, }, 's'}, // index=0xAF, utf8='ś'
+{0x20, {0x52, 0x78, 0x70, 0xF0, }, 's'}, // index=0xB0, utf8='š'
+{0x10, {0x07, 0x87, 0x0F, 0x24, }, 's'}, // index=0xB1, utf8='ș'
+{0x60, {0x69, 0x9A, 0x98, 0x8B, }, '\xe2'}, // index=0xB2, utf8='ß'
+{0x23, {0x04, 0xE4, 0x44, 0x30, }, 't'}, // index=0xB3, utf8='ť'
+{0x10, {0x4E, 0x44, 0x43, 0x24, }, 't'}, // index=0xB4, utf8='ț'
+{0x01, {0xF2, 0x22, 0x20, 0x24, }, 'T'}, // index=0xB5, utf8='Ț'
+{0x7C, {0x12, 0x88, 0x89, 0x60, }, 'u'}, // index=0xB6, utf8='ú'
+{0x78, {0x25, 0x28, 0x89, 0x60, }, 'u'}, // index=0xB7, utf8='ů'
+{0x79, {0x49, 0x08, 0x89, 0x60, }, 'u'}, // index=0xB8, utf8='ű'
+{0x3C, {0x12, 0x88, 0x70, 0x70, }, 'y'}, // index=0xB9, utf8='ý'
+{0x44, {0x12, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBA, utf8='ź'
+{0x44, {0x52, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBB, utf8='ž'
+{0x44, {0x20, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xBC, utf8='ż'
diff --git a/lang/lib/FontGen.py b/lang/lib/FontGen.py
@@ -52,7 +52,7 @@ def __init__(self, utf, charListIndex, alternate = None):
     CustomCharacter('Ľ', 74, 'L'),
     CustomCharacter('ń', 76, 'n'),
     CustomCharacter('ň', 77, 'n'),
-    CustomCharacter('ñ', 78, 'n'),
+    # CustomCharacter('ñ', 78, 'n'),
     CustomCharacter('ó', 84, 'o'),
     CustomCharacter('ò', 85, 'o'),
     CustomCharacter('ô', 86, 'o'),

diff --git a/lang/lib/charset.py b/lang/lib/charset.py
@@ -69,7 +69,7 @@
     'Ń': 'ń', #pl
     # 'ň': 'n', #cz,sk
     'Ň': 'ň', #cz,sk
-    # 'ñ': 'n', #es,nl
+    'ñ': 'n', #es,nl
     # 'ó': 'o', #cz,es,pl,hu,sk
     'Ó': 'ó', #cz,pl,hu,sk
     # 'ò': 'o', #it