X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=i-could-sing-of-your-love-forever.ly;h=ea683fd558671b35fa6261d2bd2b60dd999d73b2;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=92b79b4429162fe62c1303b9b7118ed57e000a01;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/i-could-sing-of-your-love-forever.ly b/i-could-sing-of-your-love-forever.ly
index 92b79b4..ea683fd 100644
--- a/i-could-sing-of-your-love-forever.ly
+++ b/i-could-sing-of-your-love-forever.ly
@@ -1,7 +1,8 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
 staffSize = #18 % or 16
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -9,105 +10,66 @@ staffSize = #18 % or 16
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans)
 		{ \fontsize #3.5 "I Could Sing Of Your Love Forever" } }
-%	composer = \markup { \override #'(font-family . sans) "" }
+	composer = \markup { \override #'(font-family . sans) "Martin Smith" }
 	arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" }
 	tagline  = "Engraved by JLH and Lilypond 2.8.2"
 }
 
 
 %
-% 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
 
 	\repeat volta 2
 	{
-		R1 |   % 1
-		R1 |   % 2
-		R1 |   % 3
-		R1 |   % 4
+		s1*4 |   % 1-4
 	}
 
 	\repeat volta 2
 	{
 		% Verse
 
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
 
-		r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 5
-		r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 6
-		r8 c' c8 a16 a ~ a g8 g16 ~ g f8. |   % 7
-		g8 g g f16 a ~ a g8 g16 ~ g f f8 |   % 8
-		r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 9
-		r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 10
-		r8 c' c c c c c c |   % 11
-		d8 c c c a4 ( g8 f ) \bar "||"   % 12
+		s1*8 \bar "||"   % 5-12
 
 		% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
 
-		r4 f8 f f g a c ~ |   % 13
-		c4 f,8 g ~ g a ~ a4 |   % 14
-		r4 f8 f f g a c ~ |   % 15
-		c4 a8 a ~ a g4 ( f8 ) |   % 16
-		r4 f8 f f g a c ~ |   % 17
-		c4 f,8 g ~ g a ~ a4 |   % 18
-		r4 f8 f f g a c ~ |   % 19
-		c4 a8 a ~ a g4 ( f8 ) |   % 20
+		s1*8 |   % 13-20
 	}
 	\alternative
 	{
 		{
-			R1 |   % 21
-			R1 |   % 22
-			R1 |   % 23
-			R1 |   % 24
+			s1*4 |   % 21-24
 		}
 		{
-			r2 bf16 a8 g16 ~ g f8. |   % 25
+			s1 |   % 25
 		}
 	}
 
 	% Bridge
 
-	d8 f4. r2 |   % 26
-	r4 r8 f d'16 c8 c16 ~ c8 c |   % 27
-	a4 ( g ) r2 |   % 28
-	r4 r8 f bf16 a8 g16 ~ g f8. |   % 29
-	d4 f8 f r f f d' ~ |   % 30
-	d8 c4 c8 ~ c a c d ~ |   % 31
-	d8 c4 a8 ( ~ a g4 f8 ) \bar "||"   % 32
+	s1*7 \bar "||"   % 26-32
 
 	% Solo
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
 
 	\key g \major
 
-	R1 |   % 33
-	R1 |   % 34
-	R1 |   % 35
-	R1 |   % 36
-	R1 |   % 37
-	R1 |   % 38
-	R1 |   % 39
-	R1 |   % 40
+	s1*8 |   % 33-40
 
 	% Chorus (redux)
 
@@ -115,19 +77,81 @@ LeadVox = \relative c'
 
 	\repeat volta 2
 	{
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
-
-		r4 f8 f f g a c ~ |   % 41
-		c4 f,8 g ~ g a ~ a4 |   % 42
-		r4 f8 f f g a c ~ |   % 43
-		c4 a8 a ~ a g4 ( f8 ) |   % 44
-		r4 f8 f f g a c ~ |   % 45
-		c4 f,8 g ~ g a ~ a4 |   % 46
-		r4 f8 f f g a c ~ |   % 47
-		c4 a8 a ~ a g4 ( f8 ) |   % 48
+		\mark \markup { \override #'(font-family . sans) { \box { D } } }
+
+		s1*8 |   % 41-48
 	}
 
-\mark \markup { \override #'(font-family . sans) { \box { E } } }
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+
+	s1*9 \bar "|."   % 49-57
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	\clef G
+
+	% Intro
+
+	R1*4 |   % 1-4
+
+	% Verse
+
+	r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 5
+	r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 6
+	r8 c' c8 a16 a ~ a g8 g16 ~ g f8. |   % 7
+	g8 g g f16 a ~ a g8 g16 ~ g f f8 |   % 8
+	r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 9
+	r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 |   % 10
+	r8 c' c c c c c c |   % 11
+	d8 c c c a4 ( g8 f ) |   % 12
+
+	% Chorus
+
+	r4 f8 f f g a c ~ |   % 13
+	c4 f,8 g ~ g a ~ a4 |   % 14
+	r4 f8 f f g a c ~ |   % 15
+	c4 a8 a ~ a g4 ( f8 ) |   % 16
+	r4 f8 f f g a c ~ |   % 17
+	c4 f,8 g ~ g a ~ a4 |   % 18
+	r4 f8 f f g a c ~ |   % 19
+	c4 a8 a ~ a g4 ( f8 ) |   % 20
+
+	R1 |   % 21
+	R1 |   % 22
+	R1 |   % 23
+	R1 |   % 24
+
+	r2 bf16 a8 g16 ~ g f8. |   % 25
+
+	% Bridge
+
+	d8 f4. r2 |   % 26
+	r4 r8 f d'16 c8 c16 ~ c8 c |   % 27
+	a4 ( g ) r2 |   % 28
+	r4 r8 f bf16 a8 g16 ~ g f8. |   % 29
+	d4 f8 f r f f d' ~ |   % 30
+	d8 c4 c8 ~ c a c d ~ |   % 31
+	d8 c4 a8 ( ~ a g4 f8 ) |   % 32
+
+	% Solo
+
+	R1*8 |   % 33-40
+
+	% Chorus (redux)
+
+	r4 f8 f f g a c ~ |   % 41
+	c4 f,8 g ~ g a ~ a4 |   % 42
+	r4 f8 f f g a c ~ |   % 43
+	c4 a8 a ~ a g4 ( f8 ) |   % 44
+	r4 f8 f f g a c ~ |   % 45
+	c4 f,8 g ~ g a ~ a4 |   % 46
+	r4 f8 f f g a c ~ |   % 47
+	c4 a8 a ~ a g4 ( f8 ) |   % 48
 
 	r4 f8 f f g a c ~ |   % 49
 	c4 f,8 g ~ g a ~ a4 |   % 50
@@ -137,9 +161,10 @@ LeadVox = \relative c'
 	c4 f,8 g ~ g a ~ a4 |   % 54
 	r4 f8 f f g a c ~ |   % 55
 	c4 a8 a ~ a g4 ( f8 ) ~ |   % 56
-	f1^\fermata \bar "|."   % 57
+	f1^\fermata |   % 57
 }
 
+
 LeadVoxText = \lyricmode
 {
 	O- ver the moun- _ tains and _ the sea
@@ -177,58 +202,43 @@ LeadVoxText = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\repeat volta 2
-	{
-		f2.. g8:m11 |   % 1
-		s1 |   % 2
-		bf1:9^7 |   % 3
-		bf2/c c |   % 4
-	}
+	f2.. g8:m11 |   % 1
+	s1 |   % 2
+	bf1:9^7 |   % 3
+	bf2/c c |   % 4
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		f1 |   % 5
-		g1:m11 |   % 6
-		bf1:9^7 |   % 7
-		bf4..:/c c16 s2 |   % 8
-		f1 |   % 9
-		g1:m11 |   % 10
-		bf1:9^7 |   % 11
-		bf2/c c |   % 12
+	f1 |   % 5
+	g1:m11 |   % 6
+	bf1:9^7 |   % 7
+	bf4..:/c c16 s2 |   % 8
+	f1 |   % 9
+	g1:m11 |   % 10
+	bf1:9^7 |   % 11
+	bf2/c c |   % 12
 
-		% Chorus
+	% Chorus
 
-		f2.. g8:m11 |   % 13
-		s1 |   % 14
-		bf2..:9^7 bf8/c |   % 15
-		s2 c |   % 16
-		f2.. g8:m11 |   % 17
-		s1 |   % 18
-		bf2..:9^7 bf8/c |   % 19
-		s2 c |   % 20
-	}
-	\alternative
-	{
-		{
-			f2.. g8:m11 |   % 21
-			s1 |   % 22
-			bf2..:9^7 bf8/c |   % 23
-			s2 c |   % 24
-		}
-		{
-			g1:m11 |   % 25
-		}
-	}
+	f2.. g8:m11 |   % 13
+	s1 |   % 14
+	bf2..:9^7 bf8/c |   % 15
+	s2 c |   % 16
+	f2.. g8:m11 |   % 17
+	s1 |   % 18
+	bf2..:9^7 bf8/c |   % 19
+	s2 c |   % 20
+
+	f2.. g8:m11 |   % 21
+	s1 |   % 22
+	bf2..:9^7 bf8/c |   % 23
+	s2 c |   % 24
+
+	g1:m11 |   % 25
 
 	% Bridge
 
@@ -253,17 +263,14 @@ Chords = \chordmode
 
 	% Chorus (redux)
 
-	\repeat volta 2
-	{
-		f2.. g8:m11 |   % 41
-		s1 |   % 42
-		bf2..:maj7 bf8/c |   % 43
-		s4.. c16 s2 |   % 44
-		f2.. g8:m11 |   % 45
-		s1 |   % 46
-		bf2..:maj7 bf8/c |   % 47
-		s2 c |   % 48
-	}
+	f2.. g8:m11 |   % 41
+	s1 |   % 42
+	bf2..:maj7 bf8/c |   % 43
+	s4.. c16 s2 |   % 44
+	f2.. g8:m11 |   % 45
+	s1 |   % 46
+	bf2..:maj7 bf8/c |   % 47
+	s2 c |   % 48
 
 	f2.. g8:m11 |   % 49
 	s1 |   % 50
@@ -280,64 +287,47 @@ 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
+	\tiny
 
 	% Intro
 
-	\repeat volta 2
-	{
-		c4 c c c8 c ~ |   % 1
-		c4 c c c |   % 2
-		c4 c c c |   % 3
-		c4 c c c |   % 4
-	}
+	c4 c c c8 c ~ |   % 1
+	c4 c c c |   % 2
+	c4 c c c |   % 3
+	c4 c c c |   % 4
 
-	\repeat volta 2
-	{
-		% Verse
+	% Verse
 
-		c4 ~ c8. c16 ~ c4 c |   % 5
-		c4 ~ c8. c16 ~ c4 c |   % 6
-		c4 ~ c8. c16 ~ c4 c |   % 7
-		c4 ~ c8. c16 ~ c4 c |   % 8
-		c4 ~ c8. c16 ~ c4 c |   % 9
-		c4 c8. c16 ~ c4 c |   % 10
-		c4 c c c |   % 11
-		c8-> c c c c c c c |   % 12
+	c4 ~ c8. c16 ~ c4 c |   % 5
+	c4 ~ c8. c16 ~ c4 c |   % 6
+	c4 ~ c8. c16 ~ c4 c |   % 7
+	c4 ~ c8. c16 ~ c4 c |   % 8
+	c4 ~ c8. c16 ~ c4 c |   % 9
+	c4 c8. c16 ~ c4 c |   % 10
+	c4 c c c |   % 11
+	c8-> c c c c c c c |   % 12
 
-		% Chorus
+	% Chorus
 
-		c4 c c c8 c ~ |   % 13
-		c4 c c c |   % 14
-		c4 c c c8 c-> ~ |   % 15
-		c4 c c c |   % 16
-		c4 c c c8 c ~ |   % 17
-		c4 c c c |   % 18
-		c4 c c c8 c-> ~ |   % 19
-		c4 c c c |   % 20
-	}
-	\alternative
-	{
-		{
-			c4 c c c8 c ~ |   % 21
-			c4 c c c |   % 22
-			c4 c c c8 c ~ |   % 23
-			c4 c c c |   % 24
-		}
-		{
-			c4. c8 ~ c4 c |   % 25
-		}
-	}
+	c4 c c c8 c ~ |   % 13
+	c4 c c c |   % 14
+	c4 c c c8 c-> ~ |   % 15
+	c4 c c c |   % 16
+	c4 c c c8 c ~ |   % 17
+	c4 c c c |   % 18
+	c4 c c c8 c-> ~ |   % 19
+	c4 c c c |   % 20
+
+	c4 c c c8 c ~ |   % 21
+	c4 c c c |   % 22
+	c4 c c c8 c ~ |   % 23
+	c4 c c c |   % 24
+
+	c4. c8 ~ c4 c |   % 25
 
 	% Bridge
 
@@ -362,17 +352,14 @@ StaffC = \relative c
 
 	% Chorus (redux)
 
-	\repeat volta 2
-	{
-		c4 c c c8 c-> ~ |   % 41
-		c4 c8. c16 ~ c4 c |   % 42
-		c4 c c c8 c-> ~ |   % 43
-		c4 c8. c16 ~ c4 c |   % 44
-		c4 c c c8 c-> ~ |   % 45
-		c4 c8. c16 ~ c4 c |   % 46
-		c4 c c c8 c-> ~ |   % 47
-		c4 c c c |   % 48
-	}
+	c4 c c c8 c-> ~ |   % 41
+	c4 c8. c16 ~ c4 c |   % 42
+	c4 c c c8 c-> ~ |   % 43
+	c4 c8. c16 ~ c4 c |   % 44
+	c4 c c c8 c-> ~ |   % 45
+	c4 c8. c16 ~ c4 c |   % 46
+	c4 c c c8 c-> ~ |   % 47
+	c4 c c c |   % 48
 
 	c4-> c c c8 c ~ |   % 49
 	c4 c-> c c-> |   % 50
@@ -382,42 +369,49 @@ StaffC = \relative c
 	c4 c c c |   % 54
 	c4-> c c c |   % 55
 	c2->_\markup { \italic { rit. } } c-> |   % 56
-	c1^\fermata \bar "|."   % 57
+	c1^\fermata |   % 57
 }
 
 
 \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 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
 }
+