Final fixes, update to new template

Makefile

@@ -2,20 +2,23 @@ OUT=out
 
 base = Schubert_StabatMater_D175
 SRCS = $(base)_Music_StabatMater.ily $(base)_Settings_Global.ily $(base)_Settings.ily $(base)_Settings_VocalScore.ily $(base)_Settings_ChoralScore.ily $(base)_Settings_VocalVoice.ily $(base)_Settings_FullScore.ily $(base)_Settings_Instrument.ily
-instruments = ObI ObII ClI ClII FagI FagII TrbI TrbII TrbIII VI VII Va S A T B Continuo VcB
+instruments = ObI ObII ClI ClII FagI FagII TrbI TrbII TrbIII VI VII Va Continuo VcB
+# S A T B
 scores = Full Vocal Choral
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
 
 
 texbase = Schubert_StabatMater_D175
-texscores = Full Vocal Choral
+texscores = Full
+# Vocal Choral
 texs = $(texscores:%=TeX_$(texbase)_Score_%.tex)
 texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
+distfiles = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) $(texpdfs)
 
-additionalscores = 
+additionalscores =
 
 .PHONY: all clean
 all: $(OUT) $(instruments) $(scores) $(additionalscores) tex
@@ -51,3 +54,11 @@ latexpdf: $(texpdfs)
 $(OUT)/TeX_%.pdf : TeX_%.tex
 	TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex --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)

Schubert_StabatMater_D175_Instrument_Continuo.ly

@@ -6,5 +6,6 @@
   scorenumber = \markup{\scoreNumber \ContinuoNumber}
 }
 
+StabatMaterBCExtraSettings = { \dynamicUp }
 \createScore #"StabatMater" #'("Continuo")
 

Schubert_StabatMater_D175_Score_Choral.ly

@@ -6,6 +6,30 @@
 \header {
   scoretype = \ChoralScoreTitle
   scorenumber = \markup{\scoreNumber \ChoralScoreNumber}
+  ismn = "979-0-50217-041-7"
+  copyright = \markup \abs-fontsize #9 \column{
+	  \line { 2010, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\fromproperty #'header:scorenumber .} Alle Rechte vorbehalten / All rights reserved. ISMN \fromproperty #'header:ismn }
+  }
 }
+SShortInstrumentName = ""
+AShortInstrumentName = ""
+TShortInstrumentName = ""
+BShortInstrumentName = ""
+\paper {
+	systems-per-page = #4
+	page-count = #4
+% 	ragged-last-bottom = ##t
+}
+\paper {
+  % Allow line-breaks only at rests!
+  #(define page-breaking ly:optimal-breaking)
+}
+#(set-global-staff-size 15)
 
+
+\layout {
+	\context { \Score
+		\override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
+	}
+}
 \createScore #"StabatMater" #'("ChoralScore")

Schubert_StabatMater_D175_Score_Vocal.ly

@@ -7,5 +7,9 @@
   scoretype = \VocalScoreTitle
   scorenumber = \markup{\scoreNumber \VocalScoreNumber}
 }
+SShortInstrumentName = ""
+AShortInstrumentName = ""
+TShortInstrumentName = ""
+BShortInstrumentName = ""
 
 \createScore #"StabatMater" #'("VocalScore")

Schubert_StabatMater_D175_Settings_Global.ily

