From 3305227bbcbee238593cdf44f2d4539cd9b555d3 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 25 Sep 2023 13:47:46 +0200 Subject: [PATCH] Implement all a-based diacritics --- Firmware/FontTable.h | 11 +++++++++++ lang/lib/FontGen.py | 11 +++++++++++ lang/lib/Prusa.lcd | 26 +++++++++++++------------- lang/lib/charset.py | 26 +++++++++++++------------- 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/Firmware/FontTable.h b/Firmware/FontTable.h index c7bc85f2b..078093fcf 100644 --- a/Firmware/FontTable.h +++ b/Firmware/FontTable.h @@ -9,3 +9,14 @@ {0x24, {0x00, 0x85, 0x28, 0x52, }, '\x7e'}, // index=0x88, utf8='⏬' {0x06, {0x00, 0x1B, 0xE4, 0x00, }, '\x7e'}, // index=0x89, utf8='✔' {0x78, {0x12, 0x70, 0x78, 0x70, }, 'a'}, // index=0x8A, utf8='á' +{0xF8, {0x12, 0x78, 0x8F, 0x88, }, 'A'}, // index=0x8B, utf8='Á' +{0x78, {0x42, 0x70, 0x78, 0x70, }, 'a'}, // index=0x8C, utf8='à' +{0x78, {0x25, 0x70, 0x78, 0x70, }, 'a'}, // index=0x8D, utf8='â' +{0xF8, {0x50, 0x78, 0x8F, 0x88, }, '\xd1'}, // index=0x8E, utf8='Ä' +{0xF0, {0x25, 0x27, 0x07, 0x87, }, 'a'}, // index=0x8F, utf8='å' +{0xF0, {0x25, 0x27, 0x8F, 0x88, }, 'A'}, // index=0x90, utf8='Å' +{0x2C, {0x0D, 0x27, 0xAA, 0x50, }, '\xd1'}, // index=0x91, utf8='æ' +{0xBC, {0x07, 0x07, 0x87, 0x11, }, 'a'}, // index=0x92, utf8='ą' +{0xBE, {0x78, 0x8F, 0x88, 0x11, }, 'A'}, // index=0x93, utf8='Ą' +{0xF1, {0x87, 0x07, 0x07, 0x87, }, 'a'}, // index=0x94, utf8='ă' +{0xF9, {0x87, 0x78, 0x8F, 0x88, }, 'A'}, // index=0x95, utf8='Ă' diff --git a/lang/lib/FontGen.py b/lang/lib/FontGen.py index 7da9cf33c..0711d1a55 100644 --- a/lang/lib/FontGen.py +++ b/lang/lib/FontGen.py @@ -22,6 +22,17 @@ FONT_TABLE = [ CustomCharacter('⏬', 8, '\\x7e'), CustomCharacter('✔', 9, '\\x7e'), CustomCharacter('á', 16, 'a'), + CustomCharacter('Á', 24, 'A'), + CustomCharacter('à', 17, 'a'), + CustomCharacter('â', 18, 'a'), + CustomCharacter('Ä', 27, '\\xd1'), + CustomCharacter('å', 20, 'a'), + CustomCharacter('Å', 28, 'A'), + CustomCharacter('æ', 21, '\\xd1'), + CustomCharacter('ą', 22, 'a'), + CustomCharacter('Ą', 30, 'A'), + CustomCharacter('ă', 23, 'a'), + CustomCharacter('Ă', 31, 'A'), ] BUILTIN_CHARS = { diff --git a/lang/lib/Prusa.lcd b/lang/lib/Prusa.lcd index 72ce0e143..8854463cd 100644 --- a/lang/lib/Prusa.lcd +++ b/lang/lib/Prusa.lcd @@ -21,21 +21,21 @@ - - + + - - - - - - - - - + + + + + + + + + - - + + diff --git a/lang/lib/charset.py b/lang/lib/charset.py index caed22f76..34f4bcaf4 100644 --- a/lang/lib/charset.py +++ b/lang/lib/charset.py @@ -21,19 +21,19 @@ from .FontGen import CUSTOM_CHARS TRANS_CHARS = { # 'á': 'a', #cz,fr,es,hu,sk - 'Á': 'A', #cz,fr,hu,sk - 'à': 'a', #fr,it - 'À': 'A', #fr,it - 'â': 'a', #fr,ro - 'Â': 'A', #ro - 'Ä': 'ä', #de,sv,no,sk - 'å': 'a', #sv,no - 'Å': 'A', #sv,no - 'æ': 'ä', #sv,no - 'ą': 'a', #pl - 'Ą': 'A', #pl - 'ă': 'a', #ro - 'Ă': 'A', #ro + # 'Á': 'A', #cz,fr,hu,sk + # 'à': 'a', #fr,it + 'À': 'à', #fr,it + # 'â': 'a', #fr,ro + 'Â': 'â', #ro + # 'Ä': 'ä', #de,sv,no,sk + # 'å': 'a', #sv,no + # 'Å': 'A', #sv,no + # 'æ': 'ä', #sv,no + # 'ą': 'a', #pl + # 'Ą': 'A', #pl + # 'ă': 'a', #ro + # 'Ă': 'A', #ro 'ć': 'c', #pl,hr 'Ć': 'C', #pl,hr 'ç': 'c', #fr,nl