X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=bless-the-lord-o-my-soul.ly;h=6f7b6383c7dd5e4f0dab6133cd195b5bdf5382d3;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=e4e952c7dc48bfe32f6ea2dbee972fe848d82968;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/bless-the-lord-o-my-soul.ly b/bless-the-lord-o-my-soul.ly
index e4e952c..6f7b638 100644
--- a/bless-the-lord-o-my-soul.ly
+++ b/bless-the-lord-o-my-soul.ly
@@ -3,7 +3,7 @@
 \include "english.ly"
 
 % Good sizes are 16, 18, & 20
-staffSize = #16
+staffSize = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
@@ -12,8 +12,6 @@ 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 "Bless The Lord, O My Soul" }
 	subtitle = \markup { \override #'(font-family . sans) \fontsize #1.3 "(10,000 Reasons)" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Matt Redman" }
@@ -42,7 +40,7 @@ Global =
 
 	% Intro
 
-	s1*4 |   % 1-4
+	s1*4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
@@ -60,10 +58,12 @@ Global =
 		\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
 
 		s1*6 |   % 14-19
-		s1*3 |   % 20-22
+		s1*2 |   % 20-22
 
+		s2...
 		\once \override Score.RehearsalMark #'self-alignment-X = #right
 		\mark \markup { \italic { to Coda } \musicglyph #"scripts.coda" }
+		s16
 	}
 	\alternative
 	{
@@ -71,7 +71,7 @@ Global =
 			s1 |   % 23
 		}
 		{
-			s1 |   % 24
+			s1 \bar "||"   % 24
 		}
 	}
 
@@ -96,7 +96,7 @@ Global =
 
 	% blank measure between last measure and coda
 %	\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-	\stopStaff s1 \startStaff   % That removed the spurious floating bar line from line break (DID IT???)
+	\stopStaff s1 \startStaff
 %	\break % Meh
 	\set Score.currentBarNumber = #41
 
@@ -136,16 +136,6 @@ Global =
 	}
 
 	s1 \bar "|."   % 63
-
-%{
-
-%	\once \override TextScript #'padding = #2.0
-%	s1*0^\markup { \large \bold { Moderately fast pop } }
-%%Capo 3 version
-%%	s1*0^\markup { \large \bold { Moderately fast pop "(*** CAPO 3 ***)" } }
-%	s1*13 \bar "||:"   % 1-13
-
-%}
 }
 
 
@@ -155,7 +145,6 @@ Global =
 LeadVox = \relative c'
 {
 	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -262,7 +251,7 @@ LeadVoxText = \lyricmode
 	{ The sun comes up it's a new day daw -- ning,
 	it's time to sing your song _ a -- gain,
 	What -- e -- ver may _ pass _ and what -- e -- ver lies be -- fore _ me,
-	let me go sing -- ing when the eve -- ning comes. }
+	let me be sing -- ing when the eve -- ning comes. }
 
 	\new Lyrics = "verse2" \with { alignBelowContext = #"verse1" }
 	{ \set associatedVoice = "Lead"
@@ -376,7 +365,7 @@ Chords = \chordmode
 	f2 c |   % 16
 	g2 a:m |   % 17
 	f2 c |   % 18
-	g2 a:m |   % 19
+	g2 a4:m r |   % 19 (rest here shows as N.C.!!!)
 	s2 f |   % 20
 	c2 g4:sus4 g |   % 21
 	c1 |   % 22
@@ -453,13 +442,14 @@ 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...
+Slash = { \override NoteHead #'style = #'slash }
+Cross = { \override NoteHead #'style = #'cross }
 
 Rhythm =
 {
 	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -488,8 +478,8 @@ Rhythm =
 	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 \Cross c-> |   % 19
+	c4-> c-> \Slash c c |   % 20
 	c4 c c c |   % 21
 	c4 c c c |   % 22
 
@@ -582,7 +572,7 @@ Dynamics =
 	s2 s4 \< s \! |   % 53
 %}
 	s1*18
-	s2. s4_\markup { \italic { No chord } }
+%	s2. s4_\markup { \italic { No chord } }
 }
 
 
@@ -622,7 +612,7 @@ Dynamics =
 		(/ staffSize 20)))
 
 % Don't spread staves vertically across last page (default: t)
-	ragged-last-bottom = ##f
+%	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)