From af0ba1d2ef5c3fd0eaa577bb9e8582ac4917e44e Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 7 Jan 2020 15:06:50 -0800 Subject: [PATCH 1/2] Handle string inputs to load_glyphs for BDF. --- adafruit_bitmap_font/bdf.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adafruit_bitmap_font/bdf.py b/adafruit_bitmap_font/bdf.py index e38283d..70beabf 100644 --- a/adafruit_bitmap_font/bdf.py +++ b/adafruit_bitmap_font/bdf.py @@ -92,6 +92,10 @@ def load_glyphs(self, code_points): if isinstance(code_points, int): remaining = set() remaining.add(code_points) + elif isinstance(code_points, str): + remaining = set(code_points.encode("utf-8")) + elif isinstance(code_points, set): + remaining = code_points else: remaining = set(code_points) for code_point in remaining: From 5a0dae65e36c674aa46369eef01ec02323e1a013 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 8 Jan 2020 11:29:17 -0800 Subject: [PATCH 2/2] Don't encode because it breaks unicode values. --- adafruit_bitmap_font/bdf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_bitmap_font/bdf.py b/adafruit_bitmap_font/bdf.py index 70beabf..9f89566 100644 --- a/adafruit_bitmap_font/bdf.py +++ b/adafruit_bitmap_font/bdf.py @@ -93,7 +93,7 @@ def load_glyphs(self, code_points): remaining = set() remaining.add(code_points) elif isinstance(code_points, str): - remaining = set(code_points.encode("utf-8")) + remaining = set(ord(c) for c in code_points) elif isinstance(code_points, set): remaining = code_points else: