X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=god-is-great.ly;fp=god-is-great.ly;h=f369d3e013b410a36b922f9e4b8e641a4557ce62;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=92067b6f37838e11d7f444491224b1f9abe289af;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/god-is-great.ly b/god-is-great.ly
index 92067b6..f369d3e 100644
--- a/god-is-great.ly
+++ b/god-is-great.ly
@@ -12,44 +12,132 @@ staffSize = #16
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "God Is Great" }
-%	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Twila Paris" }
+%	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"
 }
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c'
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key a \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	\partial 2 r2 |   % 0
+	\partial 2 s2 |   % 0
 
 	\repeat volta 2
 	{
-		R1 |   % 1
-		R1 |   % 2
-		R1 |   % 3
-		R1 |   % 4
+		s1*4 |   % 1-4
 	}
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
+	\mark \markup { \override #'(font-family . sans) { \box { A } } }
+
+	s1*16 \bar "||"   % 5-20
+
+	s1*16 \bar "||"   % 21-36
+
+	% Chorus
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+
+	s1*16 \bar "||"   % 37-52
+	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	\mark \markup { \italic { To Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
+
+	% Midtro
+
+	s1*4 \bar "||"   % 53-56
+
+	% Verse
+
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+
+	s1*16 \bar "||"   % 57-72
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	\mark \markup { \italic { D.S. al Coda } }
+
+	% Coda
+
+\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
+%\stopStaff s1 \startStaff
+\set Score.currentBarNumber = #73
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+
+	\repeat volta 2
+	{
+		s1*4 |   % 73-76
+	}
+
+	% Bridge
+
+	\repeat volta 2
+	{
+		s1*8 |   % 77-84
+	}
+
+	s1*8 \bar "||"   % 85-92
+
+	s1*8 \bar ".|:-||"   % 93-100
+
+	% Chorus
+
+	\repeat volta 2
+	{
+		s1*8 \bar "||"   % 101-108
+
+		s1*7 |   % 109-115
+	}
+	\alternative
+	{
+		{
+			s1 |   % 116
+		}
+		{
+			s1 |   % 117
+		}
+	}
+
+	s1*4 |   % 118-121
+
+	% Outro
+
+	\repeat volta 2
+	{
+		s1*4 |   % 122-125
+	}
+
+	s1 \bar "|."   % 126
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	\clef G
+
+	% Intro
+
+	\partial 2 r2 |   % 0
+
+	R1*4 |   % 1-4
+
+	% Verse
 
 	r2 cs8 e4 e8 ~ |   % 5
 	e8 a,4 d8 ~ d cs4 b8 ~ |   % 6
@@ -66,7 +154,7 @@ LeadVox = \relative c'
 	a4 r r2 |   % 17
 	R1 |   % 18
 	R1 |   % 19
-	R1 \bar "||"   % 20
+	R1 |   % 20
 
 	r2 cs8 e4 e8 ~ |   % 21
 	e8 a,4 d8 ~ d cs4 b8 ~ |   % 22
@@ -83,14 +171,10 @@ LeadVox = \relative c'
 	a4 r r2 |   % 33
 	R1 |   % 34
 	R1 |   % 35
-	r2 a4 cs \bar "||"   % 36
+	r2 a4 cs |   % 36
 
 	% Chorus
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
-%\musicglyph #"scripts.segno" \italic { band in } }
-
 	cs4 r a cs |   % 37
 	cs4 r d cs8 b ~ |   % 38
 	b8 r r4 d cs8 b ( |   % 39
@@ -106,21 +190,15 @@ LeadVox = \relative c'
 	cs4 a8 a ~ a cs4 cs8 ~ |   % 49
 	cs8 a4 d8 ~ d cs ( b ) b ~ |   % 50
 	b2. r8 e, |   % 51
-	cs'4 b8 b ~ b a4 a8 ~ \bar "||"   % 52
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { To Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
+	cs'4 b8 b ~ b a4 a8 ~ |   % 52
 
 	% Midtro
 
 	a1 |   % 53
-	R1 |   % 54
-	R1 |   % 55
-	R1 \bar "||"   % 56
+	R1*3 |   % 54-56
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
 	r2 cs8 e4 e8 ~ |   % 57
 	e8 a,4 d8 ~ d cs4 b8 ~ |   % 58
 	b4 r r2 |   % 59
@@ -136,41 +214,24 @@ LeadVox = \relative c'
 	a1 |   % 69
 	r2 r4 e8 d' ~ |   % 70
 	d8 cs ( b ) b ~ b2 |   % 71
-	r2 a4 cs \bar "||"   % 72
-
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { D.S. al Coda } }
+	r2 a4 cs |   % 72
 
 	% Coda
 
-%\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-\stopStaff s1 \startStaff
-\set Score.currentBarNumber = #73
-
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+	s1 % Spacer for coda
 
-	\repeat volta 2
-	{
-		R1 |   % 73
-		R1 |   % 74
-		R1 |   % 75
-		R1 |   % 76
-	}
+	R1*4 |   % 73-76
 
 	% Bridge
 
-	\repeat volta 2
-	{
-		e2 e |   % 77
-		e a,4 ( b ) |   % 78
-		b1 |   % 79
-		r4 a8 d ~ d cs4 a8 (  |   % 80
-		fs1 ) |   % 81
-		r4 a8 d ~ d cs4 b8 ~ |   % 82
-		b1 |   % 83
-		R1 |   % 84
-	}
+	e2 e |   % 77
+	e a,4 ( b ) |   % 78
+	b1 |   % 79
+	r4 a8 d ~ d cs4 a8 (  |   % 80
+	fs1 ) |   % 81
+	r4 a8 d ~ d cs4 b8 ~ |   % 82
+	b1 |   % 83
+	R1 |   % 84
 
 	e2 e |   % 85
 	e a,4 ( b ) |   % 86
@@ -179,7 +240,7 @@ LeadVox = \relative c'
 	fs1 ) |   % 89
 	r4 a8 d ~ d cs4 b8 ~ |   % 90
 	b1 |   % 91
-	R1 \bar "||"   % 92
+	R1 |   % 92
 
 	e2 e |   % 93
 	e a,4 ( b ) |   % 94
@@ -188,58 +249,41 @@ LeadVox = \relative c'
 	fs1 ) |   % 97
 	r4 a8 d ~ d cs4 b8 ~ |   % 98
 	b1 |   % 99
-	r2 a4 cs \bar "||"   % 100
+	r2 a4 cs |   % 100
 
 	% Chorus
 
-	\repeat volta 2
-	{
-		cs4 r a cs |   % 101
-		cs4 r d cs8 b ~ |   % 102
-		b8 r r4 d cs8 b ( |   % 103
-		a8 ) a4 r8 a4 cs |   % 104
-		cs4 r8 a ~ a cs4 cs8 ~ |   % 105
-		cs4 a8 d ~ d4 cs8 cs ( |   % 106
-		b2 ) r |   % 107
-		r2 a4 cs \bar "||"   % 108
-
-		cs4 r a cs |   % 109
-		cs4 r d cs8 b ~ |   % 110
-		b8 r r4 d cs8 b ( |   % 111
-		a8 ) a4 r8 a4 cs |   % 112
-		cs4 a8 a ~ a cs4 cs8 ~ |   % 113
-		cs8 a4 d8 ~ d cs ( b ) b ~ |   % 114
-		b2. r4 |   % 115
-%		cs'4 b8 b ~ b a4 a8 ~ |   % 116
-	}
-	\alternative
-	{
-		{
-			r2 a4 cs |   % 116
-		}
-		{
-			R1 |   % 117
-		}
-	}
+	cs4 r a cs |   % 101
+	cs4 r d cs8 b ~ |   % 102
+	b8 r r4 d cs8 b ( |   % 103
+	a8 ) a4 r8 a4 cs |   % 104
+	cs4 r8 a ~ a cs4 cs8 ~ |   % 105
+	cs4 a8 d ~ d4 cs8 cs ( |   % 106
+	b2 ) r |   % 107
+	r2 a4 cs \bar "||"   % 108
+
+	cs4 r a cs |   % 109
+	cs4 r d cs8 b ~ |   % 110
+	b8 r r4 d cs8 b ( |   % 111
+	a8 ) a4 r8 a4 cs |   % 112
+	cs4 a8 a ~ a cs4 cs8 ~ |   % 113
+	cs8 a4 d8 ~ d cs ( b ) b ~ |   % 114
+	b2. r4 |   % 115
+
+	r2 a4 cs |   % 116
 
-	R1 |   % 118
-	R1 |   % 119
-	R1 |   % 120
-	R1 |   % 121
+	R1 |   % 117
+
+	R1*4 |   % 118-121
 
 	% Outro
 
-	\repeat volta 2
-	{
-		R1 |   % 122
-		R1 |   % 123
-		R1 |   % 124
-		R1 |   % 125
-	}
+	R1*4 |   % 122-125
 
 	r1^\fermata |   % 126
 }
 
+
 LeadVoxText = \lyricmode
 {
 	All cre- a- _ tion cries _ to you _
@@ -306,10 +350,6 @@ LeadVoxTextB = \lyricmode
 Riffs = \relative c''
 {
 	\clef G
-	\key a \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -361,13 +401,10 @@ Chords = \chordmode
 
 	\partial 2 s2 |   % 0
 
-	\repeat volta 2
-	{
-		a1 |   % 1
-		d1:sus2 |   % 2
-		e1:11^7.9 |   % 3
-		d1:sus2 |   % 4
-	}
+	a1 |   % 1
+	d1:sus2 |   % 2
+	e1:11^7.9 |   % 3
+	d1:sus2 |   % 4
 
 	% Verse
 
@@ -452,30 +489,23 @@ Chords = \chordmode
 
 	% Coda
 
-%\stopStaff s1 \startStaff
-s1
+	s1 % Blank for coda
 
-	\repeat volta 2
-	{
-		d1 |   % 73
-		fs1:m7 |   % 74
-		e1:sus4 |   % 75
-		e1 |   % 76
-	}
+	d1 |   % 73
+	fs1:m7 |   % 74
+	e1:sus4 |   % 75
+	e1 |   % 76
 
 	% Bridge
 
-	\repeat volta 2
-	{
-		a2.. d8:sus2 |   % 77
-		s2.. e8:sus4 |   % 78
-		s2.. e8 |   % 79
-		s1 |   % 80
-		fs2..:m7 d8:sus2 |   % 81
-		s2.. e8:sus4 |   % 82
-		s2.. e8 |   % 83
-		s1 |   % 84
-	}
+	a2.. d8:sus2 |   % 77
+	s2.. e8:sus4 |   % 78
+	s2.. e8 |   % 79
+	s1 |   % 80
+	fs2..:m7 d8:sus2 |   % 81
+	s2.. e8:sus4 |   % 82
+	s2.. e8 |   % 83
+	s1 |   % 84
 
 	a1 |   % 85
 	d1:sus2 |   % 86
@@ -497,34 +527,26 @@ s1
 
 	% Chorus
 
-	\repeat volta 2
-	{
-		a1 |   % 101
-		d1:sus2 |   % 102
-		e1:sus4 |   % 103
-		d1:sus2 |   % 104
-		a1 |   % 105
-		fs1:m7 |   % 106
-		e1:sus4 |   % 107
-		e1 |   % 108
-
-		a1 |   % 109
-		d1:sus2 |   % 110
-		e1:sus4 |   % 111
-		d1:sus2 |   % 112
-		fs1:m7 |   % 113
-		d1:sus2 |   % 114
-		e1:sus4 |   % 115
-	}
-	\alternative
-	{
-		{
-			e1:sus4 |   % 116
-		}
-		{
-			e1:sus4 |   % 117
-		}
-	}
+	a1 |   % 101
+	d1:sus2 |   % 102
+	e1:sus4 |   % 103
+	d1:sus2 |   % 104
+	a1 |   % 105
+	fs1:m7 |   % 106
+	e1:sus4 |   % 107
+	e1 |   % 108
+
+	a1 |   % 109
+	d1:sus2 |   % 110
+	e1:sus4 |   % 111
+	d1:sus2 |   % 112
+	fs1:m7 |   % 113
+	d1:sus2 |   % 114
+	e1:sus4 |   % 115
+
+	e1:sus4 |   % 116
+
+	e1:sus4 |   % 117
 
 	fs1:m7 |   % 118
 	d1:sus2 |   % 119
@@ -533,17 +555,15 @@ s1
 
 	% Outro
 
-	\repeat volta 2
-	{
-		a1 |   % 122
-		d1:sus2 |   % 123
-		e1:11^7.9 |   % 124
-		d1:sus2 |   % 125
-	}
+	a1 |   % 122
+	d1:sus2 |   % 123
+	e1:11^7.9 |   % 124
+	d1:sus2 |   % 125
 
 	a1 |   % 126
 }
 
+
 %
 % Alternate chord changes (2nd verse)
 %
@@ -563,32 +583,24 @@ ChordsSup = \chordmode
 %}
 }
 
