j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #755 from colesnicov/master

Browse source 
Support for TTF font
This commit is contained in:
Ruslan V. Uss 2020-06-19 16:46:40 +05:00 committed by GitHub
commit 37449fabd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extras/fonts/tools/create_font.py
View file

@ -44,7 +44,12 @@ def gen_char(index, c, im):
def main(args): def main(args):
if args.truetype == 0:
fnt = ImageFont.load(args.font) fnt = ImageFont.load(args.font)
else:
# use a truetype font
fnt = ImageFont.truetype(args.font, args.size)
size = fnt.getsize('A') size = fnt.getsize('A')
im = Image.new('RGB', size) im = Image.new('RGB', size)
@ -62,6 +67,7 @@ def main(args):
env = jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(os.path.abspath(__file__))), finalize=lambda x: '' if x is None else x) env = jinja2.Environment(loader=jinja2.FileSystemLoader(os.path.dirname(os.path.abspath(__file__))), finalize=lambda x: '' if x is None else x)
print(env.get_template(args.template).render({ print(env.get_template(args.template).render({
'font': { 'font': {
'path': os.path.basename(args.font),
'name': args.name, 'name': args.name,
'size': size, 'size': size,
'charset': args.charset, 'charset': args.charset,
@ -82,9 +88,11 @@ if __name__ == "__main__":
parser=argparse.ArgumentParser(description='Fixed fonts converter') parser=argparse.ArgumentParser(description='Fixed fonts converter')
parser.add_argument('-f', '--font', type=str, required=True, help='PIL font filename') parser.add_argument('-f', '--font', type=str, required=True, help='PIL font filename')
parser.add_argument('-n', '--name', type=clean_str, required=True, help='Font name') parser.add_argument('-n', '--name', type=clean_str, required=True, help='Font name')
parser.add_argument('-c', '--charset', type=clean_str, required=True, help='Charset') parser.add_argument('-c', '--charset', type=clean_str, help='Charset (default=unic)', default="unic")
parser.add_argument('--first', type=int, help='First character', default=1) parser.add_argument('--first', type=int, help='First character', default=1)
parser.add_argument('--last', type=int, help='Last character', default=255) parser.add_argument('--last', type=int, help='Last character', default=255)
parser.add_argument('-s', '--size', type=int, help='Height for glyphs (default=8)', default=8)
parser.add_argument('-ttf', '--truetype', type=int, required=True, help='TrueType font (0=no|1=yes)')
parser.add_argument('-t', '--template', type=str, help='Template filename', default='template.c') parser.add_argument('-t', '--template', type=str, help='Template filename', default='template.c')
main(parser.parse_args(sys.argv[1:])) main(parser.parse_args(sys.argv[1:]))

6
extras/fonts/tools/template.c
View file

@ -8,7 +8,8 @@ _EXTRAS_FONTS_FONT_{{ font.name|upper }}_{{ font.size[0] }}X{{ font.size[1] }}_{
_fonts_{{ font.name|lower }}_{{ font_size }}_{{ font.charset|lower }} _fonts_{{ font.name|lower }}_{{ font_size }}_{{ font.charset|lower }}
{%- endset -%} {%- endset -%}
/** /**
* This file contains generated binary font data. * This file contains generated binary font data. *
* Generated from file: ({{ font.path }})
* *
* Font: {{ font.name }} * Font: {{ font.name }}
* Size: {{ font_size }} * Size: {{ font_size }}
@ -22,6 +23,9 @@ _fonts_{{ font.name|lower }}_{{ font_size }}_{{ font.charset|lower }}
#ifndef {{ header_id }} #ifndef {{ header_id }}
#define {{ header_id }} #define {{ header_id }}
#include <stdint.h>
//#include <fonts/fonts.h> // Uncomment this if you get error 'unknown type 'font_info_t'"..
static const uint8_t {{ font_prefix }}_bitmaps[] = { static const uint8_t {{ font_prefix }}_bitmaps[] = {
{%- for char in chars %} {%- for char in chars %}