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

[music] / be-thou-my-vision.ly

diff --git a/be-thou-my-vision.ly b/be-thou-my-vision.ly
index dcf768c7dd1884d8db24ca140f8c3329dd3724a9..6e55379e3b2052d436e01be54d07ec70ef9b6952 100644 (file)
--- a/be-thou-my-vision.ly
+++ b/be-thou-my-vision.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 = #20
 #(set-default-paper-size "letter")
 #(set-global-staff-size staffSize)
@@ -12,8 +12,6 @@ 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 "Be Thou My Vision" }
        composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" }
        arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" }
@@ -24,14 +22,12 @@ staffSize = #20
 %
 % Lead vocal
 %
-
 LeadVox = \relative c'
 {
        \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Lead vox"
        \clef G
        \key d \major
-       \override Staff.TimeSignature #'style = #'()
+       \numericTimeSignature
        \time 3/4
 \override Score.SpacingSpanner #'average-spacing-wishes = ##f
 
@@ -155,7 +151,7 @@ LeadVoxTextB = \lyricmode
 
 LeadVoxTextC = \lyricmode
 {
-       Ri -- ches I _ heed not, nor man’s em -- pty praise
+       Ri -- ches I _ heed not, nor vain em -- pty praise
        Thou mine in -- her -- i -- tance, now and al -- ways
        Thou and _ thou _ on -- _ ly, first in my heart _
        High King of Hea -- _ ven, my _ trea -- sure thou
@@ -165,14 +161,12 @@ LeadVoxTextC = \lyricmode
 %
 % Riff/rhythm figures
 %
-
 StaffRiffs = \relative c'
 {
        \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Rhythm"
        \key d \major
-       \override Staff.TimeSignature #'style = #'()
-       \time 3/4 
+       \numericTimeSignature
+       \time 3/4
 
        % Intro
 
@@ -211,12 +205,8 @@ StaffRiffs = \relative c'
 %
 % Chord names
 %
-
 Chords = \chordmode
 {
-%Bah, can't we set this globally?
-%      \popChords
-
        % Intro
 
        d2. |   % 1
@@ -298,17 +288,12 @@ 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...
-
 StaffC = \relative c
 {
-       \set Voice.autoBeaming = ##f
-%      \set Staff.instrument = #"Rhythm"
-       \override Staff.TimeSignature #'style = #'()
-       \time 3/4 
+       \numericTimeSignature
+       \time 3/4
        \override NoteHead #'style = #'slash
+       \teeny
 
        % Intro
 
@@ -391,9 +376,9 @@ StaffC = \relative c
 \score
 {
        <<
-%              \new ChoirStaff = "Vox"
+               \context Staff
                <<
-                       \new Staff = leadStaff { \new Voice = "lead" \LeadVox }
+                       \new Voice = "lead" \LeadVox
                        \new Lyrics \lyricsto "lead" \LeadVoxText
                        \new Lyrics \lyricsto "lead" \LeadVoxTextB
                        \new Lyrics \lyricsto "lead" \LeadVoxTextC
@@ -411,30 +396,34 @@ StaffC = \relative c
                }
                \StaffRiffs
 
-               \new ChoirStaff = "Rhythm"
+               \new ChoirStaff
                <<
-                       \new ChordNames = "chords" \Chords
-                       \new RhythmicStaff = "chordRhythm" \StaffC
+                       \new ChordNames \Chords
+                       \new RhythmicStaff \StaffC
                >>
 
                \set Score.skipBars = ##t
                \set Score.melismaBusyProperties = #'()
        >>
-
-       \layout
-       {
-               \context { \Staff \RemoveEmptyStaves }
-%              ragged-last-bottom = ##t
-               ragged-last = ##t
-       }
 }
 
 
 \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"
+               "LilyJAZZText"
+               "Luxi Mono"
+               (/ staffSize 20)))
+
+% Don't spread staves vertically across last page (default: t)
+%      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)
+       ragged-last = ##t
+
+% To find out what's eating the space at the top...
+%      annotate-spacing = ##t
 }
+