adapted library to new context aware format

adeste_fideles/assignments.tt

@@ -1,7 +1,7 @@
 [%
     song_title = 'Adeste Fideles';
     scores = {
-        congregation = 'freie_lieder/adeste_fideles/adeste_fideles_lz.ly'
+        congregation = 'adeste_fideles_lz.ly'
-        leadsheet = 'freie_lieder/adeste_fideles/adeste_fideles_leadsheet.ly'
+        leadsheet = 'adeste_fideles_leadsheet.ly'
     }
 -%]

agnus_dei_xviii/assignments.tt

@@ -1,7 +1,7 @@
 [%
     scores = {
-        SATB = 'freie_lieder/agnus_dei_xviii/agnus_dei_xviii_schola.ly'
+        SATB = 'agnus_dei_xviii_schola.ly'
-        congregation = 'freie_lieder/agnus_dei_xviii/agnus_dei_xviii_lz.ly'
+        congregation = 'agnus_dei_xviii_lz.ly'
-        band = 'freie_lieder/agnus_dei_xviii/agnus_dei_xviii_full.ly'
+        band = 'agnus_dei_xviii_full.ly'
     };
 -%]

agnus_dei_xviii_de/assignments.tt

@@ -1,7 +1,7 @@
 [%
     scores = {
-        SATB = 'freie_lieder/agnus_dei_xviii_de/agnus_dei_xviii_de_schola.ly'
+        SATB = 'agnus_dei_xviii_de_schola.ly'
-        band = 'freie_lieder/agnus_dei_xviii_de/agnus_dei_xviii_de_full.ly'
+        band = 'agnus_dei_xviii_de_full.ly'
-        congregation = 'freie_lieder/agnus_dei_xviii_de/agnus_dei_xviii_de_lz.ly'
+        congregation = 'agnus_dei_xviii_de_lz.ly'
     };
 -%]

alleluia_VII_1/alleluia_VII_1_SATB.ly

@@ -0,0 +1,50 @@
+\version "2.22.4"
+\language deutsch
+\header {
+}
+\include "../../../lilypond_musician_score_paper.ly"
+\include "gregorian.ly"
+\include "alleluia_VII_1_vars.ly"
+
+\score {
+    \SATBScore
+}
+
+tone.meta = {
+        \key a \major
+        \set Score.timing = ##f
+        s\breve s2*3 s4 \divisioMaior
+        s\breve s4 s2*2 s4\finalis
+}
+tone.S = \relative c' {
+    h'\breve s2 a4 cis h2 s4
+    a\breve s2 gis4 fis2 s4
+}
+tone.A = \relative c' {
+    e\breve( s2*2  e2) s4
+    cis\breve s2 s4 d2 s4
+}
+tone.T = \relative c' {
+    gis\breve( s2*2 gis2) s4
+    a\breve( s2 s4 a2)
+}
+tone.B = \relative c {
+    e\breve( s2*2 e2)  s4
+    fis\breve( s2 s4 fis2) s4
+}
+\score {
+    \new ChoirStaff \with {\remove "Time_signature_engraver" } <<
+    \new GregorianTranscriptionStaff <<
+        \clef "treble"
+        \tone.meta
+        \new GregorianTranscriptionVoice = "tone.S" {\voiceOne \tone.S}
+        \new GregorianTranscriptionVoice = "tone.A" {\voiceTwo \tone.A}
+    >>
+    \new GregorianTranscriptionStaff <<
+        \clef bass
+        \tone.meta
+        \new GregorianTranscriptionVoice = "tone.T" {\voiceOne \tone.T}
+        \new GregorianTranscriptionVoice = "tone.B" {\voiceTwo \tone.B}
+    >>
+    >>
+}

alleluia_VII_1/alleluia_VII_1_lz.ly

@@ -0,0 +1,11 @@
+\version "2.22.4"
+\language deutsch
+\header {
+}
+\include "../paper.ly"
+\include "gregorian.ly"
+\include "alleluia_VII_1_vars.ly"
+
+\score {
+    \MelodyScore
+}

alleluia_VII_1/alleluia_VII_1_vars.ly

