Missa_brevis_in_C: Agnus Dei nun zweizeilig

2 files changed, 101 insertions, 62 deletions

diff --git a/Missa_brevis_in_C/parts/agnus_dei.ly b/Missa_brevis_in_C/parts/agnus_dei.ly
index a9ebde3..0ceeabd 100644
--- a/Missa_brevis_in_C/parts/agnus_dei.ly
+++ b/Missa_brevis_in_C/parts/agnus_dei.ly
@@ -4,19 +4,15 @@
   \new ChoirStaff <<
     \set Score.skipBars = ##t
     \new Staff <<
-      \new Voice = sopran   { \globalAgnusDei << \melodieSopranAgnusDei \artikulationAgnusDei >> }
-    >>
-    \new Lyrics \lyricsto sopran { \textFrauenAgnusDei }
-    \new Staff <<
-      \new Voice = alt      { \globalAgnusDei << \melodieAltAgnusDei \artikulationAgnusDei >> }
+      \new Voice = frauen  { \oneVoice \globalAgnusDei \pausenFrauenAgnusDei }
+      \new Voice = sopran  { \voiceOne \globalAgnusDei << \melodieSopranAgnusDei \artikulationAgnusDei >> }
+      \new Voice = alt     { \voiceTwo \globalAgnusDei \melodieAltAgnusDei }
     >>
     \new Lyrics \lyricsto alt { \textFrauenAgnusDei }
     \new Staff <<
-      \new Voice = tenor   { \clef "G_8" \globalAgnusDei << \melodieTenorAgnusDei \artikulationAgnusDei >> }
-    >>
-    \new Lyrics \lyricsto tenor { \textFrauenAgnusDei }
-    \new Staff <<
-      \new Voice = bass    { \clef "bass" \globalAgnusDei << \melodieBassAgnusDei \artikulationAgnusDei >> }
+      \new Voice = maenner { \oneVoice \clef "bass" \globalAgnusDei \pausenMaennerAgnusDei }
+      \new Voice = tenor   { \voiceOne \clef "bass" \globalAgnusDei \melodieTenorAgnusDei }
+      \new Voice = bass    { \voiceTwo \clef "bass" \globalAgnusDei << \melodieBassAgnusDei \artikulationAgnusDei >> }
     >>
     \new Lyrics \lyricsto bass { \textBassAgnusDei }
   >>
diff --git a/Missa_brevis_in_C/parts/stimmen_agnus_dei.ly b/Missa_brevis_in_C/parts/stimmen_agnus_dei.ly
index 7694467..bacf3e9 100644
--- a/Missa_brevis_in_C/parts/stimmen_agnus_dei.ly
+++ b/Missa_brevis_in_C/parts/stimmen_agnus_dei.ly
@@ -11,23 +11,65 @@
 
 % Die Stimmen
 
+  pausenFrauenAgnusDei = {
+    s1*2 |
+    R1*11 |
+    s1*3 |
+    s2. r4 |
+    s1 |
+    s2. r4 |
+    s1 |
+    s2. r4 |
+    s1*7 |
+    s2. r4 |
+    s1 |
+    s2. r4 |
+    s1 |
+    s2. r4 |
+    s1*3 |
+    s2. r4 |
+    s1*3 |
+    s2. r4 |
+    s1*8 | \bar "|."
+  }
+
+  pausenMaennerAgnusDei = {
+    s1*5 |
+    s2. r4 |
+    s1*3 |
+    s2. r4 |
+    s1*2 |
+    s2. r4 |
+    s1*3 |
+    s2. r4 |
+    s1*11 |
+    s2. r4 |
+    R1 |
+    s2. r4 |
+    R1 |
+    s2. r4 |
+    s1*7 |
+    s2. r4 |
+    s1*8 | \bar "|."
+  }
+
   melodieSopranAgnusDei = \relative g' {
     \new CueVoice {
       g2 f4 e |
       g2 f4 e |
     }
-    R1*11 |
+    s1*11 |
     g2 f4( e) |
     g2 f4 e |
     f f8 f g4 a |
