Update to ensure charts work with latest version of Lilypond.

[music] / holy-is-the-lord.ly

diff --git a/holy-is-the-lord.ly b/holy-is-the-lord.ly
index 0efa0c641bd96049d7abc1351aeb095ae4466552..171cb370ae96a2d22f2e03c9e7e9b4dd7f706d29 100644 (file)
--- a/holy-is-the-lord.ly
+++ b/holy-is-the-lord.ly
@@ -10,12 +10,10 @@ 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 "Holy Is The Lord" }
-%      subtitle = \markup { \override #'(font-family . sans) \fontsize #3.5 "SA version" }
+%      subtitle = \markup { \override #'(font-family . sans) \fontsize #3.5 "" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Blake/Harriton" }
-%      arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart/Deborah Hammons" }
+%      arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "" }
        tagline  = $(string-append "Engraved by JLH and Lilypond " (lilypond-version))
 }
 
@@ -26,7 +24,7 @@ staffSize = #20
 Global =
 {
        \key d \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
        % A section
@@ -39,18 +37,15 @@ Global =
 
        \mark \markup { \override #'(font-family . sans) { \box { B } } }
 
-       s1*16 \bar ":|"   % 17-32
+       s1*16 \bar ":|."   % 17-32
 }
 
 
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Lead vox"
        \clef G
 
        % A section
@@ -118,51 +113,12 @@ LeadVoxText = \lyricmode
 
 Riffs = \relative c'
 {
-%{
-       \clef G
-       \key ef \major
-       \override Staff.TimeSignature #'style = #'()
-       \time 4/4
-
-       % Intro
-
-       \tiny
-       <ef g,>16 d bf f ~ f4 ~ f4. g16 bf |   % 1
-       c1 |   % 2
-       <ef' g,>16 d bf f ~ f4 ~ f4. g16 bf |   % 3
-       c2 <ef, bf af> |   % 4
-
-       s1*9
-       s2
-
-\voiceOne
-\tieDown
-       <ef g,>16 d bf f ~ f4 ~ f4. g16 bf |   % 14
-\tieNeutral
-\oneVoice
-       c1 |   % 15
-       <ef' g,>16 d bf f ~ f4 ~ f4. g16 bf |   % 16
-       c2 <ef, bf af> |   % 17
-
-       <ef' g,>16 d bf f ~ f4 ~ f4. g16 bf |   % 18
-       c2 r |   % 19
-
-       s1*10
-
-       \stemUp
-       <f a,>16 e c g ~ g4 ~ g4. a16 c |   % 31
-       \stemNeutral
-       d2 r |   % 32
-       <f a,>16 e c g ~ g4 ~ g4. a16 c |   % 33
-       d2 r |   % 34
-%}
 }
 
 
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
        % A section
@@ -210,17 +166,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 = \relative c
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
-%      \time 4/4
+       \numericTimeSignature
        \override NoteHead #'style = #'slash
+       \teeny
 
        % A section
 
@@ -288,22 +238,23 @@ Dynamics =
 \score
 {
        <<
-%              \new Staff
-               <<
-                       \new ChordNames \Chords
-%Capo 3 edition
-%                      \new ChordNames \transpose f d \Chords
-                       \new RhythmicStaff << \Rhythm \Dynamics >>
-               >>
+               \Global         % The "roadmap" that everything else depends on
 
-               \new Staff
+               \context Staff
                <<
-                       \Global                                         % The "roadmap" that everything else depends on
                        \new Voice = "lead" \LeadVox
                        \new Voice \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                >>
 
+               \new ChoirStaff
+               <<
+                       \new ChordNames \Chords
+%Capo 3 edition
+%                      \new ChordNames \transpose f d \Chords
+                       \new RhythmicStaff << \Rhythm \Dynamics >>
+               >>
+
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
        >>
@@ -327,6 +278,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)
 }
+