@@ -0,0 +1,55 @@
+\version "2.22.4"
+\language deutsch
+\header {
+}
+
+\include "gregorian.ly"
+meta = {
+        \key a \major
+        \set Score.timing = ##f
+    s2*2 s4 \divisioMinima
+    s2*2 s4 \divisioMinima
+    s2*3 \finalis
+}
+S = \relative c' {
+    s4 e gis a h
+    a fis a gis( fis)
+    e( fis) gis( fis) e e
+}
+A = \relative c' {
+    s2 cis e4~ e cis2~ cis e cis h
+}
+T = \relative c {
+    e2 a gis4~ gis a2~ a~ a~ a~ 4 gis
+}
+B = \relative c {
+    e2~ e~ 4~ 4 fis2 a, cis a e'
+}
+verba = \lyricmode {
+    \set stanza = "V/A"
+    Al -- le -- lu -- iá,
+    al -- le -- lu -- iá,
+    al -- le -- lú -- ia.
+}
+
+SATBScore = \new ChoirStaff <<
+    \new GregorianTranscriptionStaff <<
+        \clef "treble"
+        \meta
+        \new GregorianTranscriptionVoice = "S" {\voiceOne \S}
+        \new GregorianTranscriptionVoice = "A" {\voiceTwo \A}
+    >>
+        \new GregorianTranscriptionLyrics = "one" \lyricsto S \verba
+    \new GregorianTranscriptionStaff <<
+        \clef bass
+        \meta
+        \new GregorianTranscriptionVoice = "T" \T
+        \new GregorianTranscriptionVoice = "B" \B
+    >>
+    >>
+
+MelodyScore = \new GregorianTranscriptionStaff <<
+        \meta
+        \new GregorianTranscriptionVoice = "S" {\voiceOne \S}
+        \new GregorianTranscriptionLyrics = "one" \lyricsto S \verba
+>>

alleluia_VII_1/assignments.tt

@@ -0,0 +1,7 @@
+[%
+    scores = {
+        SATB = 'alleluia_VII_1_SATB.ly'
+        congregation = 'alleluia_VII_1_lz.ly'
+    };
+    after_song = 'Sucht den Herrn, er lässt sich finden, ruft ihn an, er ist nah!';
+-%]

andachtsjodler/assignments.tt

@@ -1,7 +1,7 @@
 [% 
     song_title = 'Andachtsjodler';
     scores = {
-        congregation = "freie_lieder/andachtsjodler/andachtsjodler_lz.ly"
+        congregation = "andachtsjodler_lz.ly"
-        SATB = "freie_lieder/andachtsjodler/andachtsjodler_SATB.ly"
+        SATB = "andachtsjodler_SATB.ly"
     };
 %]

christus_vincit/assignments.tt

@@ -1,7 +1,7 @@
 [%
     song_title = "Christus Vincit";
     scores = {
-        leadsheet = "freie_lieder/christus_vincit/christus_vincit_leadsheet.ly"
+        leadsheet = "christus_vincit_leadsheet.ly"
-        congregation = "freie_lieder/christus_vincit/christus_vincit_lz.ly"
+        congregation = "christus_vincit_lz.ly"
     }
 %]

co_seht_die_jungfrau/assignments.tt

@@ -0,0 +1,6 @@
+[%
+    scores = {
+        SATB = 'seht_die_jungfrau_schola.ly'
+        band = 'seht_die_jungfrau_full.ly'
+    };
+-%]

co_seht_die_jungfrau/seht_die_jungfrau_full.ly

@@ -0,0 +1,8 @@
+\version "2.24.4"
+\language deutsch
+
+\include "../sheet.ly"
+\include "seht_die_jungfrau_vars.ly"
+\include "gregorian.ly"
+
+\score { \FullScore }

co_seht_die_jungfrau/seht_die_jungfrau_lz.ly

@@ -0,0 +1,10 @@
+\version "2.24.4"
+\language deutsch
+
+\include "../paper.ly"
+\include "seht_die_jungfrau_vars.ly"
+\include "gregorian.ly"
+
+\score {
+    \VocalScore
+}

co_seht_die_jungfrau/seht_die_jungfrau_schola.ly

@@ -0,0 +1,8 @@
+\version "2.24.4"
+\language deutsch
+
+\include "../sheet.ly"
+\include "seht_die_jungfrau_vars.ly"
+\include "gregorian.ly"
+
+\score { \VocalScore }

