X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=more-love-more-power.ly;h=4e823e0dcba87291dccbacee821ec2d1d4f3eba9;hb=HEAD;hp=09adfc79c03bf7b2b637d0d893e7d0b8c4af4b1c;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/more-love-more-power.ly b/more-love-more-power.ly
old mode 100755
new mode 100644
index 09adfc7..4e823e0
--- a/more-love-more-power.ly
+++ b/more-love-more-power.ly
@@ -1,8 +1,8 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
 staffSize = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -10,536 +10,566 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "More Love, More Power" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Del Hierro" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.6"
+	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 \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	\repeat volta 2
 	{
-		c4 c c c |   % 1
-		c4 c c c |   % 2
-		c4 c c c |   % 3
-		c4 c c c |   % 4
+		s1^\markup { Half-Time Jazz Rock } |   % 1
+		s1*3 |   % 2-4
 	}
 
 	\repeat volta 2
 	{
 		% Verse
 
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-		c4 c c c |   % 8
-		c4 c c c |   % 9
-		c4 c c c |   % 10
-		c4 c c c |   % 11
-		c4 c c c \bar "||"   % 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 \bar "||"   % 20
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1^\markup { \italic { Groove 2nd X } } |   % 5
+		s1*7 \bar "||"   % 6-12
+
+		\mark \markup { \override #'(font-family . sans) { \box { A9 } } }
+		s1*8 \bar "||"   % 13-20
 
 		% Chorus
 
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		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
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1^\markup { \italic { Backbeat In } } |   % 21
+		s1*14 |   % 22-35
 	}
 	\alternative
 	{
 		{
-			c4 c c c |   % 36
-			c4 c c c |   % 37
-			c4 c c c |   % 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
-			c4 c c c |   % 44
+			s1*9 |   % 36-44
 		}
 		{
-			c4 c c c |   % 45
+			s1 |   % 45
 		}
 	}
 
 	\repeat volta 4
 	{
-		c4 c c c |   % 46
-		c4 c c c |   % 47
+		\mark \markup { \override #'(font-family . sans) { \box { C } } }
+		s1*2 |   % 46-47
 	}
 	\alternative
 	{
 		{
-			c4 c c c |   % 48
-			c4 c c c |   % 49
+			s1*2 |   % 48-49
 		}
 		{
-			c4 c c c |   % 50
-			c4 c c c |   % 51
+			s1*2 |   % 50-51
 		}
 	}
 
 	\repeat volta 2
 	{
-		c4 c c c |   % 52
-		c4 c c c |   % 53
-		c4 c c c |   % 54
-		c4 c c c |   % 55
-		c4 c c c |   % 56
-		c4 c c c |   % 57
-		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
+		\mark \markup { \override #'(font-family . sans) { \box { D } } }
+		s1*14 |   % 52-65
 	}
 	\alternative
 	{
 		{
-			c4 c c c |   % 66
-			c4 c c c |   % 67
+			s1*2 |   % 66-67
 		}
 		{
-			c4 c c c |   % 68
+			s1 |   % 68
 		}
 	}
 
-	c4 c c c |   % 69
+	s1 |   % 69
 
 	\repeat volta 2
 	{
-		c4 c c c |   % 70
-		c4 c c c |   % 71
-		c4 c c c |   % 72
-		c4 c c c |   % 73
+		\mark \markup { \override #'(font-family . sans) { \box { E } } }
+		s1*3 |   % 70-72
+		s1^\markup { \italic { Rit. Last X } } |   % 73
 	}
 
-	c1^\fermata \bar "|."   % 74
-
+	s1 \bar "|."   % 74
+}
 
 
-%{
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
 	% Intro
 
-	R1^\markup { 8th note ballad, s. stick & colors } |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	r2 r4. d8 \bar "||"   % 4
+	s1*4 |   % 1-4
 
 	% Verse
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
-
-	g8 g g g fs4 d8 ( fs |   % 5
-	e4 ) e16 ( d e8 ) d4 r |   % 6
-	r8 g16 g  g a g8  fs fs  g16 a8 ( g16 ) |   % 7
-	g2 r4. d8 |   % 8
-	g8 g g g fs4 d8 ( fs |   % 9
-	e4 ) e16 ( d e8 ) d4 r |   % 10
-	r8 g16 g  g a g8  fs fs  g16 a8 ( g16 ) |   % 11
-	g2 r \bar "||:"   % 12
+	r4 g fs ( e ~ |   % 5
+	<< { \voiceOne e1 ) } \context Voice = vb { \voiceThree \tiny r4 g' fs e ~ \normalsize } >> |   % 6
+	<< { \voiceOne r4 g, fs e ~ } \context Voice = vb { \voiceThree \tiny e'1 \normalsize } >> |   % 7
+	<< { \voiceOne e,1 } \context Voice = vb { \voiceThree \tiny r4 g' fs e ~ \normalsize } >> |   % 8
+	<< { \voiceOne r2 } \context Voice = vb { \voiceThree \tiny e2 \normalsize } >> \oneVoice fs,4 fs |   % 9
+	fs4 ( d8 b ) b fs'4 ( e8 ) |   % 10
+	e1 |   % 11
+	R1 |   % 12
+
+	r4 g fs ( e ~ |   % 13
+	<< { \voiceOne e1 ) } \context Voice = vc { \voiceThree \tiny r4 g' fs e ~ \normalsize } >> |   % 14
+	<< { \voiceOne r4 g, fs e ~ } \context Voice = vc { \voiceThree \tiny e'1 \normalsize } >> |   % 15
+	<< { \voiceOne e,1 } \context Voice = vc { \voiceThree \tiny r4 g' fs e ~ \normalsize } >> |   % 16
+	<< { \voiceOne r2 } \context Voice = vc { \voiceThree \tiny e2 \normalsize } >> \oneVoice fs,4 fs |   % 17
+	fs4 ( d8 b ) b fs'4 ( e8 ) |   % 18
+	e2. b4 |   % 19
+	<e \hn b \hn g>4 <fs \hn d \hn a> <g \hn e \hn b> <b \hn g \hn d> |   % 20
 
 	% Chorus
 
-	\repeat volta 3
-	{
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		c8.^\markup { \italic { 2nd time snare } } c16 c8 b a4 g8 a |   % 13
-		b8 b4 a16 ( g ) g4 r8 g |   % 14
-		c4 c8 b a a a16 g a8 |   % 15
-		b2 r4. g8 |   % 16
-		c4. b16 ( a ) a4. r16 g |   % 17
-		b8. c16 b8 a g e ~ e4 |   % 18
-		r8 g16 g  g a g8  fs fs  g16 a8 ( g16 ) |   % 19
-	}
-	\alternative
-	{
-		{
-			g2 r |   % 20
-			r2 r4.^\markup { \hspace #0.0 \raise #0.65 \bold D.S. } d8 \bar "||"   % 21
-		}
-		{
-			g2 r |   % 22
-		}
-		{
-			g2 r |   % 23
-		}
-	}
+	<a \hn e \hn c>2. <a \hn e \hn c>4 |   % 21
+	<a \hn d, \hn cs>4. <g \hn d \hn cs>8 ~ <g \hn d \hn cs> <fs \hn cs \hn a>4 e8 |   % 22
+	<e \hn b \hn g>2. b4 |   % 23
+	<e \hn b \hn g>4 <fs \hn d \hn a> <g \hn e \hn b> <b \hn g \hn d> |   % 24
+	<a \hn e \hn c>2. <a \hn e \hn c>4 |   % 25
+	<a \hn d, \hn cs>4. <g \hn d \hn cs>8 ~ <g \hn d \hn cs> <fs \hn cs \hn a>4 e8 |   % 26
+	<e \hn b \hn g>2. b4 |   % 27
+	<e \hn b \hn g>4 <fs \hn d \hn a> <g \hn e \hn b> <b \hn g \hn d> |   % 28
+	<a \hn e \hn c>2. <a \hn e \hn c>4 |   % 29
+	<a \hn d, \hn cs>4. <g \hn d \hn cs>8 ~ <g \hn d \hn cs> <fs \hn cs \hn a>4 e8 |   % 30
+	<e \hn b \hn g>2. <b \hn g>4 |   % 31
+	<e \hn b \hn g>4. <fs \hn d \hn a>8 ~ <fs \hn d \hn a> <g \hn e \hn b>4 e8 |   % 32
+	<e \hn c \hn g>1 ~ ( |   % 33
+	<e \hn c \hn g>2 <g \hn e \hn b> |   % 34
+	<fs \hn d \hn a>1 ) |   % 35
+
+	g4. fs8 ~ fs4 d8 e ~ |   % 36
+	e2 s |   % 37
+	s1 |   % 38
+	s1 |   % 39
+	s1 |   % 40
+	s1 |   % 41
+	s1 |   % 42
+	s1 |   % 43
+	s1 |   % 44
+
+	g4. fs8 ~ fs4 d8 e ~ |   % 45
+
+	e2 s |   % 46
+	s1 |   % 47
+
+	s1 |   % 48
+	s1 |   % 49
+
+	r2 r4 b |   % 50
+	<e \hn b \hn g>4 <fs \hn d \hn a> <g \hn e \hn b> <b \hn g \hn d> |   % 51
+
+	<a \hn e \hn c>2. <a \hn e \hn c>4 |   % 52
+	<a \hn d, \hn cs>4. <g \hn d \hn cs>8 ~ <g \hn d \hn cs> <fs \hn cs \hn a>4 e8 |   % 53
+	<e \hn b \hn g>2. b4 |   % 54
+	<e \hn b \hn g>4 <fs \hn d \hn a> <g \hn e \hn b> <b \hn g \hn d> |   % 55
+	<a \hn e \hn c>2. <a \hn e \hn c>4 |   % 56
+	<a \hn d, \hn cs>4. <g \hn d \hn cs>8 ~ <g \hn d \hn cs> <fs \hn cs \hn a>4 e8 |   % 57
+	<e \hn b \hn g>2. b4 |   % 58
+	<e \hn b \hn g>4 <fs \hn d \hn a> <g \hn e \hn b> <b \hn g \hn d> |   % 59
+	<a \hn e \hn c>2. <a \hn e \hn c>4 |   % 60
+	<a \hn d, \hn cs>4. <g \hn d \hn cs>8 ~ <g \hn d \hn cs> <fs \hn cs \hn a>4 e8 |   % 61
+	<e \hn b \hn g>2. <b \hn g>4 |   % 62
+	<e \hn b \hn g>4. <fs \hn d \hn a>8 ~ <fs \hn d \hn a> <g \hn e \hn b>4 e8 |   % 63
+	<e \hn c \hn g>1 ~ ( |   % 64
+	<e \hn c \hn g>2 <g \hn e \hn b> |   % 65
+
+	<fs \hn d \hn a>2. ) b,4 |   % 66
+	<e \hn b \hn g>4 <fs \hn d \hn a> <g \hn e \hn b> <b \hn g \hn d> |   % 67
+
+	<fs \hn d \hn a>1 \repeatTie |   % 68
+
+	g4. fs8 ~ fs4 d8 e ~ |   % 69
+
+	e2 s |   % 70
+	s1 |   % 71
+	s1 |   % 72
+	s1 |   % 73
+
+	R1^\fermata |   % 74
+}
 
-	% Ending
 
-	r8 g16 g  g a g8  fs fs  fs16 a ( g8 ) |   % 24
-	g2 r |   % 25
-	r8 g16 g  g a g8  fs fs  fs16 a ( g8 ) |   % 26
-	g1^\fermata \bar "|."   % 27
-%}
+LeadVoxText = \lyricmode
+{
+	More love, _ _ more po -- wer, _
+	more of you _ _ in my _ life,
+	More love, _ _ more po -- wer, _
+	more of you _ _ in my _ life,
+
+	<< {
+	And I will wor -- ship you with all of _ my _ heart,
+	And I will wor -- ship you with all of _ my _ mind,
+	And I will wor -- ship you with all of _ my _ strength,
+	} \new Lyrics = "v2" \with { alignBelowContext = #"v1" } { \set associatedVoice = "Lead"
+	_ _ _ seek your face _ _ _ _ _ _ _
+	_ _ _ seek your face _ _ _ _ _ _ _
+	_ _ _ seek your face
+	} >>
+	for you are _ my _ Lord, _ _ _
+	you are _ my Lord. _
+
+	you are _ my Lord. _
+
+	<< {
+	And I will wor -- ship you with all of _ my _ heart,
+	And I will wor -- ship you with all of _ my _ mind,
+	And I will wor -- ship you with all of _ my _ strength,
+	} \new Lyrics = "v2" \with { alignBelowContext = #"v1" } { \set associatedVoice = "Lead"
+	_ _ _ seek your face _ _ _ _ _ _ _
+	_ _ _ seek your face _ _ _ _ _ _ _
+	_ _ _ seek your face
+	} >>
+	for you are _ my _ Lord, _ _ _
+
+	And I will seek your
+
+	_
+	you are _ my Lord. _
 }
 
-LeadVoxText = \lyricmode
+LeadVoxEcho = \lyricmode
 {
-	More love, more po- wer
-	more of you in my life
-	More love, more po- wer
-	more of you in my life
+	More love, _ _ more po -- wer, _
+	More love, _ _ more po -- wer, _
+}
 
-	And I will wor- ship you with all of my heart
+
+%
+% Riffs
+%
+Riffs = \relative c'
+{
+	\tiny
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 1
+	<e d cs a>1 |   % 2
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 3
+	<e d cs a>4. <d b g>8 ~ <d b g> <e cs a> ~ <e cs a>4 |   % 4
+
+	s1*32 |   % 5-36
+
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 37
+	<e d cs a>1 |   % 38
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 39
+	<e d cs a>4. <d b g>8 ~ <d b g> <e cs a> ~ <e cs a>4 |   % 40
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 41
+	<e d cs a>1 |   % 42
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 43
+	<e d cs a>4. <d b g>8 ~ <d b g> <e cs a> ~ <e cs a>4 |   % 44
+
+	s1 |   % 45
+
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 46
+	<e d cs a>1 |   % 47
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 48
+	<e d cs a>4. <d b g>8 ~ <d b g> <e cs a> ~ <e cs a>4 |   % 49
+
+	s1*20 |   % 50-69
+
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 70
+	<e d cs a>1 |   % 71
+	r2 <fs d b g>4. <e d cs a>8 ~ |   % 72
+	<e d cs a>4. <d b g>8 ~ <d b g> <e cs a> ~ <e cs a>4 |   % 73
+	\normalsize
 }
 
 
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 1
-		c4 c c c |   % 2
-		c4 c c c |   % 3
-		c4 c c c |   % 4
-	}
-
-	\repeat volta 2
-	{
-		% Verse
+	e2..:m9 b8:m11 |   % 1
+	s1 |   % 2
+	e2..:m9 b8:m11 |   % 3
+	s4. g4/a a4./b |   % 4
 
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-		c4 c c c |   % 8
-		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
-
-		% Chorus
-
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		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
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 36
-			c4 c c c |   % 37
-			c4 c c c |   % 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
-			c4 c c c |   % 44
-		}
-		{
-			c4 c c c |   % 45
-		}
-	}
-
-	\repeat volta 4
-	{
-		c4 c c c |   % 46
-		c4 c c c |   % 47
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 48
-			c4 c c c |   % 49
-		}
-		{
-			c4 c c c |   % 50
-			c4 c c c |   % 51
-		}
-	}
-
-	\repeat volta 2
-	{
-		c4 c c c |   % 52
-		c4 c c c |   % 53
-		c4 c c c |   % 54
-		c4 c c c |   % 55
-		c4 c c c |   % 56
-		c4 c c c |   % 57
-		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
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 66
-			c4 c c c |   % 67
-		}
-		{
-			c4 c c c |   % 68
-		}
-	}
+	% Verse
 
-	c4 c c c |   % 69
+	e1:m7 |   % 5
+	s1 |   % 6
+	c1:maj7 |   % 7
+	s1 |   % 8
+	d1:sus2 |   % 9
+	b1:m7 |   % 10
+	e1:m7 |   % 11
+	c2:sus2/e b:m7 |   % 12
+
+	e1:m7 |   % 13
+	s1 |   % 14
+	c1:maj7 |   % 15
+	s1 |   % 16
+	a1:m/fs |   % 17
+	b1:7.9- |   % 18
+	e1:m7 |   % 19
+	e1:m/d |   % 20
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 70
-		c4 c c c |   % 71
-		c4 c c c |   % 72
-		c4 c c c |   % 73
-	}
+	% Chorus
 
-	c1 |   % 74
+	a1:m7 |   % 21
+	b1:7.9- |   % 22
+	e1:m7 |   % 23
+	e1:m/d |   % 24
+	a1:m7 |   % 25
+	b1:7.9- |   % 26
+	e1:m7 |   % 27
+	e1:m/d |   % 28
+	a1:m/fs |   % 29
+	b1:7.9- |   % 30
+	e1:m7 |   % 31
+	e1:m/d |   % 32
+	a1:m11 |   % 33
+	s1 |   % 34
+	b1:m7 |   % 35
+
+	d1:sus2 |   % 36
+	e2..:m9 b8:m11 |   % 37
+	s1 |   % 38
+	e2..:m9 b8:m11 |   % 39
+	s4. g/a a4/b |   % 40
+	e2..:m9 b8:m11 |   % 41
+	s1 |   % 42
+	e2..:m9 b8:m11 |   % 43
+	s4. g/a a4/b |   % 44
+
+	d1:sus2 |   % 45
+
+	e2..:m9 b8:m11 |   % 46
+	s1 |   % 47
+
+	e2..:m9 b8:m11 |   % 48
+	s4. g4/a a4./b |   % 49
+
+	e1:m7 |   % 50
+	e1:m7/d |   % 51
+
+	a1:m7 |   % 52
+	b1:7.9- |   % 53
+	e1:m7 |   % 54
+	e1:m/d |   % 55
+	a1:m7 |   % 56
+	b1:7.9- |   % 57
+	e1:m7 |   % 58
+	e1:m/d |   % 59
+	a1:m/fs |   % 60
+	b1:7.9- |   % 61
+	c1:maj7 |   % 62
+	b1:m11 |   % 63
+	a1:m11 |   % 64
+	s1 |   % 65
+
+	b1:m7 |   % 66
+	e2:m7 e:m7/d |   % 67
+
+	b1:m7 |   % 68
+
+	d1:sus2 |   % 69
+
+	e2..:m9 b8:m11 |   % 70
+	s1 |   % 71
+	e2..:m9 b8:m11 |   % 72
+	s4. g4/a a4./b |   % 73
+
+	e1:m9 |   % 74
 }
 
 
 %
 % Chord rhythms
 %
-
-% Use a RhythmicStaff on the chords instead of this?
-% It almost works, but not quite. Doesn't collapse chords above to single notes...
-
 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
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 1
-		c4 c c c |   % 2
-		c4 c c c |   % 3
-		c4 c c c |   % 4
-	}
+	c2. ~ c8 c ~ |   % 1
+	c2. ~ c8 c |   % 2
+	c2. ~ c8 c ~ |   % 3
+	c4. c4 c4. |   % 4
 
-	\repeat volta 2
-	{
-		% Verse
-
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-		c4 c c c |   % 8
-		c4 c c c |   % 9
-		c4 c c c |   % 10
-		c4 c c c |   % 11
-		c4 c c c \bar "||"   % 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 \bar "||"   % 20
-
-		% Chorus
-
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-		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
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 36
-			c4 c c c |   % 37
-			c4 c c c |   % 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
-			c4 c c c |   % 44
-		}
-		{
-			c4 c c c |   % 45
-		}
-	}
+	% Verse
 
-	\repeat volta 4
-	{
-		c4 c c c |   % 46
-		c4 c c c |   % 47
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 48
-			c4 c c c |   % 49
-		}
-		{
-			c4 c c c |   % 50
-			c4 c c c |   % 51
-		}
-	}
+	c1 ~ |   % 5
+	c1 |   % 6
+	c1 ~ |   % 7
+	c1 |   % 8
+	c1 |   % 9
+	c1 |   % 10
+	c1 |   % 11
+	c2 c |   % 12
+
+	c1 ~ |   % 13
+	c1 |   % 14
+	c1 ~ |   % 15
+	c1 |   % 16
+	c1 |   % 17
+	c4 c c c |   % 18
+	c1 |   % 19
+	c4 c c c |   % 20
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 52
-		c4 c c c |   % 53
-		c4 c c c |   % 54
-		c4 c c c |   % 55
-		c4 c c c |   % 56
-		c4 c c c |   % 57
-		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
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 66
-			c4 c c c |   % 67
-		}
-		{
-			c4 c c c |   % 68
-		}
-	}
+	% Chorus
 
