X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=give-thanks.ly;h=481d1e7828dba21b2a71b24cc0c7676e5b333f97;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=3d88cfd356a994e9cf4ffefb0fe6e750b265fa08;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music

diff --git a/give-thanks.ly b/give-thanks.ly
index 3d88cfd..481d1e7 100644
--- a/give-thanks.ly
+++ b/give-thanks.ly
@@ -22,7 +22,6 @@ staffSize = #18 % or 16
 %
 % Lead vocal
 %
-
 LeadVox = \relative c''
 {
 	\set Voice.autoBeaming = ##f
@@ -76,7 +75,7 @@ LeadVox = \relative c''
 		b4. e,8 fs4 g |   % 17
 		a2. g4 |   % 18
 		a2. d4 |   % 19
-	
+
 		d2. d8 [ d ] |   % 20
 		d4 g, a b |   % 21
 		c2. c8 [ c ] |   % 22
@@ -136,12 +135,8 @@ LeadVoxText = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%	\popChords
-
 	g1 |   % 1
 	d2:sus4 d |   % 2
 
@@ -189,17 +184,13 @@ Chords = \chordmode
 %
 % Chord rhythms
 %
-
-% Use a RhythmicStaff on the chords instead of this?
-% It almost works, but not quite. Doesn't collapse chords above to single notes...
-
 StaffC = \relative c
 {
 	\set Voice.autoBeaming = ##f
-%	\set Staff.instrumentName = #"Rhythm"
-	\override Staff.TimeSignature #'style = #'()
+	\numericTimeSignature
 	\time 4/4
 	\override NoteHead #'style = #'slash
+	\teeny
 
 	c4 c c c |   % 1
 	c4 c c c |   % 2
@@ -248,15 +239,16 @@ StaffC = \relative c
 \score
 {
 	<<
+		\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
@@ -266,8 +258,6 @@ StaffC = \relative c
 	\layout
 	{
 		\context { \Staff \RemoveEmptyStaves }
-%		ragged-last-bottom = ##t
-%		ragged-last = ##t
 	}
 }
 
@@ -276,7 +266,18 @@ 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
 }
+