-    g2 e4 r |
-    \new CueVoice {
+    g2 e4 s |
+    \new CueVoice { \voiceThree
       g4 d' c b |
-      c b8 a a4 r |
+      c b8 a a4 s |
       a e' d c |
       d c8 h h4
     }
-    r |
+    s |
     d2 c4( h) |
     c2 h4( a) |
     h2 a4( g) |
@@ -35,22 +77,22 @@
     g2 f4( e) |
     g2 f4 e |
     f f8 f g4 a |
-    g2 e4 r |
-    \new CueVoice {
+    g2 e4 s |
+    \new CueVoice { \voiceThree
       g a b c |
-      b2 a4 r |
+      b2 a4 s |
       d, e f g |
       f2 e4
     }
-    r |
+    s |
     g2 f4( e) |
     g2 f4( e) |
     e2( d) |
-    c2. r4 |
+    c2. s4 |
     g'2 g |
     g g |
     g1 |
-    g2. r4 |
+    g2. s4 |
     g2 g |
     g g |
     g1 |
@@ -64,18 +106,19 @@
   }
 
   melodieAltAgnusDei = \relative e' {
-    R1*13 |
+    R1*2 |
+    s1*11 |
     e2 d4( c) |
     e2 d4 c |
     d4 d8 d e4 f |
-    e2 c4 r |
-    \new CueVoice {
+    e2 c4 s |
+    \new CueVoice { \voiceFour
       e b' a g |
-      a g8 f f4 r |
+      a g8 f f4 s |
       fis c' h a |
       h a8 g g4
     }
-    r |
+    s |
     h2 a4( g) |
     a2 g4( f) |
     g2 f4( e) |
@@ -83,22 +126,22 @@
     e2 d4( c) |
     e2 d4 c |
     d d8 d e4 f |
-    e2 c4 r |
-    \new CueVoice {
+    e2 c4 s |
+    \new CueVoice { \voiceFour
       e f g a |
-      g2 f4 r |
+      g2 f4 s |
       h, c d e |
       d2 c4
     }
-    r |
+    s |
     e2 d4( c) |
     e2 d4( c) |
     c2( h) |
-    c2. r4 |
+    c2. s4 |
     g'2 g |
     g g |
     g1 |
-    g2. r4 |
+    g2. s4 |
     g2 g |
     g g |
     g1 |
@@ -108,25 +151,25 @@
 
   melodieTenorAgnusDei = \relative g {
     R1*2 |
-    \new CueVoice {
+    \new CueVoice { \voiceThree
       g2 f4 e |
       g2 f4 e |
       f f8 f g4 a |
-      g2 e4 r |
+      g2 e4 s |
       d a' g f |
       g f8 e e2 |
       e4 c' h a |
-      h a8 g g4 r |
+      h a8 g g4 s |
       g e' d c |
       c h8 a a4 g8 f |
       e2 d4
     }
-    r |
+    s |
     g2 g |
     g g4 g |
     a a8 a g4 f |
-    g2 g4 r |
-    \new CueVoice {
+    g2 g4 s |
+    \new CueVoice { \voiceThree
       c2 c |
       c c4 cis |
       d2 d |
@@ -139,22 +182,22 @@
     g,( a) h( c) |
     g( a) h c |
     a a8 a g4 f |
-    g2 g4 r |
-    R1 |
-    \new CueVoice {
-      c2 c4 r |
-      R1 |
+    g2 g4 s |
+    s1 |
+    \new CueVoice { \voiceThree
+      c2 c4 s |
+      s1 |
       h2 c4
     }
-    r |
+    s |
     g( a) h( c) |
     g2 g |
     g( f) |
-    e2. r4 |
+    e2. s4 |
     h'2 d |
     c e |
     h( d) |
-    c2. r4 |
+    c2. s4 |
     h2 d |
     c e |
     d1 |
@@ -163,30 +206,30 @@
   }
 
   melodieBassAgnusDei = \relative c {
-    \new CueVoice {
+    \new CueVoice { \voiceFour
       c1 |
       c |
       e2 d4 c |
       e2 d4 c |
       d d8 d e4 f |
-      e2 c4 r |
+      e2 c4 s |
       h f' e d |
       e d8 c c2 |
       c4 a' g fis |
-      g fis8 e e4 r |
+      g fis8 e e4 s |
       e c' h a |
       a g8 f f4 e8 d |
       c2 h4
     }
-    r4 |
+    s |
     c2 c |
     c c4 c |
     c c8 c c4 c |
-    c2 c4 r |
-    r2
-    \new CueVoice {
+    c2 c4 s |
+    s2
+    \new CueVoice { \voiceFour
       c4 c |
-      f2 f4 r |
+      f2 f4 s |
       r2 d4 d |
       g2 g |
     }
@@ -197,14 +240,14 @@
     c, c |
     c c |
     c c |
-    c c4 r |
-    R1 |
-    \new CueVoice {
-      f2 f4 r |
-      R1 |
+    c c4 s |
+    s1 |
+    \new CueVoice { \voiceFour
+      f2 f4 s |
+      s1 |
       a2 a4
     }
-    r |
+    s |
     g2 g |
     g,4( a) h( c) |
     g1 |
@@ -212,12 +255,12 @@
     d2 f |
     e c |
     d( f) |
-    e2. r4 |
+    e2. s4 |
     d2 f |
     e c |
     f1 |
     c |
-    \new CueVoice {
+    \new CueVoice { \voiceFour
       c |
       c |
       c |