X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=word-of-god-speak.ly;h=3840cb178a9b66a3f6062fedd063b9321d7f696b;hb=HEAD;hp=ea9c02261a305613573c0f0c07e3a6dc98c1ea03;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/word-of-god-speak.ly b/word-of-god-speak.ly
old mode 100755
new mode 100644
index ea9c022..3840cb1
--- a/word-of-god-speak.ly
+++ b/word-of-god-speak.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,12 +10,10 @@ 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 "Word Of God, Speak" }
 %	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "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)
@@ -26,350 +24,275 @@ hn = #(define-music-function (parser location arg) (ly:music?)
   (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 c \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 
-%{
 	% Intro
 
-	s1 |   % 1
-	s1 |   % 2
-	s1 |   % 3
-	s1 |   % 4
-	s1 |   % 5
-	s1 |   % 6
-	s1 |   % 7
-	\voiceTwo r2 r4 g \oneVoice |   % 8
-
-	\repeat volta 2
-	{
-		% Verse
-
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		e4. d8 c4 g' |   % 9
-		a4 f f a |   % 10
-		g4. e8 e4 d8 ( c ) |   % 11
-		e4 e d g |   % 12
-		e4. d8 c4 g' |   % 13
-		a4 f c' b8 ( a ) |   % 14
-		g4 e e8 ( d ) c ( d ) |   % 15
-		e4. d8 c4 <g' \hn f \hn b,> \bar "||"   % 16
-
-		% Chorus
-
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		<g \hn e \hn c>4 <c \hn g \hn e> <b \hn g \hn d> <d \hn b \hn g> |   % 17
-		<c \hn a \hn f>4 <b \hn g \hn e>8 ( <a \hn f \hn d> ) <g \hn e \hn c>4 <a \hn f \hn c> |   % 18
-		<g \hn e \hn c>4 <e \hn c \hn g> <e \hn c \hn a>8 ( <d \hn b> ) <c \hn a> ( <d \hn b \hn g> ) |   % 19
-		<e \hn c \hn fs,>4 <e \hn c \hn fs,> <d \hn c \hn g> <g \hn f! \hn d> |   % 20
-		<g \hn e \hn c>4 <c \hn g \hn e> <b \hn g \hn d> <d \hn g, \hn b,> |   % 21
-		<c \hn a \hn f>4 <b \hn g \hn e>8 ( <a \hn f \hn d> ) <g \hn e \hn c>4 <a \hn f \hn c> |   % 22
-		<g \hn e \hn c>4 <e \hn c \hn g> << { \voiceOne <e \hn c>8 ( <d \hn b> ) c ( d ) } \context Voice = "v2" { \voiceTwo \tiny a4 a8 b \normalsize } \oneVoice >> |   % 23
-		\time 2/4 <e \hn c>4 <d \hn b> \time 4/4 |   % 24
-		\voiceTwo c1 \oneVoice |   % 25
-		s1 |   % 26
-	}
-	\alternative
-	{
-		{
-			s1 |   % 27
-			\voiceTwo r2 r4 g' \oneVoice |   % 28
-		}
-		{
-			s1 |   % 29
-		}
-	}
-
-	s1 |   % 30
-	s1 |   % 31
-	s1 |   % 32
-	\voiceTwo r2 r4 <a \hn d,> \oneVoice \bar "||"   % 33
-
-	\key d \major
+	\once \override TextScript #'padding = #2.0
+	s1*0^\markup { \large \italic { Piano only } }
 
-	% Verse
+	s1*4 \bar "||"   % 1-4
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	% Verse
 
-	<fs \hn a,>4. <e \hn g,>8 <d \hn fs,>4 <a' \hn d,> |   % 34
-	<b \hn d,>4 <g \hn b,> <g \hn b,> <b \hn d,> |   % 35
-	<a \hn d,>4. <fs \hn a,>8 <fs \hn a,>4 <e \hn g,>8 ( <d \hn fs,> ) |   % 36
-	<fs \hn a,>4 <fs \hn a,> <e \hn a> <a \hn e \hn cs> |   % 37
-	<fs \hn d \hn a>4. <e \hn d \hn g,>8 <d \hn a \hn cs>4 <a' \hn fs \hn d> |   % 38
-	<b \hn g \hn d>4 <g \hn d \hn b> <d' \hn f, \hn b,> <cs \hn f, \hn cs>8 ( <b \hn d,> ) |   % 39
-	<a \hn fs \hn d>4 <fs \hn d \hn a> << { \voiceOne <fs \hn d>8 ( <e \hn cs> ) d ( e ) } \context Voice = "v2" { \voiceTwo \tiny b4 b8 cs \normalsize } \oneVoice >> |   % 40
-	<fs \hn d \hn a>4. <e \hn cs \hn g>8 <d \hn fs,>4 <a' \hn g \hn cs,> \bar "||"   % 41
+	\mark \markup { \override #'(font-family . sans) { \box { A } } }
+	s1*8 \bar "||"   % 5-12
 
 	% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
+	\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	s1*8 \bar "||"   % 13-20
 
-	<a \hn fs \hn d>4 <d \hn a \hn fs> <cs \hn a \hn e> <e \hn cs \hn a> |   % 42
-	<d \hn b \hn g>4 <cs \hn a \hn fs>8 ( <b \hn g \hn e> ) <a \hn fs \hn d>4 <b \hn g \hn d> |   % 43
-	<a \hn fs \hn d>4 <fs \hn d \hn a> <fs \hn d \hn b>8 ( <e \hn cs> ) <d \hn b> ( <e \hn cs \hn a> ) |   % 44
-	<fs \hn d \hn gs,>4 <fs \hn d \hn gs,> <e \hn d \hn a> <a \hn g! \hn cs,> |   % 45
-	<a \hn fs \hn d>4 <d \hn a \hn fs> <cs \hn a \hn e> <e \hn a, \hn cs,> |   % 46
-	<d \hn g, \hn b,>4 <cs \hn fs, \hn a,>8 ( <b \hn e, \hn g,> ) <a \hn d, \hn fs,>4 <b \hn g \hn d> |   % 47
-	<a \hn fs \hn d>4 <fs \hn d \hn a> << { \voiceOne <fs \hn d>8 ( <e \hn cs> ) d ( <e \hn cs> ) } \context Voice = "v2" { \voiceTwo \tiny b4 b8 a \normalsize } \oneVoice >> |   % 48
-	<fs' \hn d \hn a>2 <e \hn cs \hn a> \bar "||"   % 49
+	% Midtro
 
-	% Outro
+	\mark \markup { \override #'(font-family . sans) { \box { B2 } } }
+	s1*4 \bar "||"   % 21-24
 
-\mark \markup { \override #'(font-family . sans) { \box { E } } }
-
-	\voiceTwo d1 \oneVoice |   % 50
-	s1 |   % 51
-	s1 |   % 52
-	s1 |   % 53
-	s1 |   % 54
-	s1 |   % 55
-	s1 |   % 56
-	s1 |   % 57
-	s1 \bar "|."   % 58
-%}
-}
+	% Verse
 
-LeadVoxText = \lyricmode
-{
-	I'm find- ing my- self at a loss for words
-	and the fun- ny thing is, it's o- kay
-	The last thing I need is too be heard
-	but to hear what you might say
-
-	Word of God speak, would you pour down like rain,
-	wash- ing my eyes to see your ma- jes- ty
-	To be still and know that you're in this place,
-	please let me stay and rest in your ho- li- ness
-	Word of God speak.
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s1*8 \bar "||"   % 25-32
+
+	% Chorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { D } } }
+	s1*8 \bar "||"   % 33-40
+
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+	s1*9 \bar "||"   % 41-49
+
+	\mark \markup { \override #'(font-family . sans) { \box { F } } }
+	s1*4 \bar "|."  % 96-100
 }
 
 
-Riffs = \relative c''
+%
+% Lead vocal
+%
+LeadVox = \relative c'
 {
-	\clef G
-	\key c \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
-\tiny
-	r8 g16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~  |   % 1
-	c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ |   % 2
-	d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ |   % 3
-	c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ |   % 4
-	d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ |   % 5
-	c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ |   % 6
-	d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. |   % 7
-	\voiceOne <g' d c g>1 \oneVoice |   % 8
-
-	\repeat volta 2
-	{
-		% Verse
-
-		s1 |   % 9
-		s1 |   % 10
-		s1 |   % 11
-		s1 |   % 12
-		s1 |   % 13
-		s1 |   % 14
-		s1 |   % 15
-		s1 |   % 16
-
-		% Chorus
-
-		s1 |   % 17
-		s1 |   % 18
-		s1 |   % 19
-		s1 |   % 20
-		s1 |   % 21
-		s1 |   % 22
-		s1 |   % 23
-		\time 2/4 s2 \time 4/4 |   % 24
-		\voiceOne r8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ \oneVoice |   % 25
-		c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ |   % 26
-	}
-	\alternative
-	{
-		{
-			d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. |   % 27
-			\voiceOne <g' d c g>1 \oneVoice |   % 28
-		}
-		{
-			d8 \repeatTie g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. |   % 29
-		}
-	}
-
-	c8 bf16 f ~ f2. |   % 30
-	c'8 bf16 f ~ f4 ~ f8. af16 ~ af bf8. |   % 31
-	c1 |   % 32
-	\voiceOne d2 e \oneVoice |   % 33
+	r1 |   % 1
+	r1 |   % 2
+	r1 |   % 3
+	r4 r8. c16 e8 g a g ~ |   % 4
 
 	% Verse
 
-	s1 |   % 34
-	s1 |   % 35
-	s1 |   % 36
-	s1 |   % 37
-	s1 |   % 38
-	s1 |   % 39
-	s1 |   % 40
-	s1 |   % 41
+	g2 ~ g8 e16 g a4 ~ |   % 5
+	a16 g g8 ~ g4 r g8 g16 g |   % 6
+	c,16 c8. c4 r c16 d8. ~ |   % 7
+	d8 c ~ c8. c16  e8 g a g ~ |   % 8
+
+	g2 ~ g8. e16 a4 ~ |   % 9
+	a16 g g8 ~ g2 g8 g16 g ~ |   % 10
+	g2 r8. g16 c d8 d16 ~ |   % 11
+	d2 <c, \hn e>8 <d \hn f>16 <e \hn g> ~ <e \hn g>8 <e \hn g> ~ |   % 12
 
 	% Chorus
 
-	s1 |   % 42
-	s1 |   % 43
-	s1 |   % 44
-	s1 |   % 45
-	s1 |   % 46
-	s1 |   % 47
-	s1 |   % 48
-	s1 |   % 49
+	<e \hn g>4 r8 <g, \hn c>16 <g \hn c> <e' \hn g>8 <d \hn f> <c \hn e> <d \hn g> ~ |   % 13
+	<d \hn g>4 r <d \hn g>8 <d \hn g> <e \hn g> <d \hn g> ~ |   % 14
+	<d \hn g>8 <c \hn f>16 <c \hn f> ~ <c \hn f>2 <a \hn c>8 <d \hn g> ~ |   % 15
+	<d \hn g>8 <c \hn f>16 <c \hn f> r8. <a \hn c>16 <\hn g c \hn e>8 <\hn a d \hn f> <\hn c e \hn g> <\hn c e \hn g> ~ |   % 16
+
+	<\hn c e \hn g>4 r8.<g \hn e'>16 <\hn c e \hn g>8 <\hn a d \hn f> <\hn g c \hn e> <\hn c d \hn g> ~ |   % 17
+	<\hn c d \hn g>4 r <\hn b d \hn g>8 <\hn b d \hn g> <\hn c e \hn g> <\hn bf d \hn g> ~ |   % 18
+	<\hn bf d \hn g>8 <\hn bf c \hn f>16 <\hn bf c \hn f> ~ <\hn bf c \hn f>4 r8 <a \hn c> <c \hn f> <\hn a d \hn g> ~ |   % 19
+	<\hn a d \hn g>8 <\hn a c \hn f>16 <\hn a c \hn f> ~ <\hn a c \hn f>4 <g \hn g'>8 <g \hn g'>16 <g \hn g'> ~ <g \hn g'>8 <g \hn g'> ~ |   % 20
+
+	% Midtro
+
+	<g \hn g'>4 r r2 |   % 21
+	r1 |   % 22
+	r1 |   % 23
+	r4 r8. <\hn g c>16 <\hn c e>8 <\hn e g> <\hn f a> <\hn e g> ~ |   % 24
+
+	% Verse
+
+	<\hn e g>4 r r8 <\hn c e>16 <\hn e g> <\hn f a>4 ~ |   % 25
+	<\hn f a>16 <\hn e g> <\hn e g>8 ~ <\hn e g>4 r8. g16 g8 g16 g ~ |   % 26
+	g16 c,8. r4 r8. c16 c8 d16 c16 ~ |   % 27
+	c4 r <\hn c e>8 <\hn e g> <\hn f a> <\hn e g> ~ |   % 28
+
+	<\hn e g>4 r r8 <\hn c e>16 <\hn e g> <\hn f a>4 ~ |   % 29
+	<\hn f a>16 <\hn e g> <\hn e g>8 ~ <\hn e g>4 r8. g16 g8 g16 g ~ |   % 30
+	g16 g r8 r4 r <\hn g, c \hn f>16 <\hn c d \hn g>8 <\hn c d \hn g>16 ~ |   % 31
+	<\hn c d \hn g>4 r <\hn g c \hn e>8 <\hn a d \hn f>16 <\hn c e \hn g> ~ <\hn c e \hn g>8 <\hn c e \hn g> ~ |   % 32
+
+	% Chorus
+
+	<\hn c e \hn g>4 r8 <\hn g c>16 <\hn g c> <\hn c e \hn g>8 <\hn a d \hn f> <\hn g c \hn e> <\hn c d \hn g> ~ |   % 33
+	<\hn c d \hn g>2 <\hn b d \hn g>8 <\hn b d \hn g> <\hn c e \hn g> <\hn bf d \hn g> ~ |   % 34
+	<\hn bf d \hn g>8 <\hn bf c \hn f>16 <\hn bf c \hn f> ~ <\hn bf c \hn f>2 <a \hn c>8 <\hn a d \hn g> ~ |   % 35
+	<\hn a d \hn g>8 <\hn a c \hn f>16 <\hn a c \hn f> r8. <a \hn c>16 <\hn g c \hn e>8 <\hn a d \hn f> <\hn c e \hn g> <\hn c e \hn g> ~ |   % 36
+
+	<\hn c e \hn g>4 r8.<g \hn e>16 <\hn c e \hn g>8 <\hn a d \hn f> <\hn g c \hn e> <\hn c d \hn g> ~ |   % 37
+	<\hn c d \hn g>4 r <\hn b d \hn g>8 <\hn b d \hn g> <\hn c e \hn g> <\hn bf d \hn g> ~ |   % 38
+	<\hn bf d \hn g>8 <\hn bf c \hn f>16 <\hn bf c \hn f> ~ <\hn bf c \hn f>4 r8 <a \hn c> <c \hn f> <\hn a d \hn g> ~ |   % 39
+	<\hn a d \hn g>8 <\hn a c \hn f>16 <\hn a c \hn f> ~ <\hn a c \hn f>4 <\hn g f' \hn g>8 <\hn a e' \hn a>16 <\hn c d \hn g \hn c> ~ <\hn c c \hn g' \hn c>8 <\hn c e \hn g \hn c> ~ |   % 40
+
+	<\hn c e \hn g \hn c>4 r8 <\hn g c \hn e \hn g>16 <\hn g c \hn e \hn g> <\hn c \hn e g \hn c>8 <\hn a \hn d f \hn a> <\hn g \hn c e \hn g> <\hn g \hn c e \hn g> ~ |   % 41
+	<\hn g \hn c d \hn g>4 r <\hn g \hn b d \hn g>8 <\hn g \hn b d \hn g> <\hn a \hn c e \hn g> <\hn bf d \hn g> ~ |   % 42
+	<\hn bf d \hn g>8 <\hn bf c \hn f>16 <\hn bf c \hn f> ~ <\hn bf c \hn f>4 r <a \hn c>8 <\hn a d \hn g> ~ |   % 43
+	<\hn a d \hn g>8 <\hn a c \hn f>16 <\hn a c \hn f> r8. <a \hn c \hn f>16 <\hn g c \hn e \hn g>8 <\hn a d \hn f \hn a> <\hn c e \hn g \hn c> <\hn c e \hn g \hn c> ~ |   % 44
+
+	<\hn c e \hn g \hn c>4 r8. <c \hn e \hn g>16 <\hn c \hn e g \hn c>8 <\hn a \hn d f \hn a> <\hn g \hn c e \hn g> <\hn g \hn c e \hn g> ~ |   % 45
+	<\hn g \hn c d \hn g>4 r <\hn g \hn b d \hn g>8 <\hn g \hn b d \hn g> <\hn a \hn c e \hn g> <\hn bf d \hn g> ~ |   % 46
+	<\hn bf d \hn g>8 <\hn bf c \hn f>16 <\hn bf c \hn f> ~ <\hn bf c \hn f>4 r8 <a \hn c> <c \hn f> <\hn a d \hn g> ~ |   % 47
+	<\hn a d \hn g>8 <\hn a c \hn f>16 <\hn a c \hn f> ~ <\hn a c \hn f>2 r4 |   % 48
+	r4 r8. c16 e8 g a g ~ |   % 49
+
+	% End
+
+	g2 r8 e16 g a4 ~ |   % 50
+	a16 g g8 ~ g4 r g8 g16 g |   % 51
+	c,16 c8. c4 r c16 d8. ~ |   % 52
+	d8 c ~ c2.-\fermata |   % 53
+}
+
+
+LeadVoxText = \lyricmode
+{
+	I'm find -- ing my -- self _ _ at a loss _ for words _
+	and the fun -- ny thing is, it's o -- _ kay _
+	The last thing I need _ _ is to _ be heard _
+	but to hear _ what you might say _
+
+	Word of God _ speak, _ would you pour down like rain, _
+	wash -- ing my eyes _ to see _ your ma -- _ jes -- ty
+	To be still and know _ that you're in this place, _
+	please let me stay _ and rest _ in your ho -- _ li -- ness _
+	Word of God _ speak. _
+
+	I'm find -- in' my -- self _ in the midst _ of you _
+	be -- yond the mu -- _ sic, be -- yond the noise, _
+	all that I need _ is to be _ with you, _
+	and in the qui -- _ et, hear your voice, _
+
+	Word of God _ speak, _ would you pour down like rain, _
+	wash -- ing my eyes _ to see _ your ma -- _ jes -- ty
+	To be still and know _ that you're in this place, _
+	please let me stay _ and rest _ in your ho -- _ li -- ness _
+
+	Word of God _ speak, _ would you pour down like rain, _
+	wash -- ing my eyes _ to see _ your ma -- _ jes -- ty
+	To be still and know _ that you're in this place, _
+	please let me stay _ and rest _ in your ho -- _ li -- ness _
+
+	I'm find -- ing my -- self _ at a loss _ for words _
+	and the fun -- ny thing is, it's o -- _ kay _
+}
 
-	% Outro
 
-	\voiceOne r8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ \oneVoice |   % 50
-	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ |   % 51
-	e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ |   % 52
-	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ |   % 53
-	e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ |   % 54
-	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ |   % 55
-	e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ |   % 56
-	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 cs8. ~ |   % 57
-	<d a fs d>1^\fermata |   % 59
-\normalsize
+Riffs = \relative c''
+{
 }
 
 
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	c2:sus2/a c:sus2/f |   % 1
-	g1:sus4 |   % 2
-	c2:sus2/a c:sus2/f |   % 3
-	g1:sus4 |   % 4
-	c2:sus2/a c:sus2/f |   % 5
-	g1:sus4 |   % 6
-	c2:sus2/e c:sus2/f |   % 7
-	g1:sus4 |   % 8
-
-	\repeat volta 2
-	{
-		% Verse
-
-		c2 c/e |   % 9
-		f2 d:m7 |   % 10
-		c2/g a:m7 |   % 11
-		c2/f g4:sus4 g |   % 12
-		c2 c/e |   % 13
-		f2 fs:dim |   % 14
-		c2/g a:m7 |   % 15
-		c4/g g c g:sus4.7 \bar "||"   % 16
-
-		% Chorus
-
-		c2 g |   % 17
-		f4 e8:m7 d:m7 c4 f |   % 18
-		c2/g a:m7 |   % 19
-		d2:9 g4:sus4.7 g:7 |   % 20
-		c2 g |   % 21
-		f4 e8:m7 d:m7 c4 f |   % 22
-		c2/e a:m7 |   % 23
-		\time 2/4 c4/f g \time 4/4 |   % 24
-		c2:sus2/a c:sus2/f |   % 25
-		g1:sus4 |   % 26
-	}
-	\alternative
-	{
-		{
-			c2:sus2/e c:sus2/f |   % 27
-			g1:sus4 |   % 28
-		}
-		{
-			c2:sus2/e c:sus2/ef |   % 29
-		}
-	}
-
-	bf1:sus2/d |   % 30
-	df1:maj7 |   % 31
-	f1/g |   % 32
-	g2/a a4 a:sus4.7 \bar "||"   % 33
+	c2. c4:sus4 |   % 1
+	c2. c4:sus2 |   % 2
+	c2./f c4:sus4/f |   % 3
+	c2./f c4:sus2/f |   % 4
 
 	% Verse
 
-	d2 d/fs |   % 34
-	g2 e:m7 |   % 35
-	d2/a b:m7 |   % 36
-	d2/a a |   % 37
-	d4. e8:m7 d2/fs |   % 38
-	g2 gs:dim |   % 39
-	d2/a b:m7 |   % 40
-	d4/a a d d:sus4.7 \bar "||"   % 41
+	c2. c4:sus4 |   % 5
+	c2. c4:sus2 |   % 6
+	c2./f c4:sus4/f |   % 7
+	c2./f c4:sus2/f |   % 8
+
+	c2. c4:sus4 |   % 9
+	c2. c4:sus2 |   % 10
+	c2./f c4:sus4/f |   % 11
+	c1/f |   % 12
 
 	% Chorus
 
-	d2 a |   % 42
-	g4 fs8:m7 e:m7 d4 g |   % 43
-	d2/a b:m7 |   % 44
-	e2:9 a4:sus4.7 a:7 |   % 45
-	d2/a a |   % 46
-	g4 fs8:m7 e:m7 d4 g |   % 47
-	d2/fs b:m7 |   % 48
-	d2/g a \bar "||"   % 49
+	c1 |   % 13
+	g2:sus4 g4 a:m11 |   % 14
+	bf1:sus2 |   % 15
+	f2 c/f |   % 16
 
-	% Outro
+	c1 |   % 17
+	g2:sus4 g4 a:m11 |   % 18
+	bf1:sus2 |   % 19
+	f1 |   % 20
+
+	% Midtro
+
+	c2. c4:sus4 |   % 21
+	c2. c4:sus2 |   % 22
+	c2./f c4:sus4/f |   % 23
+	c2./f c4:sus2/f |   % 24
+
+	% Verse
+
+	c2. c4:sus4 |   % 25
+	c2. c4:sus2 |   % 26
+	c2./f c4:sus4/f |   % 27
+	c2./f c4:sus2/f |   % 28
 
-	d2:sus2 g:6.9 |   % 50
-	a1:sus4 |   % 51
-	d2:sus2/b g:6.9 |   % 52
-	a1:sus4 |   % 53
-	d2:sus2 g:6.9 |   % 54
-	a1:sus4 |   % 55
-	d2:sus2/fs g:6.9 |   % 56
-	a1:sus4 |   % 57
-	d1 |   % 58
+	c2. c4:sus4 |   % 29
+	c2. c4:sus2 |   % 30
+	c2./f c4:sus4/f |   % 31
+	c1 |   % 32
+
+	% Chorus
+
+	c1 |   % 33
+	g2:sus4 g4 a:m11 |   % 34
+	bf1:sus2 |   % 35
+	f2 c/f |   % 36
+
+	c1 |   % 37
+	g2:sus4 g4 a:m11 |   % 38
+	bf1:sus2 |   % 39
+	f1 |   % 40
+
+	c1 |   % 41
+	g2:sus4 g4 a:m11 |   % 42
+	bf1:sus2 |   % 43
+	f2 c/f |   % 44
+
+	c1 |   % 45
+	g2:sus4 g4 a:m11 |   % 46
+	bf1:sus2 |   % 47
+	f1 |   % 48
+	f1:sus2 |   % 49
+
+	% End
+
+	c2. c4:sus4 |   % 50
+	c2. c4:sus2 |   % 51
+	c2./f c4:sus4/f |   % 52
+	f1:sus2 |   % 53
 }
 
 
 %
 % 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
+Rhythm = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -377,144 +300,133 @@ StaffC = \relative c
 	c4 c c c |   % 2
 	c4 c c c |   % 3
 	c4 c c c |   % 4
+
+	% Verse
+
 	c4 c c c |   % 5
 	c4 c c c |   % 6
 	c4 c c c |   % 7
-	c1 |   % 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-> \bar "||"   % 16
-
-		% Chorus
-
-		c4 c c c |   % 17
-		c4 c8 c c4 c |   % 18
-		c4 c c c |   % 19
-		c4 c c c |   % 20
-		c4 c c c |   % 21
-		c4 c8 c c4 c |   % 22
-		c4 c c c |   % 23
-		\time 2/4 c4 c \time 4/4 |   % 24
-		c4 c c c |   % 25
-		c4 c c c |   % 26
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 27
-			c4 c c c |   % 28
-		}
-		{
-			c4 c c c |   % 29
-		}
-	}
+	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
 
