Update to ensure charts work with latest version of Lilypond.

[music] / forever.ly

diff --git a/forever.ly b/forever.ly
index aa6d206485d94456e0400d4ae89cd05afcd00610..5b0499720309fba400a677bd872d3e149c2dce87 100644 (file)
--- a/forever.ly
+++ b/forever.ly
@@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key g \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
        % Intro
@@ -83,7 +83,7 @@ Global =
        % Prechorus
 
        \mark \markup { \override #'(font-family . sans) { \box { D } } }
-       s1*8 \bar "||:"   % -
+       s1*8 \bar ".|:-||"   % -
 
        % Chorus
 
@@ -109,11 +109,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
 
@@ -270,8 +266,6 @@ LeadVoxTextC = \lyricmode
 Riffs = \relative c''
 {
        \clef G
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
        % Intro
 
@@ -287,9 +281,6 @@ Riffs = \relative c''
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        % Intro
 
        g1:sus2 |   %
@@ -389,10 +380,9 @@ Chords = \chordmode
 %
 Rhythm = \relative c
 {
-%%     \set Voice.autoBeaming = ##f
-%%     \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \override NoteHead #'style = #'slash
+       \teeny
 
        r4 r8 c c4 |   % 0
        c4 c c |   % 1
@@ -453,8 +443,6 @@ Dynamics =
                        \new Voice \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
-%                      \new Lyrics \lyricsto "lead" \LeadVoxTextC
-%                      \new Lyrics \lyricsto "lead" \LeadVoxTextD
                >>
        >>
 }
@@ -464,7 +452,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "JazzText"
     "Luxi Mono"
     (/ staffSize 20)))
 
@@ -477,6 +465,4 @@ 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)
 }