X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=worthy-of-my-praise.ly;h=42478e54ffd15ed51b4b00e15c0dad7e5daa1d9a;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=f40b13f168cc6e68012affc7984ca3bc6d2c7f6f;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/worthy-of-my-praise.ly b/worthy-of-my-praise.ly
index f40b13f..42478e5 100644
--- a/worthy-of-my-praise.ly
+++ b/worthy-of-my-praise.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)
@@ -10,8 +10,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 "Worthy Of My Praise" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "David Ruis" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -20,65 +18,38 @@ staffSize = #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
 
 	\repeat volta 2
 	{
-		R1 |   % 1
-		R1 |   % 2
-		R1 |   % 3
-		R1 |   % 4
+		s1*4 |   % 1-4
 	}
 
 	% Verse
 
 	\repeat volta 2
 	{
-\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" }
+		\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" }
 
-		f4. c8 c4 f ~ |   % 5
-<<
-{ \voiceOne
-		f2.. f8 |   % 6
-		f8 f4 g8 ~ g ef ~ ef4 ~ |   % 7
-		ef1 |   % 8
-		bf'4. f8 f4 bf ~ |   % 9
-		bf2. \tiny bf8 \normalsize bf\noBeam |   % 10
-		bf8 a4 g8 f2  |   % 11
-}
-\context Voice = v { \voiceTwo
-\tiny
-		f4. c8 c4 f ~ |   % 6
-		f2.. f8 |   % 7
-		f8 f4 g8 ~ g ef ~ ef4 ~ |   % 8
-		ef1 |   % 9
-		bf'4. f8 f4 bf ~ |   % 10
-		bf2. r8 bf |   % 11
-}
->>
-\oneVoice
+		s1*7 |   % 5-11
 	}
 	\alternative
 	{
 		{
-			\context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } |   % 12
+			s1 |   % 12
 		}
 		{
-			\context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } |   % 13
+			s1 |   % 13
 		}
 	}
 
@@ -86,35 +57,93 @@ LeadVox = \relative c'
 
 	\repeat volta 3
 	{
-\mark \markup { \override #'(font-family . sans) { \box { B } } }
-
-		r4 c'8. c16 c4. c8 |   % 14
-		c4. bf8 a ( g ) g4 |   % 15
-		r4 bf8. bf16 bf4. bf8 |   % 16
-		bf4 a g8 ( f e f ) |   % 17
-		r4 c'8. c16 c4. c8 |   % 18
-		c4. bf8 a ( g ) g4 |   % 19
-		r4 bf8. bf16 bf4. bf8 |   % 20
+		\mark \markup { \override #'(font-family . sans) { \box { B } } }
+		s1*7 |   % 14-20
 	}
 	\alternative
 	{
 		{
-			bf4 a g8 ( f ) e ( f ) |   % 21
-			f2 r |   % 22
-			R1^\markup { \bold D.S. } \bar "||"   % 23
+			s1*2 |   % 21-22
+			s1^\markup { \bold D.S. } \bar "||"   % 23
 		}
 		{
-			bf4 a g8 ( f ) e f |   % 24
+			s1 |   % 24
 		}
 		{
-			bf4 a g8 ( f ) e f \bar "||"   % 25
+			s1 \bar "||"   % 25
 		}
 	}
 
 	% Outro
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { C } } \small \italic { a capella } }
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { \override #'(font-family . sans) { \box { C } } \small \italic { a capella } }
+
+	s1*7 |   % 26-32
+
+	\once \override Score.RehearsalMark #'self-alignment-X = #left
+	\mark \markup { \small \italic { tutti } }
+
+	s1*2 \bar "|."   % 33-34
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+	% Intro
+
+	R1*4 |   % 1-4
+
+	% Verse
+
+	f4. c8 c4 f ~ |   % 5
+<<
+{ \voiceOne
+	f2.. f8 |   % 6
+	f8 f4 g8 ~ g ef ~ ef4 ~ |   % 7
+	ef1 |   % 8
+	bf'4. f8 f4 bf ~ |   % 9
+	bf2. \tiny bf8 \normalsize bf\noBeam |   % 10
+	bf8 a4 g8 f2  |   % 11
+}
+\context Voice = v { \voiceTwo
+\tiny
+	f4. c8 c4 f ~ |   % 6
+	f2.. f8 |   % 7
+	f8 f4 g8 ~ g ef ~ ef4 ~ |   % 8
+	ef1 |   % 9
+	bf'4. f8 f4 bf ~ |   % 10
+	bf2. r8 bf |   % 11
+}
+>>
+\oneVoice
+
+	\context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } |   % 12
+
+	\context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } |   % 13
+
+	% Chorus
+
+	r4 c'8. c16 c4. c8 |   % 14
+	c4. bf8 a ( g ) g4 |   % 15
+	r4 bf8. bf16 bf4. bf8 |   % 16
+	bf4 a g8 ( f e f ) |   % 17
+	r4 c'8. c16 c4. c8 |   % 18
+	c4. bf8 a ( g ) g4 |   % 19
+	r4 bf8. bf16 bf4. bf8 |   % 20
+
+	bf4 a g8 ( f ) e ( f ) |   % 21
+	f2 r |   % 22
+	R1 |   % 23
+
+	bf4 a g8 ( f ) e f |   % 24
+
+	bf4 a g8 ( f ) e f |   % 25
+
+	% Outro
 
 	r4 c'8. c16 c4. c8 |   % 26
 	c4. bf8 a ( g ) g4 |   % 27
