X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=amazing-love.ly;h=2c21305cff6b62cff8c15f22853376f8e4bb90fe;hb=HEAD;hp=54769942c94996032f521774c99f96fff0475239;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/amazing-love.ly b/amazing-love.ly
old mode 100755
new mode 100644
index 5476994..2c21305
--- a/amazing-love.ly
+++ b/amazing-love.ly
@@ -1,348 +1,347 @@
-\version "2.16.0"
-\include "pop-chords.ly"
-\include "english.ly"
-
-% Good sizes are 16, 18, & 20
-staffSize = #18
-#(set-default-paper-size "letter")
-#(set-global-staff-size staffSize)
-#(ly:set-option (quote no-point-and-click))
-
-%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %}
-
-\header
-{
-	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Amazing Love" }
-	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Graham Kendrick" }
-	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" }
-	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-}
-
-
-%
-% Lead vocal
-%
-
-LeadVox = \relative c'
-{
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
-	\override Staff.TimeSignature #'style = #'()
-	\clef G
-	\key d \major
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
-	% Intro
-
-	R1^\markup { Moderate half time feel } |   % 1
-	r2 r4 e |   % 2
-
-	\repeat volta 3
-	{
-		% Verse
-
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		fs1 ~ |   % 3
-		fs2. fs4 |   % 4
-		fs4. e8 g2 ~ |   % 5
-		g2. e4 |   % 6
-		e1 ~ |   % 7
-		e2. g4 |   % 8
-		g4. ( fs8 ) fs2 |   % 9
-		r2 r4 e |   % 10
-		fs1 ~ |   % 11
-		fs2. fs4 |   % 12
-		fs4. e8 g2 ~ |   % 13
-		g2. r4 |   % 14
-		b1 |   % 15
-		a1 |   % 16
-		d1 ~ |   % 17
-		d2 r4 d \bar "||"   % 18
-
-		% Chorus
-
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		c4. b8 a2 ~ |   % 19
-		a2 g4 a |   % 20
-		a4. d,8 d2 ~ |   % 21
-		d2 r4 d' |   % 22
-		c4. b8 a2 ~ |   % 23
-		a2 g8 g a4 |   % 24
-		a1 ~ |   % 25
-		a2 r4 d |   % 26
-
-		c4. b8 a2 ~ |   % 27
-		a2 g4 a |   % 28
-		a4. d,8 d2 ~ |   % 29
-		d2. fs4 |   % 30
-		g4. ( fs8 e2 ) ~ |   % 31
-		e2 b'4. ( a8 ) |   % 32
-		a1 ~ |   % 33
-		a2. fs4 |   % 34
-		g4. ( fs8 e2 ) ~ |   % 35
-		e2 b'4. ( a8 ) |   % 36
-	}
-	\alternative
-	{
-		{
-			a1 |   % 37
-			r2 r4 e |   % 38
-		}
-		{
-			a1 ~ |   % 39
-		}
-	}
-
-	% Ending
-
-	a2. fs4 \bar "||"   % 40
-
-%\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
-	g4. ( fs8 e2 ) ~ |   % 41
-	e2^\fermata \breathe d' |   % 42
-	d1 ~ |   % 43
-	d1 |   % 44
-	R1 |   % 45
-	R1 |   % 46
-	r1^\fermata \bar "|."   % 47
-}
-
-
-LeadVoxText = \lyricmode
-{
-	My Lord, __ _ what love is this _
-	that pays __ _ so dear -- _ ly;
-	That I, __ _ the guil -- ty one _
-	may go free? __ _
-
-	A -- ma -- zing love, __ _ O what sac -- ri -- fice __ _
-	The Son of God __ _ gi -- ven for me; __ _
-	My debt he pays __ _ and my death he dies __ _
-	That I __ _ _ _ might _ live, __ _ that I __ _ _ _ might _ live.
-
-	And
-	live, __ _
-
-	that I __ _ _ _ might live. __ _
-}
-
-LeadVoxTextB = \lyricmode
-{
-	_ so, __ _ they watched him die _
-	de -- spised, __ _ re -- jec -- _ ted;
-	But O, __ _ the blood he shed _
-	flowed for me! __
-}
-
-LeadVoxTextC = \lyricmode
-{
-	_ now __ _ this love of Christ _
-	shall flow __ _ like ri -- _ vers;
-	Come wash __ _ your guilt a -- way, _
-	live a -- gain! __
-}
-
-
-%
-% Chord names
-%
-
-Chords = \chordmode
-{
-%Bah, can't we set this globally?
-%	\popChords
-
-	% Intro
-
-	d1 |   % 1
-	a2:sus4.7 a:7 |   % 2
-
-	% Verse
-
-	d1 |   % 3
-	s1 |   % 4
-	s2 e:m7 |   % 5
-	s1 |   % 6
-	a1:sus4.7 |   % 7
-	a1:7 |   % 8
-	g2 d |   % 9
-	s2 a:sus4.7 |   % 10
-	d1 |   % 11
-	s1 |   % 12
-	s2 e:m7 |   % 13
-	s1 |   % 14
-	g1 |   % 15
-	a1 |   % 16
-	d1 |   % 17
-	d4.:sus4 d s4 |   % 18
-
-	% Chorus
-
-	a1:m7 |   % 19
-	s1 |   % 20
-	d2.. d8:sus4 |   % 21
-	s4. d2 s8 |   % 22
-	f1:maj7 |   % 23
-	s1 |   % 24
-	a2..:sus2 a8 |   % 25
-	s1 |   % 26
-
-	a1:m7 |   % 27
-	s1 |   % 28
-	d2.. d8:sus4 |   % 29
-	s4. d2 s8 |   % 30
-	a1:m7 |   % 31
-	s2 g |   % 32
-	d1 |   % 33
-	s1 |   % 34
-	a1:m7 |   % 35
-	s2 g |   % 36
-
-	d1 |   % 37
-	s2 a:sus4.7 |   % 38
-
-	d1 |   % 39
-
-	% Ending
-
-	s1 |   % 40
-	a1:m7 |   % 41
-	c1 |   % 42
-	d1 |   % 43
-	s1 |   % 44
-	a1:m7 |   % 45
-	c1 |   % 46
-	d1 |   % 47
-}
-
-
-%
-% 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.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4 
-	\override NoteHead #'style = #'slash
-
-	% Intro
-
-	c4 c c c |   % 1
-	c4. c c4 |   % 2
-
-	\repeat volta 3
-	{
-		% Verse
-
-		c4_\markup { \italic { fingerpick throughout verses } } c c c |   % 3
-		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
-		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 c4 \bar "||"   % 18
-
-		% Chorus
-
-		c4 r8 c c4 r8 c ~ |   % 19
-		c8 c c4 c8 c c4 |   % 20
-		c4 r8 c c4 c8 c ~ |   % 21
-		c8 c4 c8 ~ c c c4 |   % 22
-		c4 r8 c c4 r8 c |   % 23
-		r8 c c4 c8 c c4 |   % 24
-		c4 c c8 c r c |   % 25
-		r8 c c4 c8 c c c |   % 26
-
-		c4 r8 c c4 r8 c ~ |   % 27
-		c8 c c4 c8 c c4 |   % 28
-		c4 r8 c c4 c8 c ~ |   % 29
-		c8 c4 c8 c4 c |   % 30
-		c4 r8 c c4 r8 c ~ |   % 31
-		c8 c c c c4 c8 c |   % 32
-		c4 r8 c c4 r8 c |   % 33
-		r8 c c4 c8 c c4 |   % 34
-		c4 r8 c c4 r8 c ~ |   % 35
-		c8 c c c c4. c8 |   % 36
-	}
-	\alternative
-	{
-		{
-			c4 r8 c c4 r8 c ~ |   % 37
-			c8 c c4 c2 |   % 38
-		}
-		{
-			c4 r8 c c4 c8 c ~ |   % 39
-		}
-	}
-
-	% Ending
-
-	c8 c c4 c8 c c4 \bar "||"   % 40
-
-	c4 r8 c c4 c8 c |   % 41
-	c1^\fermata |   % 42
-	c4_\markup { \italic { a tempo } } c c c |   % 43
-	c4 c c c |   % 44
-	c4 c c c_\markup { \italic { rit. } } |   % 45
-	c4 c c c |   % 46
-	c1^\fermata \bar "|."   % 47
-}
-
-
-\score
-{
-	<<
-%		\new ChoirStaff = "Vox"
-		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-			\new Lyrics \lyricsto "lead" \LeadVoxTextB
-			\new Lyrics \lyricsto "lead" \LeadVoxTextC
-		>>
-
-		\new ChoirStaff = "Rhythm"
-		<<
-%			\new Staff = "riff" \RhythmB
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
-		>>
-
-		\set Score.skipBars = ##t
-		\set Score.melismaBusyProperties = #'()
-	>>
-	\layout
-	{
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
-}
-
-
-\paper
-{
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
-}
+\version "2.16.0"
+\include "pop-chords.ly"
+\include "english.ly"
+
+% Good sizes are 16, 18, & 20
+staffSize = #18
+#(set-default-paper-size "letter")
+#(set-global-staff-size staffSize)
+#(ly:set-option (quote no-point-and-click))
+
+%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %}
+
+\header
+{
+	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Amazing Love" }
+	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Graham Kendrick" }
+	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" }
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
+}
+
+
+%
+% Lead vocal
+%
+
+LeadVox = \relative c'
+{
+	\numericTimeSignature
+	\clef G
+	\key d \major
+	\time 4/4
+\override Score.SpacingSpanner #'average-spacing-wishes = ##f
+
+	% Intro
+
+	R1^\markup { Moderate half time feel } |   % 1
+	r2 r4 e |   % 2
+
+	\repeat volta 3
+	{
+		% Verse
+
+\mark \markup { \override #'(font-family . sans) { \box { A } } }
+
+		fs1 ~ |   % 3
+		fs2. fs4 |   % 4
+		fs4. e8 g2 ~ |   % 5
+		g2. e4 |   % 6
+		e1 ~ |   % 7
+		e2. g4 |   % 8
+		g4. ( fs8 ) fs2 |   % 9
+		r2 r4 e |   % 10
+		fs1 ~ |   % 11
+		fs2. fs4 |   % 12
+		fs4. e8 g2 ~ |   % 13
+		g2. r4 |   % 14
+		b1 |   % 15
+		a1 |   % 16
+		d1 ~ |   % 17
+		d2 r4 d \bar "||"   % 18
+
+		% Chorus
+
+\mark \markup { \override #'(font-family . sans) { \box { B } } }
+
+		c4. b8 a2 ~ |   % 19
+		a2 g4 a |   % 20
+		a4. d,8 d2 ~ |   % 21
+		d2 r4 d' |   % 22
+		c4. b8 a2 ~ |   % 23
+		a2 g8 g a4 |   % 24
+		a1 ~ |   % 25
+		a2 r4 d |   % 26
+
+		c4. b8 a2 ~ |   % 27
+		a2 g4 a |   % 28
+		a4. d,8 d2 ~ |   % 29
+		d2. fs4 |   % 30
+		g4. ( fs8 e2 ) ~ |   % 31
+		e2 b'4. ( a8 ) |   % 32
+		a1 ~ |   % 33
+		a2. fs4 |   % 34
+		g4. ( fs8 e2 ) ~ |   % 35
+		e2 b'4. ( a8 ) |   % 36
+	}
+	\alternative
+	{
+		{
+			a1 |   % 37
+			r2 r4 e |   % 38
+		}
+		{
+			a1 ~ |   % 39
+		}
+	}
+
+	% Ending
+
+	a2. fs4 \bar "||"   % 40
+
+%\once \override Score.RehearsalMark #'self-alignment-X = #left
+\mark \markup { \override #'(font-family . sans) { \box { C } } }
+
+	g4. ( fs8 e2 ) ~ |   % 41
+	e2^\fermata \breathe d' |   % 42
+	d1 ~ |   % 43
+	d1 |   % 44
+	R1 |   % 45
+	R1 |   % 46
+	r1^\fermata \bar "|."   % 47
+}
+
+
+LeadVoxText = \lyricmode
+{
+	My Lord, __ _ what love is this _
+	that pays __ _ so dear -- _ ly;
+	That I, __ _ the guil -- ty one _
+	may go free? __ _
+
+	A -- ma -- zing love, __ _ O what sac -- ri -- fice __ _
+	The Son of God __ _ gi -- ven for me; __ _
+	My debt he pays __ _ and my death he dies __ _
+	That I __ _ _ _ might _ live, __ _ that I __ _ _ _ might _ live.
+
+	And
+	live, __ _
+
+	that I __ _ _ _ might live. __ _
+}
+
+LeadVoxTextB = \lyricmode
+{
+	_ so, __ _ they watched him die _
+	de -- spised, __ _ re -- jec -- _ ted;
+	But O, __ _ the blood he shed _
+	flowed for me! __
+}
+
+LeadVoxTextC = \lyricmode
+{
+	_ now __ _ this love of Christ _
+	shall flow __ _ like ri -- _ vers;
+	Come wash __ _ your guilt a -- way, _
+	live a -- gain! __
+}
+
+
+%
+% Chord names
+%
+Chords = \chordmode
+{
+	% Intro
+
+	d1 |   % 1
+	a2:sus4.7 a:7 |   % 2
+
+	% Verse
+
+	d1 |   % 3
+	s1 |   % 4
+	s2 e:m7 |   % 5
+	s1 |   % 6
+	a1:sus4.7 |   % 7
+	a1:7 |   % 8
+	g2 d |   % 9
+	s2 a:sus4.7 |   % 10
+	d1 |   % 11
+	s1 |   % 12
+	s2 e:m7 |   % 13
+	s1 |   % 14
+	g1 |   % 15
+	a1 |   % 16
+	d1 |   % 17
+	d4.:sus4 d s4 |   % 18
+
+	% Chorus
+
+	a1:m7 |   % 19
+	s1 |   % 20
+	d2.. d8:sus4 |   % 21
+	s4. d2 s8 |   % 22
+	f1:maj7 |   % 23
+	s1 |   % 24
+	a2..:sus2 a8 |   % 25
+	s1 |   % 26
+
+	a1:m7 |   % 27
+	s1 |   % 28
+	d2.. d8:sus4 |   % 29
+	s4. d2 s8 |   % 30
+	a1:m7 |   % 31
+	s2 g |   % 32
+	d1 |   % 33
+	s1 |   % 34
+	a1:m7 |   % 35
+	s2 g |   % 36
+
+	d1 |   % 37
+	s2 a:sus4.7 |   % 38
+
+	d1 |   % 39
+
+	% Ending
+
+	s1 |   % 40
+	a1:m7 |   % 41
+	c1 |   % 42
+	d1 |   % 43
+	s1 |   % 44
+	a1:m7 |   % 45
+	c1 |   % 46
+	d1 |   % 47
+}
+
+
+%
+% 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
+{
+	\numericTimeSignature
+	\time 4/4
+	\override NoteHead #'style = #'slash
+	\teeny
+
+	% Intro
+
+	c4 c c c |   % 1
+	c4. c c4 |   % 2
+
+	\repeat volta 3
+	{
+		% Verse
+
+		c4_\markup { \italic { fingerpick throughout verses } } c c c |   % 3
+		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
+		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 c4 \bar "||"   % 18
+
+		% Chorus
+
+		c4 r8 c c4 r8 c ~ |   % 19
+		c8 c c4 c8 c c4 |   % 20
+		c4 r8 c c4 c8 c ~ |   % 21
+		c8 c4 c8 ~ c c c4 |   % 22
+		c4 r8 c c4 r8 c |   % 23
+		r8 c c4 c8 c c4 |   % 24
+		c4 c c8 c r c |   % 25
+		r8 c c4 c8 c c c |   % 26
+
+		c4 r8 c c4 r8 c ~ |   % 27
+		c8 c c4 c8 c c4 |   % 28
+		c4 r8 c c4 c8 c ~ |   % 29
+		c8 c4 c8 c4 c |   % 30
+		c4 r8 c c4 r8 c ~ |   % 31
+		c8 c c c c4 c8 c |   % 32
+		c4 r8 c c4 r8 c |   % 33
+		r8 c c4 c8 c c4 |   % 34
+		c4 r8 c c4 r8 c ~ |   % 35
+		c8 c c c c4. c8 |   % 36
+	}
+	\alternative
+	{
+		{
+			c4 r8 c c4 r8 c ~ |   % 37
+			c8 c c4 c2 |   % 38
+		}
+		{
+			c4 r8 c c4 c8 c ~ |   % 39
+		}
+	}
+
+	% Ending
+
+	c8 c c4 c8 c c4 \bar "||"   % 40
+
+	c4 r8 c c4 c8 c |   % 41
+	c1^\fermata |   % 42
+	c4_\markup { \italic { a tempo } } c c c |   % 43
+	c4 c c c |   % 44
+	c4 c c c_\markup { \italic { rit. } } |   % 45
+	c4 c c c |   % 46
+	c1^\fermata \bar "|."   % 47
+}
+
+
+\score
+{
+	<<
+		\context Staff
+		<<
+			\new Voice = "lead" \LeadVox
+			\new Lyrics \lyricsto "lead" \LeadVoxText
+			\new Lyrics \lyricsto "lead" \LeadVoxTextB
+			\new Lyrics \lyricsto "lead" \LeadVoxTextC
+		>>
+
+		\new ChoirStaff
+		<<
+%			\new Staff = "riff" \RhythmB
+			\new ChordNames \Chords
+			\new RhythmicStaff \StaffC
+		>>
+
+		\set Score.skipBars = ##t
+		\set Score.melismaBusyProperties = #'()
+	>>
+}
+
+
+\paper
+{
+  #(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
+}
+