Finished figured bass realization, layout of scores; only About is missing

1123 - Eybler - Tristes erant HV123.def

+{
+  "output_dir": "1123 - Eybler - Tristes erant HV123",
+  "version": "2.17.6",
+  "template": "EK_Full",
+  "language": "deutsch",
+  "additionalscores": [],
+  "options": ["optimal-breaking","nocolortitle"],
+
+  "defaults": {
+    "title": "Tristes erant Apostoli",
+    "subtitle": "Hymnus, HV 123",
+    "composer": "Joseph Eybler",
+    "composerdate": "1765-1846",
+
+    #"arranger": u"<<arranger>>",
+    #"opus": u"<<opus>>",
+    #"instrumentation": u"<<instrumentation>>",
+    #"key": u"<<key>>",
+    #"language": u"<<language>>",
+    #"duration": u"<<duration>>",
+    #"composition_year": u"<<composition_year>>",
+    #"score_information": u"<<score_information>>",
+    #"genre": u"<<genre>>",
+
+    "year": "2012",
+    "publisher": "Edition Kainhofer, Vienna",
+    "publisherurl": "http://www.edition-kainhofer.com/",
+    "editor": "Reinhold Kainhofer",
+    "editorurl": "http://reinhold.kainhofer.com/",
+    "editormail": "reinhold@kainhofer.com",
+    "scorenumber": "EK-1123",
+    "basename": "Eybler_TristesErant_HV123",
+
+    "instruments": ["Ch", "Continuo", "VcB" ],
+    "noscore_instruments": ["Ch"],
+    "vocalvoices": ["Ch"],
+    "scores": ["Full", "Choral"],
+  },
+
+  "scores": ["TristesErant"],
+  "latex": {},
+}

Eybler_TristesErant_HV123_Instrument_Continuo.ly

-\version "2.13.1"
+\version "2.17.6"
 \include "Eybler_TristesErant_HV123_Settings_Instrument.ily"
+#(set-global-staff-size 17)
 
 \header {
-  instrument = "Organo"
-  scorenumber = \markup{\scoreNumber \ContinuoNumber}
+  instrument = \ContinuoInstrumentName
+  instrumentnr = \ContinuoNumber
+  arranger = "Generalbass-Aussetzung: R. Kainhofer"
 }
 \paper {
-  ragged-bottom = ##t
-  ragged-last-bottom = ##t
+  ragged-bottom = ##f
+  ragged-last-bottom = ##f
 }
 
-\createScore #"TristesErant" #'("Continuo")
-\noPageBreak
+\createNoCuesScore #"TristesErant" #'("RealizedContinuo")
+\createHeadline "Praeludium"
+\createNoCuesScore #"TristesErantII" #'("RealizedContinuo")
 \createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"

Eybler_TristesErant_HV123_Instrument_VcB.ly

-\version "2.13.1"
+\version "2.17.6"
 \include "Eybler_TristesErant_HV123_Settings_Instrument.ily"
 
 \header {
   instrument = "Violone"
-  scorenumber = \markup{\scoreNumber \VcBNumber}
+  instrumentnr = \VcBNumber
+  arranger = ##f
 }
 \paper {
   ragged-bottom = ##t
@@ -15,13 +16,20 @@
 %     \remove "Instrument_name_engraver"
 %   }
 %   \context {
-%     \RemoveEmptyStaffContext 
+%     \Staff \RemoveEmptyStaves 
 %     % No instrument names, they are already in the title/header! (Removing 
 %     % the engraver only from the \Staff context is not sufficient!)
 %     \remove "Instrument_name_engraver"
 %   }
 % }
 
-\createScore #"TristesErant" #'("VcB")
-\noPageBreak
+% \createScore #"TristesErant" #'("VcB")
+% \noPageBreak
+% \createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"
+TristesErantVcBMusic = \TristesErantBCMusic
+TristesErantIIVcBMusic = \TristesErantIIBCMusic
+
+\createNoCuesScore #"TristesErant" #'("VcB")
+\createHeadline "Praeludium"
+\createNoCuesScore #"TristesErantII" #'("VcB")
 \createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"

Eybler_TristesErant_HV123_Music_TristesErant.ily

-\version "2.13.1"
+\version "2.17.6"
 
 TristesErantPieceName = "Tristes erant"
 TristesErantIIPieceName = "Gloria tibi"
