X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=he-leadeth-me.ly;h=9b45bbdb67c7cbcd1537f53d67b25b27e9fcd431;hb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;hp=cab6f86a0797742bfccde9f9fab4a29f52c166de;hpb=33e1021fd4e2f073ee59dc977ce3b51de041c42e;p=music

diff --git a/he-leadeth-me.ly b/he-leadeth-me.ly
index cab6f86..9b45bbd 100644
--- a/he-leadeth-me.ly
+++ b/he-leadeth-me.ly
@@ -270,7 +270,7 @@ Riffs = \relative c''
 	e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ |   % 54
 	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ |   % 55
 	e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ |   % 56
-	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 cs8. ~ |   % 57
+	d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 cs8. |   % 57
 	<d a fs d>1^\fermata |   % 59
 \normalsize
 }
@@ -496,29 +496,23 @@ Dynamics =
 \score
 {
 	<<
+		\context Staff
 		<<
-%			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-			\new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
+			\new Voice = "lead" \LeadVox
+			\new Voice \Riffs
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
@@ -530,5 +524,13 @@ Dynamics =
     "Luxi Mono"
     (/ staffSize 20)))
 
-%  top-margin = -0.25 \in
+% 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
 }