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

fontgen: move features into fonts

Browse Source 
Also, removed feature existance cheking (since it now depends on a font,
so may end up being inside (only) a font not being used currently -
which is an allowed usage)
This commit is contained in:
Yehoshua Pesach Wallach
2022-04-19 14:53:57 +03:00
committed by JF
parent ac0dc5ff47
commit 9535c1e651
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/displayapp/fonts/generate.py
View File

@@ -43,10 +43,6 @@ def main():
with open(args.config, 'r') as fd:
data = json.load(fd)
for enabled_feature in args.features:
if enabled_feature not in data['features']:
sys.exit(f'Error: the requested feature {enabled_feature} does not exist in {args.config}.')
fonts_to_run = args.font
if args.removec and args.font:
fonts_to_run = []
@@ -66,13 +62,11 @@ def main():
if fonts_to_run and name not in fonts_to_run:
continue
sources = font.pop('sources')
if 'patches' in font:
patches = font.pop('patches')
else:
patches = None
patches = font.pop('patches') if 'patches' in font else []
features = font.pop('features') if 'features' in font else []
for enabled_feature in args.features:
if name in data['features'][enabled_feature]:
sources.extend(data['features'][enabled_feature][name])
if enabled_feature in features:
sources.extend(features[enabled_feature])
font['fonts'] = [FontArg(thing) for thing in sources]
line = gen_lvconv_line(f'{name}.c', **font)
subprocess.check_call(line)