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

[music] / almighty.ly

diff --git a/almighty.ly b/almighty.ly
index c209d90e43612f0dcae5fe7263d8ed59b2b718d5..df6f4486df86be2634b28d5f831de851a2347157 100644 (file)
--- a/almighty.ly
+++ b/almighty.ly
@@ -12,8 +12,6 @@ staffSize = #20
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
        title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "Almighty" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Gary Oliver" }
        arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -24,18 +22,12 @@ staffSize = #20
 %
 % Lead vocal
 %
-
 LeadVox = \relative c''
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Lead vox"
        \clef G
        \key f \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
-%      \set Score.markFormatter = #format-mark-box-letters
 
        % Intro
 
@@ -126,6 +118,7 @@ LeadVox = \relative c''
        g1^\fermata^\markup { \italic { On cue } } \bar "|."
 }
 
+
 LeadVoxText = \lyricmode
 {
        Al -- migh -- _ ty, most ho -- _ ly God _
@@ -182,16 +175,14 @@ LeadVoxTextB = \lyricmode
 %
 % Instrumental lines
 %
-
 RhythmB = \relative c'
 {
        \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Rhythm"
        \clef G
        \key d \major
-       \time 4/4 
+       \time 4/4
 
-%This structure, BTW, is totally wrong (from a different song) 
+%This structure, BTW, is totally wrong (from a different song)
        % Intro
 
        r1 |
@@ -262,9 +253,6 @@ RhythmB = \relative c'
 
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        % Intro
 
        s1 \bar "||"
@@ -345,10 +333,10 @@ s1 |
 StaffC = \relative c
 {
        \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
-       \time 4/4 
+       \numericTimeSignature
+       \time 4/4
        \override NoteHead #'style = #'slash
+       \teeny
 
        % Intro
 
@@ -425,35 +413,42 @@ StaffC = \relative c
 \score
 {
        <<
-%              \new ChoirStaff = "Vox"
+               \context Staff
                <<
-                       \new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+                       \new Voice = "lead" \LeadVox
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                >>
 
-               \new ChoirStaff = "Rhythm"
+               \new ChoirStaff
                <<
 %                      \new Staff = "riff" \RhythmB
-                       \new ChordNames = "chords" \Chords
-                       \new RhythmicStaff = "chordRhythm" \StaffC
+                       \new ChordNames \Chords
+                       \new RhythmicStaff \StaffC
                >>
 
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
        >>
-       \layout {
-%              ragged-last-bottom = ##t
-               ragged-last = ##t
-       }
 }
 
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+       #(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
 }
+