Update music, add part scores

parts-keys.ly

@@ -8,79 +8,97 @@ melodicaMusic = {
 	}
 }
 
+pianoRHVerse = \relative c'' {
+	b8 d fs b, d fs b, d |
+	a cs e a, cs e a, cs |
+	g b d g, b d g, b |
+	a fs' cs a fs' cs a cs |
+	b d fs b, d fs b, d |
+	a cs e a, cs e a, cs |
+	g d' b g d' b g b |
+	a fs' cs a fs' cs a cs |
+}
+pianoLHVerse = \relative c {
+	b4. b b4 |
+	a2 r4 a |
+	g2 r4 g |
+	a2 r4 a |
+	b4. b b4 |
+	a4. a a4 |
+	g4. g g4 |
+	a4. a a4 |
+}
+
+pianoRHChorus = \relative c'' {
+	b8 d fs b, d a' b, d |
+	b d a' b, d g b, d |
+	a d fs a, d g a, d |
+	a cs e a, cs fs a, cs |
+	b d fs b, d a' b, d |
+	b d a' b, d g b, d |
+	a d fs a, d e a, d |
+	a cs e a, cs fs a, cs |
+}
+pianoLHChorus = \relative c {
+	b1 | g | d' | a |
+	b1 | g | d' | a |
+}
+
 pianoRHMusic = {
 	\meterAndTempo
 	\clef "treble"
 	\key b \minor
 
-	\repeat volta 2 {
+	\pianoRHVerse % 2
-	\relative c'' {
+	\pianoRHChorus
-		b8 d fs b, d fs b, d
+	\clef "treble^8"
-		| % 2
+	\fixed c' {
-		a cs e a, cs e a, cs
+		r4 b8 fs' a' cs'' fs'' a'' | b''4 r2. |
-		| % 3
-		g b d g, b d g, b
-		| % 4
-		a fs' cs a fs' cs a cs
-		| % 5
-		b d fs b, d fs b, d
-		| % 6
-		a cs e a, cs e a, cs
-		| % 7
-		g d' b g d' b g b
-		| % 8
-		a fs' cs a fs' cs a cs
-		| % 9
-
-		b8 d fs b, d a' b, d
-		|
-		b d a' b, d g b, d
-		|
-		a d fs a, d g a, d
-		|
-		a cs e a, cs fs a, cs
-		|
-		b d fs b, d a' b, d
-		|
-		b d a' b, d g b, d
-		|
-		a d fs a, d e a, d
-		|
-		a cs e a, cs fs a, cs
-		|
-	}
 	}
+	\clef "treble"
+	\pianoRHVerse % 2
+	\pianoRHChorus
+	\pianoRHChorus % bridge
+	\pianoRHChorus
+	\pianoRHChorus
+	<b' fs'' b''>2\arpeggio r |
+	\bar "|."
 }
 
 pianoLHMusic = {
 	\meterAndTempo
-	\clef "bass_8"
+	\clef "bass"
 	\key b \minor
 
-	\repeat volta 2 {
+	\pianoLHVerse % 2
-	\relative c {
+	\pianoLHChorus
-		b4. b b4
+	b,8 b r2. | R1 |
-		| % 2
+	\pianoLHVerse % 2
-		a2 r4 a
+	\pianoLHChorus
-		| % 3
+	\pianoLHChorus % bridge
-		g2 r4 g
+	\pianoLHChorus
-		| % 4
+	\pianoLHChorus
-		a2 r4 a
+	b,2 r |
-		| % 5
+	\bar "|."
-		b4. b b4
+}
-		| % 6
-		a4. a a4
-		| % 7
-		g4. g g4
-		| % 8
-		a4. a a4
-		| % 9
 
 
-		b,1 | g | d' | a |
+accordionChords = \chordmode {
-		b1  | g | d' | a |
+	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
 }
 
 accordionMusic = {
@@ -88,9 +106,13 @@ accordionMusic = {
 	\clef "treble"
 	\key b \minor
 
-	\repeat volta 2 {
+	R1*8
+	R1*8
+	R1*2
+
+	R1*8
+
 	\relative c'' {
-		R1*8 |
 		\grace {b,8 d fs} b2. r4 |
 		\grace {g,8 b d} g2. r4 |
 		\grace {d8 fs a} d2. r4 |
@@ -101,31 +123,23 @@ accordionMusic = {
 		\grace {d8 fs a} d2. cs4 |
 		\grace {a,8 cs e} a2. g4 |
 	}
+	\relative c' {
+		fs2. d4 | a' b2 a4 |
+		fs2. a4 | e2. g8 a |
+		fs2. d4 | b2. b4 |
+		d a'2 g16 a g8 | fs2. e4 |
+
+		b2. d4 | g2. fs4 |
+		d2. e4 | cs4. cs d4 |
+		b2. d4 | g2. fs4 |
+		a4. a fs4 | e2. r4 |
+
+		b2. d4 | g2. fs4 |
+		d2. e4 | cs4. cs d4 |
+		b2. d4 | g2. fs4 |
+		a4. a fs4 | e2. d4 |
+
+		b2 r
 	}
-	fs'4
 	\bar "|."
 }
-
-
-staffMelodica = \new Staff \with {
-	instrumentName = "Melodica"
-	shortInstrumentName = "Mel."
-	midiInstrument = "Melodica"
-} \melodicaMusic
-
-
-staffAccordion = \new Staff \with {
-	instrumentName = "Accordion"
-	shortInstrumentName = "Acc."
-	midiInstrument = "Accordion"
-} \accordionMusic
-
-
-staffPiano = \new PianoStaff \with {
-	instrumentName = "Piano"
-	shortInstrumentName = "P."
-	midiInstrument = "Grand"
-} <<
-	\new Staff \pianoRHMusic
-	\new Staff \pianoLHMusic
->>

parts-percussion.ly

@@ -3,13 +3,3 @@ percussionMusic = \drummode {
 
 	\stub
 }
-
-
-staffPercussion = \new DrumStaff \with {
-	instrumentName = "Percussie"
-	shortInstrumentName = "Perc."
-} \percussionMusic
-
-staffgroupPercussion = \new StaffGroup <<
-	\staffPercussion
->>

parts-strings.ly

@@ -7,81 +7,60 @@ violinMusic = {
 }
 
 
+celloVerse = \fixed c, {
+	b,1 | cs | d | cs |
+	b,1 | cs | d | cs |
+}
+celloChorusI = \fixed c, {
+	b,1 | fs | d | cs |
+	b,1 | fs | d | cs |
+}
+celloChorusII = \relative c, {
+	b8 d4 d8 fs4 a, | g2. r4 |
+	a8 d r8 d fs4 d | cs4 r2. |
+
+	b'8 d,4 d8 d4 fs, | g2. r4 |
+	fs2 fs4 g | a2. r4 |
+}
 celloMusic = {
 	\meterAndTempo
 	\clef "bass_8"
 	\key b \minor
 
-	\repeat volta 2 {
+	\celloVerse
-
+	\celloChorusI
-	\fixed c, {
+	R1*2
-		b1 | e | d | a |
+	R1*8 % verse
-		b1 | e | d | a |
+	\celloChorusII
-	}
+	R1*8 % bridge
-
+	R1*16 % chorus ×2
-	\relative c, {
+	R1
-		b8 d4 d8 fs4 a,
+	\bar "|."
-		| % 2
-		g2. r4
-		| % 3
-		a8 d r8 d fs4 d
-		| % 4
-		cs4 r2. |
-
-		b'8 d,4 d8 d4 fs,
-		| % 2
-		g2. r4
-		| % 3
-		fs2 fs4 g
-		| % 4
-		a2. r4
-		|
-	}
-
-	}
 }
 
 
-guitarMusic = {
+guitarVerse = \chordmode {
-	\meterAndTempo
-	\key b \minor
-
-	\repeat volta 2 {
-	\chordmode {
 	\repeat unfold 2 {
 		b,1:m | a,:9 | g, | a, |
 	}
+}
+guitarChorus = \chordmode {
 	\repeat unfold 2 {
 		b,:m | g, | d, | a, |
 	}
 }
+guitarMusic = {
+	\meterAndTempo
+	\key b \minor
+
+	\guitarVerse
+	\guitarChorus
+	R1*2
+	\guitarVerse
+	R1*8 % bare chorus
+	R1*8 % bridge
+	\guitarChorus
+	\guitarChorus
+	R1
+	\bar "|."
 }
-}
-
-
-staffViolin = \new Staff \with {
-	instrumentName = "Viool"
-	shortInstrumentName = "Vln."
-	midiInstrument = "Violin"
-} \violinMusic
-
-staffCello = \new Staff \with {
-	instrumentName = "Cello"
-	shortInstrumentName = "Vcl."
-	midiInstrument = "Cello"
-} \celloMusic
-
-chordNames = \new ChordNames {
-	\guitarMusic
-}
-
-staffGuitar = \new Staff \with {
-	instrumentName = "Gitaar"
-	shortInstrumentName = "Gtr."
-	midiInstrument = "Guitar"
-} \guitarMusic
-
-staffgroupStrings = \new StaffGroup <<
-	\staffViolin
-	\staffCello
->>

parts-vocals.ly

@@ -1,10 +1,4 @@
-vocalsIMusic = {
+vocalsIMusicVerse = \relative c' {
-	\meterAndTempo
-	\clef "treble"
-	\key b \minor
-
-	\repeat volta 2 {
-	\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
@@ -12,8 +6,7 @@ vocalsIMusic = {
 	e e e | d d d d d d e d | cs d~d cs~cs4 r |
 	% \break
 }
-
+vocalsIMusicChorus = \relative c'' {
-	\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 |
 	% \break
@@ -21,7 +14,21 @@ vocalsIMusic = {
 	fs4 fs8 fs~4 fs | a4 a8 a8~a4 r |
 	% \break
 }
-}
+vocalsIMusic = {
+	\meterAndTempo
+	\clef "treble"
+	\key b \minor
+
+	\vocalsIMusicVerse
+	\vocalsIMusicChorus
+	R1*2
+	\vocalsIMusicVerse
+	\vocalsIMusicChorus
+	R1*8
+	\vocalsIMusicChorus
+	\vocalsIMusicChorus
+	R1
+	\bar "|."
 }
 
 vocalsIIMusic = {
@@ -41,26 +48,35 @@ vocalsIIIMusic = {
 }
 
 
-vocalsILyrics = \lyricmode {
+vocalsILyricsVerseI = \lyricmode {
 	\set stanza = "1. "
 	Aan de u -- ni -- ver -- si -- teit van Gent
 	ben je als in -- for -- ma -- ti -- cus niet con -- tent,
 	wan -- neer je Zeus W -- P -- I niet kent,
 	en re -- gel -- mat -- ig in de kel -- der van S -- "9" __ _ bent.
-
+}
+vocalsILyricsChorus = \lyricmode {
 	\set stanza = "C. "
 	Wel -- kom, wel -- kom, kom naar de kel -- der,
 	in het echt of di -- gi -- taal.
 	Wel -- kom, wel -- kom, kom naar de kel -- der,
 	start van -- daag je Zeus -- ver -- haal.
 }
-vocalsILyricsStII = \lyricmode {
+vocalsILyricsVerseII = \lyricmode {
 	\set stanza = "2. "
 	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, __ _
 	die mo -- men -- ten met mijn vrien -- den koes -- ter ik het meest.
 }
+vocalsILyrics = {
+	\vocalsILyricsVerseI
+	\vocalsILyricsChorus
+	\vocalsILyricsVerseII
+	\vocalsILyricsChorus
+	\vocalsILyricsChorus
+	\vocalsILyricsChorus
+}
 
 vocalsIILyrics = \lyricmode {
 }
@@ -74,40 +90,39 @@ vocalsIIILyricsStII = \lyricmode {
 
 
 staffgroupVocals = \new ChoirStaff <<
+	\new Staff \with {
+		instrumentName = "Zang"
+		midiInstrument = "Alto Sax"
+	}
+	\new Voice \vocalsIMusic
+	\addlyrics \vocalsILyrics
+
+	% --------------------------------
+
 	%\new Staff \with {
-		%instrumentName = "Zang"
+		%instrumentName = "Felixiaan"
+		%shortInstrumentName = "Fxn."
 		%midiInstrument = "Alto Sax"
 	%}
 	%\new Voice \vocalsIMusic
 	%\addlyrics \vocalsILyrics
 	%\addlyrics \vocalsILyricsStII
 
-	% --------------------------------
+	%\new Staff \with {
+		%instrumentName = "Midgard"
+		%shortInstrumentName = "Mid."
+		%midiInstrument = "Tenor Sax"
+	%}
+	%\new Voice \vocalsIIMusic
+	%\addlyrics \vocalsIILyrics
+	%\addlyrics \vocalsIILyricsStII
 
-	\new Staff \with {
+	%\new Staff \with {
-		instrumentName = "Felixiaan"
+		%instrumentName = "Noctua"
-		shortInstrumentName = "Fxn."
+		%shortInstrumentName = "Noc."
-		midiInstrument = "Alto Sax"
+		%midiInstrument = "Tenor Sax"
-	}
+	%}
-	\new Voice \vocalsIMusic
+	%\new Voice = "vocals3" \vocalsIIIMusic
-	\addlyrics \vocalsILyrics
+	%\addlyrics \vocalsIIILyrics
-	\addlyrics \vocalsILyricsStII
+	%\addlyrics \vocalsIIILyricsStII
-
-	\new Staff \with {
-		instrumentName = "Midgard"
-		shortInstrumentName = "Mid."
-		midiInstrument = "Tenor Sax"
-	}
-	\new Voice \vocalsIIMusic
-	\addlyrics \vocalsIILyrics
-	\addlyrics \vocalsIILyricsStII
-
-	\new Staff \with {
-		instrumentName = "Noctua"
-		shortInstrumentName = "Noc."
-		midiInstrument = "Tenor Sax"
-	}
-	\new Voice = "vocals3" \vocalsIIIMusic
-	\addlyrics \vocalsIIILyrics
-	\addlyrics \vocalsIIILyricsStII
 >>

welkom.ly

@@ -9,12 +9,6 @@
 %#(set-global-staff-size 15)
 #(set-global-staff-size 18)
 #(set-default-paper-size "a4")
-\paper {
-	indent = 3.0\cm  % add space for instrumentName
-	short-indent = 1.5\cm  % add less space for shortInstrumentName
-	%ragged-last-bottom = ##f
-	%ragged-bottom = ##f
-}
 
 meterAndTempo = {
 	\time 4/4
@@ -22,9 +16,15 @@ meterAndTempo = {
 }
 
 stub = {
-	\repeat volta 2 {
+	R1*8 % verse 1
-		R1*16
+	R1*8 % chorus
-	}
+	R1*2
+	R1*8 % verse 2
+	R1*8 % chorus
+	R1*8 % bridge
+	R1*16 % chorus ×2
+	R1
+	\bar "|."
 }
 
 \include "parts-keys.ly"
@@ -33,17 +33,53 @@ stub = {
 \include "parts-vocals.ly"
 
 
+anonymousStaffVocals = {
+	\new Staff \with { midiInstrument = "Alto Sax" }
+	\new Voice \vocalsIMusic \addlyrics \vocalsILyrics
+}
+
+
 \book {
+	\paper {
+		indent = 3.0\cm  % add space for instrumentName
+		short-indent = 1.5\cm  % add less space for shortInstrumentName
+	}
+
 	\score {
 		\compressMMRests
 		<<
-			\chordNames
+			\new ChordNames { \guitarMusic }
-			\staffgroupVocals
+
-			\staffPiano
+			\new ChoirStaff <<
-			\staffgroupStrings
+				\new Staff \with { instrumentName = "Zang" shortInstrumentName = "Zng." midiInstrument = "Alto Sax" }
-			\staffMelodica
+				\new Voice \vocalsIMusic \addlyrics \vocalsILyrics
-			\staffAccordion
+
-			\staffgroupPercussion
+				% --------------------------------
+
+				%\new Staff \with { instrumentName = "Felixiaan" shortInstrumentName = "Fxn." midiInstrument = "Alto Sax" }
+				%\new Voice \vocalsIMusic \addlyrics \vocalsILyrics
+
+				%\new Staff \with { instrumentName = "Midgard" shortInstrumentName = "Mid." midiInstrument = "Tenor Sax" }
+				%\new Voice \vocalsIIMusic \addlyrics \vocalsIILyrics
+
+				%\new Staff \with { instrumentName = "Noctua" shortInstrumentName = "Noc." midiInstrument = "Tenor Sax" }
+				%\new Voice = "vocals3" \vocalsIIIMusic \addlyrics \vocalsIIILyrics
+			>>
+
+			\new PianoStaff \with { instrumentName = "Piano" shortInstrumentName = "P." midiInstrument = "Acoustic Grand" } <<
+				\new Staff \pianoRHMusic
+				\new Staff \pianoLHMusic
+			>>
+
+			\new Staff \with { instrumentName = "Accordion" shortInstrumentName = "Acc." midiInstrument = "Accordion" } \accordionMusic
+
+			\new StaffGroup <<
+				%\new Staff \with { instrumentName = "Viool" shortInstrumentName = "Vln." midiInstrument = "Violin" } \violinMusic
+				\new Staff \with { instrumentName = "Cello" shortInstrumentName = "Vcl." midiInstrument = "Cello" } \celloMusic
+			>>
+
+			%\new DrumStaff \with { instrumentName = "Percussie" shortInstrumentName = "Perc." }
+			%\percussionMusic
 		>>
 		\layout {
 			\context { \GrandStaff \accepts "Lyrics" }
@@ -51,3 +87,30 @@ stub = {
 		\midi {}
 	}
 }
+
+\book {
+	\bookOutputSuffix "accordeon"
+	\header { instrument = "Accordeon" }
+	\score {
+		\compressMMRests
+		<<
+			\anonymousStaffVocals
+			\new ChordNames { \accordionChords }
+			\new Staff \with { midiInstrument = "Accordion" } \accordionMusic
+		>>
+		\layout {}
+	}
+}
+
+\book {
+	\bookOutputSuffix "cello"
+	\header { instrument = "Cello" }
+	\score {
+		\compressMMRests
+		<<
+			\anonymousStaffVocals
+			\new Staff \with { midiInstrument = "Cello" } \celloMusic
+		>>
+		\layout {}
+	}
+}