X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=he-leadeth-me.ly;h=f5bc67c5e5de7c98a8723d40f0aad6d72d4a1f64;hb=HEAD;hp=67e1b99797f39ff8243ee8308a433a2f512f98c5;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/he-leadeth-me.ly b/he-leadeth-me.ly
old mode 100755
new mode 100644
index 67e1b99..f5bc67c
--- a/he-leadeth-me.ly
+++ b/he-leadeth-me.ly
@@ -3,17 +3,15 @@
 \include "english.ly"
 
 % Good sizes are 16, 18, & 20
-staffSize = #16
+staffSize = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "He Leadeth Me" }
-%	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Fernando Ortega" }
+%	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"
 }
@@ -30,79 +28,115 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 %
 % Lead vocal
 %
-
-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
+	s1*8 \bar ".|:-||"   % 1-8
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		\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
+		s1*8 \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
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+
+		s1*7 |   % 17-23
+		\time 2/4 s2 \time 4/4 |   % 24
+		s1*2 |   % 25-26
 	}
 	\alternative
 	{
 		{
-			s1 |   % 27
-			\voiceTwo r2 r4 g' \oneVoice |   % 28
+			s1*2 |   % 27-28
 		}
 		{
 			s1 |   % 29
 		}
 	}
 
-	s1 |   % 30
-	s1 |   % 31
-	s1 |   % 32
-	\voiceTwo r2 r4 <a \hn d,> \oneVoice \bar "||"   % 33
+	s1*4 \bar "||"   % 30-33
 
 	\key d \major
 
 	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+
+	s1*8 \bar "||"   % 34-41
+
+	% Chorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { D } } }
+
+	s1*8 \bar "||"   % 42-49
+
+	% Outro
+
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+
+	s1*9 \bar "|."   % 50-58
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	\clef G
+
+	% Intro
+
+	s1*7 |   % 1-7
+	\voiceTwo r2 r4 g \oneVoice |   % 8
+
+
+	% Verse
+
+	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,> |   % 16
+
+	% Chorus
+
+	<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
+	<e \hn c>4 <d \hn b> |   % 24
+	\voiceTwo c1 \oneVoice |   % 25
+	s1 |   % 26
+
+	s1 |   % 27
+	\voiceTwo r2 r4 g' \oneVoice |   % 28
+
+	s1 |   % 29
+
+	s1 |   % 30
+	s1 |   % 31
+	s1 |   % 32
+	\voiceTwo r2 r4 <a \hn d,> \oneVoice |   % 33
+
+	% 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
@@ -111,12 +145,10 @@ LeadVox = \relative c''
 	<fs \hn d \hn a>4. <e \hn d \hn g,>8 <d \hn a \hn fs>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
+	<fs \hn d \hn a>4. <e \hn cs \hn g>8 <d \hn fs,>4 <a' \hn g \hn cs,> |   % 41
 
 	% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
-
 	<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
@@ -124,23 +156,15 @@ LeadVox = \relative c''
 	<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
+	<fs' \hn d \hn a>2 <e \hn cs \hn a> |   % 49
 
 	% Outro
 
-\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
+	s1*8 |   % 51-58
 }
 
+
 LeadVoxText = \lyricmode
 {
 	He lead- eth me, O bless- ed thought,
@@ -180,10 +204,6 @@ LeadVoxTextB = \lyricmode
 Riffs = \relative c''
 {
 	\clef G
-	\key c \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -197,42 +217,21 @@ Riffs = \relative c''
 	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
+	% Verse
 
-		s1 |   % 9
-		s1 |   % 10
-		s1 |   % 11
-		s1 |   % 12
-		s1 |   % 13
-		s1 |   % 14
-		s1 |   % 15
-		s1 |   % 16
+	s1*8 |   % 9-16
 
-		% Chorus
+	% 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
-		}
-	}
+	s1*7 |   % 17-23
+	s2 |   % 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
+
+	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
@@ -241,25 +240,11 @@ Riffs = \relative c''
 
 	% Verse
 
-	s1 |   % 34
-	s1 |   % 35
-	s1 |   % 36
-	s1 |   % 37
-	s1 |   % 38
-	s1 |   % 39
-	s1 |   % 40
-	s1 |   % 41
+	s1*8 |   % 34-41
 
 	% Chorus
 
-	s1 |   % 42
-	s1 |   % 43
-	s1 |   % 44
-	s1 |   % 45
-	s1 |   % 46
-	s1 |   % 47
-	s1 |   % 48
-	s1 |   % 49
+	s1*8 |   % 42-49
 
 	% Outro
 
@@ -270,7 +255,7 @@ Riffs = \relative c''
 	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
+	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 cs8. |   % 57
 	<d a fs d>1^\fermata |   % 59
 \normalsize
 }
@@ -279,12 +264,8 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	c2:sus2/a c:sus2/f |   % 1
@@ -296,47 +277,39 @@ Chords = \chordmode
 	c2:sus2/e c:sus2/f |   % 7
 	g1:sus4 |   % 8
 
-	\repeat volta 2
-	{
-		% Verse
+	% 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
+	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 |   % 16
 
-		% Chorus
+	% 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
-		}
-	}
+	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
+	c4/f g |   % 24
+	c2:sus2/a c:sus2/f |   % 25
+	g1:sus4 |   % 26
+
+	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
+	g2/a a4 a:sus4.7 |   % 33
 
 	% Verse
 
@@ -347,7 +320,7 @@ Chords = \chordmode
 	d4. e8:m7 d2/fs |   % 38
 	g2 gs:dim |   % 39
 	d2/a b:m7 |   % 40
-	d4/a a d d:sus4.7 \bar "||"   % 41
+	d4/a a d d:sus4.7 |   % 41
 
 	% Chorus
 
@@ -358,7 +331,7 @@ Chords = \chordmode
 	d2 a |   % 46
 	g4 fs8:m7 e:m7 d4 g |   % 47
 	d2/fs b:m7 |   % 48
-	d2/g a \bar "||"   % 49
+	d2/g a |   % 49
 
 	% Outro
 
@@ -377,17 +350,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
 
@@ -400,47 +367,40 @@ StaffC = \relative c
 	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
+	% Verse
 
-		% Chorus
+	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 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
-		}
-	}
+	% 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
+	c4 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 \bar "||"   % 33
+	c4 c c c |   % 33
 
 	% Verse
 
@@ -451,7 +411,7 @@ StaffC = \relative c
 	c4. c8 c4 c |   % 38
 	c4 c c c |   % 39
 	c4 c c c |   % 40
-	c4 c c c-> \bar "||"   % 41
+	c4 c c c-> |   % 41
 
 	% Chorus
 
@@ -462,7 +422,7 @@ StaffC = \relative c
 	c4 c c c |   % 46
 	c4 c8 c c4 c |   % 47
 	c4 c c c |   % 48
-	c2 c \bar "||"   % 49
+	c2 c |   % 49
 
 	% Outro
 
@@ -474,7 +434,7 @@ StaffC = \relative c
 	c4 c c c |   % 55
 	c4 c c c |   % 56
 	c4 c c c |   % 57
-	c1^\fermata \bar "|."   % 58
+	c1^\fermata |   % 58
 }
 
 
@@ -496,39 +456,44 @@ 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
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\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
 		\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
 }
+