From ed7843fe00dafdc44b60e613a1a9e33c598e843e Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 23 Jun 2019 10:28:00 +0300 Subject: Change: command line syntax of ftt-docgen --- Makefile | 2 +- ftt-docgen | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 379b2a8..af6a25c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ publish: install -m 0644 $(outputs) files .md.tmp: - ./ftt-docgen $$(basename $< .md).yaml $< > $@ + ./ftt-docgen $< > $@ .tmp.pdf: ./ftt-pandoc $< -o $@ diff --git a/ftt-docgen b/ftt-docgen index f1f23a7..f73bb27 100755 --- a/ftt-docgen +++ b/ftt-docgen @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import copy +import os import re import sys @@ -228,14 +229,23 @@ def walk(o, func): for c in o.children: walk(c, func) +def infer_bindings_filename(markdowns): + root, ext = os.path.splitext(markdowns[0]) + if ext not in ['.md', '.mdwn']: + sys.exit('Input filenames must end in .md or .mdwn') + return root + '.yaml' + def debug(msg): if False: sys.stderr.write('DEBUG: {}\n'.format(msg)) sys.stderr.flush() -bindings = yaml.safe_load(open(sys.argv[1])) +markdowns = sys.argv[1:] +text = ''.join(open(filename).read() for filename in markdowns) + +with open(infer_bindings_filename(markdowns)) as f: + bindings = yaml.safe_load(f) -text = ''.join(open(filename).read() for filename in sys.argv[2:]) start = '---\n' end = '\n...\n' -- cgit v1.2.1