X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=jesus-draw-me-close.ly;h=d0c4831c4ecb37e71551e6ea6277dbd703b3e232;hb=HEAD;hp=e4ab6707f1b842e4b0300427a2e59fbf8f493bae;hpb=cdf57606f385bc4493fed4e3860bce0ce657dc40;p=music diff --git a/jesus-draw-me-close.ly b/jesus-draw-me-close.ly index e4ab670..d0c4831 100644 --- a/jesus-draw-me-close.ly +++ b/jesus-draw-me-close.ly @@ -1,16 +1,15 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -staffSize = #20 % or 16 or 18 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Jesus, Draw Me Close" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Rick Founds" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -19,72 +18,82 @@ staffSize = #20 % or 16 or 18 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - -% \set Score.markFormatter = #format-mark-box-letters % Intro -\tiny - a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 1 - f1 | % 2 - bf4 g8 [ a ] ~ a4 f8 [ g ] ~ | % 3 - g2. r8 c, | % 4 - d4 d8 [ e ] ~ e4 e8 [ f ] ~ | % 5 - f8 [ a ] ~ a4 g f8 [ f ] ~ | % 6 - f1 ~ | % 7 - f2 r | % 8 -\normalsize + s1*8 | % 1-8 % Verses 1-2 \repeat volta 2 { -\mark \markup { \override #'(font-family . sans) \box { A } } - - a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 9 - f2. r4 | % 10 - bf4 g8 [ a ] ~ a4 f8 [ g ] ~ | % 11 - g1 | % 12 - a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 13 - f8 [ d ] ~ d4 bf'4 a8 [ a ]( | % 14 - g1 ) ~ | % 15 - g2 r | % 16 - a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 17 - f2. r4 | % 18 - bf4 g8 [ a ] ~ a4 f8 [ g ] ~ | % 19 - g2. r8 c, | % 20 - d4 d8 [ e ] ~ e4 e8 [ f ] ~ | % 21 - f8 [ a ] ~ a4 g f8 [ f ] ~ | % 22 + \mark \markup { \override #'(font-family . sans) \box { A } } + s1*14 | % 9-22 } \alternative { { - f1 | % 23 - R1 | % 24 + s1*2 | % 23-24 } { - f1 \repeatTie | % 25 + s1 | % 25 } } - R1 \bar "||" % 26 + s1 \bar "||" % 26 % Verse 3 \key g \major -\mark \markup { \override #'(font-family . sans) \box { B } } + \mark \markup { \override #'(font-family . sans) \box { B } } + s1*21 \bar "|." % 27-47 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + \clef G + + % Intro + + s1*8 | % 1-8 + + % Verses 1-2 + + a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 9 + f2. r4 | % 10 + bf4 g8 [ a ] ~ a4 f8 [ g ] ~ | % 11 + g1 | % 12 + a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 13 + f8 [ d ] ~ d4 bf'4 a8 [ a ]( | % 14 + g1 ) ~ | % 15 + g2 r | % 16 + a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 17 + f2. r4 | % 18 + bf4 g8 [ a ] ~ a4 f8 [ g ] ~ | % 19 + g2. r8 c, | % 20 + d4 d8 [ e ] ~ e4 e8 [ f ] ~ | % 21 + f8 [ a ] ~ a4 g f8 [ f ] ~ | % 22 + + f1 | % 23 + R1 | % 24 + + f1 \repeatTie | % 25 + + R1 | % 26 + + % Verse 3 b4 g8 [ a ] ~ a4 fs8 [ g ] ~ | % 27 g2. r4 | % 28 @@ -104,24 +113,13 @@ LeadVox = \relative c'' r2 r4. d8 | % 42 e4 e8 [ fs ] ~ fs4 fs8 [ g ] ~ | % 43 g8 [ b ] ~ b4 a g8 [ g ] ~ | % 44 -% << { \voiceOne g1 } \context Voice = v { \voiceThree \tiny b4 g8 [ a ] ~ a4 fs8 [ g ] ~ \normalsize } >> \oneVoice | % 45 - << { \voiceOne g1 } \context Voice = v { \voiceThree \tiny b4 g8 [ a ] ~ a4 fs8 [ g ] ~ \normalsize } >> | % 45 - -%\small -\context Voice = v { \voiceThree -\tiny - g8 [ fs ] ~ fs4 c'8 [ b a g ] | % 46 - g1^\fermata \bar "|." % 47 -\normalsize -} + g1 | % 45 + s1*2 | % 46-47 } + LeadVoxText = \lyricmode { - _ _ _ _ _ _ _ - _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - Je- sus draw _ me close _ Clo- ser Lord _ to you __ _ Let the world _ a- round _ me _ fade a- way __ _ _ @@ -144,17 +142,13 @@ LeadVoxText = \lyricmode % % Riff/rhythm figures % - -StaffRiffs = \relative c' +Riffs = \relative c'' { \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Rhythm" - \key f \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 % Intro + \teeny a4 f8 [ g ] ~ g4 e8 [ f ] ~ | % 1 f1 | % 2 bf4 g8 [ a ] ~ a4 f8 [ g ] ~ | % 3 @@ -163,27 +157,21 @@ StaffRiffs = \relative c' f8 [ a ] ~ a4 g f8 [ f ] ~ | % 6 f1 ~ | % 7 f2 r | % 8 -\stopStaff - s1*35 | % 9 - 44 + s1*36 | % 9-44 -\startStaff - d4 d e8 [ d ] | % 45 - b4 a2 | % 46 - d4 d e8 [ fs ] | % 47 + \voiceThree b4 g8 [ a ] ~ a4 fs8 [ g ] ~ | % 45 + g8 [ fs ] ~ fs4 c'8 [ b a g ] | % 46 + g1^\fermata | % 47 + \normalsize } - % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro f4. c2/e bf8/d | % 1 @@ -197,35 +185,27 @@ Chords = \chordmode % Verses 1-2 - \repeat volta 2 - { - f4. c2/e bf8/d | % 9 - s4. f2/c s8 | % 10 - bf4. f2/a c8:sus4 | % 11 - s2 c | % 12 - f4. c2/e d8:m | % 13 - s2 bf:sus2 | % 14 - c1:sus4 | % 15 - c1 | % 16 - f4. c2/e bf8/d | % 17 - s4. f/c s4 | % 18 - bf4. f2/a c8:sus4 | % 19 - s2 c | % 20 - bf4./d c2/e d8:m7 | % 21 - s2 c:sus4 | % 22 - } - \alternative - { - { - f1 | % 23 - bf1/c | % 24 - } - { - f1 | % 25 - } - } + f4. c2/e bf8/d | % 9 + s4. f2/c s8 | % 10 + bf4. f2/a c8:sus4 | % 11 + s2 c | % 12 + f4. c2/e d8:m | % 13 + s2 bf:sus2 | % 14 + c1:sus4 | % 15 + c1 | % 16 + f4. c2/e bf8/d | % 17 + s4. f/c s4 | % 18 + bf4. f2/a c8:sus4 | % 19 + s2 c | % 20 + bf4./d c2/e d8:m7 | % 21 + s2 c:sus4 | % 22 + + f1 | % 23 + bf1/c | % 24 - d2:sus4 d \bar "||" % 26 + f1 | % 25 + + d2:sus4 d | % 26 % Verse 3 @@ -250,24 +230,18 @@ Chords = \chordmode g4. d2/fs c8/e | % 45 s2 c:sus2 | % 46 - g1 \bar "|." % 47 + g1 | % 47 } % % 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -282,35 +256,27 @@ StaffC = \relative c % Verses 1-2 - \repeat volta 2 - { - c4. c8 ~ c4. c8 ~ | % 9 - c4. c8 ~ c4 c | % 10 - c4. c8 ~ c4. c8 ~ | % 11 - c4 c c c | % 12 - c4. c8 ~ c4. c8 ~ | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4. c8 ~ c4. c8 ~ | % 17 - c4. c8 ~ c4 c | % 18 - c4. c8 ~ c4. c8 ~ | % 19 - c4 c c c | % 20 - c4. c8 ~ c4. c8 ~ | % 21 - c4 c c c | % 22 - } - \alternative - { - { - c4 c c c | % 23 - c4 c c c | % 24 - } - { - c4 c c c | % 25 - } - } + c4. c8 ~ c4. c8 ~ | % 9 + c4. c8 ~ c4 c | % 10 + c4. c8 ~ c4. c8 ~ | % 11 + c4 c c c | % 12 + c4. c8 ~ c4. c8 ~ | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4. c8 ~ c4. c8 ~ | % 17 + c4. c8 ~ c4 c | % 18 + c4. c8 ~ c4. c8 ~ | % 19 + c4 c c c | % 20 + c4. c8 ~ c4. c8 ~ | % 21 + c4 c c c | % 22 - c4 c \< c c \! \bar "||" % 26 + c4 c c c | % 23 + c4 c c c | % 24 + + c4 c c c | % 25 + + c4 c \< c c \! | % 26 % Verse 3 @@ -336,56 +302,50 @@ StaffC = \relative c c4. c8 ~ c4. c8 ~ | % 45 c4 c c-\markup { \italic { rit. } } c | % 46 - c1-\fermata \bar "|." % 47 + c1-\fermata | % 47 } \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> -%{ - \new Staff \with - { - \remove "Time_signature_engraver" - \remove "Clef_engraver" -%Hmm, removing this screws up the formatting... -% \remove "Key_engraver" - fontSize = #-3.0 - \override StaffSymbol #'staff-space = #(magstep -3.0) -% firstClef = ##f - } - \StaffRiffs -%} - \new ChoirStaff = "Rhythm" << - \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 } +