-	c4 c c c |   % 69
+	c4 c c c |   % 21
+	c4 c c c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+	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
+
+	c1 |   % 36
+	c2. ~ c8 c ~ |   % 37
+	c2. ~ c8 c |   % 38
+	c2. ~ c8 c ~ |   % 39
+	c4. c4 c4. |   % 40
+	c2. ~ c8 c ~ |   % 41
+	c2. ~ c8 c |   % 42
+	c2. ~ c8 c ~ |   % 43
+	c4. c4 c4. |   % 44
+
+	c4 c c c |   % 45
+
+	c2. ~ c8 c ~ |   % 46
+	c2. ~ c8 c |   % 47
+
+	c2. ~ c8 c ~ |   % 48
+	c4. c4 c4 c8 |   % 49
+
+	c4 c c c |   % 50
+	c4 c c c |   % 51
+
+	c4 c c c |   % 52
+	c4 c c c |   % 53
+	c4 c c c |   % 54
+	c4 c c c |   % 55
+	c4 c c c |   % 56
+	c4 c c c |   % 57
+	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
+
+	c1 |   % 69
+
+	c2. ~ c8 c ~ |   % 46
+	c2. ~ c8 c |   % 47
+	c2. ~ c8 c ~ |   % 48
+	c4. c4 c4. |   % 49
+
+	c1^\fermata |   % 74
+}
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 70
-		c4 c c c |   % 71
-		c4 c c c |   % 72
-		c4 c c c |   % 73
-	}
 
-	c1^\fermata \bar "|."   % 74
+Dynamics =
+{
+	s1_\mf |   % 1
+	s1*18
+	s4 \< s2 s4 \! |   % 20
+	s1*13
+	s4 \< s2 s4 \! |   % 34
+	s1
+	s4 \> s2 s4 \! |   % 36
+	s1*8
+	s4 \< s2. |   % 45
+	s4_\f s2. |   % 46
+	s1*4
+	s4 \< s2 s4 \! |   % 51
+	s1*13
+	s4 \< s2 s4 \! |   % 65
+	s1
+	s4 \< s2 s4 \! |   % 67
+	s1
+	s4 \> s2. |   % 69
+	s4_\mf s2. |   % 70
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Lyrics \lyricsto "lead" \LeadVoxText
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
+			\new Lyrics = "v1" \lyricsto "lead" \LeadVoxText
+			\new Lyrics \lyricsto "vb" \LeadVoxEcho
+			\new Lyrics \lyricsto "vc" \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
 }
+