X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=come-just-as-you-are.ly;h=d56b9ffe1935043c6a9fe56f2e58a1fedcc9cb33;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=958c32905d7082da3180035d3b253a06ca0ac8eb;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/come-just-as-you-are.ly b/come-just-as-you-are.ly
index 958c329..d56b9ff 100644
--- a/come-just-as-you-are.ly
+++ b/come-just-as-you-are.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
-
-%}
 }
 
 
@@ -143,13 +133,10 @@ Global =
 LeadVox = \relative c'
 {
 	\clef G
-	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	r1 |   % 1
-	r1 |   % 2
-	r1 |   % 3
+	R1*3 |   % 1-3
 	r2 r4 r8 e |   % 4
 
 	% Verse
@@ -333,9 +320,6 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	e1:sus2 |   % 1
@@ -440,8 +424,9 @@ Chords = \chordmode
 
 Rhythm =
 {
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -560,7 +545,7 @@ Dynamics =
 \score
 {
 	<<
-		\Global						% The "roadmap" that everything else depends on
+		\Global		% The "roadmap" that everything else depends on
 
 		\context Staff
 		<<
@@ -569,7 +554,6 @@ Dynamics =
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 			\new Lyrics \lyricsto "v2" \LeadVoxEcho
-%			\new Lyrics \lyricsto "v2" \LeadVoxEcho
 		>>
 
 		\new ChoirStaff
@@ -590,7 +574,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"JazzText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -603,6 +587,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)
 }
+