X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lord-you-have-my-heart.ly;h=1b40378df3f7bc7b2db4d49f1148a57c3783f2a2;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=c5249908e69d07af93280fe49a7dba67e11d95f9;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/lord-you-have-my-heart.ly b/lord-you-have-my-heart.ly
index c524990..1b40378 100644
--- a/lord-you-have-my-heart.ly
+++ b/lord-you-have-my-heart.ly
@@ -1,8 +1,10 @@
-\version "2.16.0"
+% Chart needs to be added
+
+\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,154 +12,193 @@ 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 "Lord You Have My Heart" } }
 %	composer = \markup { \override #'(font-family . sans) "" }
 	arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.2"
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c'
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
 	\clef G
 	\key e \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	R1 |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	R1 \bar "||:"   % 4
+	s1*4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
-		R1 |   % 5
-		R1 |   % 6
-		R1 |   % 7
-		R1 |   % 8
+		s1*4 |   % 5-8
 	}
 
 	\repeat volta 2
 	{
 		% Verse
-	
-		R1 |   % 9
-		R1 |   % 10
-		R1 |   % 11
-		R1 |   % 12
-		R1 |   % 13
-		R1 |   % 14
-		R1 |   % 15
-		R1 |   % 16
-	
-		R1 |   % 17
-		R1 |   % 18
-		R1 |   % 19
-		R1 |   % 20
-		R1 |   % 21
-		R1 |   % 22
-		R1 |   % 23
-		R1 |   % 24
+
+		s1*16 |   % 9-24
 
 		% Chorus
 
-		R1 \bar "||"   % 25
-		R1 |   % 26
-		R1 |   % 27
-		R1 |   % 28
-		R1 |   % 29
-		R1 |   % 30
-		R1 |   % 31
-		R1 |   % 32
-		R1 |   % 33
-		R1 |   % 34
-		R1 |   % 35
+		s1 \bar "||"   % 25
+		s1*10 |   % 26-35
 	}
 	\alternative
 	{
 		{
-			R1 |   % 36
-			R1 |   % 37
-			R1 \bar "||"   % 38
-
-			R1 |   % 39
-			R1 |   % 40
-			R1 |   % 41
-			R1 |   % 42
+			s1*3 \bar "||"   % 36-38
+
+			s1*4 |   % 39-42
 		}
 		{
-			R1 |   % 43
+			s1 |   % 43
 		}
 	}
 
-	R1 |   % 44
-	R1 |   % 45
-	R1 |   % 46
-	R1 |   % 47
-	R1 |   % 48
-	R1 \bar "||"   % 49
+	s1*6 \bar "||"   % 44-49
 
-	R1 |   % 50
-	R1 |   % 51
-	R1 |   % 52
-	R1 \bar "||"   % 53
+	s1*4 \bar "||"   % 50-53
 
-	R1 |   % 54
-	R1 |   % 55
-	R1 |   % 56
-	R1 \bar "||:"   % 57
+	s1*4 \bar ".|:-||"   % 54-57
 
 	\repeat volta 2
 	{
-		R1 |   % 58
-		R1 |   % 59
-		R1 |   % 60
+		s1*3 |   % 58-60
 	}
 	\alternative
 	{
 		{
-			R1 |   % 61
+			s1 |   % 61
 		}
 		{
-			R1 |   % 62
+			s1 |   % 62
 		}
 	}
 
 	\repeat volta 2
 	{
-		R1 |   % 63
-		R1 |   % 64
-		R1 |   % 65
-		R1 |   % 66
+		s1*4 |   % 63-66
 	}
 
