Update to ensure charts work with latest version of Lilypond.

[music] / here-i-am-to-worship.ly

diff --git a/here-i-am-to-worship.ly b/here-i-am-to-worship.ly
index 1a75d048d7c86a333dff8a9c286f9fa8d10c7f0f..669911379b4d5e6a5a3a52a367057e9131fe0120 100644 (file)
--- a/here-i-am-to-worship.ly
+++ b/here-i-am-to-worship.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 "Here I Am To Worship" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "T. Hughes" }
        arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -31,11 +29,10 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 %
 % Song's structure
 %
-
 Global =
 {
        \key a \major
-       %       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
        % Intro
@@ -54,17 +51,16 @@ Global =
 
                % Chorus
 
-%              \mark \markup { \override #'(font-family . sans) { \box { B } } }
-\once \override Score.RehearsalMark #'self-alignment-X = #left
-\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
+               \once \override Score.RehearsalMark #'self-alignment-X = #left
+               \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" }
                s1*7 |   % 15-21
        }
        \alternative
        {
                {
-\once \override Score.RehearsalMark #'self-alignment-X = #right
-\once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
-\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
+                       \once \override Score.RehearsalMark #'self-alignment-X = #right
+                       \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
+                       \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" }
                        s1*2 |   % 22-23
                }
                {
@@ -113,20 +109,14 @@ Global =
 %
 % Lead vocal
 %
-
 LeadVox = \relative c''
 {
        \clef G
-       \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
        % Intro
 
        s2 |   % 0
-       s1 |   % 1
-       s1 |   % 2
-       s1 |   % 3
-       s1 |   % 4
-       s1 |   % 5
+       s1*5 |   % 1-5
 
        % Verse
 
@@ -270,7 +260,6 @@ Riffs = \relative c''
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
        % Intro
@@ -348,10 +337,6 @@ Chords = \chordmode
 %
 % 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...
-
 Rhythm = \relative c
 {
        \override NoteHead #'style = #'slash
@@ -432,16 +417,6 @@ Rhythm = \relative c
 
 Dynamics =
 {
-%{
-       s1*12 |   % 1-12
-       s4_\markup { \italic { Add bass, pad } } s2. |   % 13
-       s1*7 |   % 14-20
-       s4_\markup { \italic { Add perc, Ac. gtrs. } } s2. |   % 21
-       s1*28 |   % 22-49
-       s4_\markup { \italic { Piano only, like intro } } s2. |   % 50
-       s1*2 |   % 51-52
-       s4_\markup { \italic { Full band } } s2. |   % 53
-%}
        s2_\mf |   % 0
        s1*3 |   % 1-3
        s4_\markup { \italic { add cymbal colors } } s2. |   % 5
@@ -478,38 +453,21 @@ Dynamics =
 
 \score
 {
-%{
-       <<
-               <<
-%                      \new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-                       \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> }
-                       \new Lyrics \lyricsto "lead" \LeadVoxText
-               >>
-
-               \new ChoirStaff = "Rhythm"
-               <<
-                       \new ChordNames = "chords" \Chords
-                       \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
-               >>
-
-               \set Score.skipBars = ##t
-               \set Score.melismaBusyProperties = #'()
-       >>
-%}
        <<
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
 
-               \new Staff
+               \Global         % The "roadmap" that everything else depends on
+
+               \context Staff
                <<
-                       \Global   % The "roadmap" that everything else depends on
                        \new Voice = "lead" \LeadVox
                        \new Voice \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxTextA
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                >>
 
-%              \new Staff
+               \new ChoirStaff
                <<
                        \new ChordNames \Chords
                        \new RhythmicStaff << \Rhythm \Dynamics >>
@@ -520,11 +478,11 @@ 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