fixed indents

Makefile

@@ -1,11 +1,15 @@
-docker = podman
 build_dir = build
-template_dir = templates
 config_dir = config
+docker = podman
+library_dir = library
+propers_dir = propers
+template_dir = templates
+tex_deps = $(template_dir)/*.tt $(library_dir)/*/*/*.tt $(propers_dir)/*.tt $(config_dir)/song_choices.csv $(config_dir)/qr_codes.csv $(config_dir)/variables.tt
 .PHONY: all 
 all: leadsheet_collection.pdf choir_scores.pdf print_a3.pdf clean_intermediate #print_a4.pdf
 %.pdf: build
 	$(MAKE) -C $(build_dir) $@
+songsheet.tex: $(template_dir)/songsheet.tt $(tex_deps) $(template_dir)/header.tt $(template_dir)/head.tt $(template_dir)/footer.tt
 %.tex: build
 	$(MAKE) -C $(template_dir) $@
 clean_intermediate:

templates/Makefile

@@ -2,7 +2,7 @@ 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
+tex_deps = *.tt $(library_dir)/*/*/*.tt $(propers_dir)/*.tt $(config_dir)/song_choices.csv $(config_dir)/variables.tt
 songsheet.tex: songsheet.tt $(tex_deps) header.tt head.tt footer.tt
 	tpage $< > $(build_dir)/$@
 musician_scores.tex: musician_scores.tt $(tex_deps)

templates/musician_scores.tt

@@ -77,17 +77,17 @@ RawFeature = {+ss06}
 
 [% USE song_choices = datafile("${config_dir}/song_choices.csv", delim= '|') %]
 [% IF parts == 0 -%]
-    parts = ensemble
+parts = ensemble
 [% END -%]
 [% FOREACH song = song_choices %]
 \newpage
-    [% template = song.template == '' ? "song_template.tt" : song.template -%]
+[% template = song.template == '' ? "song_template.tt" : song.template -%]
-    [% INCLUDE "$template"
+[% INCLUDE "$template"
     purpose = song.purpose
     title = song.title
     content = song.content
-        variables = song.variables ? "${song.variables}/assignments.tt" : ''
+    variables = song.variables ? "${library_dir}/${song.variables}/assignments.tt" : ''
-    %]
+%]
 [% END %]
 
 \end{document}

templates/song_template.tt

@@ -4,17 +4,18 @@
     END;
 -%]
 \song{[% purpose_print ? purpose_print : purpose %]}{[% song_title -%]}{
-    [% before_song -%]
+[% before_song -%]
-    \begin{samepage}
+\begin{samepage}
-    [% IF scores -%]
+[% IF scores;
-    [% IF scores.gregorian AND (gregorian OR NOT scores.congregation) -%]
+    IF scores.gregorian AND (gregorian OR NOT scores.congregation);
-        [% IF NOT gregorian -%]
+        IF NOT gregorian;
-        \textbf{\LARGE{Activate gregorian}}
+            GET "\\textbf{\\LARGE{Activate gregorian}}\n";
-        [% ELSE -%]
+        ELSE;
-        \gregorioscore{gregorio_scores/[% scores.gregorian %]}
+            GET "\\gregorioscore{gregorio_scores/${scores.gregorian}}\n";
-        [% END -%]
+        END;
-    [% ELSE -%]
+    ELSE;
-\lilypondfile{[% IF parts;
+    GET '\lilypondfile{';
+    IF parts;
         IF parts == 'band';
             IF scores.leadsheet;
                 GET "${library_dir}/${scores.leadsheet}";
@@ -28,27 +29,30 @@
                 GET "${library_dir}/${scores.leadsheet}";
             END;
         END;
-ELSE;
+    ELSE;
         GET "${library_dir}/${scores.congregation}";
-END; %]}
+    END;
-    [% END -%]
+    GET "}\n";
-    [% ELSIF lyrics -%]
+END;
-        [% lyrics %]
+ELSIF lyrics;
-    [% END -%]
+    GET lyrics;
-    [% IF credits -%]
+END; %]
-        \leavevmode\\*
+[% IF credits -%]
-        [% FOREACH key = credits.keys -%]
+\leavevmode\\*
-            \[% key %]{[% credits.$key %]}
+[% FOREACH key = credits.keys;
-        [% END -%]
+# Workaround because PERL keeps resolving \\$ to $
-    [% END -%]
+    s = "\\ ${key}{${credits.$key}}\n";
-    \end{samepage}
+    GET s.replace('(\W) ', '$1');
-    [% content -%]
+END; -%]
-    [% IF (meditation && meditations) || (parts && meditation) -%]
+[% END -%]
+\end{samepage}
+[% content -%]
+[% IF (meditation && meditations) || (parts && meditation) -%]
     \leavevmode\par\smallskip
     [% meditation %]
-    [% END -%]
+[% END -%]
-    [% IF after_song -%]
+[% IF after_song -%]
     \leavevmode\par\smallskip
     [% after_song %]
-    [% END -%]
+[% END -%]
 }

templates/songsheet.tt

@@ -7,12 +7,12 @@
 [% USE song_choices = datafile("${config_dir}/song_choices.csv", delim= '|') %]
 
 [% FOREACH song = song_choices %]
-    [% template = song.template == '' ? "song_template.tt" : song.template -%]
+[% template = song.template == '' ? "song_template.tt" : song.template -%]
-    [% INCLUDE "$template"
+[% INCLUDE "$template"
     purpose = song.purpose
     content = song.content
-        variables = song.variables ? "${song.variables}/assignments.tt" : ''
+    variables = song.variables ? "${library_dir}/${song.variables}/assignments.tt" : ''
-    %]
+%]
 [% END %]
 
 [% INCLUDE footer.tt %]

templates/variables.tt

@@ -10,9 +10,10 @@
     meditations = 0
     config_dir = '../config'
     library_dir = '../library'
+    propers_dir = '../propers/'
 -%]
 [%  PROCESS "${config_dir}/variables.tt";
     IF proper != '';
-    PROCESS "propers/${proper}.tt";
+    PROCESS "${propers_dir}/${proper}.tt";
     END;
 -%]