Bring in line with current instrumentation

parts-keys.ly

@@ -49,7 +49,8 @@ pianoRHMusic = {
 	\clef "treble"
 	\key b \minor
 
-	\pianoRHVerse % 2
+	R1*4
+	R1*8 % verse 1
 	\pianoRHChorus
 	\clef "treble^8"
 	\fixed c' {
@@ -57,7 +58,7 @@ pianoRHMusic = {
 	}
 	\clef "treble"
 	\pianoRHVerse % 2
-	\pianoRHChorus
+	R1*8 % bare chorus
 	\pianoRHChorus % bridge
 	\pianoRHChorus
 	\pianoRHChorus
@@ -70,11 +71,12 @@ pianoLHMusic = {
 	\clef "bass"
 	\key b \minor
 
-	\pianoLHVerse % 2
+	R1*4
+	R1*8 % verse 1
 	\pianoLHChorus
 	b,8 b r2. | R1 |
 	\pianoLHVerse % 2
-	\pianoLHChorus
+	R1*8 % bare chorus
 	\pianoLHChorus % bridge
 	\pianoLHChorus
 	\pianoLHChorus
@@ -83,36 +85,33 @@ pianoLHMusic = {
 }
 
 
-accordionChords = \chordmode {
-	R1*8
-	R1*8
-	R1*2
-
-	R1*8
-
-	\repeat unfold 2 {
-		b,1:m | a,:9 | g, | a, |
-	}
-	R1*8
-
-	\repeat unfold 4 {
-		b,1:m | g, | d, | a, |
-	}
-	R1
+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"
+	} }
 }
 