+	s1*7 \bar "|."   % 67-73
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	R1 |   % 1
+	R1 |   % 2
+	R1 |   % 3
+	R1 |   % 4
+
+	R1 |   % 5
+	R1 |   % 6
+	R1 |   % 7
+	R1 |   % 8
+
+	% Verse
+
+	c1 |   % 9
+	R1 |   % 10
+	R1 |   % 11
+	R1 |   % 12
+	R1 |   % 13
+	R1 |   % 14
+	R1 |   % 15
+	R1 |   % 16
+
+	R1 |   % 17
+	R1 |   % 18
+	R1 |   % 19
+	R1 |   % 20
+	R1 |   % 21
+	R1 |   % 22
+	R1 |   % 23
+	R1 |   % 24
+
+	% Chorus
+
+	R1 |   % 25
+	R1 |   % 26
+	R1 |   % 27
+	R1 |   % 28
+	R1 |   % 29
+	R1 |   % 30
+	R1 |   % 31
+	R1 |   % 32
+	R1 |   % 33
+	R1 |   % 34
+	R1 |   % 35
+
+	R1 |   % 36
+	R1 |   % 37
+	R1 |   % 38
+
+	R1 |   % 39
+	R1 |   % 40
+	R1 |   % 41
+	R1 |   % 42
+
+	R1 |   % 43
+
+	R1 |   % 44
+	R1 |   % 45
+	R1 |   % 46
+	R1 |   % 47
+	R1 |   % 48
+	R1 |   % 49
+
+	R1 |   % 50
+	R1 |   % 51
+	R1 |   % 52
+	R1 |   % 53
+
+	R1 |   % 54
+	R1 |   % 55
+	R1 |   % 56
+	R1 |   % 57
+
+	R1 |   % 58
+	R1 |   % 59
+	R1 |   % 60
+
+	R1 |   % 61
+
+	R1 |   % 62
+
+	R1 |   % 63
+	R1 |   % 64
+	R1 |   % 65
+	R1 |   % 66
+
 	R1 |   % 67
 	R1 |   % 68
 	R1 |   % 69
 	R1 |   % 70
 	R1 |   % 71
 	R1 |   % 72
-	r1^\fermata \bar "|."   % 73
+	r1^\fermata |   % 73
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Lord, you have my heart and I will search for yours,
-	Je- sus take my life and lead me on.
+	Je -- sus take my life and lead me on.
 	Lord, you have my heart and I will search for yours,
-	Let me be to you a sa- cri- fice.
+	Let me be to you a sa -- cri -- fice.
 
 	And I will praise you Lord
 }
@@ -166,12 +207,8 @@ LeadVoxText = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	 |   % 1
@@ -179,68 +216,57 @@ Chords = \chordmode
 	 |   % 3
 	 |   % 4
 
-	\repeat volta 2
-	{
-		 |   % 5
-		 |   % 6
-		 |   % 7
-		 |   % 8
-	}
-
-	\repeat volta 2
-	{
-		% Verse
-	
-		 |   % 9
-		 |   % 10
-		 |   % 11
-		 |   % 12
-		 |   % 13
-		 |   % 14
-		 |   % 15
-		 |   % 16
-	
-		 |   % 17
-		 |   % 18
-		 |   % 19
-		 |   % 20
-		 |   % 21
-		 |   % 22
-		 |   % 23
-		 |   % 24
-
-		% Chorus
-
-		 |   % 25
-		 |   % 26
-		 |   % 27
-		 |   % 28
-		 |   % 29
-		 |   % 30
-		 |   % 31
-		 |   % 32
-		 |   % 33
-		 |   % 34
-		 |   % 35
-	}
-	\alternative
-	{
-		{
-			 |   % 36
-			 |   % 37
-			 |   % 38
-
-			 |   % 39
-			 |   % 40
-			 |   % 41
-			 |   % 42
-		}
-		{
-			 |   % 43
-		}
-	}
-
-	 |   % 44
+	|   % 5
+	|   % 6
+	|   % 7
+	|   % 8
+
+	% Verse
+
+	|   % 9
+	|   % 10
+	|   % 11
+	|   % 12
+	|   % 13
+	|   % 14
+	|   % 15
+	|   % 16
+
+	|   % 17
+	|   % 18
+	|   % 19
+	|   % 20
+	|   % 21
+	|   % 22
+	|   % 23
+	|   % 24
+
+	% Chorus
+
+	|   % 25
+	|   % 26
+	|   % 27
+	|   % 28
+	|   % 29
+	|   % 30
+	|   % 31
+	|   % 32
+	|   % 33
+	|   % 34
+	|   % 35
+
+	|   % 36
+	|   % 37
+	|   % 38
+
+	|   % 39
+	|   % 40
+	|   % 41
+	|   % 42
+
+	|   % 43
+
+	|   % 44
 	 |   % 45
 	 |   % 46
 	 |   % 47
@@ -257,29 +283,19 @@ Chords = \chordmode
 	 |   % 56
 	 |   % 57
 
