X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lord-you-have-my-heart.ly;h=58ffd41ad48fe8e7c1f1dc15ef2b88d315893b43;hb=HEAD;hp=c5249908e69d07af93280fe49a7dba67e11d95f9;hpb=cdf57606f385bc4493fed4e3860bce0ce657dc40;p=music

diff --git a/lord-you-have-my-heart.ly b/lord-you-have-my-heart.ly
index c524990..58ffd41 100644
--- a/lord-you-have-my-heart.ly
+++ b/lord-you-have-my-heart.ly
@@ -1,463 +1,568 @@
-\version "2.16.0"
+% Chart needs to be added
+
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #18
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+staffSize = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans)
-		{ \fontsize #3.5 "Lord You Have My Heart" } }
+		{ \fontsize #3.5 "Lord, You Have My Heart" } }
 %	composer = \markup { \override #'(font-family . sans) "" }
 	arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.2"
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
+% Useful tweak abbreviations (hn = harmony note)
+
+hn = #(define-music-function (parser location arg) (ly:music?)
+;; Harmony Note: Set the tweaks property of the passed in note to use a smaller font
+
+  (set! (ly:music-property arg 'tweaks)
+    (acons 'font-size -3.0 (ly:music-property arg 'tweaks))) arg)
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c'
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key e \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	R1 |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	R1 \bar "||:"   % 4
+	s1*4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
-		R1 |   % 5
-		R1 |   % 6
-		R1 |   % 7
-		R1 |   % 8
+		\mark \markup { \override #'(font-family . sans) { \box { 1 } } }
+		s1^\markup { Band In w/Rhodes Fig. } |   % 5
+		s1*3 |   % 6-8
 	}
 
 	\repeat volta 2
 	{
 		% Verse
-	
-		R1 |   % 9
-		R1 |   % 10
-		R1 |   % 11
-		R1 |   % 12
-		R1 |   % 13
-		R1 |   % 14
-		R1 |   % 15
-		R1 |   % 16
-	
-		R1 |   % 17
-		R1 |   % 18
-		R1 |   % 19
-		R1 |   % 20
-		R1 |   % 21
-		R1 |   % 22
-		R1 |   % 23
-		R1 |   % 24
+
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1^\markup { Piano, Ac. Gtr. tacet 1st X } |   % 9
+		s1*15 \bar "||"   % 10-24
 
 		% Chorus
 
-		R1 \bar "||"   % 25
-		R1 |   % 26
-		R1 |   % 27
-		R1 |   % 28
-		R1 |   % 29
-		R1 |   % 30
-		R1 |   % 31
-		R1 |   % 32
-		R1 |   % 33
-		R1 |   % 34
-		R1 |   % 35
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1^\markup { Full Band } |   % 25
+		s1*10 |   % 26-35
 	}
 	\alternative
 	{
 		{
-			R1 |   % 36
-			R1 |   % 37
-			R1 \bar "||"   % 38
-
-			R1 |   % 39
-			R1 |   % 40
-			R1 |   % 41
-			R1 |   % 42
+			s1*3 \bar "||"   % 36-38
+
+			s1*4 |   % 39-42
 		}
 		{
-			R1 |   % 43
+			s1 |   % 43
 		}
 	}
 
-	R1 |   % 44
-	R1 |   % 45
-	R1 |   % 46
-	R1 |   % 47
-	R1 |   % 48
-	R1 \bar "||"   % 49
+	s1*6 \bar "||"   % 44-49
 
-	R1 |   % 50
-	R1 |   % 51
-	R1 |   % 52
-	R1 \bar "||"   % 53
+	s1*4 \bar "||"   % 50-53
 
-	R1 |   % 54
-	R1 |   % 55
-	R1 |   % 56
-	R1 \bar "||:"   % 57
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s1^\markup { BIG! } |   % 54
+	s1*3 \bar ".|:-||"   % 55-57
 
 	\repeat volta 2
 	{
-		R1 |   % 58
-		R1 |   % 59
-		R1 |   % 60
+		\mark \markup { \override #'(font-family . sans) { \box { D } } }
+		s1*3 |   % 58-60
 	}
 	\alternative
 	{
 		{
-			R1 |   % 61
+			s1 |   % 61
 		}
 		{
-			R1 |   % 62
+			s1 |   % 62
 		}
 	}
 
 	\repeat volta 2
 	{
-		R1 |   % 63
-		R1 |   % 64
-		R1 |   % 65
-		R1 |   % 66
+		\mark \markup { \override #'(font-family . sans) { \box { E } } }
+		s1^\markup { Open } |   % 63
+		s1*3 |   % 64-66
 	}
 
-	R1 |   % 67
-	R1 |   % 68
-	R1 |   % 69
-	R1 |   % 70
-	R1 |   % 71
-	R1 |   % 72
-	r1^\fermata \bar "|."   % 73
+	\mark \markup { \override #'(font-family . sans) { \box { F } } }
+	s1^\markup { On Cue } |   % 67
+	s1*6 \bar "|."   % 68-73
 }
 
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	% Intro
+
+	s1*8 |   % 1-8
+
+	% Verse
+
+	gs4 gs8 a ~ a gs4 e8 ~ |   % 9
+	e2. r8 cs |   % 10
+	e4 gs8 fs ~ fs e4 b8 ~ |   % 11
+	b2. r4 |   % 12
+	gs'4 gs8 a ~ a gs4 e8 ~ |   % 13
+	e4 r8 gs fs4. e8 |   % 14
+	e1 |   % 15
+	R1 |   % 16
+
+	gs4 gs8 a ~ a gs4 e8 ~ |   % 17
+	e2. r8 cs |   % 18
+	e4 gs8 fs ~ fs e4 b8 ~ |   % 19
+	b2. r4 |   % 20
+	gs'4 gs8 a ~ a gs4 e8 ~ |   % 21
+	e4 r8 gs fs4. e8 |   % 22
+	e1 |   % 23
+	r2 r4 r8 b |   % 24
+
+	% Chorus
+
+	gs'2 a |   % 25
+	b2 e,4. ( fs8 ) |   % 26
+	<< { \voiceOne fs1 ~ } \context Voice = vEcho { \voiceTwo <\hn fs \hn ds>2 <\hn gs \hn e> } >>  |   % 27
+	<< { \voiceOne fs2 r4 r8 \stemDown b, \stemNeutral } \context Voice = vEcho { \voiceTwo <\hn a' \hn fs>2 <\hn cs \hn a>4. ( \stemUp <\hn b \hn gs>8 ) \stemNeutral } >> |   % 28
+	<< { \voiceOne gs2 a } \context Voice = vEcho { \voiceTwo <\hn b \hn gs>1 } >> |   % 29
+	<< { \voiceOne b4 e,8 e ~ e fs4 fs8 ~ } \context Voice = vEcho { \voiceTwo s1 } >> |   % 30
+	<< { \voiceOne fs1 } \context Voice = vEcho { \voiceTwo <\hn fs \hn ds>2 <\hn gs \hn e> } >> |   % 31
+	<< { \voiceOne r2 r4 r8 \stemDown b, \stemNeutral } \context Voice = vEcho { \voiceTwo <\hn a' \hn fs>4 <\hn gs \hn e>8 <\hn a \hn fs> ~ <\hn a \hn fs> <\hn cs \hn a>4 ( \stemUp <\hn b \hn gs>8 ) \stemNeutral } >> |   % 32
+	<< { \voiceOne gs2 a } \context Voice = vEcho { \voiceTwo <\hn b \hn gs>1 } >> |   % 33
+	<< { \voiceOne b2 e,4. ( fs8 ) } \context Voice = vEcho { \voiceTwo s1 } >> |   % 34
+	<< { \voiceOne fs1 } \context Voice = vEcho { <\hn fs \hn ds>2 <\hn gs \hn e>4. ( <\hn fs \hn ds>8 ) } >>  |   % 35
+
+	<< { \voiceOne r2 r4 <e \hn a> } \context Voice = vEcho { \voiceTwo \hn fs2. s4 } >> \oneVoice |   % 36
+	<e \hn a>2 <gs \hn cs> |   % 37
+	<fs \hn b>2. <e \hn gs>4 |   % 38
+
+	<e \hn gs>1 |   % 39
+	R1 |   % 40
+	R1 |   % 41
+	R1 |   % 42
+
+	r2 r4 e |   % 43
+
+	e2 gs |   % 44
+	fs2. e4 |   % 45
+	e1 ~ |   % 46
+	e2 r4 <e \hn b \hn gs> |   % 47
+	<e \hn cs \hn a>2 <gs \hn e \hn b> |   % 48
+	<fs \hn ds \hn b>2. <e \hn b \hn a>4 |   % 49
+
+	<e \hn b \hn gs>1 ~ |   % 50
+	<e \hn b \hn gs>1 |   % 51
+	R1 |   % 52
+	R1 |   % 53
+
+	R1 |   % 54
+	R1 |   % 55
+	R1 |   % 56
+	r2 r4 <e \hn b \hn gs> |   % 57
+
+	<e \hn cs \hn a>2 <gs \hn e \hn b> |   % 58
+	<fs \hn ds \hn b>2. <e \hn b \hn a>4 |   % 59
+	<e \hn b \hn gs>1 |   % 60
+
+	r2 r4 <e \hn b \hn gs> |   % 61
+
+	r2 r4 <e \hn b \hn gs' \hn b \hn e> |   % 62
+
+	<e \hn cs \hn a' \hn cs \hn e>2 <gs \hn e \hn b' \hn e \hn gs> |   % 63
+	<fs \hn ds \hn b' \hn ds \hn fs>2. <e \hn b \hn a' \hn b \hn e>4 |   % 64
+	<e \hn b \hn gs' \hn b \hn e>1 |   % 65
+	r2 r4 <e \hn b \hn gs' \hn b \hn e> |   % 66
+
+	<e \hn cs \hn a' \hn cs \hn e>2 <gs \hn e \hn b' \hn e \hn gs> |   % 67
+	<fs \hn ds \hn b' \hn ds \hn fs>2. <e \hn b \hn a' \hn b \hn e>4 |   % 68
+	<e \hn b \hn gs' \hn b \hn e>1 |   % 69
+	r2 r4 <e \hn b \hn gs' \hn b \hn e> |   % 70
+	<e \hn cs \hn a' \hn cs \hn e>2 <gs \hn e \hn b' \hn e \hn gs> |   % 71
+	<fs \hn ds \hn b' \hn ds \hn fs>2. <e \hn b \hn a' \hn b \hn e>4 |   % 72
+	<e \hn b \hn gs' \hn b \hn e>1^\fermata |   % 73
+}
+
+
 LeadVoxText = \lyricmode
 {
-	Lord, you have my heart and I will search for yours,
-	Je- sus take my life and lead me on.
-	Lord, you have my heart and I will search for yours,
-	Let me be to you a sa- cri- fice.
+	Lord, you have _ my heart _ and I will search _ for yours, _
+	Je -- sus take _ my life _ and lead me on.
+	Lord, you have _ my heart _ and I will search _ for yours, _
+	Let me be _ to you _ a sac -- ri -- fice.
+
+	And I will praise you _ Lord, _
+	and I will sing of love _ come down, _
+	And as you show your _ face,
+	we'll see your glo -- ry here.
+
+	We'll see your glo -- ry here. _
+	We'll see your glo -- ry here. _
+	We'll see your glo -- ry here.
+	We'll
+
+	We'll see your glo -- ry here.
+	We'll see your glo -- ry here.
+	We'll see your glo -- ry here.
+}
 
-	And I will praise you Lord
+LeadVoxEcho = \lyricmode
+{
+	I will praise you, _ Lord,
+	I will sing of love _ come _ down,
+	show your _ face
 }
 
 
+Cross = { \override NoteHead #'style = #'cross }
+Norm = { \revert NoteHead #'style }
+
 %
-% Chord names
+% Riffs
 %
-
-Chords = \chordmode
+Riffs = \relative c'
 {
-%Bah, can't we set this globally?
-%	\popChords
+	\tiny
 
-	% Intro
+	<< { \voiceTwo cs1 } \context Voice = vb { \voiceOne \tiny e'8.^\markup { \italic { Rhodes fig.; ride cym. } } gs,16 ~ gs8 b ~ b8 cs4 gs8 } >> |   % 1
+	<< { \voiceTwo b,1 } \context Voice = vb { \voiceOne e'8. gs,16 ~ gs8 b ~ b8 cs4 gs8 } >> |   % 2
+	<< { \voiceTwo a,1 } \context Voice = vb { \voiceOne e''8. gs,16 ~ gs8 b ~ b8 cs4 gs8 } >> |   % 3
+	<< { \voiceTwo b,1 } \context Voice = vb { \voiceOne e'8. gs,16 ~ gs8 b ~ b8 cs4 gs8 } >> |   % 4
 
-	 |   % 1
-	 |   % 2
-	 |   % 3
-	 |   % 4
+	<< { \Cross a,4_\markup { \italic { Kick pattern + Snare 2&4 w/Ride } } r r8 a r4 \Norm } \context Voice = vb { \voiceOne r8 b^\markup { \italic { El. Gtr. fig. } } e fs ~ fs2 ~ } >> |   % 5
+	<< { \Cross a,4 r r8 a r4 \Norm } \context Voice = vb { \voiceOne fs'1 } >> |   % 6
+	<< { \Cross a,4 r r8 a r4 \Norm } \context Voice = vb { \voiceOne r8 b e fs ~ fs2 ~ } >> |   % 7
+	<< { \Cross a,4 r r8 a r4 \Norm } \context Voice = vb { \voiceOne fs'1 } >> |   % 8
 
-	\repeat volta 2
-	{
-		 |   % 5
-		 |   % 6
-		 |   % 7
-		 |   % 8
-	}
+	s1^\markup { \italic { Snare 2&4 w/Hat } } |   % 9
 
-	\repeat volta 2
-	{
-		% Verse
-	
-		 |   % 9
-		 |   % 10
-		 |   % 11
-		 |   % 12
-		 |   % 13
-		 |   % 14
-		 |   % 15
-		 |   % 16
-	
-		 |   % 17
-		 |   % 18
-		 |   % 19
-		 |   % 20
-		 |   % 21
-		 |   % 22
-		 |   % 23
-		 |   % 24
+	s1*13
 
-		% Chorus
+	s1^\markup { \italic { Ac. Gtr. In } } |   % 23
 
-		 |   % 25
-		 |   % 26
-		 |   % 27
-		 |   % 28
-		 |   % 29
-		 |   % 30
-		 |   % 31
-		 |   % 32
-		 |   % 33
-		 |   % 34
-		 |   % 35
-	}
-	\alternative
-	{
-		{
-			 |   % 36
-			 |   % 37
-			 |   % 38
-
-			 |   % 39
-			 |   % 40
-			 |   % 41
-			 |   % 42
-		}
-		{
-			 |   % 43
-		}
-	}
+	s1
 
-	 |   % 44
-	 |   % 45
-	 |   % 46
-	 |   % 47
-	 |   % 48
-	 |   % 49
+	s1^\markup { \italic { Snare 2&4 w/Ride } } |   % 25
 
-	 |   % 50
-	 |   % 51
-	 |   % 52
-	 |   % 53
+	s1*11
 
-	 |   % 54
-	 |   % 55
-	 |   % 56
-	 |   % 57
+	s1^\markup { \italic { Cym. Colors } } |   % 37
+	s1
+	s1^\markup { \italic { w/Rhodes & Gtr figs. } } |   % 39
 
-	\repeat volta 2
-	{
-		 |   % 58
-		 |   % 59
-		 |   % 60
-	}
-	\alternative
-	{
-		{
-			 |   % 61
-		}
-		{
-			 |   % 62
-		}
-	}
+	s1*10
 
-	\repeat volta 2
-	{
-		 |   % 63
-		 |   % 64
-		 |   % 65
-		 |   % 66
-	}
+	s1^\markup { \italic { w/Rhodes & Gtr figs., Cym. Clrs } } |   % 50
+
+	s1*3
+
+	s1^\markup { \italic { Snare 2&4 w/Ride } } |   % 54
 
-	 |   % 67
-	 |   % 68
-	 |   % 69
-	 |   % 70
-	 |   % 71
-	 |   % 72
-	 |   % 73
+	\normalsize
 }
 
 
 %
-% Chord rhythms
+% Chord names
 %
+Chords = \chordmode
+{
+	% Intro
+
+	s1*4 |   % 1-4
+
+	cs1:m11 |   % 5
+	s1 |   % 6
+	a1:sus2/cs |   % 7
+	s1 |   % 8
+
+	% Verse
+
+	cs1:m7 |   % 9
+	a1:sus2 |   % 10
+	s2 e/gs |   % 11
+	b1:5 |   % 12
+	cs1:m7 |   % 13
+	a2:sus2 b:3.5.11 |   % 14
+	e1 |   % 15
+	b1/ds |   % 16
+
+	cs1:m7 |   % 17
+	a1:sus2 |   % 18
+	s2 e/gs |   % 19
+	b1:5 |   % 20
+	cs1:m7 |   % 21
+	a2:sus2 b:3.5.11 |   % 22
+	e1 |   % 23
+	s1 |   % 24
+
+	% Chorus
+
+	e1 |   % 25
+	a2:sus2 e/gs |   % 26
+	b2 b:sus4 |   % 27
+	b2 b:sus4 |   % 28
+	e1 |   % 29
+	a2:sus2 e/gs |   % 30
+	b2 b:sus4 |   % 31
+	b2 b:sus4 |   % 32
+	e1 |   % 33
+	a2:sus2 e/gs |   % 34
+	b2 b:sus4 |   % 35
+
+	b1 |   % 36
+	a2:sus2 e/gs |   % 37
+	b1:sus4 |   % 38
+
+	cs1:m11 |   % 39
+	s1 |   % 40
+	a1:sus2/cs |   % 41
+	s1 |   % 42
+
+	b1 |   % 43
+
+	a2:sus2 e/gs |   % 44
+	b2. b4:sus4 |   % 45
+	e1 |   % 46
+	s1 |   % 47
+	a2:sus2 e/gs |   % 48
+	b2. b4:sus4 |   % 49
+
+	cs1:m11 |   % 50
+	s1 |   % 51
+	a1:sus2/cs |   % 52
+	s1 |   % 53
+
+	a2:sus2 e/gs |   % 54
+	b2. b4:sus4 |   % 55
+	e1 |   % 56
+	s1 |   % 57
+
+
+	a2:sus2 e/gs |   % 58
+	b2 b:sus4 |   % 59
+	e1 |   % 60
+
+	s1 |   % 61
+
+	e1 |   % 62
+
+	a2:sus2 e/gs |   % 63
+	b2 b:sus4 |   % 64
+	e1 |   % 65
+	s1 |   % 66
+
+	a2:sus2 e/gs |   % 67
+	b2. b4:sus4 |   % 68
+	cs1:m7 |   % 69
+	cs1:m/b |   % 70
+	a2:sus2 e/gs |   % 71
+	b2. b4:sus4 |   % 72
+	e1 |   % 73
+}
 
-% Use a RhythmicStaff on the chords instead of this?
-% It almost works, but not quite. Doesn't collapse chords above to single notes...
 
+%
+% Chord rhythms
+%
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
-	c4 c c c |   % 1
-	c4 c c c |   % 2
-	c4 c c c |   % 3
-	c4 c c c \bar "||:"   % 4
-
-	\repeat volta 2
-	{
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-		c4 c c c |   % 8
-	}
-
-	\repeat volta 2
-	{
-		% Verse
-	
-		c4 c c c |   % 9
-		c4 c c c |   % 10
-		c4 c c c |   % 11
-		c4 c c c |   % 12
-		c4 c c c |   % 13
-		c4 c c c |   % 14
-		c4 c c c |   % 15
-		c4 c c c |   % 16
-	
-		c4 c c c |   % 17
-		c4 c c c |   % 18
-		c4 c c c |   % 19
-		c4 c c c |   % 20
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-
-		% Chorus
-
-		c4 c c c \bar "||"   % 25
-		c4 c c c |   % 26
-		c4 c c c |   % 27
-		c4 c c c |   % 28
-		c4 c c c |   % 29
-		c4 c c c |   % 30
-		c4 c c c |   % 31
-		c4 c c c |   % 32
-		c4 c c c |   % 33
-		c4 c c c |   % 34
-		c4 c c c |   % 35
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 36
-			c4 c c c |   % 37
-			c4 c c c \bar "||"   % 38
-
-			c4 c c c |   % 39
-			c4 c c c |   % 40
-			c4 c c c |   % 41
-			c4 c c c |   % 42
-		}
-		{
-			c4 c c c |   % 43
-		}
-	}
+	s1*4 |   % 1-4
+
+	c1 ~ |   % 5
+	c1 |   % 6
+	c1 ~ |   % 7
+	c1 |   % 8
+
+	% Verse
+
+	c1 |   % 9
+	c1 |   % 10
+	c2 c |   % 11
+	c1 |   % 12
+	c1 |   % 13
+	c2 c |   % 14
+	c1 |   % 15
+	c1 |   % 16
+
+	c1 |   % 17
+	c1 |   % 18
+	c2 c |   % 19
+	c1 |   % 20
+	c1 |   % 21
+	c2 c |   % 22
+	c1 |   % 23
+	c8 c c c c c c c |   % 24
+
+	% Chorus
+
+	c4 c c c |   % 25
+	c4 c c c |   % 26
+	c4 c c c |   % 27
+	c4 c c c |   % 28
+	c4 c c c |   % 29
+	c4 c c c |   % 30
+	c4 c c c |   % 31
+	c4 c c c |   % 32
+	c4 c c c |   % 33
+	c4 c c c |   % 34
+	c4 c c c |   % 35
+
+	c4 c c c |   % 36
+	c2 c |   % 37
+	c1 |   % 38
+
+	c1 ~ |   % 39
+	c1 |   % 40
+	c1 ~ |   % 41
+	c1 |   % 42
+
+	c4 c c c |   % 43
 
 	c4 c c c |   % 44
 	c4 c c c |   % 45
 	c4 c c c |   % 46
 	c4 c c c |   % 47
 	c4 c c c |   % 48
-	c4 c c c \bar "||"   % 49
+	c4 c c c |   % 49
 
-	c4 c c c |   % 50
-	c4 c c c |   % 51
-	c4 c c c |   % 52
-	c4 c c c \bar "||"   % 53
+	c1 ~ |   % 50
+	c1 |   % 51
+	c1 ~ |   % 52
+	c1 |   % 53
 
 	c4 c c c |   % 54
 	c4 c c c |   % 55
 	c4 c c c |   % 56
-	c4 c c c \bar "||:"   % 57
+	c4 c c c |   % 57
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 58
-		c4 c c c |   % 59
-		c4 c c c |   % 60
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 61
-		}
-		{
-			c4 c c c |   % 62
-		}
-	}
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 63
-		c4 c c c |   % 64
-		c4 c c c |   % 65
-		c4 c c c |   % 66
-	}
+	c4 c c c |   % 58
+	c4 c c c |   % 59
+	c4 c c c |   % 60
+
+	c4 c c c |   % 61
+
+	c4 c c c |   % 62
+
+	c4 c c c |   % 63
+	c4 c c c |   % 64
+	c4 c c c |   % 65
+	c4 c c c |   % 66
 
 	c4 c c c |   % 67
 	c4 c c c |   % 68
 	c4 c c c |   % 69
 	c4 c c c |   % 70
-	c4 c c c |   % 71
+	c2 c |   % 71
 	c4 c c c |   % 72
-	c1^\fermata \bar "|."   % 73
+	c1^\fermata |   % 73
+}
+
+
+Dynamics =
+{
+	s1_\mp |   % 1
+
+	s1*3
+
+	s1_\mf |   % 5
+
+	s1*18
+
+	s1_\< |   % 24
+	s1_\f |   % 25
+
+	s1*10
+
+	s4_\> s2 s4_\! |   % 36
+
+	s1*12
+
+	s4 s_\> s s_\! |   % 49
+
+	s1*4
+
+	s1_\f |   % 54
+
+	s1*7
+
+	s1_\< |   % 62
+	s1_\ff |   % 63
+
+	s1*8
+
+	s1_\markup { \italic { Rit. } } |   % 72
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
-%			\new Lyrics \lyricsto "lead" \LeadVoxTextB
+			\new Lyrics \lyricsto "vEcho" \LeadVoxEcho
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+	#(define fonts (make-pango-font-tree
+		"Times New Roman"
+		"LilyJAZZText"
+		"Luxi Mono"
+		(/ staffSize 20)))
+
+% Don't spread staves vertically across last page (default: t)
+%	ragged-last-bottom = ##f
+% Don't spread staves vertically across the page (default: f)
+%	ragged-bottom = ##t
+% Allow partial line for last stave (default: f)
+	ragged-last = ##t
+
+% To find out what's eating the space at the top...
+%	annotate-spacing = ##t
 }
+