-accordionMusic = {
+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"
+	} }
+}
+
+
+accordionRHMusic = {
 	\meterAndTempo
 	\clef "treble"
 	\key b \minor
 
-	R1*8
-	R1*8
+	R1*4
+	R1*8 % Verse 1
+	R1*8 % Chorus
 	R1*2
 
-	R1*8
+	R1*8 % Verse 2
 
 	\relative c'' {
+		% Chorus (bare)
 		\grace {b,8 d fs} b2. r4 |
 		\grace {g,8 b d} g2. r4 |
 		\grace {d8 fs a} d2. r4 |
@@ -124,11 +123,13 @@ accordionMusic = {
 		\grace {a,8 cs e} a2. g4 |
 	}
 	\relative c' {
+		% Bridge (accordion solo)
 		fs2. d4 | a' b2 a4 |
 		fs2. a4 | e2. g8 a |
 		fs2. d4 | b2. b4 |
 		d a'2 g16 a g8 | fs2. e4 |
 
+		% Chorus
 		b2. d4 | g2. fs4 |
 		d2. e4 | cs4. cs d4 |
 		b2. d4 | g2. fs4 |
@@ -137,9 +138,31 @@ accordionMusic = {
 		b2. d4 | g2. fs4 |
 		d2. e4 | cs4. cs d4 |
 		b2. d4 | g2. fs4 |
-		a4. a fs4 | e2. d4 |
+		a4. a fs4 | e2. d8 cs |
 
 		b2 r
 	}
 	\bar "|."
 }
+
+accordionLHMusic = {
+	\meterAndTempo
+	\clef "bass"
+	\key b \minor
+
+	R1*4
+	R1*8 % Verse 1
+	R1*8 % Chorus
+	R1*2
+
+	\accordionVerseLHMusic
+
+	R1*8 % Chorus (bare)
+
+	\accordionChorusLHMusic % Bridge (accordion solo)
+	\accordionChorusLHMusic
+	\accordionChorusLHMusic
+	\fixed c,, { \chordmode {
+		b2:m3.5.8_"b" r2
+	} }
+}

parts-strings.ly

@@ -27,14 +27,16 @@ celloMusic = {
 	\clef "bass_8"
 	\key b \minor
 
+	\fixed c, { b,1 | cs | d | fs } |
 	\celloVerse
 	\celloChorusI
 	R1*2
 	R1*8 % verse
-	\celloChorusII
+	\celloChorusII % bare chorus
 	R1*8 % bridge
-	R1*16 % chorus ×2
-	R1
+	R1*8 % chorus
+	\celloChorusII
+	\fixed c, { e,2 r }
 	\bar "|."
 }
 
@@ -53,6 +55,7 @@ guitarMusic = {
 	\meterAndTempo
 	\key b \minor
 
+	R1*4
 	\guitarVerse
 	\guitarChorus
 	R1*2

parts-vocals.ly

@@ -1,4 +1,4 @@
-vocalsIMusicVerse = \relative c' {
+vocalsIMusicVerseI = \relative c' {
 	r4 b'8 a b a b a | b a~a e~e
 	e e e | d d~d d~d e d4 | cs8 d~d cs~cs4 r |
 	% \break
@@ -6,6 +6,14 @@ vocalsIMusicVerse = \relative c' {
 	e e e | d d d d d d e d | cs d~d cs~cs4 r |
 	% \break
 }
+vocalsIMusicVerseII = \relative c' {
+	r4 b'8 a b a b a | b4 a8 e~e
+	e8 e4 | d8 d d d~d4 d | cs8 d~d cs~cs4 r |
+	% \break
+	r4 b'8 a b a b a | b4 a8 e~e4
+	e8 e | a a a a a a a g | fs g~g fs~fs4 r |
+	% \break
+}
 vocalsIMusicChorus = \relative c'' {
 	b4 b8 b~b b~4 | d8 b b b~b b~4 |
 	d8 d~8 d~d4 d | e cs8 cs~4 r |
@@ -19,10 +27,11 @@ vocalsIMusic = {
 	\clef "treble"
 	\key b \minor
 
-	\vocalsIMusicVerse
+	R1*4
+	\vocalsIMusicVerseI
 	\vocalsIMusicChorus
 	R1*2
-	\vocalsIMusicVerse
+	\vocalsIMusicVerseII
 	\vocalsIMusicChorus
 	R1*8
 	\vocalsIMusicChorus
@@ -64,9 +73,9 @@ vocalsILyricsChorus = \lyricmode {
 }
 vocalsILyricsVerseII = \lyricmode {
 	\set stanza = "2. "
-	In die kel -- der heb ik veel ge -- leerd __ _
+	In die kel -- der heb ik veel ge -- leerd
 	en tot diep in de nacht ge -- prog -- ram -- meerd.
-	Al die tijd ben~'k nooit al -- leen ge -- weest, __ _
+	Al die tijd ben~'k nooit al -- leen ge -- weest,
 	die mo -- men -- ten met mijn vrien -- den koes -- ter ik het meest.
 }
 vocalsILyrics = {

welkom.ly

@@ -1,7 +1,7 @@
 \include "english.ly"
 \version "2.21.4"
 \header {
-	composer = "Zeus WPI"
+	composer = "Tekst en muziek door Felixiaan en Midgard"
 	title = "Welkom"
 	subtitle = \markup{ \concat { "Voor de " \italic{on/off-generatie} } }
 	tagline = ##f
@@ -16,6 +16,7 @@ meterAndTempo = {
 }
 
 stub = {
+	R1*4 % intro
 	R1*8 % verse 1
 	R1*8 % chorus
 	R1*2
@@ -72,7 +73,10 @@ anonymousStaffVocals = {
 				\new Staff \pianoLHMusic
 			>>
 
-			\new Staff \with { instrumentName = "Accordion" shortInstrumentName = "Acc." midiInstrument = "Accordion" } \accordionMusic
+			\new GrandStaff \with { instrumentName = "Accordeon" shortInstrumentName = "Acc." midiInstrument = "Accordion" } <<
+				\new Staff \accordionRHMusic
+				\new Staff \accordionLHMusic
+			>>
 
 			\new StaffGroup <<
 				%\new Staff \with { instrumentName = "Viool" shortInstrumentName = "Vln." midiInstrument = "Violin" } \violinMusic
@@ -96,10 +100,13 @@ anonymousStaffVocals = {
 		\compressMMRests
 		<<
 			\anonymousStaffVocals
-			\new ChordNames { \accordionChords }
-			\new Staff \with { instrumentName = "Accordeon" midiInstrument = "Accordion" } \accordionMusic
+			\new GrandStaff \with { instrumentName = "Accordeon" midiInstrument = "Accordion" } <<
+				\new Staff \accordionRHMusic
+				\new Staff \accordionLHMusic
+			>>
 		>>
 		\layout {}
+		\midi {}
 	}
 }