Update to ensure charts work with latest version of Lilypond.

[music] / hosanna-loud-hosanna.ly

diff --git a/hosanna-loud-hosanna.ly b/hosanna-loud-hosanna.ly
index b47bcdbe82142f13fe909b61c8af17bd4fb555b4..125c84951c47df48f7215cf878ea68065f1d8506 100644 (file)
--- a/hosanna-loud-hosanna.ly
+++ b/hosanna-loud-hosanna.ly
@@ -21,46 +21,64 @@ staffSize = #20
 
 
 %
-% Lead vocal
+% Song's structure
 %
-
-LeadVox = \relative c'
+Global =
 {
-%      \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Lead vox"
        \clef G
        \key bf \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
-\override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
        % Verse
 
-       \partial 4*1 f4 |   % 0
+       \partial 4*1 s4 |   % 0
+       s1*4 |   % 1-4
+\break % bleh
+
+       s1*4 |   % 5-8
+\break % bleh
+
+       s1*4 |   % 9-12
+\break % bleh
+
+       s1*3 |   % 13-15
+       \partial 4*3 s2. \bar "|."   % 16
+}
+
+
+%
+% Lead vocal
+%
+LeadVox = \relative c'
+{
+       \clef G
+
+       % Verse
+
+       f4 |   % 0
        bf4 a8 ( g ) f4 bf |   % 1
        d,4 ( ef ) f f |   % 2
        g8 ( a ) bf4 c c |   % 3
        d2. f,4 |   % 4
-\break % bleh
 
        bf4 a8 ( g ) f4 bf |   % 5
        d,4 ( ef ) f f |   % 6
        g8 ( a ) bf4 bf a |   % 7
        bf2. bf8 ( c ) |   % 8
-\break % bleh
 
        d4 c d ef |   % 9
        c4 ( a8 bf ) c4 bf8 ( c ) |   % 10
        d4 c d ef |   % 11
        c2. f,4 |   % 12
-\break % bleh
 
        bf4 a8 ( g ) f4 bf |   % 13
        d,4 ( ef ) f f |   % 14
        g8 ( a ) bf4 bf a |   % 15
-       \partial 4*3 bf2. \bar "|."   % 16
+       bf2. |   % 16
 }
 
+
 LeadVoxText = \lyricmode
 {
        Ho -- san -- na, _ loud ho -- san -- _ na, the lit -- _ tle chil -- dren sang;
@@ -89,13 +107,9 @@ LeadVoxTextC = \lyricmode
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
-       \partial 4*1 s4 |   % 0
+       s4 |   % 0
        bf1 |   % 1
        g2:m bf |   % 2
        ef2 f |   % 3
@@ -114,48 +128,7 @@ Chords = \chordmode
        bf1 |   % 13
        g2:m bf |   % 14
        ef2 f |   % 15
-       \partial 4*3 bf2.  |   % 16
-}
-
-
-%
-% 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...
-
-%Slash = { \override NoteHead #'style = #'slash }
-%Cross = { \override NoteHead #'style = #'cross }
-
-StaffC = \relative c
-{
-       \override Staff.TimeSignature #'style = #'()
-       \time 4/4
-       \override NoteHead #'style = #'slash
-
-       % Verse
-
-       \partial 4*1 r4 |   % 0
-       c4 c c c |   % 1
-       c4 c c c |   % 2
-       c4 c c c |   % 3
-       c4 c c c |   % 4
-
-       c4 c c c |   % 5
-       c4 c c c |   % 6
-       c4 c c c |   % 7
-       c4 c c c |   % 8
-
-       c4 c c c |   % 9
-       c4 c c c |   % 10
-       c4 c c c |   % 11
-       c4 c c c |   % 12
-
-       c4 c c c |   % 13
-       c4 c c c |   % 14
-       c4 c c c |   % 15
-       \partial 4*3 c2. \bar "|."   % 16
+       bf2.  |   % 16
 }
 
 
@@ -185,16 +158,16 @@ Dynamics =
 {
        <<
                <<
-                       \new Staff = leadStaff { \new Voice = "lead" \LeadVox }
-                       \new Lyrics \lyricsto "lead" \LeadVoxText
-                       \new Lyrics \lyricsto "lead" \LeadVoxTextB
-                       \new Lyrics \lyricsto "lead" \LeadVoxTextC
+                       \new ChordNames \Chords
                >>
 
-               \new ChoirStaff = "Rhythm"
+               \new Staff
                <<
-                       \new ChordNames = "chords" \Chords
-                       \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >>
+                       \Global         % The "roadmap" that everything else depends on
+                       \new Voice = "lead" \LeadVox
+                       \new Lyrics \lyricsto "lead" \LeadVoxText
+                       \new Lyrics \lyricsto "lead" \LeadVoxTextB
+                       \new Lyrics \lyricsto "lead" \LeadVoxTextC
                >>
 
                \set Score.skipBars = ##t
@@ -205,11 +178,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"
+               "JazzText"
+               "Luxi Mono"
+               (/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
 %      ragged-last-bottom = ##f
@@ -220,6 +193,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)
 }
+