From e6628ea105a4ebb0dc752085fbfb172bba9c0a8a Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer <reinhold@kainhofer.com> Date: Thu, 1 Oct 2009 12:34:02 +0200 Subject: [PATCH] Updated to new oly jinja template script --- ...eiGenitrix_HV44_Music_PerTeDeiGenitrix.ily | 5 ++ Eybler_PerTeDeiGenitrix_HV44_Score_Choral.ly | 1 - Eybler_PerTeDeiGenitrix_HV44_Score_Full.ly | 1 - Eybler_PerTeDeiGenitrix_HV44_Score_Long.ly | 1 - ...er_PerTeDeiGenitrix_HV44_Score_Original.ly | 1 - Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.ly | 1 - ..._PerTeDeiGenitrix_HV44_Settings_Global.ily | 12 ++-- Makefile | 28 +++++++--- ...r_PerTeDeiGenitrix_HV44_Include_About.itex | 3 +- ...ler_PerTeDeiGenitrix_HV44_Include_Bio.itex | 0 ...eDeiGenitrix_HV44_Include_KritBericht.itex | 3 +- ...DeiGenitrix_HV44_Include_Preface_Long.itex | 4 +- ...er_PerTeDeiGenitrix_HV44_Include_Todo.itex | 2 - ...ler_PerTeDeiGenitrix_HV44_Score_Choral.tex | 2 + ...bler_PerTeDeiGenitrix_HV44_Score_Vocal.tex | 5 +- ...Eybler_PerTeDeiGenitrix_HV44_Settings.itex | 6 +- ...trix_HV44_Music_PerTeDeiGenitrix.ily.patch | 40 ++++++++++++- ...TeDeiGenitrix_HV44_Score_Original.ly.patch | 7 +-- ...DeiGenitrix_HV44_Settings_Global.ily.patch | 11 ---- ...x_HV44_Include_ContentsMaterial.itex.patch | 15 ++--- ...nitrix_HV44_Include_KritBericht.itex.patch | 20 +++---- ...eDeiGenitrix_HV44_Include_Leben.itex.patch | 18 ------ ...TeDeiGenitrix_HV44_Include_Text.itex.patch | 14 ++--- ...rTeDeiGenitrix_HV44_Score_Choral.tex.patch | 13 ----- ...iGenitrix_HV44_Score_Instruments.tex.patch | 56 ++++++++++++++++--- ..._PerTeDeiGenitrix_HV44_Settings.itex.patch | 32 +++-------- 26 files changed, 160 insertions(+), 141 deletions(-) rename TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex => TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Bio.itex (100%) delete mode 100644 patches/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily.patch delete mode 100644 patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex.patch delete mode 100644 patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex.patch diff --git a/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily b/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily index 229282d..890e48c 100644 --- a/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily +++ b/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily @@ -513,6 +513,7 @@ PerTeDeiGenitrixCorIIMusic = \relative c'' { } \addQuote "PerTeDeiGenitrixCorIIMusic" { \PerTeDeiGenitrixCorIIMusic } + PerTeDeiGenitrixVIMusic = \relative c' { r2 | % 1 r2 r8 c16[(\f e] g[ c e g]) | % 2 @@ -578,6 +579,7 @@ PerTeDeiGenitrixVIMusic = \relative c' { } \addQuote "PerTeDeiGenitrixVIMusic" { \PerTeDeiGenitrixVIMusic } + PerTeDeiGenitrixVIIMusic = \relative c' { r2 | % 1 R1 | % 2 @@ -643,6 +645,7 @@ PerTeDeiGenitrixVIIMusic = \relative c' { } \addQuote "PerTeDeiGenitrixVIIMusic" { \PerTeDeiGenitrixVIIMusic } + PerTeDeiGenitrixVaMusic = \relative c' { r2 | % 1 R1 | % 2 @@ -891,6 +894,7 @@ PerTeDeiGenitrixALyrics = \lyricmode { Al -- le -- lu -- ja, al -- le -- lu -- ja. } + PerTeDeiGenitrixTMusic = \relative c' { r2 | % 1 R1*10 | \barNumberCheck #11 @@ -976,6 +980,7 @@ PerTeDeiGenitrixTLyrics = \lyricmode { Al -- le -- lu -- ja, al -- le -- lu -- ja. } + PerTeDeiGenitrixBMusic = \relative c' { r2 | % 1 R1*10 | \barNumberCheck #11 diff --git a/Eybler_PerTeDeiGenitrix_HV44_Score_Choral.ly b/Eybler_PerTeDeiGenitrix_HV44_Score_Choral.ly index c91adb8..139740c 100644 --- a/Eybler_PerTeDeiGenitrix_HV44_Score_Choral.ly +++ b/Eybler_PerTeDeiGenitrix_HV44_Score_Choral.ly @@ -9,4 +9,3 @@ } \createScore #"PerTeDeiGenitrix" #'("ChoralScore") - diff --git a/Eybler_PerTeDeiGenitrix_HV44_Score_Full.ly b/Eybler_PerTeDeiGenitrix_HV44_Score_Full.ly index 9b52053..95e7912 100644 --- a/Eybler_PerTeDeiGenitrix_HV44_Score_Full.ly +++ b/Eybler_PerTeDeiGenitrix_HV44_Score_Full.ly @@ -9,4 +9,3 @@ } \createNoCuesScore #"PerTeDeiGenitrix" #'("FullScore") - diff --git a/Eybler_PerTeDeiGenitrix_HV44_Score_Long.ly b/Eybler_PerTeDeiGenitrix_HV44_Score_Long.ly index 64b859c..abebeb1 100644 --- a/Eybler_PerTeDeiGenitrix_HV44_Score_Long.ly +++ b/Eybler_PerTeDeiGenitrix_HV44_Score_Long.ly @@ -9,4 +9,3 @@ } \createNoCuesScore #"PerTeDeiGenitrix" #'("LongScore") - diff --git a/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly b/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly index 1803a03..92013b2 100644 --- a/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly +++ b/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly @@ -9,4 +9,3 @@ } \createNoCuesScore #"PerTeDeiGenitrix" #'("Tim" "BrLong" "WdLong" "Str" "Ch" "Continuo") - diff --git a/Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.ly b/Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.ly index 4afe505..b0a7196 100644 --- a/Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.ly +++ b/Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.ly @@ -9,4 +9,3 @@ } \createScore #"PerTeDeiGenitrix" #'("VocalScore") - diff --git a/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily b/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily index cee4c7e..2d8efa0 100644 --- a/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily +++ b/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily @@ -9,14 +9,14 @@ scorenumber="EK-1044" subtitle = "Graduale, HV 44" composer = "Joseph Eybler (1765-1846)" copyright = \markup \abs-fontsize #9 \column{ - \line { "2009," \concat{\with-url #"http://www.edition-kainhofer.com/" "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 -% CorIKey = \CorKey -% CorIIKey = \CorKey +%% Add custom keys here, e.g. +%% CorKey = \key g \major +%% CorIKey = \CorKey +%% CorIIKey = \CorKey diff --git a/Makefile b/Makefile index 87e7ff3..1888fdb 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,28 @@ -base = Eybler_PerTeDeiGenitrix_HV44 -SRCS = Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily $(base)_Settings.ily OUT=out +base = Eybler_PerTeDeiGenitrix_HV44 +SRCS = Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily Eybler_PerTeDeiGenitrix_HV44_Settings.ily Eybler_PerTeDeiGenitrix_HV44_Settings_VocalScore.ily Eybler_PerTeDeiGenitrix_HV44_Settings_ChoralScore.ily Eybler_PerTeDeiGenitrix_HV44_Settings_VocalVoice.ily Eybler_PerTeDeiGenitrix_HV44_Settings_FullScore.ily Eybler_PerTeDeiGenitrix_HV44_Settings_Instrument.ily Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily $(base)_Settings.ily instruments = ObI ObII ClI ClII FagI FagII CorI CorII VI VII Va S A T B Continuo VcB -scores = Full Long Vocal Choral Original +scores = Long Full Vocal Choral Original +pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \ + $(scores:%%=$(OUT)/$(base)_Score_%.pdf) + + +texbase = Eybler_PerTeDeiGenitrix_HV44 +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) $(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)/ $< + diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_About.itex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_About.itex index e163082..4f6cf69 100644 --- a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_About.itex +++ b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_About.itex @@ -1,9 +1,10 @@ \addcontentsline{toc}{section}{Vorwort / Preface} -\chapter*{Vorwort / Preface} \begin{multicols}{2} +\prefacesection{Vorwort} TODO \columnbreak +\prefacesection{Preface} TODO \end{multicols} \vfill diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Bio.itex similarity index 100% rename from TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex rename to TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Bio.itex diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex index 1ffe481..d94f062 100644 --- a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex +++ b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex @@ -158,8 +158,9 @@ gebundenen Noten keine Linien. \subsubsection*{Einzelbemerkungen} -\begin{vergleich} + +\begin{vergleich} TODO \end{vergleich} diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Preface_Long.itex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Preface_Long.itex index 420f8b8..4f02e26 100644 --- a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Preface_Long.itex +++ b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Preface_Long.itex @@ -3,10 +3,12 @@ \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex} \cleardoublepage +\begin{preface} \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_About.itex} \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex} \pagebreak -\input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex} +\input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Bio.itex} +\end{preface} \mainmatter \cleardoublepage diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Todo.itex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Todo.itex index 92fdae4..21a48eb 100644 --- a/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Todo.itex +++ b/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Todo.itex @@ -1,10 +1,8 @@ % \todos{ % \chapter*{Offene Fragen} % -% \section*{Literaturvergleich mit dem Autograph:} % \begin{itemize} % \item % % \end{itemize} -% % } diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex index f67124b..20bd39f 100644 --- a/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex +++ b/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex @@ -18,5 +18,7 @@ \addcontentsline{toc}{section}{\ChoralScoreType} \includescore{Score_Choral} + + \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Backpage.itex} \end{document} diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.tex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.tex index 90ab928..6445196 100644 --- a/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.tex +++ b/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Vocal.tex @@ -18,10 +18,7 @@ \addcontentsline{toc}{section}{\VocalScoreType} \includescore{Score_Vocal} -\cleardoublepage -\backmatter -\appendix -\input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex} + \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Backpage.itex} \end{document} diff --git a/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex b/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex index 9850c45..3f51639 100644 --- a/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex +++ b/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex @@ -1,11 +1,11 @@ +\title{Per te, Dei genitrix} +\subtitle{Graduale, HV 44} \composer{Joseph Eybler} \composerdate{(1765-1846)} -\title{Per te dei genitrix} -\subtitle{Graduale, HV 44} \description{Per Coro (SATB) e Orchestra} \instrumentation{2 Oboi, 2 Clarinetti, 2 Fagotti, 2 Corni\\2 Violini, Viole, Violoncello\\Contrabasso ed Organo\\} \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 \& Erstdruck} diff --git a/patches/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily.patch b/patches/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily.patch index 4cb7108..f8bd23e 100644 --- a/patches/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily.patch +++ b/patches/Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily.patch @@ -1,6 +1,6 @@ ---- Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily.new 2009-09-24 16:19:18.000000000 +0200 -+++ Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily 2009-09-21 12:40:08.000000000 +0200 -@@ -1,115 +1,1181 @@ +--- Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily.new 2009-10-01 12:32:27.000000000 +0200 ++++ Eybler_PerTeDeiGenitrix_HV44_Music_PerTeDeiGenitrix.ily 2009-10-01 12:26:56.000000000 +0200 +@@ -1,149 +1,1186 @@ \version "2.13.1" -PerTeDeiGenitrixPieceName = "PerTeDeiGenitrix" @@ -21,7 +21,9 @@ + \partial 2 } +- -PerTeDeiGenitrixObIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixObIMusic = \relative c'' { + r4 r8 e8~\fz | % 1 @@ -85,7 +87,9 @@ } \addQuote "PerTeDeiGenitrixObIMusic" { \PerTeDeiGenitrixObIMusic } +- -PerTeDeiGenitrixObIIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixObIIMusic = \relative c'' { + r4 r8 c8~\fz | % 1 @@ -146,7 +150,9 @@ } \addQuote "PerTeDeiGenitrixObIIMusic" { \PerTeDeiGenitrixObIIMusic } +- -PerTeDeiGenitrixClIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixClIMusic = \relative c'' { + r4 r8 b8~\fz | % 1 @@ -213,7 +219,9 @@ } \addQuote "PerTeDeiGenitrixClIMusic" { \PerTeDeiGenitrixClIMusic } +- -PerTeDeiGenitrixClIIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixClIIMusic = \relative c'' { + r4 r8 g8\fz~ | % 1 @@ -276,7 +284,9 @@ } \addQuote "PerTeDeiGenitrixClIIMusic" { \PerTeDeiGenitrixClIIMusic } +- -PerTeDeiGenitrixFagIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixFagIMusic = \relative c { + r2 | % 1 @@ -343,7 +353,9 @@ } \addQuote "PerTeDeiGenitrixFagIMusic" { \PerTeDeiGenitrixFagIMusic } +- -PerTeDeiGenitrixFagIIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixFagIIMusic = \relative c, { + r2 | % 1 @@ -406,7 +418,9 @@ } \addQuote "PerTeDeiGenitrixFagIIMusic" { \PerTeDeiGenitrixFagIIMusic } +- -PerTeDeiGenitrixCorIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixCorIMusic = \relative c'' { + r2 | % 1 @@ -471,7 +485,9 @@ } \addQuote "PerTeDeiGenitrixCorIMusic" { \PerTeDeiGenitrixCorIMusic } +- -PerTeDeiGenitrixCorIIMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixCorIIMusic = \relative c'' { + r2 | % 1 @@ -536,7 +552,9 @@ } \addQuote "PerTeDeiGenitrixCorIIMusic" { \PerTeDeiGenitrixCorIIMusic } + PerTeDeiGenitrixVIMusic = \relative c' { +- s8 - % TODO + r2 | % 1 + r2 r8 c16[(\f e] g[ c e g]) | % 2 @@ -602,7 +620,9 @@ } \addQuote "PerTeDeiGenitrixVIMusic" { \PerTeDeiGenitrixVIMusic } + PerTeDeiGenitrixVIIMusic = \relative c' { +- s8 - % TODO + r2 | % 1 + R1 | % 2 @@ -668,7 +688,9 @@ } \addQuote "PerTeDeiGenitrixVIIMusic" { \PerTeDeiGenitrixVIIMusic } + PerTeDeiGenitrixVaMusic = \relative c' { +- s8 - % TODO + r2 | % 1 + R1 | % 2 @@ -747,7 +769,9 @@ } \addQuote "PerTeDeiGenitrixVaMusic" { \PerTeDeiGenitrixVaMusic } +- -PerTeDeiGenitrixSMusic = \relative c' { +- s8 - % TODO +PerTeDeiGenitrixSMusic = \relative c'' { + r2 | % 1 @@ -809,7 +833,9 @@ - % TODO -} - +- -PerTeDeiGenitrixAMusic = \relative c' { +- s8 - % TODO + Per te, per te, De -- i ge -- ni -- trix, + no -- bis est da -- ta vi -- ta per -- di -- ta, @@ -925,7 +951,9 @@ + Al -- le -- lu -- ja, al -- le -- lu -- ja. } + PerTeDeiGenitrixTMusic = \relative c' { +- s8 - % TODO + r2 | % 1 + R1*10 | \barNumberCheck #11 @@ -1012,7 +1040,9 @@ + Al -- le -- lu -- ja, al -- le -- lu -- ja. } + PerTeDeiGenitrixBMusic = \relative c' { +- s8 - % TODO + r2 | % 1 + R1*10 | \barNumberCheck #11 @@ -1213,12 +1243,16 @@ } +\addQuote "PerTeDeiGenitrixContinuoMusic" { \PerTeDeiGenitrixBCMusic } +- -PerTeDeiGenitrixContinuoMusic = \relative c' { +- s8 - % TODO -} -\addQuote "PerTeDeiGenitrixContinuoMusic" { \PerTeDeiGenitrixContinuoMusic } - +- -PerTeDeiGenitrixVcBMusic = \relative c' { +- s8 - % TODO -} +PerTeDeiGenitrixVcBMusic = \PerTeDeiGenitrixBCMusic diff --git a/patches/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly.patch b/patches/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly.patch index a8e7dfa..1f48082 100644 --- a/patches/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly.patch +++ b/patches/Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly.patch @@ -1,9 +1,8 @@ ---- Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly.new 2009-09-24 16:19:18.000000000 +0200 -+++ Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly 2009-09-24 16:19:05.000000000 +0200 -@@ -8,5 +8,5 @@ +--- Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly.new 2009-10-01 12:32:27.000000000 +0200 ++++ Eybler_PerTeDeiGenitrix_HV44_Score_Original.ly 2009-10-01 12:27:42.000000000 +0200 +@@ -8,4 +8,4 @@ scorenumber = \markup{\scoreNumber \OriginalScoreNumber} } -\createNoCuesScore #"PerTeDeiGenitrix" #'("OriginalScore") +\createNoCuesScore #"PerTeDeiGenitrix" #'("Tim" "BrLong" "WdLong" "Str" "Ch" "Continuo") - diff --git a/patches/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily.patch b/patches/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily.patch deleted file mode 100644 index 95a2123..0000000 --- a/patches/Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily.new 2009-09-24 16:19:18.000000000 +0200 -+++ Eybler_PerTeDeiGenitrix_HV44_Settings_Global.ily 2009-09-24 16:19:31.000000000 +0200 -@@ -9,7 +9,7 @@ - subtitle = "Graduale, HV 44" - 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. 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."} - } - } diff --git a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex.patch b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex.patch index 035f229..04931b5 100644 --- a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex.patch +++ b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex.patch @@ -1,21 +1,22 @@ ---- TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex.new 2009-09-24 16:19:18.000000000 +0200 +--- TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex.new 2009-10-01 12:32:28.000000000 +0200 +++ TeX_Eybler_PerTeDeiGenitrix_HV44_Include_ContentsMaterial.itex 2009-09-24 16:17:02.000000000 +0200 -@@ -16,11 +16,20 @@ +@@ -15,12 +15,21 @@ + \scorelistbox{ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor: - \FullScoreName{} (-\FullScoreNumber), -\LongScoreName{} (-\LongScoreNumber), + \FullScoreName{} (-\FullScoreNumber), -\VocalScoreName{} (-\VocalScoreNumber), +\VocalScoreName{} (-\VocalScoreNumber); + \ChoralScoreName{} (-\ChoralScoreNumber), --\OriginalScoreName{} (-\OriginalScoreNumber), +-\OriginalScoreName{} (-\OriginalScoreNumber); +\SName{} (-\SNumber), +\AName{} (-\ANumber), +\TName{} (-\TNumber), +\BName{} (-\BNumber); -+ - \InstrumentsName{} (-\InstrumentsNumber), + ++\InstrumentsName{} (-\InstrumentsNumber), +\ContinuoName{} (-\ContinuoNumber), +\VIName{} (-\VINumber), +\VIIName{} (-\VIINumber), @@ -37,7 +38,7 @@ -\TName{} (-\TNumber), -\BName{} (-\BNumber), -\ContinuoName{} (-\ContinuoNumber), --\VcBName{} (-\VcBNumber), +-\VcBName{} (-\VcBNumber). - +\CorIIName{} (-\CorIINumber). } diff --git a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex.patch b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex.patch index a7385b6..01bc503 100644 --- a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex.patch +++ b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex.patch @@ -1,5 +1,5 @@ ---- TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex.new 2009-09-24 16:19:18.000000000 +0200 -+++ TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex 2009-09-24 16:15:56.000000000 +0200 +--- TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex.new 2009-10-01 12:32:28.000000000 +0200 ++++ TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex 2009-10-01 12:28:55.000000000 +0200 @@ -12,124 +12,64 @@ \newblock TODO @@ -219,7 +219,7 @@ der vorliegenden Ausgabe ohne weitere Kennzeichnung ergänzt. \item In den Quellen sind tw. Akzidenzien nicht -@@ -186,15 +120,13 @@ +@@ -186,48 +120,39 @@ \begin{itemize} \item[\cite{Aut}:] TODO \item[\cite{HS1}:] TODO @@ -239,7 +239,10 @@ TODO \end{enumerate} -@@ -203,37 +135,31 @@ + + +- +- \paragraph*{Diverses} \begin{enumerate} @@ -283,12 +286,3 @@ \end{enumerate} - \subsubsection*{Einzelbemerkungen} - --\subsubsection*{PerTeDeiGenitrix} -- - \begin{vergleich} -+ - TODO - \end{vergleich} - diff --git a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex.patch b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex.patch deleted file mode 100644 index cf13337..0000000 --- a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex.new 2009-09-24 16:19:18.000000000 +0200 -+++ TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Leben.itex 2009-07-24 00:46:46.000000000 +0200 -@@ -1,14 +1 @@ --\section*{Das Leben von Joseph Eybler (1765-1846)} -- --\begin{multicols}{2} --TODO --\end{multicols} -- --\section*{The life of Joseph Eybler (1765-1846)} -- --\begin{multicols}{2} --TODO --\end{multicols} -- --Quellen / Sources:\\[0em] --TODO -+\input{../../Komponisten/Eybler/TeX_Eybler_Include_Biografie.itex} diff --git a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex.patch b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex.patch index de940c3..e94a438 100644 --- a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex.patch +++ b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex.patch @@ -1,14 +1,12 @@ ---- TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex.new 2009-09-24 16:19:18.000000000 +0200 -+++ TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex 2009-09-24 16:25:31.000000000 +0200 -@@ -1,12 +1,15 @@ +--- TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex.new 2009-10-01 12:32:28.000000000 +0200 ++++ TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Text.itex 2009-10-01 12:15:53.000000000 +0200 +@@ -1,10 +1,15 @@ -\subsection*{Text des \q{Per te, Dei genitrix}: TODO} +\subsection*{Text des \q{Per te, Dei genitrix}: Graduale zu Maria vom Berge Karmel (16. Juli)} - \begin{small} - --\subsection*{PerTeDeiGenitrix} --\nopagebreak + \begin{lyricstext} +\renewenvironment{lyricstable}{\begin{tabular}{p{0.27\textwidth}p{0.35\textwidth}p{0.35\textwidth}}}{\end{tabular}} + \begin{lyricstable} -TODO & TODO & TODO \\\\[0.5em] - & \footnotesize\em{(TODO)} & \footnotesize\em{(TODO)} @@ -20,4 +18,4 @@ + & \footnotesize\em{(Reinhold Kainhofer)} & \footnotesize\em{(Reinhold Kainhofer)} \end{lyricstable} - + \end{lyricstext} diff --git a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex.patch b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex.patch deleted file mode 100644 index b7aa596..0000000 --- a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex.new 2009-09-24 16:19:18.000000000 +0200 -+++ TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Choral.tex 2009-09-17 22:15:10.000000000 +0200 -@@ -18,10 +18,5 @@ - \addcontentsline{toc}{section}{\ChoralScoreType} - \includescore{Score_Choral} - --\cleardoublepage --\backmatter --\appendix --\input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_KritBericht.itex} -- - \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Backpage.itex} - \end{document} diff --git a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Instruments.tex.patch b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Instruments.tex.patch index 2457804..eb5ca9e 100644 --- a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Instruments.tex.patch +++ b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Instruments.tex.patch @@ -1,12 +1,13 @@ ---- TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Instruments.tex.new 2009-09-24 16:19:18.000000000 +0200 +--- TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Instruments.tex.new 2009-10-01 12:32:28.000000000 +0200 +++ TeX_Eybler_PerTeDeiGenitrix_HV44_Score_Instruments.tex 2009-07-31 21:36:13.000000000 +0200 -@@ -15,6 +15,36 @@ +@@ -14,81 +14,61 @@ + \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Coverpage.itex} \input{TeX_Eybler_PerTeDeiGenitrix_HV44_Include_Preface_Long.itex} - \phantomsection ++\phantomsection +\addcontentsline{toc}{section}{\ContinuoName} +\includescore{Instrument_Continuo} -+ + +\phantomsection +\addcontentsline{toc}{section}{\SName} +\includescore{Instrument_S} @@ -19,7 +20,9 @@ +\phantomsection +\addcontentsline{toc}{section}{\BName} +\includescore{Instrument_B} -+ + +- +- +\phantomsection +\addcontentsline{toc}{section}{\VIName} +\includescore{Instrument_VI} @@ -32,42 +35,77 @@ +\phantomsection +\addcontentsline{toc}{section}{\VcBName} +\includescore{Instrument_VcB} -+ -+\phantomsection + + \phantomsection \addcontentsline{toc}{section}{\ObIName} \includescore{Instrument_ObI} +- \phantomsection -@@ -38,33 +68,6 @@ + \addcontentsline{toc}{section}{\ObIIName} + \includescore{Instrument_ObII} +- + \phantomsection + \addcontentsline{toc}{section}{\ClIName} + \includescore{Instrument_ClI} +- + \phantomsection + \addcontentsline{toc}{section}{\ClIIName} + \includescore{Instrument_ClII} +- + \phantomsection + \addcontentsline{toc}{section}{\FagIName} + \includescore{Instrument_FagI} +- + \phantomsection + \addcontentsline{toc}{section}{\FagIIName} + \includescore{Instrument_FagII} +- + \phantomsection + \addcontentsline{toc}{section}{\CorIName} + \includescore{Instrument_CorI} +- \phantomsection \addcontentsline{toc}{section}{\CorIIName} \includescore{Instrument_CorII} + -\phantomsection -\addcontentsline{toc}{section}{\VIName} -\includescore{Instrument_VI} +- -\phantomsection -\addcontentsline{toc}{section}{\VIIName} -\includescore{Instrument_VII} +- -\phantomsection -\addcontentsline{toc}{section}{\VaName} -\includescore{Instrument_Va} +- -\phantomsection -\addcontentsline{toc}{section}{\SName} -\includescore{Instrument_S} +- -\phantomsection -\addcontentsline{toc}{section}{\AName} -\includescore{Instrument_A} +- -\phantomsection -\addcontentsline{toc}{section}{\TName} -\includescore{Instrument_T} +- -\phantomsection -\addcontentsline{toc}{section}{\BName} -\includescore{Instrument_B} +- -\phantomsection -\addcontentsline{toc}{section}{\ContinuoName} -\includescore{Instrument_Continuo} +- -\phantomsection -\addcontentsline{toc}{section}{\VcBName} -\includescore{Instrument_VcB} - +- +- +- \cleardoublepage + \backmatter diff --git a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex.patch b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex.patch index 396c34e..7916e19 100644 --- a/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex.patch +++ b/patches/TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex.patch @@ -1,27 +1,13 @@ ---- TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex.new 2009-09-24 16:19:18.000000000 +0200 -+++ TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex 2009-09-24 16:27:26.000000000 +0200 -@@ -1,15 +1,14 @@ --\composer{Joseph Eybler (1765-1846)} --%\composerdate{(TODO-TODO)} --% \poet{} --% \poetdate{} --\title{Per te, Dei genitrix} -+\composer{Joseph Eybler} -+\composerdate{(1765-1846)} -+\title{Per te dei genitrix} +--- TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex.new 2009-10-01 12:32:28.000000000 +0200 ++++ TeX_Eybler_PerTeDeiGenitrix_HV44_Settings.itex 2009-10-01 12:32:26.000000000 +0200 +@@ -2,8 +2,8 @@ \subtitle{Graduale, HV 44} --% \description{Für Chor (SATB) und Orgel oder Orchester} --% \instrumentation{2 Oboen oder Klarinetten, 2 Hörner\\2 Trompeten, Pauken (nicht obl.)\\2 Violinen, Viola, Cello und Contrabass} --\editor{Reinhold Kainhofer} --\publisher{Edition Kainhofer, Vienna} + \composer{Joseph Eybler} + \composerdate{(1765-1846)} +-% \description{Per Coro (SATB) ed Organo o Orchestra} +-% \instrumentation{2 Oboi, 2 Corni\\2 Violini, Viola, Violoncello\\e Basso Continuo (Organo e Bassi)} +\description{Per Coro (SATB) e Orchestra} +\instrumentation{2 Oboi, 2 Clarinetti, 2 Fagotti, 2 Corni\\2 Violini, Viole, Violoncello\\Contrabasso ed Organo\\} -+\editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}} -+\publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer}, Vienna} + \editor{\href{http://reinhold.kainhofer.com/}{Reinhold Kainhofer}} + \publisher{\href{http://www.edition-kainhofer.com/}{Edition Kainhofer, Vienna}} \year{2009} --% \scoreinfo{Urtext \& Erstdruck} -+\scoreinfo{Urtext \& Erstdruck} -+ - \basename{Eybler_PerTeDeiGenitrix_HV44} - - \newcommand{\scoreNumber}[1]{EK-1044-#1} -- GitLab