New charts "How Great Thou Art" and "In The Garden".

[music] / brethren-we-have-met-to-worship.ly

diff --git a/brethren-we-have-met-to-worship.ly b/brethren-we-have-met-to-worship.ly
old mode 100755 (executable)
new mode 100644 (file)
index cc14665..175f853
--- a/brethren-we-have-met-to-worship.ly
+++ b/brethren-we-have-met-to-worship.ly
@@ -28,11 +28,9 @@ staffSize = #20
 
 LeadVox = \relative c'
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Lead vox"
        \clef G
        \key g \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
@@ -82,9 +80,6 @@ LeadVoxText = \lyricmode
 
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        g1 |   % 1
        d2 g4 c |   % 2
 %{
@@ -128,11 +123,10 @@ g g c e           C       8
 
 StaffC = \relative c
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
        \override NoteHead #'style = #'slash
+       \teeny
 
        c4 c c c |   % 1
        c4 c c c |   % 2
@@ -174,40 +168,41 @@ 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 Lyrics \lyricsto "lead" \LeadVoxText
-%                      \new Lyrics \lyricsto "lead" \LeadVoxTextB
                >>
 
-               \new ChoirStaff = "Rhythm"
+               \new ChoirStaff
                <<
-                       \new ChordNames = "chords" \Chords
-%                      \new ChordNames = "chords2" \ChordsSup
-                       \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+                       \new ChordNames \Chords
+%                      \new ChordNames \ChordsSup
+                       \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"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
-
-%  top-margin = -0.25 \in
+       "Times New Roman"
+       "LilyJazz Text"
+       "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
 }
+