co_seht_die_jungfrau/seht_die_jungfrau_vars.ly

@@ -0,0 +1,58 @@
+\language deutsch
+
+\include "gregorian.ly"
+% Ps 145 (144) 8
+% 3. Modus
+chant.meta = {
+    \key c \major
+    \set Score.timing = ##f
+}
+chant.ant.meta = {
+    {\chant.meta}
+    s4*19 \divisioMaxima
+    s4*11 \divisioMinima
+    s4*7 \finalis
+}
+chant.ant.cantus = \fixed c' {
+    d4 f( e) f( g) d
+    c e g( a) a
+    g a h c' a c'( d') a
+    a( g) f( e) f g f( g) f g a
+    d( e) d( c) c( d)
+}
+chant.ant.S = \relative c' {
+    d2 s2 d s e2 s s a s2 a4 s2 f2 s4 g2 s4 f2 s4 e2 s2 d
+}
+chant.ant.A = \relative c' {
+    a2 s2 b s c2 s s c s2 e4 s2 c2 s4 c2 s4 c2 s4 c2 s2 a
+}
+chant.ant.T = \relative {
+    d2 s2 f s g2 s s e s2 a4 s2 a2 s4 g2 s4 a2 s4 g2 s2 d
+}
+chant.ant.B = \relative {
+    d,2 s2 b' s a2 s s f s2 a4 s2 d2 s4 e2 s4 f2 s4 a,2 s2 d,
+}
+verba.ant = \lyricmode {
+    Seht, die Jung -- frau wird emp -- fan -- gen und ei -- nen Sohn ge -- bäh -- ren;
+    Sein Na -- me ist Im -- ma -- nu -- el
+    Gott mit uns.
+}
+
+VocalScore = \new GregorianTranscriptionStaff <<
+        \new GregorianTranscriptionVoice = "melody" <<\chant.ant.meta \chant.ant.cantus>>
+        \new GregorianTranscriptionLyrics  \lyricsto melody {\verba.ant}
+    >>
+FullScore = <<
+    {\VocalScore}
+    \new StaffGroup <<
+        \new GregorianTranscriptionStaff <<
+            \new GregorianTranscriptionVoice <<\voiceOne \chant.ant.meta \chant.ant.S>>
+            \new GregorianTranscriptionVoice <<\voiceTwo \chant.ant.meta \chant.ant.A>>
+        >>
+        \new GregorianTranscriptionStaff <<
+            \clef bass
+            \new GregorianTranscriptionVoice <<\voiceOne \chant.ant.meta \chant.ant.T>>
+            \new GregorianTranscriptionVoice <<\voiceTwo \chant.ant.meta \chant.ant.B>>
+        >>
+    >>
+>>

der_engel_des_herrn/assignments.tt

@@ -1,8 +1,8 @@
 [%
     title = 'Der Engel des Herrn'
     scores = {
-        band = 'freie_lieder/der_engel_des_herrn/der_engel_des_herrn_leadsheet.ly'
+        band = 'der_engel_des_herrn_leadsheet.ly'
-        SATB = 'freie_lieder/der_engel_des_herrn/der_engel_des_herrn_SATB.ly'
+        SATB = 'der_engel_des_herrn_SATB.ly'
-        congregation = 'freie_lieder/der_engel_des_herrn/der_engel_des_herrn_lz.ly'
+        congregation = 'der_engel_des_herrn_lz.ly'
     }
 -%]

erbarme_dich_meiner_GL_639_1/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/erbarme_dich_meiner_GL_639_1/erbarme_dich_meiner.ly';
+    scores.congregation = 'erbarme_dich_meiner.ly';
 -%]

hallaluja_174_3/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/hallaluja_174_3/hallaluja_174_3.ly';
+    scores.congregation = 'hallaluja_174_3.ly';
 -%]

hallaluja_174_4/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/hallaluja_174_4/hallaluja_174_4.ly';
+    scores.congregation = 'hallaluja_174_4.ly';
 -%]

halleluja_174_6/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/hallaluja_174_6/hallaluja_174_6.ly';
+    scores.congregation = 'hallaluja_174_6.ly';
 -%]

halleluja_175_5/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/hallaluja_175_5/hallaluja_175_5.ly';
+    scores.congregation = 'hallaluja_175_5.ly';
 -%]

