Adjusted to new template structure

Makefile

-SRCS = Schubert_StabatMater_D383_01_Chor.ly Schubert_StabatMater_D383_02_Arie.ly Schubert_StabatMater_D383_03_Chor.ly Schubert_StabatMater_D383_04_Duett.ly Schubert_StabatMater_D383_05_Chor.ly Schubert_StabatMater_D383_06_Arie.ly Schubert_StabatMater_D383_07_Chor.ly Schubert_StabatMater_D383_08_Arie.ly Schubert_StabatMater_D383_09_Chor.ly Schubert_StabatMater_D383_10_Terzett.ly Schubert_StabatMater_D383_11_Terzett_Chor.ly Schubert_StabatMater_D383_12_Chor.ly Schubert_StabatMater_D383_Settings.ly Schubert_StabatMater_D383_Settings_Global.ly
+base = Schubert_StabatMater_D383
+SRCS = Schubert_StabatMater_D383_Music_01_Chor.ily Schubert_StabatMater_D383_Music_02_Arie.ily Schubert_StabatMater_D383_Music_03_Chor.ily Schubert_StabatMater_D383_Music_04_Duett.ily Schubert_StabatMater_D383_Music_05_Chor.ily Schubert_StabatMater_D383_Music_06_Arie.ily Schubert_StabatMater_D383_Music_07_Chor.ily Schubert_StabatMater_D383_Music_08_Arie.ily Schubert_StabatMater_D383_Music_09_Chor.ily Schubert_StabatMater_D383_Music_10_Terzett.ily Schubert_StabatMater_D383_Music_11_Terzett_Ch.ily Schubert_StabatMater_D383_Music_12_Chor.ily $(base)_Settings.ily
+OUT=out
 
-TEX_TYPES = Ch SoloCh LongScore Instruments
-TEX_FILES = Tex_Schubert_StabatMater_D383.tex %(TEX_TYPES:%=Tex_Schubert_StabatMater_D383_%.tex)
+instruments = FlI FlII ObI ObII FagI FagII CFag TrbI TrbI_AltoClef TrbII TrbIII CorI CorII VI VII Va SSolo TSolo BSolo S A T B VcB
+scores = Long Full Vocal SoloChoral Choral Original
 
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(scores:%=$(OUT)/$(base)_Score_%.pdf)
+texs = $(scores:%=TeX_$(base)_Score_%.tex)
+texpdfs = $(scores:%=$(OUT)/TeX_$(base)_Score_%.pdf) $(OUT)/TeX_$(base)_Score_Instruments.pdf
 
 
-instruments = FlI FlII ObI ObII FagI FagII CFag CorI CorII TrI TrII TrIII VI VII Va VcB
-instrumentparts = Solo # Fl Ob Fag Wd Cor TrAll Br V Str 
-vocal = SSo TSo BSo S A T B Ch SoloCh
-extensions = $(instruments) $(vocal) $(instrumentparts) LongScore
-
-pdfs = %(extensions:%=Schubert_StabatMater_D383_%.pdf) Schubert_StabatMater_D383.pdf %(TEX_FILES:%.tex=%.pdf)
-
 .PHONY: all clean
-all: $(extensions) Partitur 
-instruments: $(instruments) 
-instrumentparts: $(instrumentparts)
-vocal: $(vocal)
-# all: $(extensions) Partitur 
-dist: $(instruments) $(vocal) Partitur
-
-full: $(extensions) Partitur
+all: $(OUT) $(instruments) $(scores) tex
+instruments: $(instruments)
+scores: $(scores)
+
 clean: 
-	for i in $(extensions); do \
-	  rm -f Schubert_StabatMater_D383_$${i}.pdf Schubert_StabatMater_D383_$${i}.ps; \
-	done; \
-	rm -f Schubert_StabatMater_D383.ps Schubert_StabatMater_D383.pdf;
+	rm -rf $(OUT)
+
+$(OUT) : 
+	mkdir -p $(OUT)
+
+$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
 
-$(extensions): % : Schubert_StabatMater_D383_%.pdf $(SRCS)
+$(OUT)/%.pdf : %.ly $(SRCS)
+	lilypond -o $(basename $@) $<
 
