Update to ensure charts work with latest version of Lilypond.

[music] / you-have-been-good.ly

diff --git a/you-have-been-good.ly b/you-have-been-good.ly
index 9091ae8d203074590cc05412a55005693a92de0f..bb283eef8eba02336762fa38258683ec04c52741 100644 (file)
--- a/you-have-been-good.ly
+++ b/you-have-been-good.ly
@@ -1,8 +1,8 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
 staffSize = #16
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,8 +12,6 @@ staffSize = #16
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
        title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "You Have Been Good" }
 % Neat!
 %      subtitle = \markup { \fret-diagram #"6-3;5-x;4-2;3-o;2-3;1-3;" " - " \fret-diagram-terse #"3-(;6;;5;4;3-);" }
@@ -26,56 +24,39 @@ staffSize = #16
 %
 % Song's structure
 %
-Global = 
+Global =
 {
        \key d \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 12/8
 
        % Intro
 
-       s1. |   % 1
-       s1. |   % 2
-       s1. |   % 3
-       s1. \bar "||:"   % 4
+       s1.*3 |   % 1-3
+       s1. \bar ".|:-||"   % 4
 
        \repeat volta 3
        {
                % A section
 
                \mark \markup { \override #'(font-family . sans) { \box { A } } }
-
-               s1. |   % 5
-               s1. |   % 6
-               s1. |   % 7
-               s1. |   % 8
-
-               s1. |   % 9
-               s1. |   % 10
-               s1. |   % 11
-               s1. \bar "||"   % 12
+               s1.*8 \bar "||"   % 5-12
 
                % B section
 
                \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. |   % 13
-               s1. |   % 14
-               s1. |   % 15
-               s1. \bar "||"   % 16
+               s1.*4 \bar "||"   % 13-16
 
                % A section
 
-               s1. |   % 17
-               s1. |   % 18
-               s1. |   % 19
+               s1.*3 |   % 17-19
        }
        \alternative
        {
                {
-                       s1. |   % 20
-                       s1. |   % 21
+                       s1.*2 |   % 20-21
                }
                {
                        s2. s4. s8^\markup { \hspace #4.0 \raise #1.0 \bold { D.S. } } s s \bar "||"   % 22
@@ -87,10 +68,7 @@ Global =
 
        % Ending
 
-       s1. |   % 24
-       s1. |   % 25
-       s1. |   % 26
-       s1. \bar "|."   % 27
+       s1.*4 \bar "|."   % 24-27
 }
 
 
@@ -99,9 +77,6 @@ Global =
 %
 LeadVox = \relative c'
 {
-       \clef G
-       \override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
        % Intro
 
        s1. |   % 1
@@ -149,6 +124,7 @@ LeadVox = \relative c'
        d1.^\fermata |   % 27
 }
 
+
 LeadVoxText = \lyricmode
 {
        O Lord, _ you have been good, _
@@ -194,9 +170,6 @@ Riffs = \relative c'
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        % Intro
 
        d4. d:sus4 d g |   % 1
@@ -248,14 +221,11 @@ 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 =
 {
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \override NoteHead #'style = #'slash
+       \teeny
 
        % Intro
 
@@ -336,11 +306,12 @@ Dynamics =
 \score
 {
        <<
-               \Global                                         % The "roadmap" that everything else depends on
+               \Global         % The "roadmap" that everything else depends on
 
                \context Staff
                <<
-                       \context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >>
+                       \new Voice = "lead" \LeadVox
+                       \new Voice \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                >>
@@ -361,7 +332,7 @@ Dynamics =
 {
        #(define fonts (make-pango-font-tree
                "Times New Roman"
-               "DomCasual BT"
+               "LilyJAZZText"
                "Luxi Mono"
                (/ staffSize 20)))
 
@@ -374,6 +345,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)
 }
+