X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=we-will-glorify.ly;h=eb519656423723bb2936280a9fe6d32cbf4a5b42;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=3bda98a0544a5573589bfb6fa5f6ed8fd418185e;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/we-will-glorify.ly b/we-will-glorify.ly
index 3bda98a..eb51965 100644
--- a/we-will-glorify.ly
+++ b/we-will-glorify.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 = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,8 +12,6 @@ staffSize = #20
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "We Will Glorify" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Twila Paris" }
 	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -35,19 +33,14 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key d \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 3/4
 
 	% Intro
 
 	\partial 4*1 s4 |   % 0
-%	\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
 
-	\repeat volta 3
+	\repeat volta 4
 	{
 		% Verse
 
@@ -61,7 +54,7 @@ Global =
 			s2. |   % 8
 		}
 		{
-			s2. |   % 9
+			s2. \bar "||"   % 9
 		}
 	}
 
@@ -83,9 +76,6 @@ Global =
 %
 LeadVox = \relative c''
 {
-	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Intro
 
 	s4 |   % 0
@@ -126,6 +116,7 @@ LeadVox = \relative c''
 	e2.-\fermata |   % 24
 }
 
+
 LeadVoxText = \lyricmode
 {
 	glor -- i -- fy the King of Kings,
@@ -160,7 +151,6 @@ LeadVoxTextB = \lyricmode
 %
 Riffs = \relative c'
 {
-
 	% Intro
 
 	\tiny
@@ -180,9 +170,6 @@ Riffs = \relative c'
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	d4/fs |   % 0
@@ -227,14 +214,11 @@ 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...
-
 Rhythm =
 {
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -300,7 +284,7 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
@@ -328,7 +312,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -341,6 +325,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)
 }
+