X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=show-me-your-ways-o-lord.ly;h=ca55f3b4d86cf0037679d1037b5517b1ef12f8fb;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=fe7e0f1dc493b6ef7bd8d84b8d346ee91cff7d7f;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/show-me-your-ways-o-lord.ly b/show-me-your-ways-o-lord.ly
index fe7e0f1..ca55f3b 100644
--- a/show-me-your-ways-o-lord.ly
+++ b/show-me-your-ways-o-lord.ly
@@ -1,100 +1,133 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #16
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+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 "Show Me Your Ways, O Lord" } }
 	composer = \markup { \override #'(font-family . sans) "Ed Smart" }
-%	arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" }
-	tagline  = "Engraved by JLH and Lilypond 2.8.2"
+%	arranger = \markup { \override #'(font-family . sans) "arr." }
+	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 d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	R1 |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	r2 r4. d8 \bar "||:"   % 4
-
-	% Verse
+	s1*4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		d4 d8 e ~ e4 e8 g ~ |   % 5
-		g8 fs e fs ~ fs2 |   % 6
-		r4 b,8 cs d4 fs8 e ~ |   % 7
-		e2. r8 d |   % 8
-		d4 d8 e ~ e e e g ~ |   % 9
-		g8 fs e fs ~ fs2 |   % 10
-		r4 b,8 cs d4 e8 fs ~ |   % 11
-		fs8 g fs e ~ e2 \bar "||"   % 12
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*8 \bar "||"   % 5-12
 
 		% Prechorus
 
-\mark \markup { \override #'(font-family . sans) { \box { A9 } } }
-
-		r4 b'8 b b4 b8 a ~ |   % 13
-		a4 a8 fs ~ fs4. d8 |   % 14
-		b'8 b b b ~ b b4 as8 ~ |   % 15
-		as8 as4 b8 ~ b cs ~ cs4 \bar "||"   % 16
+		\mark \markup { \override #'(font-family . sans) { \box { A9 } } }
+		s1*4 \bar "||"   % 13-16
 
 		% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		d8 d d cs ~ cs4 a16 ( fs ) b8 ~ |   % 17
-		b2 r |   % 18
-		d4. cs8 ~ cs4 a16 ( fs ) b8 ~ |   % 19
-		b2 r |   % 20
-		b8 b b b as b cs d ~ |   % 21
-		d4. e8 ( ~ e d ) cs cs ~ |   % 22
-		cs8 b ~ b2 d8 b ~ |   % 23
-		b8 a8 ~ a2 fs8 fs ( ~ |   % 24
-		fs8 g ) ~ g2. ~ |   % 25
-		g4. g8 g fs d d ~ |   % 26
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*10 |   % 17-26
 	}
 	\alternative
 	{
 		{
-			d2 r |   % 27
-			R1 |   % 28
-			R1 |   % 29
-			r2 r4. d8 |   % 30
+			s1*4 |   % 27-30
 		}
 		{
-			d2 \repeatTie r |   % 31
+			s1 |   % 31
 		}
 	}
-	
+
+	% Bridge
+
+	s1*7 \bar "||"   % 32-38
+
+	% Prechorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s1*4 \bar "||"   % 39-42
+
+	% Chorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { D } } }
+	s1*14 \bar "||"   % 43-56
+
+	% Ending
+
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+	s1*5 \bar "|."   % 57-61
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	R1*3 |   % 1-3
+	r2 r4. d8 |   % 4
+
+	% Verse
+
+	d4 d8 e ~ e4 e8 g ~ |   % 5
+	g8 fs e fs ~ fs2 |   % 6
+	r4 b,8 cs d4 fs8 e ~ |   % 7
+	e2. r8 d |   % 8
+	d4 d8 e ~ e e e g ~ |   % 9
+	g8 fs e fs ~ fs2 |   % 10
+	r4 b,8 cs d4 e8 fs ~ |   % 11
+	fs8 g fs e ~ e2 \bar "||"   % 12
+
+	% Prechorus
+
+	r4 b'8 b b4 b8 a ~ |   % 13
+	a4 a8 fs ~ fs4. d8 |   % 14
+	b'8 b b b ~ b b4 as8 ~ |   % 15
+	as8 as4 b8 ~ b cs ~ cs4 \bar "||"   % 16
+
+	% Chorus
+
+	d8 d d cs ~ cs4 a16 ( fs ) b8 ~ |   % 17
+	b2 r |   % 18
+	d4. cs8 ~ cs4 a16 ( fs ) b8 ~ |   % 19
+	b2 r |   % 20
+	b8 b b b as b cs d ~ |   % 21
+	d4. e8 ( ~ e d ) cs cs ~ |   % 22
+	cs8 b ~ b2 d8 b ~ |   % 23
+	b8 a8 ~ a2 fs8 fs ( ~ |   % 24
+	fs8 g ) ~ g2. ~ |   % 25
+	g4. g8 g fs d d ~ |   % 26
+
+	d2 r |   % 27
+	R1 |   % 28
+	R1 |   % 29
+	r2 r4. d8 |   % 30
+
+	d2 \repeatTie r |   % 31
+
 	% Bridge
 
 	r2 g8 fs d d ~ |   % 32
@@ -104,31 +137,17 @@ LeadVox = \relative c'
 	<< { \voiceTwo r2 g8 fs d d ~ } \context Voice = vb { \voiceOne fs8 d ~ d2. } >> |   % 36
 	\oneVoice
 	d4 r r2 |   % 37
-	R1 \bar "||"   % 38
-
-%{
-	<< { gs,8 b e gs, b e a, b ds a b ds }
-	\context Voice = vb { \stemUp gs2 fs4 b \stemNeutral } >> |   % 8
-
-	r2 fs8 g a d ~ |   % 33
-	d8 c b c ~ c b a a ~ |   % 34
-	a2. d,16 e fs8 ~ |   % 35
-	fs8 d ~ d2. |   % 36
-%}
+	R1 |   % 38
 
 	% Prechorus
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
 	r4 b'8 b b4 b8 a ~ |   % 39
 	a8 a4 fs8 ~ fs4. d8 |   % 40
 	b'8 b b b b4 b8 as ~ |   % 41
-	as8 as4 b8 ~ b cs ~ cs4 \bar "||"   % 42
+	as8 as4 b8 ~ b cs ~ cs4 |   % 42
 
 	% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
-
 	d8 d d cs ~ cs4 a16 ( fs ) b8 ~ |   % 43
 	b2 r |   % 44
 	d4. cs8 ~ cs4 a16 ( fs ) b8 ~ |   % 45
@@ -142,19 +161,18 @@ LeadVox = \relative c'
 	cs8 b4. ~ b4 d8 b ~ |   % 53
 	b8 a4. ~ a4 fs8 fs ( ~ |   % 54
 	fs8 g8 ) ~ g2. ~ |   % 55
-	g4. g8 g fs d d ~ \bar "||"   % 56
+	g4. g8 g fs d d ~ |   % 56
 
 	% Ending
 
-\mark \markup { \override #'(font-family . sans) { \box { E } } }
-
 	d4 r r2 |   % 57
 	r2 g8 fs d d ~ |   % 58
 	d4 r r2 |   % 59
 	r2 g8 fs d4 |   % 60
-	d1^\fermata \bar "|."   % 61
+	d1^\fermata |   % 61
 }
 
+
 LeadVoxText = \lyricmode
 {
 	To you O Lord, _ I lift _ up my soul _
@@ -193,58 +211,6 @@ LeadVoxText = \lyricmode
 	For you are my God _
 	You are my God _
 	You are my God
-
-%{
-To you, Oh Lord, I lift up my soul
-For in you I trust
-In all your ways you are faithful and true
-So to you I give all my hope
-You Oh Lord are truly good
-And you are the one that I desire
-
-Show me your ways, Oh Lord
-Teach me your paths
-Guide me in the light of your truth
-Lord, and teach me
-Oh teach me
-My Lord
-For you are my God
-
-My eyes will ever look to you Lord
-For in you I trust
-And I will never be ashamed
-For its you that's giving me hope
-You Oh Lord are truly good
-And you are the one that I desire
-
-Show me your ways, Oh Lord
-Teach me your paths
-Guide me in the light of your truth
-Lord, and teach me
-Oh teach me
-My Lord
-For you are my God
-
-You are my God (You are my God and my Savior)
-You are my God (You are my God)
-You are my God
-
-You Oh Lord are truly good
-Please guide me in the way that you desire
-
-Show me your ways, Oh Lord
-Teach me your paths
-Guide me in the light of your truth
-
-Lord, and teach me
-
-Please teach me
-Oh teach me
-My Lord
-For you are my God
-You are my God
-You are my God
-%}
 }
 
 LeadVoxTextB = \lyricmode
@@ -261,15 +227,12 @@ LeadDescant = \lyricmode
 	You are my _ God _
 }
 
