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

Fix charset conversion

This commit is contained in:
Alex Voinea 2023-09-28 19:35:43 +02:00
parent f093d431c8
commit 9fbdbb3c7b
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/lib/FontGen.py
View File

@ -91,6 +91,8 @@ for index in range(len(FONT_TABLE)):
CUSTOM_CHARS.update({chr(index + 0x80): FONT_TABLE[index].utf}) CUSTOM_CHARS.update({chr(index + 0x80): FONT_TABLE[index].utf})
CUSTOM_CHARS.update(BUILTIN_CHARS) CUSTOM_CHARS.update(BUILTIN_CHARS)
INVERSE_CUSTOM_CHARS = {v: k for k, v in CUSTOM_CHARS.items()}
def generateLineInTable(index, chars): def generateLineInTable(index, chars):
pixels = chars[FONT_TABLE[index].charListIndex]["PIXELS"].split(',') pixels = chars[FONT_TABLE[index].charListIndex]["PIXELS"].split(',')

23
lang/lib/charset.py
View File

@ -1,4 +1,4 @@
from .FontGen import CUSTOM_CHARS from .FontGen import CUSTOM_CHARS, INVERSE_CUSTOM_CHARS
# Charaters to be remapped prior to source-encoding transformation # Charaters to be remapped prior to source-encoding transformation
# This transformation is applied to the translation prior to being converted to the final encoding, # This transformation is applied to the translation prior to being converted to the final encoding,
@ -141,19 +141,22 @@ def translation_check(buf):
valid_chars.add('\n') valid_chars.add('\n')
return _character_check(buf, valid_chars) return _character_check(buf, valid_chars)
def source_to_unicode(buf):
for src, dst in CUSTOM_CHARS.items():
buf = buf.replace(src, dst)
return buf
def trans_replace(buf): def trans_replace(buf):
for src, dst in TRANS_CHARS.items(): for src, dst in TRANS_CHARS.items():
buf = buf.replace(src, dst) buf = buf.replace(src, dst)
return buf return buf
def source_to_unicode(buf):
buf = trans_replace(buf)
out = u''
for c in buf:
out += CUSTOM_CHARS.get(c, c)
return out
def unicode_to_source(buf): def unicode_to_source(buf):
buf = trans_replace(buf) buf = trans_replace(buf)
for dst, src in CUSTOM_CHARS.items(): out = ''
buf = buf.replace(src, dst) for c in buf:
return buf out += INVERSE_CUSTOM_CHARS.get(c, c)
return out