X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=god-is-my-redeemer.ly;h=3ef7d828d71450d56efb08150530b189c498d6c6;hb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;hp=8bba74883ec24c64f4a15a8e046fb027d388b9b2;hpb=33e1021fd4e2f073ee59dc977ce3b51de041c42e;p=music

diff --git a/god-is-my-redeemer.ly b/god-is-my-redeemer.ly
index 8bba748..3ef7d82 100644
--- a/god-is-my-redeemer.ly
+++ b/god-is-my-redeemer.ly
@@ -200,7 +200,7 @@ StaffC = \relative c
 %	\set Voice.autoBeaming = ##f
 %	\set Staff.instrumentName = #"Rhythm"
 	\override Staff.TimeSignature #'style = #'()
-	\time 4/4 
+	\time 4/4
 	\override NoteHead #'style = #'slash
 
 	% Intro
@@ -264,29 +264,21 @@ StaffC = \relative c
 \score
 {
 	<<
-%		\new ChoirStaff = "Vox"
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" \StaffC
+			\new ChordNames \Chords
+			\new RhythmicStaff \StaffC
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-	\layout
-	{
-%		linewidth = 170.000 \mm
-%		textheight = 250.000 \mm
-%		papersize = "letter"
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
@@ -294,7 +286,17 @@ StaffC = \relative c
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
+
+% Don't spread staves vertically across last page (default: t)
+	ragged-last-bottom = ##f
+% Don't spread staves vertically across the page (default: f)
+%	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
 }