moved to new jinja2 oly template structure; regenerated scores

Eybler_UnamPetii_HV43_Music_UnamPetii.ily

@@ -11,6 +11,7 @@ UnamPetiiSettings = \notemode {
   \tempo \UnamPetiiTempo
 }
 
+
 UnamPetiiTIMusic = \relative c' {
   r4 r g8\mf c | % 2
   e4. f16[ e] d8 c | % 3
@@ -67,9 +68,6 @@ UnamPetiiTILyrics = \lyricmode {
 }
 
 
-
-
-
 UnamPetiiTIIMusic = \relative c' {
   r4 r g8\mf g | % 2
   c4. c8 g8 g | % 3

Eybler_UnamPetii_HV43_Score_Choral.ly

@@ -9,4 +9,3 @@
 }
 
 \createScore #"UnamPetii" #'("ChoralScore")
-

Eybler_UnamPetii_HV43_Settings_Global.ily

@@ -9,12 +9,12 @@ scorenumber="EK-1043"
   subtitle = "Graduale, HV 43"
   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...
 
 % Add custom keys here, e.g.
 % CorKey = \key g \major

Makefile

-base = Eybler_UnamPetii_HV43
-SRCS = Eybler_UnamPetii_HV43_Music_UnamPetii.ily $(base)_Settings.ily
 OUT=out
 
+base = Eybler_UnamPetii_HV43
+SRCS = Eybler_UnamPetii_HV43_Settings_Global.ily Eybler_UnamPetii_HV43_Settings.ily Eybler_UnamPetii_HV43_Settings_ChoralScore.ily Eybler_UnamPetii_HV43_Settings_VocalVoice.ily Eybler_UnamPetii_HV43_Settings_FullScore.ily Eybler_UnamPetii_HV43_Music_UnamPetii.ily $(base)_Settings.ily
 instruments = TI TII BI BII
 scores = Choral Original
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%%=$(OUT)/$(base)_Score_%.pdf)
+
+
+texbase = Eybler_UnamPetii_HV43
+texscores = 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) $(additionalscores) tex
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex 
 instruments: $(instruments)
 scores: $(scores)
 
+
 clean:
 	rm -rf $(OUT)
 
@@ -25,7 +32,8 @@ $(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
@@ -35,7 +43,9 @@ $(additionalscores): $(OUT)/%.pdf: %.ly
 	lilypond -dbackend=eps -o $(basename $@) $<
 
 tex: $(additionalscores) latex
-latex: $(texpdfs)
+latex: $(pdfs) $(texpdfs)
+latexpdf: $(texpdfs)
 
 $(OUT)/TeX_%.pdf : TeX_%.tex
 	TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+

TeX_Eybler_UnamPetii_HV43_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_UnamPetii_HV43_Include_ContentsMaterial.itex

@@ -19,7 +19,7 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 \TIName{} (-\TINumber),
 \TIIName{} (-\TIINumber),
 \BIName{} (-\BINumber),
-\BIIName{} (-\BIINumber),
+\BIIName{} (-\BIINumber).
 
 }
 \end{center}

TeX_Eybler_UnamPetii_HV43_Include_Preface_Long.itex

@@ -3,10 +3,12 @@
 
 \input{TeX_Eybler_UnamPetii_HV43_Include_ContentsMaterial.itex}
 \cleardoublepage
+\begin{preface}
 \input{TeX_Eybler_UnamPetii_HV43_Include_About.itex}
 \input{TeX_Eybler_UnamPetii_HV43_Include_Text.itex}
 \pagebreak
-\input{TeX_Eybler_UnamPetii_HV43_Include_Leben.itex}
+\input{TeX_Eybler_UnamPetii_HV43_Include_Bio.itex}
+\end{preface}
 
 \mainmatter
 \cleardoublepage

TeX_Eybler_UnamPetii_HV43_Include_Todo.itex

 % \todos{
 % \chapter*{Offene Fragen}
 %
-% \section*{Literaturvergleich mit dem Autograph:}
 % \begin{itemize}
 % \item
 %
 % \end{itemize}
-%
 % }

TeX_Eybler_UnamPetii_HV43_Score_Instruments.tex

@@ -14,20 +14,30 @@
 \input{TeX_Eybler_UnamPetii_HV43_Include_Coverpage.itex}
 \input{TeX_Eybler_UnamPetii_HV43_Include_Preface_Long.itex}
 
+
+
+
+
+
 \phantomsection
 \addcontentsline{toc}{section}{\TIName}
 \includescore{Instrument_TI}
+
 \phantomsection
 \addcontentsline{toc}{section}{\TIIName}
 \includescore{Instrument_TII}
+
 \phantomsection
 \addcontentsline{toc}{section}{\BIName}
 \includescore{Instrument_BI}
+
 \phantomsection
 \addcontentsline{toc}{section}{\BIIName}
 \includescore{Instrument_BII}
 
 
+
+
 \cleardoublepage
 \backmatter
 \appendix

TeX_Eybler_UnamPetii_HV43_Settings.itex

-\composer{Joseph Eybler}
-\composerdate{(1765-1846)}
 \title{Unam petii}
 \subtitle{Graduale, HV 43}
+\composer{Joseph Eybler}
+\composerdate{(1765-1846)}
 \description{Per Soli (TTBB) a capella}
 % \instrumentation{TODO 2 Oboen oder Klarinetten, 2 Hörner\\2 Trompeten, Pauken (nicht obl.)\\2 Violinen, Viola, Cello und Contrabass}
 \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}}
-\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}, Vienna}
+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}}
 \year{2009}
 \scoreinfo{Urtext}