X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=blessed-be-your-name.ly;h=6fbc4680f1137fb2b0efb1d12c72bc6903f689f6;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=d913ea1d95066431c02530f300ea84ca1b01f052;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/blessed-be-your-name.ly b/blessed-be-your-name.ly
index d913ea1..6fbc468 100644
--- a/blessed-be-your-name.ly
+++ b/blessed-be-your-name.ly
@@ -24,23 +24,17 @@ staffSize = #18
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Lead vox"
 	\clef G
 	\key b \major
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
 	% Intro
 
-	r1 |   % 1
-	r1 |   % 2
-	r1 |   % 3
-	r1 |   % 4
+	R1*4 |   % 1-4
 
 	\repeat volta 3
 	{
@@ -225,12 +219,8 @@ LeadVoxTextB = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	% Intro
 
 	b1 |   % 1
@@ -359,10 +349,9 @@ Cross = { \override NoteHead #'style = #'cross }
 
 StaffC = \relative c
 {
-%	\set Voice.autoBeaming = ##f
-%	\set Staff.instrument = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
+	\teeny
 %	\override NoteHead #'style = #'slash
 
 	% Intro
@@ -504,40 +493,43 @@ Dynamics =
 \score
 {
 	<<
+		\context Staff
 		<<
-			\new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+			\new Voice = "lead" \LeadVox
 %			\new Staff = leadStaff { \new Voice = "lead" \transpose b a \LeadVox }
 			\new Lyrics \lyricsto "lead" \LeadVoxText
 			\new Lyrics \lyricsto "lead" \LeadVoxTextB
 		>>
 
-		\new ChoirStaff = "Rhythm"
+		\new ChoirStaff
 		<<
-			\new ChordNames = "chords" \Chords
-%			\new ChordNames = "chords" \transpose b a \Chords
-			\new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+			\new ChordNames \Chords
+%			\new ChordNames \transpose b a \Chords
+			\new RhythmicStaff << \StaffC \Dynamics >>
 		>>
 
 		\set Score.skipBars = ##t
 		\set Score.melismaBusyProperties = #'()
 	>>
-
-	\layout
-	{
-%		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-		ragged-last = ##t
-	}
 }
 
 
 \paper
 {
   #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "JazzText"
-    "Luxi Mono"
-    (/ staffSize 20)))
-
-%  top-margin = -0.25 \in
+	"Times New Roman"
+	"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
 }
+