+
 %
 % 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
 
 	\partial 2 c4-> c-> |   % 0
 
-	\repeat volta 2
-	{
-		c4. c8 ~ c4 c |   % 1
-		c4. c8 ~ c4 c |   % 2
-		c4. c8 ~ c4 c |   % 3
-		c4. c8 ~ c4 c |   % 4
-	}
+	c4. c8 ~ c4 c |   % 1
+	c4. c8 ~ c4 c |   % 2
+	c4. c8 ~ c4 c |   % 3
+	c4. c8 ~ c4 c |   % 4
 
 	% Verse
 
@@ -607,7 +619,7 @@ StaffC = \relative c
 	c2. ~ c8 c ~ |   % 17
 	c1 |   % 18
 	c2. ~ c8 c ~ |   % 19
-	c2. ~ c8 c-> ~ \bar "||"   % 20
+	c2. ~ c8 c-> ~ |   % 20
 
 	c4 c-> c8 c c c ~ |   % 21
 	c4 c-> c8 c c c ~ |   % 22
@@ -624,7 +636,7 @@ StaffC = \relative c
 	c2. ~ c8 c ~ |   % 33
 	c1 |   % 34
 	c2. ~ c8 c ~ |   % 35
-	c1 \bar "||"   % 36
+	c1 |   % 36
 
 	% Chorus
 
