From 7dca831b591ceb3b174328fdf4c10efa770f5e38 Mon Sep 17 00:00:00 2001
From: Midgard <midgard@zeus.ugent.be>
Date: Sun, 4 Oct 2020 20:21:39 +0200
Subject: [PATCH] Update score

---
 parts-keys.ly    |  4 ++--
 parts-strings.ly | 40 +++++++++++++++++++++++++---------------
 welkom.ly        |  4 ++++
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/parts-keys.ly b/parts-keys.ly
index d78ae7c..a5314b7 100644
--- a/parts-keys.ly
+++ b/parts-keys.ly
@@ -140,7 +140,7 @@ accordionRHMusic = {
 		b2. d4 | g2. fs4 |
 		a4. a fs4 | e2. d8 cs |
 
-		b2 r
+		b1
 	}
 	\bar "|."
 }
@@ -163,6 +163,6 @@ accordionLHMusic = {
 	\accordionChorusLHMusic
 	\accordionChorusLHMusic
 	\fixed c,, { \chordmode {
-		b2:m3.5.8_"b" r2
+		b1:m3.5.8_"b"
 	} }
 }
diff --git a/parts-strings.ly b/parts-strings.ly
index 0daea0b..9a6ccd2 100644
--- a/parts-strings.ly
+++ b/parts-strings.ly
@@ -7,36 +7,46 @@ violinMusic = {
 }
 
 
-celloVerse = \fixed c, {
-	b,1 | cs | d | cs |
-	b,1 | cs | d | cs |
+celloVerse = \fixed c {
+	b,1 | a, | d | e |
+	b,1 | a, | fs | a |
 }
-celloChorusI = \fixed c, {
-	b,1 | fs | d | cs |
-	b,1 | fs | d | cs |
+celloChorusI = \fixed c {
+	b,1 | d | <d a> | <cs a> |
+	<b, g>1 | <d fs> | <d a> | <cs a> |
+
+	<fs b> | R1 |
 }
-celloChorusII = \relative c, {
+celloChorusII = \relative c {
 	b8 d4 d8 fs4 a, | g2. r4 |
-	a8 d r8 d fs4 d | cs4 r2. |
+	a8 d r8 d fs4 d | cs2. r4 |
 
 	b'8 d,4 d8 d4 fs, | g2. r4 |
 	fs2 fs4 g | a2. r4 |
 }
+celloChorusIII = \relative c {
+	b8 d4 d8 fs4 a, | g2. r4 |
+	a8 d r8 d fs4 d | cs2. r4 |
+
+	b'8 d,4 d8 d4 fs, | g2. r4 |
+	fs2 fs4 g | a1 |
+}
 celloMusic = {
 	\meterAndTempo
-	\clef "bass_8"
+	\clef "bass"
 	\key b \minor
 
-	\fixed c, { b,1 | cs | d | fs } |
+	\fixed c { <b, fs>1 | <cs fs> | <d fs> | e2. d8 cs } |
 	\celloVerse
-	\celloChorusI
-	R1*2
-	R1*8 % verse
+	\celloChorusI % Drop already included
+	R1*3 % verse
+	\fixed c { r2. b,8 a, | b,4 r2. | }
+	R1*3
 	\celloChorusII % bare chorus
 	R1*8 % bridge
 	R1*8 % chorus
-	\celloChorusII
-	\fixed c, { e,2 r }
+	\celloChorusIII
+	\fixed c { b,1 }
 	\bar "|."
 }
 
diff --git a/welkom.ly b/welkom.ly
index 6d210eb..071cfad 100644
--- a/welkom.ly
+++ b/welkom.ly
@@ -38,6 +38,7 @@ anonymousStaffVocals = {
 	\new Staff \with {
 		instrumentName = "Zang"
 		% No MIDI instrument
+		\remove "Staff_performer"
 		\magnifyStaff #2/3
 	}
 	\new Voice \vocalsIMusic \addlyrics \vocalsILyrics
@@ -126,6 +127,7 @@ anonymousStaffVocals = {
 			\new Staff \with { instrumentName = "Cello" midiInstrument = "Cello" } \celloMusic
 		>>
 		\layout {}
+		\midi {}
 	}
 }
 
@@ -143,6 +145,7 @@ anonymousStaffVocals = {
 			>>
 		>>
 		\layout {}
+		\midi {}
 	}
 }
 
@@ -157,5 +160,6 @@ anonymousStaffVocals = {
 			\new Voice \vocalsIMusic \addlyrics \vocalsILyrics
 		>>
 		\layout {}
+		\midi {}
 	}
 }