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

[music] / there-is-a-rock.ly

diff --git a/there-is-a-rock.ly b/there-is-a-rock.ly
index 83ac9d4453beb8228499abf53eaed7e996e6ab6b..f9d8a591534fc3c7e4ae03c7285d6dfc25709b3f 100644 (file)
--- a/there-is-a-rock.ly
+++ b/there-is-a-rock.ly
@@ -1,8 +1,8 @@
-\version "2.16.0"
+\version "2.19.0"
 \include "pop-chords.ly"
 \include "english.ly"
 
-% Good sizes are 16, 18, & 20
+% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26)
 staffSize = #18
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,14 +12,10 @@ staffSize = #18
 
 \header
 {
-%Let's bump up the title size and switch to the chord font. :-)
-
        title    = \markup { \override #'(font-family . sans) \fontsize #3.5 "There Is A Rock" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Tommy Walker" }
-%      arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. " }
+       arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
        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)
@@ -37,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?)
 Global =
 {
        \key e \minor
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 4/4
 
        % Intro
@@ -113,12 +109,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
-
        % Intro
 
        s1*4 |   % 1-4
@@ -207,6 +197,7 @@ LeadVox = \relative c'
        r1-\fermata |   % 62
 }
 
+
 LeadVoxText = \lyricmode
 {
        _ Light of the world, _ light of all truth,
@@ -248,10 +239,6 @@ LeadVoxTextB = \lyricmode
 
 Riffs = \relative c'
 {
-       \clef G
-%Hm. Needed anymore?
-%      \override Score.SpacingSpanner #'average-spacing-wishes = ##f
-
        % Intro
 
        \tiny
@@ -380,14 +367,9 @@ 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
        \teeny
 
@@ -471,9 +453,9 @@ Rhythm = \relative c
        c4 c c c8. c16 ~ |   % 54
        c4 c c c |   % 55
 
-       c4 c c c8. c16 ~ |   % 56
+       c4 c c c8. c16 \laissezVibrer |   % 56
 
-       c4 c c c8. c16 ~ |   % 57
+       c4 c c c |   % 57
 
        % Outro
 
@@ -488,16 +470,6 @@ Rhythm = \relative c
 
 Dynamics =
 {
-%{
-       s4_\markup { \italic { snare pat. } } s2 |   % 1
-       s4_\markup { \italic { simile } } s2 |   % 2
-       s2.*19
-       s4_\markup { \italic { spacey } } s2 |   % 22
-       s2.*5
-       s4 s \< s \! |   % 28
-       s2.*22
-       s4_\markup { \italic { Last time } } s2 |   % 51
-%}
        s1*40 |   % 1-40
        s4_\markup { \bold { Guitar solo } } s2. |   % 41
        s1*3 |   % 42-44
@@ -508,25 +480,25 @@ Dynamics =
 \score
 {
        <<
+               \Global         % The "roadmap" that everything else depends on
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
 
-%              \new Staff
-               <<
-                       \new ChordNames \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" \LeadVox
                        \new Voice \Riffs
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                >>
+
+               \new ChoirStaff
+               <<
+                       \new ChordNames \Chords
+%Capo 4 edition
+%                      \new ChordNames \transpose b g \Chords
+                       \new RhythmicStaff << \Rhythm \Dynamics >>
+               >>
        >>
 }
 
@@ -535,7 +507,7 @@ Dynamics =
 {
   #(define fonts (make-pango-font-tree
     "Times New Roman"
-    "DomCasual BT"
+    "LilyJAZZText"
     "Luxi Mono"
     (/ staffSize 20)))
 
@@ -548,6 +520,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)
 }
+