@@ -643,7 +655,7 @@ StaffC = \relative c
 	c4 c c c |   % 49
 	c4 c c c |   % 50
 	c4 c c c |   % 51
-	c4 c c c \bar "||"   % 52
+	c4 c c c |   % 52
 
 	% Midtro
 
@@ -669,35 +681,29 @@ StaffC = \relative c
 	c4 c c c |   % 69
 	c4 c c c8 c ~ |   % 70
 	c4 c c c |   % 71
-	c4 c c c \bar "||"   % 72
+	c4 c c c |   % 72
 
 	% Coda
 
-%\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-\stopStaff s1 \startStaff
+\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
+%\stopStaff s1 \startStaff
 \set Score.currentBarNumber = #73
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 73
-		c4 c c c |   % 74
-		c4 c c c |   % 75
-		c4 c c c |   % 76
-	}
+	c4 c c c |   % 73
+	c4 c c c |   % 74
+	c4 c c c |   % 75
+	c4 c c c |   % 76
 
 	% Bridge
 
-	\repeat volta 2
-	{
-		c4 c-> c8 c c c ~ |   % 77
-		c4 c-> c8 c c c ~ |   % 78
-		c4 c-> c8 c c c ~ |   % 79
-		c4 c-> c8 c c c |   % 80
-		c4 c-> c8 c c c ~ |   % 81
-		c4 c-> c8 c c c ~ |   % 82
-		c4 c-> c8 c c c ~ |   % 83
-		c4 c-> c8 c c c |   % 84
-	}
+	c4 c-> c8 c c c ~ |   % 77
+	c4 c-> c8 c c c ~ |   % 78
+	c4 c-> c8 c c c ~ |   % 79
+	c4 c-> c8 c c c |   % 80
+	c4 c-> c8 c c c ~ |   % 81
+	c4 c-> c8 c c c ~ |   % 82
+	c4 c-> c8 c c c ~ |   % 83
+	c4 c-> c8 c c c |   % 84
 
 	c4 c c c |   % 85
 	c4 c c c |   % 86
