Black formatted again...

[hackapet/Adafruit_Blinka_Displayio.git] / fontio.py

diff --git a/fontio.py b/fontio.py
index c904af44ed7ca8d48040f13aecf7f6158ca7ecba..e64ce68ac142726e5df6ffa119f11dfdf20af52c 100644 (file)
--- a/fontio.py
+++ b/fontio.py
@@ -34,22 +34,25 @@ fontio for Blinka
 
 """
 
 
 """
 

-from displayio import Bitmap

 from PIL import ImageFont
 from PIL import ImageFont

+from displayio import Bitmap

 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 

+

 class BuiltinFont:
 class BuiltinFont:

+    """Simulate a font built into CircuitPython"""
+

     def __init__(self):
         self._font = ImageFont.load_default()
     def __init__(self):
         self._font = ImageFont.load_default()

-        ascii = ""
+        ascii_chars = ""

         for character in range(0x20, 0x7F):
         for character in range(0x20, 0x7F):

-            ascii += chr(character)
-        self._font.getmask(ascii)
-        bmp_size = self._font.getsize(ascii)
+            ascii_chars += chr(character)
+        self._font.getmask(ascii_chars)
+        bmp_size = self._font.getsize(ascii_chars)

         self._bitmap = Bitmap(bmp_size[0], bmp_size[1], 2)
         self._bitmap = Bitmap(bmp_size[0], bmp_size[1], 2)

-        ascii_mask = self._font.getmask(ascii, mode="1")
+        ascii_mask = self._font.getmask(ascii_chars, mode="1")

         for x in range(bmp_size[0]):
             for y in range(bmp_size[1]):
                 self._bitmap[x, y] = 1 if ascii_mask.getpixel((x, y)) else 0
         for x in range(bmp_size[0]):
             for y in range(bmp_size[1]):
                 self._bitmap[x, y] = 1 if ascii_mask.getpixel((x, y)) else 0


@@ -57,9 +60,12 @@ class BuiltinFont:
     def _get_glyph_index(self, charcode):
         if 0x20 <= charcode <= 0x7E:
             return charcode - 0x20
     def _get_glyph_index(self, charcode):
         if 0x20 <= charcode <= 0x7E:
             return charcode - 0x20

+        return None

 
     def get_bounding_box(self):
 
     def get_bounding_box(self):

-        """Returns the maximum bounds of all glyphs in the font in a tuple of two values: width, height."""
+        """Returns the maximum bounds of all glyphs in the font in
+        a tuple of two values: width, height.
+        """

         return self._font.getsize("M")
 
     def get_glyph(self, codepoint):
         return self._font.getsize("M")
 
     def get_glyph(self, codepoint):


@@ -78,12 +84,16 @@ class BuiltinFont:
 
     @property
     def bitmap(self):
 
     @property
     def bitmap(self):

-        """Bitmap containing all font glyphs starting with ASCII and followed by unicode. Use `get_glyph` in most cases. This is useful for use with `displayio.TileGrid` and `terminalio.Terminal`.
+        """Bitmap containing all font glyphs starting with ASCII and followed by unicode. Use
+        `get_glyph` in most cases. This is useful for use with `displayio.TileGrid` and
+        `terminalio.Terminal`.

         """
         return self._bitmap
 
 
 class Glyph:
         """
         return self._bitmap
 
 
 class Glyph:

+    """Storage of glyph info"""
+

     def __init__(self, *, bitmap, tile_index, width, height, dx, dy, shift_x, shift_y):
         self.bitmap = bitmap
         self.width = width
     def __init__(self, *, bitmap, tile_index, width, height, dx, dy, shift_x, shift_y):
         self.bitmap = bitmap
         self.width = width