CCF_100
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fontgen: simplify enabled fonts

main
Yehoshua Pesach Wallach 2022-04-19 18:01:12 +07:00 committed by JF
parent 77645b20b2
commit 1d4fd9c27f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/displayapp/fonts/generate.py
Unescape Escape View File

@ -42,17 +42,16 @@ def main():
with open(args.config, 'r') as fd: with open(args.config, 'r') as fd:
data = json.load(fd) data = json.load(fd)
fonts_to_run = args.font fonts_to_run = set(data['fonts'].keys())
if fonts_to_run: if args.font:
d = set(fonts_to_run).difference(data['fonts'].keys()) d = set(args.font).difference(fonts_to_run)
if d: if d:
print(f'Warning: requested font{"s" if len(d)>1 else ""} missing: {" ".join(d)}') print(f'Warning: requested font{"s" if len(d)>1 else ""} missing: {" ".join(d)}')
fonts_to_run = list(set(fonts_to_run).intersection(data['fonts'].keys())) fonts_to_run = fonts_to_run.intersection(set(args.font))
for (name,font) in data['fonts'].items(): for name in fonts_to_run:
if fonts_to_run and name not in fonts_to_run: font = data['fonts'][name]
continue
sources = font.pop('sources') sources = font.pop('sources')
patches = font.pop('patches') if 'patches' in font else [] patches = font.pop('patches') if 'patches' in font else []
features = font.pop('features') if 'features' in font else [] features = font.pop('features') if 'features' in font else []