@@ -81,12 +81,13 @@ TristesErantBCMusic = \relative c {
   c2 r \bar"|."
   \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
   \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT  
-  \tag #'cues \mark "Da Capo"
-%   TODO: Print Da capo
+%   \tag #'cues \mark "Da Capo"
 }
 TristesErantIIBCMusic=\TristesErantBCMusic
 
-TristesErantBCFbMusic = \figuremode {
+TristesErantFiguredBassMusic = \figuremode {\bassFigureStaffAlignmentDown
+  \set FiguredBass.implicitBassFigures = #'(0)
+  \set FiguredBass.useBassFigureExtenders = ##t
   s1 | % 2
   <6>4 <6 4> \bassFigureExtendersOn <3>8 <3> <3> <3> | % 3
   <6>4 s <6> s | % 4
@@ -96,13 +97,26 @@ TristesErantBCFbMusic = \figuremode {
   s s s <6>8 s | % 8
   <6>8 s <6> s s2 | % 9
   \bassFigureExtendersOff
-  s <\markup{\hat \number 5}>4 <6> | \barNumberCheck #10
+  s <\markup{\fontsize #-2 \hat \number 5}>4 <\markup{\pad-y #1.5 "_"}>8 <6>8 | \barNumberCheck #10
   \bassFigureExtendersOn 
   s2 <6 4>4 <5 _!> | % 11
   s2 <6\\>8 <8>8 <5 4> <5  _!> | % 12
   s1 \bar"|."
 }
-TristesErantIIBCFbMusic = \TristesErantBCFbMusic
+TristesErantIIFiguredBassMusic = \TristesErantFiguredBassMusic
 
-TristesErantVcBMusic = \TristesErantBCMusic
-TristesErantIIVcBMusic = \TristesErantIIBCMusic
+TristesErantBCRealizationMusic = \relative c' {
+  <c es g>1 | % 2
+  <c f>4 <c es g>4 <c f as>2 | % 3
+  <h d g>2 <c es g> | % 4
+  <c es as>1 | % 5
+  <c f>4 <h d g> <as c es>2 | % 6
+  <g h d>2 <h d g> | % 7
+  <c es g> <b d f>4 <b es g> | % 8
+  <c es as> <b es g> <c f as>2 | % 9
+  <c f as>2 <d f as>4 <d g> | \barNumberCheck #10
+  <c es g>2 <c es>4 <h d> | % 11
+  <c es g>2 <d f h>8[ <es g c>8 <d g c> <d g h>] |
+  <es g c>2 r 
+}
+TristesErantIIBCRealizationMusic = \TristesErantBCRealizationMusic
\ No newline at end of file

Eybler_TristesErant_HV123_Score_Choral.ly

+\version "2.17.6"
+\include "Eybler_TristesErant_HV123_Settings_ChoralScore.ily"
+\setCreateMIDI ##t
+\setCreatePDF ##t
+
+\header {
+  scoretype = \ChoralScoreTitle
+  instrumentnr = \ChoralScoreNumber
+}
+\paper {
+  ragged-last-bottom = ##t
+}
+
+\createScore #"TristesErant" #'("ChoralScore")
+\createHeadline "Praeludium"
+\createScore #"TristesErantII" #'("ChoralScore")
+\createHeadline "R: Vos elegit Deus inhaereditatem sibi. Alleluja"

Eybler_TristesErant_HV123_Score_Full.ly

-\version "2.13.1"
+\version "2.17.6"
 \include "Eybler_TristesErant_HV123_Settings_FullScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
 
 \header {
   scoretype = \FullScoreTitle
-  scorenumber = \markup{\scoreNumber \FullScoreNumber}
+  instrumentnr = \FullScoreNumber
 }
 \paper {
 %   ragged-bottom = ##t
   system-count = #3
-  system-separator-markup = #f
+  system-separator-markup = ##f
+  page-count = 1
+%   annotate-spacing = ##t 
+
+  system-system-spacing #'padding = #2
+  system-system-spacing #'minimum-distance = #5
+  markup-markup-spacing #'basic-distance = #5
 }
+OMidiInstrument = "accoustic grand"
+RealizedContinuoMidiInstrument = "accoustic grand"
 
 \createNoCuesScore #"TristesErant" #'("FullScore")
 \createHeadline "Praeludium"

Eybler_TristesErant_HV123_Settings.ily

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

Eybler_TristesErant_HV123_Settings_ChoralScore.ily

+\version "2.17.6"
+\include "orchestrallily/oly_settings_choralscore.ily"
+\include "Eybler_TristesErant_HV123_Settings.ily"
+#(set-global-staff-size 20)

Eybler_TristesErant_HV123_Settings_FullScore.ily

+\version "2.17.6"
 \include "orchestrallily/oly_settings_fullscore.ily"
 \include "Eybler_TristesErant_HV123_Settings.ily"
+#(set-global-staff-size 13)
+\header {
+    arranger = "Generalbass-Aussetzung: R. Kainhofer"
+  }
\ No newline at end of file

Eybler_TristesErant_HV123_Settings_Global.ily

-\version "2.13.1"
+\version "2.17.6"
 
-\include "orchestrallily/orchestrallily.ily"
 \include "orchestrallily/oly_settings_names.ily"
 
-scorenumber="EK-1123"
 
 \header {
+  LicenseCCBY = \markup {Lizenz: / License: Creative Commons BY \with-url #"http://creativecommons.org/licenses/by/3.0/at/" {\translate #'(0 . -0.7) \epsfile #Y #2.75 #"orchestrallily/cc-by.eps" }}
+
+  scorenumberbase = "EK-1123"
   title = "Tristes erant Apostoli"
+  titlepagetitle = "Tristes erant Apostoli"
   subtitle = "Hymnus, HV 123"
+  titlepagesubtitle = "Hymnus, HV 123"
   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 {"Die Ausgabe darf kopiert und ohne Einschränkungen aufgeführt werden. / May be copied and performed without restriction."}
+  shortcomposer = "J. Eybler"
+
+  ismn = "979-0-50217-081-3"
+  copyright = \markup \abs-fontsize #8 \column{
+    \line {© 2012, \concat{\with-url #"http://www.edition-kainhofer.com/" {"Edition Kainhofer, Vienna, Austria"}.} \concat{\fromproperty #'header:scorenumber ,} ISMN \concat{\fromproperty #'header:ismn .} \LicenseCCBY }
+    \LicenseNoRestrictions
   }
 }
 
-% Possibly adjust the \orchestralScoreStructure here...
+%% Possibly adjust the \orchestralScoreStructure here...
 
 % Add custom keys here, e.g.
 % CorKey = \key g \major
 % CorIKey = \CorKey
 % CorIIKey = \CorKey
-#(oly:remove_from_score_structure "Ch")
-ContinuoInstrumentName = \markup\column{"Organo" "e Bassi"}
-ChShortInstrumentName = #f
-ContinuoShortInstrumentName = #f
+\orchestralScoreStructure #'(
+  ;  ("BCFb" "FiguredBass" ())
+  ;  ("FiguredBass" "FiguredBass" ())
+  ;("Organ" "SimultaneousMusic" ("BCFb" "O"))
+  ("Continuo" "ParallelVoicesStaff" ("BCFb" "BC" "FiguredBass"))
+  ("RealizedContinuo" "PianoStaff" ("BCRealization" "Continuo"))
+  ("ChoralScore" "SimultaneousMusic" ("Ch"))
+; Full Scores
+  ("FullScore" "SimultaneousMusic" ("Ch" "RealizedContinuo"))
+)
+
+% #(oly:remove_from_score_structure "Ch")
+% #(oly:remove_from_score_structure "VcB")
+% ContinuoInstrumentName = \markup\column{"Organo" "e Bassi"}
+ChInstrumentName = "Chor"
+ContinuoInstrumentName = "Continuo"
+RealizedContinuoInstrumentName = "Organo"
+ChShortInstrumentName = ##f
+ContinuoShortInstrumentName = ##f
 
 \paper {
   #(define (page-post-process layout pages) #f)
 }
+SClef = \clef "soprano/treble"
+AClef = \clef "alto/treble"
+TClef = \clef "tenor/treble_8"

Eybler_TristesErant_HV123_Settings_Instrument.ily

-\include "Eybler_TristesErant_HV123_Settings.ily"
+\version "2.17.6"
 \include "orchestrallily/oly_settings_instrument.ily"
+\include "Eybler_TristesErant_HV123_Settings.ily"
 
 \paper {
   #(define page-breaking ly:optimal-breaking)

Eybler_TristesErant_HV123_Settings_Vocal.ily

+\version "2.17.6"
+\include "orchestrallily/orchestrallily.ily"
 \include "orchestrallily/oly_settings_vocalvoice.ily"
 \include "Eybler_TristesErant_HV123_Settings.ily"

Makefile

-SRCS = Eybler_TristesErant_HV123_Music_TristesErant.ily Eybler_TristesErant_HV123_Settings.ily
 OUT=out
 
+base = Eybler_TristesErant_HV123
+SRCS = $(base)_Music_TristesErant.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_Instrument.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_FullScore.ily
 instruments = Continuo VcB
-scores = Full
+scores = Full Choral
+pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
+     $(scores:%=$(OUT)/$(base)_Score_%.pdf)
 
-pdfs = $(instruments:%=$(OUT)/Eybler_TristesErant_HV123_Instrument_%.pdf) $(scores:%=$(OUT)/Eybler_TristesErant_HV123_Score_%.pdf)
-texs = $(scores:%=TeX_Eybler_TristesErant_HV123_Score_%.tex)
-texpdfs = $(scores:%=$(OUT)/TeX_Eybler_TristesErant_HV123_Score_%.pdf)
 
+texbase = Eybler_TristesErant_HV123
+texscores = Full
+texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
+texpdfs = $(texs:%.tex=$(OUT)/%.pdf)  $(OUT)/$(base)_Score_Choral.pdf
+#      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
+
+distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(texpdfs)
+
+additionalscores =
 
 .PHONY: all clean
-all: $(OUT) $(instruments) $(scores) tex
+all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
 instruments: $(instruments)
 scores: $(scores)
 
+
 clean:
 	rm -rf $(OUT)
 
+lily: $(pdfs) $(additionalscores)
+
 $(OUT) :
 	mkdir -p $(OUT)
 
-$(instruments): % : $(OUT)/Eybler_TristesErant_HV123_Instrument_%.pdf $(SRCS)
-$(scores): % : $(OUT)/Eybler_TristesErant_HV123_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)/ $<
+	TEXINPUTS=$(OUT):orchestrallily/:.//: xelatex --output-directory=$(OUT)/ $<
+# 	TEXINPUTS=$(OUT):orchestrallily/:.//: xelatex -interaction=batchmode --output-directory=$(OUT)/ $<
+
+zipdir = $(base)_Final
+dist: $(distfiles)
+	mkdir -p $(zipdir)
+	cp -r $(distfiles) $(zipdir)
+	rename 's/TeX_//' $(zipdir)/*
+	rename 's/Score_(Full|Long)\./Score./' $(zipdir)/*
+	zip -jr $(base).zip $(zipdir)
+	rm -rf $(zipdir)
+
+
+webshop: $(distfiles)
+	@python ../../Diverses/Webshop/EditionKainhofer_CSVI_Generate.py "1123 - Eybler - Tristes erant HV123.def" $(distfiles)

Materialien

+../../Komponisten/Eybler/Werke/HV123 Tristes erant/
\ No newline at end of file

TeX_Eybler_TristesErant_HV123_Include_About.itex

@@ -6,4 +6,4 @@ TODO
 \columnbreak
 TODO
 \end{multicols}
-\vfill
+% \vfill

TeX_Eybler_TristesErant_HV123_Include_Copyrightbox.itex

+\makeatletter
+\copyrightbox{© \@yearpublished, \@publisher\ifx\@publisherurl\@empty\else, \href{\@publisherurl}{\@publisherurl}\fi\newline
+1. Auflage / 1st Printing \@yearpublished\newline
+\ifx\@scorenumber\@empty\else\@scorenumber\ifx\@ismn\@empty\else, \fi\fi\ifx\@ismn\@empty\else%
+ISMN \@ismn\fi\newline
+Computersatz mit \@software\newline
+Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
+\makeatother

TeX_Eybler_TristesErant_HV123_Include_KritBericht.itex

@@ -8,8 +8,34 @@
 \begin{thebibliography}{AA}
 
 \bibitem[A]{Aut}
-Autographe Partitur, im Besitz des Musikarchiv des Schottenstiftes, Wien. Signatur: TODO
-\newblock TODO
+Autographe Partitur, im Besitz des Archiv des Schottenstiftes, Wien. Archivkodex: A-Ws Kodex 707(673)/4 (Einlage).
+
+
+\newblock 1 fol. (Querformat). Seite 1v: Entwurf eines Teiles eines Gloria.
+Aufbewahrt in einem Kartonumschlag mit zahlreichen weiteren Hymnen und kurzen sakralen Kompositionen von Eybler.
+
+Wasserzeichen: Halbmond.
+
+Titel: \q{Hymnus de Apostolis tempore pascali}
+
+Zwei Akkoladen auf der Seite, durch zwei kurze Striche getrennt, Anordnung der Stimmen (nur auf der ersten Akkolade bezeichnet):
+\begin{sourcetitle}
+Soprano (im Sopranschlüssel)\sbreak
+Alto (im Altschlüssel)\sbreak
+Tenore (im Tenorschlüssel)\sbreak
+Basso\sbreak
+{}[leere Notenzeile]\sbreak
+Organo con Bassi
+\end{sourcetitle}
+
+Der Text der Vokalstimmen enthält praktisch keine Trennstriche. Nur die erste Strophe vorhanden.
+
+Signiert am Ende des Stückes (rechts unten):
+\begin{sourcetitle}
+Eybler mp
+\end{sourcetitle}
+
+
 
 \bibitem[B]{HS1}
 Handschriftlicher Stimmensatz der Wr. Hofmusikkapelle, Österreichische Nationalbibliothek, A-Whk HK.2481 Mus.
@@ -36,17 +62,19 @@ Bassschlüssel) gesetzt und entsprechend oktaviert.
 
 
 \subsubsection*{Bemerkungen}
-\begin{enumerate}
-\item Der Stimmensatz \cite{HS1} notiert jede der Chorstimmen trotz des unisono-Gesangs
+\begin{vergleich}
+Der Stimmensatz \cite{HS1} notiert jede der Chorstimmen trotz des unisono-Gesangs
 eigenständig im entsprechenden Schlüssel. Die vorliegende Ausgabe benutzt für
 die Gesangsstimme nur den Violinschlüssel, die Männerstimmen oktavieren
 selbstverständlich.
-\end{enumerate}
 
-\begin{vergleich}
-4: Text \q{Christi} in \cite{HS1} abgekürzt als \q{Xsti}
+In der Violoncello-Stimme in \cite{HS1} sind etliche Warnakzidentien mehr angegeben als in den anderen Ausgaben und Stimmen.
+
+T4: Text \q{Christi} in \cite{HS1} abgekürzt als \q{Xsti}
+
+T5: Text \q{munere} statt \q{funere} in \cite{HS1}
 
-5: Text \q{munere} statt \q{funere} in \cite{HS1}
+T9: Bezifferung \lilyText[scale=1.3]{6} im Autograph \cite{Aut} falsch auf der vorletzten Achtelnote, in den anderen Quellen eine Verlängerungslinie auf der vorletzten und \lilyText[scale=1.3]{6} erst auf der letzten Achtelnote.
 
 \end{vergleich}
 

TeX_Eybler_TristesErant_HV123_Include_Material.itex

+\begin{center}
+
+\scorelistbox{
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+\FullScoreName{} (-\FullScoreNumber),
+\ChoralScoreName{} (-\ChoralScoreNumber);
+
+\ChName{} (-\ChNumber),
+\ContinuoName{} (-\ContinuoNumber),
+\VcBName{} (-\VcBNumber).
+
+}
+\end{center}

TeX_Eybler_TristesErant_HV123_Include_Text.itex

 \subsection*{Text des \q{Tristes erant Apostoli}: TODO}
 
-\begin{small}
-\nopagebreak
+\begin{lyricstext}
+
 \begin{lyricstable}
 Tristes erant Apostoli   & Trauernd der Apostel Schar   & While the disciples weep the loss \\
 De Christi acerbo funere,& ob Christi herbem Tode war:  & Of Jesus murder'd on the cross \\
@@ -15,5 +15,5 @@ in sempiterna saecula       & in Ewigkeit.                         & \\[0.3em]
 {\footnotesize\em ???}   & {\footnotesize\em (Reinhold Kainhofer)} & {\footnotesize\em(TODO)}
 \end{lyricstable}
 
-\end{small}
+\end{lyricstext}