heilges_kreuz_sei_hochverehret/assignments.tt

@@ -4,7 +4,7 @@
         melody = 'Graz 1855, Salzburg 1878'
     };
     scores = {
-        leadsheet = 'freie_lieder/heilges_kreuz_sei_hochverehret/heilges_kreuz_sei_hochverehret_leadsheet.ly'
+        leadsheet = 'heilges_kreuz_sei_hochverehret_leadsheet.ly'
-        congregation = 'freie_lieder/heilges_kreuz_sei_hochverehret/heilges_kreuz_sei_hochverehret_lz.ly'
+        congregation = 'heilges_kreuz_sei_hochverehret_lz.ly'
     };
 -%]

hy_bevor_des_tages/assignments.tt

@@ -1,6 +1,6 @@
 [%
     scores = {
-        congregation = 'freie_lieder/hy_bevor_des_tages/hy_bevor_des_tages_lz.ly'
+        congregation = 'hy_bevor_des_tages_lz.ly'
-        leadsheet = 'freie_lieder/hy_bevor_des_tages/hy_bevor_des_tages_full.ly'
+        leadsheet = 'hy_bevor_des_tages_full.ly'
     };
 -%]

ihr_freunde_gottes_allzugleich/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/ihr_freunde_gottes_allzugleich/ihr_freunde_gottes_allzugleich.ly';
+    scores.congregation = 'ihr_freunde_gottes_allzugleich.ly';
 -%]

kyrie_xvi/assignments.tt

@@ -1,7 +0,0 @@
-[%
-    scores = {
-        gregorian = 'gregorio_scores/kyrie/kyrie_xvi.gabc'
-    };
-    credits.TM = 'Vat. XVI';
--%]
-[%# Accompanyment available. Arragngement Berthold Hummel%]

kyrie_xvi/kyrie_xvi.tt

@@ -0,0 +1,9 @@
+\song{[% purpose %]}{}{%
+[% IF parts == 'choir' -%]
+    \lilypondfile{library/freie_lieder/kyrie_xvi/kyrie_xvi_schola.ly}%
+[% ELSIF parts != 0 -%]
+    \lilypondfile{library/freie_lieder/kyrie_xvi/kyrie_xvi_full.ly}%
+[% ELSE -%]
+    \lilypondfile{library/freie_lieder/kyrie_xvi/kyrie_xvi_lz.ly}%
+[% END -%]
+}

kyrie_xvi/kyrie_xvi_vars.ly

@@ -5,39 +5,44 @@
 
 chant.meta = {
     \key f \major
-    \repeat volta 2 {s4*9}
+    \repeat volta 2 {s4*6}
     \repeat volta 2 {s4*7}
-    \repeat volta 2 {s4*10} \finalis
+    s4*6 \finalis
+    s4*8 \finalis
 }
 chant.cantus = \fixed c' {
-    \repeat volta 2 { f4 g( a) \melisma a4 \melismaEnd a f g a a }
+    \repeat volta 2 { \melisma a4 \melismaEnd a f g a a }
     \repeat volta 2 {c' a (b) g g a a}
-    \repeat volta 2 {f4 g( a) \melisma a4 \melismaEnd a f g a a s}
+    \melisma a \melismaEnd a f g a a
+    \melisma a \melismaEnd a f g (f) e d
 }
 chant.A = \relative c' {
-    \repeat volta 2 {d2 s4 e2 s4 d2 e4}
+    \repeat volta 2 {f2 s4 d2 e4}
     \repeat volta 2 {e2 s d2 e4}
-    \repeat volta 2 {d2 s4 e2 s4 d2 e4 s}
+    f2 s4 d2 e4
+    f2 s4 d2 c4 a
 }
 chant.T = \relative {
-    \repeat volta 2 {a2( s4 a2) s4 b2 c4}
+    \repeat volta 2 {a2 s4 b2 c4}
     \repeat volta 2 {c2 s d c4}
-    \repeat volta 2 {a2( s4 a2) s4 b2 c4 s}
+    a2 s4 b2 c4
+    a2 s4 b2 g4 f
 }
 chant.B = \relative {
-    \repeat volta 2 {d2 s4 c2 s4 b2 a4}
+    \repeat volta 2 {d2 s4 b2 a4}
     \repeat volta 2 {a2 s b2 a4}
-    \repeat volta 2 {d2 s4 c2 s4 b2 a4 s}
+    d2 s4 b2 a4
+    d2 s4 b2 c4 d
 }
 chant.verba = \lyricmode {
     \set stanza = "V/A"    
-    Ky -- ri -- e e -- le -- i son.
+    Ky -- ri -- e, e -- le -- i -- son.
     \set stanza = "V/A"    
-    Chri -- ste e -- le -- i -- son.
+    Chri -- ste, er -- le -- i son.
     \set stanza = "V"    
-    Ky -- ri -- e e -- le -- i son.
+    Ky -- ri -- e, e -- le -- i -- son.
     \set stanza = "A"    
-    Ky -- ri -- e e -- le -- i son.
+    Ky -- ri -- e, e -- le -- i -- son.
 }
 
 VocalScore = 

