X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=i-will-praise-him-still.ly;h=dda2841c667b8b70ab1251698191851050f98232;hb=HEAD;hp=08b46f5b1fb2f5d5d2d313769d2473aaec4a57e6;hpb=cdf57606f385bc4493fed4e3860bce0ce657dc40;p=music

diff --git a/i-will-praise-him-still.ly b/i-will-praise-him-still.ly
index 08b46f5..dda2841 100644
--- a/i-will-praise-him-still.ly
+++ b/i-will-praise-him-still.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)
@@ -12,8 +12,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 "I Will Praise Him Still" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Fernando Ortega" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. John Wierick" }
@@ -30,126 +28,180 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c''
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key g \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
-	\time 2/4 s2 \time 4/4 | % 5
-	r2 r4 g8 fs | % 6
+	s1*4 |   % 1-4
+	\time 2/4 s2 \time 4/4 |   % 5
+	s1 |   % 6
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
 
-		e4 e d d8 g | % 7
-		a4 a b b8 a | % 8
-		g4 e d d8 g | % 9
-		\time 2/4 a4 a \time 4/4 | % 10
-		g2 r4 g8 fs | % 11
-
-		e4 e d d8 g | % 12
-		a4 a b b8 a | % 13
-		g4 e d d8 g | % 14
-		\time 2/4 a4 a \time 4/4 | % 15
-		g2 r4 b8 d \bar "||" % 16
+		s1*3 |   % 7-9
+		\time 2/4 s2 \time 4/4 |   % 10
+		s1*4 |   % 11-14
+		\time 2/4 s2 \time 4/4 |   % 15
+		s1 \bar "||"   % 16
 
 		% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
 
-		<d \hn fs>4 <d \hn fs> <d \hn g>4 b8 ( a16 g ) | % 17
-		<a \hn d>4 <a \hn d> <b \hn d> b8 d | % 18
-		<e \hn g>4 <e \hn g> <d \hn fs> b8 a | % 19
-		\time 2/4 g4 b \time 4/4 | % 20
+		s1*3 | % 17-19
+		\time 2/4 s2 \time 4/4 |   % 20
 	}
 	\alternative
 	{
 		{
-			a2 r4 g8 fs \bar "||" % 21
-			e4 e d d8 g | % 22
-			a4 a b b8 a | % 23
-			g4 e d d8 g | % 24
-			\time 2/4 a4 a \time 4/4 | % 25
-			g2. r4 | % 26
-			r2 r4 g8 fs | % 27
+			s1 \bar "||"   % 21
+			s1*3 |   % 22-24
+			\time 2/4 s2 \time 4/4 |   % 25
+			s1*2 |   % 26-27
 		}
 		{
-			a2 r4 e'8 e | % 28
-			d4 d d b8 ( a16 g ) | % 29
+			s1*2 |   % 28-29
 		}
 	}
 
+	s1*2 |   % 30-31
+	\time 2/4 s2 \time 4/4 |   % 32
+	s1 \bar "||"   % 33
+
+	% Verse
+
+	s1*3 |   % 34-36
+	\time 2/4 s2 \time 4/4 |   % 37
+	s1*2 |   % 38-39
+
+	\repeat volta 2
+	{
+		% Interlude
+
+		\mark \markup { \override #'(font-family . sans) { \box { C } } }
+		s1*4 |   % 40-43
+	}
+
+	% Chorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { D } } }
+	s1*3 |   % 44-46
+	\time 2/4 s2 \time 4/4 |   % 47
+	s1*4 |   % 48-51
+	\time 2/4 s2 \time 4/4 |   % 52
+	s1 \bar "||"   % 53
+
+	% Verse outro
+
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+	s1*3 |   % 54-56
+	\time 2/4 s2 \time 4/4 | % 57
+	s1*2 \bar "|."   % 58-59
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	\clef G
+
+	% Intro
+
+	s1*4 | % 1-4
+	s2 | % 5
+	r2 r4 g8 fs | % 6
+
+	% Verse
+
+	e4 e d d8 g | % 7
+	a4 a b b8 a | % 8
+	g4 e d d8 g | % 9
+	a4 a | % 10
+	g2 r4 g8 fs | % 11
+
+	e4 e d d8 g | % 12
+	a4 a b b8 a | % 13
+	g4 e d d8 g | % 14
+	a4 a | % 15
+	g2 r4 b8 d | % 16
+
+	% Chorus
+
+	<d \hn fs>4 <d \hn fs> <d \hn g>4 b8 ( a16 g ) | % 17
+	<a \hn d>4 <a \hn d> <b \hn d> b8 d | % 18
+	<e \hn g>4 <e \hn g> <d \hn fs> b8 a | % 19
+	g4 b | % 20
+
+	a2 r4 g8 fs | % 21
+	e4 e d d8 g | % 22
+	a4 a b b8 a | % 23
+	g4 e d d8 g | % 24
+	a4 a | % 25
+	g2. r4 | % 26
+	r2 r4 g8 fs | % 27
+
+	a2 r4 e'8 e | % 28
+	d4 d d b8 ( a16 g ) | % 29
+
 	a4 a b b8 d | % 30
 	e4 e d b8 a | % 31
