X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=better-is-one-day.ly;h=15a68dea4ec2c355bbb86481947b177dd4e6312f;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=6645e16569585b9e37ff52ae149ae30113b5428d;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/better-is-one-day.ly b/better-is-one-day.ly
index 6645e16..15a68de 100644
--- a/better-is-one-day.ly
+++ b/better-is-one-day.ly
@@ -35,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key e \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -124,16 +124,6 @@ Global =
 	\mark \markup { \override #'(font-family . sans) { \box { F } } }
 
 	s1*7 \bar "|."   % 60-66
-
-%{
-
-%	\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
-
-%}
 }
 
 
@@ -147,9 +137,7 @@ LeadVox = \relative c'
 
 	% Intro
 
-	r1 |   % 1
-	r1 |   % 2
-	r1 |   % 3
+	R1*3 |   % 1-3
 	r2 r4 r8 e |   % 4
 
 	% Verse
@@ -336,9 +324,6 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	e1:sus2 |   % 1
@@ -443,8 +428,9 @@ Chords = \chordmode
 
 Rhythm =
 {
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -564,7 +550,7 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
@@ -598,7 +584,7 @@ Dynamics =
 		(/ staffSize 20)))
 
 % Don't spread staves vertically across last page (default: t)
-	ragged-last-bottom = ##f
+%	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)
@@ -607,3 +593,4 @@ Dynamics =
 % To find out what's eating the space at the top...
 %	annotate-spacing = ##t
 }
+