First attempts at an organ voice, some other improvements

.gitignore

+Materialien
 *.new
 *.aux
 *.blg

0004 - Mozart - Benedictus sit deus - KV117.def

@@ -11,6 +11,14 @@
     "subtitle": "Offertorium, KV 117",
     "composer": "Wolfgang Amadeus Mozart",
     "composerdate": "1756-1791",
+    "shortcomposer": "Mozart",
+
+    "opus": u"KV 117",
+    #"instrumentation": u"<<instrumentation>>",
+    #"key": u"<<key>>",
+    #"duration": u"<<duration>>",
+    #"composition_year": u"<<composition_year>>",
+    #"genre": u"<<genre>>",
 
     "year": "2010",
     "shortpublisher": "Edition Kainhofer",
@@ -31,7 +39,7 @@
       "Continuo", "VcB"
     ],
     "vocalvoices": ["SSolo", "S", "A", "T", "B"],
-    "noscore_instruments": ["S", "A", "T", "B"],
+    "noscore_instruments": ["S", "A", "T", "B", "SSolo"],
     "scores": ["Full", "Vocal", "Choral"],
   },
 

Makefile

@@ -34,7 +34,7 @@ lily: $(pdfs) $(additionalscores)
 $(OUT) :
 	mkdir -p $(OUT)
 
-$(instruments) SSolo: % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
+$(instruments) SSolo O: % : $(OUT)/$(base)_Instrument_%.pdf $(SRCS)
 $(scores): % : $(OUT)/$(base)_Score_%.pdf $(SRCS)
 
 

Mozart_BenedictusSitDeus_Instrument_O.ly

+\version "2.13.34"
+\include "Mozart_BenedictusSitDeus_Settings_Instrument.ily"
+
+ContinuoInstrumentName = "Organo"
+
+\header {
+  instrument = \ContinuoInstrumentName
+  scorenumber = \markup{\scoreNumber \ContinuoNumber}
+}
+% \createScore #"IAllegro" #'("SoloChoirScore" "RealizedContinuo")
+\createScore #"IAllegro" #'("RealizedContinuo")
+\createScore #"IIAndante" #'("SoloChoirScore" "RealizedContinuo")
+\createScore #"IIIAllegro" #'("SoloChoirScore" "RealizedContinuo")
+% #(set-global-staff-size 19)
+
+% \layout {
+%   \context { \Staff
+%     \override VerticalAxisGroup #'remove-empty = ##f
+%   }
+%   \context { \Score
+%     \override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 32)
+%   }
+% }

Mozart_BenedictusSitDeus_Music_01_Allegro.ily

@@ -664,13 +664,13 @@ IAllegroBCMusic = \relative c' {
 	c8[ c, e g] c[ c,16 d] e8[ e] | % 2
 	f[ g a h] c[ c,16 d] e8[ c] | % 3
 	d4. d8 e4. f8 | % 4
-	g8[ c,] r4 \SClef \senzaVcB << {e''8[ e] e[ d16 e] } \\ {g,8[ g] g[ f16 g] } >> | % 5
+	g8[ c,] r4 \SClef \senzaVcB \twoVoice {e''8[ e] e[ d16 e] } {g,8[ g] g[ f16 g] } | % 5
 	\BClef \conVcB a,8[ a] a[ g16 a] fis8[ fis fis fis] | % 6
 	g8[ g] g[ fis16 g] cis,8[ cis cis cis] | % 7
 	d4 \SClef \senzaVcBstacked d''4 \BClef \conVcB g,,4. f?8 | % 8
 	e8[ d] c[ d16 e] f4. c8 | % 9
 	f8[ f f f] c4 r4 | \barNumberCheck #10
-	\SClef \senzaVcB << { r2 r8 g''4 a8 | h4 h r8 a4 h8 | c8 } \\ { r8 c,4 d8 e4 e | r8 d4 e8 f4 f | e8} >>
+	\SClef \senzaVcB \twoVoice { r2 r8 g''4 a8 | h4 h r8 a4 h8 | c8 } { r8 c,4 d8 e4 e | r8 d4 e8 f4 f | e8^"TODO: r8 or e8???" }
 	\BClef \conVcB a,4 g8 fis4 fis | % 13
 	r8 g4 fis8 e8[ e a, a] | % 14
 	d[ d d d] cis[ cis cis cis] | % 15
