Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update enabled diacritics #4456

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 49 additions & 37 deletions Firmware/FontTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,54 @@
{0x78, {0x52, 0x70, 0x78, 0x70, }, 'a'}, // index=0x94, utf8='ă'
{0xF8, {0x52, 0x78, 0x8F, 0x88, }, 'A'}, // index=0x95, utf8='Ă'
{0x20, {0x12, 0x78, 0x88, 0x70, }, 'c'}, // index=0x96, utf8='ć'
{0x20, {0x12, 0x78, 0x88, 0x70, }, 'c'}, // index=0x97, utf8='ć'
{0x20, {0x52, 0x78, 0x88, 0x70, }, 'c'}, // index=0x98, utf8='č'
{0x20, {0x52, 0x78, 0x88, 0x70, }, 'c'}, // index=0x97, utf8='č'
{0x48, {0x52, 0x78, 0x88, 0x87, }, 'C'}, // index=0x98, utf8='Č'
{0x03, {0x11, 0x17, 0x99, 0x70, }, 'd'}, // index=0x99, utf8='ď'
{0x18, {0x12, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9A, utf8='é'
{0x18, {0x42, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9B, utf8='è'
{0x18, {0x52, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9C, utf8='ě'
{0x0C, {0x07, 0x8F, 0x87, 0x23, }, 'e'}, // index=0x9D, utf8='ę'
{0x44, {0x12, 0xF8, 0xF8, 0xF0, }, 'E'}, // index=0x9E, utf8='É'
{0x00, {0x12, 0x06, 0x22, 0x70, }, 'i'}, // index=0x9F, utf8='í'
{0x00, {0x25, 0x06, 0x22, 0x70, }, 'i'}, // index=0xA0, utf8='î'
{0x00, {0x25, 0x07, 0x22, 0x27, }, 'I'}, // index=0xA1, utf8='Î'
{0x00, {0x12, 0x06, 0x22, 0x27, }, 'l'}, // index=0xA2, utf8='ĺ'
{0x02, {0x62, 0x36, 0xA2, 0x70, }, 'l'}, // index=0xA3, utf8='ł'
{0x03, {0x62, 0x22, 0x22, 0x70, }, 'l'}, // index=0xA4, utf8='ľ'
{0x40, {0x45, 0x6C, 0x44, 0x70, }, 'L'}, // index=0xA5, utf8='Ł'
{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='ż'
{0x44, {0x12, 0xF8, 0xF8, 0xF0, }, 'E'}, // index=0x9B, utf8='É'
{0x18, {0x42, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9C, utf8='è'
{0x18, {0x25, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9D, utf8='ê'
{0x18, {0x52, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9E, utf8='ě'
{0x18, {0x50, 0x78, 0xF8, 0x70, }, 'e'}, // index=0x9F, utf8='ë'
{0x0C, {0x07, 0x8F, 0x87, 0x23, }, 'e'}, // index=0xA0, utf8='ę'
{0xA2, {0x0F, 0x8F, 0x8F, 0x11, }, 'E'}, // index=0xA1, utf8='Ę'
{0x00, {0x12, 0x06, 0x22, 0x70, }, 'i'}, // index=0xA2, utf8='í'
{0x00, {0x12, 0x07, 0x22, 0x27, }, 'I'}, // index=0xA3, utf8='Í'
{0x00, {0x25, 0x06, 0x22, 0x70, }, 'i'}, // index=0xA4, utf8='î'
{0x00, {0x25, 0x07, 0x22, 0x27, }, 'I'}, // index=0xA5, utf8='Î'
{0x00, {0x12, 0x06, 0x22, 0x27, }, 'l'}, // index=0xA6, utf8='ĺ'
{0x02, {0x62, 0x36, 0xA2, 0x70, }, 'l'}, // index=0xA7, utf8='ł'
{0x40, {0x45, 0x6C, 0x44, 0x70, }, 'L'}, // index=0xA8, utf8='Ł'
{0x03, {0x62, 0x22, 0x22, 0x70, }, 'l'}, // index=0xA9, utf8='ľ'
{0x43, {0x88, 0x88, 0x88, 0xF0, }, 'L'}, // index=0xAA, utf8='Ľ'
{0x78, {0x12, 0xBC, 0x88, 0x80, }, 'n'}, // index=0xAB, utf8='ń'
{0x78, {0x52, 0xBC, 0x88, 0x80, }, 'n'}, // index=0xAC, utf8='ň'
{0x38, {0x12, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAD, utf8='ó'
{0x78, {0x12, 0x78, 0x88, 0x87, }, 'O'}, // index=0xAE, utf8='Ó'
{0x38, {0x42, 0x78, 0x88, 0x70, }, 'o'}, // index=0xAF, utf8='ò'
{0x38, {0x25, 0x78, 0x88, 0x70, }, 'o'}, // index=0xB0, utf8='ô'
{0x3A, {0x00, 0x79, 0xAC, 0x78, }, 'o'}, // index=0xB1, utf8='ø'
{0x3D, {0x07, 0x9A, 0xAC, 0x78, }, 'o'}, // index=0xB2, utf8='Ø'
{0x78, {0x50, 0x78, 0x88, 0x87, }, '\xef'}, // index=0xB3, utf8='Ö'
{0x39, {0x49, 0x78, 0x88, 0x70, }, 'o'}, // index=0xB4, utf8='ő'
{0x08, {0x52, 0xBC, 0x88, 0x80, }, 'r'}, // index=0xB5, utf8='ř'
{0x98, {0x52, 0xF8, 0x8F, 0x98, }, 'R'}, // index=0xB6, utf8='Ř'
{0x20, {0x12, 0x78, 0x70, 0xF0, }, 's'}, // index=0xB7, utf8='ś'
{0x48, {0x12, 0x78, 0x63, 0x87, }, 'S'}, // index=0xB8, utf8='Ś'
{0x20, {0x52, 0x78, 0x70, 0xF0, }, 's'}, // index=0xB9, utf8='š'
{0x48, {0x52, 0x78, 0x63, 0x87, }, 'S'}, // index=0xBA, utf8='Š'
{0x10, {0x07, 0x87, 0x0F, 0x24, }, 's'}, // index=0xBB, utf8='ș'
{0x12, {0x78, 0x63, 0x87, 0x24, }, 'S'}, // index=0xBC, utf8='Ș'
{0x60, {0x69, 0x9A, 0x98, 0x8B, }, '\xe2'}, // index=0xBD, utf8='ß'
{0x23, {0x04, 0xE4, 0x44, 0x30, }, 't'}, // index=0xBE, utf8='ť'
{0x10, {0x4E, 0x44, 0x43, 0x24, }, 't'}, // index=0xBF, utf8='ț'
{0x7C, {0x12, 0x88, 0x89, 0x60, }, 'u'}, // index=0xC0, utf8='ú'
{0x3C, {0x50, 0x88, 0x88, 0x70, }, 'U'}, // index=0xC1, utf8='Ü'
{0x78, {0x25, 0x28, 0x89, 0x60, }, 'u'}, // index=0xC2, utf8='ů'
{0x79, {0x49, 0x08, 0x89, 0x60, }, 'u'}, // index=0xC3, utf8='ű'
{0x3C, {0x12, 0x88, 0x70, 0x70, }, 'y'}, // index=0xC4, utf8='ý'
{0x0C, {0x12, 0x88, 0x52, 0x22, }, 'Y'}, // index=0xC5, utf8='Ý'
{0x44, {0x12, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xC6, utf8='ź'
{0x44, {0x52, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xC7, utf8='ž'
{0x8C, {0x52, 0xF0, 0x36, 0x8F, }, 'Z'}, // index=0xC8, utf8='Ž'
{0x44, {0x20, 0xF1, 0x24, 0xF0, }, 'z'}, // index=0xC9, utf8='ż'
64 changes: 59 additions & 5 deletions lang/lib/FontGen.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ def __init__(self, utf, charListIndex, alternate = None):
CustomCharacter('á', 16, 'a'),
CustomCharacter('Á', 24, 'A'),
CustomCharacter('à', 17, 'a'),
# CustomCharacter('À', 25, 'A'),
CustomCharacter('â', 18, 'a'),
# CustomCharacter('Â', 26, 'A'),
CustomCharacter('Ä', 27, '\\xd1'),
CustomCharacter('å', 20, 'a'),
CustomCharacter('Å', 28, 'A'),
Expand All @@ -34,45 +36,97 @@ def __init__(self, utf, charListIndex, alternate = None):
CustomCharacter('ă', 23, 'a'),
CustomCharacter('Ă', 31, 'A'),
CustomCharacter('ć', 32, 'c'),
CustomCharacter('ć', 32, 'c'),
# CustomCharacter('Ć', 36, 'C'),
# CustomCharacter('ç', 33, 'c'),
# CustomCharacter('Ç', 37, 'C'),
CustomCharacter('č', 34, 'c'),
CustomCharacter('Č', 38, 'C'),
CustomCharacter('ď', 40, 'd'),
# CustomCharacter('Ď', 42, 'D'),
# CustomCharacter('đ', 41, 'd'),
# CustomCharacter('Đ', 43, 'D'),
CustomCharacter('é', 44, 'e'),
CustomCharacter('É', 52, 'E'),
CustomCharacter('è', 45, 'e'),
# CustomCharacter('È', 53, 'E'),
CustomCharacter('ê', 46, 'e'),
# CustomCharacter('Ê', 54, 'E'),
CustomCharacter('ě', 47, 'e'),
# CustomCharacter('Ě', 55, 'E'),
CustomCharacter('ë', 48, 'e'),
# CustomCharacter('Ë', 56, 'E'),
CustomCharacter('ę', 49, 'e'),
CustomCharacter('É', 52, 'E'),
CustomCharacter('Ę', 57, 'E'),
CustomCharacter('í', 60, 'i'),
CustomCharacter('Í', 64, 'I'),
# CustomCharacter('ì', 61, 'i'),
# CustomCharacter('Ì', 65, 'I'),
CustomCharacter('î', 62, 'i'),
CustomCharacter('Î', 66, 'I'),
CustomCharacter('ĺ', 68, 'l'),
# CustomCharacter('Ĺ', 72, 'L'),
CustomCharacter('ł', 69, 'l'),
CustomCharacter('ľ', 70, 'l'),
CustomCharacter('Ł', 73, 'L'),
CustomCharacter('ľ', 70, 'l'),
CustomCharacter('Ľ', 74, 'L'),
CustomCharacter('ń', 76, 'n'),
# CustomCharacter('Ń', 80, 'N'),
CustomCharacter('ň', 77, 'n'),
CustomCharacter('ñ', 78, 'n'),
# CustomCharacter('Ň', 81, 'N'),
# CustomCharacter('ñ', 78, 'n'),
# CustomCharacter('Ñ', 82, 'N'),
CustomCharacter('ó', 84, 'o'),
CustomCharacter('Ó', 92, 'O'),
CustomCharacter('ò', 85, 'o'),
# CustomCharacter('Ò', 93, 'O'),
CustomCharacter('ô', 86, 'o'),
# CustomCharacter('Ô', 94, 'O'),
# CustomCharacter('œ', 87, 'o'),
# CustomCharacter('Œ', 95, 'O'),
CustomCharacter('ø', 88, 'o'),
CustomCharacter('Ø', 96, 'o'),
CustomCharacter('Ö', 97, '\\xef'),
CustomCharacter('ő', 90, 'o'),
# CustomCharacter('Ő', 98, 'O'),
# CustomCharacter('ŕ', 100, 'r'),
# CustomCharacter('Ŕ', 104, 'R'),
CustomCharacter('ř', 101, 'r'),
CustomCharacter('Ř', 105, 'R'),
CustomCharacter('ś', 108, 's'),
CustomCharacter('Ś', 112, 'S'),
CustomCharacter('š', 109, 's'),
CustomCharacter('Š', 113, 'S'),
CustomCharacter('ș', 110, 's'),
CustomCharacter('Ș', 114, 'S'),
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved
CustomCharacter('ß', 111, '\\xe2'),
# CustomCharacter('ẞ', 115, '\\xe2'),
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved
CustomCharacter('ť', 116, 't'),
# CustomCharacter('Ť', 118, 'T'),
CustomCharacter('ț', 117, 't'),
CustomCharacter('Ț', 119, 'T'),
# CustomCharacter('Ț', 119, 'T'),
CustomCharacter('ú', 120, 'u'),
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved
# CustomCharacter('Ú', 128, 'U'),
# CustomCharacter('ù', 121, 'u'),
# CustomCharacter('Ù', 129, 'U'),
# CustomCharacter('û', 122, 'u'),
# CustomCharacter('Û', 130, 'U'),
CustomCharacter('Ü', 133, 'U'),
CustomCharacter('ů', 123, 'u'),
# CustomCharacter('Ů', 131, 'U'),
CustomCharacter('ű', 124, 'u'),
# CustomCharacter('Ű', 132, 'U'),
CustomCharacter('ý', 136, 'y'),
CustomCharacter('Ý', 138, 'Y'),
# CustomCharacter('ÿ', 137, 'y'),
# CustomCharacter('Ÿ', 139, 'Y'),
CustomCharacter('ź', 140, 'z'),
# CustomCharacter('Ź', 144, 'Z'),
CustomCharacter('ž', 141, 'z'),
CustomCharacter('Ž', 145, 'Z'),
CustomCharacter('ż', 142, 'z'),
# CustomCharacter('Ż', 146, 'Z'),
# CustomCharacter('¿', 254, ' '),
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved
# CustomCharacter('¡', 255, ' '),
]

BUILTIN_CHARS = {
Expand Down
6 changes: 3 additions & 3 deletions lang/lib/Prusa.lcd
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<CHAR CODE="112" PIXELS="16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,0,0,16777215,0,0,16777215,0,0,16777215,0,16777215,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,16777215,0,16777215"/>
<CHAR CODE="113" PIXELS="16777215,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,0,16777215,0,16777215,16777215,0,16777215,0,0,16777215,0,0,16777215,0,0,16777215,0,16777215,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,16777215,0,16777215"/>
<CHAR CODE="114" PIXELS="16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,0,0,16777215,0,0,16777215,0,0,16777215,0,16777215,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215"/>
<CHAR CODE="115" 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="115" PIXELS="16777215,0,0,0,0,0,0,0,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,0,16777215,0,16777215,0,16777215,16777215,0,16777215,0,16777215,16777215,16777215,0,0,16777215"/>
<CHAR CODE="116" PIXELS="16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,0,0,0,0,0,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,0,16777215,16777215,16777215,0,16777215,16777215"/>
<CHAR CODE="117" PIXELS="16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,0,0,0,0,0,16777215,16777215,0,16777215,0,16777215,16777215,16777215,0,0,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215"/>
<CHAR CODE="118" PIXELS="16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,0,0,0,0,0,0,0,0,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215"/>
Expand All @@ -129,15 +129,15 @@
<CHAR CODE="122" PIXELS="16777215,16777215,16777215,0,0,0,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="123" PIXELS="16777215,16777215,16777215,0,0,0,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="124" PIXELS="16777215,0,16777215,0,0,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,16777215,0,16777215,16777215,0,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="125" 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="125" PIXELS="16777215,16777215,0,0,0,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,0,0,0,0,0,16777215"/>
<CHAR CODE="126" 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="127" 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="128" PIXELS="16777215,16777215,0,0,0,0,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,0,0,0,0,16777215"/>
<CHAR CODE="129" PIXELS="16777215,16777215,0,0,0,0,0,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,0,0,0,0,0,16777215"/>
<CHAR CODE="130" PIXELS="16777215,16777215,16777215,0,0,0,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="131" PIXELS="16777215,16777215,16777215,0,0,0,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,16777215,0,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="132" PIXELS="16777215,0,16777215,0,0,0,0,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,0,0,16777215,16777215,0,0,0,0,16777215"/>
<CHAR CODE="133" 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="133" PIXELS="16777215,16777215,0,0,0,0,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,16777215,16777215,0,16777215,16777215,16777215,0,0,0,0,16777215,16777215"/>
<CHAR CODE="134" 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="135" 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="136" PIXELS="16777215,16777215,0,0,16777215,16777215,16777215,16777215,16777215,16777215,16777215,16777215,0,16777215,0,16777215,16777215,0,16777215,16777215,0,16777215,0,16777215,0,16777215,16777215,16777215,0,16777215,0,16777215,16777215,16777215,0,0,0,0,16777215,16777215"/>
Expand Down
45 changes: 26 additions & 19 deletions lang/lib/charset.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
# 'ć': 'c', #pl,hr
'Ć': 'ć', #pl,hr
'ç': 'c', #fr,nl
'Ç': 'C', #fr,nl
# 'č': 'c', #cz,hr,sk
'Č': 'č', #cz,hr,sk
# 'Č': 'č', #cz,hr,sk
# 'ď': 'd', #cz,sk
'Ď': 'ď', #cz,sk
'đ': 'd', #hr
Expand All @@ -49,15 +50,17 @@
# 'É': 'E', #cz,fr,it,hu,sk
# 'è': 'e', #fr,it,nl
'È': 'è', #fr,it
'ê': 'e', #fr,nl
'Ê': 'E', #fr
# 'ê': 'e', #fr,nl
'Ê': 'ê', #fr
# 'ě': 'e', #cz
'Ě': 'ě', #cz
'ë': 'e', #fr
# 'ë': 'e', #fr
# 'ę': 'e', #pl
'Ę': 'ę', #pl
# 'Ę': 'ę', #pl
# 'í': 'i', #cz,es,it,sk
'Í': 'í', #cz,it,sk
# 'Í': 'í', #cz,it,sk
'ì': 'i',
'Ì': 'I',
# 'î': 'i', #fr,ro
# 'Î': 'I', #ro
# 'ĺ': 'l', #sk
Expand All @@ -70,55 +73,59 @@
'Ń': 'ń', #pl
# 'ň': 'n', #cz,sk
'Ň': 'ň', #cz,sk
# 'ñ': 'n', #es,nl
'ñ': 'n', #es,nl
# 'ó': 'o', #cz,es,pl,hu,sk
'Ó': 'ó', #cz,pl,hu,sk
# 'Ó': 'ó', #cz,pl,hu,sk
# 'ò': 'o', #it
'Ò': 'ò', #it
# 'ô': 'o', #fr,nl,sk
'Ô': 'ô', #sk
'œ': 'o', #fr
'œ': 'o', #fr
# 'ø': 'ö', #sv,no
'Ø': 'ø', #sv,no
'Ö': 'ö', #de,sv,no,hu
# 'Ø': 'ø', #sv,no
# 'Ö': 'ö', #de,sv,no,hu
# 'ő': 'o', #hu
'Ő': 'ő', #hu
'ŕ': 'r', #sk
'Ŕ': 'R', #sk
# 'ř': 'r', #cz
'Ř': 'ř', #cz
# 'Ř': 'ř', #cz
# 'ś': 's', #pl
'Ś': 'ś', #pl
# 'Ś': 'ś', #pl
# 'š': 's', #cz,hr,sk
'Š': 'š', #cz,hr,sk
# 'Š': 'š', #cz,hr,sk
# 'ș': 's', #ro - s-comma
'Ș': 'ș', #ro - S-comma
# 'Ș': 'ș', #ro - S-comma
'ş': 'ș', #ro - s-cedilla
'Ş': 'ș', #ro - S-cedilla
'Ş': 'Ș', #ro - S-cedilla
# 'ß': 'ss',#de
'ẞ': 'ß',#de
# 'ť': 't', #cz,sk
'Ť': 'ť', #cz,sk
# 'ț': 't', #ro - t-comma
# 'Ț': 'T', #ro - T-comma
'Ț': 'ț', #ro - T-comma
'ţ': 'ț', #ro - t-cedilla
'Ţ': 'Ț', #ro - T-cedilla
# 'ú': 'u', #cz,es,hu,sk
'Ú': 'ú', #cz,hu,sk
'ù': 'u', #it
'Ù': 'U', #it
'û': 'u', #fr
'Ü': 'ü', #de,hu
'Û': 'U', #fr
# 'Ü': 'ü', #de,hu
# 'ů': 'u', #cz
'Ů': 'ů', #cz
# 'ű': 'u', #hu
'Ű': 'ű', #hu
# 'ý': 'y', #cz,sk
'Ý': 'ý', #cz,sk
# 'Ý': 'ý', #cz,sk
'ÿ': 'y', #fr
'Ÿ': 'y', #fr
# 'ź': 'z', #pl
'Ź': 'ź', #pl
# 'ž': 'z', #cz,hr,sk
'Ž': 'ž', #cz,hr,sk
# 'Ž': 'ž', #cz,hr,sk
# 'ż': 'z', #pl
'Ż': 'ż', #pl
'¿': '', #es
Expand Down