mirror
/
micropython-font-to-py
kopia lustrzana https://github.com/peterhinch/micropython-font-to-py
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Implement left alignment.

pull/28/head
Peter Hinch 2019-10-17 12:30:18 +01:00
rodzic 6e9e934939
commit 5c6ac90911
2 zmienionych plików z 9 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
extended
Wyświetl plik

@ -1 +1 @@
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~°Ωαβγδθλμπωϕ£ ¬!"#£$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~°Ωαβγδθλμπωϕ£

13
font_to_py.py
Wyświetl plik

@ -6,6 +6,7 @@
# Some code adapted from Daniel Bader's work at the following URL # Some code adapted from Daniel Bader's work at the following URL
# http://dbader.org/blog/monochrome-font-rendering-with-freetype-and-python # http://dbader.org/blog/monochrome-font-rendering-with-freetype-and-python
# With thanks to Stephen Irons @ironss for fix for leading left pixels.
# The MIT License (MIT) # The MIT License (MIT)
# #
@ -111,10 +112,10 @@ class Bitmap(object):
print() print()
print() print()
def bitblt(self, src, row): def bitblt(self, src, top, left):
"""Copy all pixels from `src` into this bitmap""" """Copy all pixels from `src` into this bitmap"""
srcpixel = 0 srcpixel = 0
dstpixel = row * self.width dstpixel = top * self.width + left
row_offset = self.width - src.width row_offset = self.width - src.width
for _ in range(src.height): for _ in range(src.height):
@ -166,12 +167,13 @@ class Bitmap(object):
class Glyph(object): class Glyph(object):
def __init__(self, pixels, width, height, top, advance_width): def __init__(self, pixels, width, height, top, left, advance_width):
self.bitmap = Bitmap(width, height, pixels) self.bitmap = Bitmap(width, height, pixels)
# The glyph bitmap's top-side bearing, i.e. the vertical distance from # The glyph bitmap's top-side bearing, i.e. the vertical distance from
# the baseline to the bitmap's top-most scanline. # the baseline to the bitmap's top-most scanline.
self.top = top self.top = top
self.left = left
# Ascent and descent determine how many pixels the glyph extends # Ascent and descent determine how many pixels the glyph extends
# above or below the baseline. # above or below the baseline.
@ -197,12 +199,13 @@ class Glyph(object):
pixels = Glyph.unpack_mono_bitmap(slot.bitmap) pixels = Glyph.unpack_mono_bitmap(slot.bitmap)
width, height = slot.bitmap.width, slot.bitmap.rows width, height = slot.bitmap.width, slot.bitmap.rows
top = slot.bitmap_top top = slot.bitmap_top
left = slot.bitmap_left
# The advance width is given in FreeType's 26.6 fixed point format, # The advance width is given in FreeType's 26.6 fixed point format,
# which means that the pixel values are multiples of 64. # which means that the pixel values are multiples of 64.
advance_width = slot.advance.x / 64 advance_width = slot.advance.x / 64
return Glyph(pixels, width, height, top, advance_width) return Glyph(pixels, width, height, top, left, advance_width)
@staticmethod @staticmethod
def unpack_mono_bitmap(bitmap): def unpack_mono_bitmap(bitmap):
@ -335,7 +338,7 @@ class Font(dict):
# The vertical drawing position should place the glyph # The vertical drawing position should place the glyph
# on the baseline as intended. # on the baseline as intended.
row = self.height - int(glyph.ascent) - self._max_descent row = self.height - int(glyph.ascent) - self._max_descent
outbuffer.bitblt(glyph.bitmap, row) outbuffer.bitblt(glyph.bitmap, row, glyph.left)
self[char] = [outbuffer, width, char_width] self[char] = [outbuffer, width, char_width]
def stream_char(self, char, hmap, reverse): def stream_char(self, char, hmap, reverse):