X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=change-my-heart-o-god.ly;h=77619a338216c4706b7eb347f3d8967127e70674;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=8b39d0d19b74828a40298febcafc8179dc96f6c0;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/change-my-heart-o-god.ly b/change-my-heart-o-god.ly
index 8b39d0d..77619a3 100644
--- a/change-my-heart-o-god.ly
+++ b/change-my-heart-o-god.ly
@@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key c \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 
 	% Intro
@@ -47,7 +47,7 @@ Global =
 % Capo 4 version
 %	s1*0^\markup { \hspace #0.0 \raise #2.0 \larger \bold { "Moderate pop (*** CAPO 4 ***)" } }
 
-	s1*4 \bar "||:"   % 1-4
+	s1*4 \bar ".|:-||"   % 1-4
 
 	\repeat volta 2
 	{
@@ -66,11 +66,7 @@ Global =
 %
 LeadVox = \relative c'
 {
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
-	\override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -116,8 +112,6 @@ LeadVoxText = \lyricmode
 Riffs = \relative c'
 {
 	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -135,9 +129,6 @@ Riffs = \relative c'
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	s1 |   % 1
@@ -177,10 +168,9 @@ Chords = \chordmode
 %
 Rhythm = \relative c
 {
-%%	\set Voice.autoBeaming = ##f
-%%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	% Intro
 
@@ -234,21 +224,21 @@ Dynamics =
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 
-%		\new Staff
+		\context Staff
+		<<
+			\Global		% The "roadmap" that everything else depends on
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
+			\new Lyrics \lyricsto "lead" \LeadVoxText
+		>>
+
+		\new ChoirStaff
 		<<
 			\new ChordNames \Chords
 %Capo 4 edition
 %			\new ChordNames \transpose b g \Chords
 			\new RhythmicStaff << \Rhythm \Dynamics >>
 		>>
-
-		\new Staff
-		<<
-			\Global						% The "roadmap" that everything else depends on
-			\new Voice = "lead" \LeadVox
-			\new Voice \Riffs
-			\new Lyrics \lyricsto "lead" \LeadVoxText
-		>>
 	>>
 }
 
@@ -256,20 +246,18 @@ Dynamics =
 \paper
 {
   #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+	"Times New Roman"
+	"JazzText"
+	"Luxi Mono"
+	(/ staffSize 20)))
 
 % 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
+%	ragged-bottom = ##t
 % Allow partial line for last stave (default: f)
 	ragged-last = ##t
 
 % 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)
 }