X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=there%27s-a-sweet-sweet-spirit.ly;h=b5db2f2dd57e3717fdbc00639f36a99daca77e66;hb=c7291ba4fa2a8851839b23562a8d0db92d594e25;hp=8742413c3e4b58cc3a0cc2960055951f6a0a0a31;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/there's-a-sweet-sweet-spirit.ly b/there's-a-sweet-sweet-spirit.ly
index 8742413..b5db2f2 100644
--- a/there's-a-sweet-sweet-spirit.ly
+++ b/there's-a-sweet-sweet-spirit.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 = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,8 +12,6 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
 	title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "There’s A Sweet, Sweet Spirit" }
 	composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Doris Akers" }
 %	arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
@@ -35,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key g \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -77,9 +75,6 @@ s2 s^\markup { \fret-diagram-terse #"x;2;3;2;3;x;" }
 %
 LeadVox = \relative c'
 {
-	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
 	% Lead in
 
 	r2 b4 c |   % 1
@@ -212,9 +207,6 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Lead in
 
 	s1 |   % 1
@@ -265,14 +257,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
 
 	% Lead in
 
@@ -336,11 +325,12 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
-			\context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >>
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "lead" \LeadVoxTextC
@@ -364,7 +354,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"LilyJAZZText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -377,6 +367,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)
 }
+