@@ -124,13 +153,11 @@ LeadVox = \relative c'
 	c4. bf8 a ( g ) g4 |   % 31
 	r4 bf8. bf16 bf4. bf8 |   % 32
 
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \small \italic { tutti } }
-
 	bf4 a g8 ( f ) e ( f ) |   % 33
-	f1^\fermata \bar "|."   % 34
+	f1^\fermata |   % 34
 }
 
+
 LeadVoxText = \lyricmode
 {
 	I will wor -- ship _
@@ -208,70 +235,46 @@ LeadVoxTextD = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
-	\repeat volta 2
-	{
-		f1:sus2 |   % 1
-		s1 |   % 2
-		ef1:sus2 |   % 3
-		s1 |   % 4
-	}
+	f1:sus2 |   % 1
+	s1 |   % 2
+	ef1:sus2 |   % 3
+	s1 |   % 4
 
 	% Verse
 
-	\repeat volta 2
-	{
-		f1:sus2 |   % 5
-		s1 |   % 6
-		ef1:sus2 |   % 7
-		s1 |   % 8
-		bf1 |   % 9
-		s1 |   % 10
-		f1 |   % 11
-	}
-	\alternative
-	{
-		{
-			g2:m7 bf4/c c |   % 12
-		}
-		{
-			g2:m7 bf4/c c |   % 13
-		}
-	}
+	f1:sus2 |   % 5
+	s1 |   % 6
+	ef1:sus2 |   % 7
+	s1 |   % 8
+	bf1 |   % 9
+	s1 |   % 10
+	f1 |   % 11
+
+	g2:m7 bf4/c c |   % 12
+
+	g2:m7 bf4/c c |   % 13
 
 	% Chorus
 
-	\repeat volta 3
-	{
-		f1 |   % 14
-		c1/e |   % 15
-		bf1/d |   % 16
-		g4:m7 f/a bf:6 c |   % 17
-		f1 |   % 18
-		c1/e |   % 19
-		g1:m7 |   % 20
-	}
-	\alternative
-	{
-		{
-			g4:m7 f/a bf:6 c |   % 21
-			f1 |   % 22
-			bf1/c |   % 23
-		}
-		{
-			g4:m7 f/a bf:6 c |   % 24
-		}
-		{
-			g4:m7 f/a bf:6 c |   % 25
-		}
-	}
+	f1 |   % 14
+	c1/e |   % 15
+	bf1/d |   % 16
+	g4:m7 f/a bf:6 c |   % 17
+	f1 |   % 18
+	c1/e |   % 19
+	g1:m7 |   % 20
+
+	g4:m7 f/a bf:6 c |   % 21
+	f1 |   % 22
+	bf1/c |   % 23
+
+	g4:m7 f/a bf:6 c |   % 24
+
+	g4:m7 f/a bf:6 c |   % 25
 
 	% Outro
 
@@ -290,76 +293,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
 
-	\repeat volta 2
-	{
-		c1 ~ |   % 1
-		c1 |   % 2
-		c1 ~ |   % 3
-		c1 |   % 4
-	}
+	c1 ~ |   % 1
+	c1 |   % 2
+	c1 ~ |   % 3
+	c1 |   % 4
 
 	% Verse
 
-	\repeat volta 2
-	{
-		c1 ~ |   % 5
-		c1 |   % 6
-		c1 ~ |   % 7
-		c1 |   % 8
-		c1 ~ |   % 9
-		c1 |   % 10
-		c1 |   % 11
-	}
-	\alternative
-	{
-		{
-			c2 c4 c |   % 12
-		}
-		{
-			c4 c c c |   % 13
-		}
-	}
+	c1 ~ |   % 5
+	c1 |   % 6
+	c1 ~ |   % 7
+	c1 |   % 8
+	c1 ~ |   % 9
+	c1 |   % 10
+	c1 |   % 11
+
+	c2 c4 c |   % 12
+
+	c4 c c c |   % 13
 
 	% Chorus
 
-	\repeat volta 3
-	{
-		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
-	}
-	\alternative
-	{
-		{
-			c4 c c c |   % 21
-			c4 c c c |   % 22
-			c1 \bar "||"   % 23
-		}
-		{
-			c4 c c c |   % 24
-		}
-		{
-			c4 c c c \bar "||"   % 25
-		}
-	}
+	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
+	c1 |   % 23
+
+	c4 c c c |   % 24
+
+	c4 c c c |   % 25
 
 	% Outro
 
@@ -371,25 +348,28 @@ StaffC = \relative c
 	c1 |   % 31
 	c1 |   % 32
 	c4_\markup { \italic { rit. } } c c c |   % 33
-	c1^\fermata \bar "|."   % 34
+	c1^\fermata |   % 34
 }
 
 
 \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 Lyrics \lyricsto "lead" \LeadVoxTextC
 			\new Lyrics \lyricsto "lead" \LeadVoxTextD
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff \StaffC
 		>>
 
 		\set Score.skipBars = ##t
@@ -400,21 +380,20 @@ StaffC = \relative c
 
 \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
 % Don't spread staves vertically across the page (default: f)
 %	ragged-bottom = ##t
 % Allow partial line for last stave (default: f)
-	ragged-last = ##t
+%	ragged-last = ##t
 
 % 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)
 }
+