-Partitur: Schubert_StabatMater_D383.pdf $(SRCS)
+$(OUT)/%.mp3 : %.midi
+	timidity -c /etc/timidity/fluidr3_gm.cfg -OwM $< -o $@
 
-%.pdf : %.ly
-	lilypond $< 
+tex: latex
+latex: $(texpdfs)
 
-Tex_%.pdf: Tex_%.tex %.pdf
-	latex $<
+$(OUT)/TeX_%.pdf : TeX_%.tex
+	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<

Schubert_StabatMater_D383.ly

-\version "2.11.35"
-\include "Schubert_StabatMater_D383_Settings_FullScore.ly"
-\paper {
-   #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
-}
-
-\markup \commentsInstrMarkup
-\createNoCuesScore #"IChor" #'("Partitur")
-\createNoCuesScore #"IIArie" #'("Partitur")
-\createNoCuesScore #"IIIChor" #'("Partitur")
-\createNoCuesScore #"IVDuett" #'("Partitur")
-\createNoCuesScore #"VChor" #'("Partitur")
-\createNoCuesScore #"VIArie" #'("Partitur")
-\createNoCuesScore #"VIIChor" #'("Partitur")
-\createNoCuesScore #"VIIIArie" #'("Partitur")
-\createNoCuesScore #"IXChor" #'("Partitur")
-\createNoCuesScore #"XTerzett" #'("Partitur")
-\createNoCuesScore #"XITerzettChor" #'("Partitur")
-\createNoCuesScore #"XIIChor" #'("Partitur")

Schubert_StabatMater_D383_Ch.ly

-%lilypond input for Schubert's Stabat Mater
-\include "Schubert_StabatMater_D383_Settings_FullScore.ly"
-#(set-global-staff-size 15)
-
-\header { instrument = "Chorstimmen" }
-
-\paper {
-    bottom-margin = 1.1\cm
-   #(define (page-post-process layout pages) (oly:create-toc-file layout pages))
-}
-\layout {
-  \context { \Staff
-    \override VerticalAxisGroup #'remove-empty = ##f
-  }
-  \context { \Lyrics
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(0.5 . 0.5)
-  }
-}
-% This breaks with "Nr.5", where we define the staff manually!
-% SShortInstrumentName = ""
-% AShortInstrumentName = ""
-
-\markup \commentsInstrMarkup
-\createScore #"IChor" #'("Ch")
-\createNoCuesScore #"IIArie" #'("Ch")
-\createScore #"IIIChor" #'("Ch")
-\createNoCuesScore #"IVDuett" #'("Ch")
-\createNoCuesScore #"VChor" #'("Ch")
-\createNoCuesScore #"VIArie" #'("Ch")
-\createNoCuesScore #"VIIChor" #'("Ch")
-\createNoCuesScore #"VIIIArie" #'("Ch")
-\createNoCuesScore #"IXChor" #'("Ch")
-\createNoCuesScore #"XTerzett" #'("Ch")
-\createScore #"XITerzettChor" #'("Ch")
-\createNoCuesScore #"XIIChor" #'("Ch")

Schubert_StabatMater_D383_A.ly → Schubert_StabatMater_D383_Instrument_A.ly

-\include "orchestrallily/oly_settings_vocalvoice.ly"
-\include "Schubert_StabatMater_D383_Settings.ly"
+\version "2.13.4"
+\include "Schubert_StabatMater_D383_Settings_Vocal.ily"
 
-\header { instrument = "Alto" }
+\header {
+  instrument = \AInstrumentName
+  scorenumber = \markup{\scoreNumber \ANumber}
+}
 
 \markup \commentsInstrMarkup
 \createScore #"IChor" #'("A")
@@ -14,5 +17,6 @@
 \createScore #"VIIIArie" #'("A")
 \createScore #"IXChor" #'("A")
 \createScore #"XTerzett" #'("A")
-\createScore #"XITerzettChor" #'("A")
+\createScore #"XITerzettCh" #'("A")
 \createScore #"XIIChor" #'("A")
+

Schubert_StabatMater_D383_B.ly → Schubert_StabatMater_D383_Instrument_B.ly