maria_durch_ein_dornwald_ging/assignments.tt

@@ -1,8 +1,8 @@
 [%
     title = 'Maria durch ein Dornwald ging';
     scores = {
-        band = 'freie_lieder/maria_durch_ein_dornwald_ging/maria_durch_ein_dornwald_ging_leadsheet.ly'
+        band = 'maria_durch_ein_dornwald_ging_leadsheet.ly'
-        SATB = 'freie_lieder/maria_durch_ein_dornwald_ging/maria_durch_ein_dornwald_ging_SATB.ly'
+        SATB = 'maria_durch_ein_dornwald_ging_SATB.ly'
-        congregation = 'freie_lieder/maria_durch_ein_dornwald_ging/maria_durch_ein_dornwald_ging_lz.ly'
+        congregation = 'maria_durch_ein_dornwald_ging_lz.ly'
     };
 -%]

o_haupt_voll_blut_und_wunden/assignments.tt

@@ -1,8 +1,8 @@
 [%
     song_title = "O Haupt voll Blut und Wunden";
     scores = {
-        congregation = "freie_lieder/o_haupt_voll_blut_und_wunden/o_haupt_voll_blut_und_wunden_lz.ly"
+        congregation = "o_haupt_voll_blut_und_wunden_lz.ly"
-        leadsheet = "freie_lieder/o_haupt_voll_blut_und_wunden/o_haupt_voll_blut_und_wunden_leadsheet.ly"
+        leadsheet = "o_haupt_voll_blut_und_wunden_leadsheet.ly"
     };
     credits = {
         lyrics = "Paul Gerhardt 1656 nach ``Salve, caput cruentatum'' des Arnulf von Löwn vor 1250"

o_heiland_reiss_die_himmel_auf/assignments.tt

@@ -1,7 +1,7 @@
 [%
     song_title = "O Heiland, reiß die Himmel auf";
     scores = {
-        congregation = "freie_lieder/o_heiland_reiss_die_himmel_auf/o_heiland_reiss_die_himmel_auf_lz.ly"
+        congregation = "o_heiland_reiss_die_himmel_auf_lz.ly"
-        SATB = "freie_lieder/o_heiland_reiss_die_himmel_auf/o_heiland_reiss_die_himmel_auf_SATB.ly"
+        SATB = "o_heiland_reiss_die_himmel_auf_SATB.ly"
     };
 -%]

preise_zunge_und_verkuende/assignments.tt

@@ -1,5 +1,5 @@
 [%
     parts = {
-        schola = "freie_lieder/co_preise_zunge_und_verkuende/preise_zunge_und_verkuende_full.ly"
+        schola = "preise_zunge_und_verkuende_full.ly"
     };
 -%]

resp_herr_auf_dich_vertraue_ich/assignments.tt

@@ -1,6 +1,6 @@
 [%
     scores = {
-        congregation = 'freie_lieder/resp_herr_auf_dich_vertraue_ich/resp_herr_auf_dich_vertraue_ich_lz.ly'
+        congregation = 'resp_herr_auf_dich_vertraue_ich_lz.ly'
-        leadsheet = 'freie_lieder/resp_herr_auf_dich_vertraue_ich/resp_herr_auf_dich_vertraue_ich_full.ly'
+        leadsheet = 'resp_herr_auf_dich_vertraue_ich_full.ly'
     };
 -%]

rorate_modern/assignments.tt

@@ -1,9 +1,9 @@
 [%
     song_title = "Rorate Cæli";
     scores = {
-        band = "freie_lieder/rorate_modern/rorate_modern_full"
+        band = "rorate_modern_full"
-        SATB = "freie_lieder/rorate_modern/rorate_modern_schola"
+        SATB = "rorate_modern_schola"
-        congregation = "freie_lieder/rorate_modern/rorate_modern_lz"
+        congregation = "rorate_modern_lz"
     };
-    after_song = '\mytable{freie_lieder/rorate_modern/table.tex}'
+    after_song = "\mytable{${directory}/table.tex}"
 -%]

sagt_an_wer_ist_doch_diese/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    congregation = 'freie_lieder/sagt_an_wer_ist_doch_diese_lyrics/sagt_an_wer_ist_doch_diese_lyrics.ly';
+    congregation = 'sagt_an_wer_ist_doch_diese_lyrics.ly';
 -%]

sankt_michael/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/sankt_michael/sankt_michael.ly';
+    scores.congregation = 'sankt_michael.ly';
 -%]