@@ -6,11 +6,12 @@ scorenumber="EK-0003"
 
 \header {
   title = "Stabat Mater, D 175"
+  titlepagetitle = "Stabat Mater, D 175"
   subtitle = "für Chor, Orchester und Orgel"
+  titlepagesubtitle = "für Chor, Orchester und Orgel"
   composer = "Franz Schubert (1797-1828)"
   copyright = \markup \abs-fontsize #9 \column{
-      \line { 2010, \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 { 2010, \with-url #"http://www.edition-kainhofer.com/" {Edition Kainhofer, Vienna,} \concat{\fromproperty #'header:scorenumber .} Alle Rechte vorbehalten / All rights reserved / Printed in Austria. }
   }
 }
 
@@ -78,9 +79,9 @@ TrbIIIShortInstrumentName = \markup\null
 ContinuoInstrumentName = \markup { \center-column { \line{Violoncello, Basso} \line{ ed Organo}}}
 ContinuoShortInstrumentName = \markup { \center-column { \line{Vc. e B.} \line{Org.}}}
 
-StabatMaterClIInstrumentName = \markup { \center-column { "Clarinetto I" \line{"in Si"{\smaller\flat}"/B"} } }
-StabatMaterClIIInstrumentName = \markup { \center-column { "Clarinetto II" \line{"in Si"{\smaller\flat}"/B"} } }
-StabatMaterClInstrumentName = \markup { \center-column { "Clarinetti" \line{"in Si"{\smaller\flat}"/B"} } }
+ClIInstrumentName = \markup { \center-column { "Clarinetto I" \line{"in Si"{\smaller\flat}"/B"} } }
+ClIIInstrumentName = \markup { \center-column { "Clarinetto II" \line{"in Si"{\smaller\flat}"/B"} } }
+ClInstrumentName = \markup { \center-column { "Clarinetti" \line{"in Si"{\smaller\flat}"/B"} } }
 
 FagExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }
 SExtraSettings = \notemode { \override Staff.VerticalAxisGroup #'remove-empty = ##f }

TeX_Schubert_StabatMater_D175_Include_ContentsMaterial.itex

-\begin{center}
-
-\begin{minipage}{0.5\textwidth}
-\tableofcontents
-\end{minipage}
-\end{center}
-
-
-\vfill
-
-\begin{center}
-
-\scorelistbox{
-Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
-
-\FullScoreName{} (-\FullScoreNumber),
-% \OrganScoreName{} (-\OrganScoreNumber),
-\ChoralScoreName{} (-\ChoralScoreNumber);
-
-\SName{} (-\SNumber),
-\AName{} (-\ANumber),
-\TName{} (-\TNumber),
-\BName{} (-\BNumber);
-
-\InstrumentsName{} (-\InstrumentsNumber),
-\ContinuoName{} (-\ContinuoNumber),
-
-\VIName{} (-\VINumber),
-\VIIName{} (-\VIINumber),
-\VaName{} (-\VaNumber),
-\VcBName{} (-\VcBNumber),
-
-\ObIName{} (-\ObINumber),
-\ObIIName{} (-\ObIINumber),
-\ClIName{} (-\ClINumber),
-\ClIIName{} (-\ClIINumber),
-\FagIName{} (-\FagINumber),
-\FagIIName{} (-\FagIINumber),
-\TrbIName{} (-\TrbINumber),
-\TrbIIName{} (-\TrbIINumber),
-\TrbIIIName{} (-\TrbIIINumber).
-}
-\end{center}
-
+\input{TeX_Schubert_StabatMater_D175_Include_TOC.itex}
+\input{TeX_Schubert_StabatMater_D175_Include_Material.itex}
 \vfill
 \input{TeX_Schubert_StabatMater_D175_Include_Text.itex}
-
-
 \vfill
-\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
-\begin{hauptquellen}
-\item Autographe Partitur, Wiener Stadt- und Landesbibliothek, Signatur: MH 15. 
-Faksimile online abrufbar unter \url{http://www.schubert-online.at/}.
-\item Alte Schubert-Ausgabe: {\em Franz Peter Schuberts Werke}. Kritische durchgesehene 
-Gesamtausgabe, Band XIV. Kleinere Kirchenmusikwerke (Nrs. 1-22); 
-Editor: Eusebius Mandyczewski, Breitkopf \& Härtel, 1884-1897.
-
-\end{hauptquellen}
-
-
+\input{TeX_Schubert_StabatMater_D175_Include_Sources.itex}
 % \vfill
-\makeatletter
-\copyrightbox{© \@year, \@publisher\newline
-1. Auflage / 1st Printing \@year\newline
-Computersatz mit \@software\newline
-Alle Rechte vorbehalten / All rights reserved. Printed in Austria.}
-
-
+\input{TeX_Schubert_StabatMater_D175_Include_Copyrightbox.itex}

TeX_Schubert_StabatMater_D175_Include_Copyrightbox.itex

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

TeX_Schubert_StabatMater_D175_Include_Material.itex

+\begin{center}
+
+\scorelistbox{
+Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
+
+\FullScoreName{} (-\FullScoreNumber),
+% \OrganScoreName{} (-\OrganScoreNumber),
+\ChoralScoreName{} (-\ChoralScoreNumber);
+
+% \SName{} (-\SNumber),
+% \AName{} (-\ANumber),
+% \TName{} (-\TNumber),
+% \BName{} (-\BNumber);
+
+\InstrumentsName{} (-\InstrumentsNumber),
+\ContinuoName{} (-\ContinuoNumber),
+
+\VIName{} (-\VINumber),
+\VIIName{} (-\VIINumber),
+\VaName{} (-\VaNumber),
+\VcBName{} (-\VcBNumber),
+
+\ObIName{} (-\ObINumber),
+\ObIIName{} (-\ObIINumber),
+\ClIName{} (-\ClINumber),
+\ClIIName{} (-\ClIINumber),
+\FagIName{} (-\FagINumber),
+\FagIIName{} (-\FagIINumber),
+\TrbIName{} (-\TrbINumber),
+\TrbIIName{} (-\TrbIINumber),
+\TrbIIIName{} (-\TrbIIINumber).
+}
+\end{center}

TeX_Schubert_StabatMater_D175_Include_Settings.itex

@@ -9,7 +9,7 @@
 \description{für Chor (SATB), Orchester und Orgel}
 \instrumentation{2 Oboi, 2 Clarinetti, 2 Fagotti,\\
 3 Tromboni, 2 Violini, Viola,\\
-Violoncello, Contrabbasso ed Organo}
+Violoncello, Contrabasso ed Organo}
 \editor{Reinhold Kainhofer}
 \publisher{Edition Kainhofer}
 \year{2009}

TeX_Schubert_StabatMater_D175_Include_Sources.itex

+\section*{Hauptquellen der Ausgabe / Main sources of this Edition}
+\begin{hauptquellen}
+\item Autographe Partitur, Wiener Stadt- und Landesbibliothek, Signatur: MH 15. 
+Faksimile online abrufbar unter \url{http://www.schubert-online.at/}.
+\item Alte Schubert-Ausgabe: {\em Franz Peter Schuberts Werke}. Kritische durchgesehene 
+Gesamtausgabe, Band XIV. Kleinere Kirchenmusikwerke (Nrs. 1-22); 
+Editor: Eusebius Mandyczewski, Breitkopf \& Härtel, 1884-1897.
+\end{hauptquellen}

TeX_Schubert_StabatMater_D175_Include_TOC.itex

+\begin{center}
+\begin{minipage}{0.5\textwidth}
+\tableofcontents
+\end{minipage}
+\vfill
+\vfill
+\end{center}

TeX_Schubert_StabatMater_D175_Score_Choral.tex

 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[choralscore,nocolortitle]{editionkainhofer}
+\usepackage[nocolortitle,choralscore]{editionkainhofer}
 \input{TeX_Schubert_StabatMater_D175_Settings.itex}
 
 \hypersetup{
@@ -8,6 +8,7 @@
 
 \scoretype{\ChoralScoreType}
 \scorenumber{\scoreNumber\ChoralScoreNumber}
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Schubert_StabatMater_D175_Include_Coverpage.itex}

TeX_Schubert_StabatMater_D175_Score_Full.tex

 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[fullscore,nocolortitle]{editionkainhofer}
+\usepackage[nocolortitle,fullscore]{editionkainhofer}
 \input{TeX_Schubert_StabatMater_D175_Settings.itex}
 
 \hypersetup{
@@ -8,6 +8,7 @@
 
 \scoretype{\FullScoreType}
 \scorenumber{\scoreNumber\FullScoreNumber}
+\ismn{979-0-50217-040-0}
 
 \begin{document}
 \input{TeX_Schubert_StabatMater_D175_Include_Coverpage.itex}

TeX_Schubert_StabatMater_D175_Score_Instruments.tex

 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[instrumentalparts,nocolortitle]{editionkainhofer}
+\usepackage[nocolortitle,instrumentalparts]{editionkainhofer}
 \input{TeX_Schubert_StabatMater_D175_Settings.itex}
 
 \hypersetup{
     pdftitle={\scoreTitle, \InstrumentalPartsType},
 }
 
+\makeatletter
+\frontpageinstrumentation{\@instrumentation}
+\frontpageeditor{\@editor}
+\makeatother
+
 \scoretype{\InstrumentalPartsType}
 \scorenumber{\scoreNumber\InstrumentalPartsNumber}
+\ismn{979-0-50217-040-0}
+
+\todos{
+\begin{center}
+\null
+\vfill
+\section*{\Huge Inhalt / Contents}
+\begin{Large}
+\ContinuoName\\
+4 $\times$ \VIName\\
+3 $\times$ \VIIName\\
+3 $\times$ \VaName\\
+3 $\times$ \VcBName\\
+
+\ObIName\\
+\ObIIName\\
+\ClIName\\
+\ClIIName\\
+\FagIName\\
+\FagIIName\\
+\TrbIName\\
+\TrbIIName\\
+\TrbIIIName\\
+
+\end{Large}
+\end{center}
+\vfill
+\vfill
+\input{TeX_Schubert_StabatMater_D175_Include_Material.itex}
+\input{TeX_Schubert_StabatMater_D175_Include_Sources.itex}
+\input{TeX_Schubert_StabatMater_D175_Include_Copyrightbox.itex}
+}
+
+\pagestyle{empty}
 
 \begin{document}
-\input{TeX_Schubert_StabatMater_D175_Include_Coverpage.itex}
-\input{TeX_Schubert_StabatMater_D175_Include_Preface_Long.itex}
+\makefrontpage
 
+% Remove the \iffalse if you want all instrumental parts to be included here
+\iftrue
 
+\phantomsection
+\addcontentsline{toc}{section}{\ChoralScoreType}
+\includescore{Score_Choral}
+% \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}{\VIName}
+\includescore{Instrument_VI}
+\phantomsection
+\addcontentsline{toc}{section}{\VIIName}
+\includescore{Instrument_VII}
+\phantomsection
+\addcontentsline{toc}{section}{\VaName}
+\includescore{Instrument_Va}
+\phantomsection
+\addcontentsline{toc}{section}{\VcBName}
+\includescore{Instrument_VcB}
 
 \phantomsection
 \addcontentsline{toc}{section}{\ObIName}
@@ -42,35 +114,23 @@
 \phantomsection
 \addcontentsline{toc}{section}{\TrbIIIName}
 \includescore{Instrument_TrbIII}
-\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
+\fi
+
+\pagebreak
+\pagestyle{empty}
+\thispagestyle{empty}
 
 
+\begin{preface}
+\input{TeX_Schubert_StabatMater_D175_Include_About.itex}
+\input{TeX_Schubert_StabatMater_D175_Include_Bio.itex}
+\input{TeX_Schubert_StabatMater_D175_Include_Text.itex}
+\end{preface}
 
-\input{TeX_Schubert_StabatMater_D175_Include_Backpage.itex}
+\thispagestyle{empty}
+\pagebreak
+\thispagestyle{empty}
+\backpage
 \end{document}

TeX_Schubert_StabatMater_D175_Score_Vocal.tex

 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[vocalscore,nocolortitle]{editionkainhofer}
+\usepackage[nocolortitle,vocalscore]{editionkainhofer}
 \input{TeX_Schubert_StabatMater_D175_Settings.itex}
 
 \hypersetup{
@@ -8,6 +8,7 @@
 
 \scoretype{\VocalScoreType}
 \scorenumber{\scoreNumber\VocalScoreNumber}
+% \ismn{......}
 
 \begin{document}
 \input{TeX_Schubert_StabatMater_D175_Include_Coverpage.itex}