diff --git a/generate.py b/generate.py index 8f73208..c30facc 100644 --- a/generate.py +++ b/generate.py @@ -26,7 +26,10 @@ modules = dict(map(read, module.glob('*.html'))) def format(item, modules): name, content = item - return (name, re.sub('\n\s*', '', content.format(**modules))) + content = content.format(**modules) + content = re.sub(r'\s+', ' ', content) + content = re.sub(r'>\s<', '><', content) + return (name, content) dist_html = dict(map(lambda item: format(item, modules), templates.items())) @@ -42,4 +45,5 @@ def mk_dist(dist, item): for item in dist_html.items(): mk_dist(dist, item) -dist.joinpath('static').symlink_to(static.resolve(strict=True), target_is_directory=True) +dist.joinpath('static')\ + .symlink_to(static.resolve(strict=True), target_is_directory=True)