-	\time 2/4 g4 b \time 4/4 | % 32
-	a2 r4 g8 fs \bar "||" % 33
+	g4 b | % 32
+	a2 r4 g8 fs | % 33
 
 	% Verse
 
 	e4 e d d8 g | % 34
 	a4 a b b8 a | % 35
 	g4 e d d8 g | % 36
-	\time 2/4 a4 a \time 4/4 | % 37
+	a4 a | % 37
 	g2. r4 | % 38
 	R1 | % 39
 
-	\repeat volta 2
-	{
-		% Interlude
-
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	% Interlude
 
-		s1 | % 40
-		s1 | % 41
-		s1 | % 42
-		\voiceOne s2. <e' \hn g>8 <e \hn fs> \oneVoice | % 43
-	}
+	s1 | % 40
+	s1 | % 41
+	s1 | % 42
+	\voiceOne s2. <e' \hn g>8 <e \hn fs> \oneVoice | % 43
 
 	% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
-
 	d4 d d b8 ( a16 g ) | % 44
 	a4 a b b8 d | % 45
 	e4 e d b8 a | % 46
-	\time 2/4 g4 b \time 4/4 | % 47
+	g4 b | % 47
 	a2 r4 e'8 e | % 48
 
 	d4 d d b8 ( a16 g ) | % 49
 	a4 a b b8 d | % 50
 	e4 e d b8 a | % 51
-	\time 2/4 g4 b \time 4/4 | % 52
-	a2 r4  g8 fs \bar "||" % 53
+	 g4 b | % 52
+	a2 r4 g8 fs | % 53
 
 	% Verse outro
 
-\mark \markup { \override #'(font-family . sans) { \box { E } } }
-
 	e4 e d d8 g | % 54
 	a4 a b b8 a | % 55
 	g4 e d d8 g | % 56
-	\time 2/4 a4 a \time 4/4 | % 57
+	a4 a | % 57
 	g1 ~ | % 58
-	g1^\fermata \bar "|." % 59
+	g1^\fermata | % 59
 }
 