+	% Chorus
+
+	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
+
+	% Midtro
+
+	c4 c c c |   % 21
+	c4 c c c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+
+	% Verse
+
+	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 \bar "||"   % 33
 
-	% Verse
+	% Chorus
 
+	c4 c c c |   % 33
 	c4 c c c |   % 34
 	c4 c c c |   % 35
 	c4 c c c |   % 36
+
 	c4 c c c |   % 37
-	c4. c8 c4 c |   % 38
+	c4 c c c |   % 38
 	c4 c c c |   % 39
 	c4 c c c |   % 40
-	c4 c c c-> \bar "||"   % 41
-
-	% Chorus
 
+	c4 c c c |   % 41
 	c4 c c c |   % 42
-	c4 c8 c c4 c |   % 43
+	c4 c c c |   % 43
 	c4 c c c |   % 44
 	c4 c c c |   % 45
 	c4 c c c |   % 46
-	c4 c8 c c4 c |   % 47
+	c4 c c c |   % 47
 	c4 c c c |   % 48
-	c2 c \bar "||"   % 49
+	c1^\fermata |   % 49
 
 	% Outro
 
 	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
-	c1^\fermata \bar "|."   % 58
+	c1^\fermata |   % 53
 }
 
 
 Dynamics =
 {
-%{
-	s4_\mf s2. |   % 1
-	s1*22 |   % 2-23
-	s4 s \> |   % 24
-	s4 \! s2. |   % 25
-	s1*2 |   % 26-27
-	s4 \< s s \! s |   % 28
-	s1*4 |   % 29-32
-	s4 \< s s \! s |   % 33
-	s1*23 |   % 34-56
-	s2 s2_\markup { \italic { rit. } }  |   % 57
-%}
+	s1*12 |   % 1-12
+	s4_\markup { \italic { Add bass, pad } } s2. |   % 13
+	s1*7 |   % 14-20
+	s4_\markup { \italic { Add perc, Ac. gtrs. } } s2. |   % 21
+	s1*28 |   % 22-49
+	s4_\markup { \italic { Piano only, like intro } } s2. |   % 50
+	s1*2 |   % 51-52
+	s4_\markup { \italic { Full band } } s2. |   % 53
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+		\set Score.skipBars = ##t
+		\set Score.melismaBusyProperties = #'()
+
+		\context Staff
 		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \Rhythm \Dynamics >>
 		>>
-
-		\set Score.skipBars = ##t
-		\set Score.melismaBusyProperties = #'()
 	>>
 }
 
 
 \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)))
 
 % 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
+%	ragged-last = ##t
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+