X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=nothing-but-the-blood.ly;h=7e292128aca4bde57355f23a21ed5c7bec5c54e1;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=e7718672178b1e37f44d881e7a5ec40a70302154;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/nothing-but-the-blood.ly b/nothing-but-the-blood.ly
index e771867..7e29212 100644
--- a/nothing-but-the-blood.ly
+++ b/nothing-but-the-blood.ly
@@ -1,8 +1,8 @@
-\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 = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -10,173 +10,122 @@ 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 "Nothing But The Blood" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" }
-	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 f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro/midtro
 
-	R1^\markup { \hspace #0.0 \raise #1.0 { Moderate folk-rock } } |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	R1 |   % 4
+	s1^\markup { \hspace #0.0 \raise #1.0 { Moderate folk-rock } } |   % 1
+	s1*3 \bar ".|:-||"   % 2-4
 
 	\repeat volta 3
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-		f4 f f g |   % 5
-		a4 c a2 |   % 6
-		f8 [ f f g ] a4 a |   % 7
-		g4. ( f8 ) f4 r |   % 8
-		f4 f f g |   % 9
-		a4 c a2 |   % 10
-		f8 [ f f g ] a4 a |   % 11
-		g4. ( f8 ) f4 r \bar "||"   % 12
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s1*8 \bar "||"   % 5-12
 
 		% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-% Bah, some ppl don't like syncopation
-%{
-		c'4. a8 ~ a g4 a8 ~ |   % 13
-		a4 c8 [ a ] ~ a4 r |   % 14
-		g4. g8 ~ g8 f4 g8 ~ |   % 15
-		g8 g4 a8 ( \stemUp c4 ) \stemNeutral r |   % 16
-		c4. a8 ~ a g4 a8 ~ |   % 17
-		a8 c4 a8 ~ a4 r |   % 18
-		f8 [ f f g ] a4 a |   % 19
-		g4. ( f8 ) f4 r |   % 20
-%}
-% Straight as a stretched out wire... :-(
-		c'2 a4 g |   % 13
-		a4 c a r |   % 14
-		g2 g4 f |   % 15
-		g4 g a ( \stemUp c ) \stemNeutral |   % 16
-		c2 a4 g |   % 17
-		a4 c a r |   % 18
-		f8 [ f f g ] a4 a |   % 19
-%		g4. ( f8 ) f4 r |   % 20
-		g2.. ( f8 ) |   % 20
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*8 |   % 13-20
 	}
 	\alternative
 	{
 		{
-			f4 r r2 |   % 21
-			R1 |   % 22
-			R1 |   % 23
-			R1 |   % 24
+			s1*4 |   % 21-24
 		}
 		{
-			f4 r r2 |   % 25
+			s1 |   % 25
 		}
 	}
 
-	R1 |   % 26
+	s1 |   % 26
 
 	% Outro
 
 	\repeat volta 2
 	{
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
-
-		f8 [ f f g ] a4 a |   % 27
-		g4. ( f8 ) f4 r |   % 28
-		f8 [ f f g ] a4 a |   % 29
-		g4. ( f8 ) f4 r |   % 30
+		\mark \markup { \override #'(font-family . sans) { \box { C } } }
+		s1*4 |   % 27-30
 	}
 
 	% Ending
 
-	R1 |   % 31
-	R1 \bar "|."   % 32
+	s1*2 \bar "|."   % 31-32
 }
 
-% This isn't the hymnal melody, but I like it. So there! :-P
-LeadVoxAlt = \relative c''
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
 {
 	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Lead vox"
-	\clef G
-	\key f \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
-	\repeat volta 3
-	{
-		% Intro/midtro
+	% Intro/midtro
 
-		R1^\markup { Moderate folk-rock } |   % 1
-		R1 |   % 2
-		R1 |   % 3
-		R1 \bar "||"   % 4
+	R1*4 |   % 1-4
 
-		% Verse
+	% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-		c4 a8 [ a ] ~ a4 g8 [ a ] ~ |   % 5
-		a4 c8 [ c ] ~ c2 |   % 6
-		f,8 [ f f g ] a4 f |   % 7
-		g4. a8 ~ a4 r |   % 8
-		c4 a8 [ a ] ~ a4 g8 [ a ] ~ |   % 9
-		a4 c8 [ c ] ~ c2 |   % 10
-		f,8 [ f f g ] a4 f |   % 11
-		g4. f8 ~ f4 r \bar "||"   % 12
+	f4 f f g |   % 5
+	a4 c a2 |   % 6
+	f8 [ f f g ] a4 a |   % 7
+	g4. ( f8 ) f4 r |   % 8
+	f4 f f g |   % 9
+	a4 c a2 |   % 10
+	f8 [ f f g ] a4 a |   % 11
+	g4. ( f8 ) f4 r \bar "||"   % 12
 
-		% Chorus
+	% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-		c'4. a8 ~ a g4 a8 ~ |   % 13
-		a4 c8 [ c ] ~ c4 r |   % 14
-		d4. f8 ~ f8 d4 d8 ~ |   % 15
-		d8 c4 c8 ~ c4 r |   % 16
-		c4. a8 ~ a g4 a8 ~ |   % 17
-		a8 c4 c8 ~ c4 r |   % 18
-		f,8 [ f f g ] a4 f |   % 19
-		g4. f8 ~ f4 r |   % 20
-	}
+	c'2 a4 g |   % 13
+	a4 c a r |   % 14
+	g2 g4 f |   % 15
+	g4 g a ( \stemUp c ) \stemNeutral |   % 16
+	c2 a4 g |   % 17
+	a4 c a r |   % 18
+	f8 [ f f g ] a4 a |   % 19
+	g2.. ( f8 ) |   % 20
 
-	% Outro
+	f4 r r2 |   % 21
+	R1 |   % 22
+	R1 |   % 23
+	R1 |   % 24
 
-	\repeat volta 2
-	{
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	f4 r r2 |   % 25
 
-		f8 [ f f g ] a4 f |   % 21
-		g4. a8 ~ a4 r |   % 22
-		f8 [ f f g ] a4 f |   % 23
-		g4. f8 ~ f4 r |   % 24
-	}
+	R1 |   % 26
+
+	% Outro
+
+	f8 [ f f g ] a4 a |   % 27
+	g4. ( f8 ) f4 r |   % 28
+	f8 [ f f g ] a4 a |   % 29
+	g4. ( f8 ) f4 r |   % 30
 
 	% Ending
 
-	R1 |   % 25
-	R1 \bar "|."   % 26
+	R1 |   % 31
+	R1 |   % 32
 }
 
+
 LeadVoxText = \lyricmode
 {
 	What can wash a- way my sin?
@@ -184,14 +133,6 @@ LeadVoxText = \lyricmode
 	What can make me whole a- gain?
 	No- thing but the blood of Je- _ sus.
 
-% Bah, some ppl don't like syncopation...
-%{
-	Oh, pre- _ cious is _ the flow _
-	That makes _ me white _ as snow; _
-	No o- _ ther fount _ I know, _
-	No- thing but the blood of Je- _ sus.
-%}
-% Straight as a stretched out wire... :-(
 	Oh, pre- cious is the flow
 	That makes me white as snow; _
 	No o- ther fount I know,
@@ -248,10 +189,10 @@ LeadVoxTextAltC = \lyricmode
 	This is all _ my right- _ eous- _ ness,
 }
 
+
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
 	% Intro/midtro
@@ -261,54 +202,43 @@ Chords = \chordmode
 	f4./a bf2:sus2 s8 |   % 3
 	c4.:^3 d2:m7 s8 |   % 4
 
-	\repeat volta 3
-	{
-		% Verse
+	% Verse
 
-		f4./a bf2:sus2 s8 |   % 5
-		c4.:^3 d2:m7 s8 |   % 6
-		f4./a bf2:sus2 s8 |   % 7
-		c4.:^3 d2:m7 s8 |   % 8
-		f4./a bf2:sus2 s8 |   % 9
-		c4.:^3 d2:m7 s8 |   % 10
-		f4./a bf2:sus2 s8 |   % 11
-		c4.:^3 d2:m7 s8 |   % 12
+	f4./a bf2:sus2 s8 |   % 5
+	c4.:^3 d2:m7 s8 |   % 6
+	f4./a bf2:sus2 s8 |   % 7
+	c4.:^3 d2:m7 s8 |   % 8
+	f4./a bf2:sus2 s8 |   % 9
+	c4.:^3 d2:m7 s8 |   % 10
+	f4./a bf2:sus2 s8 |   % 11
+	c4.:^3 d2:m7 s8 |   % 12
 
-		% Chorus
+	% Chorus
 
-		f4. c2 s8 |   % 13
-		d4.:m7 f2 s8 |   % 14
-		bf4. f2/a s8 |   % 15
-		bf2 c |   % 16
-		f4./a bf2 s8 |   % 17
-		c4.:^3 d2:m7 s8 |   % 18
-		f4./a bf2 s8 |   % 19
-		c1:^3 |   % 20
-	}
-	\alternative
-	{
-		{
-			f4./a bf2:sus2 s8 |   % 21
-			c4.:^3 d2:m7 s8 |   % 22
-			f4./a bf2:sus2 s8 |   % 23
-			c4.:^3 d2:m7 s8 |   % 24
-		}
-		{
-			f4./a bf2:sus2 s8 |   % 25
-		}
-	}
+	f4. c2 s8 |   % 13
+	d4.:m7 f2 s8 |   % 14
+	bf4. f2/a s8 |   % 15
+	bf2 c |   % 16
+	f4./a bf2 s8 |   % 17
+	c4.:^3 d2:m7 s8 |   % 18
+	f4./a bf2 s8 |   % 19
+	c1:^3 |   % 20
+
+	f4./a bf2:sus2 s8 |   % 21
+	c4.:^3 d2:m7 s8 |   % 22
+	f4./a bf2:sus2 s8 |   % 23
+	c4.:^3 d2:m7 s8 |   % 24
+
+	f4./a bf2:sus2 s8 |   % 25
 
 	c4.:^3 d2:m7 s8 |   % 26
 
 	% Outro
 
-	\repeat volta 2
-	{
-		f4./a bf2:sus2 s8 |   % 27
-		c4.:^3 d2:m7 s8 |   % 28
-		f4./a bf2:sus2 s8 |   % 29
-		c4.:^3 d2:m7 s8 |   % 30
-	}
+	f4./a bf2:sus2 s8 |   % 27
+	c4.:^3 d2:m7 s8 |   % 28
+	f4./a bf2:sus2 s8 |   % 29
+	c4.:^3 d2:m7 s8 |   % 30
 
 	% Ending
 
@@ -320,17 +250,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/midtro
 
@@ -339,96 +263,92 @@ StaffC = \relative c
 	c4. c8 ~ c4 c |   % 3
 	c4. c8 ~ c4 c |   % 4
 
-	\repeat volta 3
-	{
-		% Verse
+	% Verse
 
-		c4. c8 ~ c4 c |   % 5
-		c4. c8 ~ c4 c |   % 6
-		c4. c8 ~ c4 c |   % 7
-		c4. c8 ~ c4 c |   % 8
-		c4. c8 ~ c4 c |   % 9
-		c4. c8 ~ c4 c |   % 10
-		c4. c8 ~ c4 c |   % 11
-		c4. c8 ~ c4 c |   % 12
+	c4. c8 ~ c4 c |   % 5
+	c4. c8 ~ c4 c |   % 6
+	c4. c8 ~ c4 c |   % 7
+	c4. c8 ~ c4 c |   % 8
+	c4. c8 ~ c4 c |   % 9
+	c4. c8 ~ c4 c |   % 10
+	c4. c8 ~ c4 c |   % 11
+	c4. c8 ~ c4 c |   % 12
 
-		% Chorus
+	% Chorus
 
-		c4. c8 ~ c4 c |   % 13
-		c4. c8 ~ c4 c |   % 14
-		c4. c8 ~ c4 c |   % 15
-		c4 c c c |   % 16
-		c4. c8 ~ c4 c |   % 17
-		c4. c8 ~ c4 c |   % 18
-		c4. c8 ~ c4 c |   % 19
-		c4 c c c |   % 20
-	}
-	\alternative
-	{
-		{
-			c4. c8 ~ c4 c |   % 21
-			c4. c8 ~ c4 c |   % 22
-			c4. c8 ~ c4 c |   % 23
-			c4. c8 ~ c4 c |   % 24
-		}
-		{
-			c4. c8 ~ c4 c |   % 25
-		}
-	}
+	c4. c8 ~ c4 c |   % 13
+	c4. c8 ~ c4 c |   % 14
+	c4. c8 ~ c4 c |   % 15
+	c4 c c c |   % 16
+	c4. c8 ~ c4 c |   % 17
+	c4. c8 ~ c4 c |   % 18
+	c4. c8 ~ c4 c |   % 19
+	c4 c c c |   % 20
+
+	c4. c8 ~ c4 c |   % 21
+	c4. c8 ~ c4 c |   % 22
+	c4. c8 ~ c4 c |   % 23
+	c4. c8 ~ c4 c |   % 24
+
+	c4. c8 ~ c4 c |   % 25
 
 	c4. c8 ~ c4 c |   % 26
 
 	% Outro
 
-	\repeat volta 2
-	{
-		c4. c8 ~ c4 c |   % 27
-		c4. c8 ~ c4 c |   % 28
-		c4. c8 ~ c4 c |   % 29
-		c4. c8 ~ c4 c |   % 30
-	}
+	c4. c8 ~ c4 c |   % 27
+	c4. c8 ~ c4 c |   % 28
+	c4. c8 ~ c4 c |   % 29
+	c4. c8 ~ c4 c |   % 30
 
 	% Ending
 
 	c4._\markup { \italic { on cue } } c8 ~ c4 c |   % 31
-	c4. c8 ~ c2^\fermata \bar "|."   % 32
+	c4. c8 ~ c2^\fermata |   % 32
 }
 
 
 \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 "lead" \LeadVoxTextC
 		>>
 
-		\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"
-    "JazzText"
-    "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
 }
+