segne_du_maria/assignments.tt

@@ -1,4 +1,4 @@
 [%
     title = 'Segne du Maria';
-    scores.congregation = 'freie_lieder/segne_du_maria/segne_du_maria.ly';
+    scores.congregation = 'segne_du_maria.ly';
 -%]

selig_wem_christus/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/selig_wem_christus/selig_wem_christus.ly';
+    scores.congregation = 'selig_wem_christus.ly';
 -%]

tauet_himmel/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/tauet_himmel/tauet_himmel.ly';
+    scores.congregation = 'tauet_himmel.ly';
 -%]

telemann_ich_will_den_herrn_loben/assignments.tt

@@ -1,4 +1,4 @@
 [%
-    scores.congregation = 'freie_lieder/telemann_ich_will_den_herrn_loben/telemann_ich_will_den_herrn_loben.ly';
+    scores.congregation = 'telemann_ich_will_den_herrn_loben.ly';
     credits.TM = 'Georg Philipp Telemann';
 -%]

tochter_zion/assignments.tt

@@ -1,3 +1,3 @@
 [%
-    scores.congregation = 'freie_lieder/tochter_zion/tochter_zion.ly';
+    scores.congregation = 'tochter_zion.ly';
 -%]

v_o_gott_komm_mir/assignments.tt

@@ -1,6 +1,6 @@
 [%
     scores = {
-        congregation = 'freie_lieder/v_o_gott_komm_mir/v_o_gott_komm_mir_lz.ly'
+        congregation = 'v_o_gott_komm_mir_lz.ly'
-        leadsheet = 'freie_lieder/v_o_gott_komm_mir/v_o_gott_komm_mir_full.ly'
+        leadsheet = 'v_o_gott_komm_mir_full.ly'
     };
 -%]

veni_immanuel/assignments.tt

@@ -1,7 +1,7 @@
 [%
     song_title = 'Veni Immanuel';
     scores = {
-        SATB = 'freie_lieder/veni_immanuel/veni_immanuel_de_SATB.ly'
+        SATB = 'veni_immanuel_de_SATB.ly'
-        congregation = 'freie_lieder/veni_immanuel/veni_immanuel_de_lz.ly'
+        congregation = 'veni_immanuel_de_lz.ly'
     };
 -%]

veni_immanuel/veni_immanuel_vars.ly

@@ -229,11 +229,11 @@ Song.DE.MelodyScore = <<
       \consists Merge_rests_engraver
     } <<
       \partial 4
-      {\voiceOne
+      {
-        \new Voice = "verse" {\Song.Voice.Verse}
+        \new Voice = "verse" <<\voiceOne \Song.Voice.Verse>>
-        \new Voice = "chorus" {\Song.Voice.Chorus \bar "|."}
+        \new Voice = "chorus" <<\voiceOne \Song.Voice.Chorus \bar "|.">>
       }
-      {\voiceTwo \Song.Voice.A}
+      <<\voiceTwo \Song.Voice.A>>
   >>
     \new Lyrics <<
       \lyricsto "verse" {\Song.Lyrics.German.VerseI }