Updated to new oly jinja template script

Eybler_TuiSuntCoeli_HV78_Instrument_A.ly

 \version "2.13.1"
-\include "Eybler_TuiSuntCoeli_HV78_Settings_Vocal.ily"
+\include "Eybler_TuiSuntCoeli_HV78_Settings_VocalVoice.ily"
 
 \header {
   instrument = \AInstrumentName

Eybler_TuiSuntCoeli_HV78_Instrument_B.ly

 \version "2.13.1"
-\include "Eybler_TuiSuntCoeli_HV78_Settings_Vocal.ily"
+\include "Eybler_TuiSuntCoeli_HV78_Settings_VocalVoice.ily"
 
 \header {
   instrument = \BInstrumentName

Eybler_TuiSuntCoeli_HV78_Instrument_S.ly

 \version "2.13.1"
-\include "Eybler_TuiSuntCoeli_HV78_Settings_Vocal.ily"
+\include "Eybler_TuiSuntCoeli_HV78_Settings_VocalVoice.ily"
 
 \header {
   instrument = \SInstrumentName

Eybler_TuiSuntCoeli_HV78_Instrument_T.ly

 \version "2.13.1"
-\include "Eybler_TuiSuntCoeli_HV78_Settings_Vocal.ily"
+\include "Eybler_TuiSuntCoeli_HV78_Settings_VocalVoice.ily"
 
 \header {
   instrument = \TInstrumentName

Eybler_TuiSuntCoeli_HV78_Music_TuiSuntCoeli.ily

@@ -140,6 +140,7 @@ TuiSuntCoeliClIMusic = \relative d'' {
 }
 \addQuote "TuiSuntCoeliClIMusic" { \TuiSuntCoeliClIMusic }
 
+
 TuiSuntCoeliClIIMusic = \relative c' {
     \transposition b
     fis2\f r2 |
@@ -269,6 +270,7 @@ TuiSuntCoeliClIIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliClIIMusic" { \TuiSuntCoeliClIIMusic }
 
+
 TuiSuntCoeliFagIMusic = \relative c' {
     g2\f r2 | % 2
     R1 | % 3
@@ -397,6 +399,7 @@ TuiSuntCoeliFagIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliFagIMusic" { \TuiSuntCoeliFagIMusic }
 
+
 TuiSuntCoeliFagIIMusic = \relative c' {
     c,2\f r2 |
     R1 | % 3
@@ -525,6 +528,7 @@ TuiSuntCoeliFagIIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliFagIIMusic" { \TuiSuntCoeliFagIIMusic }
 
+
 TuiSuntCoeliCorIMusic = \relative c' {
     c'2\f r2 | % 2
     R1 | % 3
@@ -648,6 +652,7 @@ TuiSuntCoeliCorIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliCorIMusic" { \TuiSuntCoeliCorIMusic }
 
+
 TuiSuntCoeliCorIIMusic = \relative c' {
     c2\f r2 |
     R1 | % 3
@@ -771,6 +776,7 @@ TuiSuntCoeliCorIIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliCorIIMusic" { \TuiSuntCoeliCorIIMusic }
 
+
 TuiSuntCoeliTbeIMusic = \relative c' {
     \transposition b
     d2\f r2 | % 2
@@ -861,6 +867,7 @@ TuiSuntCoeliTbeIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliTbeIMusic" { \TuiSuntCoeliTbeIMusic }
 
+
 TuiSuntCoeliTbeIIMusic = \relative c' {
     \transposition b
     d2\f r2 |
@@ -951,6 +958,7 @@ TuiSuntCoeliTbeIIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliTbeIIMusic" { \TuiSuntCoeliTbeIIMusic }
 
+
 TuiSuntCoeliTimMusic = \relative c' {
     c,2\f r2 | % 2
     R1 | % 3
@@ -1034,6 +1042,7 @@ TuiSuntCoeliTimMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliTimMusic" { \TuiSuntCoeliTimMusic }
 
+
 TuiSuntCoeliVIMusic = \relative c' {
     c4..\fSempreBenMarcato e16-| g8.-|[ c16-| e8.-| c16-|] | % 2
     h4-| d4-| r2 | % 3
@@ -1162,6 +1171,7 @@ TuiSuntCoeliVIMusic = \relative c' {
 }
 \addQuote "TuiSuntCoeliVIMusic" { \TuiSuntCoeliVIMusic }
 
+
 TuiSuntCoeliVIIMusic = \relative c' {
     c4..\fSempreBenMarcato e16-| g8.-|[ c16-| e8.-| c16-|] | % 2
     h4-| d4-| r2 | % 3

Eybler_TuiSuntCoeli_HV78_Score_Choral.ly

 \version "2.13.1"
-\include "Eybler_TuiSuntCoeli_HV78_Settings_FullScore.ily"
+\include "Eybler_TuiSuntCoeli_HV78_Settings_ChoralScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
@@ -9,4 +9,3 @@
 }
 
 \createScore #"TuiSuntCoeli" #'("ChoralScore")
-

Eybler_TuiSuntCoeli_HV78_Score_Full.ly

@@ -9,4 +9,3 @@
 }
 
 \createNoCuesScore #"TuiSuntCoeli" #'("FullScore")
-

Eybler_TuiSuntCoeli_HV78_Score_Long.ly

@@ -9,4 +9,3 @@
 }
 
 \createNoCuesScore #"TuiSuntCoeli" #'("LongScore")