+
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	d2.. a8:m11 |   % 1
@@ -279,52 +242,42 @@ Chords = \chordmode
 
 	% Verse
 
-	\repeat volta 2
-	{
-		% Verse
+	d4. a2:m11 g8 |   % 5
+	s4. d s4 |   % 6
+	g2.. a8:sus4 |   % 7
+	s2 a |   % 8
+	b4.:m7 a2:11^9.7 g8 |   % 9
+	s4. d s4 |   % 10
+	g2.. d8/a |   % 11
+	s4. a s4 |   % 12
 
-		d4. a2:m11 g8 |   % 5
-		s4. d s4 |   % 6
-		g2.. a8:sus4 |   % 7
-		s2 a |   % 8
-		b4.:m7 a2:11^9.7 g8 |   % 9
-		s4. d s4 |   % 10
-		g2.. d8/a |   % 11
-		s4. a s4 |   % 12
+	% Prechorus
 
-		% Prechorus
+	g2.. d8/fs |   % 13
+	s1 |   % 14
+	g2..:maj7 fs8:7 |   % 15
+	s1 |   % 16
 
-		g2.. d8/fs |   % 13
-		s1 |   % 14
-		g2..:maj7 fs8:7 |   % 15
-		s1 |   % 16
+	% Chorus
 
-		% Chorus
+	b4.:m7 a2:11^9.7 g8 |   % 17
+	s1 |   % 18
+	b4.:m7 fs2:m7 g8 |   % 19
+	s1 |   % 20
+	g2:maj7 fs4.:7 b8:m7 |   % 21
+	s4. a2 g8:sus2 |   % 22
+	s2.. d8/fs |   % 23
+	s2.. a8:m11 |   % 24
+	s1 |   % 25
+	c1:sus2 |   % 26
+
+	d2.. a8:m11 |   % 27
+	s2 c:sus2 |   % 28
+	d2.. a8:m11 |   % 29
+	s2 c:sus2 |   % 30
+
+	d2.. a8:m11 |   % 31
 
-		b4.:m7 a2:11^9.7 g8 |   % 17
-		s1 |   % 18
-		b4.:m7 fs2:m7 g8 |   % 19
-		s1 |   % 20
-		g2:maj7 fs4.:7 b8:m7 |   % 21
-		s4. a2 g8:sus2 |   % 22
-		s2.. d8/fs |   % 23
-		s2.. a8:m11 |   % 24
-		s1 |   % 25
-		c1:sus2 |   % 26
-	}
-	\alternative
-	{
-		{
-			d2.. a8:m11 |   % 27
-			s2 c:sus2 |   % 28
-			d2.. a8:m11 |   % 29
-			s2 c:sus2 |   % 30
-		}
-		{
-			d2.. a8:m11 |   % 31
-		}
-	}
-	
 	% Bridge
 
 	s2 c:sus2 |   % 32
