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

[music] / come-thou-fount-of-every-blessing.ly

diff --git a/come-thou-fount-of-every-blessing.ly b/come-thou-fount-of-every-blessing.ly
index 771b0538d402c08c20c4d795233314dad712dbdc..f4a20a67ef7fa93fd06df4206e0556b6a4e61b28 100644 (file)
--- a/come-thou-fount-of-every-blessing.ly
+++ b/come-thou-fount-of-every-blessing.ly
@@ -12,8 +12,6 @@ staffSize = #24
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
        title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Come Thou Fount Of Every Blessing" }
 %      composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
        arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" }
@@ -24,16 +22,12 @@ staffSize = #24
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Lead vox"
        \clef G
        \key d \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
        % Intro
 
@@ -121,12 +115,6 @@ LeadVoxTextC = \lyricmode
 
 Riffs = \relative c'
 {
-       \clef G
-       \key d \major
-       \override Staff.TimeSignature #'style = #'()
-       \time 3/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
        % Intro
 
        \partial 4*1 \tiny fs8 e |   % partial
@@ -156,54 +144,14 @@ Riffs = \relative c'
        b4 a fs8 e |   % 24
        d2.^\fermata |   % 25
        \normalsize
-
-%{
-       \tiny
-       \repeat "percent" 3   % 1 - 6
-       {
-               << { \tiny f16 c f, <f' f,> ~ <f f,> f, c' f f8 e } \\ { \tiny f,,2 c'4 } >> |   % 1
-               << { \tiny f'16 c f, <f' f,> ~ <f f,> f, c' f f8 e } \\ { \tiny bf,2 c4 } >> |   % 2
-       }
-       << s2. \\ { \tiny d2 c4 } >> |   % 7
-       << s2. \\ { \tiny bf2. } >> |   % 8
-
-       s2.*7
-
-       \voiceOne
-       \repeat "percent" 6 { f''16 c f, <f' f,> ~ <f f,> f, c' f f8 e | }   % 16-21
-       \oneVoice
-
-       s2.*7
-
-       \voiceOne
-       \repeat "percent" 2 { f16 c f, f' ~ f f, c' f f8 e | }   % 29-30
-       \oneVoice
-
-       \key g \major
-
-       \voiceOne
-       \repeat "percent" 2 { g16 d g, g' ~ g g, d' g g8 fs | }   % 31-32
-       \oneVoice
-
-       s2.*7
-
-       \voiceOne
-       \repeat "percent" 4 { g16 d g, g' ~ g g, d' g g8 fs | }   % 40-43
-       \oneVoice
-       \normalsize
-%}
 }
 
 
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        % Intro
 
        s4 |   % pickup
@@ -261,11 +209,10 @@ Chords = \chordmode
 
 StaffC = \relative c
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 3/4
        \override NoteHead #'style = #'slash
+       \teeny
 
        % Intro
 
@@ -333,30 +280,24 @@ 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" \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                        \new Lyrics \lyricsto "lead" \LeadVoxTextC
                >>
 
-               \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
-       }
 }
 
 
@@ -368,5 +309,14 @@ 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
 }
+