New charts "How Great Thou Art" and "In The Garden".

[music] / god-of-wonders.ly

diff --git a/god-of-wonders.ly b/god-of-wonders.ly
index 5bcb1afd02ea34d6506d48233318a975410f608b..69572019f0c27eb8dee1afe943e97ec2aeeea8ec 100644 (file)
--- a/god-of-wonders.ly
+++ b/god-of-wonders.ly
@@ -35,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key a \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
        % Intro
@@ -108,10 +108,7 @@ LeadVox = \relative c''
 
        % Intro/midtro
 
-       s1 |   % 1
-       s1 |   % 2
-       s1 |   % 3
-       s1 |   % 4
+       s1*4 |   % 1-4
 
        % Verse
 
@@ -152,13 +149,7 @@ LeadVox = \relative c''
        % Solo
 
        <cs \hn a \hn e \hn cs>1 |   % 31
-       R1 |   % 32
-       R1 |   % 33
-       R1 |   % 34
-       R1 |   % 35
-       R1 |   % 36
-       R1 |   % 37
-       R1 |   % 38
+       R1*7 |   % 32-38
 
        % Chorus
 
@@ -275,25 +266,22 @@ Riffs = \relative c'
 %
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        % Intro/midtro
 
-       e2:5.11 s16 fs4:m7 s16 d8:sus2 |   % 1
+       e2:3.5.11 s16 fs4:m7 s16 d8:sus2 |   % 1
        s1 |   % 2
-       e2:5.11 s16 fs4:m7 s16 d8:sus2 |   % 3
+       e2:3.5.11 s16 fs4:m7 s16 d8:sus2 |   % 3
        s1 |   % 4
 
        % Verse
 
-       e2:5.11 s16 fs4:m7 s16 d8:sus2 |   % 5
+       e2:3.5.11 s16 fs4:m7 s16 d8:sus2 |   % 5
        s1 |   % 6
-       e2:5.11 s16 fs4:m7 s16 d8:sus2 |   % 7
+       e2:3.5.11 s16 fs4:m7 s16 d8:sus2 |   % 7
        s1 |   % 8
-       e2:5.11 s16 fs4:m7 s16 d8:sus2 |   % 9
+       e2:3.5.11 s16 fs4:m7 s16 d8:sus2 |   % 9
        s1 |   % 10
-       e2:5.11 s16 fs4:m7 s16 d8:sus2 |   % 11
+       e2:3.5.11 s16 fs4:m7 s16 d8:sus2 |   % 11
        s1 |   % 12
 
        % Chorus
@@ -307,9 +295,9 @@ Chords = \chordmode
        b1:m9 |   % 19
        d1:maj7 |   % 20
 
-       d2:sus2 e:5.11 |   % 21
-       d2:sus2 e:5.11 |   % 22
-       d2:sus2 e:5.11 |   % 23
+       d2:sus2 e:3.5.11 |   % 21
+       d2:sus2 e:3.5.11 |   % 22
+       d2:sus2 e:3.5.11 |   % 23
        d1:sus2 |   % 24
 
        % Interlude
@@ -345,11 +333,11 @@ Chords = \chordmode
 
        % Outro
 
-       d2:sus2 e:5.11 |   % 47
-       d2:sus2 e:5.11 |   % 48
-       d2:sus2 e:5.11 |   % 49
-       d2:sus2 e:5.11 |   % 50
-       d2:sus2 e:5.11 |   % 51
+       d2:sus2 e:3.5.11 |   % 47
+       d2:sus2 e:3.5.11 |   % 48
+       d2:sus2 e:3.5.11 |   % 49
+       d2:sus2 e:3.5.11 |   % 50
+       d2:sus2 e:3.5.11 |   % 51
        d1:sus2 |   % 52
 }
 
@@ -357,14 +345,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/midtro
 
@@ -481,7 +466,7 @@ Dynamics =
 \score
 {
        <<
-               \Global                                         % The "roadmap" that everything else depends on
+               \Global         % The "roadmap" that everything else depends on
 
                \context Staff
                <<
@@ -524,6 +509,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)
 }
+