@@ -694,7 +694,7 @@ IAllegroBCMusic = \relative c' {
 	\BClef \conVcB f4. e8 d[ c h a] | % 33
 	g8[ a16 h] c8[ c'] fis,[ fis fis fis] | % 34
 	g4 r \SClef \senzaVcB r8 d'4 e8 | % 35
-	<< { r8 a4 h8 c4 c | r8 h4 c8 d } \\ {f,4 f r8 e4 f8 | g4 g r8} >> \BClef \conVcB g,4 f8 | % 37
+	\twoVoice { r8 a4 h8 c4 c | r8 h4 c8 d } {f,4 f r8 e4 f8 | g4 g r8} \BClef \conVcB g,4 f8 | % 37
 	e4 e r8 f4 e8 | % 38
 	d8[ d d d] h[ h h h] | % 39
 	h[ h c c] g'[ g c, c] | \barNumberCheck #40
@@ -748,5 +748,75 @@ IAllegroBCFbMusic = \figuremode { \bassFigureStaffAlignmentDown
   <9 5\!> <8 5> <8 6> <8 6> <7 5> <7 5> <6 4> <6 4> | % 44
   <5 4> <5 4> <5 3> <5 3> s4 s \bar"|."
 }
-
 % IAllegroVcBMusic = \IAllegroBCMusic
+
+
+IAllegroBCRealizationMusic = \relative c'' {
+  <c g e>4 <c g e>8[ <h g d>] <c g e>4 <c g e>4 | % 2
+  <d a f>8[ <e c g>] <f c a>[ <f d g,>] <e c g>4 <c g e> | % 3
+  s1 % TODO
+  <h g d>8[ <c g e>] r4 \twoVoice { e8[ e] e[ d16 e] } { g,8[ g] g[ f16 g] } | % 5
+  <c e,>4 q <d fis,>8[ q q <c e,>16 <d fis,>] | % 6
+  <h d,>4 <h g d,> <h g e>2 | % 7
+  <a fis d>4 \twoVoice { d4. c8[ h a] } { r4 r g } |  % 8
+  \mark "TODO" \twoVoice { g8[ a16 h] } { <g c,>8[ <f c>] } <c' e, c>4 <c a c,>8[^"TODO" <h g c,> <a f d> <c g e>] | % 9 
+  <c a f>2 <c g e>4 r | \barNumberCheck #10
+  \twoVoice { 
+    r2 r8 g4 a8 |  % 11
+    h4 h r8 a4 h8 |  % 12
+    c2  r4 a | % 13
+  } { 
+    r8 c,4 d8 e4 e |  % 11
+    r8 d4 e8 f4 f |  % 12
+    r4 e a8[ fis d c] | % 13
+  }
+  <g' d h>2 <g e c> | % 14
+  <a fis d> <a g e> | % 15
+  <a fis d>4 <h g~ d~> <a g d> <a fis d> | % 16
+  <h g d>2 <h g d> | % 17
+  <h g d> <h gis d> | % 18
+  q4 r <e c> <d h fis> | % 19
+  <c a e> <e c a>8[ <e h g>] <e c a>4 <d a f> | \barNumberCheck #20
+  <e h gis>1 | % 21
+  \twoVoice { e4. d8 } {<h gis>2 } <c a e>2 | % 22
+  <d a fis>1 | % 23
+  \twoVoice { d4. c8 } { <a fis>2 } <h g d>4 <g d h> | % 24
+  \mark "TODO" <c a e>1 | % 25
+  \twoVoice { c4. b8 } { <g e>2 } <a f c>2 | % 26
+  \mark "TODO" <c a f>4 <d a f> <d h f> <c a e> | % 27
+  \mark "TODO" <h f d> <c g e> <d h g> r | % 28
+  e,8[ e] e[ d16 e] <c' a>8[ q] q[ <h g>16 <c a>] | % 29
+  <d h f>4 q q q8[ <e h g>16 <d h f>] | \barNumberCheck #30
+  <c a e>8[ <d a f>] <e~ c g~>4 <e a, g>8[ <d a f>] <c a e>4 | % 31
+  <h g d>4 \twoVoice { r4 r c } { g4. f8 e[ d] } | % 32
+  <c' a c,>8[ <h g d> <a f> <c g e>] <d h f>4 <d h g> | % 33
+  <f h, g> <e c g>8[ <c g e>] q2 | % 34
+  <h g d>4 r4 r8 d,4 e8 | % 35
+  \twoVoice {
+    r8 a4 h8 c4 c | % 36
+    r8 h4 c8
+  } {
+    f,4 f r8 e4 f8 | % 36
+    g4 g
+  } d'4 <d h> | % 37
+  <c g e>4 <g e c> <a f c>2 | % 38
+  <g f d,>4 <h g f> <d g, f>2 | % 39
+  q4 <c g e> <h g d> <c g e> | \barNumberCheck #40
+  q <h g d> <c g e> r | % 41
+  c,4 d8[ e] \twoVoice { a4 h8[ c] } { f,4. e8 } | % 42
+  \twoVoice { d'4 c8[ h] r8 e4 } { g,2 <c g>4. } <d h g>8 | % 43
+  <c a g>8[ <c a f>] <d a f>4 <f d g,> <e c g> | % 44
+  <d~ c g~> <d h g> <c g e> r \bar"|."
+}
+
+
+IAllegroPIMusic = \relative c'' {
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 32)
+  % TODO
+  s1*44 \bar"|."
+}
+
+IAllegroPIIMusic = \relative c {
+  % TODO
+  s1*44 \bar"|."
+}

Mozart_BenedictusSitDeus_Music_02_Andante.ily

@@ -1174,3 +1174,224 @@ IIAndanteFiguredBassMusic = \figuremode { \bassFigureStaffAlignmentDown
 
 % IIAndanteVcBMusic = \IIAndanteBCMusic
 % \addQuote "IIAndanteVcBMusic" { \IIAndanteVcBMusic }
+
+IIAndanteBCRealizationMusic = \relative c'' {
+  % TODO
+  s2*96 \bar"|."
+}
+
+pu = \change Staff = "IIAndantePISt" 
+pd = \change Staff = "IIAndantePIISt" 
+su = \once\stemUp
+IIAndantePIMusic = \relative c'' {
+  \twoVoice {
+    c4. f8 | % 2
+    e8.[( f32 g]) f8[-. f]-.
+  } {
+    c,16[ f a f] c[ f a f] | % 2
+    \pd\su c[ \pu g' b g] \pd\su c,[ \pu f a f]
+  } | % 3
+  \twoVoice {
+    <a c>4. <d f>8 | % 4
+    <e g>8.[( <f a>32 <g b>]) <f a>8[-. <f a>]-.
+  } {
+    c,16[ f a f] c[ f a f] | % 4
+    c[ e g e] c[ f a f]
+  } | % 5
+  c''4 a16[( f c) a']-. | % 6  % TODO: <f a>2 in 2. Stimme?
+  b16[-. g-. e-. c]-. b'4 | % 7 % TODO: <g b>2 in 2. Stimme?
+  c4 a16[( f c) a']-. | % 8  % TODO: <f a>2 in 2. Stimme?
+  b16[-. g-. e-. c]-. b'4 | % 9 % TODO: <g b>2 in 2. Stimme?
+  \twoVoice {
+    c16[( f, e f]) r d'[( b g]) | \barNumberCheck #10
+    f4( e8) r
+  } {
+    a8[ c,(] d16[) f d b] | \barNumberCheck #10
+    a4( g16) <f d>16[-. <c e>-. <b d>]-.
+  } | % 11
+  \twoVoice {
+    \times 2/3 { r16 <f'' a>[-. <e g>]-. } \times 2/3 {<d f>[-. <c e>-. <b d>]-. } \times 2/3 {<a c>[-. <g b>-. <f a>]-. } \times 2/3 { <e g>[-. <d f>-. <c e>]-. }
+  } {
+    a'4 r4
+  } | % 12
+  \twoVoice {
+    r8 <f' d'>16[ <g b>] <f a>8[ <e g>]
+  } {
+    <d, b>8[ \appoggiatura e'32 <d b>16 <a c>32 <g b>] <f a>8[ <e g>]
+  } | % 13
+  \twoVoice {
+    \times 2/3 { r16 <f' a>[-. <e g>]-. } \times 2/3 {<d f>[-. <c e>-. <b d>]-. } \times 2/3 {<a c>[-. <g b>-. <f a>]-. } \times 2/3 { <e g>[-. <d f>-. <c e>]-. }
+  } {
+    <a' c f>4 r4
+  } | % 14
+  \twoVoice {
+    r8 <f' d'>16[ <g b>] <f a>8[ <e g>]
+  } {
+    <d, b>8[ \appoggiatura e'32 <d b>16 <a c>32 <g b>] <f a>8[ <e g>]
+  } | % 15
+  \twoVoice {
+    f'8[^"TODO" <a c>32 <b d> <a c> <g b>] <f a>8[-. <f a>]-.
+  } {
+    <a,, c>4 s
+  } | % 16
+  <c f a>2 | % 17
+  \twoVoice {
+    c'4. f8 | % 18
+    e8.[( f32 g]) f8[-. f]-.
+  } {
+    c,16[ f a f] c[ f a f] | % 18
+    c[ g' b g] c,[ f a f]
+  } | % 19
+  \twoVoice {
+    <a c>4. <d f>8 | \barNumberCheck #20
+    <e g>8.[( <f a>32 <g b>]) <f a>8[-. <f a>]-.
+  } {
+    c,16[ f a f] c[ f a f] | \barNumberCheck #20
+    c[ e g e] c[ f a f]
+  } | % 21
+  c'4^"TODO" f16[( c f) a]-. | % 22  % TODO: <f a>2 in 2. Stimme?
+  b[-. g-. e-. c]-. b4\trill | % 23
+  <a c,>8 <f' a,>4 \twoVoice { <a f>8 } { <a, f> } | % 24
+  \twoVoice { <a' f>4( <g e>8) r8 } { <a, f>4( <g e>8) <g' e>32[ <f d> <e c> <d h>] } | % 25
+  \twoVoice { 
+    c8 c'4 b8 | % 26
+    a8[ a a a]
+  } {
+    c,8[ c,( d) e] | % 26
+    f[ c' c c]
+  } | % 27
+  <d h'>8[ q q q] | % 28
+  \twoVoice { c'8 c,4( b8) } { e[ g, g g] } | % 29
+  \twoVoice { gis16[( a) h( c]) cis[( d) e( f]) } { <f, c>8 r r4 } | \barNumberCheck #30
+  a16[( d) <f a>( <d f>]) <c e>8[( <h d>]) | % 31
+  \times 2/3 { <c g e>16[ <e g> <d f>] } \times 2/3 { <c e>[ <h d> <a c>] } \times 2/3 { <g h>[ <f a> <e g>] } \times 2/3 { <d f>[ <c e> <h d>] } | % 32
+  \twoVoice { c8 g''4 g8 } { c,,[ e' d c] } | % 33
+  \twoVoice { g'8.[( a32 g]) c16[( g) f( e]) } { s2_"TODO" } | % 34
+  e16[( d) <f a>( <d f>]) <c e>8[( <h d>]) | % 35
+  \times 2/3 { <c g e>16[ <e g> <d f>] } \times 2/3 { <c e>[ <h d> <a c>] } \times 2/3 { <g h>[ <f a> <e g>] } \times 2/3 { <d f>[ <c e> <h d>] } | % 36
+  \twoVoice { c8 g''4 g8 } { c,,[ e' d c] } | % 37
+  \twoVoice { g'8.[( a32 g]) c16[( g) f( e]) } { s2_"TODO" } | % 38
+  e16[( d) <f a>( <d f>]) <c e>8[( <h d>]) | % 39
+  
+  
+  
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 64)
+  \newSpacingSection
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 64)
+
+  % TODO
+%   s2*96 \bar"|."
+  s2*58 \bar"|."
+}
+
+IIAndantePIIMusic = \relative c {
+        r8 f8[ a f] | % 2
+        c'8[ b] a4 | % 3
+        r8 f16[ g] a8[ f] | % 4
+        r8 c8[ f f,] | % 5
+        \twoVoice {
+          c''16[ c c c] c[ c c c] | % 6
+          c[ c c c] c[ c c c] | % 7
+          c[ c c c] c[ c c c] | % 8
+          c[ c c c] c[ c c c]
+        } {
+          r8 f,[ a f] | % 6
+          r8 g[ e c] | % 7
+          r8 f16[ g] a8[ f] | % 8
+          r8 g8[ e c]
+        } | % 9
+        f[ a( b) b] | \barNumberCheck #10
+        r16 c[( h c]) c,[ b'\staccato a\staccato g]\staccato | % 11
+        <f a>4 r | % 12
+        r8 b8[ c c,] | % 13
+        f4 r | % 14
+        r8 b8[ c c,] | % 15
+        f4 f8[ f] | % 16
+        f2 | % 17
+        r8 f16[\p g] a8[ f] | % 18
+        c'8[ b] a4 | % 19
+        r8 f16[ g] a8[ f] | \barNumberCheck #20
+        r8 c8[ f f,] | % 21
+        \twoVoice {
+          c''16[ c c c] c[ c c c] | % 22
+          c[ c c c] c[ c c c]
+        } {
+          r8 f,8[ a f] | % 22
+          r8 g[ e c]
+        } | % 23
+        r8 f[ a, b] | % 24
+        r8 c8[ c' c,] | % 25
+        c[ e f g] | % 26
+        f[ f f f] | % 27
+        f[ f f f] | % 28
+        e[ e e e] | % 29
+        f[ f f f] | \barNumberCheck #30
+        f[ f g g,] | % 31
+        c4\f r4 | % 32
+        \dynamicUp c8[ c\p h a] | % 33
+        \dynamicNeutral g[ f' e e] | % 34
+        f[ f g g] | % 35
+        c,4\f r | % 36
+        r8 \dynamicsX #-3 c8[\p h a] | % 37
+        g[ f' e e] | % 38
+        f[ f g g,] | % 39
+\stemDown
+        c[ e d c] | \barNumberCheck #40
+        h[ h' c f,] | % 41
+        g[ g g g] | % 42
+        g,[ g g g ] | % 43
+        c[\f c' e c] | % 44
+        r g[ h g] | % 45
+        r c[ e c] | % 46
+        r d[ h g] | % 47
+        c4 r | % 48
+        r8 c[ c c] | % 49
+        c[ f, g g,] | \barNumberCheck #50
+        c8[ c'] c,4 | % 51
+        c4\p r | % 52
+        c c'8[ g] | % 53
+        c,[ e' d g,] | % 54
+        c[ c,\f c c] | % 55
+        c[ c'\p a g] | % 56
+        fis[ fis fis es] | % 57
+        d[ d d d] | % 58
+        d[ d d d] | % 59
+        c[ c c c] | \barNumberCheck #60
+        f4 f, | % 61
+        r8 f'8[ g c,] | % 62
+        \dynamicUp f4 f,\f | % 63
+        \dynamicNeutral r8 f'8[ g c,] | % 64
+        f4 r | % 65
+        \dynamicUp f8[\p f f f] | % 66
+        \dynamicNeutral f[ f f f] | % 67
+        b[ b, b' b] | % 68
+        a[ a e e] | % 69
+        f4 r8 b,8 | \barNumberCheck #70
+        c16[\staccato c'( h c)] c,[\staccato b'( a g)] | % 71
+        f4\f r4 | % 72
+        \dynamicUp f8[ a(\p b a)] | % 73
+        \dynamicNeutral e8[( c f)] r | % 74
+        r8 b,[ c c] | % 75
+        f4\f r | % 76
+        r8 \dynamicsX #-3 a8[(\p e f]) | % 77
+        e[( c f]) r | % 78
+        r b,[ c c] | % 79
+        f[ a( g f]) | \barNumberCheck #80
+        e[ c f f,] | % 81
+        b8 r b' r | % 82
+        c[ c c c] | % 83
+        c,[ c c c] | % 84
+        f[\f f a f] | % 85
+        r d[ f d] | % 86
+        r8 h[ h h] | % 87
+        c2\fermata | % 88
+        f8[ f a f] | % 89
+        r8 c[ e c] | \barNumberCheck #90
+        r f16[ g] a8[ f] | % 91
+        r c[ e c] | % 92
+        f4 r | % 93
+        r8 f'[\ff f f] | % 94
+        f r b, r | % 95
+        c[ c c, c] | % 96
+        f[ f,] f'4 \bar"|."
+}

Mozart_BenedictusSitDeus_Music_03_Allegro.ily

@@ -775,3 +775,20 @@ IIIAllegroBCFbMusic = \figuremode { \bassFigureStaffAlignmentDown
 }
 
 % IIIAllegroVcBMusic = \IIIAllegroBCMusic
+
+
+IIIAllegroBCRealizationMusic = \relative c'' {
+  % TODO
+  s1*48 \bar"|."
+}
+
+IIIAllegroPIMusic = \relative c'' {
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 32)
+  % TODO
+  s1*48 \bar"|."
+}
+
+IIIAllegroPIIMusic = \relative c {
+  % TODO
+  s1*48 \bar"|."
+}

Mozart_BenedictusSitDeus_Score_Vocal.ly

@@ -2,12 +2,32 @@
 \include "Mozart_BenedictusSitDeus_Settings_VocalScore.ily"
 \setCreateMIDI ##t
 \setCreatePDF ##t
+#(set-global-staff-size 17)
 
 \header {
   scoretype = \VocalScoreTitle
   scorenumber = \markup{\scoreNumber \VocalScoreNumber}
 }
+\layout {
+  \context { \Staff
+    \override VerticalAxisGroup #'remove-empty = ##f
+  }
+%   \context { \Score
+%     \override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 32)
+%   }
+}
+SShortInstrumentName = ##f
+AShortInstrumentName = ##f
+TShortInstrumentName = ##f
+BShortInstrumentName = ##f
+SSoloShortInstrumentName = ##f
+SSoloInstrumentName = \markup { \center-column { \line {"Soprano"} \line {"Solo"}}}
+ExtraSettings = { \expandFullBarRests }
+% IIAndanteExtraSettings = {
+%   \expandFullBarRests 
+%   \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 64) 
+% }
 
-\createScore #"IAllegro" #'("VocalScore")
-\createScore #"IIAndante" #'("VocalScore")
-\createScore #"IIIAllegro" #'("VocalScore")
+% \createNoCuesScore #"IAllegro" #'("VocalScore")
+\createNoCuesScore #"IIAndante" #'("VocalScore")
+% \createNoCuesScore #"IIIAllegro" #'("VocalScore")

TeX_Mozart_BenedictusSitDeus_Include_Todo.itex

-% \todos{
-% \chapter*{Offene Fragen}
-%
-% \begin{itemize}
-% \item
-%
-% \end{itemize}
-% }
+\todos{
+\chapter*{Errata}
+
+\begin{itemize}
+\item Alto 21: last quarter note wrongly d instead of e
+\item Continuo 12: First (lower) eighth wrongly e instead of rest
+\end{itemize}
+}

out/Mozart_BenedictusSitDeus_Score_Vocal.toc

-1, section, 1, {1. Coro}, toc63,
-4, section, 1, {2. Aria tacet (Andante, 96 Takte)}, toc64,
+1, section, 1, {2. Aria}, toc66
\ No newline at end of file
-4, section, 1, {3. Coro}, toc65
\ No newline at end of file