+
 LeadVoxText = \lyricmode
 {
 	When the mor- ning falls on the far- thest hill
@@ -186,65 +238,51 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c'''
 {
-	\clef G
-	\key g \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
-\tiny
+	\tiny
 	r2. g8 fs | % 1
 	e4 e d d8 g | % 2
 	a4 a b b16 c32 b a16 g | % 3
 	g4 e d d8 g | % 4
-	\time 2/4 a4 a \time 4/4 | % 5
+	a4 a | % 5
 	g1 | % 6
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		s1 | % 7
-		s1 | % 8
-		s1 | % 9
-		\time 2/4 s2 \time 4/4 | % 10
-		s1 | % 11
+	s1 | % 7
+	s1 | % 8
+	s1 | % 9
+	s2 | % 10
+	s1 | % 11
 
-		s1 | % 12
-		s1 | % 13
-		s1 | % 14
-		\time 2/4 s2 \time 4/4 | % 15
-		s1 | % 16
+	s1 | % 12
+	s1 | % 13
+	s1 | % 14
+	s2 | % 15
+	s1 | % 16
 
-		% Chorus
+	% Chorus
 
-		s1 | % 17
-		s1 | % 18
-		s1 | % 19
-		\time 2/4 s2 \time 4/4 | % 20
-	}
-	\alternative
-	{
-		{
-			s1 | % 21
-			s1 | % 22
-			s1 | % 23
-			s1 | % 24
-			\time 2/4 s2 \time 4/4 | % 25
-			s1 | % 26
-			s1 | % 27
-		}
-		{
-			s1 | % 28
-			s1 | % 29
-		}
-	}
+	s1 | % 17
+	s1 | % 18
+	s1 | % 19
+	s2 | % 20
+
+	s1 | % 21
+	s1 | % 22
+	s1 | % 23
+	s1 | % 24
+	s2 | % 25
+	s1 | % 26
+	s1 | % 27
+
+	s1 | % 28
+	s1 | % 29
 
 	s1 | % 30
 	s1 | % 31
-	\time 2/4 s2 \time 4/4 | % 32
+	s2 | % 32
 	s1 | % 33
 
 	% Verse
@@ -252,31 +290,28 @@ Riffs = \relative c'''
 	s1 | % 34
 	s1 | % 35
 	s1 | % 36
-	\time 2/4 s2 \time 4/4 | % 37
+	s2 | % 37
 	s1 | % 38
 	s1 | % 39
 
-	\repeat volta 2
-	{
-		% Interlude
+	% Interlude
 
-		<< { \tiny e4 e d d8 g } \\ { \tiny <c, g>2 <b g> } >> | % 40
-		<< { a'4 a b b8 a } \\ { <a, fs>2 b16 c b a g8 fs } >> | % 41
-		<< { g'4 e d d8 g } \\ { e,4. g16 a b8 g d b' } >> | % 42
-		<< { a'4 a b16 c b a s4 } \\ { a,4. g16 fs g4 b8 g } >> | % 43
-	}
+	<< { \tiny e4 e d d8 g } \\ { \tiny <c, g>2 <b g> } >> | % 40
+	<< { a'4 a b b8 a } \\ { <a, fs>2 b16 c b a g8 fs } >> | % 41
+	<< { g'4 e d d8 g } \\ { e,4. g16 a b8 g d b' } >> | % 42
+	<< { a'4 a b16 c b a s4 } \\ { a,4. g16 fs g4 b8 g } >> | % 43
 
 	% Chorus
 
 	s1 | % 44
 	s1 | % 45
 	s1 | % 46
-	\time 2/4 s2 \time 4/4 | % 47
+	s2 | % 47
 	s1 | % 48
 	s1 | % 49
 	s1 | % 50
 	s1 | % 51
-	\time 2/4 s2 \time 4/4 | % 52
+	s2 | % 52
 	s1 | % 53
 
 	% Verse outro
@@ -284,74 +319,62 @@ Riffs = \relative c'''
 	s1 | % 54
 	s1 | % 55
 	s1 | % 56
-	\time 2/4 s2 \time 4/4 | % 57
+	s2 | % 57
 	s1 | % 58
-	s1 \bar "|." % 59
-\normalsize
+	s1 | % 59
+	\normalsize
 }
 
 
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	s1 | % 1
 	c2/g g | % 2
 	d2/fs e:m | % 3
 	a2:m g/b | % 4
-	\time 2/4 d2 \time 4/4 | % 5
+	d2 | % 5
 	g1 | % 6
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		c2 g/b | % 7
-		d2 g | % 8
-		a2:m g/b | % 9
-		\time 2/4 d2 \time 4/4 | % 10
-		g1 | % 11
+	c2 g/b | % 7
+	d2 g | % 8
+	a2:m g/b | % 9
+	d2 | % 10
+	g1 | % 11
 
-		c2/g g | % 12
-		d2/fs e:m | % 13
-		a2:m g/b | % 14
-		\time 2/4 d2 \time 4/4 | % 15
-		g1 | % 16
+	c2/g g | % 12
+	d2/fs e:m | % 13
+	a2:m g/b | % 14
+	d2 | % 15
+	g1 | % 16
 
-		% Chorus
+	% Chorus
 
-		d2 g | % 17
-		d2/fs g | % 18
-		e2:m b:m | % 19
-		\time 2/4 c \time 4/4 | % 20
-	}
-	\alternative
-	{
-		{
-			d1 | % 21
-			c2 g/b | % 22
-			d2 e:m | % 23
-			a2:m g/b | % 24
-			\time 2/4 d2 \time 4/4 | % 25
-			g1 | % 26
-			s1 | % 27
-		}
-		{
-			d1 | % 28
-			d2 g | % 29
-		}
-	}
+	d2 g | % 17
+	d2/fs g | % 18
+	e2:m b:m | % 19
+	c | % 20
+
+	d1 | % 21
+	c2 g/b | % 22
+	d2 e:m | % 23
+	a2:m g/b | % 24
+	d2 | % 25
+	g1 | % 26
+	s1 | % 27
+
+	d1 | % 28
+	d2 g | % 29
 
 	d2/fs g | % 30
 	e2:m b:m | % 31
-	\time 2/4 c2 \time 4/4 | % 32
+	c2 | % 32
 	d1 | % 33
 
 	% Verse
@@ -359,31 +382,28 @@ Chords = \chordmode
 	c2 g/b | % 34
 	d2 e:m | % 35
 	a2:m7 g/b | % 36
-	\time 2/4 d2 \time 4/4 | % 37
+	d2 | % 37
 	g1 | % 38
 	s1 | % 39
 
-	\repeat volta 2
-	{
-		% Interlude
+	% Interlude
 
-		c2/g g | % 40
-		d2/fs g | % 41
-		c2/g g | % 42
-		d2/fs g | % 43
-	}
+	c2/g g | % 40
+	d2/fs g | % 41
+	c2/g g | % 42
+	d2/fs g | % 43
 
 	% Chorus
 
 	d2 g | % 44
 	d2:/fs g | % 45
 	e2:m b:m7 | % 46
-	\time 2/4 c2 \time 4/4 | % 47
+	c2 | % 47
 	d1 | % 48
 	d2 g | % 49
 	d2/fs g | % 50
 	e2:m b:m7 | % 51
-	\time 2/4 c2 \time 4/4 | % 52
+	c2 | % 52
 	d1 | % 53
 
 	% Verse outro
@@ -391,7 +411,7 @@ Chords = \chordmode
 	c2 g/b | % 54
 	d2 e:m | % 55
 	a2:m g/b | % 56
-	\time 2/4 d2 \time 4/4 | % 57
+	d2 | % 57
 	g1 | % 58
 	s1 | % 59
 }
@@ -400,17 +420,11 @@ 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.instrumentName = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -418,52 +432,44 @@ StaffC = \relative c
 	c4 c c c | % 2
 	c4 c c c | % 3
 	c4 c c c | % 4
-	\time 2/4 c4 c \time 4/4 | % 5
+	c4 c | % 5
 	c4 c c c | % 6
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		c4 c c c | % 7
-		c4 c c c | % 8
-		c4 c c c | % 9
-		\time 2/4 c4 c \time 4/4 | % 10
-		c4 c c c | % 11
+	c4 c c c | % 7
+	c4 c c c | % 8
+	c4 c c c | % 9
+	c4 c | % 10
+	c4 c c c | % 11
 
-		c4 c c c | % 12
-		c4 c c c | % 13
-		c4 c c c | % 14
-		\time 2/4 c4 c \time 4/4 | % 15
-		c4 c c c | % 16
+	c4 c c c | % 12
+	c4 c c c | % 13
+	c4 c c c | % 14
+	c4 c | % 15
+	c4 c c c | % 16
 
-		% Chorus
+	% Chorus
 
-		c4 c c c | % 17
-		c4 c c c | % 18
-		c4 c c c | % 19
-		\time 2/4 c4 c \time 4/4 | % 20
-	}
-	\alternative
-	{
-		{
-			c4 c c c | % 21
-			c4 c c c | % 22
-			c4 c c c | % 23
-			c4 c c c | % 24
-			\time 2/4 c4 c \time 4/4 | % 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 | % 17
+	c4 c c c | % 18
+	c4 c c c | % 19
+	c4 c | % 20
+
+	c4 c c c | % 21
+	c4 c c c | % 22
+	c4 c c c | % 23
+	c4 c c c | % 24
+	c4 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
-	\time 2/4 c4 c \time 4/4 | % 32
+	c4 c | % 32
 	c4 c c c | % 33
 
 	% Verse
@@ -471,31 +477,28 @@ StaffC = \relative c
 	c4 c c c | % 34
 	c4 c c c | % 35
 	c4 c c c | % 36
-	\time 2/4 c4 c \time 4/4 | % 37
+	c4 c | % 37
 	c4 c c c | % 38
 	c4 c c c | % 39
 
-	\repeat volta 2
-	{
-		% Interlude
+	% Interlude
 
-		c4 c c c | % 40
-		c4 c c c | % 41
-		c4 c c c | % 42
-		c4 c c c | % 43
-	}
+	c4 c c c | % 40
+	c4 c c c | % 41
+	c4 c c c | % 42
+	c4 c c c | % 43
 
 	% Chorus
 
 	c4 c c c | % 44
 	c4 c c c | % 45
 	c4 c c c | % 46
-	\time 2/4 c4 c \time 4/4 | % 47
+	c4 c | % 47
 	c4 c c c | % 48
 	c4 c c c | % 49
 	c4 c c c | % 50
 	c4 c c c | % 51
-	\time 2/4 c4 c \time 4/4 | % 52
+	c4 c | % 52
 	c1 | % 53
 
 	% Verse outro
@@ -503,9 +506,9 @@ StaffC = \relative c
 	c2 c | % 54
 	c2 c | % 55
 	c2 c | % 56
-	\time 2/4 c4 c \time 4/4 | % 57
+	c4 c | % 57
 	c1 ~ | % 58
-	c1^\fermata \bar "|." % 59
+	c1^\fermata | % 59
 }
 
 
@@ -521,15 +524,19 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\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
@@ -542,7 +549,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -555,6 +562,5 @@ Dynamics =
 
 % 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)
 }
+