X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=shout-to-the-north.ly;h=bed85d057edd16b48ba9a18fdb95726eeedc38fb;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=779e8d8da8fd9c2021f4d7279ff778fc259a1014;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/shout-to-the-north.ly b/shout-to-the-north.ly
index 779e8d8..bed85d0 100644
--- a/shout-to-the-north.ly
+++ b/shout-to-the-north.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 = #16
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -29,68 +29,125 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c''
+Global =
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key g \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 6/8
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	\repeat volta 4
 	{
-		r2. |   % 1
+		s2. |   % 1
+	}
+	\alternative
+	{
+		{
+			s2. |   % 2
+		}
+		{
+			s2. |   % 3
+		}
+	}
+
+	\repeat volta 2
+	{
+		\mark \markup { \override #'(font-family . sans) { \box { A } } }
+		s2.*9 |   % 4-12
+
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { B } } \italic \smaller { (1st X unison) } }
+		s2.*7 |   % 13-19
 	}
 	\alternative
 	{
 		{
-			r2. |   % 2
+			s2.*2 |   % 20-21
 		}
 		{
-			r4. r8 g a |   % 3
+			s2. |   % 22
 		}
 	}
 
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s2.*9 \bar "||"   % 23-31
+
+	\mark \markup { \override #'(font-family . sans) { \box { D } } }
+	s2.*9 |   % 32-40
+
 	\repeat volta 2
 	{
-\mark \markup { \override #'(font-family . sans) { \box { A } } }
-		b4 d,8 a'4 fs8 |   % 4
-		g4. r8 g g |   % 5
-		b4 d,8 a'4 fs8 |   % 6
-		g4. r8 g a |   % 7
-		b4 d,8 a'4 fs8 |   % 8
-		g4. r8 g g |   % 9
-		b4 d,8 a'4 fs8 |   % 10
-		a16 ( g ) ~ g4 ~ g4. |   % 11
-		r2. |   % 12
-
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \italic \smaller { (1st X unison) } }
-		<d' \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 13
-		<c \hn e,>8 <c \hn e,> <b \hn d,> <a \hn d,>4. |   % 14
-		<d \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 15
-		<c \hn e,>8 <c \hn e,> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 16
-		<d \hn b \hn g>4. <d \hn b \hn g>4 <g, \hn d>8 |   % 17
-		<c \hn g \hn e>8 <c \hn g \hn e> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 18
-		<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 19
+		\mark \markup { \override #'(font-family . sans) { \box { E } } }
+		s2.*7 |   % 41-47
 	}
 	\alternative
 	{
 		{
-			<g \hn d>2. |   % 20
-			r2 g8 a |   % 21
+			s2. |   % 48
 		}
 		{
-			g2. |   % 22
+			s2. |   % 49
 		}
 	}
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s2. \bar "||"   % 50
+
+	\mark \markup { \override #'(font-family . sans) { \box { F } } }
+	s2.*9 |   % 51-59
+
+	\repeat volta 2
+	{
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { G } } \italic \smaller { (1st X kids, 2nd X all) } }
+		s2.*8 |   % 60-67
+	}
+
+	\repeat volta 2
+	{
+		\mark \markup { \override #'(font-family . sans) { \box { H } } }
+		s2.*8 |   % 68-75
+	}
+
+	s2.*6 \bar "|."   % 76-81
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c''
+{
+	r2. |   % 1
+
+	r2. |   % 2
+
+	r4. r8 g a |   % 3
+
+	b4 d,8 a'4 fs8 |   % 4
+	g4. r8 g g |   % 5
+	b4 d,8 a'4 fs8 |   % 6
+	g4. r8 g a |   % 7
+	b4 d,8 a'4 fs8 |   % 8
+	g4. r8 g g |   % 9
+	b4 d,8 a'4 fs8 |   % 10
+	a16 ( g ) ~ g4 ~ g4. |   % 11
+	r2. |   % 12
+
+	<d' \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 13
+	<c \hn e,>8 <c \hn e,> <b \hn d,> <a \hn d,>4. |   % 14
+	<d \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 15
+	<c \hn e,>8 <c \hn e,> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 16
+	<d \hn b \hn g>4. <d \hn b \hn g>4 <g, \hn d>8 |   % 17
+	<c \hn g \hn e>8 <c \hn g \hn e> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 18
+	<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 19
+
+	<g \hn d>2. |   % 20
+	r2 g8 a |   % 21
+
+	g2. |   % 22
+
 	<d' \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 23
 	<c \hn e,>8 <c \hn e,> <b \hn d,> <a \hn d,>4. |   % 24
 	<d \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 25
@@ -99,9 +156,8 @@ LeadVox = \relative c''
 	<c \hn g \hn e>8 <c \hn g \hn e> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 28
 	<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 29
 	<g \hn d>2. |   % 30
-	r2. \bar "||"   % 31
+	r2. |   % 31
 
-\mark \markup { \override #'(font-family . sans) { \box { D } } }
 	<b \hn e,>8 <b \hn e,> <b \hn e,> <b \hn e,> ( <a \hn d,> ) r |   % 32
 	<g \hn c,>8 <g \hn c,> <a \hn d,> <e \hn c>4. |   % 33
 	<b' \hn e,>8 <b \hn e,> <b \hn e,> <b \hn e,> <a \hn d,> <g \hn b,> |   % 34
@@ -112,30 +168,20 @@ LeadVox = \relative c''
 	<d \hn a \hn fs>2. ~ |   % 39
 	<d \hn a \hn fs>4. r8 g, g |   % 40
 
-	\repeat volta 2
-	{
-\mark \markup { \override #'(font-family . sans) { \box { E } } }
-		<d' \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 41
-		<c \hn e,>8 <c \hn e,> <b \hn d,> <a \hn d,>4. |   % 42
-		<d \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 43
-		<c \hn e,>8 <c \hn e,> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 44
-		<d \hn b \hn g>4. <d \hn b \hn g>4 <g, \hn d>8 |   % 45
-		<c \hn g \hn e>8 <c \hn g \hn e> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 46
-		<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 47
-	}
-	\alternative
-	{
-		{
-			<g \hn d>4. r8 g g |   % 48
-		}
-		{
-			<g \hn d>2. |   % 49
-		}
-	}
+	<d' \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 41
+	<c \hn e,>8 <c \hn e,> <b \hn d,> <a \hn d,>4. |   % 42
+	<d \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 43
+	<c \hn e,>8 <c \hn e,> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 44
+	<d \hn b \hn g>4. <d \hn b \hn g>4 <g, \hn d>8 |   % 45
+	<c \hn g \hn e>8 <c \hn g \hn e> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 46
+	<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 47
+
+	<g \hn d>4. r8 g g |   % 48
 
-	r2 g8 a \bar "||"   % 50
+	<g \hn d>2. |   % 49
+
+	r2 g8 a |   % 50
 
-\mark \markup { \override #'(font-family . sans) { \box { F } } }
 	b4 d,8 a'4 fs8 |   % 51
 	g4. r8 g g |   % 52
 	b4 d,8 a'4 fs8 |   % 53
@@ -146,41 +192,33 @@ LeadVox = \relative c''
 	a16 ( g ) ~ g4 ~ g4. |   % 58
 	r2. |   % 59
 
-	\repeat volta 2
-	{
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { G } } \italic \smaller { (1st X kids, 2nd X all) } }
-		d'4. d4 g,8 |   % 60
-		c8 c b a4. |   % 61
-		d4. d4 g,8 |   % 62
-		c8 c b a4. |   % 63
-		d4. d4 g,8 |   % 64
-		c8 c b a4. |   % 65
-		c4 b8 a16 g8. g8 |   % 66
-		g2. |   % 67
-	}
-
-	\repeat volta 2
-	{
-\mark \markup { \override #'(font-family . sans) { \box { H } } }
-		<d' \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 68
-		<c \hn e,>8 <c \hn e,> <b \hn d,> <a \hn d,>4. |   % 69
-		<d \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 70
-		<c \hn e,>8 <c \hn e,> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 71
-		<d \hn b \hn g>4. <d \hn b \hn g>4 <g, \hn d>8 |   % 72
-		<c \hn g \hn e>8 <c \hn g \hn e> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 73
-		<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 74
-		<g \hn d>2. |   % 75
-	}
+	d'4. d4 g,8 |   % 60
+	c8 c b a4. |   % 61
+	d4. d4 g,8 |   % 62
+	c8 c b a4. |   % 63
+	d4. d4 g,8 |   % 64
+	c8 c b a4. |   % 65
+	c4 b8 a16 g8. g8 |   % 66
+	g2. |   % 67
+
+	<d' \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 68
+	<c \hn e,>8 <c \hn e,> <b \hn d,> <a \hn d,>4. |   % 69
+	<d \hn g,>4. <d \hn g,>4 <g, \hn d>8 |   % 70
+	<c \hn e,>8 <c \hn e,> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 71
+	<d \hn b \hn g>4. <d \hn b \hn g>4 <g, \hn d>8 |   % 72
+	<c \hn g \hn e>8 <c \hn g \hn e> <b \hn g \hn d> <a \hn fs \hn d>4. |   % 73
+	<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 74
+	<g \hn d>2. |   % 75
 
 	<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 76
 	<g \hn d>2. |   % 77
 	<c \hn g \hn e>4 <b \hn g \hn d>8 <a \hn d,>16 <g \hn d>8. <g \hn d>8 |   % 78
 	<g \hn d>2. |   % 79
 	c4 b8 a16 g8. g8 |   % 80
-	g2.-\fermata \bar "|."   % 81
+	g2.-\fermata |   % 81
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Men of faith, rise up and sing
@@ -248,56 +286,36 @@ LeadVoxTextB = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
+	g2.:5^3 |   % 1
 
-	\repeat volta 4
-	{
-		g2.:5^3 |   % 1
-	}
-	\alternative
-	{
-		{
-			s4. g:sus4 |   % 2
-		}
-		{
-			g2.:5^3 |   % 3
-		}
-	}
+	s4. g:sus4 |   % 2
 
-	\repeat volta 2
-	{
-		g4. d |   % 4
-		c2. |   % 5
-		g4. d |   % 6
-		c2. |   % 7
-		g4. d |   % 8
-		c2. |   % 9
-		g4. d |   % 10
-		c2.:sus2 |   % 11
-		s2. \bar "||"   % 12
-
-		g2. |   % 13
-		c4. d |   % 14
-		g2. |   % 15
-		c4. d |   % 16
-		g2. |   % 17
-		c4. d |   % 18
-		c4. d:sus4 |   % 19
-	}
-	\alternative
-	{
-		{
-			g2. |   % 20
-			s2. |   % 21
-		}
-		{
-			g2. |   % 22
-		}
-	}
+	g2.:5^3 |   % 3
+
+	g4. d |   % 4
+	c2. |   % 5
+	g4. d |   % 6
+	c2. |   % 7
+	g4. d |   % 8
+	c2. |   % 9
+	g4. d |   % 10
+	c2.:sus2 |   % 11
+	s2. |   % 12
+
+	g2. |   % 13
+	c4. d |   % 14
+	g2. |   % 15
+	c4. d |   % 16
+	g2. |   % 17
+	c4. d |   % 18
+	c4. d:sus4 |   % 19
+
+	g2. |   % 20
+	s2. |   % 21
+
+	g2. |   % 22
 
 	g2. |   % 23
 	c4. d |   % 24
@@ -319,25 +337,17 @@ Chords = \chordmode
 	d2. |   % 39
 	d2.:sus4 |   % 40
 
-	\repeat volta 2
-	{
-		g2. |   % 41
-		c4. d |   % 42
-		g2. |   % 43
-		c4. d |   % 44
-		e2.:m7 |   % 45
-		c4. d |   % 46
-		c4. d:sus4 |   % 47
-	}
-	\alternative
-	{
-		{
-			g2. |   % 48
-		}
-		{
-			g2. |   % 49
-		}
-	}
+	g2. |   % 41
+	c4. d |   % 42
+	g2. |   % 43
+	c4. d |   % 44
+	e2.:m7 |   % 45
+	c4. d |   % 46
+	c4. d:sus4 |   % 47
+
+	g2. |   % 48
+
+	g2. |   % 49
 
 	s2. |   % 50
 
@@ -351,29 +361,23 @@ Chords = \chordmode
 	c2.:sus2 |   % 58
 	s2. |   % 59
 
-	\repeat volta 2
-	{
-		g2. |   % 60
-		c4. d |   % 61
-		g2. |   % 62
-		c4. d |   % 63
-		g2. |   % 64
-		c4. d |   % 65
-		c4. d:sus4 |   % 66
-		g2. |   % 67
-	}
-
-	\repeat volta 2
-	{
-		g2. |   % 68
-		c4. d |   % 69
-		g2. |   % 70
-		c4. d |   % 71
-		e2.:m7 |   % 72
-		c4. d |   % 73
-		c4. d:sus4 |   % 74
-		g2. |   % 75
-	}
+	g2. |   % 60
+	c4. d |   % 61
+	g2. |   % 62
+	c4. d |   % 63
+	g2. |   % 64
+	c4. d |   % 65
+	c4. d:sus4 |   % 66
+	g2. |   % 67
+
+	g2. |   % 68
+	c4. d |   % 69
+	g2. |   % 70
+	c4. d |   % 71
+	e2.:m7 |   % 72
+	c4. d |   % 73
+	c4. d:sus4 |   % 74
+	g2. |   % 75
 
 	c4. d:sus4 |   % 76
 	g2. |   % 77
@@ -388,62 +392,43 @@ 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 }
 
 StaffC = \relative c
 {
-	\override Staff.TimeSignature #'style = #'()
-	\time 6/8
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
-	\repeat volta 4
-	{
-		c8-> c c c-> c c |   % 1
-	}
-	\alternative
-	{
-		{
-			c8-> c c c-> c c |   % 2
-		}
-		{
-			c2.-> |   % 3
-		}
-	}
+	c8-> c c c-> c c |   % 1
 
-	\repeat volta 2
-	{
-		c8 c c c c c |   % 4
-		c8 c c c c c |   % 5
-		c8 c c c c c |   % 6
-		c8 c c c c c |   % 7
-		c8 c c c c c |   % 8
-		c8 c c c c c |   % 9
-		c8 c c c c c |   % 10
-		c8 c c c c c |   % 11
-		c8 c c c c c |   % 12
-
-		c8 c c c c c |   % 13
-		c8 c c c c c |   % 14
-		c8 c c c c c |   % 15
-		c8 c c c c c |   % 16
-		c8 c c c c c |   % 17
-		c8 c c c c c |   % 18
-		c8 c c c c c |   % 19
-	}
-	\alternative
-	{
-		{
-			g2. ~ |   % 20
-			g2. |   % 21
-		}
-		{
-			c8 c c c c c |   % 22
-		}
-	}
+	c8-> c c c-> c c |   % 2
+
+	c2.-> |   % 3
+
+	c8 c c c c c |   % 4
+	c8 c c c c c |   % 5
+	c8 c c c c c |   % 6
+	c8 c c c c c |   % 7
+	c8 c c c c c |   % 8
+	c8 c c c c c |   % 9
+	c8 c c c c c |   % 10
+	c8 c c c c c |   % 11
+	c8 c c c c c |   % 12
+
+	c8 c c c c c |   % 13
+	c8 c c c c c |   % 14
+	c8 c c c c c |   % 15
+	c8 c c c c c |   % 16
+	c8 c c c c c |   % 17
+	c8 c c c c c |   % 18
+	c8 c c c c c |   % 19
+
+	g2. ~ |   % 20
+	g2. |   % 21
+
+	c8 c c c c c |   % 22
 
 	c8 c c c c c |   % 23
 	c8 c c c c c |   % 24
@@ -453,7 +438,7 @@ StaffC = \relative c
 	c8 c c c c c |   % 28
 	c8 c c c c c |   % 29
 	c8 c c c c c |   % 30
-	c8 c c c c c \bar "||"   % 31
+	c8 c c c c c |   % 31
 
 	c8 c c c c c |   % 32
 	c8 c c c c c |   % 33
@@ -465,27 +450,19 @@ StaffC = \relative c
 	c8 c c c c c |   % 39
 	c8 c c c c c |   % 40
 
-	\repeat volta 2
-	{
-		c8 c c c c c |   % 41
-		c8 c c c c c |   % 42
-		c8 c c c c c |   % 43
-		c8 c c c c c |   % 44
-		c8 c c c c c |   % 45
-		c8 c c c c c |   % 46
-		c8 c c c c c |   % 47
-	}
-	\alternative
-	{
-		{
-			c8 c c c c c |   % 48
-		}
-		{
-			c2. ~ |   % 49
-		}
-	}
+	c8 c c c c c |   % 41
+	c8 c c c c c |   % 42
+	c8 c c c c c |   % 43
+	c8 c c c c c |   % 44
+	c8 c c c c c |   % 45
+	c8 c c c c c |   % 46
+	c8 c c c c c |   % 47
+
+	c8 c c c c c |   % 48
+
+	c2. ~ |   % 49
 
-	c2. \bar "||"   % 50
+	c2. |   % 50
 
 	c8 c c c c c |   % 51
 	c8 c c c c c |   % 52
@@ -497,36 +474,30 @@ StaffC = \relative c
 	c8 c c c c c |   % 58
 	c8 c c c c c |   % 59
 
-	\repeat volta 2
-	{
-		c8 c c c c c |   % 60
-		c8 c c c c c |   % 61
-		c8 c c c c c |   % 62
-		c8 c c c c c |   % 63
-		c8 c c c c c |   % 64
-		c8 c c c c c |   % 65
-		c8 c c c c c |   % 66
-		c8 c c c c c |   % 67
-	}
-
-	\repeat volta 2
-	{
-		c8 c c c c c |   % 68
-		c8 c c c c c |   % 69
-		c8 c c c c c |   % 70
-		c8 c c c c c |   % 71
-		c8 c c c c c |   % 72
-		c8 c c c c c |   % 73
-		c8 c c c c c |   % 74
-		c8 c c c c c |   % 75
-	}
+	c8 c c c c c |   % 60
+	c8 c c c c c |   % 61
+	c8 c c c c c |   % 62
+	c8 c c c c c |   % 63
+	c8 c c c c c |   % 64
+	c8 c c c c c |   % 65
+	c8 c c c c c |   % 66
+	c8 c c c c c |   % 67
+
+	c8 c c c c c |   % 68
+	c8 c c c c c |   % 69
+	c8 c c c c c |   % 70
+	c8 c c c c c |   % 71
+	c8 c c c c c |   % 72
+	c8 c c c c c |   % 73
+	c8 c c c c c |   % 74
+	c8 c c c c c |   % 75
 
 	c8 c c c c c |   % 76
 	c8 c c c c c |   % 77
 	c8 c c c c c |   % 78
 	c8 c c c c c |   % 79
 	c8 c c c c c |   % 80
-	c2.-\fermata \bar "|."   % 81
+	c2.-\fermata |   % 81
 }
 
 
@@ -551,39 +522,25 @@ Dynamics =
 	s2.*6 |   % 61-66
 	s8 \< s s2 |   % 67
 	s8_\ff s s2 |   % 68
-%{
-	s4_\markup { \italic { snare on 4, bass 8th notes } } s2. |   % 1
-	s1*26 |   % 2-27
-	s2 s4 \< s |   % 28
-	s4_\f s_\markup { \hspace #0.0 \raise #-2.0 \italic { snare 2 & 4 } } s2 |   % 29
-	s1*8 |   % 30-37
-	s2 s4 \< s \! |   % 38
-	s1 |   % 39
-	s2. s8 \> s \! |   % 40
-	s4_\markup { \hspace #0.0 \raise #-2.0 \italic { bass 8th notes, band builds each repeat } } s2. |   % 41
-	s1*8 |   % 42-49
-	s4 \< s2. |   % 50
-	s4_\f s2. |   % 51
-	s1*5 |   % 52-56
-	s4_\markup { \hspace #0.0 \raise #-2.0 \italic { rit. last time } } s2. |   % 57
-	s2 s4 \< s \! |   % 58
-%}
 }
 
 
 \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 \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
@@ -594,11 +551,11 @@ Dynamics =
 
 \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)))
 
 % Spread staves vertically across last page (default: t)
 %	ragged-last-bottom = ##f
@@ -609,6 +566,5 @@ 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)
 }
+