X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=my-redeemer-lives.ly;h=829c845364980117994ebc79ac4db65639227eaf;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=3b22c6a4156f3e9cba8294c80e5ba66406366c30;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/my-redeemer-lives.ly b/my-redeemer-lives.ly
index 3b22c6a..829c845 100644
--- a/my-redeemer-lives.ly
+++ b/my-redeemer-lives.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,8 +10,6 @@ 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 "My Redeemer Lives" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Reuben Morgan" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Drippin’ Soul" }
@@ -20,89 +18,116 @@ staffSize = #18
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c''
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key e \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
 	\repeat volta 2
 	{
-		R1 |   % 1
-		R1 |   % 2
+		s1*2 |   % 1-2
 	}
 
 	\repeat volta 3
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		r4 gs gs4. fs8 |   % 3
-		fs8 e cs e ~ e4 r |   % 4
-		r4 gs gs4. fs8 |   % 5
-		fs8 e cs e ~ e e fs gs ~ ( |   % 6
-		gs2 ~ gs4. ~ gs16 fs |   % 7
-		e4 ) r r8 a a a ( |   % 8
-		gs4 ) r r2 |   % 9
-		R1 |   % 10
-		r4 gs gs4. fs8 |   % 11
-		fs8 e cs e ~ e4 r |   % 12
-		r4 gs gs4. fs8 |   % 13
-		fs8 e cs e ~ e e fs gs ~ ( |   % 14
-		gs2 ~ gs4. ~ gs16 fs |   % 15
-		e4 ) r r8 a a a ( |   % 16
-		gs4 ) r r2 |   % 17
-		R1 \bar "||"   % 18
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*16 \bar "||"   % 3-18
 
 		% Prechorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		r4 fs fs e8 fs ~ |   % 19
-		fs8 gs4. r2 |   % 20
-		r8 e a4 a r8 a8 |   % 21
-		a8 gs a8 b ~ b r gs b \bar "||"   % 22
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*4 \bar "||"   % 19-22
 
 		% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+		\mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
 
