josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement all a-based diacritics

This commit is contained in:
Alex Voinea 2023-09-25 13:47:46 +02:00
parent 6707570c6c
commit 3305227bbc
4 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Firmware/FontTable.h
View File

@ -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='Ă'

11
lang/lib/FontGen.py
View File

@ -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 = {

26
lang/lib/Prusa.lcd
View File

@ -21,21 +21,21 @@
<CHAR CODE="14" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="15" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="16" PIXELS="16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,0,16777215,0,16777215,16777215,0,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="17" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="18" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="17" PIXELS="16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,0,16777215,0,16777215,16777215,0,0,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="18" PIXELS="16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,16777215,0,0,16777215,0,16777215,0,16777215,16777215,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="19" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="20" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="21" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="22" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="23" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="24" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="25" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="26" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="27" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="28" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="20" PIXELS="16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,0,16777215,0,0,16777215,0,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,16777215,0,0,0,0"/>
<CHAR CODE="21" PIXELS="16777215,0,16777215,16777215,0,0,16777215,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,0,0,0,16777215,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,0,16777215,16777215"/>
<CHAR CODE="22" PIXELS="16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,0,16777215,0,0,0,16777215,16777215,0,0,0,0,16777215,0"/>
<CHAR CODE="23" PIXELS="0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,16777215,0,0,16777215,16777215,16777215,0,0,0,0"/>
<CHAR CODE="24" PIXELS="16777215,16777215,16777215,0,0,0,0,0,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,0,0,0"/>
<CHAR CODE="25" PIXELS="16777215,16777215,16777215,0,0,0,0,0,0,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,0,0,0"/>
<CHAR CODE="26" PIXELS="16777215,16777215,16777215,0,0,0,0,0,16777215,0,0,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,0,0,0"/>
<CHAR CODE="27" PIXELS="16777215,16777215,16777215,0,0,0,0,0,0,16777215,0,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,0,0,0"/>
<CHAR CODE="28" PIXELS="16777215,16777215,16777215,16777215,0,0,0,0,16777215,0,16777215,0,16777215,0,16777215,16777215,0,16777215,0,0,16777215,0,16777215,16777215,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,0,0,0,0"/>
<CHAR CODE="29" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="30" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="31" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="30" PIXELS="16777215,0,0,0,0,0,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,0,0,16777215,0,0,0,0,0,16777215,0"/>
<CHAR CODE="31" PIXELS="0,16777215,16777215,0,0,0,0,0,16777215,0,0,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,16777215,0,16777215,16777215,0,16777215,16777215,0,0,0,0,0"/>
<CHAR CODE="32" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="33" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>
<CHAR CODE="34" PIXELS="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"/>

26
lang/lib/charset.py
View File

@ -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