X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=wonderful-merciful-savior.ly;h=d8e31d1d662bcf2131d9589dd94663f22b49cbdd;hb=f527218f36b040f6e869a7617ed3380707c7f5c1;hp=e1ca109689fb17e579e56b6237613dc1343a4917;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/wonderful-merciful-savior.ly b/wonderful-merciful-savior.ly
index e1ca109..d8e31d1 100644
--- a/wonderful-merciful-savior.ly
+++ b/wonderful-merciful-savior.ly
@@ -1,9 +1,9 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #16
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+staffSize = #20
 #(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 "Wonderful, Merciful Savior" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Dawn Rodgers/Eric Wyse" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -30,76 +28,108 @@ 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 c \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	s2. |   % 1
-	s2. |   % 2
-	s2. |   % 3
-	s2. |   % 4
-	s2. |   % 5
-	s2. |   % 6
-	s2. |   % 7
-	s2. \bar "||:"   % 8
-%\break % bleah
+	s2.*8 \bar ".|:-||"   % 1-8
 
 	\repeat volta 2
 	{
 		% Verse
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { A } } \italic \smaller { 1st X piano only, unison } }
-		<e \hn c>4. <e \hn c>8 <e \hn c>4 |   % 9
-		<f \hn d>4. <e \hn c>8 <d \hn b>4 |   % 10
-		<e \hn c>2. |   % 11
-		<c \hn g>2. |   % 12
-		<g' \hn e \hn b>4 <g \hn e \hn b> <g \hn e \hn b> |   % 13
-		<a \hn f \hn c>4 <g \hn e \hn c> <f \hn d \hn a>8 ( <g \hn c,> ) |   % 14
-		<g \hn d \hn c>2. ~ |   % 15
-		<g \hn d \hn b>2. |   % 16
-		<c \hn a \hn e>4 <c \hn a \hn e> <c \hn a \hn e>8 <c \hn a \hn e> ~ |   % 17
-		<c \hn a \hn e>4 <b \hn g \hn d> <a \hn e \hn b> |   % 18
-		<a \hn f \hn c>2. |   % 19
-		<c, \hn a>2 r4 |   % 20
-		<e \hn c>4 <f \hn d> <g \hn d> |   % 21
-		<b, \hn g>2 <c \hn a>4 |   % 22
-		<c \hn a>2. |   % 23
-		<< { \voiceOne a'4 ( b ) c } \context Voice = "v2" { \voiceTwo <\hn f, \hn c>2 <\hn f \hn a,>4 } \oneVoice >> |   % 24
-		<g \hn e \hn c>4 <f \hn d \hn c> <e \hn c \hn g> |   % 25
-		<e \hn b \hn g>2 <d \hn b>4 |   % 26
+		\once \override Score.RehearsalMark #'self-alignment-X = #left
+		\mark \markup { \override #'(font-family . sans) { \box { A } } \italic \smaller { 1st X piano only, unison } }
+		s2.*18 |   % 9-26
 	}
 	\alternative
 	{
 		{
-			c2. |   % 27
-			s2. |   % 28
-			s2. |   % 29
-			s2. |   % 30
+			s2.*4 |   % 27-30
 		}
 		{
-\set Score.repeatCommands = #'((volta "2.–3.") end-repeat) % That's an ndash in there...
-			c2. |   % 31
-\set Score.repeatCommands = #'((volta #f))
+			\set Score.repeatCommands = #'((volta "2.–3.") end-repeat) % That's an ndash in there...
+			s2. |   % 31
+			\set Score.repeatCommands = #'((volta #f))
 		}
 	}
 
-	r2. \bar "||"   % 32
+	s2. \bar "||"   % 32
+
+	% Chorus
+
+	\mark \markup { \override #'(font-family . sans) { \box { B } } }
+	s2.*18 |   % 33-50
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { \musicglyph #"scripts.coda" \italic { to Coda } }
+	s2.*4 \bar ":|."   % 51-54
+
+%\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
+%\break % Meh
+\stopStaff s2. \startStaff
+\set Score.currentBarNumber = #55
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
+
+	% Coda
+
+	s2.*2 \bar "||"   % 55-56
+
+	\mark \markup { \override #'(font-family . sans) { \box { C } } }
+	s2.*27 \bar "|."   % 57-83
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	s2.*8 |   % 1-8
+
+	% Verse
+
+	<e \hn c>4. <e \hn c>8 <e \hn c>4 |   % 9
+	<f \hn d>4. <e \hn c>8 <d \hn b>4 |   % 10
+	<e \hn c>2. |   % 11
+	<c \hn g>2. |   % 12
+	<g' \hn e \hn b>4 <g \hn e \hn b> <g \hn e \hn b> |   % 13
+	<a \hn f \hn c>4 <g \hn e \hn c> <f \hn d \hn a>8 ( <g \hn c,> ) |   % 14
+	<g \hn d \hn c>2. ~ |   % 15
+	<g \hn d \hn b>2. |   % 16
+	<c \hn a \hn e>4 <c \hn a \hn e> <c \hn a \hn e>8 <c \hn a \hn e> ~ |   % 17
+	<c \hn a \hn e>4 <b \hn g \hn d> <a \hn e \hn b> |   % 18
+	<a \hn f \hn c>2. |   % 19
+	<c, \hn a>2 r4 |   % 20
+	<e \hn c>4 <f \hn d> <g \hn d> |   % 21
+	<b, \hn g>2 <c \hn a>4 |   % 22
+	<c \hn a>2. |   % 23
+	<< { \voiceOne a'4 ( b ) c } \context Voice = "v2" { \voiceTwo <\hn f, \hn c>2 <\hn f \hn a,>4 } \oneVoice >> |   % 24
+	<g \hn e \hn c>4 <f \hn d \hn c> <e \hn c \hn g> |   % 25
+	<e \hn b \hn g>2 <d \hn b>4 |   % 26
+
+	c2. |   % 27
+	s2. |   % 28
+	s2. |   % 29
+	s2. |   % 30
+
+	c2. |   % 31
+
+	r2. |   % 32
 
 	% Chorus
 
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
 	<c' \hn a \hn e>4 <c \hn a \hn e> <c \hn a \hn e>8 <c \hn a \hn e> ~ |   % 33
 	<c \hn a \hn e>4 <b \hn g \hn d> <a \hn e \hn c> |   % 34
 	<a \hn f \hn c>2. ( |   % 35
@@ -118,26 +148,19 @@ LeadVox = \relative c'
 	<< { \voiceOne a'4 ( b ) c } \context Voice = "v2" { \voiceTwo <\hn f, \hn c>2 <\hn f \hn a,>4 } \oneVoice >> |   % 48
 	<g \hn e \hn c>4 <f \hn d> <e \hn c> |   % 49
 	<e \hn b>4 <d \hn b>2 |   % 50
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \musicglyph #"scripts.coda" \italic { to Coda } }
+
 	c2. |   % 51
 	s2. |   % 52
 	s2. |   % 53
-	s2. \bar ":|"   % 54
+	s2. |   % 54
 
-%\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-%\break % Meh
-\stopStaff s2. \startStaff
-\set Score.currentBarNumber = #55
+s2.
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
 	% Coda
 
 	c2. ~ |   % 55
-	c2. \bar "||"   % 56
+	c2. |   % 56
 
-\mark \markup { \override #'(font-family . sans) { \box { C } } }
 	<c' \hn a \hn e>4 <c \hn a \hn e> <c \hn a \hn e>8 <c \hn a \hn e> ~ |   % 57
 	<c \hn a \hn e>4 <b \hn g \hn d> <a \hn e \hn c> |   % 58
 	<a \hn f \hn c>2. ( |   % 59
@@ -165,9 +188,10 @@ LeadVox = \relative c'
 	s2. |   % 80
 	s2. |   % 81
 	s2. |   % 82
-	s2. \bar "|."   % 83
+	s2. |   % 83
 }
 
+
 LeadVoxText = \lyricmode
 {
 	Won -- der -- ful, mer -- ci -- ful sav -- ior,
@@ -219,12 +243,6 @@ LeadVoxTextC = \lyricmode
 
 Riffs = \relative c''
 {
-	\clef G
-	\key c \major
-	\override Staff.TimeSignature #'style = #'()
-	\time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	\tiny
@@ -269,12 +287,8 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	s2. |   % 1
@@ -284,45 +298,37 @@ Chords = \chordmode
 	c2. |   % 5
 	d2.:m/c |   % 6
 	c2. |   % 7
-	d2.:m/c \bar "||:"   % 8
-
-	\repeat volta 2
-	{
-		% Verse
-
-		c2. |   % 9
-		d2.:m/c |   % 10
-		c2. |   % 11
-		s2. |   % 12
-		e2.:m |   % 13
-		f2. |   % 14
-		g2.:sus4 |   % 15
-		g2. |   % 16
-		a2.:m |   % 17
-		s2. |   % 18
-		f2. |   % 19
-		s2. |   % 20
-		c2. |   % 21
-		g2. |   % 22
-		a2.:m |   % 23
-		f2. |   % 24
-		c2./g |   % 25
-		g2.:6 |   % 26
-	}
-	\alternative
-	{
-		{
-			c2. |   % 27
-			d2.:m/c |   % 28
-			c2. |   % 29
-			d2.:m/c |   % 30
-		}
-		{
-			c2. |   % 31
-		}
-	}
-
-	c2./b \bar "||"   % 32
+	d2.:m/c |   % 8
+
+	% Verse
+
+	c2. |   % 9
+	d2.:m/c |   % 10
+	c2. |   % 11
+	s2. |   % 12
+	e2.:m |   % 13
+	f2. |   % 14
+	g2.:sus4 |   % 15
+	g2. |   % 16
+	a2.:m |   % 17
+	s2. |   % 18
+	f2. |   % 19
+	s2. |   % 20
+	c2. |   % 21
+	g2. |   % 22
+	a2.:m |   % 23
+	f2. |   % 24
+	c2./g |   % 25
+	g2.:6 |   % 26
+
+	c2. |   % 27
+	d2.:m/c |   % 28
+	c2. |   % 29
+	d2.:m/c |   % 30
+
+	c2. |   % 31
+
+	c2./b |   % 32
 
 	% Chorus
 
@@ -388,17 +394,11 @@ s2.
 %
 % 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.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
-	\time 3/4
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -409,45 +409,37 @@ StaffC = \relative c
 	c4 c c |   % 5
 	c4 c c |   % 6
 	c4 c c |   % 7
-	c4 c c \bar "||:"   % 8
-
-	\repeat volta 2
-	{
-		% Verse
-
-		c4 c c |   % 9
-		c4 c c |   % 10
-		c4 c c |   % 11
-		c4 c c |   % 12
-		c4 c c |   % 13
-		c4 c c |   % 14
-		c4 c c |   % 15
-		c4 c c |   % 16
-		c4 c c |   % 17
-		c4 c c |   % 18
-		c4 c c |   % 19
-		c4 c c |   % 20
-		c4 c c |   % 21
-		c4 c c |   % 22
-		c4 c c |   % 23
-		c4 c c |   % 24
-		c4 c c |   % 25
-		c4 c c |   % 26
-	}
-	\alternative
-	{
-		{
-			c4 c c |   % 27
-			c4 c c |   % 28
-			c4 c c |   % 29
-			c4 c c |   % 30
-		}
-		{
-			c4 c c |   % 31
-		}
-	}
-
-	c4 c c \bar "||"   % 32
+	c4 c c |   % 8
+
+	% Verse
+
+	c4 c c |   % 9
+	c4 c c |   % 10
+	c4 c c |   % 11
+	c4 c c |   % 12
+	c4 c c |   % 13
+	c4 c c |   % 14
+	c4 c c |   % 15
+	c4 c c |   % 16
+	c4 c c |   % 17
+	c4 c c |   % 18
+	c4 c c |   % 19
+	c4 c c |   % 20
+	c4 c c |   % 21
+	c4 c c |   % 22
+	c4 c c |   % 23
+	c4 c c |   % 24
+	c4 c c |   % 25
+	c4 c c |   % 26
+
+	c4 c c |   % 27
+	c4 c c |   % 28
+	c4 c c |   % 29
+	c4 c c |   % 30
+
+	c4 c c |   % 31
+
+	c4 c c |   % 32
 
 	% Chorus
 
@@ -472,19 +464,15 @@ StaffC = \relative c
 	c4 c c |   % 51
 	c4 c c |   % 52
 	c4 c c |   % 53
-	c4 c c \bar ":|"   % 54
+	c4 c c |   % 54
 
 %\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
 \stopStaff s2. \startStaff
-\set Score.currentBarNumber = #55
-
-%\once \override Score.RehearsalMark #'self-alignment-X = #left
-%\mark \markup { { \musicglyph #"scripts.coda" } "Coda" }
 
 	% Coda
 
 	c4 c c |   % 55
-	c4 c c \bar "||"   % 56
+	c4 c c |   % 56
 
 	c4-> r2 |   % 57
 	r2. |   % 58
@@ -512,7 +500,7 @@ StaffC = \relative c
 	c4 c c |   % 80
 	c4 c c |   % 81
 	c4 c c |   % 82
-	c2.-\fermata \bar "|."   % 83
+	c2.-\fermata |   % 83
 }
 
 
@@ -534,18 +522,21 @@ Dynamics =
 \score
 {
 	<<
+		\Global		% The "roadmap" that everything else depends on
+
+		\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" \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
 		>>
 
-		\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
@@ -556,11 +547,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
@@ -571,6 +562,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)
 }
+