X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=the-heart-of-worship.ly;h=76792a38498efa07c793a39031ac83fa8e572acd;hb=HEAD;hp=e61f36703978325947f43df176deb75c4d92096f;hpb=cdf57606f385bc4493fed4e3860bce0ce657dc40;p=music

diff --git a/the-heart-of-worship.ly b/the-heart-of-worship.ly
index e61f367..76792a3 100644
--- a/the-heart-of-worship.ly
+++ b/the-heart-of-worship.ly
@@ -1,10 +1,10 @@
 % Still needs hairpins/etc
 
-\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 = #16
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,113 +12,73 @@ staffSize = #16
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans)
 		{ \fontsize #3.5 "The Heart Of Worship" } }
 	composer = \markup { \override #'(font-family . sans) "Michael W. Smith" }
 	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 d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	r8^\markup { \hspace #0.0 \raise #1.5 { 8th note ballad } } \tiny a a a a d, d b' ~ |   % 1
-	b8 a4 fs8 ~ fs e4 d16 d |   % 2
-	fs8 fs16 g ~ g8 fs ~ fs2 |   % 3
-	fs8 fs16 g ~ g8 fs ~ fs e4. ~ |   % 4
-	e1 \normalsize \bar "||:"   % 5
+	s8^\markup { \hspace #0.0 \raise #1.5 { 8th note ballad } } s2.. |   % 1
+	s1*4 \normalsize \bar ".|:-||"   % 2-5
 
 	\repeat volta 2
 	{
 		% Verse
-	
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { A } } \italic { 1st time piano } }
-
-		r4. a16 a a8 d,4 e8 ~ |   % 6
-		e2 fs8 e e d16 d ~ |   % 7
-		d4. a'16 a a8 d,4 e8 ~ |   % 8
-		e2 r |   % 9
-		r4. a16 a a8 d,4 e8 ~ |   % 10
-		e2 fs8 e e d16 d ~ |   % 11
-		d4. a'16 a a8 d,4 e8 ~ |   % 12
-		e2 r \bar "||"   % 13
-	
+
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { A } } \italic { 1st time piano } }
+
+		s1*8 \bar "||"   % 6-13
+
 		% Prechorus
-	
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" \italic { band in } }
-
-		r8 g g g fs e d e ~ |   % 14
-		e4. e16 d fs8 e d b |   % 15
-		r8 g' g g fs e d e ~ |   % 16
-		e2 r |   % 17
-		r8 g g g fs e d e ~ |   % 18
-		e4. e16 d fs8 e d b |   % 19
-		r8 g' g g a fs b fs16 e ~ |   % 20
-		e2 r \bar "||"   % 21
-	
+
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" \italic { band in } }
+
+		s1*8 \bar "||"   % 14-21
+
 		% Chorus
-	
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { C } } \italic { snare } }
-
-		r8 a a a a d, d b' ~ |   % 22
-		b8 a4 fs8 ~ fs e r d16 d |   % 23
-		fs8 fs16 g ~ g8 fs ~ fs2 |   % 24
-		fs8 fs16 g ~ g8 fs ~ fs e4 d8 |   % 25
-		r8 a' a a a d, d b' ~ |   % 26
-		b8 a4 fs8 ~ fs e r d16 d |   % 27
-		fs8 fs16 g ~ g8 fs ~ fs2 |   % 28
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
+
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { C } } \italic { snare } }
+
+		s1*7 |   % 22-28
+		\once \override Score.RehearsalMark #'self-alignment-X = #right
+		\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
 	}
 	\alternative
 	{
 		{
-			fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ |   % 29
-			d2 r |   % 30
-			R1 |   % 31
+			s1*3 |   % 29-31
 		}
 		{
-			fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ \bar "||"   % 32
+			s1 \bar "||"   % 32
 		}
 	}
 
 	% Solo
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { D } } \italic { solo } }
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { \override #'(font-family . sans) { \box { D } } \italic { solo } }
 
-	d2 r |   % 33
-%blegh
-\break
-	R1 |   % 34
-	R1 |   % 35
-	R1 |   % 36
-	R1 |   % 37
-	R1 |   % 38
-	R1 |   % 39
-	R1 \bar "||"   % 40
-
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\mark \markup { \italic { D.S. al Coda } }
+	s1*8 \bar "||"   % 33-40
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	\mark \markup { \italic { D.S. al Coda } }
 
 	% Coda
 
@@ -126,12 +86,73 @@ LeadVox = \relative c''
 \stopStaff s1 \startStaff
 \set Score.currentBarNumber = #41
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+
+	s1 \bar "||"   % 41
+
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+	s1*13 \bar "|."   % 42-54
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	% Intro
+
+	s1*5 |   % 1-5
+
+	% Verse
+
+	r4. a16 a a8 d,4 e8 ~ |   % 6
+	e2 fs8 e e d16 d ~ |   % 7
+	d4. a'16 a a8 d,4 e8 ~ |   % 8
+	e2 r |   % 9
+	r4. a16 a a8 d,4 e8 ~ |   % 10
+	e2 fs8 e e d16 d ~ |   % 11
+	d4. a'16 a a8 d,4 e8 ~ |   % 12
+	e2 r |   % 13
+
+	% Prechorus
+
+	r8 g g g fs e d e ~ |   % 14
+	e4. e16 d fs8 e d b |   % 15
+	r8 g' g g fs e d e ~ |   % 16
+	e2 r |   % 17
+	r8 g g g fs e d e ~ |   % 18
+	e4. e16 d fs8 e d b |   % 19
+	r8 g' g g a fs b fs16 e ~ |   % 20
+	e2 r |   % 21
+
+	% Chorus
 
-	fs8 fs16 g ~ g8 fs ~ fs e4 d8 \bar "||"   % 41
+	r8 a a a a d, d b' ~ |   % 22
+	b8 a4 fs8 ~ fs e r d16 d |   % 23
+	fs8 fs16 g ~ g8 fs ~ fs2 |   % 24
+	fs8 fs16 g ~ g8 fs ~ fs e4 d8 |   % 25
+	r8 a' a a a d, d b' ~ |   % 26
+	b8 a4 fs8 ~ fs e r d16 d |   % 27
+	fs8 fs16 g ~ g8 fs ~ fs2 |   % 28
 
-\mark \markup { \override #'(font-family . sans) { \box { E } } }
+	fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ |   % 29
+	d2 r |   % 30
+	R1 |   % 31
+
+	fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ |   % 32
+
+	% Solo
+
+	d2 r |   % 33
+	R1*7 |   % 33-40
+
+	% Coda
+
+	s1 % blank bar for coda
+
+	fs8 fs16 g ~ g8 fs ~ fs e4 d8 |   % 41
 
 	r8 a' a a a d, d b' ~ |   % 42
 	b8 a4 fs8 ~ fs e r d16 d |   % 43
@@ -147,14 +168,12 @@ LeadVox = \relative c''
 
 	fs8 fs16 g ~ g8 fs ~ fs2 |   % 50
 	fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ |   % 53
-	d1^\fermata \bar "|."   % 54
+	d1^\fermata |   % 54
 }
 
+
 LeadVoxText = \lyricmode
 {
-	_ _ _ _ _ _ _ _ _ _ _ _ _ _
-	_ _ _ _ _ _ _ _ _ _ _ _ _ _
-
 	When the mu- sic fades _ all is stripped a- way _
 	And I simp- ly come _
 	Long- ing just to bring _ some- thing that's of worth _
@@ -185,9 +204,6 @@ LeadVoxText = \lyricmode
 
 LeadVoxTextB = \lyricmode
 {
-	_ _ _ _ _ _ _ _ _ _ _ _ _ _
-	_ _ _ _ _ _ _ _ _ _ _ _ _ _
-
 	King of end- less worth _ no one could ex- press _
 	How much you de- serve _
 	Though I'm weak and poor _ all I have is yours _
@@ -196,14 +212,27 @@ LeadVoxTextB = \lyricmode
 
 
 %
-% Chord names
+% Riffs
 %
+Riffs = \relative c''
+{
+	% Intro
+
+	\tiny
+	r8 a a a a d, d b' ~ |   % 1
+	b8 a4 fs8 ~ fs e4 d16 d |   % 2
+	fs8 fs16 g ~ g8 fs ~ fs2 |   % 3
+	fs8 fs16 g ~ g8 fs ~ fs e4. ~ |   % 4
+	e1 |   % 5
+	\normalsize
+}
 
+
+%
+% Chord names
+%
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	d1 |   % 1
@@ -212,51 +241,43 @@ Chords = \chordmode
 	g4. a:sus4 s4 |   % 4
 	a1 |   % 5
 
-	\repeat volta 2
-	{
-		% Verse
-	
-		d1 |   % 6
-		a1 |   % 7
-		e1:m7 |   % 8
-		a2:sus4 a |   % 9
-		d1 |   % 10
-		a1:sus2/cs |   % 11
-		e1:m7 |   % 12
-		a2:sus4 a |   % 13
-	
-		% Prechorus
-	
-		e2:m7 d:sus2/fs |   % 14
-		a2:sus4 d/fs |   % 15
-		e2:m7 d:sus2/fs |   % 16
-		a2:sus4 a |   % 17
-		e2:m7 d:sus2/fs |   % 18
-		a2:sus4 d/fs |   % 19
-		e2:m7 d:sus2/fs |   % 20
-		a2:sus4 a |   % 21
-	
-		% Chorus
-	
-		d1 |   % 22
-		a1:sus2/cs |   % 23
-		e4.:m7 d:sus2/fs s4 |   % 24
-		g4. a:sus4 a4 |   % 25
-		d1 |   % 26
-		a1:sus2/cs |   % 27
-		e4.:m7 d:sus2/fs s4 |   % 28
-	}
-	\alternative
-	{
-		{
-			g4. a:sus4 a4 |   % 29
-			d1 |   % 30
-			a2:sus4 a |   % 31
-		}
-		{
-			g4. a:sus4 a4 |   % 32
-		}
-	}
+	% Verse
+
+	d1 |   % 6
+	a1 |   % 7
+	e1:m7 |   % 8
+	a2:sus4 a |   % 9
+	d1 |   % 10
+	a1:sus2/cs |   % 11
+	e1:m7 |   % 12
+	a2:sus4 a |   % 13
+
+	% Prechorus
+
+	e2:m7 d:sus2/fs |   % 14
+	a2:sus4 d/fs |   % 15
+	e2:m7 d:sus2/fs |   % 16
+	a2:sus4 a |   % 17
+	e2:m7 d:sus2/fs |   % 18
+	a2:sus4 d/fs |   % 19
+	e2:m7 d:sus2/fs |   % 20
+	a2:sus4 a |   % 21
+
+	% Chorus
+
+	d1 |   % 22
+	a1:sus2/cs |   % 23
+	e4.:m7 d:sus2/fs s4 |   % 24
+	g4. a:sus4 a4 |   % 25
+	d1 |   % 26
+	a1:sus2/cs |   % 27
+	e4.:m7 d:sus2/fs s4 |   % 28
+
+	g4. a:sus4 a4 |   % 29
+	d1 |   % 30
+	a2:sus4 a |   % 31
+
+	g4. a:sus4 a4 |   % 32
 
 	% Solo
 
@@ -271,7 +292,7 @@ Chords = \chordmode
 
 	% Coda
 
-s1
+	s1 % blank bar for coda
 
 	g4. a:sus4 a4 |   % 41
 	d1 |   % 42
@@ -293,17 +314,11 @@ s1
 %
 % 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
 
@@ -313,51 +328,43 @@ StaffC = \relative c
 	c4.-> c8-> ~ c2 |   % 4
 	c1 |   % 5
 
-	\repeat volta 2
-	{
-		% Verse
-	
-		c4-\mp 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 \bar "||"   % 13
-	
-		% Prechorus
-	
-		c4-\mf 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 \bar "||"   % 21
-	
-		% Chorus
-	
-		c4-\f c c c |   % 22
-		c4 c c c |   % 23
-		c4.-> c8-> ~ c4 c |   % 24
-		c4.-> c8-> ~ c4 c |   % 25
-		c4 c c c |   % 26
-		c4 c c c |   % 27
-		c4.-> c8-> ~ c4 c |   % 28
-	}
-	\alternative
-	{
-		{
-			c4.-> c8-> ~ c4 c |   % 29
-			c4 c c c |   % 30
-			c4 c c c |   % 31
-		}
-		{
-			c4.-> c8-> ~ c4 c \bar "||"   % 32
-		}
-	}
+	% Verse
+
+	c4-\mp 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
+
+	% Prechorus
+
+	c4-\mf 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
+
+	% Chorus
+
+	c4-\f c c c |   % 22
+	c4 c c c |   % 23
+	c4.-> c8-> ~ c4 c |   % 24
+	c4.-> c8-> ~ c4 c |   % 25
+	c4 c c c |   % 26
+	c4 c c c |   % 27
+	c4.-> c8-> ~ c4 c |   % 28
+
+	c4.-> c8-> ~ c4 c |   % 29
+	c4 c c c |   % 30
+	c4 c c c |   % 31
+
+	c4.-> c8-> ~ c4 c |   % 32
 
 	% Solo
 
@@ -373,9 +380,8 @@ StaffC = \relative c
 	% Coda
 
 \stopStaff s1 \startStaff |
-\set Score.currentBarNumber = #41
 
-	c4.-> c8-> ~ c4 c \bar "||"   % 41
+	c4.-> c8-> ~ c4 c |   % 41
 	c4 c c c |   % 42
 	c4 c c c |   % 43
 	c4.-> c8-> ~ c4 c |   % 44
@@ -388,43 +394,51 @@ StaffC = \relative c
 	c4.-> c8-> ~ c4 c |   % 51
 	c4.-> c8-> ~ c4 c |   % 52
 	c4.-> c8->_\markup { \italic { rit. } } ~ c4 c |   % 53
-	c1^\fermata \bar "|."   % 54
+	c1^\fermata |   % 54
 }
 
 
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\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
+			\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
 }
+