Update to new template

Makefile

@@ -2,7 +2,7 @@ OUT=out
 
 base = Preindl_InTuoNomine
 SRCS = $(base)_Music_InTuoNomine.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 = FlI FlII ObI ObII ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII ASolo S A T B Vc Cb VcB
+instruments = FlI FlII ObI ObII ClI ClII FagI FagII CorI CorII TbeI TbeII Tim VI VII ASolo S A T B VcB Vc Cb
 scores = Long Full Vocal Choral Original
 pdfs = $(instruments:%=$(OUT)/$(base)_Instrument_%.pdf) \
      $(scores:%=$(OUT)/$(base)_Score_%.pdf)
@@ -15,7 +15,7 @@ texpdfs = $(texs:%.tex=$(OUT)/%.pdf) \
      $(OUT)/TeX_$(texbase)_Score_Instruments.pdf
 
 
-additionalscores =
+additionalscores = 
 
 .PHONY: all clean
 all: $(OUT) $(instruments) $(scores) $(additionalscores) tex

Preindl_InTuoNomine_Instrument_FlI.ly

@@ -8,15 +8,3 @@
 
 \createScore #"InTuoNomine" #'("FlI")
 
-\layout {
-  \context {
-    \Score
-    % Force multi-measure rests to be written as one span
-%     \override MultiMeasureRest #'expand-limit = #3
-%     skipBars = ##t
-%     autoBeaming = ##f
-%     \override Hairpin #'to-barline = ##f
-    \override BarNumber #'break-visibility = #'#(#t #t #t)
-  }
-}
-

Preindl_InTuoNomine_Settings_Global.ily

@@ -11,7 +11,7 @@ scorenumber="EK-0058"
   titlepagesubtitle = "Offertorium No.21"
   composer = "Joseph Preindl (1756-1823)"
   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 { 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."}
   }
 }

TeX_Preindl_InTuoNomine_Include_About.itex

-\addcontentsline{toc}{section}{Joseph Preindl}
-%
-% \begin{multicols}{2}\raggedcolumns
-% \prefacesection{Vorwort}
-% TODO
-% \columnbreak
-% \prefacesection{Preface}
-% TODO
-% \end{multicols}
-% \vfill

TeX_Preindl_InTuoNomine_Include_Bio.itex

+\addcontentsline{toc}{section}{Joseph Preindl}
 \chapter*{Joseph Preindl (1756--1823)}
 
 \begin{multicols}{2}

TeX_Preindl_InTuoNomine_Include_ContentsMaterial.itex

@@ -15,10 +15,21 @@
 \scorelistbox{
 Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 
-\LongScoreName{} (-\LongScoreNumber),
-% \FullScoreName{} (-\FullScoreNumber),
+\FullScoreName{} (-\FullScoreNumber),
 % \VocalScoreName{} (-\VocalScoreNumber),
-\ChoralScoreName{} (-\ChoralScoreNumber);
+\SoloChoralScoreName{} (-\SoloChoralScoreNumber);
+
+\ASoloName{} (-\ASoloNumber),
+\SName{} (-\SNumber),
+\AName{} (-\ANumber),
+\TName{} (-\TNumber),
+\BName{} (-\BNumber);
+
+\VIName{} (-\VINumber),
+\VIIName{} (-\VIINumber),
+\VcBName{} (-\VcBNumber),
+\VcName{} (-\VcNumber),
+\CbName{} (-\CbNumber);
 
 \FlIName{} (-\FlINumber),
 \FlIIName{} (-\FlIINumber),
@@ -27,22 +38,13 @@ Zu diesem Werk (\scoreNumber{...}) liegt folgendes Aufführungsmaterial vor:
 \ClIName{} (-\ClINumber),
 \ClIIName{} (-\ClIINumber),
 \FagIName{} (-\FagINumber),
-\FagIIName{} (-\FagIINumber),
+\FagIIName{} (-\FagIINumber);
+
 \CorIName{} (-\CorINumber),
 \CorIIName{} (-\CorIINumber),
 \TbeIName{} (-\TbeINumber),
 \TbeIIName{} (-\TbeIINumber),
 \TimName{} (-\TimNumber),
-\VIName{} (-\VINumber),
-\VIIName{} (-\VIINumber),
-\ASoloName{} (-\ASoloNumber),
-\SName{} (-\SNumber),
-\AName{} (-\ANumber),
-\TName{} (-\TNumber),
-\BName{} (-\BNumber),
-\VcBName{} (-\VcBNumber),
-\VcName{} (-\VcNumber),
-\CbName{} (-\CbNumber).
 
 }
 \end{center}

TeX_Preindl_InTuoNomine_Include_Preface_Long.itex

@@ -7,7 +7,6 @@
 \input{TeX_Preindl_InTuoNomine_Include_About.itex}
 \input{TeX_Preindl_InTuoNomine_Include_Bio.itex}
 \input{TeX_Preindl_InTuoNomine_Include_Text.itex}
-% \pagebreak
 \end{preface}
 
 \mainmatter

TeX_Preindl_InTuoNomine_Score_Choral.tex

 \documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage[vocalscore]{editionkainhofer}
+\usepackage[choralscore]{editionkainhofer}
 \input{TeX_Preindl_InTuoNomine_Settings.itex}
 
 \hypersetup{

TeX_Preindl_InTuoNomine_Score_Full.tex

@@ -11,7 +11,6 @@
 
 \begin{document}
 \input{TeX_Preindl_InTuoNomine_Include_Coverpage.itex}
-% \input{TeX_Preindl_InTuoNomine_Include_Preface_Long.itex}
 \frontmatter
 \maketitle
 

TeX_Preindl_InTuoNomine_Score_Original.tex

@@ -6,7 +6,7 @@
     pdftitle={\scoreTitle, \OriginalScoreType},
 }
 
-\scoretype{\FullScoreType (Original)}
+\scoretype{\OriginalScoreType}
 \scorenumber{\scoreNumber\OriginalScoreNumber}
 
 \begin{document}