@@ -706,7 +712,7 @@ StaffC = \relative c
 	c4 c c c |   % 89
 	c4 c c c |   % 90
 	c4 c c c |   % 91
-	c4 c c c \bar "||"   % 92
+	c4 c c c |   % 92
 
 	c4 c c c |   % 93
 	c4 c c c |   % 94
@@ -715,38 +721,30 @@ StaffC = \relative c
 	c4 c c c |   % 97
 	c4 c c c |   % 98
 	c4 c c c |   % 99
-	c4 c c c \bar "||"   % 100
+	c4 c c c |   % 100
 
 	% Chorus
 
-	\repeat volta 2
-	{
-		c4 c2.-> ~ |   % 101
-		c4 c2.-> ~ |   % 102
-		c4 c2.-> ~ |   % 103
-		c4 c2.-> ~ |   % 104
-		c4 c2.-> ~ |   % 105
-		c4 c2.-> |   % 106
-		c8 c c c c c c c |   % 107
-		r8 c-> c4-> r8 c-> c-> c-> \bar "||"   % 108
-
-		c4 c c c |   % 109
-		c4 c c c |   % 110
-		c4 c c c |   % 111
-		c4 c c c |   % 112
-		c4 c c c |   % 113
-		c4 c c c |   % 114
-		c4 c c c |   % 115
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 116
-		}
-		{
-			c4 c c c |   % 117
-		}
-	}
+	c4 c2.-> ~ |   % 101
+	c4 c2.-> ~ |   % 102
+	c4 c2.-> ~ |   % 103
+	c4 c2.-> ~ |   % 104
+	c4 c2.-> ~ |   % 105
+	c4 c2.-> |   % 106
+	c8 c c c c c c c |   % 107
+	r8 c-> c4-> r8 c-> c-> c-> |   % 108
+
+	c4 c c c |   % 109
+	c4 c c c |   % 110
+	c4 c c c |   % 111
+	c4 c c c |   % 112
+	c4 c c c |   % 113
+	c4 c c c |   % 114
+	c4 c c c |   % 115
+
+	c4 c c c |   % 116
+
+	c4 c c c |   % 117
 
 	c4 c c c |   % 118
 	c4 c c c |   % 119
@@ -755,13 +753,10 @@ StaffC = \relative c
 
 	% Outro
 
-	\repeat volta 2
-	{
-		c4. c8 ~ c4 c |   % 122
-		c4. c8 ~ c4 c |   % 123
-		c4. c8 ~ c4 c |   % 124
-		c4. c8 ~ c4 c |   % 125
-	}
+	c4. c8 ~ c4 c |   % 122
+	c4. c8 ~ c4 c |   % 123
+	c4. c8 ~ c4 c |   % 124
+	c4. c8 ~ c4 c |   % 125
 
 	c1^\fermata |   % 126
 }
@@ -786,40 +781,45 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\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" \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new ChordNames = "chords2" \ChordsSup
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new ChordNames \ChordsSup
+			\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)))
-
-%  top-margin = -0.25 \in
+	#(define fonts (make-pango-font-tree
+		"Times New Roman"
+		"JazzText"
+		"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
 }
+