Updated to new oly jinja template script

Eybler_SiConsistant_HV86_Instrument_A.ly

 \version "2.13.1"
-\include "Eybler_SiConsistant_HV86_Settings_Vocal.ily"
+\include "Eybler_SiConsistant_HV86_Settings_VocalVoice.ily"
 
 #(undefine SiConsistantAStaff)
 

Eybler_SiConsistant_HV86_Instrument_B.ly

 \version "2.13.1"
-\include "Eybler_SiConsistant_HV86_Settings_Vocal.ily"
+\include "Eybler_SiConsistant_HV86_Settings_VocalVoice.ily"
 
 \header {
   instrument = \BInstrumentName

Eybler_SiConsistant_HV86_Instrument_Organ.ly → Eybler_SiConsistant_HV86_Instrument_Continuo.ly

@@ -2,9 +2,9 @@
 \include "Eybler_SiConsistant_HV86_Settings_Instrument.ily"
 
 \header {
-  instrument = \OrganInstrumentName
-  scorenumber = \markup{\scoreNumber \OrganNumber}
+  instrument = \ContinuoInstrumentName
+  scorenumber = \markup{\scoreNumber \ContinuoNumber}
 }
 
-\createScore #"SiConsistant" #'("Organ")
+\createScore #"SiConsistant" #'("Continuo")
 

Eybler_SiConsistant_HV86_Instrument_S.ly

 \version "2.13.1"
-\include "Eybler_SiConsistant_HV86_Settings_Vocal.ily"
+\include "Eybler_SiConsistant_HV86_Settings_VocalVoice.ily"
 
 #(undefine SiConsistantSStaff)
 

Eybler_SiConsistant_HV86_Instrument_T.ly

 \version "2.13.1"
-\include "Eybler_SiConsistant_HV86_Settings_Vocal.ily"
+\include "Eybler_SiConsistant_HV86_Settings_VocalVoice.ily"
 
 #(undefine SiConsistantTStaff)
 

Eybler_SiConsistant_HV86_Music_SiConsistant.ily

@@ -145,6 +145,7 @@ SiConsistantObIMusic = \relative c'' {
 }
 \addQuote "SiConsistantObIMusic" { \SiConsistantObIMusic }
 
+
 SiConsistantObIIMusic = \relative c' {
   es2.\f es8.[ es16] | % 2
   es2. es8.[ es16] | % 3
@@ -256,6 +257,7 @@ SiConsistantObIIMusic = \relative c' {
 }
 \addQuote "SiConsistantObIIMusic" { \SiConsistantObIIMusic }
 
+
 SiConsistantFagIMusic = \relative c' {
   g2.\f g8.[ g16] | % 2
   g2. g8.[ g16] | % 3
@@ -590,6 +592,7 @@ SiConsistantCorIMusic = \relative c'' {
 }
 \addQuote "SiConsistantCorIMusic" { \SiConsistantCorIMusic }
 
+
 SiConsistantCorIIMusic = \relative c' {
   \transposition c
   c2.\f c8.[ c16] | % 2
@@ -767,6 +770,7 @@ SiConsistantTbeIMusic = \relative c'' {
 }
 \addQuote "SiConsistantTbeIMusic" { \SiConsistantTbeIMusic }
 
+
 SiConsistantTbeIIMusic = \relative c' {
   c4\f r r8 c16[ c] c8[ c] | % 2
   c4 r r8 c16[ c] c8[ c] | % 3
@@ -920,6 +924,7 @@ SiConsistantTimMusic = \relative c {
 }
 \addQuote "SiConsistantTimMusic" { \SiConsistantTimMusic }
 
+
 SiConsistantVIMusic = \relative c' {
   c16[(\f d es d]) c[( d es d]) c[( d es f] g[ a h c]) | % 2
   c,[( d es d]) c[( d es d]) c[( d es f] g[ a h c]) | % 3
@@ -1014,6 +1019,7 @@ SiConsistantVIMusic = \relative c' {
 }
 \addQuote "SiConsistantVIMusic" { \SiConsistantVIMusic }
 
+
 SiConsistantVIIMusic = \relative c' {
   <es g,>16[\f <es g,> <es g,> <es g,>] <es g,>4:16 <es g,> r | % 2
   <es g,>2:16 <es g,>4 r | % 3
@@ -1108,6 +1114,7 @@ SiConsistantVIIMusic = \relative c' {
 }
 \addQuote "SiConsistantVIIMusic" { \SiConsistantVIIMusic }
 
+
 SiConsistantVaMusic = \relative c' {
   <c c,>2:16\f <c c,>4 r | % 2
   <c c,>2:16 <c c,>4 r | % 3