-

Eybler_TuiSuntCoeli_HV78_Score_Organ.ly

-\version "2.13.1"
-\include "Eybler_TuiSuntCoeli_HV78_Settings_FullScore.ily"
-\setCreateMIDI ##t
-\setCreatePDF ##t
-
-\header {
-  scoretype = \OrganScoreTitle
-  scorenumber = \markup{\scoreNumber \OrganScoreNumber}
-}
-
-\createScore #"TuiSuntCoeli" #'("OrganScore")
-

Eybler_TuiSuntCoeli_HV78_Score_Original.ly

@@ -9,4 +9,3 @@
 }
 
 \createNoCuesScore #"TuiSuntCoeli" #'("Tim" "TbeLong" "CorLong" "WdLong" "Str" "Ch" "Continuo")
-

Eybler_TuiSuntCoeli_HV78_Score_Vocal.ly

+\version "2.13.1"
+\include "Eybler_TuiSuntCoeli_HV78_Settings_VocalScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
+
+\header {
+  scoretype = \VocalScoreTitle
+  scorenumber = \markup{\scoreNumber \VocalScoreNumber}
+}
+
+\createScore #"TuiSuntCoeli" #'("VocalScore")

Eybler_TuiSuntCoeli_HV78_Settings.ily

-#(set-default-paper-size "a4")
 #(ly:set-option 'point-and-click #f)
 
 \include "deutsch.ly"

Eybler_TuiSuntCoeli_HV78_Settings_ChoralScore.ily

+\include "orchestrallily/oly_settings_choralscore.ily"
+\include "Eybler_TuiSuntCoeli_HV78_Settings.ily"

Eybler_TuiSuntCoeli_HV78_Settings_Global.ily

 \version "2.13.1"
 
-\include "orchestrallily/orchestrallily.ily"
 \include "orchestrallily/oly_settings_names.ily"
 
 scorenumber="EK-1078"
 
-\header { 
+\header {
   title = "Tui sunt coeli"
   subtitle = "Offertorium, HV 78"
   composer = "Joseph Eybler (1765-1846)"
   copyright = \markup \abs-fontsize #9 \column{
-      \line { "2009, Edition Kainhofer, Vienna. Alle Rechte vorbehalten / All rights reserved / Printed in Austria."} 
+      \line { "2009, " \concat{\with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna},} \concat{\scorenumber.} "Alle Rechte vorbehalten / All rights reserved / Printed in Austria."}
       \line {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
   }
 }
 
-% Possibly adjust the \orchestralScoreStructure here...
+%% Possibly adjust the \orchestralScoreStructure here...
 
 \layout {
   \context { \Lyrics

Eybler_TuiSuntCoeli_HV78_Settings_VocalScore.ily

+\include "orchestrallily/oly_settings_vocalscore.ily"
+\include "Eybler_TuiSuntCoeli_HV78_Settings.ily"

Makefile

-base = Eybler_TuiSuntCoeli_HV78
-SRCS = Eybler_TuiSuntCoeli_HV78_Music_TuiSuntCoeli.ily $(base)_Settings.ily
 OUT=out
 
+base = Eybler_TuiSuntCoeli_HV78
+SRCS = Eybler_TuiSuntCoeli_HV78_Settings_Global.ily Eybler_TuiSuntCoeli_HV78_Settings.ily Eybler_TuiSuntCoeli_HV78_Settings_VocalScore.ily Eybler_TuiSuntCoeli_HV78_Settings_ChoralScore.ily Eybler_TuiSuntCoeli_HV78_Settings_VocalVoice.ily Eybler_TuiSuntCoeli_HV78_Settings_FullScore.ily Eybler_TuiSuntCoeli_HV78_Settings_Instrument.ily Eybler_TuiSuntCoeli_HV78_Music_TuiSuntCoeli.ily $(base)_Settings.ily
 instruments = ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Continuo O VcB
-scores = Full Long Particell Organ Choral Original
+scores = Long Full Vocal Choral Original
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
+
+
+texbase = Eybler_TuiSuntCoeli_HV78
+texscores = Long Full Vocal Choral Original
+texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
+texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
+     $(OUT)/TeX_$(texbase)_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
 
+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) : 
+$(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)/ $<
+

TeX_Eybler_TuiSuntCoeli_HV78_Include_About.itex

 \addcontentsline{toc}{section}{Vorwort / Preface}
-\chapter*{Vorwort / Preface}
 
 \begin{multicols}{2}
+\prefacesection{Vorwort}
 TODO
 \columnbreak
+\prefacesection{Preface}
 TODO
 \end{multicols}
 \vfill

TeX_Eybler_TuiSuntCoeli_HV78_Include_ContentsMaterial.itex

@@ -16,7 +16,6 @@
 Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 
 \FullScoreName{} (-\FullScoreNumber),
-\ParticellScoreName{} (-\ParticellScoreNumber),
 \OrganScoreName{} (-\OrganScoreNumber);
 
 \ChoralScoreName{} (-\ChoralScoreNumber),
@@ -59,3 +58,4 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 Computersatz mit \@software\newline
 Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
 
+