-	\repeat volta 2
-	{
-		 |   % 58
-		 |   % 59
-		 |   % 60
-	}
-	\alternative
-	{
-		{
-			 |   % 61
-		}
-		{
-			 |   % 62
-		}
-	}
 
-	\repeat volta 2
-	{
-		 |   % 63
-		 |   % 64
-		 |   % 65
-		 |   % 66
-	}
+	 |   % 58
+	|   % 59
+	|   % 60
+
+	|   % 61
+
+	|   % 62
+
+	|   % 63
+	|   % 64
+	|   % 65
+	|   % 66
 
 	 |   % 67
 	 |   % 68
@@ -294,126 +310,99 @@ 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
 
 	c4 c c c |   % 1
 	c4 c c c |   % 2
 	c4 c c c |   % 3
-	c4 c c c \bar "||:"   % 4
-
-	\repeat volta 2
-	{
-		c4 c c c |   % 5
-		c4 c c c |   % 6
-		c4 c c c |   % 7
-		c4 c c c |   % 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 |   % 16
-	
-		c4 c c c |   % 17
-		c4 c c c |   % 18
-		c4 c c c |   % 19
-		c4 c c c |   % 20
-		c4 c c c |   % 21
-		c4 c c c |   % 22
-		c4 c c c |   % 23
-		c4 c c c |   % 24
-
-		% Chorus
-
-		c4 c c c \bar "||"   % 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
-		c4 c c c |   % 35
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 36
-			c4 c c c |   % 37
-			c4 c c c \bar "||"   % 38
-
-			c4 c c c |   % 39
-			c4 c c c |   % 40
-			c4 c c c |   % 41
-			c4 c c c |   % 42
-		}
-		{
-			c4 c c c |   % 43
-		}
-	}
+	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
+
+	% 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 |   % 16
+
+	c4 c c c |   % 17
+	c4 c c c |   % 18
+	c4 c c c |   % 19
+	c4 c c c |   % 20
+	c4 c c c |   % 21
+	c4 c c c |   % 22
+	c4 c c c |   % 23
+	c4 c c c |   % 24
+
+	% Chorus
+
+	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
+	c4 c c c |   % 35
+
+	c4 c c c |   % 36
+	c4 c c c |   % 37
+	c4 c c c |   % 38
+
+	c4 c c c |   % 39
+	c4 c c c |   % 40
+	c4 c c c |   % 41
+	c4 c c c |   % 42
+
+	c4 c c c |   % 43
 
 	c4 c c c |   % 44
 	c4 c c c |   % 45
 	c4 c c c |   % 46
 	c4 c c c |   % 47
 	c4 c c c |   % 48
-	c4 c c c \bar "||"   % 49
+	c4 c c c |   % 49
 
 	c4 c c c |   % 50
 	c4 c c c |   % 51
 	c4 c c c |   % 52
-	c4 c c c \bar "||"   % 53
+	c4 c c c |   % 53
 
 	c4 c c c |   % 54
 	c4 c c c |   % 55
 	c4 c c c |   % 56
-	c4 c c c \bar "||:"   % 57
+	c4 c c c |   % 57
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 58
-		c4 c c c |   % 59
-		c4 c c c |   % 60
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 61
-		}
-		{
-			c4 c c c |   % 62
-		}
-	}
 
-	\repeat volta 2
-	{
-		c4 c c c |   % 63
-		c4 c c c |   % 64
-		c4 c c c |   % 65
-		c4 c c c |   % 66
-	}
+	c4 c c c |   % 58
+	c4 c c c |   % 59
+	c4 c c c |   % 60
+
+	c4 c c c |   % 61
+
+	c4 c c c |   % 62
+
+	c4 c c c |   % 63
+	c4 c c c |   % 64
+	c4 c c c |   % 65
+	c4 c c c |   % 66
 
 	c4 c c c |   % 67
 	c4 c c c |   % 68
@@ -421,43 +410,49 @@ StaffC = \relative c
 	c4 c c c |   % 70
 	c4 c c c |   % 71
 	c4 c c c |   % 72
-	c1^\fermata \bar "|."   % 73
+	c1^\fermata |   % 73
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
 			\new Lyrics \lyricsto "lead" \LeadVoxText
-%			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff \StaffC
 		>>
 
 		\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)))
+	#(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
 }
+