From a3866474a63dceade6d0b34b690253c2c9bfda48 Mon Sep 17 00:00:00 2001
From: Midgard <midgard@zeus.ugent.be>
Date: Tue, 3 Nov 2020 03:36:15 +0100
Subject: [PATCH] Update to match changed song

---
 parts-keys.ly    | 22 ++++++++++++++++------
 parts-strings.ly | 38 +++++++++++++++++++++++++++++++-------
 parts-vocals.ly  | 19 +++++++++++++------
 3 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/parts-keys.ly b/parts-keys.ly
index a5314b7..517a9c3 100644
--- a/parts-keys.ly
+++ b/parts-keys.ly
@@ -43,6 +43,16 @@ pianoLHChorus = \relative c {
 	b1 | g | d' | a |
 	b1 | g | d' | a |
 }
+pianoRHChorusII = \relative c'' {
+	b8 d fs <b, d a'>4. b8 d |
+	b  d a' <b, d g >4. b8 d |
+	a  d fs <a, d g >4. a8 d |
+	a cs e a, cs fs a, cs |
+	b  d fs <b, d a'>4. b8 d |
+	b  d a' <b, d g >4. b8 d |
+	a  d fs <a, d e >4. a8 d |
+	<a cs e>4. <a cs fs>4. <a cs>4 |
+}
 
 pianoRHMusic = {
 	\meterAndTempo
@@ -61,8 +71,8 @@ pianoRHMusic = {
 	R1*8 % bare chorus
 	\pianoRHChorus % bridge
 	\pianoRHChorus
-	\pianoRHChorus
-	<b' fs'' b''>2\arpeggio r |
+	\pianoRHChorusII
+	<b' d'' fs'' b''>2\arpeggio r |
 	\bar "|."
 }
 
@@ -79,7 +89,7 @@ pianoLHMusic = {
 	R1*8 % bare chorus
 	\pianoLHChorus % bridge
 	\pianoLHChorus
-	\pianoLHChorus
+	R1*8 % final chorus
 	b,2 r |
 	\bar "|."
 }
@@ -87,13 +97,13 @@ pianoLHMusic = {
 
 accordionVerseLHMusic = \fixed c,, {
 	\chordmode { \repeat unfold 2 {
-		b1:m3.5.8_"b" | a:3.5.8_"A" | g:3.5.8_"G" | a:3.5.8_"A"
+		b1:m3.5.8_"Bm" | a:3.5.8_"A" | g:3.5.8_"G" | a:3.5.8_"A"
 	} }
 }
 
 accordionChorusLHMusic = \fixed c,, {
 	\chordmode { \repeat unfold 2 {
-		b1:m3.5.8_"b" | g:3.5.8_"G" | d:3.5.8_"D" | a:3.5.8_"A"
+		b1:m3.5.8_"Bm" | g:3.5.8_"G" | d:3.5.8_"D" | a:3.5.8_"A"
 	} }
 }
 
@@ -163,6 +173,6 @@ accordionLHMusic = {
 	\accordionChorusLHMusic
 	\accordionChorusLHMusic
 	\fixed c,, { \chordmode {
-		b1:m3.5.8_"b"
+		b1:m3.5.8_"Bm"
 	} }
 }
diff --git a/parts-strings.ly b/parts-strings.ly
index 9a6ccd2..516b189 100644
--- a/parts-strings.ly
+++ b/parts-strings.ly
@@ -3,7 +3,33 @@ violinMusic = {
 	\clef "treble"
 	\key b \minor
 
-	\stub
+	% intro
+	\fixed c' { fs1 | a | fs | e2. fs8 g |
+
+	% verse 1
+	fs1\> ~ | fs2. r4\! } |
+	R1*6
+	R1*8 % chorus
+	R1*2
+	R1*8 % verse 2
+	R1*8 % chorus
+
+	\relative c'' {
+		fs2. d4 | a' b2 a4 |
+		fs2. a4 | e2. g8 a |
+		fs2. d4 | b2. b4 |
+		d a'2 g16 a g8 | fs2. e4 |
+		% chorus
+		d1\< ~ | d2.\! r4 | R1*6
+	}
+
+	\relative c'' {
+		fs2. fs4 | g2. fs4 |
+		a4. d, a'4 | a4. cs, e4 |
+		fs2. fs4 | g2. fs4 |
+		a4. d, a'4 | e2 r4 cs |
+		<a' d,>1
+	}
 }
 
 
@@ -25,18 +51,17 @@ celloChorusII = \relative c {
 	fs2 fs4 g | a2. r4 |
 }
 celloChorusIII = \relative c {
-	b8 d4 d8 fs4 a, | g2. r4 |
-	a8 d r8 d fs4 d | cs2. r4 |
+	b1 | b | a2 d  | cs1 |
+	b  | a | d2 fs | cs2
 
-	b'8 d,4 d8 d4 fs, | g2. r4 |
-	fs2 fs4 g | a1 |
+	r4 a | <b d>1
 }
 celloMusic = {
 	\meterAndTempo
 	\clef "bass"
 	\key b \minor
 
-	\fixed c { <b, fs>1 | <cs fs> | <d fs> | e2. d8 cs } |
+	\fixed c { b,1 | cs | d | e2. d8 cs } |
 	\celloVerse
 	\celloChorusI % Drop already included
 	R1*3 % verse
@@ -46,7 +71,6 @@ celloMusic = {
 	R1*8 % bridge
 	R1*8 % chorus
 	\celloChorusIII
-	\fixed c { b,1 }
 	\bar "|."
 }
 
diff --git a/parts-vocals.ly b/parts-vocals.ly
index 3cbc584..169fb52 100644
--- a/parts-vocals.ly
+++ b/parts-vocals.ly
@@ -64,7 +64,7 @@ vocalsILyricsVerseI = \lyricmode {
 	wan -- neer je Zeus W -- P -- I niet kent,
 	en re -- gel -- mat -- ig in de kel -- der van S -- "9" __ _ bent.
 }
-vocalsILyricsChorus = \lyricmode {
+vocalsILyricsChorusI = \lyricmode {
 	\set stanza = "C. "
 	Wel -- kom, wel -- kom, kom naar de kel -- der,
 	in het echt of di -- gi -- taal.
@@ -78,13 +78,20 @@ vocalsILyricsVerseII = \lyricmode {
 	Al die tijd ben~'k nooit al -- leen ge -- weest,
 	die mo -- men -- ten met mijn vrien -- den koes -- ter ik het meest.
 }
+vocalsILyricsChorusII = \lyricmode {
+	\set stanza = "C. "
+	Wel -- kom, wel -- kom, kom naar de kel -- der,
+	zo gaat mijn me -- lo -- die.
+	Wel -- kom, wel -- kom, kom naar de kel -- der,
+	Han -- nes, schrijf meer tekst voor mij.
+}
 vocalsILyrics = {
 	\vocalsILyricsVerseI
-	\vocalsILyricsChorus
+	\vocalsILyricsChorusI
 	\vocalsILyricsVerseII
-	\vocalsILyricsChorus
-	\vocalsILyricsChorus
-	\vocalsILyricsChorus
+	\vocalsILyricsChorusI
+	\vocalsILyricsChorusI
+	\vocalsILyricsChorusII
 }
 
 vocalsIILyrics = \lyricmode {
@@ -104,7 +111,7 @@ staffgroupVocals = \new ChoirStaff <<
 		midiInstrument = "Alto Sax"
 	}
 	\new Voice \vocalsIMusic
-	\addlyrics \vocalsILyrics
+	%\addlyrics \vocalsILyrics
 
 	% --------------------------------