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

[music] / go-tell-it-on-the-mountain.ly

diff --git a/go-tell-it-on-the-mountain.ly b/go-tell-it-on-the-mountain.ly
index 480004979220596776677d78d1be650e11533ffe..a88e98b5eb9fc02e82c4f0f2937e7dd72acfd205 100644 (file)
--- a/go-tell-it-on-the-mountain.ly
+++ b/go-tell-it-on-the-mountain.ly
@@ -12,8 +12,6 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
        title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Go Tell It On The Mountain" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" }
        arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart/Shamus & Deborah Hammons/J. & Kat Michaels/Chris Craig" }
@@ -33,16 +31,12 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 %
 % Lead vocal
 %
-
 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
 
        % Intro
 
@@ -116,8 +110,8 @@ LeadVox = \relative c''
 
        % Coda
 
-%\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
-\stopStaff s1 \startStaff
+\stopStaff s1 \bar "" \startStaff   % That removed the spurious floating bar line from line break
+%\stopStaff s1 \startStaff
 \set Score.currentBarNumber = #37
 
 \once \override Score.RehearsalMark #'self-alignment-X = #left
@@ -169,6 +163,7 @@ LeadVox = \relative c''
        r1-\fermata \bar ".|"   % 54
 }
 
+
 LeadVoxText = \lyricmode
 {
        Go tell it on the moun -- _ _ tain, _
@@ -230,10 +225,6 @@ LeadVoxTextC = \lyricmode
 Riffs = \relative c''
 {
        \clef G
-       \key g \major
-       \override Staff.TimeSignature #'style = #'()
-       \time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
        % Intro
 
@@ -278,12 +269,8 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        % Intro
 
        \repeat volta 2
@@ -389,17 +376,11 @@ s1
 %
 % 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.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
-       \time 4/4
+       \numericTimeSignature
        \override NoteHead #'style = #'slash
+       \teeny
 
        % Intro
 
@@ -523,40 +504,43 @@ 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
-       }
 }
 
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
-
-%  top-margin = -0.25 \in
+       #(define fonts (make-pango-font-tree
+               "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
 }
+