Merge pull request #494 from jdlcdl/ja-JP_simulator_support

resolves simulator support for ja-JP
selfcustody · Dec 11, 2024 · 4bfe2cc · 4bfe2cc
2 parents 2d94a05 + 2be4cc6
commit 4bfe2cc
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/simulator/kruxsim/mocks/lcd.py b/simulator/kruxsim/mocks/lcd.py
@@ -34,6 +34,8 @@
 WIDTH = BOARD_CONFIG["lcd"]["width"]
 HEIGHT = BOARD_CONFIG["lcd"]["height"]
 
+JAPANESE_CODEPOINT_MIN = 0x3000
+JAPANESE_CODEPOINT_MAX = 0x30FF
 CHINESE_CODEPOINT_MIN = 0x4E00
 CHINESE_CODEPOINT_MAX = 0x9FFF
 KOREAN_CODEPOINT_MIN = 0xAC00
@@ -153,7 +155,8 @@ def string_width_px(string):
 
     for c in string:
         if (
-            CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
+            JAPANESE_CODEPOINT_MIN <= ord(c) <= JAPANESE_CODEPOINT_MAX
+            or CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
             or KOREAN_CODEPOINT_MIN <= ord(c) <= KOREAN_CODEPOINT_MAX
         ):
             string_width += wide_width
@@ -165,21 +168,24 @@ def string_width_px(string):
 def string_has_wide_glyph(string):
     for c in string:
         if (
-            CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
+            JAPANESE_CODEPOINT_MIN <= ord(c) <= JAPANESE_CODEPOINT_MAX
+            or CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
             or KOREAN_CODEPOINT_MIN <= ord(c) <= KOREAN_CODEPOINT_MAX
         ):
             return True
     return False
 
 def is_wide(c):
     return (
-            CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
+            JAPANESE_CODEPOINT_MIN <= ord(c) <= JAPANESE_CODEPOINT_MAX
+            or CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
             or KOREAN_CODEPOINT_MIN <= ord(c) <= KOREAN_CODEPOINT_MAX
     )
 
 def char_width(c):
     if (
-        CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
+        JAPANESE_CODEPOINT_MIN <= ord(c) <= JAPANESE_CODEPOINT_MAX
+        or CHINESE_CODEPOINT_MIN <= ord(c) <= CHINESE_CODEPOINT_MAX
         or KOREAN_CODEPOINT_MIN <= ord(c) <= KOREAN_CODEPOINT_MAX
     ):
         return BOARD_CONFIG["krux"]["display"]["font_wide"][0]