will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/displayapp/fonts/fonts.json
View File

@ -13,7 +13,15 @@
], ],
"bpp": 1, "bpp": 1,
"size": 20, "size": 20,
"patches": ["./fix_jetbrains_mono_bold_20_zero.py"] "patches": ["./fix_jetbrains_mono_bold_20_zero.py"],
"features": {
"hebrew": [
{
"font": "SimpleCLM-Medium.ttf",
"range": "0x05D0-0x05EA,0x05F3,0x05F4"
}
]
}
}, },
"jetbrains_mono_42": { "jetbrains_mono_42": {
"sources": [ "sources": [
@ -76,15 +84,5 @@
"size": 80, "size": 80,
"compress": true "compress": true
} }
},
"features": {
"hebrew": {
"jetbrains_mono_bold_20": [
{
"font": "SimpleCLM-Medium.ttf",
"range": "0x05D0-0x05EA,0x05F3,0x05F4"
}
]
}
} }
} }

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

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