X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=come-and-see.ly;h=06a2f3c71a61dabd8f1d9a0e5bdc3c97f8fb4d41;hb=HEAD;hp=44166bde7e8c7b272770529e3e79958876e00181;hpb=7add1480813db617ee22ba3276c5b61649445f50;p=music

diff --git a/come-and-see.ly b/come-and-see.ly
index 44166bd..06a2f3c 100644
--- a/come-and-see.ly
+++ b/come-and-see.ly
@@ -29,7 +29,7 @@ staffSize = #18
 Global =
 {
 	\key f \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -127,13 +127,9 @@ Global =
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -251,14 +247,12 @@ LeadVoxTextB = \lyricmode
 	Come and give _ _ thanks un -- to _ the Lord _
 	Come be -- hold __ _ the Lamb
 	Come and sing _ _ prais -- es of _ the __ _ King
-	Bow -- ing down _ be -- _ fore __ _ _ _
 }
 
 
 %
 % Riffs
 %
-
 Riffs = \relative c''
 {
 %{
@@ -277,7 +271,6 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
 	% Intro
@@ -360,15 +353,12 @@ s1
 %
 % Chord rhythms
 %
-
 Rhythm = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 	\override NoteHead #'style = #'slash
-\tiny
+	\teeny
 
 	% Intro
 
@@ -469,22 +459,22 @@ Dynamics =
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new ChoirStaff
+		\context Staff
 		<<
-			\new ChordNames \Chords
-%Capo 3 edition
-%			\new ChordNames \transpose f d \Chords
-			\new RhythmicStaff << \Rhythm \Dynamics >>
-		>>
-
-		\new Staff
-		<<
-			\Global						% The "roadmap" that everything else depends on
+			\Global		% The "roadmap" that everything else depends on
 			\new Voice = "lead" \LeadVox
 			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
+
+		\new ChoirStaff
+		<<
+			\new ChordNames \Chords
+%Capo 3 edition
+%			\new ChordNames \transpose f d \Chords
+			\new RhythmicStaff << \Rhythm \Dynamics >>
+		>>
 	>>
 }
 
@@ -493,7 +483,7 @@ Dynamics =
 {
 	#(define fonts (make-pango-font-tree
 		"Times New Roman"
-		"DomCasual BT"
+		"JazzText"
 		"Luxi Mono"
 		(/ staffSize 20)))
 
@@ -506,6 +496,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)
 }
+