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

[music] / breathe.ly

diff --git a/breathe.ly b/breathe.ly
index 37995f18e29bbb279327fb78a1d0cfdfde12f2f8..c9bcc90c13037e5ff38e1ebb50cddc7be0f856bf 100644 (file)
--- a/breathe.ly
+++ b/breathe.ly
@@ -37,10 +37,9 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global = \transpose a g
 {
        \key a \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
-%      \once \override TextScript #'padding = #2.0
        s1*0^\markup { \italic \bold { 8th-note ballad } }
 % Capo 4 version
 %      s1*0^\markup { \hspace #0.0 \raise #2.0 \bigger \bold { "Moderate pop (*** CAPO 4 ***)" } }
@@ -115,11 +114,7 @@ Global = \transpose a g
 %
 LeadVox = \relative c'
 {
-%      \set Staff.instrument = #"Lead vox"
        \clef G
-       \override Staff.TimeSignature #'style = #'()
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
        \set tupletSpannerDuration = #(ly:make-moment 1 4)
 
        % Intro
@@ -253,9 +248,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c'
 {
-%      \clef G
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
        \set tupletSpannerDuration = #(ly:make-moment 1 4)
 
        % Intro
@@ -309,11 +301,11 @@ Chords = \chordmode
        % Verse
 
        b1:sus2 |   % 22
-       e1:sus2/b |   % 23 
+       e1:sus2/b |   % 23
        b8:sus2 \parenthesize fs/b s2. |   % 24
        e1:sus2/b |   % 25
        b2 fs/as |   % 26
-       gs2:m7 fs:5.11 |   % 27
+       gs2:m7 fs:3.5.11 |   % 27
        e2 gs:m7 |   % 28
 
        fs2 fs4:sus4 fs |   % 29
@@ -357,12 +349,9 @@ Chords = \chordmode
 %
 Rhythm = \relative c
 {
-%%     \set Voice.autoBeaming = ##f
-%%     \set Staff.instrument = #"Rhythm"
        \override Staff.TimeSignature #'style = #'()
        \override NoteHead #'style = #'slash
-
-%Not small enough...
+%Not small enough... (?)
        \teeny
 %      \magnify #0.3
 
@@ -401,7 +390,7 @@ Rhythm = \relative c
        % Verse
 
        c4 c c c |   % 22
-       c4 c c c |   % 23 
+       c4 c c c |   % 23
        c4 c c c |   % 24
        c4 c c c |   % 25
        c4 c c c |   % 26
@@ -443,15 +432,6 @@ Rhythm = \relative c
 
 Dynamics =
 {
-%      s1*4 |   % 1-4
-%      s4_\markup { \italic { 1st X: Melody, 2nd X+: Solos } } s2. |   % 5
-%      s1*38 |   % 1-38
-%      s4_\markup { \bold \italic { Double Chorus 2nd X } } s2. |   % 39
-%      s1*7 |   % 40-46
-%      s4_\markup { \bold { Tutti } } s2. |   % 47
-%      s4 |   % 0
-%      s2.*39 |   % 1-39
-%      s4_\markup { \large \bold \italic { Solo } } s2 |   % 40
        s4_\mp s2. |   % 1
        s1*20 |   % 2-21
        s4_\f s2. |   % 22
@@ -477,15 +457,7 @@ Dynamics =
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
 
-%              \new Staff
-               <<
-                       \new ChordNames \transpose a g \Chords
-%Capo 4 edition
-%                      \new ChordNames \transpose b g \Chords
-                       \new RhythmicStaff << \Rhythm \Dynamics >>
-               >>
-
-               \new Staff
+               \context Staff
                <<
                        \Global                 % The "roadmap" that everything else depends on
                        \new Voice = "lead" \transpose a g \LeadVox
@@ -493,6 +465,14 @@ Dynamics =
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                >>
+
+               \new ChoirStaff
+               <<
+                       \new ChordNames \transpose a g \Chords
+%Capo 4 edition
+%                      \new ChordNames \transpose b g \Chords
+                       \new RhythmicStaff << \Rhythm \Dynamics >>
+               >>
        >>
 }
 
@@ -500,13 +480,13 @@ Dynamics =
 \paper
 {
   #(define fonts (make-pango-font-tree
-    "Times New Roman"
-    "DomCasual BT"
-    "Luxi Mono"
-    (/ staffSize 20)))
+       "Times New Roman"
+       "JazzText"
+       "Luxi Mono"
+       (/ staffSize 20)))
 
 % Spread staves vertically across last page (default: t)
-       ragged-last-bottom = ##f
+%      ragged-last-bottom = ##f
 % Don't spread staves vertically across the page (default: f)
 %      ragged-bottom = ##t
 % Allow partial line for last stave (default: f)
@@ -514,6 +494,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)
 }
+