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

@@ -86,7 +86,7 @@ RawFeature = {+ss06}
     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 %]
 

templates/song_template.tt

@@ -6,15 +6,16 @@
 \song{[% purpose_print ? purpose_print : purpose %]}{[% song_title -%]}{
 [% before_song -%]
 \begin{samepage}
-    [% IF scores -%]
-    [% IF scores.gregorian AND (gregorian OR NOT scores.congregation) -%]
-        [% IF NOT gregorian -%]
-        \textbf{\LARGE{Activate gregorian}}
-        [% ELSE -%]
-        \gregorioscore{gregorio_scores/[% scores.gregorian %]}
-        [% END -%]
-    [% ELSE -%]
-\lilypondfile{[% IF parts;
+[% IF scores;
+    IF scores.gregorian AND (gregorian OR NOT scores.congregation);
+        IF NOT gregorian;
+            GET "\\textbf{\\LARGE{Activate gregorian}}\n";
+        ELSE;
+            GET "\\gregorioscore{gregorio_scores/${scores.gregorian}}\n";
+        END;
+    ELSE;
+    GET '\lilypondfile{';
+    IF parts;
         IF parts == 'band';
             IF scores.leadsheet;
                 GET "${library_dir}/${scores.leadsheet}";
@@ -30,16 +31,19 @@
         END;
     ELSE;
         GET "${library_dir}/${scores.congregation}";
-END; %]}
-    [% END -%]
-    [% ELSIF lyrics -%]
-        [% lyrics %]
-    [% END -%]
+    END;
+    GET "}\n";
+END;
+ELSIF lyrics;
+    GET lyrics;
+END; %]
 [% IF credits -%]
 \leavevmode\\*
-        [% FOREACH key = credits.keys -%]
-            \[% key %]{[% credits.$key %]}
-        [% END -%]
+[% FOREACH key = credits.keys;
+# Workaround because PERL keeps resolving \\$ to $
+    s = "\\ ${key}{${credits.$key}}\n";
+    GET s.replace('(\W) ', '$1');
+END; -%]
 [% END -%]
 \end{samepage}
 [% content -%]

templates/songsheet.tt

@@ -11,7 +11,7 @@
 [% 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 %]
 

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;
 -%]