From f5086b2b000d5ae0b8b3eb9f618d4515af8966d8 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Thu, 16 Aug 2012 02:28:35 +0200
Subject: [PATCH] Update to new orchestrallily code
---
Makefile | 20 ++++++++++--
Schubert_StabatMater_D383_Instrument_A.ly | 2 +-
Schubert_StabatMater_D383_Instrument_B.ly | 2 +-
Schubert_StabatMater_D383_Instrument_BSolo.ly | 2 +-
Schubert_StabatMater_D383_Instrument_CFag.ly | 2 +-
Schubert_StabatMater_D383_Instrument_CorI.ly | 2 +-
Schubert_StabatMater_D383_Instrument_CorII.ly | 2 +-
Schubert_StabatMater_D383_Instrument_FagI.ly | 2 +-
Schubert_StabatMater_D383_Instrument_FagII.ly | 2 +-
Schubert_StabatMater_D383_Instrument_FlI.ly | 2 +-
Schubert_StabatMater_D383_Instrument_FlII.ly | 2 +-
Schubert_StabatMater_D383_Instrument_ObI.ly | 2 +-
Schubert_StabatMater_D383_Instrument_ObII.ly | 2 +-
Schubert_StabatMater_D383_Instrument_S.ly | 2 +-
Schubert_StabatMater_D383_Instrument_SSolo.ly | 2 +-
Schubert_StabatMater_D383_Instrument_T.ly | 2 +-
Schubert_StabatMater_D383_Instrument_TSolo.ly | 2 +-
Schubert_StabatMater_D383_Instrument_TrbI.ly | 2 +-
Schubert_StabatMater_D383_Instrument_TrbII.ly | 2 +-
...bert_StabatMater_D383_Instrument_TrbIII.ly | 2 +-
...abatMater_D383_Instrument_TrbI_AltoClef.ly | 2 +-
Schubert_StabatMater_D383_Instrument_VI.ly | 2 +-
Schubert_StabatMater_D383_Instrument_VII.ly | 2 +-
Schubert_StabatMater_D383_Instrument_Va.ly | 2 +-
Schubert_StabatMater_D383_Instrument_VcB.ly | 2 +-
Schubert_StabatMater_D383_Score_Choral.ly | 2 +-
Schubert_StabatMater_D383_Score_Full.ly | 5 +--
Schubert_StabatMater_D383_Score_Long.ly | 4 +--
Schubert_StabatMater_D383_Score_Original.ly | 2 +-
Schubert_StabatMater_D383_Score_SoloChoral.ly | 2 +-
Schubert_StabatMater_D383_Score_Vocal.ly | 2 +-
...rt_StabatMater_D383_Settings_FullScore.ily | 2 ++
Schubert_StabatMater_D383_Settings_Global.ily | 31 +++++++++----------
...Schubert_StabatMater_D383_Score_Choral.tex | 3 +-
TeX_Schubert_StabatMater_D383_Score_Full.tex | 3 +-
...ert_StabatMater_D383_Score_Instruments.tex | 3 +-
TeX_Schubert_StabatMater_D383_Score_Long.tex | 3 +-
...hubert_StabatMater_D383_Score_Original.tex | 3 +-
...bert_StabatMater_D383_Score_SoloChoral.tex | 3 +-
TeX_Schubert_StabatMater_D383_Score_Vocal.tex | 3 +-
.../Schubert_StabatMater_D383_00b_Material.ly | 2 +-
...ubert_StabatMater_D383_Settings.itex.patch | 2 +-
42 files changed, 75 insertions(+), 68 deletions(-)
diff --git a/Makefile b/Makefile
index f5ab3b8..6deb693 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,12 @@ all: $(OUT) $(instruments) $(scores) tex
instruments: $(instruments)
scores: $(scores)
-clean:
+clean:
rm -rf $(OUT)
-$(OUT) :
+lily: $(pdfs) $(additionalscores)
+
+$(OUT) :
mkdir -p $(OUT)
$(instruments): % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
@@ -34,4 +36,16 @@ tex: latex
latex: $(texpdfs)
$(OUT)/TeX_%.pdf : TeX_%.tex
- TEXINPUTS=$(OUT): latex --output-directory=$(OUT)/ $<
+ TEXINPUTS=$(OUT):orchestrallily/:.//: pdflatex -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 "0002 - Schubert - Stabat Mater D383.def" $(distfiles)
diff --git a/Schubert_StabatMater_D383_Instrument_A.ly b/Schubert_StabatMater_D383_Instrument_A.ly
index 8b370dc..df59f1e 100644
--- a/Schubert_StabatMater_D383_Instrument_A.ly
+++ b/Schubert_StabatMater_D383_Instrument_A.ly
@@ -3,7 +3,7 @@
\header {
instrument = \AInstrumentName
- scorenumber = \markup{\scoreNumber \ANumber}
+ instrumentnr = \ANumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_B.ly b/Schubert_StabatMater_D383_Instrument_B.ly
index fdde1f6..7a8f292 100644
--- a/Schubert_StabatMater_D383_Instrument_B.ly
+++ b/Schubert_StabatMater_D383_Instrument_B.ly
@@ -3,7 +3,7 @@
\header {
instrument = \BInstrumentName
- scorenumber = \markup{\scoreNumber \BNumber}
+ instrumentnr = \BNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_BSolo.ly b/Schubert_StabatMater_D383_Instrument_BSolo.ly
index 68fa8d7..e7a8b43 100644
--- a/Schubert_StabatMater_D383_Instrument_BSolo.ly
+++ b/Schubert_StabatMater_D383_Instrument_BSolo.ly
@@ -3,7 +3,7 @@
\header {
instrument = \BSoloInstrumentName
- scorenumber = \markup{\scoreNumber \BSoloNumber}
+ instrumentnr = \BSoloNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_CFag.ly b/Schubert_StabatMater_D383_Instrument_CFag.ly
index 4b7a0d8..ffefbaf 100644
--- a/Schubert_StabatMater_D383_Instrument_CFag.ly
+++ b/Schubert_StabatMater_D383_Instrument_CFag.ly
@@ -3,7 +3,7 @@
\header {
instrument = \CFagInstrumentName
- scorenumber = \markup{\scoreNumber \CFagNumber}
+ instrumentnr = \CFagNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_CorI.ly b/Schubert_StabatMater_D383_Instrument_CorI.ly
index bf9480a..8a94bc7 100644
--- a/Schubert_StabatMater_D383_Instrument_CorI.ly
+++ b/Schubert_StabatMater_D383_Instrument_CorI.ly
@@ -3,7 +3,7 @@
\header {
instrument = \CorIInstrumentName
- scorenumber = \markup{\scoreNumber \CorINumber}
+ instrumentnr = \CorINumber
}
% we need the instrument name, because corni are transposing instruments and
% the instrument name contains the base pitch!
diff --git a/Schubert_StabatMater_D383_Instrument_CorII.ly b/Schubert_StabatMater_D383_Instrument_CorII.ly
index afe51a3..b4f8229 100644
--- a/Schubert_StabatMater_D383_Instrument_CorII.ly
+++ b/Schubert_StabatMater_D383_Instrument_CorII.ly
@@ -3,7 +3,7 @@
\header {
instrument = \CorIIInstrumentName
- scorenumber = \markup{\scoreNumber \CorIINumber}
+ instrumentnr = \CorIINumber
}
% we need the instrument name, because corni are transposing instruments and
% the instrument name contains the base pitch!
diff --git a/Schubert_StabatMater_D383_Instrument_FagI.ly b/Schubert_StabatMater_D383_Instrument_FagI.ly
index 76f6326..2838bda 100644
--- a/Schubert_StabatMater_D383_Instrument_FagI.ly
+++ b/Schubert_StabatMater_D383_Instrument_FagI.ly
@@ -3,7 +3,7 @@
\header {
instrument = \FagIInstrumentName
- scorenumber = \markup{\scoreNumber \FagINumber}
+ instrumentnr = \FagINumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_FagII.ly b/Schubert_StabatMater_D383_Instrument_FagII.ly
index 87b0e7b..0ca19a3 100644
--- a/Schubert_StabatMater_D383_Instrument_FagII.ly
+++ b/Schubert_StabatMater_D383_Instrument_FagII.ly
@@ -3,7 +3,7 @@
\header {
instrument = \FagIIInstrumentName
- scorenumber = \markup{\scoreNumber \FagIINumber}
+ instrumentnr = \FagIINumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_FlI.ly b/Schubert_StabatMater_D383_Instrument_FlI.ly
index f0c54a4..3df54dd 100644
--- a/Schubert_StabatMater_D383_Instrument_FlI.ly
+++ b/Schubert_StabatMater_D383_Instrument_FlI.ly
@@ -3,7 +3,7 @@
\header {
instrument = \FlIInstrumentName
- scorenumber = \markup{\scoreNumber \FlINumber}
+ instrumentnr = \FlINumber
}
\paper {
ragged-last-bottom = ##f
diff --git a/Schubert_StabatMater_D383_Instrument_FlII.ly b/Schubert_StabatMater_D383_Instrument_FlII.ly
index b833c35..a76a280 100644
--- a/Schubert_StabatMater_D383_Instrument_FlII.ly
+++ b/Schubert_StabatMater_D383_Instrument_FlII.ly
@@ -3,7 +3,7 @@
\header {
instrument = \FlIIInstrumentName
- scorenumber = \markup{\scoreNumber \FlIINumber}
+ instrumentnr = \FlIINumber
}
\paper {
ragged-last-bottom = ##f
diff --git a/Schubert_StabatMater_D383_Instrument_ObI.ly b/Schubert_StabatMater_D383_Instrument_ObI.ly
index 0cef78a..38b2e4d 100644
--- a/Schubert_StabatMater_D383_Instrument_ObI.ly
+++ b/Schubert_StabatMater_D383_Instrument_ObI.ly
@@ -3,7 +3,7 @@
\header {
instrument = \ObIInstrumentName
- scorenumber = \markup{\scoreNumber \ObINumber}
+ instrumentnr = \ObINumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_ObII.ly b/Schubert_StabatMater_D383_Instrument_ObII.ly
index 6df13b0..c10b6d9 100644
--- a/Schubert_StabatMater_D383_Instrument_ObII.ly
+++ b/Schubert_StabatMater_D383_Instrument_ObII.ly
@@ -3,7 +3,7 @@
\header {
instrument = \ObIIInstrumentName
- scorenumber = \markup{\scoreNumber \ObIINumber}
+ instrumentnr = \ObIINumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_S.ly b/Schubert_StabatMater_D383_Instrument_S.ly
index f94fed8..d810ff9 100644
--- a/Schubert_StabatMater_D383_Instrument_S.ly
+++ b/Schubert_StabatMater_D383_Instrument_S.ly
@@ -3,7 +3,7 @@
\header {
instrument = \SInstrumentName
- scorenumber = \markup{\scoreNumber \SNumber}
+ instrumentnr = \SNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_SSolo.ly b/Schubert_StabatMater_D383_Instrument_SSolo.ly
index e344670..d0af845 100644
--- a/Schubert_StabatMater_D383_Instrument_SSolo.ly
+++ b/Schubert_StabatMater_D383_Instrument_SSolo.ly
@@ -3,7 +3,7 @@
\header {
instrument = \SSoloInstrumentName
- scorenumber = \markup{\scoreNumber \SSoloNumber}
+ instrumentnr = \SSoloNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_T.ly b/Schubert_StabatMater_D383_Instrument_T.ly
index 9e49ba7..ba0e11a 100644
--- a/Schubert_StabatMater_D383_Instrument_T.ly
+++ b/Schubert_StabatMater_D383_Instrument_T.ly
@@ -3,7 +3,7 @@
\header {
instrument = \TInstrumentName
- scorenumber = \markup{\scoreNumber \TNumber}
+ instrumentnr = \TNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_TSolo.ly b/Schubert_StabatMater_D383_Instrument_TSolo.ly
index 142e792..9962e1a 100644
--- a/Schubert_StabatMater_D383_Instrument_TSolo.ly
+++ b/Schubert_StabatMater_D383_Instrument_TSolo.ly
@@ -3,7 +3,7 @@
\header {
instrument = \TSoloInstrumentName
- scorenumber = \markup{\scoreNumber \TSoloNumber}
+ instrumentnr = \TSoloNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_TrbI.ly b/Schubert_StabatMater_D383_Instrument_TrbI.ly
index 0806657..965bacf 100644
--- a/Schubert_StabatMater_D383_Instrument_TrbI.ly
+++ b/Schubert_StabatMater_D383_Instrument_TrbI.ly
@@ -3,7 +3,7 @@
\header {
instrument = \TrbIInstrumentName
- scorenumber = \markup{\scoreNumber \TrbINumber}
+ instrumentnr = \TrbINumber
}
\markup\commentsInstrMarkupShort
diff --git a/Schubert_StabatMater_D383_Instrument_TrbII.ly b/Schubert_StabatMater_D383_Instrument_TrbII.ly
index 978f7a7..bf9e769 100644
--- a/Schubert_StabatMater_D383_Instrument_TrbII.ly
+++ b/Schubert_StabatMater_D383_Instrument_TrbII.ly
@@ -3,7 +3,7 @@
\header {
instrument = \TrbIIInstrumentName
- scorenumber = \markup{\scoreNumber \TrbIINumber}
+ instrumentnr = \TrbIINumber
}
\markup\commentsInstrMarkupShort
diff --git a/Schubert_StabatMater_D383_Instrument_TrbIII.ly b/Schubert_StabatMater_D383_Instrument_TrbIII.ly
index 6389909..d6d8598 100644
--- a/Schubert_StabatMater_D383_Instrument_TrbIII.ly
+++ b/Schubert_StabatMater_D383_Instrument_TrbIII.ly
@@ -3,7 +3,7 @@
\header {
instrument = \TrbIIIInstrumentName
- scorenumber = \markup{\scoreNumber \TrbIIINumber}
+ instrumentnr = \TrbIIINumber
}
\markup\commentsInstrMarkupShort
diff --git a/Schubert_StabatMater_D383_Instrument_TrbI_AltoClef.ly b/Schubert_StabatMater_D383_Instrument_TrbI_AltoClef.ly
index db0946e..ebfe123 100644
--- a/Schubert_StabatMater_D383_Instrument_TrbI_AltoClef.ly
+++ b/Schubert_StabatMater_D383_Instrument_TrbI_AltoClef.ly
@@ -4,7 +4,7 @@
\header {
instrument = \TrbIInstrumentName
- scorenumber = \markup{\scoreNumber \TrbINumber}
+ instrumentnr = \TrbINumber
}
\markup\commentsInstrMarkupShort
diff --git a/Schubert_StabatMater_D383_Instrument_VI.ly b/Schubert_StabatMater_D383_Instrument_VI.ly
index 5b172dc..52d217b 100644
--- a/Schubert_StabatMater_D383_Instrument_VI.ly
+++ b/Schubert_StabatMater_D383_Instrument_VI.ly
@@ -3,7 +3,7 @@
\header {
instrument = \VIInstrumentName
- scorenumber = \markup{\scoreNumber \VINumber}
+ instrumentnr = \VINumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_VII.ly b/Schubert_StabatMater_D383_Instrument_VII.ly
index 14db55f..d505b3b 100644
--- a/Schubert_StabatMater_D383_Instrument_VII.ly
+++ b/Schubert_StabatMater_D383_Instrument_VII.ly
@@ -3,7 +3,7 @@
\header {
instrument = \VIIInstrumentName
- scorenumber = \markup{\scoreNumber \VIINumber}
+ instrumentnr = \VIINumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_Va.ly b/Schubert_StabatMater_D383_Instrument_Va.ly
index 334d073..77e4c10 100644
--- a/Schubert_StabatMater_D383_Instrument_Va.ly
+++ b/Schubert_StabatMater_D383_Instrument_Va.ly
@@ -3,7 +3,7 @@
\header {
instrument = \VaInstrumentName
- scorenumber = \markup{\scoreNumber \VaNumber}
+ instrumentnr = \VaNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Instrument_VcB.ly b/Schubert_StabatMater_D383_Instrument_VcB.ly
index 2bb5d7f..33c8f6d 100644
--- a/Schubert_StabatMater_D383_Instrument_VcB.ly
+++ b/Schubert_StabatMater_D383_Instrument_VcB.ly
@@ -3,7 +3,7 @@
\header {
instrument = \VcBInstrumentName
- scorenumber = \markup{\scoreNumber \VcBNumber}
+ instrumentnr = \VcBNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Score_Choral.ly b/Schubert_StabatMater_D383_Score_Choral.ly
index 272fe53..1fb63f9 100644
--- a/Schubert_StabatMater_D383_Score_Choral.ly
+++ b/Schubert_StabatMater_D383_Score_Choral.ly
@@ -5,7 +5,7 @@
\header {
scoretype = \ChoralScoreTitle
- scorenumber = \markup{\scoreNumber \ChoralScoreNumber}
+ instrumentnr = \ChoralScoreNumber
}
% This breaks with "Nr.5", where we define the staff manually!
% SShortInstrumentName = ""
diff --git a/Schubert_StabatMater_D383_Score_Full.ly b/Schubert_StabatMater_D383_Score_Full.ly
index 4c4a612..db9a968 100644
--- a/Schubert_StabatMater_D383_Score_Full.ly
+++ b/Schubert_StabatMater_D383_Score_Full.ly
@@ -1,11 +1,12 @@
\version "2.13.4"
\include "Schubert_StabatMater_D383_Settings_FullScore.ily"
-\setCreateMIDI ##t
+\setCreateMIDI ##f
\setCreatePDF ##t
+% #(set-global-staff-size 16)
\header {
scoretype = \FullScoreTitle
- scorenumber = \markup{\scoreNumber \FullScoreNumber}
+ instrumentnr = \FullScoreNumber
}
\markup \commentsInstrMarkup
diff --git a/Schubert_StabatMater_D383_Score_Long.ly b/Schubert_StabatMater_D383_Score_Long.ly
index b93c67c..b4630b8 100644
--- a/Schubert_StabatMater_D383_Score_Long.ly
+++ b/Schubert_StabatMater_D383_Score_Long.ly
@@ -6,10 +6,10 @@
\header {
scoretype = \LongScoreTitle
- scorenumber = \markup{\scoreNumber \LongScoreNumber}
+ instrumentnr = \LongScoreNumber
}
-\markup \commentsInstrMarkup
+% \markup \commentsInstrMarkup
\createNoCuesScore #"IChor" #'("LongScore")
\createNoCuesScore #"IIArie" #'("LongScore")
\createNoCuesScore #"IIIChor" #'("LongScore")
diff --git a/Schubert_StabatMater_D383_Score_Original.ly b/Schubert_StabatMater_D383_Score_Original.ly
index 8d59acf..82cb761 100644
--- a/Schubert_StabatMater_D383_Score_Original.ly
+++ b/Schubert_StabatMater_D383_Score_Original.ly
@@ -5,7 +5,7 @@
\header {
scoretype = \OriginalScoreTitle
- scorenumber = \markup{\scoreNumber \OriginalScoreNumber}
+ instrumentnr = \OriginalScoreNumber
}
\createScore #"IChor" #'("OriginalScore")
diff --git a/Schubert_StabatMater_D383_Score_SoloChoral.ly b/Schubert_StabatMater_D383_Score_SoloChoral.ly
index fe47445..e6ebb75 100644
--- a/Schubert_StabatMater_D383_Score_SoloChoral.ly
+++ b/Schubert_StabatMater_D383_Score_SoloChoral.ly
@@ -5,7 +5,7 @@
\header {
scoretype = \SoloChoralScoreTitle
- scorenumber = \markup{\scoreNumber \SoloChoralScoreNumber}
+ instrumentnr = \SoloChoralScoreNumber
}
% Don't remove empty staves, except in "Nr.10 Terzett" in SSolo and BSolo
diff --git a/Schubert_StabatMater_D383_Score_Vocal.ly b/Schubert_StabatMater_D383_Score_Vocal.ly
index 6bdb381..22881fd 100644
--- a/Schubert_StabatMater_D383_Score_Vocal.ly
+++ b/Schubert_StabatMater_D383_Score_Vocal.ly
@@ -5,7 +5,7 @@
\header {
scoretype = \VocalScoreTitle
- scorenumber = \markup{\scoreNumber \VocalScoreNumber}
+ instrumentnr = \VocalScoreNumber
}
\createScore #"IChor" #'("VocalScore")
diff --git a/Schubert_StabatMater_D383_Settings_FullScore.ily b/Schubert_StabatMater_D383_Settings_FullScore.ily
index c65d494..e632b51 100644
--- a/Schubert_StabatMater_D383_Settings_FullScore.ily
+++ b/Schubert_StabatMater_D383_Settings_FullScore.ily
@@ -1,2 +1,4 @@
\include "orchestrallily/oly_settings_fullscore.ily"
\include "Schubert_StabatMater_D383_Settings.ily"
+#(set-global-staff-size 15)
+
diff --git a/Schubert_StabatMater_D383_Settings_Global.ily b/Schubert_StabatMater_D383_Settings_Global.ily
index 8d43af3..a1f0683 100644
--- a/Schubert_StabatMater_D383_Settings_Global.ily
+++ b/Schubert_StabatMater_D383_Settings_Global.ily
@@ -1,21 +1,17 @@
\version "2.13.4"
-\include "orchestrallily/orchestrallily.ily"
-\include "orchestrallily/oly_settings_names.ily"
-
-scorenumber="EK-0002"
-
-\header {
+\header {
title = "Stabat Mater, D 383"
subtitle = "\"Jesus Christus schwebt am Kreuze\", D 383"
composer = "Franz Schubert (1797-1828)"
+ shortcomposer = "F. Schubert"
poet = "Friedrich G. Klopstock (1724-1803)"
enteredby = "Reinhold Kainhofer"
lastupdated = "September 2009"
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."}
+ \line { "© 2010, " \concat{\with-url #"http://www.edition-kainhofer.com/" {"Edition Kainhofer, Vienna"},} \concat{\fromproperty #'header:scorenumber .} "Alle Rechte vorbehalten / All rights reserved / Printed in Austria."}
}
+ scorenumberbase="EK-0002"
}
#(oly:modify_score_structure '("Trb" "GrandStaff" ("TrbA" "TrbIII")))
@@ -42,7 +38,7 @@ scorenumber="EK-0002"
% ("CorLong" "GrandStaff" ("CorI" "CorII"))
% ("TrLong" "GrandStaff" ("TrI" "TrII" "TrIII"))
% ("BrLong" "StaffGroup" ("CorLong" "TrLong"))
-% ; Strings, they are the same in long and short full score
+% ; Strings, they are the same in long and short full score
% ("V" "GrandStaff" ("VI" "VII"))
% ("Str" "StaffGroup" ("V" "Va"))
% ("VceB" "StaffGroup" ("VcB"))
@@ -64,9 +60,9 @@ Für die Versetzungszeichen wurde der \"modern\"-Stil von Lilypond benutzt, wobe
Schubert schreibt Akzente und Decresceni sehr ähnlich, wobei Akzente auch als Decrescendi zu verstehen sind und nicht als kurzer Akzent auszuführen sind. Längere Akzente/Decrescendi, die sich auf mehrere Noten beziehen, werden in dieser Ausgabe auch als Decrescendi notiert, kurze Decrescendi über eine einzige Note jedoch als Akzent."
-commentsInstrMarkup = \markup { \fill-line {
+commentsInstrMarkup = \markup { \fill-line {
\justify-string #"Schubert notiert Akzente und Decrescendi meist sehr ähnlich, sie haben für ihn auch ähnliche Bedeutung: Betonung mit nachfolgendem (langsamen oder manchmal auch schnellem) Decrescendo, welches auch über mehrere Noten gehen kann. Warnakzidentien werden in dieser Ausgabe nur im folgenden Takt (und in Klammern) angegeben." } }
-commentsInstrMarkupShort = \markup { \fill-line {
+commentsInstrMarkupShort = \markup { \fill-line {
\justify-string #"Bemerkung: Akzent = Betonung mit langsamen Decrescendo (evt. über mehrere Noten)." } }
@@ -79,12 +75,13 @@ CorIIKey = \CorKey
%%% Clef definitions, either old-style (using the Breitkopf style) or new style
-TrClef = \newOrOldClef #"tenor" #"alto"
-TrIClef = \TrClef
-TrIIClef = \TrClef
-SClef = \newOrOldClef #"treble" #"soprano"
-AClef = \newOrOldClef #"treble" #"alto"
-TClef = \newOrOldClef #"treble_8" #"tenor"
+TrbClef = \clef #"alto/tenor" #"alto"
+TrbAClef = \TrbClef
+TrbIClef = \TrbClef
+TrbIIClef = \TrbClef
+SClef = \clef "soprano/treble"
+AClef = \clef "alto/treble"
+TClef = \clef "tenor/treble_8"
SSoloClef = \SClef
TSoloClef = \TClef
diff --git a/TeX_Schubert_StabatMater_D383_Score_Choral.tex b/TeX_Schubert_StabatMater_D383_Score_Choral.tex
index 2be10aa..a924247 100644
--- a/TeX_Schubert_StabatMater_D383_Score_Choral.tex
+++ b/TeX_Schubert_StabatMater_D383_Score_Choral.tex
@@ -1,5 +1,5 @@
\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[choralscore]{editionkainhofer}
\input{TeX_Schubert_StabatMater_D383_Settings.itex}
\hypersetup{
@@ -8,7 +8,6 @@
\scoretype{\ChoralScoreType}
\scorenumber{\scoreNumber\ChoralScoreNumber}
-\ChoralScoreSettings
\begin{document}
\input{TeX_Schubert_StabatMater_D383_Include_Coverpage.itex}
diff --git a/TeX_Schubert_StabatMater_D383_Score_Full.tex b/TeX_Schubert_StabatMater_D383_Score_Full.tex
index 1b4ec21..03509e4 100644
--- a/TeX_Schubert_StabatMater_D383_Score_Full.tex
+++ b/TeX_Schubert_StabatMater_D383_Score_Full.tex
@@ -1,5 +1,5 @@
\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[fullscore]{editionkainhofer}
\input{TeX_Schubert_StabatMater_D383_Settings.itex}
\hypersetup{
@@ -8,7 +8,6 @@
\scoretype{\FullScoreType}
\scorenumber{\scoreNumber\FullScoreNumber}
-\FullScoreSettings
\begin{document}
\input{TeX_Schubert_StabatMater_D383_Include_Coverpage.itex}
diff --git a/TeX_Schubert_StabatMater_D383_Score_Instruments.tex b/TeX_Schubert_StabatMater_D383_Score_Instruments.tex
index 789d09a..e1ba611 100644
--- a/TeX_Schubert_StabatMater_D383_Score_Instruments.tex
+++ b/TeX_Schubert_StabatMater_D383_Score_Instruments.tex
@@ -1,5 +1,5 @@
\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[instrumentalparts]{editionkainhofer}
\input{TeX_Schubert_StabatMater_D383_Settings.itex}
\hypersetup{
@@ -8,7 +8,6 @@
\scoretype{\InstrumentalPartsType}
\scorenumber{\scoreNumber\InstrumentalPartsNumber}
-\InstrumentalPartsSettings
\begin{document}
\input{TeX_Schubert_StabatMater_D383_Include_Coverpage.itex}
diff --git a/TeX_Schubert_StabatMater_D383_Score_Long.tex b/TeX_Schubert_StabatMater_D383_Score_Long.tex
index 0cd0f76..c1b3b87 100644
--- a/TeX_Schubert_StabatMater_D383_Score_Long.tex
+++ b/TeX_Schubert_StabatMater_D383_Score_Long.tex
@@ -1,5 +1,5 @@
\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[fullscore]{editionkainhofer}
\input{TeX_Schubert_StabatMater_D383_Settings.itex}
\hypersetup{
@@ -8,7 +8,6 @@
\scoretype{\LongScoreType}
\scorenumber{\scoreNumber\LongScoreNumber}
-\LongScoreSettings
\begin{document}
\input{TeX_Schubert_StabatMater_D383_Include_Coverpage.itex}
diff --git a/TeX_Schubert_StabatMater_D383_Score_Original.tex b/TeX_Schubert_StabatMater_D383_Score_Original.tex
index 58741ab..30bddd2 100644
--- a/TeX_Schubert_StabatMater_D383_Score_Original.tex
+++ b/TeX_Schubert_StabatMater_D383_Score_Original.tex
@@ -1,5 +1,5 @@
\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[fullscore]{editionkainhofer}
\input{TeX_Schubert_StabatMater_D383_Settings.itex}
\hypersetup{
@@ -8,7 +8,6 @@
\scoretype{\OriginalScoreType}
\scorenumber{\scoreNumber\OriginalScoreNumber}
-\OriginalScoreSettings
\begin{document}
\input{TeX_Schubert_StabatMater_D383_Include_Coverpage.itex}
diff --git a/TeX_Schubert_StabatMater_D383_Score_SoloChoral.tex b/TeX_Schubert_StabatMater_D383_Score_SoloChoral.tex
index ee5e22c..ffeaffa 100644
--- a/TeX_Schubert_StabatMater_D383_Score_SoloChoral.tex
+++ b/TeX_Schubert_StabatMater_D383_Score_SoloChoral.tex
@@ -1,5 +1,5 @@
\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[choralscore]{editionkainhofer}
\input{TeX_Schubert_StabatMater_D383_Settings.itex}
\hypersetup{
@@ -8,7 +8,6 @@
\scoretype{\SoloChoralScoreType}
\scorenumber{\scoreNumber\SoloChoralScoreNumber}
-\SoloChoralScoreSettings
\begin{document}
\input{TeX_Schubert_StabatMater_D383_Include_Coverpage.itex}
diff --git a/TeX_Schubert_StabatMater_D383_Score_Vocal.tex b/TeX_Schubert_StabatMater_D383_Score_Vocal.tex
index 09c7bfc..db7d00f 100644
--- a/TeX_Schubert_StabatMater_D383_Score_Vocal.tex
+++ b/TeX_Schubert_StabatMater_D383_Score_Vocal.tex
@@ -1,5 +1,5 @@
\documentclass[a4paper,10pt,naustrian,twoside]{report}
-\usepackage{orchestrallily/editionkainhofer}
+\usepackage[vocalscore]{editionkainhofer}
\input{TeX_Schubert_StabatMater_D383_Settings.itex}
\hypersetup{
@@ -8,7 +8,6 @@
\scoretype{\VocalScoreType}
\scorenumber{\scoreNumber\VocalScoreNumber}
-\VocalScoreSettings
\begin{document}
\input{TeX_Schubert_StabatMater_D383_Include_Coverpage.itex}
diff --git a/Vorwort_Lilypond_Alt/Schubert_StabatMater_D383_00b_Material.ly b/Vorwort_Lilypond_Alt/Schubert_StabatMater_D383_00b_Material.ly
index 283457e..ae88da4 100644
--- a/Vorwort_Lilypond_Alt/Schubert_StabatMater_D383_00b_Material.ly
+++ b/Vorwort_Lilypond_Alt/Schubert_StabatMater_D383_00b_Material.ly
@@ -23,7 +23,7 @@
Violino I \concat{(\scoreNumber \VINumber), }
Violino II \concat{(\scoreNumber \VIINumber),}
Viola \concat{(\scoreNumber \VaNumber),}
- Violoncello / Contrabbasso \concat{(\scoreNumber \VcBNumber), }
+ Violoncello / Contrabasso \concat{(\scoreNumber \VcBNumber), }
Flauto I \concat{(\scoreNumber \FlINumber),}
Flauto II \concat{(\scoreNumber \FlIINumber),}
Oboe I \concat{(\scoreNumber \ObINumber),}
diff --git a/patches/TeX_Schubert_StabatMater_D383_Settings.itex.patch b/patches/TeX_Schubert_StabatMater_D383_Settings.itex.patch
index 370e873..881a0fb 100644
--- a/patches/TeX_Schubert_StabatMater_D383_Settings.itex.patch
+++ b/patches/TeX_Schubert_StabatMater_D383_Settings.itex.patch
@@ -19,7 +19,7 @@
+\description{Coro (SATB), Soli (STB) ed Orchestra}
+\instrumentation{2 Flauti, 2 Oboi, 2 Fagotti, Contrafagotto,\\
+3 Tromboni, 2 Corni,\\
-+2 Violini, Viola, Violoncello ed Contrabbasso}
++2 Violini, Viola, Violoncello ed Contrabasso}
\editor{Reinhold Kainhofer}
\publisher{Edition Kainhofer, Vienna}
\year{2009}
--
GitLab