From e280468585fc3af098a1743cc5899b6de3914234 Mon Sep 17 00:00:00 2001
From: Shamus Hammons <jlhamm@acm.org>
Date: Tue, 10 Oct 2017 22:17:55 -0500
Subject: [PATCH] De-Pete-ified chart "Forever".

---
 forever.ly | 450 ++++++++++++++++++++++++++---------------------------
 1 file changed, 217 insertions(+), 233 deletions(-)

diff --git a/forever.ly b/forever.ly
index bf168ae..a45cef6 100644
--- a/forever.ly
+++ b/forever.ly
@@ -12,14 +12,10 @@ staffSize = #20
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Forever" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Chris Tomlin/Jesse Reeves" }
 %	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. " }
 	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-% Let's try a chord dictionary
-%	subtitle = \markup { \center-column { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } "       " \center-column { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } "       " \center-column { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" }  "       " \center-column { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" }  "       " \center-column { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" }  "       " \center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" }  }
 }
 
 % Useful tweak abbreviations (hn = harmony note)
@@ -36,183 +32,207 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 %
 Global =
 {
-	\key g \major
+	\key a \major
 	\numericTimeSignature
 	\time 4/4
 
 	% Intro
 
+	\partial 4*1 s4 |   % 0
+
 	\once \override TextScript #'padding = #2.0
 	s1*0^\markup { \large \bold { 8th Note Rock } }
 % Capo 4 version
 %	s1*0^\markup { \hspace #0.0 \raise #2.0 \larger \bold { "Moderate pop (*** CAPO 4 ***)" } }
 
-	s1*8 \bar ".|:-||"    % 1-8
+	\repeat volta 2
+	{
+		s1*4 |   % 1-4
+	}
 
-	% Verse
+	% Chorus
 
 	\repeat volta 2
 	{
 		\mark \markup { \override #'(font-family . sans) { \box { A } } }
-		s1*11 |   % 9-19
+		s1^\markup { \italic { Unison 1st X } } |   % 5
+		s1*6 |   % 6-11
 	}
 	\alternative
 	{
 		{
-			s1 |   % 20
+			s1 |   % 12
 		}
 		{
-			s1 |   % 21
+			s1 |   % 13
 		}
 	}
 
-	% Prechorus
-
-	s1*4 \bar "||"   % 22-25
-
-	% Chorus
-
-	\mark \markup { \override #'(font-family . sans) { \box { B } } }
-	s1*10 \bar "||"   % 26-
+	s1*2 |   % 14-15
 
 	% Verse
 
-	\mark \markup { \override #'(font-family . sans) { \box { C } } }
-	s1*8 \bar "||"   % -
+	\repeat volta 2
+	{
+		\mark \markup { \override #'(font-family . sans) { \box { B } }
+		\hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+		s1*11 |   % 16-26
+	}
+	\alternative
+	{
+		{
+			s1 |   % 27
+		}
+		{
+			s1 |   % 28
+		}
+	}
 
 	% Prechorus
 
-	\mark \markup { \override #'(font-family . sans) { \box { D } } }
-	s1*8 \bar ".|:-||"   % -
+	s1*4 \bar ".|:-||"   % 29-32
 
-	% Chorus
+	\repeat volta 4
+	{
+		% Chorus
 
-	\repeat volta 2
+		\mark \markup { \override #'(font-family . sans) { \box { C } } }
+		s1*7 |   % 33-39
+	}
+	\alternative
 	{
-		\mark \markup { \override #'(font-family . sans) { \box { E } } }
-		s1*10 |   % -
+		{
+			s1 |   % 40
+		}
+		{
+			s1*2 |   % 41-42
+			s1^\markup { D.S. (take 2nd end.) } \bar "||"   % 43
+		}
+		{
+			s1 |   % 44
+		}
+		{
+			s1 |   % 45
+		}
 	}
 
-	% Bridge
-
-	\mark \markup { \override #'(font-family . sans) { \box { F } } }
-	s1*7 |   % -
-%	s1*0^\markup { \large \bold { "Repeat at [D], end at [F]" } }
-	\mark \markup { \large \bold { "Repeat at [D], end at [F]" } }
-	s1*1 \bar "||"   % -
-%	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	s1 \bar "|."   % 46
 }
 
 
 %
 % Lead vocal
 %
-LeadVox = \relative c'
+LeadVox = \relative c''
 {
 	\clef G
 
 	% Intro
 
-	r1 |   % 1
-	r1 |   % 2
-	r1 |   % 3
-	r1 |   % 4
-	r1 |   % 5
-	r1 |   % 6
-	r1 |   % 7
-	r2 r4 d |   % 8
+	s4 |   % 0
+	s1 |   % 1
+	s1 |   % 2
+	s1 |   % 3
+	s2 r4 e8 e8 ~ |   % 4
+
+	% Chorus
+
+	<e \hn a,>8 <cs \hn e,> r <b \hn d,> ~ <b \hn d,> <a \hn cs,>4 <b \hn d,>8 ~ |   % 5
+	<b \hn d,>8 <cs \hn e,> ~ <cs \hn e,>2 <e \hn a,>8 <e \hn a,> ~ |   % 6
+	<e \hn a,> <cs \hn e,>4 <b \hn d,>8 ~ <b \hn d,> <cs \hn e,>4 <a \hn cs,>8 ~ |   % 7
+	<a \hn cs,>2. <e' \hn a,>8 <e \hn gs,> ~ |   % 8
+	<e \hn gs,>8 <cs \hn e,>4 <b \hn d,>8 ~ <b \hn d,> <a \hn cs,>4 <b \hn d,>8 ~ |   % 9
+	<b \hn d,>8 <cs \hn e,> ~ <cs \hn e,>2 <b \hn e,>8 <b \hn e,> ( |   % 10
+	<a \hn d,>8 ) <a \hn d,> ~ <a \hn d,>2 <b \hn e,>8 <b \hn e,> ( |   % 11
+
+	a8 ) a ~ a2 <e' \hn a,>8 <e \hn a,>-\laissezVibrer  |   % 12
+
+	<a, \hn d,>8 <a \hn d,> ~ <a \hn d,>2 b8 b ( |   % 13
+
+	a8 ) a ~ a2. |   % 14
+	r2 r4 e |   % 15
 
 	% Verse
 
-	b8 d d d ~ d d4 e8 ~ |   % 9
-	e8 d4 d8 ~ d4 r8 d8 |   % 10
-	b'4 b b a8 a ( |   % 11
-	g8 ) g ~ g2 g8 g |   % 12
-	e8 g4 g8 ~ g g g g |   % 13
-	a8 b4 g8 ~ g4 r8 d8 |   % 14
-	b'4 b b a8 a ( |   % 15
-	g8 ) g ~ g2 g4 |   % 16
+	cs8 e e e ~ e e4 fs8 ~ |   % 16
+	fs8 e4 e8 ~ e4 r8 e |   % 17
+	<cs' \hn e,>4 <cs \hn e,> <cs \hn e,> <b \hn d,>8 <b \hn d,> ( |   % 18
+	<a \hn cs,>8 ) <a \hn cs,> ~ <a \hn cs,>2 a8 \tiny a \normalsize |   % 19
+	fs8 a4 a8 ~ a a a a |   % 20
+	b8 cs4 a8 ~ a4 r8 e |   % 21
+	<cs' \hn e,>4 <cs \hn e,> <cs \hn e,> <b \hn d,>8 <b \hn d,> ( |   % 22
+	<a \hn cs,>8 ) <a \hn cs,> ~ <a \hn cs,>2 <cs \hn a>4 |   % 23
+	<b \hn gs>1 ~ |   % 24
+	<b \hn gs>2 ~ <b \hn gs>8 <cs \hn a>4.  |   % 25
+	<a \hn fs \hn d>1 ~ |   % 26
 
-	a1 ~ |   % 17
-	a2 ~ a8 b4. |   % 18
-	g1 ~ |   % 19
+	<a \hn fs \hn d>2. d,8 d |   % 27
 
-	g2. c,8 c |   % 20
+	 <a' \hn fs \hn d>2-\repeatTie ~ <a \hn fs \hn d>8 <cs \hn a \hn e>4. |   % 28
 
-	g'2 ~ g8 g4. |   % 21
+	% Prechorus
 
-	a1 ~ |   % 22
-	a2 ~ a8 b4. |   % 23
-	g1 ~ |   % 24
-	g2. d'8 d ~ |   % 25
+	<b \hn gs \hn e>1 ~ |   % 29
+	<b \hn gs \hn e>2 ~ <b \hn gs \hn e>8 <cs \hn a \hn e>4. |   % 30
+	<a \hn fs \hn d>1 ~ |   % 31
+	<a \hn fs \hn d>2. <e' \hn a,>8 <e \hn a,> ~ |   % 32
 
 	% Chorus
 
-	d8 b4 a8 ~ a g4 a8 ~ |   % 26
-	a8 b2 ~ b8 d8 d ~ |   % 27
-	d8 b4 a8 ~ a b4 g8 ~ |   % 28
-	g2. d'8 d ~ |   % 29
-	d8 b4 a g a8 ~ |   % 30
-	a8 b ~ b2 a8 a ( |   % 31
-	g8 ) g ~ g2. |   % 32
-	r2 r4 a8 a ( |   % 33
-	g8 ) g ~ g2. |   % 34
-	r2 r4 d8 d |   % 35
+	<e \hn a,>8 <cs \hn e,>4 <b \hn d,>8 ~ <b \hn d,> <a \hn cs,>4 <b \hn d,>8 ~ |   % 33
+	<b \hn d,>8 <cs \hn e,> ~ <cs \hn e,>2 <e \hn a,>8 <e \hn a,> ~ |   % 34
+	<e \hn a,>8 <cs \hn e,>4 <b \hn d,>8 ~ <b \hn d,> <cs \hn e,>4 <a \hn cs,>8 ~ |   % 35
+	<a \hn cs,>2. <e' \hn a,>8 ~ <e \hn gs,> ~ |   % 36
+	<e \hn gs,>8 <cs \hn e,>4 <b \hn d,>8 ~ <b \hn d,> <a \hn cs,>4 <b \hn d,>8 ~ |   % 37
+	<b \hn d,>8 <cs \hn e,> ~ <cs \hn e,>2 <b \hn e,>8 <b \hn e,> ( |   % 38
+	<a \hn d,>8 ) <a \hn d,> ~ <a \hn d,>2 <b \hn e,>8 <b \hn e,> ( |   % 39
 
-	% Verse
+	<a \hn d,>8 ) <a \hn d,> ~ <a \hn d,>2 <e' \hn a,>8 <e \hn a,>-\laissezVibrer |   % 40
 
-	b8 d d d ~ d d4 e8 ~ |   % 36
-	e8 d4 d8 ~ d4 r8 d8 |   % 37
-	b'4 b b a8 a ( |   % 38
-	g8 ) g ~ g2 g8 g |   % 39
-	e8 g4 g8 ~ g g g g |   % 40
-	a8 b4 g8 ~ g4 r8 d8 |   % 41
-	b'4 b b a8 a ( |   % 42
-	g8 ) g ~ g2 g4 |   % 43
+	<a, \hn d,>8 <a \hn d,> ~ <a \hn d,>2 b8 b ( |   % 41
+	a8 ) a ~ a2. |   % 42
+	r2 r4 e8 e |   % 43
 
-	% Prechorus
+	<a \hn d,>8 <a \hn d,> ~ <a \hn d,>2 <e' \hn a,>8 <e \hn a,>-\laissezVibrer |   % 44
 
-	a1 ~ |   % 44
-	a2 ~ a8 b4. |   % 45
-	g1 ~ |   % 46
-	g2 ~ g8 g4. |   % 47
-	a1 ~ |   % 48
-	a2 ~ a8 b4. |   % 49
-	g1 ~ |   % 50
-	g2. d'8 d ~ |   % 51
+	<a, \hn d,>8 <a \hn d,> ~ <a \hn d,>2 b8 b ( |   % 45
 
-	% Chorus
+	% End
 
-	d8 b4 a8 ~ a g4 a8 ~ |   % 52
-	a8 b2 ~ b8 d8 d ~ |   % 53
-	d8 b4 a8 ~ a b4 g8 ~ |   % 54
-	g2. d'8 d ~ |   % 55
-	d8 b4 a g a8 ~ |   % 56
-	a8 b ~ b2 a8 a ( |   % 57
-	g8 ) g ~ g2. |   % 58
-	r2 r4 a8 a ( |   % 59
-	g8 ) g ~ g2. |   % 60
-	r2 r4 r8 d |   % 61
-
-	 % Bridge
-
-	b'4 b b a8 a ( |   % 62
-	g8 ) g ~ g2 r8 d |   % 63
-	b'4 b b a8 a ( |   % 64
-	g8 ) g ~ g2 r8 d |   % 65
-	b'4 b b a8 a ( |   % 66
-	g8 ) g ~ g2 r8 d |   % 67
-	b'4 b b a8 a ( |   % 68
-	g8 ) g ~ g2 g4 |   % 69
-
-	 |   %
+	a8 ) a ~ a2.-\fermata |   % 46
 }
 
 LeadVoxText = \lyricmode
 {
-	Give thanks to the Lord, _ our God _ and King, _
+	For -- e -- _ ver God _ is faith -- _ ful, _
+	For -- e -- _ ver God _ is strong, _
+	For -- e -- _ ver God _ is with _ us, _
+	For -- e -- _ ver _
+	For -- e -- _ ver _
+
+	For -- e-
+	_ ver, _ for -- e -- _ ver. _
+
+	Give
+	<<
+	{ thanks to the Lord, _ our God _ and King, _
 	His love en -- dures for -- e -- _ ver _
-	For _ he is good, _ he is a -- bove all things, _
+	For _ he is good, _ he is a -- bove all things, _ }
+
+	\new Lyrics = "verse2" \with { alignBelowContext = #'"verse1" }
+	{ \set associatedVoice = "Lead"
+	might -- y _ hand _ and out -- _ stretched arm, _
+	_ _ _ _ _ _ _ _ _
+	For the life that’s been _ re -- _ born _ in Christ, _
+	}
+
+	\new Lyrics = "verse3" \with { alignBelowContext = #'"verse2" }
+	{ \set associatedVoice = "Lead"
+	ris -- ing _ to _ the set -- _ ting sun, _
+	_ _ _ _ _ _ _ _ _
+	By the grace of God, _ we will car -- _ ry on, _
+	}
+	>>
 	His love en -- dures for -- e -- _ ver _
 
 	Sing praise, __ _ _ sing praise __ _
@@ -224,42 +244,18 @@ LeadVoxText = \lyricmode
 
 	For -- e -- _ ver God _ is faith -- _ ful _
 	For -- e -- _ ver God _ is strong _
-	For -- e -- _ ver God is with _ us _
+	For -- e -- _ ver God _ is with _ us _
 	For -- e -- _ ver _
 	For -- e -- _ ver _
 
-	From the ris -- ing _ to _ the set -- _ ting sun, _
-	His love en -- dures for -- e -- _ ver _
-	By the grace of God, _ we will car -- _ ry on, _
-	His love en -- dures for -- e -- _ ver _
-
-	Sing praise, __ _ _ sing praise __ _ _
-	Sing praise, __ _ _ sing praise __ _
-
-	For -- e -- _ ver God _ is faith -- _ ful _
-	For -- e -- _ ver God _ is strong _
-	For -- e -- _ ver God is with _ us _
-	For -- e -- _ ver _
-	For -- e -- _ ver _
-
-	His love en -- dures for -- e -- _ ver _
-	His love en -- dures for -- e -- _ ver _
-	His love en -- dures for -- e -- _ ver _
-	His love en -- dures for -- e -- _ ver _
+	For -- e-
 
-	Sing
-}
+	_ ver, _ for -- e -- _ ver. _
+	From the
 
-LeadVoxTextB = \lyricmode
-{
-	_ might -- y _ hand _ and out -- _ stretched arm, _
-	His love en -- dures for -- e -- _ ver _
-	_ _ For the life _ _ _ that’s been re -- born, _
-	His love en -- dures for -- e -- _ ver _
-}
+	_ ver, _ for -- e-
 
-LeadVoxTextC = \lyricmode
-{
+	_ ver, _ For -- e -- _ ver. _
 }
 
 
@@ -267,12 +263,17 @@ Riffs = \relative c''
 {
 	\clef G
 
+	\tiny
+
 	% Intro
 
-%{
-	\tiny
+	e8 e ~ |   % 0
+	e8 cs4 b8 ~ b a4 b8 ~ |   % 1
+	b8 cs4. ~ cs4 e8 e ~ |   % 2
+	e8 cs4 b8 ~ b cs4 a8 ~ |   % 3
+	a2 s2 |    % 4
+
 	\normalsize
-%}
 }
 
 
@@ -283,108 +284,90 @@ Chords = \chordmode
 {
 	% Intro
 
-	g1:sus2 |   %
-	s1 |   %
-	e1:m7 |   %
-	s1 |   %
-	d1 |   %
-	s1 |   %
-	c1:sus2 |   %
-	s1 |   %
+	s8 a:sus2 |   % 0
+	s1 |   % 1
+	s2.. a8:sus2/fs |   % 2
+	s2.. d8:sus2 |   % 3
+	s2.. a8:sus2 |   % 4
+
+	% Chorus
+
+	s1 |   % 5
+	s2.. a8:sus2/fs |   % 6
+	s1 |   % 7
+	s2.. e8 |   % 8
+	s1 |   % 9
+	s2.. d8:sus2 |   % 10
+	s1 |   % 11
+
+	d2..:sus2 a8:sus2 |   % 12
+
+	d2..:sus2 a8:sus2 |   % 13
+
+	s1 |   % 14
+	s2 d:sus2 |   % 15
 
 	% Verse
 
-	g1:sus2 |   %
-	s1 |   %
-	s1 |   %
-	s1 |   %
-	c1 |   %
-	s1 |   %
-	s1 |   %
-	g1:sus2 |   %
-	d1 |   %
-	s1 |   %
-	e1:m7 |   %
+	a1:sus2 |   % 16
+	s1 |   % 17
+	s1 |   % 18
+	s1 |   % 19
+	d1 |   % 20
+	s1 |   % 21
+	s1 |   % 22
+	a1:sus2 |   % 23
+	e1 |   % 24
+	s1 |   % 25
+	d1:sus2/fs |   % 26
 
-	c1:sus2 |   %
+	d1:sus2 |   % 27
 
-	c1:sus2 |   %
+	d1:sus2 |   % 28
 
 	% Prechorus
 
-	d1 |   %
-	s1 |   %
-	e1:m7 |   %
-	c1 |   %
+	e1 |   % 29
+	s1 |   % 30
+	d1:sus2/fs |   % 31
+	d2.. a8:sus2 |   % 32
 
 	% Chorus
 
-	g1:sus2 |   %
-	s1 |   %
-	e1:m7 |   %
-	s1 |   %
-	d1 |   %
-	s1 |   %
-	c1:sus2 |   %
-	s1 |   %
-	g1:sus2 |   %
-	s2 c:sus2 |   %
+	s1 |   % 33
+	s2.. a8:sus2/fs |   % 34
+	s1 |   % 35
+	s2.. e8 |   % 36
+	s1 |   % 37
+	s2.. d8:sus2 |   % 38
+	s1 |   % 39
 
-	% Verse
+	d2..:sus2 a8:sus2 |   % 40
 
-	g1:sus2 |   %
-	s1 |   %
-	s1 |   %
-	s1 |   %
-	c1 |   %
-	s1 |   %
-	s1 |   %
-	g1:sus2 |   %
+	d2..:sus2 a8:sus2 |   % 41
+	s1 |   % 42
+	s2 d:sus2 |   % 43
 
-	% Prechorus
+	d2..:sus2 a8:sus2 |   % 44
 
-	d1 |   %
-	s1 |   %
-	e1:m7 |   %
-	c1:sus2 |   %
-	d1 |   %
-	s1 |   %
-	e1:m7 |   %
-	c1 |   %
+	d1:sus2 |   % 45
 
-	% Chorus
+	% End
 
-	g1:sus2 |   %
-	s1 |   %
-	e1:m7 |   %
-	s1 |   %
-	d1 |   %
-	s1 |   %
-	c1:sus2 |   %
-	s1 |   %
-	g1:sus2 |   %
-	s1 |   %
-
-	% Bridge
-
-	g1 |   %
-	 |   %
+	a1:sus2 |   % 46
 }
 
 
 %
 % 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...
-%
 Rhythm = \relative c
 {
 	\numericTimeSignature
 	\override NoteHead #'style = #'slash
 	\teeny
 
-	r4 r8 c c4 |   % 0
+	r8 c ~ |   % 0
 	c4 c c |   % 1
 	c4 c c |   % 2
 	c4 c4. c8 |   % 3
@@ -409,16 +392,17 @@ Rhythm = \relative c
 
 Dynamics =
 {
-%{
-	s4_\markup { \italic { snare pat. } } s2 |   % 1
-	s4_\markup { \italic { simile } } s2 |   % 2
-	s2.*19
-	s4_\markup { \italic { spacey } } s2 |   % 22
-	s2.*5
-	s4 s \< s \! |   % 28
-	s2.*22
-	s4_\markup { \italic { Last time } } s2 |   % 51
-%}
+	s4_\f |   % 0
+	s1*14
+	s2._\> s4_\mf |   % 15
+	s1*11
+	s1^\markup { \italic { (Dr. Fill) } } |   % 27
+	s1*4
+	s2._\<^\markup { \italic { (Dr. Fill) } } s4_\f |   % 32
+	s1*10
+	s2._\>^\markup { \italic { (Dr. Fill) } } s4_\mf |   % 43
+	s1
+	s2 s^\markup { \italic { Rit. } } |   % 45
 }
 
 
@@ -440,9 +424,8 @@ Dynamics =
 		<<
 			\Global						% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
-			\new Voice \Riffs
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-			\new Lyrics \lyricsto "lead" \LeadVoxTextB
+			\new Voice << \Riffs \Dynamics >>
+			\new Lyrics = "verse1" \lyricsto "lead" \LeadVoxText
 		>>
 	>>
 }
@@ -466,3 +449,4 @@ Dynamics =
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
 }
+
-- 
2.37.2