X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=child-of-love.ly;h=c9b26b56f39c73d810f86166b65d40fbb80e1217;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=73294509e8f7eb7ba96c4598088a9f757fa3c75a;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/child-of-love.ly b/child-of-love.ly
index 7329450..c9b26b5 100644
--- a/child-of-love.ly
+++ b/child-of-love.ly
@@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
 	\key b \minor
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 2/2
 
 	% Intro
@@ -85,11 +85,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
 
@@ -205,8 +201,6 @@ LeadVoxTextB = \lyricmode
 Riffs = \relative c'
 {
 	\clef G
-%Hm. Needed anymore?
-%	\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
@@ -239,9 +233,6 @@ Riffs = \relative c'
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	b2:m b:m/a |   % 1
@@ -341,10 +332,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
 
@@ -452,7 +442,16 @@ 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 Lyrics \lyricsto "lead" \LeadVoxTextB
+		>>
+
+		\new ChoirStaff
 		<<
 			\new ChordNames \Chords
 %Capo 4 edition
@@ -460,14 +459,6 @@ Dynamics =
 			\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
-			\new Lyrics \lyricsto "lead" \LeadVoxTextB
-		>>
 	>>
 }
 
@@ -475,10 +466,10 @@ 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
@@ -489,6 +480,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)
 }
+