Update to ensure charts work with latest version of Lilypond.

[music] / come-now-is-the-time-to-worship.ly

diff --git a/come-now-is-the-time-to-worship.ly b/come-now-is-the-time-to-worship.ly
index c690ab2a2b26704f8b6d3c06e0afd12356aab37c..da59250f41fe6725329f0d5d3f9c418c4e55e9f0 100644 (file)
--- a/come-now-is-the-time-to-worship.ly
+++ b/come-now-is-the-time-to-worship.ly
@@ -3,7 +3,7 @@
 \include "english.ly"
 
 % Good sizes are 16, 18, & 20
-staffSize = #20
+staffSize = #22
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
@@ -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 "Come, Now is the Time to Worship" }
 %      composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "M. Barnett" }
        arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key d \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
 %      \once \override TextScript #'padding = #2.0
@@ -47,7 +45,7 @@ Global =
 
        % Intro
 
-       s1*4 |   % 1-4
+       s1*4 \bar ".|:-||"   % 1-4
 
        % Verse
 
@@ -115,19 +113,12 @@ Global =
 %
 LeadVox = \relative c'
 {
-%      \set Staff.instrument = #"Lead vox"
        \clef G
-       \override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
        \set tupletSpannerDuration = #(ly:make-moment 1 4)
 
        % Intro
 
-       r1 |   % 1
-       r1 |   % 2
-       r1 |   % 3
-       r1 |   % 4
+       R1*4 |   % 1-4
 
        % Verse
 
@@ -240,7 +231,7 @@ LeadVoxText = \lyricmode
        Come.
 
        One day ev’ -- ry tongue will con -- fess _ you are God, _
-       One day ev’ -- ry knee will bow _ down, _
+       One day ev’ -- ry knee _ will bow _ _
        Still the great -- est trea -- sure re -- mains _ for those _
        who glad -- _ ly choose _ you now. _
 
@@ -251,7 +242,7 @@ LeadVoxText = \lyricmode
        Come,
 
        One day ev’ -- ry tongue will con -- fess _ you are God, _
-       One day ev’ -- ry knee will bow _ down, _
+       One day ev’ -- ry knee _ will bow _ _
        Still the great -- est trea -- sure re -- mains _ for those _
        who glad -- _ ly choose _ you now. _
 
@@ -267,9 +258,6 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c'
 {
-%      \clef G
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
        \set tupletSpannerDuration = #(ly:make-moment 1 4)
 
        % Intro
@@ -403,12 +391,9 @@ Chords = \chordmode
 %
 Rhythm = \relative c
 {
-%%     \set Voice.autoBeaming = ##f
-%%     \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \override NoteHead #'style = #'slash
-
-%Not small enough...
+%Not small enough... (?)
        \teeny
 %      \magnify #0.3
 
@@ -549,7 +534,7 @@ Dynamics =
 
                \new Staff
                <<
-                       \Global                 % The "roadmap" that everything else depends on
+                       \Global         % The "roadmap" that everything else depends on
                        \new Voice = "lead" \LeadVox
                        \new Voice \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxText
@@ -560,14 +545,14 @@ Dynamics =
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "JazzText"
-    "Luxi Mono"
-    (/ staffSize 20)))
+       #(define fonts (make-pango-font-tree
+               "Times New Roman"
+               "JazzText"
+               "Luxi Mono"
+               (/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
-       ragged-last-bottom = ##f
+%      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)
@@ -575,6 +560,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %      annotate-spacing = ##t
-%let's try this: [It works! Huzzah!][nope, it doesn't :-/]
-%      obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+