X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=we-will-worship-the-lamb-of-glory.ly;h=7373c18f1886ff2de1a4d8ac3700ec727ed97242;hb=HEAD;hp=34c609a50b72cceed88cd9268e0a69ce1dab1746;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/we-will-worship-the-lamb-of-glory.ly b/we-will-worship-the-lamb-of-glory.ly
old mode 100755
new mode 100644
index 34c609a..7373c18
--- a/we-will-worship-the-lamb-of-glory.ly
+++ b/we-will-worship-the-lamb-of-glory.ly
@@ -1,16 +1,15 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-staffSize = #18 % or 16
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+staffSize = #16
 #(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 "We Will Worship The Lamb Of Glory" } }
 %	composer = \markup { \override #'(font-family . sans) "" }
@@ -20,50 +19,36 @@ staffSize = #18 % or 16
 
 
 %
-% 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
 
-	R1^\markup { 8th note ballad } |   % 1
-	R1 |   % 2
-	R1 |   % 3
-	R1 |   % 4
+	s1^\markup { 8th note ballad } |   % 1
+	s1*3 \bar ".|:-||"   % 2-4
 
 	% Verse
 
 	\repeat volta 2
 	{
-%\mark \markup { \override #'(font-family . sans) { \box { A } } }
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
-
-		r4 a8 a a g f g ~ |   % 5
-		g4 f8 a ~ a g4. |   % 6
-		r4 a8 a a g f g ~ |   % 7
-		g4 a8 g ~ g4 r |   % 8
-		r4 a8 a a g f g ~ |   % 9
-		g4 a8 g ( ~ g f ) d4 |   % 10
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+
+		s1*6 |   % 5-10
 	}
 	\alternative
 	{
 		{
-			r4 f8 f g a g f ~ |   % 11
-			f2 r |   % 12
+			s1*2 |   % 11-12
 		}
 		{
-			r4 f8 f g a g f |   % 13
-			r8 c' c c c bf a c ~ |   % 14
+			s1*2 |   % 13-14
 		}
 	}
 
@@ -71,46 +56,88 @@ LeadVox = \relative c''
 
 	\repeat volta 3
 	{
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		c8 c c bf ~ bf c d c |   % 15
-		r8 c c c c bf a c ~ |   % 16
-		c8 c c c bf c d c |   % 17
-		r8 c c c c bf a d ~ |   % 18
-		d8 c bf c ~ c bf a bf ~ |   % 19
-		bf8 a g f ~ f g a bf ~ |   % 20
-		bf8 a g f f g e f ~ |   % 21
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*7 |   % 15-21
 	}
 	\alternative
 	{
 		{
-			f2 r |   % 22
-			<< R1 \\ { s2. s4^\markup { \bold \italic { D.S. } } } >> \bar "||"   % 23
+			s1 |   % 22
+			s2. s4^\markup { \hspace #-1.8 \raise #0.2 \bold "D.S." } \bar "||"   % 23
 %			R1^\markup { \bold \italic { D.S. } } \bar "||"   % 23
 %\once \override Score.RehearsalMark #'self-alignment-X = #right
 %\mark \markup { \italic { D.S. } }
 		}
 		{
-			r8 c' c c c bf a c ~ |   % 24
+			s1 |   % 24
 		}
 		{
-			f,2 \repeatTie r8 g a bf ~ |   % 25
+			s1 |   % 25
 		}
 	}
 
 	% Outro
 
+	s1*3 \bar "||"   % 26-28
+	s1*5 \bar "|."   % 29-33
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	% Intro
+
+	R1*4 |   % 1-4
+
+	% Verse
+
+	r4 a8 a a g f g ~ |   % 5
+	g4 f8 a ~ a g4. |   % 6
+	r4 a8 a a g f g ~ |   % 7
+	g4 a8 g ~ g4 r |   % 8
+	r4 a8 a a g f g ~ |   % 9
+	g4 a8 g ( ~ g f ) d4 |   % 10
+
+	r4 f8 f g a g f ~ |   % 11
+	f2 r |   % 12
+
+	r4 f8 f g a g f |   % 13
+	r8 c' c c c bf a c ~ |   % 14
+
+	% Chorus
+
+	c8 c c bf ~ bf c d c |   % 15
+	r8 c c c c bf a c ~ |   % 16
+	c8 c c c bf c d c |   % 17
+	r8 c c c c bf a d ~ |   % 18
+	d8 c bf c ~ c bf a bf ~ |   % 19
+	bf8 a g f ~ f g a bf ~ |   % 20
+	bf8 a g f f g e f ~ |   % 21
+
+	f2 r |   % 22
+	R1 |   % 23
+
+	r8 c' c c c bf a c \laissezVibrer |   % 24
+
+	f,2 \repeatTie r8 g a bf ~ |   % 25
+
+	% Outro
+
 	bf8 a g f f g e f ~ |   % 26
 	f2 r8 g a bf ~ |   % 27
-	bf8 a g f f g e4 \bar "||"   % 28
+	bf8 a g f f g e4 |   % 28
 
 	f4 r r2 |   % 29
 	R1 |   % 30
 	R1 |   % 31
 	R1 |   % 32
-	r1^\fermata \bar "|."   % 33
+	r1^\fermata |   % 33
 }
 
+
 LeadVoxText = \lyricmode
 {
 	We will wor- ship the lamb _ of glo- _ ry
@@ -148,12 +175,8 @@ LeadVoxTextB = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	f2.. c8/f |   % 1
@@ -210,73 +233,50 @@ 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
 
 	c4-\markup { \small \italic { sidestick } } c c c8 c ~ |   % 1
 	c4 c c c |   % 2
 	c4 c c c |   % 3
-	c4 c c c \bar "||:"   % 4
+	c4 c c c |   % 4
 
 	% Verse
 
-	\repeat volta 2
-	{
-		c4_\mf c c c8 c ~ |   % 5
-		c4 c c c |   % 6
-		c4 c c c8 c ~ |   % 7
-		c4 c c c |   % 8
-		c4 c c c8 c ~ |   % 9
-		c4 c c c |   % 10
-	}
-	\alternative
-	{
-		{
-			c4 c c c8 c ~ |   % 11
-			c4 c8 c ~ c4 c |   % 12
-		}
-		{
-			c4 c c c8 c ~ |   % 13
-			c8 c c c c c c c ~ |   % 14
-		}
-	}
+	c4_\mf c c c8 c ~ |   % 5
+	c4 c c c |   % 6
+	c4 c c c8 c ~ |   % 7
+	c4 c c c |   % 8
+	c4 c c c8 c ~ |   % 9
+	c4 c c c |   % 10
+
+	c4 c c c8 c ~ |   % 11
+	c4 c8 c ~ c4 c |   % 12
+
+	c4 c c c8 c ~ |   % 13
+	c8 c c c c c c c ~ |   % 14
 
 	% Chorus
 
-	\repeat volta 3
-	{
-		c4_\markup { \italic { snare } } c8 c ~ c4 c8 c ~ |   % 15
-		c8 c c c c c c c ~ |   % 16
-		c4 c8 c ~ c4 c8 c ~ |   % 17
-		c8 c c c c c c c ~ |   % 18
-		c4 c8 c ~ c4 c8 c ~ |   % 19
-		c4 c8 c ~ c4 c8 c ~ |   % 20
-		c4 c8 c ~ c4 c |   % 21
-	}
-	\alternative
-	{
-		{
-			c4 c c c8 c ~ |   % 22
-			c4 c c c |   % 23
-		}
-		{
-			c8 c c c c c c c |   % 24 (repeat tie on the last c
-		}
-		{
-			c4. c8 ~ c4 c8 c ~ |   % 25
-		}
-	}
+	c4_\markup { \italic { snare } } c8 c ~ c4 c8 c ~ |   % 15
+	c8 c c c c c c c ~ |   % 16
+	c4 c8 c ~ c4 c8 c ~ |   % 17
+	c8 c c c c c c c ~ |   % 18
+	c4 c8 c ~ c4 c8 c ~ |   % 19
+	c4 c8 c ~ c4 c8 c ~ |   % 20
+	c4 c8 c ~ c4 c |   % 21
+
+	c4 c c c8 c ~ |   % 22
+	c4 c c c |   % 23
+
+	c8 c c c c c c c |   % 24 (repeat tie on the last c
+
+	c4. c8 ~ c4 c8 c ~ |   % 25
 
 	% Outro
 
@@ -288,43 +288,50 @@ StaffC = \relative c
 	c4 c c c |   % 30
 	c4 c c c |   % 31
 	c4 c c c |   % 32
-	c1^\fermata \bar "|."   % 33
+	c1^\fermata |   % 33
 }
 
 
 \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 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
 }
+