Update to ensure charts work with latest version of Lilypond.

[music] / wait-by-the-water.ly

diff --git a/wait-by-the-water.ly b/wait-by-the-water.ly
index 9028c8cf1138b51d22367fea9a95756f2485783e..2d150588e01efa8ef1c0460c57a03a1fca74aacd 100644 (file)
--- a/wait-by-the-water.ly
+++ b/wait-by-the-water.ly
@@ -1,9 +1,9 @@
-\version "2.18.2"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
-staffSize = #20
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
+staffSize = #23
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
 #(ly:set-option (quote no-point-and-click))
@@ -12,15 +12,11 @@ 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 "Wait By The Water" }
        subtitle    = \markup { \override #'(font-family . sans) \fontsize #1.3 "Honoring The MoRanch Professional Women’s Group" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Helen Currie Foster" }
 %      arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" }
        tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
-% Let's try a chord dictionary
-%      subtitle =  \markup { \center-column { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } "       " \center-column { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } "       " \center-column { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" }  "       " \center-column { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" }  "       " \center-column { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" }  "       " \center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" }  }
 }
 
 % Useful tweak abbreviations (hn = harmony note)
@@ -38,15 +34,12 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key c \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 3/4
 
        \once \override Score.RehearsalMark #'self-alignment-X = #left
        \mark \markup { \override #'(font-family . sans) { \box { A } } }
-%      \once \override TextScript #'padding = #2.0
        s2.*0^\markup { \large \italic { Refrain } }
-% Capo 4 version
-%      s1*0^\markup { \hspace #0.0 \raise #2.0 \larger \bold { "Moderate pop (*** CAPO 4 ***)" } }
 
        % Refrain
 
@@ -56,35 +49,6 @@ Global =
        \mark \markup { \override #'(font-family . sans) { \box { B } } }
        s2.*0^\markup { \large \italic { Verse } }
        s2.*16 \bar ":|."   % 16-32
-
-%{
-               s1*4 |   % 15-18
-
-               s1*2 |   % 19-20
-       }
-       \alternative
-       {
-               {
-                       s1 |   % 21
-               }
-               {
-                       s1 |   % 22
-               }
-       }
-
-       \repeat volta 2
-       {
-               \mark \markup { \override #'(font-family . sans) { \box { C } } }
-
-               s1*0^\markup { \large \bold \italic { Solos } }
-               s1*2 |   % 23-24
-       }
-
-       % Coda
-
-       s2. s4^\markup { \large \bold \italic { Free Time } } |   % 39
-       s1*3 \bar ":||"   % 40-42
-%}
 }
 
 
@@ -93,12 +57,6 @@ 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
-
        % Refrain
 
        e4 g4. d8 |   % 1
@@ -119,7 +77,6 @@ LeadVox = \relative c'
        bf4 c d |   % 15
        c2. |   % 16
 
-
        % Verse
 
        g'4 c c |   % 17
@@ -191,10 +148,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c
 {
-       \clef G
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
        % Intro
 
 %      \tiny
@@ -254,19 +207,12 @@ 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
 {
-%%     \set Voice.autoBeaming = ##f
-%%     \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \override NoteHead #'style = #'slash
-
-%Not small enough...
        \teeny
-%      \magnify #0.3
+
        % Refrain
 
         |   % 1
@@ -348,11 +294,11 @@ Dynamics =
 
 \paper
 {
-  #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+       #(define fonts (make-pango-font-tree
+               "Times New Roman"
+               "LilyJAZZText"
+               "Luxi Mono"
+               (/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
 %      ragged-last-bottom = ##f
@@ -363,6 +309,5 @@ Dynamics =
 
 % To find out what's eating the space at the top...
 %      annotate-spacing = ##t
-%let's try this: [It works! Huzzah!][nope]
-%      obsolete-page-top-space = 0  top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
 }
+