diff --git a/Makefile b/Makefile index a4281df..f789501 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,8 @@ include $(build_dir)/dynamic_deps.mk clean: $(RM) -r build all: leadsheet_collection.pdf choir_scores.pdf print_a3.pdf clean_intermediate #print_a4.pdf +print_%.pdf: songsheet.pdf + $(MAKE) -C $(build_dir) $@ %.pdf: build %.tex $(MAKE) -C $(build_dir) $@ clean_intermediate: diff --git a/templates/header.tt b/templates/header.tt index 32db6b0..f6bf23f 100644 --- a/templates/header.tt +++ b/templates/header.tt @@ -8,7 +8,7 @@ \usepackage{ifthen} \usepackage[utf8]{inputenc} \usepackage{ltxtable} -\usepackage[staffsize=14,pass-fonts]{lyluatex} +\usepackage[pass-fonts]{lyluatex} \usepackage{multirow} \usepackage[ngerman]{selnolig} \usepackage{svg} diff --git a/templates/musician_scores.tt b/templates/musician_scores.tt index be4356c..c8b8f67 100644 --- a/templates/musician_scores.tt +++ b/templates/musician_scores.tt @@ -1,4 +1,8 @@ -[% PROCESS variables.tt -%] +[% PROCESS variables.tt + IF proper != ''; + PROCESS "${propers_dir}/${proper}.tt"; + END; +-%] \documentclass[a4paper,12pt]{article} \usepackage[ngerman]{babel} \usepackage{enumitem} diff --git a/templates/song_template.tt b/templates/song_template.tt index 7a174fe..b2cc875 100644 --- a/templates/song_template.tt +++ b/templates/song_template.tt @@ -19,7 +19,17 @@ ELSE; IF parts; GET '\lilypondfile{'; - IF parts == 'band' || parts == 'full'; + IF parts == 'band'; + IF scores.band; + GET "${directory}/${scores.band}"; + ELSIF scores.leadsheet; + GET "${directory}/${scores.leadsheet}"; + ELSIF scores.full; + GET "${directory}/${scores.full}"; + ELSE; + GET "${directory}/${scores.SATB}"; + END; + ELSIF parts == 'full'; IF scores.full; GET "${directory}/${scores.full}"; ELSIF scores.leadsheet;