Update to ensure charts work with latest version of Lilypond.

[music] / be-still-and-know.ly

diff --git a/be-still-and-know.ly b/be-still-and-know.ly
index e39ada74bc1d7d29bbdbdb533cacc40cb50667d6..ff8f11562d43dc71af7020a28e115f47c933c693 100644 (file)
--- a/be-still-and-know.ly
+++ b/be-still-and-know.ly
@@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key b \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 3/4
 
        % Intro
@@ -49,7 +49,7 @@ Global =
 
        % Intro
 
-       s2.*8 \bar "||:"   % 1-8
+       s2.*8 \bar ".|:-||"   % 1-8
 
        \repeat volta 2
        {
@@ -92,11 +92,7 @@ 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
 
        % Intro
 
@@ -194,8 +190,6 @@ LeadVoxTextB = \lyricmode
 Riffs = \relative c''
 {
        \clef G
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
        % Intro
 
@@ -328,10 +322,9 @@ Chords = \chordmode
 %
 Rhythm = \relative c
 {
-%%     \set Voice.autoBeaming = ##f
-%%     \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \override NoteHead #'style = #'slash
+       \teeny
 
        % Intro
 
@@ -430,22 +423,22 @@ Dynamics =
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
 
-%              \new Staff
+               \context Staff
                <<
-                       \new ChordNames \Chords
-%Capo 4 edition
-%                      \new ChordNames \transpose b g \Chords
-                       \new RhythmicStaff << \Rhythm \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
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                >>
+
+               \new ChoirStaff
+               <<
+                       \new ChordNames \Chords
+%Capo 4 edition
+%                      \new ChordNames \transpose b g \Chords
+                       \new RhythmicStaff << \Rhythm \Dynamics >>
+               >>
        >>
 }
 
@@ -454,7 +447,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
 
@@ -467,6 +460,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %      annotate-spacing = ##t
-%let's try this: [It works! Huzzah!]
-%      obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+