Commit 2ab9fd7d authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

moved to new jinja2 oly template structure; regenerated scores

parent 6d477a12
...@@ -11,6 +11,7 @@ UnamPetiiSettings = \notemode { ...@@ -11,6 +11,7 @@ UnamPetiiSettings = \notemode {
\tempo \UnamPetiiTempo \tempo \UnamPetiiTempo
} }
UnamPetiiTIMusic = \relative c' { UnamPetiiTIMusic = \relative c' {
r4 r g8\mf c | % 2 r4 r g8\mf c | % 2
e4. f16[ e] d8 c | % 3 e4. f16[ e] d8 c | % 3
...@@ -67,9 +68,6 @@ UnamPetiiTILyrics = \lyricmode { ...@@ -67,9 +68,6 @@ UnamPetiiTILyrics = \lyricmode {
} }
UnamPetiiTIIMusic = \relative c' { UnamPetiiTIIMusic = \relative c' {
r4 r g8\mf g | % 2 r4 r g8\mf g | % 2
c4. c8 g8 g | % 3 c4. c8 g8 g | % 3
......
...@@ -9,4 +9,3 @@ ...@@ -9,4 +9,3 @@
} }
\createScore #"UnamPetii" #'("ChoralScore") \createScore #"UnamPetii" #'("ChoralScore")
...@@ -9,12 +9,12 @@ scorenumber="EK-1043" ...@@ -9,12 +9,12 @@ scorenumber="EK-1043"
subtitle = "Graduale, HV 43" subtitle = "Graduale, HV 43"
composer = "Joseph Eybler (1765-1846)" composer = "Joseph Eybler (1765-1846)"
copyright = \markup \abs-fontsize #9 \column{ 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."} \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. % Add custom keys here, e.g.
% CorKey = \key g \major % CorKey = \key g \major
......
base = Eybler_UnamPetii_HV43
SRCS = Eybler_UnamPetii_HV43_Music_UnamPetii.ily $(base)_Settings.ily
OUT=out 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 instruments = TI TII BI BII
scores = Choral Original 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 = additionalscores =
.PHONY: all clean .PHONY: all clean
all: $(OUT) $(instruments) $(scores) $(additionalscores) tex all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
instruments: $(instruments) instruments: $(instruments)
scores: $(scores) scores: $(scores)
clean: clean:
rm -rf $(OUT) rm -rf $(OUT)
...@@ -25,7 +32,8 @@ $(OUT) : ...@@ -25,7 +32,8 @@ $(OUT) :
$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS) $(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
$(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS) $(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
$(OUT)/%.pdf : %.ly $(SRCS)
$(OUT)/%.pdf : %.ly
lilypond -o $(basename $@) $< lilypond -o $(basename $@) $<
$(OUT)/%.mp3 : %.midi $(OUT)/%.mp3 : %.midi
...@@ -35,7 +43,9 @@ $(additionalscores): $(OUT)/%.pdf: %.ly ...@@ -35,7 +43,9 @@ $(additionalscores): $(OUT)/%.pdf: %.ly
lilypond -dbackend=eps -o $(basename $@) $< lilypond -dbackend=eps -o $(basename $@) $<
tex: $(additionalscores) latex tex: $(additionalscores) latex
latex: $(texpdfs) latex: $(pdfs) $(texpdfs)
latexpdf: $(texpdfs)
$(OUT)/TeX_%.pdf : TeX_%.tex $(OUT)/TeX_%.pdf : TeX_%.tex
TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $< TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
\addcontentsline{toc}{section}{Vorwort / Preface} \addcontentsline{toc}{section}{Vorwort / Preface}
\chapter*{Vorwort / Preface}
\begin{multicols}{2} \begin{multicols}{2}
\prefacesection{Vorwort}
TODO TODO
\columnbreak \columnbreak
\prefacesection{Preface}
TODO TODO
\end{multicols} \end{multicols}
\vfill \vfill
...@@ -19,7 +19,7 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor: ...@@ -19,7 +19,7 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
\TIName{} (-\TINumber), \TIName{} (-\TINumber),
\TIIName{} (-\TIINumber), \TIIName{} (-\TIINumber),
\BIName{} (-\BINumber), \BIName{} (-\BINumber),
\BIIName{} (-\BIINumber), \BIIName{} (-\BIINumber).
} }
\end{center} \end{center}
......
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
\input{TeX_Eybler_UnamPetii_HV43_Include_ContentsMaterial.itex} \input{TeX_Eybler_UnamPetii_HV43_Include_ContentsMaterial.itex}
\cleardoublepage \cleardoublepage
\begin{preface}
\input{TeX_Eybler_UnamPetii_HV43_Include_About.itex} \input{TeX_Eybler_UnamPetii_HV43_Include_About.itex}
\input{TeX_Eybler_UnamPetii_HV43_Include_Text.itex} \input{TeX_Eybler_UnamPetii_HV43_Include_Text.itex}
\pagebreak \pagebreak
\input{TeX_Eybler_UnamPetii_HV43_Include_Leben.itex} \input{TeX_Eybler_UnamPetii_HV43_Include_Bio.itex}
\end{preface}
\mainmatter \mainmatter
\cleardoublepage \cleardoublepage
% \todos{ % \todos{
% \chapter*{Offene Fragen} % \chapter*{Offene Fragen}
% %
% \section*{Literaturvergleich mit dem Autograph:}
% \begin{itemize} % \begin{itemize}
% \item % \item
% %
% \end{itemize} % \end{itemize}
%
% } % }
...@@ -14,20 +14,30 @@ ...@@ -14,20 +14,30 @@
\input{TeX_Eybler_UnamPetii_HV43_Include_Coverpage.itex} \input{TeX_Eybler_UnamPetii_HV43_Include_Coverpage.itex}
\input{TeX_Eybler_UnamPetii_HV43_Include_Preface_Long.itex} \input{TeX_Eybler_UnamPetii_HV43_Include_Preface_Long.itex}
\phantomsection \phantomsection
\addcontentsline{toc}{section}{\TIName} \addcontentsline{toc}{section}{\TIName}
\includescore{Instrument_TI} \includescore{Instrument_TI}
\phantomsection \phantomsection
\addcontentsline{toc}{section}{\TIIName} \addcontentsline{toc}{section}{\TIIName}
\includescore{Instrument_TII} \includescore{Instrument_TII}
\phantomsection \phantomsection
\addcontentsline{toc}{section}{\BIName} \addcontentsline{toc}{section}{\BIName}
\includescore{Instrument_BI} \includescore{Instrument_BI}
\phantomsection \phantomsection
\addcontentsline{toc}{section}{\BIIName} \addcontentsline{toc}{section}{\BIIName}
\includescore{Instrument_BII} \includescore{Instrument_BII}
\cleardoublepage \cleardoublepage
\backmatter \backmatter
\appendix \appendix
......
\composer{Joseph Eybler}
\composerdate{(1765-1846)}
\title{Unam petii} \title{Unam petii}
\subtitle{Graduale, HV 43} \subtitle{Graduale, HV 43}
\composer{Joseph Eybler}
\composerdate{(1765-1846)}
\description{Per Soli (TTBB) a capella} \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} % \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}} \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} \year{2009}
\scoreinfo{Urtext} \scoreinfo{Urtext}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment