X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=blessed-assurance.ly;h=35506df61a58f9b3618cc539a6a3036667f7a9fe;hb=HEAD;hp=0054755c09f4ad41096440abc63807d99fe51c64;hpb=cdf57606f385bc4493fed4e3860bce0ce657dc40;p=music

diff --git a/blessed-assurance.ly b/blessed-assurance.ly
index 0054755..35506df 100644
--- a/blessed-assurance.ly
+++ b/blessed-assurance.ly
@@ -32,14 +32,11 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key c \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
@@ -409,11 +406,10 @@ Chords = \chordmode
 
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -587,35 +583,23 @@ Dynamics =
 	s4_\markup { \hspace #0.0 \raise #-2.0 \italic { orig. half-time groove } } s2. |   % 81
 	s1*2 |   % 82-83
 	s2 s4_\markup { \hspace #0.0 \raise #-2.0 \italic { last X rit. } } s |   % 84
-
-%{
-	s4_\mf s2. |   % 1
-	s1*22 |   % 2-23
-	s4 s \> |   % 24
-	s4 \! s2. |   % 25
-	s1*2 |   % 26-27
-	s4 \< s s \! s |   % 28
-	s1*4 |   % 29-32
-	s4 \< s s \! s |   % 33
-	s1*23 |   % 34-56
-	s2 s2_\markup { \italic { rit. } }  |   % 57
-%}
 }
 
 
 \score
 {
 	<<
+		\context Staff
 		<<
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox >> }
+			\new Voice = "lead" \LeadVox
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
 		\new ChoirStaff = "Rhythm"
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
@@ -628,7 +612,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
 
@@ -641,6 +625,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)
 }
+