Part-combine, Layout, Update to new oly template, KB, etc; re-generate scores

Makefile

-base = Schubert_StabatMater_D175
-SRCS = Schubert_StabatMater_D175_Music_StabatMater.ily $(base)_Settings.ily
 OUT=out
 
+base = Schubert_StabatMater_D175
+SRCS = $(base)_Music_StabatMater.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
 instruments = ObI ObII ClI ClII FagI FagII TrbI TrbII TrbIII VI VII Va S A T B Continuo VcB
-scores = Long Full Organ Choral Original
+scores = Full Vocal Choral
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%=$(OUT)/$(base)_Score_%.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
+texbase = Schubert_StabatMater_D175
+texscores = Full Vocal Choral
+texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
+texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
+     $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
 
+additionalscores = 
+
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) tex
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
 instruments: $(instruments)
 scores: $(scores)
 
-clean: 
+
+clean:
 	rm -rf $(OUT)
 
-$(OUT) : 
+lily: $(pdfs) $(additionalscores)
+
+$(OUT) :
 	mkdir -p $(OUT)
 
 $(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
 $(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
 
-$(OUT)/%.pdf : %.ly $(SRCS)
+
+$(OUT)/%.pdf : %.ly
 	lilypond -o $(basename $@) $<
 
 $(OUT)/%.mp3 : %.midi
 	timidity -c /etc/timidity/fluidr3_gm.cfg -OwM $< -o $@
 
-tex: latex
-latex: $(texpdfs)
+$(additionalscores): $(OUT)/%.pdf: %.ly
+	lilypond -dbackend=eps -o $(basename $@) $<
+
+tex: $(additionalscores) latex
+latex: $(pdfs) $(texpdfs)
+latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
-	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+	TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex --output-directory=$(OUT)/ $<
+

Schubert_StabatMater_D175_Instrument_A.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_VocalVoice.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_B.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_VocalVoice.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_ClI.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_ClII.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_Continuo.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {
   instrument = \ContinuoInstrumentName
   scorenumber = \markup{\scoreNumber \ContinuoNumber}
 }
-\paper{
-  page-count = #2
-}
 
 \createScore #"StabatMater" #'("Continuo")
 

Schubert_StabatMater_D175_Instrument_FagI.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_FagII.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_ObI.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_ObII.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_S.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_VocalVoice.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_T.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_VocalVoice.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_TrbI.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_TrbII.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_TrbIII.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_VI.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_VII.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_Va.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {

Schubert_StabatMater_D175_Instrument_VcB.ly

-\version "2.13.1"
+\version "2.13.35"
 \include "Schubert_StabatMater_D175_Settings_Instrument.ily"
 
 \header {
   instrument = \VcBInstrumentName
   scorenumber = \markup{\scoreNumber \VcBNumber}
 }
+StabatMaterVcBMusic = \StabatMaterBCMusic
 
 \createScore #"StabatMater" #'("VcB")