@@ -372,16 +325,9 @@ 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
 
 	% Intro
@@ -389,56 +335,46 @@ StaffC = \relative c
 	c4_\mf c c r8 c ~ |   % 1
 	c4 c c c |   % 2
 	c4 c c r8 c ~ |   % 3
-	c4 c c c \bar "||:"   % 4
+	c4 c c c |   % 4
 
 	% Verse
 
-	\repeat volta 2
-	{
-		% Verse
+	c4._\markup { \italic { piano/vocal, shaker 1st time } } c8 ~ c4. c8 ~ |   % 5
+	c4. c8 ~ c4 c |   % 6
+	c4 c c r8 c ~ |   % 7
+	c4 c c c |   % 8
+	c4. c8 ~ c4. c8 ~ |   % 9
+	c4. c8 ~ c4 c |   % 10
+	c4 c c r8 c ~ |   % 11
+	c4. c8 ~ c4 c |   % 12
 
-		c4._\markup { \italic { piano/vocal, shaker 1st time } } c8 ~ c4. c8 ~ |   % 5
-		c4. c8 ~ c4 c |   % 6
-		c4 c c r8 c ~ |   % 7
-		c4 c c c |   % 8
-		c4. c8 ~ c4. c8 ~ |   % 9
-		c4. c8 ~ c4 c |   % 10
-		c4 c c r8 c ~ |   % 11
-		c4. c8 ~ c4 c \bar "||"   % 12
+	% Prechorus
 
-		% Prechorus
+	c4 c c r8 c ~ |   % 13
+	c4 c c c |   % 14
+	c4 c c r8 c ~ |   % 15
+	c8 c4 << { c8 ~ c c ~ c4 } \context Voice = vc { s8 s16 \< s4. s16 \! } >> |   % 16
 
-		c4 c c r8 c ~ |   % 13
-		c4 c c c |   % 14
-		c4 c c r8 c ~ |   % 15
-		c8 c4 << { c8 ~ c c ~ c4 } \context Voice = vc { s8 s16 \< s4. s16 \! } >> \bar "||"   % 16
+	% Chorus
 
-		% Chorus
+	c4._\markup { \dynamic f \italic { bass in } } c8 ~ c4. c8 ~ |   % 17
+	c4 c c c |   % 18
+	c4. c8 ~ c4. c8 ~ |   % 19
+	c4 c c c |   % 20
+	c4 c c r8 c ~ |   % 21
+	c4. c8 ~ c4. c8 ~ |   % 22
+	c4 c c r8 c ~ |   % 23
+	c4 c c r8 c ~ |   % 24
+	c4 c c c |   % 25
+	c4 c c << c \context Voice = vc { s16 \< s s s \! } >>  |   % 26
+
+	c4_\markup { \italic { band in w/conga } } c c r8 c ~ |   % 27
+	c4 c c c |   % 28
+	c4 c c r8 c ~ |   % 29
+	c4 c c c |   % 30
+
+	c4_\ff c c r8 c ~ |   % 31
 
-		c4._\markup { \dynamic f \italic { bass in } } c8 ~ c4. c8 ~ |   % 17
-		c4 c c c |   % 18
-		c4. c8 ~ c4. c8 ~ |   % 19
-		c4 c c c |   % 20
-		c4 c c r8 c ~ |   % 21
-		c4. c8 ~ c4. c8 ~ |   % 22
-		c4 c c r8 c ~ |   % 23
-		c4 c c r8 c ~ |   % 24
-		c4 c c c |   % 25
-		c4 c c << c \context Voice = vc { s16 \< s s s \! } >>  |   % 26
-	}
-	\alternative
-	{
-		{
-			c4_\markup { \italic { band in w/conga } } c c r8 c ~ |   % 27
-			c4 c c c |   % 28
-			c4 c c r8 c ~ |   % 29
-			c4 c c c |   % 30
-		}
-		{
-			c4_\ff c c r8 c ~ |   % 31
-		}
-	}
-	
 	% Bridge
 
 	c4 c c c |   % 32
