From a48ecfc7fc0877bbe1e5a6823ac85ad93f029cbf Mon Sep 17 00:00:00 2001 From: Vik Fearing Date: Wed, 4 Sep 2024 13:26:29 +0200 Subject: [PATCH] Allow multiple fonts on the command line --- docs/confreg/skinning.md | 3 ++- postgresqleu/confreg/jinjapdf.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/confreg/skinning.md b/docs/confreg/skinning.md index 5142c50f..acbd92ae 100644 --- a/docs/confreg/skinning.md +++ b/docs/confreg/skinning.md @@ -372,7 +372,8 @@ paragraph : The actual text to write fontname - : The font to use. This font must be registered in local_settings.py! + : The font to use. This font must be registered in local_settings.py! When using the + command line, these may be passed via one or multiple `--font` arguments. color : The color to use (defaults to *black*) diff --git a/postgresqleu/confreg/jinjapdf.py b/postgresqleu/confreg/jinjapdf.py index 4ce7e73f..d7fc1435 100755 --- a/postgresqleu/confreg/jinjapdf.py +++ b/postgresqleu/confreg/jinjapdf.py @@ -382,7 +382,7 @@ if __name__ == "__main__": parser.add_argument('--borders', action='store_true', help='Enable borders on written file') parser.add_argument('--pagebreaks', action='store_true', help='Enable pagebreaks on written file') parser.add_argument('--fontroot', type=str, help='fontroot for dejavu fonts') - parser.add_argument('--font', type=str, nargs='+', help=':') + parser.add_argument('--font', type=str, nargs=1, action='append', help=':') args = parser.parse_args() @@ -424,7 +424,8 @@ if __name__ == "__main__": ] if args.font: - fonts.extend([f.split(':') for f in args.font]) + for font in args.font: + fonts.extend([f.split(':') for f in font]) if args.what == 'badge': renderer = JinjaBadgeRenderer(args.repopath, fonts, debug=True, border=args.borders, pagebreaks=args.pagebreaks) -- 2.39.5