Update to new oly template

Makefile

-SRCS = Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily Eybler_OmnesDeSabaVenient_HV40_Settings.ily
+base = Eybler_OmnesDeSabaVenient_HV40
+SRCS = Eybler_OmnesDeSabaVenient_HV40_Music_OmnesDeSabaVenient.ily $(base)_Settings.ily
 OUT=out
 
 instruments = ObI ObII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va SSolo S A T B Continuo VcB TrbI TrbIII O
 scores = Full Long Vocal Particell Choral Original
 
-pdfs = $(instruments:%=$(OUT)/Eybler_OmnesDeSabaVenient_HV40_Instrument_%.pdf) $(scores:%=$(OUT)/Eybler_OmnesDeSabaVenient_HV40_Score_%.pdf)
-texs = $(scores:%=TeX_Eybler_OmnesDeSabaVenient_HV40_Score_%.tex)
-texpdfs = $(scores:%=$(OUT)/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_%.pdf) $(OUT)/TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Instruments.pdf
+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
 
-additionalincludes = $(OUT)/Eybler_OmnesDeSabaVenient_HV40_Music_FagAlternatives.pdf
+additionalscores = $(OUT)/Eybler_OmnesDeSabaVenient_HV40_Music_FagAlternatives.pdf
 
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) $(additionalincludes) tex
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
 instruments: $(instruments)
 scores: $(scores)
 
-clean: 
+clean:
 	rm -rf $(OUT)
 
-$(OUT) : 
+$(OUT) :
 	mkdir -p $(OUT)
 
-$(instruments): % : $(OUT)/Eybler_OmnesDeSabaVenient_HV40_Instrument_%.pdf $(SRCS)
-$(scores): % : $(OUT)/Eybler_OmnesDeSabaVenient_HV40_Score_%.pdf $(SRCS)
+$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
 
 $(OUT)/%.pdf : %.ly $(SRCS)
 	lilypond -o $(basename $@) $<
@@ -30,13 +31,11 @@ $(OUT)/%.pdf : %.ly $(SRCS)
 $(OUT)/%.mp3 : %.midi
 	timidity -c /etc/timidity/fluidr3_gm.cfg -OwM $< -o $@
 
+$(additionalscores): $(OUT)/%.pdf: %.ly
+	lilypond -dbackend=eps -o $(basename $@) $<
 
-$(additionalincludes): $(OUT)/%.pdf: %.ly
-	lilypond -dbackend=eps -o $(basename $@) $< 
-
-tex: $(additionalincludes) latex
+tex: $(additionalscores) latex
 latex: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
 	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
-

TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Choral.tex

@@ -14,7 +14,6 @@
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Coverpage.itex}
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Preface_Long.itex}
 
-
 \phantomsection
 \addcontentsline{toc}{section}{\ChoralScoreType}
 \includescore{Score_Choral}

TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Full.tex

@@ -18,10 +18,9 @@
 \addcontentsline{toc}{section}{\FullScoreType}
 \includescore{Score_Full}
 
-\clearpage
-% \backmatter
-% \appendix 
-
+\cleardoublepage
+\backmatter
+\appendix
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex}
 
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}

TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Long.tex

@@ -18,9 +18,9 @@
 \addcontentsline{toc}{section}{\LongScoreType}
 \includescore{Score_Long}
 
-\clearpage
-% \backmatter
-% \appendix
+\cleardoublepage
+\backmatter
+\appendix
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_KritBericht.itex}
 
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Include_Backpage.itex}

TeX_Eybler_OmnesDeSabaVenient_HV40_Score_Vocal.tex

 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[vocalscore]{orchestrallily/editionkainhofer}
 \input{TeX_Eybler_OmnesDeSabaVenient_HV40_Settings.itex}
 
 \hypersetup{