cleanup

Makefile

@@ -1,19 +1,14 @@
 docker = podman
 build_dir = build
-tex_deps = variables.tt library/*/*/*.tt song_choices.csv song_template.tt empty_page_template.tt propers/*.tt purpose_processing.tt
+template_dir = templates
+config_dir = config
 .PHONY: all 
 .PRECIOUS: %.tex
 all: leadsheet_collection.pdf choir_scores.pdf print_a3.pdf clean_intermediate #print_a4.pdf
 %.pdf: build
 	$(MAKE) -C $(build_dir) $@
-songsheet.tex: songsheet.tt $(tex_deps) header.tt head.tt footer.tt
+%.tex: build
-	tpage $< > $(build_dir)/$@
+	$(MAKE) -C $(template_dir) $@
-musician_scores.tex: musician_scores.tt $(tex_deps)
-	tpage $< > $(build_dir)/$@
-leadsheet_collection.tex: musician_scores.tt $(tex_deps)
-	tpage --define parts=band $< > $(build_dir)/$@
-choir_scores.tex: musician_scores.tt $(tex_deps)
-	tpage --define parts=SATB $< > $(build_dir)/$@
 clean_intermediate:
 	$(MAKE) -C $(build_dir) clean_intermediate
 build: build-Makefile

templates/Makefile

@@ -0,0 +1,13 @@
+build_dir = ../build
+library_dir = ../library
+propers_dir = ../propers
+config_dir = ../config
+tex_deps = *.tt $(library_dir)/*/*/*.tt $(config_dir)/song_choices.csv $(propers_dir)/*.tt
+songsheet.tex: songsheet.tt $(tex_deps) header.tt head.tt footer.tt
+	tpage $< > $(build_dir)/$@
+musician_scores.tex: musician_scores.tt $(tex_deps)
+	tpage $< > $(build_dir)/$@
+leadsheet_collection.tex: musician_scores.tt $(tex_deps)
+	tpage --define parts=band $< > $(build_dir)/$@
+choir_scores.tex: musician_scores.tt $(tex_deps)
+	tpage --define parts=SATB $< > $(build_dir)/$@

templates/footer.tt

@@ -1,6 +1,6 @@
 \vspace*{\fill}
 
-[% USE qr_codes = datafile('qr_codes.csv', delim='|') %]
+[% USE qr_codes = datafile("${config_dir}/qr_codes.csv", delim='|') %]
 
 [% FOREACH qr_code = qr_codes -%]
 

templates/musician_scores.tt

@@ -75,7 +75,7 @@ RawFeature = {+ss06}
 [% subtitle %]
 \end{centering}
 
-[% USE song_choices = datafile('song_choices.csv', delim='|') %]
+[% USE song_choices = datafile("${config_dir}/song_choices.csv", delim='|') %]
 [% IF parts == 0 -%]
     parts = ensemble
 [% END -%]

templates/song_template.tt

@@ -11,25 +11,25 @@
         [% IF NOT gregorian -%]
         \textbf{\LARGE{Activate gregorian}}
         [% ELSE -%]
-        \gregorioscore{../library/[% scores.gregorian %]}
+        \gregorioscore{[% library_dir %]/[% scores.gregorian %]}
         [% END -%]
     [% ELSE -%]
 \lilypondfile{[% IF parts;
     IF parts == 'band';
         IF scores.leadsheet;
-            GET "../library/${scores.leadsheet}";
+            GET "${library_dir}/${scores.leadsheet}";
         ELSE;
-            GET "../library/${scores.SATB}";
+            GET "${library_dir}/${scores.SATB}";
         END;
     ELSIF parts == 'SATB';
         IF scores.SATB;
-            GET "../library/${scores.SATB}";
+            GET "${library_dir}/${scores.SATB}";
         ELSE;
-            GET "../library/${scores.leadsheet}";
+            GET "${library_dir}/${scores.leadsheet}";
         END;
     END;
 ELSE;
-    GET "../library/${scores.congregation}";
+    GET "${library_dir}/${scores.congregation}";
 END; %]}
     [% END -%]
     [% ELSIF lyrics -%]

templates/songsheet.tt

@@ -4,7 +4,7 @@
 \begin{document}
 [% INCLUDE head.tt %]
 
-[% USE song_choices = datafile('song_choices.csv', delim='|') %]
+[% USE song_choices = datafile("${config_dir}/song_choices.csv", delim='|') %]
 
 [% FOREACH song = song_choices %]
     [% template = song.template == '' ? "song_template.tt" : song.template -%]

templates/variables.tt

@@ -8,5 +8,7 @@
     small_footer = 0
     lent = 0
     meditations = 0
+    config_dir = '../config'
+    library_dir = '../library'
 -%]
 [%# PROCESS propers/per_annum_XIII.tt -%]