@@ -447,14 +383,14 @@ StaffC = \relative c
 	c4 c c r8 c ~ |   % 35
 	c4 c c c |   % 36
 	c4 c c r8 c ~ |   % 37
-	c4 c c c \bar "||"   % 38
+	c4 c c c |   % 38
 
 	% Prechorus
 
 	c4 c c r8 c ~ |   % 39
 	c4 c c c |   % 40
 	c4 c c r8 c ~ |   % 41
-	c8 c4 c8 ~ c c ~ c4 \bar "||"   % 42
+	c8 c4 c8 ~ c c ~ c4 |   % 42
 
 	% Chorus
 
@@ -471,7 +407,7 @@ StaffC = \relative c
 	c4 c c r8 c ~ |   % 53
 	c4 c c r8 c ~ |   % 54
 	c4 c c c |   % 55
-	c1 \bar "||"   % 56
+	c1 |   % 56
 
 	% Ending
 
@@ -479,44 +415,51 @@ StaffC = \relative c
 	c4 c c c |   % 58
 	c4 c c r8 c ~ |   % 59
 	c4_\markup { \italic { rit. } } c c c |   % 60
-	c1^\fermata \bar "|."   % 61
+	c1^\fermata |   % 61
 }
 
 
 \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 Lyrics \lyricsto "vb" \LeadDescant
 		>>
 
-		\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
 }
+