-\include "orchestrallily/oly_settings_vocalvoice.ly"
-\include "Schubert_StabatMater_D383_Settings.ly"
+\version "2.13.4"
+\include "Schubert_StabatMater_D383_Settings_Vocal.ily"
 
-\header { instrument = "Basso" }
+\header {
+  instrument = \BInstrumentName
+  scorenumber = \markup{\scoreNumber \BNumber}
+}
 
 \markup \commentsInstrMarkup
 \createScore #"IChor" #'("B")
@@ -14,5 +17,6 @@
 \createScore #"VIIIArie" #'("B")
 \createScore #"IXChor" #'("B")
 \createScore #"XTerzett" #'("B")
-\createScore #"XITerzettChor" #'("B")
+\createScore #"XITerzettCh" #'("B")
 \createScore #"XIIChor" #'("B")
+

Schubert_StabatMater_D383_BSo.ly → Schubert_StabatMater_D383_Instrument_BSolo.ly

-\include "orchestrallily/oly_settings_vocalvoice.ly"
-\include "Schubert_StabatMater_D383_Settings.ly"
+\version "2.13.4"
+\include "Schubert_StabatMater_D383_Settings_Vocal.ily"
 
-\header { instrument = "Basso Solo" }
+\header {
+  instrument = \BSoloInstrumentName
+  scorenumber = \markup{\scoreNumber \BSoloNumber}
+}
 
 \markup \commentsInstrMarkup
 \markup \piece-title "Nr. 1 - Nr. 7 Chor tacet"
 \createScore #"VIIIArie" #'("BSolo")
 \createScore #"IXChor" #'("BSolo")
 \createScore #"XTerzett" #'("BSolo")
-\createScore #"XITerzettChor" #'("BSolo")
+\createScore #"XITerzettCh" #'("BSolo")
 \createScore #"XIIChor" #'("BSolo")
+

Schubert_StabatMater_D383_CFag.ly → Schubert_StabatMater_D383_Instrument_CFag.ly

-\include "orchestrallily/oly_settings_instrument.ly"
-\include "Schubert_StabatMater_D383_Settings.ly"
+\version "2.13.4"
+\include "Schubert_StabatMater_D383_Settings_Instrument.ily"
 
-\header { instrument = "Contrafagotto" }
+\header {
+  instrument = \CFagInstrumentName
+  scorenumber = \markup{\scoreNumber \CFagNumber}
+}
 
-\markup \commentsInstrMarkup 
+\markup \commentsInstrMarkup
 \markup \piece-title { "Nr. 1 - " \VIIChorPieceNameTacet }
 \createScore #"VIIIArie" #'("CFag")
 \markup \piece-title {"Nr. 9 - " \XIIChorPieceNameTacet }
+

Schubert_StabatMater_D383_CorI.ly → Schubert_StabatMater_D383_Instrument_CorI.ly

-\include "orchestrallily/oly_settings_instrument.ly"
-\include "Schubert_StabatMater_D383_Settings.ly"
+\version "2.13.4"
+\include "Schubert_StabatMater_D383_Settings_Instrument.ily"
 
-\header { instrument = "Corno I" }
+\header {
+  instrument = \CorIInstrumentName
+  scorenumber = \markup{\scoreNumber \CorINumber}
+}
 % we need the instrument name, because corni are transposing instruments and 
 % the instrument name contains the base pitch!
 \layout {
@@ -10,20 +13,14 @@
   }
 }
 
-\paper { 
-%   foot-separation = #2
-  between-system-padding = #0.5
-}
-
 \markup \commentsInstrMarkupShort
 \markup \piece-title { "Nr. 1 - " \IIAriePieceNameTacet }
-% \createScore #"IChor" #'("CorI")
-% \createScore #"IIArie" #'("CorI")
 \createScore #"IIIChor" #'("CorI")
 \createScore #"IVDuett" #'("CorI")
 \createScore #"VChor" #'("CorI")
 \markup \piece-title { "Nr. 6 - " \VIIIAriePieceNameTacet }
 \createScore #"IXChor" #'("CorI")
 \createScore #"XTerzett" #'("CorI")
-\createScore #"XITerzettChor" #'("CorI")
+\createScore #"XITerzettCh" #'("CorI")
 \createScore #"XIIChor" #'("CorI")
+