-		b2 gs4. e8 ~ |   % 23
-		e4 r r gs8 b |   % 24
-		b2 gs4. a16 ( gs |   % 25
-		fs4 ) r r gs8 b |   % 26
-		b2 gs4. e8 ~ |   % 27
-		e4 r r gs8 b |   % 28
+		s1*6 |   % 23-28
 	}
 	\alternative
 	{
 		{
-			b2 gs4. a16 ( gs |   % 29
-			fs2. ) r4 |   % 30
+			s1*2 |   % 29-30
 		}
 		{
-			b2 gs4. a16 ( gs |   % 31
-			fs2. ) r4^\markup { \hspace #0.0 \raise #0.6 { D.S. } } \bar "||"   % 32
+			s1 |   % 31
+			s2. s4^\markup { \hspace #0.0 \raise #0.6 { D.S. } } \bar "||"   % 32
 		}
 		{
-			b2 gs4. a16 ( gs |   % 33
-			fs2. ) r4 |   % 34
+			s1*2 |   % 33-34
 		}
 	}
 
-	r1-\fermata \bar "|."   % 35
+	s1 \bar "|."   % 35
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	% Intro
+
+	R1 |   % 1
+	R1 |   % 2
+
+	% Verse
+
+	r4 gs gs4. fs8 |   % 3
+	fs8 e cs e ~ e4 r |   % 4
+	r4 gs gs4. fs8 |   % 5
+	fs8 e cs e ~ e e fs gs ~ ( |   % 6
+	gs2 ~ gs4. ~ gs16 fs |   % 7
+	e4 ) r r8 a a a ( |   % 8
+	gs4 ) r r2 |   % 9
+	R1 |   % 10
+	r4 gs gs4. fs8 |   % 11
+	fs8 e cs e ~ e4 r |   % 12
+	r4 gs gs4. fs8 |   % 13
+	fs8 e cs e ~ e e fs gs ~ ( |   % 14
+	gs2 ~ gs4. ~ gs16 fs |   % 15
+	e4 ) r r8 a a a ( |   % 16
+	gs4 ) r r2 |   % 17
+	R1 |   % 18
+
+	% Prechorus
+
+	r4 fs fs e8 fs ~ |   % 19
+	fs8 gs4. r2 |   % 20
+	r8 e a4 a r8 a8 |   % 21
+	a8 gs a8 b ~ b r gs b |   % 22
+
+	% Chorus
+
+	b2 gs4. e8 ~ |   % 23
+	e4 r r gs8 b |   % 24
+	b2 gs4. a16 ( gs |   % 25
+	fs4 ) r r gs8 b |   % 26
+	b2 gs4. e8 ~ |   % 27
+	e4 r r gs8 b |   % 28
+
+	b2 gs4. a16 ( gs |   % 29
+	fs2. ) r4 |   % 30
+
+	b2 gs4. a16 ( gs |   % 31
+	fs2. ) r4 |   % 32
+
+	b2 gs4. a16 ( gs |   % 33
+	fs2. ) r4 |   % 34
+
+	r1-\fermata |   % 35
 }
 
+
 LeadVoxText = \lyricmode
 {
 	I know he res -- cued my soul, __ _
@@ -134,15 +159,8 @@ LeadVoxText = \lyricmode
 %
 % Riff/rhythm figures
 %
-
 Riffs = \relative c''
 {
-	\clef G
-	\key e \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 %{
@@ -186,74 +204,56 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Needed???
-	\override SeparatingGroupSpanner #'padding = #'2.0
-% Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\repeat volta 2
-	{
-		e1:7 |   % 1
-		a1:7 |   % 2
-	}
-
-	\repeat volta 3
-	{
-		% Verse
-
-		e1:7 |   % 3
-		a1 |   % 4
-		e1:7 |   % 5
-		a1 |   % 6
-		e1:7 |   % 7
-		a1:7 |   % 8
-		e1:7 |   % 9
-		a1:7 |   % 10
-		e1:7 |   % 11
-		a1 |   % 12
-		e1:7 |   % 13
-		a1 |   % 14
-		e1:7 |   % 15
-		a1:7 |   % 16
-		e1:7 |   % 17
-		a1:7 |   % 18
-
-		% Prechorus
-
-		b1:sus4 |   % 19
-		s1 |   % 20
-		a1 |   % 21
-		a1/b |   % 22
-
-		% Chorus
-
-		e1 |   % 23
-		a1 |   % 24
-		cs1:m7 |   % 25
-		b1:sus4 |   % 26
-		e1 |   % 27
-		a1 |   % 28
-	}
-	\alternative
-	{
-		{
-			cs1:m7 |   % 29
-			b1:sus4 |   % 30
-		}
-		{
-			cs1:m7 |   % 31
-			b1:sus4 |   % 32
-		}
-		{
-			cs1:m7 |   % 33
-			b1:sus4 |   % 34
-		}
-	}
+	e1:7 |   % 1
+	a1:7 |   % 2
+
+	% Verse
+
+	e1:7 |   % 3
+	a1 |   % 4
+	e1:7 |   % 5
+	a1 |   % 6
+	e1:7 |   % 7
+	a1:7 |   % 8
+	e1:7 |   % 9
+	a1:7 |   % 10
+	e1:7 |   % 11
+	a1 |   % 12
+	e1:7 |   % 13
+	a1 |   % 14
+	e1:7 |   % 15
+	a1:7 |   % 16
+	e1:7 |   % 17
+	a1:7 |   % 18
+
+	% Prechorus
+
+	b1:sus4 |   % 19
+	s1 |   % 20
+	a1 |   % 21
+	a1/b |   % 22
+
+	% Chorus
+
+	e1 |   % 23
+	a1 |   % 24
+	cs1:m7 |   % 25
+	b1:sus4 |   % 26
+	e1 |   % 27
+	a1 |   % 28
+
+	cs1:m7 |   % 29
+	b1:sus4 |   % 30
+
+	cs1:m7 |   % 31
+	b1:sus4 |   % 32
+
+	cs1:m7 |   % 33
+	b1:sus4 |   % 34
 
 	e1:^3 |   % 35
 }
@@ -262,80 +262,62 @@ Chords = \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.instrument = #"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
-	}
-
-	\repeat volta 3
-	{
-		% Verse
-
-		c4 c c c |   % 3
-		c4 c c c |   % 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 \bar "||"   % 18
-
-		% Prechorus
-
-		c4 c c c |   % 19
-		c4 c c c |   % 20
-		c4 c c c |   % 21
-		c4 c c c \bar "||"   % 22
-
-		% Chorus
-
-		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
-	}
-	\alternative
-	{
-		{
-			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
-		}
-	}
-
-	c1-\fermata \bar "|."   % 35
+	c4 c c c |   % 1
+	c4 c c c |   % 2
+
+	% Verse
+
+	c4 c c c |   % 3
+	c4 c c c |   % 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
+
+	% Prechorus
+
+	c4 c c c |   % 19
+	c4 c c c |   % 20
+	c4 c c c |   % 21
+	c4 c c c |   % 22
+
+	% Chorus
+
+	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
+
+	c1-\fermata |   % 35
 }
 
 
@@ -354,16 +336,19 @@ 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 ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
@@ -381,9 +366,20 @@ Dynamics =
 
 \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
 }
+