@@ -1452,6 +1459,7 @@ SiConsistantALyrics = \lyricmode {
   non ti -- me -- bit cor me -- um.
 }
 
+
 SiConsistantTMusic = \relative c' {
   \cueText "Tutti" R1 | % 2
   r2 r4 es8\f es | % 3

Eybler_SiConsistant_HV86_Score_Choral.ly

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

Eybler_SiConsistant_HV86_Score_Full.ly

@@ -8,5 +8,4 @@
   scorenumber = \markup{\scoreNumber \FullScoreNumber}
 }
 
-\createScore #"SiConsistant" #'("FullScore")
-
+\createNoCuesScore #"SiConsistant" #'("FullScore")

Eybler_SiConsistant_HV86_Score_Long.ly

@@ -8,5 +8,4 @@
   scorenumber = \markup{\scoreNumber \LongScoreNumber}
 }
 
-\createScore #"SiConsistant" #'("LongScore")
-
+\createNoCuesScore #"SiConsistant" #'("LongScore")

Eybler_SiConsistant_HV86_Score_Original.ly

@@ -8,5 +8,4 @@
   scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
 }
 
-\createScore #"SiConsistant" #'("Tim" "TbeLong" "CorLong" "WdLong" "Str" "Ch" "Organ")
-
+\createNoCuesScore #"SiConsistant" #'("Tim" "TbeLong" "CorLong" "WdLong" "Str" "Ch" "Organ")

Eybler_SiConsistant_HV86_Score_Vocal.ly

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

Eybler_SiConsistant_HV86_Settings.ily

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

Eybler_SiConsistant_HV86_Settings_ChoralScore.ily

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

Eybler_SiConsistant_HV86_Settings_Global.ily

 \version "2.13.1"
 
-\include "orchestrallily/orchestrallily.ily"
 \include "orchestrallily/oly_settings_names.ily"
 
 scorenumber="EK-1086"
 
-\header { 
+\header {
   title = "Si consistant"
   subtitle = "Offertorium, HV 86"
   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
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
-  }
-}
-
-% Add custom keys here, e.g.
-% CorKey = \key g \major
-% CorIKey = \CorKey
-% CorIIKey = \CorKey
+%% Add custom keys here, e.g.
+%% CorKey = \key g \major
+%% CorIKey = \CorKey
+%% CorIIKey = \CorKey
 
 SClef = \clef "soprano"
 AClef = \clef "alto"

Eybler_SiConsistant_HV86_Settings_VocalScore.ily

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

Makefile

-SRCS = Eybler_SiConsistant_HV86_Music_SiConsistant.ily Eybler_SiConsistant_HV86_Settings.ily
 OUT=out
 
-instruments = ObI ObII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Organ VcB
-scores = Full Long Particell Choral Original
+base = Eybler_SiConsistant_HV86
+SRCS = Eybler_SiConsistant_HV86_Settings_Global.ily Eybler_SiConsistant_HV86_Settings.ily Eybler_SiConsistant_HV86_Settings_VocalScore.ily Eybler_SiConsistant_HV86_Settings_ChoralScore.ily Eybler_SiConsistant_HV86_Settings_VocalVoice.ily Eybler_SiConsistant_HV86_Settings_FullScore.ily Eybler_SiConsistant_HV86_Settings_Instrument.ily Eybler_SiConsistant_HV86_Music_SiConsistant.ily $(base)_Settings.ily
+instruments = ObI ObII FagI FagII CorI CorII TbeI TbeII Tim VI VII Va S A T B Continuo VcB
+scores = Long Full Vocal Choral Original
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
 
-pdfs = $(instruments:%=$(OUT)/Eybler_SiConsistant_HV86_Instrument_%.pdf) $(scores:%=$(OUT)/Eybler_SiConsistant_HV86_Score_%.pdf)
-texs = $(scores:%=TeX_Eybler_SiConsistant_HV86_Score_%.tex)
-texpdfs = $(scores:%=$(OUT)/TeX_Eybler_SiConsistant_HV86_Score_%.pdf) $(OUT)/TeX_Eybler_SiConsistant_HV86_Score_Instruments.pdf
 
+texbase = Eybler_SiConsistant_HV86
+texscores = Long Full Vocal Choral Original
+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) : 
+$(OUT) :
 	mkdir -p $(OUT)
 
-$(instruments): % : $(OUT)/Eybler_SiConsistant_HV86_Instrument_%.pdf $(SRCS)
-$(scores): % : $(OUT)/Eybler_SiConsistant_HV86_Score_%.pdf $(SRCS)
+$(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_SiConsistant_HV86_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_SiConsistant_HV86_Include_ContentsMaterial.itex

@@ -58,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.}
 
+