From 103aad44d7a03933f59ff62791fa66a4d2b7082b Mon Sep 17 00:00:00 2001 From: troido Date: Tue, 22 Sep 2020 14:18:04 +0200 Subject: don't double non-ascii letters when converting to fullwidth --- asciifarmclient/charmap.py | 4 ++-- asciifarmclient/display.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'asciifarmclient') diff --git a/asciifarmclient/charmap.py b/asciifarmclient/charmap.py index 593364c..dd003cc 100644 --- a/asciifarmclient/charmap.py +++ b/asciifarmclient/charmap.py @@ -8,14 +8,14 @@ ALPHABET = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ab def make_text_wide(char): - if len(char) != 1 or strwidth.strwidth(char) != 1: + if len(char) != 1: return char o = ord(char) if o >= ord('!') and o <= ord('~'): # printable ascii character return chr(o - ord("!") + ord('！')) # fullwidth ascii block if char == " ": return chr(12288) # ideographic space - return char + char + return char def make_sprite_wide(sprite): (char, fg, bg) = sprite diff --git a/asciifarmclient/display.py b/asciifarmclient/display.py index 597e502..05b4733 100644 --- a/asciifarmclient/display.py +++ b/asciifarmclient/display.py @@ -17,7 +17,6 @@ class Display: def __init__(self, charmap, ratuil_args={}): - self.charmap = charmap fname = os.path.join(os.path.dirname(__file__), "layout.xml") -- cgit