scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

fontgen: remove "feature" feature

Browse source
This commit is contained in:
Yehoshua Pesach Wallach 2022-04-24 18:46:44 +03:00 committed by JF
parent 4e2b0b1f10
commit 331de8ce8e
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/displayapp/fonts/README.md
View file

@ -24,7 +24,6 @@ and for each font there is:
* bpp - bits per pixel. * bpp - bits per pixel.
* size - size. * size - size.
* patches - list of extra "patches" to run, either string to file which should be run, or list of arguments (with first one being the command being run) * patches - list of extra "patches" to run, either string to file which should be run, or list of arguments (with first one being the command being run)
* features - optional. dictionary of extra file,range fonts to be included when the feature is enabled. (for example: a extra language)
* compress - optional. default disabled. add `"compress": true` to enable * compress - optional. default disabled. add `"compress": true` to enable
### Navigation font ### Navigation font

10
src/displayapp/fonts/fonts.json
View file

@ -12,15 +12,7 @@
], ],
"bpp": 1, "bpp": 1,
"size": 20, "size": 20,
"patches": [["patch", "{file}", "{file}_zero.patch"]], "patches": [["patch", "{file}", "{file}_zero.patch"]]
"features": {
"hebrew": [
{
"file": "SimpleCLM-Medium.ttf",
"range": "0x05D0-0x05EA,0x05F3,0x05F4"
}
]
}
}, },
"jetbrains_mono_42": { "jetbrains_mono_42": {
"sources": [ "sources": [

5
src/displayapp/fonts/generate.py
View file

@ -33,7 +33,6 @@ def gen_lvconv_line(dest: str, size: int, bpp: int, sources: typing.List[Source]
def main(): def main():
ap = argparse.ArgumentParser(description='auto generate LVGL font files from fonts') ap = argparse.ArgumentParser(description='auto generate LVGL font files from fonts')
ap.add_argument('config', type=str, help='config file to use') ap.add_argument('config', type=str, help='config file to use')
ap.add_argument('-e', '--enable', type=str, action='append', help='optional feature to enable in font generation', default=[], metavar='FEATURE', dest='features')
ap.add_argument('-f', '--font', type=str, action='append', help='Choose specific fonts to generate (default: all)', default=[]) ap.add_argument('-f', '--font', type=str, action='append', help='Choose specific fonts to generate (default: all)', default=[])
args = ap.parse_args() args = ap.parse_args()
@ -59,10 +58,6 @@ def main():
font = data[name] font = data[name]
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 []
for enabled_feature in args.features:
if enabled_feature in features:
sources.extend(features[enabled_feature])
font['sources'] = [Source(thing) for thing in sources] font['sources'] = [Source(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)