From 6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d Mon Sep 17 00:00:00 2001
From: Shamus Hammons <jlhamm@acm.org>
Date: Sat, 2 Sep 2017 11:24:15 -0500
Subject: [PATCH] New chart "Bless The Lord, O My Soul".

---
 better-is-one-day.ly               |   4 +-
 bless-the-lord-o-my-soul.ly        | 634 +++++++++++++++++++++++++++++
 come-now-is-the-time-to-worship.ly |   6 +-
 god-is-my-redeemer.ly              |  32 +-
 he-leadeth-me.ly                   |  30 +-
 5 files changed, 671 insertions(+), 35 deletions(-)
 create mode 100644 bless-the-lord-o-my-soul.ly

diff --git a/better-is-one-day.ly b/better-is-one-day.ly
index 39022f4..6645e16 100644
--- a/better-is-one-day.ly
+++ b/better-is-one-day.ly
@@ -593,7 +593,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"JazzText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -606,6 +606,4 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
diff --git a/bless-the-lord-o-my-soul.ly b/bless-the-lord-o-my-soul.ly
new file mode 100644
index 0000000..e4e952c
--- /dev/null
+++ b/bless-the-lord-o-my-soul.ly
@@ -0,0 +1,634 @@
+\version "2.19.48"
+\include "pop-chords.ly"
+\include "english.ly"
+
+% Good sizes are 16, 18, & 20
+staffSize = #16
+#(set-default-paper-size "letter")
+#(set-global-staff-size staffSize)
+#(ly:set-option (quote no-point-and-click))
+
+%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %}
+
+\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" }
+	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. S. Hammons" }
+	tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
+}
+
+% Useful tweak abbreviations (hn = harmony note)
+
+hn = #(define-music-function (parser location arg) (ly:music?)
+;; Harmony Note: Set the tweaks property of the passed in note to use a smaller font
+
+  (set! (ly:music-property arg 'tweaks)
+    (acons 'font-size -3.5 (ly:music-property arg 'tweaks))) arg)
+
+
+%
+% Song's structure
+%
+Global =
+{
+	% Original is in G
+	\key c \major
+	\numericTimeSignature
+	\time 4/4
+
+	% Intro
+
+	s1*4 |   % 1-4
+
+	\repeat volta 2
+	{
+		% Chorus
+
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+
+		s1*9 \bar "||"   % 5-13
+%bleh
+%\break
+		% Verse
+
+%		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\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
+
+		\once \override Score.RehearsalMark #'self-alignment-X = #right
+		\mark \markup { \italic { to Coda } \musicglyph #"scripts.coda" }
+	}
+	\alternative
+	{
+		{
+			s1 |   % 23
+		}
+		{
+			s1 |   % 24
+		}
+	}
+
+	% Chorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+
+	s1*8 \bar "||"   % 25-32
+
+	% Instrumental
+
+	\mark \markup { \override #'(font-family . sans) { \box { D } } }
+
+%{	s1^\markup { \italic { Repeat figure thru to D.S. } } |   % 42
+	s1*8 |   % 34-41 %}
+	s1*8 \bar "||"   % 33-40
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #right
+	\mark \markup { \hspace #0.0 \raise #1.0 \italic { D.S. al Coda } }
+
+	% Coda
+
+	% 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???)
+%	\break % Meh
+	\set Score.currentBarNumber = #41
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+
+	s1 \bar "||"   % 41
+
+	% Chorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { E } } }
+
+	s1*8 \bar "||"   % 42-49
+
+	% Outro
+
+	\mark \markup { \override #'(font-family . sans) { \box { F } } }
+	s1 |   % 50
+
+	\repeat volta 2
+	{
+		\set Staff.ottavation = #"Vox tacet on repeat"
+		\set Voice.middleCPosition = #7
+		s1 |   % 51
+		s1 |   % 52
+		s2 \unset Staff.ottavation \unset Voice.middleCPosition s |   % 53
+		s1*6 |   % 54-59
+	}
+	\alternative
+	{
+		{
+			s1*2 |   % 60-61
+		}
+		{
+			s1 |   % 62
+		}
+	}
+
+	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
+
+%}
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	\clef G
+	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
+
+	% Intro
+
+	s1 |   % 1
+	s1 |   % 2
+	s1 |   % 3
+	r2 r4 e8 g |   % 4
+
+	% Chorus
+
+	a4 a8 g e4 r |   % 5
+	d8 ( e d ) c a4 r |   % 6
+	a8 c g' e ~ e4 c8 d ~ |   % 7
+	d2 r4 e8 g |   % 8
+
+	a4 a8 g e4 r |   % 9
+	a4 b e, r8 r16 d |   % 10
+	c8 d e d ~ d4 c8 c ~ |   % 11
+	c2 r |   % 12
+	r2 r4 r8 g |   % 13
+
+	% Verse
+
+	c4 c c a8 g |   % 14
+	b4 c c a |   % 15
+	r8 c c c c r c d ~ |   % 16
+	d4 e8 e r4 r8 c |   % 17
+	<< { \voiceTwo f8 f f ( e ) } \new Voice = "v2" { \voiceOne \tiny f4 f } >> << { \voiceOne \tiny e8 [ d ] \normalsize } \new Voice = "v2" { \voiceTwo e r } >> \oneVoice c c |   % 18
+	<< { \voiceTwo d8 c d e d ( c ) a4 } \new Voice = "v2" { \voiceOne \tiny d4 e e d } >> \oneVoice |   % 19
+	r2 r8 c c c |   % 20
+	c8 c c d e4 d |   % 21
+	c2 r |   % 22
+
+	r2 r4 e8 g |   % 23
+
+	r2 r4 e8 g |   % 24
+
+	% Chorus
+
+	a4 a8 g e4 r |   % 25
+	d8 ( e d ) c a4 r |   % 26
+	a8 c g' e ~ e4 c8 d ~ |   % 27
+	d2 r4 e8 g |   % 28
+
+	a4 a8 g e4 r |   % 29
+	a4 b e, r8 r16 d |   % 30
+	c8 d e d ~ d4 c8 c ~ |   % 31
+	c2 r |   % 32
+
+	% Chorus
+
+	R1*7 |   % 33-39
+	r2 r4 r8 g |   % 40
+
+	% Coda
+
+	s1 | % blank measure for coda
+
+	r2 r4 e'8 g |   % 41
+
+	% Chorus
+
+	a4 a8 g e4 r |   % 42
+	d8 ( e d ) c a4 r |   % 43
+	a8 c g' e ~ e4 c8 d ~ |   % 44
+	d2 r4 e8 g |   % 45
+
+	a4 a8 g e4 r |   % 46
+	a4 b e, r8 r16 d |   % 47
+	c8 d e d ~ d4 c8 c ~ |   % 48
+	c2 r4 e8 g |   % 49
+
+	% Outro
+
+	a4 a8 g e4 r |   % 50
+	d8 ( e d ) c a4 r |   % 51
+	a8 c g' e ~ e4 c8 d ~ |   % 52
+	d2 r4 e8 g |   % 53
+
+	a4 a8 g e4 r |   % 54
+	a4 b e, r8 r16 d |   % 55
+	c8 d e d ~ d4 c8 c ~ |   % 56
+	c2 r4 r8 r16 d |   % 57
+
+	c8 d e d ~ d4 e8 e ~ |   % 58
+	e2 r4 r8 r16 d |   % 59
+
+	c8 d e d ~ d4 c8 c ~ |   % 60
+	c2 r |   % 61
+
+	c8 d e d ~ d4 c8 c ~ |   % 62
+
+	c1-\fermata |   % 63
+}
+
+LeadVoxText = \lyricmode
+{
+	Bless the Lord, o my soul, o __ _ _ my soul,
+	wor -- ship his ho -- _ ly name, _
+	Sing like ne -- ver be -- fore, o my soul,
+	I'll wor -- ship your ho -- _ ly name. _
+
+	<<
+	{ 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. }
+
+	\new Lyrics = "verse2" \with { alignBelowContext = #"verse1" }
+	{ \set associatedVoice = "Lead"
+	You're rich in love and you're slow to an -- ger,
+	your name is great and your heart is kind,
+	for all _ your  _ good -- ness I will keep _ on _ sing -- _ ing,
+	ten thou -- sand rea -- sons for my heart to find.
+	}
+
+	\new Lyrics = "verse3"  \with { alignBelowContext = #"verse2" }
+	{ \set associatedVoice = "Lead"
+	_ on that day when my strength is fail -- ing,
+	the end draws near and my time has come,
+	_ still _ my _ soul will sing your praise _ un -- _ end -- _ ing,
+	ten thou -- sand years and then for -- e -- ver -- more.
+	}
+	>>
+
+	Bless the
+
+	Bless the Lord, o my soul, o __ _ _ my soul,
+	wor -- ship his ho -- _ ly name, _
+	Sing like ne -- ver be -- fore, o my soul,
+	I'll wor -- ship your ho -- _ ly name. _
+
+	And
+
+	Bless the Lord, o my soul, o __ _ _ my soul,
+	wor -- ship his ho -- _ ly name, _
+	Sing like ne -- ver be -- fore, o my soul,
+	I'll wor -- ship your ho -- _ ly name. _
+
+	Bless the Lord, o my soul, o __ _ _ my soul,
+	wor -- ship his ho -- _ ly name, _
+	Sing like ne -- ver be -- fore, o my soul,
+	I'll wor -- ship your ho -- _ ly name. _
+	I'll wor -- ship your ho -- _ ly name. _
+
+	I'll wor -- ship your ho -- _ ly name. _
+
+	wor -- ship your ho -- _ ly name. _
+}
+
+LeadVoxEcho = \lyricmode
+{
+	Bet -- ter is one day _
+	Bet -- ter is one day
+}
+
+
+%
+% Riffs
+%
+Riffs = \relative c'
+{
+	% Intro
+
+	\teeny
+%{	c4 d b2 |   % 1
+	a8 b a g e2 |   % 2
+	g4 d' b g |   % 3
+	a1 |   % 4
+%}
+	f4 g e2 |   % 1
+	d8 e d c a2 |   % 2
+	c4 g' e c |   % 3
+	d1 |   % 4
+
+	s1*36 |   % 5-40
+	s1 % Blank bar for Coda
+	s1*20 |   % 41-60
+
+	a'4 a8 g e2 |   % 61
+}
+
+
+%
+% Chord names
+%
+Chords = \chordmode
+{
+	% Intro
+
+%{	c2 g |   % 1
+	d2/fs e:m |   % 2
+	c2 g |   % 3
+	d2:sus4 d |   % 4
+%}
+	f2 c |   % 1
+	g2/b a:m |   % 2
+	f2 c |   % 3
+	g2:sus4 g |   % 4
+
+	% Chorus
+
+	f2 c |   % 5
+	g2/b a:m |   % 6
+	f2 c |   % 7
+	g2:sus4 g |   % 8
+
+	f2 a:m |   % 9
+	f4 g a2:m |   % 10
+	f2 g |   % 11
+	f2 c |   % 12
+	f2 c |   % 13
+
+	% Verse
+
+	f2 c |   % 14
+	g2 a:m |   % 15
+	f2 c |   % 16
+	g2 a:m |   % 17
+	f2 c |   % 18
+	g2 a:m |   % 19
+	s2 f |   % 20
+	c2 g4:sus4 g |   % 21
+	c1 |   % 22
+
+	s1 |   % 23
+
+	c1 |   % 24
+
+	% Chorus
+
+	f2 c |   % 25
+	g2/b a:m |   % 26
+	f2 c |   % 27
+	g2:sus4 g |   % 28
+
+	f2 a:m |   % 29
+	f4 g a2:m |   % 30
+	f2 g |   % 31
+	c1 |   % 32
+
+	% Instrumental
+
+	f2 c |   % 33
+	g2/b a:m |   % 34
+	f2 c |   % 35
+	g2:sus4 g |   % 36
+
+	f2 a:m |   % 37
+	f4 g a2:m |   % 38
+	f2 g |   % 39
+	c1 |   % 40
+
+	% Coda
+
+	s1 % blank measure for coda
+
+	c1 |   % 41
+
+	f2 c |   % 42
+	g2/b a:m |   % 43
+	f2 c |   % 44
+	g2:sus4 g |   % 45
+
+	f2 a:m |   % 46
+	f4 g a2:m |   % 47
+	f2 g |   % 48
+	c1 |   % 49
+
+	% Outro
+
+	f2 c |   % 50
+	g2/b a:m |   % 51
+	f2 c |   % 52
+	g2:sus4 g |   % 53
+
+	f2 a:m |   % 54
+	f4 g a2:m |   % 55
+	f2 g |   % 56
+	a1:m |   % 57
+
+	f2 g |   % 58
+	a1:m |   % 59
+
+	f2 g |   % 60
+	f2 c |   % 61
+
+	f2 g |   % 62
+
+	c1 |   % 63
+}
+
+
+%
+% 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...
+
+Rhythm =
+{
+	\numericTimeSignature
+	\override NoteHead #'style = #'slash
+
+	% Intro
+
+	c2 c |   % 1
+	c2 c |   % 2
+	c2 c |   % 3
+	c2 c |   % 4
+
+	% Chorus
+
+	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
+
+	% Verse
+
+	c4 c c c |   % 14
+	c4 c c c |   % 15
+	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 c |   % 21
+	c4 c c c |   % 22
+
+	c4 c c c |   % 23
+
+	c4 c c c |   % 24
+
+	% Chorus
+
+	c4 c c c |   % 25
+	c4 c c c |   % 26
+	c4 c c c |   % 27
+	c4 c c c |   % 28
+
+	c4 c c c |   % 29
+	c4 c c c |   % 30
+	c4 c c c |   % 31
+	c4 c c c |   % 32
+
+	% Instrumental
+
+	c4 c c c |   % 33
+	c4 c c c |   % 34
+	c4 c c c |   % 35
+	c4 c c c |   % 36
+
+	c4 c c c |   % 37
+	c4 c c c |   % 38
+	c2 c |   % 39
+	c4 c c c |   % 40
+
+	% Coda
+
+	% blank measure between last measure and coda
+%hm. Shouldn't need /startStaff /stopStaff... !!! FIX !!!
+	\stopStaff s1 \startStaff
+
+	c4 c c c |   % 41
+
+	c4 c c c |   % 42
+	c4 c c c |   % 43
+	c4 c c c |   % 44
+	c4 c c c |   % 45
+
+	c4 c c c |   % 46
+	c4 c c c |   % 47
+	c4 c c c |   % 48
+	c4 c c c |   % 49
+
+	% Outro
+
+	c4 c c c |   % 50
+	c4 c c c |   % 51
+	c4 c c c |   % 52
+	c4 c c c |   % 53
+
+	c4 c c c |   % 54
+	c4 c c c |   % 55
+	c4 c c c |   % 56
+	c4 c c c |   % 57
+
+	c4 c c c |   % 58
+	c4 c c c |   % 59
+
+	c4 c c c |   % 60
+	c4 c c c |   % 61
+
+	c4 c c c |   % 62
+
+	c1-\fermata |   % 63
+}
+
+
+Dynamics =
+{
+%Hmm, this is throwin off the layout...
+%{
+	s4_\mf s2. |   % 1
+	s1*18 |   % 2-19
+	s4 s \< s2 |   % 20
+	s4_\f s2. |   % 21
+	s1*9 |   % 22-30
+	s2 s4 \< s \! |   % 31
+	s1*9 |   % 32-40
+	s2 s4 \> s |   % 41
+	s4_\mp s2. |   % 42
+	s1*3 |   % 43-45
+	s4_\mf s2. |   % 46
+	s1*6 |   % 47-52
+	s2 s4 \< s \! |   % 53
+%}
+	s1*18
+	s2. s4_\markup { \italic { No chord } }
+}
+
+
+\score
+{
+	<<
+		\Global			% The "roadmap" that everything else depends on
+
+		\context Staff
+		<<
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
+			\new Lyrics = "verse1" \lyricsto "lead" \LeadVoxText
+%			\new Lyrics \lyricsto "v2" \LeadVoxEcho
+		>>
+
+		\new ChoirStaff
+		<<
+			\new ChordNames \Chords
+%Capo 3 edition
+%			\new ChordNames \transpose f d \Chords
+			\new RhythmicStaff << \Rhythm \Dynamics >>
+		>>
+
+		\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
+}
+
diff --git a/come-now-is-the-time-to-worship.ly b/come-now-is-the-time-to-worship.ly
index 4b9267c..c690ab2 100644
--- a/come-now-is-the-time-to-worship.ly
+++ b/come-now-is-the-time-to-worship.ly
@@ -562,7 +562,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
 
@@ -575,6 +575,6 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
+%let's try this: [It works! Huzzah!][nope, it doesn't :-/]
+%	obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
diff --git a/god-is-my-redeemer.ly b/god-is-my-redeemer.ly
index 8bba748..3ef7d82 100644
--- a/god-is-my-redeemer.ly
+++ b/god-is-my-redeemer.ly
@@ -200,7 +200,7 @@ StaffC = \relative c
 %	\set Voice.autoBeaming = ##f
 %	\set Staff.instrumentName = #"Rhythm"
 	\override Staff.TimeSignature #'style = #'()
-	\time 4/4 
+	\time 4/4
 	\override NoteHead #'style = #'slash
 
 	% Intro
@@ -264,29 +264,21 @@ StaffC = \relative c
 \score
 {
 	<<
-%		\new ChoirStaff = "Vox"
+		\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
-	{
-%		linewidth = 170.000 \mm
-%		textheight = 250.000 \mm
-%		papersize = "letter"
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
@@ -294,7 +286,17 @@ StaffC = \relative c
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "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
 }
diff --git a/he-leadeth-me.ly b/he-leadeth-me.ly
index cab6f86..9b45bbd 100644
--- a/he-leadeth-me.ly
+++ b/he-leadeth-me.ly
@@ -270,7 +270,7 @@ Riffs = \relative c''
 	e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ |   % 54
 	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ |   % 55
 	e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ |   % 56
-	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 cs8. ~ |   % 57
+	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 cs8. |   % 57
 	<d a fs d>1^\fermata |   % 59
 \normalsize
 }
@@ -496,29 +496,23 @@ Dynamics =
 \score
 {
 	<<
+		\context Staff
 		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
@@ -530,5 +524,13 @@ Dynamics =
     "Luxi Mono"
     (/ staffSize 20)))
 
-%  top-margin = -0.25 \in
+% 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
 }
-- 
2.37.2