X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=search-my-heart.ly;h=4a37ebb307d88f7017d359e56ea3daa6e00a8faa;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=d41891d13e86052dfd6a196ce87a3f2f24b42a6c;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music diff --git a/search-my-heart.ly b/search-my-heart.ly index d41891d..4a37ebb 100644 --- a/search-my-heart.ly +++ b/search-my-heart.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,14 +12,10 @@ 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 "Search My Heart" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Hillsong United" } -% arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } +% arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) -% Let's try a chord dictionary -% subtitle = \markup { \center-align { "F#m" \fret-diagram-terse #"x;x;4;2;2;2;" } " " \center-align { "F#m/F" \fret-diagram-terse #"x;x;3;2;2;2;" } " " \center-align { "F#m/E" \fret-diagram-terse #"x;x;2;2;2;2;" } " " \center-align { "F#m/Eb" \fret-diagram-terse #"x;x;1;2;2;2;" } " " \center-align { "Em7" \fret-diagram-terse #"o;2;2;o;3;o;" } " " \center-align { "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 = \transpose c g { \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % \once \override TextScript #'padding = #2.0 @@ -104,7 +100,7 @@ Global = \transpose c g % Outro \mark \markup { \override #'(font-family . sans) { \box { H } } } - s1*5 \bar "|." % + s1*5 \bar "|." % } @@ -113,11 +109,6 @@ Global = \transpose c 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) \override MultiMeasureRest #'expand-limit = 1 @@ -143,7 +134,7 @@ LeadVox = \relative c' e4 r r c | % 15 g'4. g8 ~ g ( d ) d4 ~ | % 16 d4 r c8 d4 c8 | % 17 - f4. f8 ~ f ( e ) e4 ~ | % 18 + f4. f8 ~ f ( e ) e4 | % 18 % A section @@ -166,26 +157,26 @@ LeadVox = \relative c' g'4. g8 ~ g ( d ) d4 ~ | % 36 % d4 r << { c8 d4 c8 } \context Voice = vb { \voiceTwo \teeny c8 c d c \normalsize } >> | % 37 d4 r << { \stemDown \teeny c8 c d c \normalsize \stemNeutral } \context Voice = vb { \voiceTwo \stemUp c8 d4 c8 \stemNeutral } >> | % 37 - f4. f8 ~ f ( e ) e4 ~ | % 38 + f4. f8 ~ f ( e ) e4 | % 38 % C section - r1 | % - r1 | % - r2 r8 c8 d e ~ | % - e8 c d e ~ e c4. | % - r1 | % - r1 | % - r2 r8 c8 d e ~ | % - e8 c d e ~ e e16 ( f e4 ) | % - r1 | % - r1 | % - r2 r8 c8 d e ~ | % - e8 c d e ~ e c4. | % - r2 r8 c8 d e ~ | % - e8 c d e ~ e e16 ( f e4 ) | % - r2 r8 c8 d e ~ | % - e8 c d e ~ e c4. | % + r1 | % + r1 | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e c4. | % + r1 | % + r1 | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e e16 ( f e4 ) | % + r1 | % + r1 | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e c4. | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e e16 ( f e4 ) | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e c4. | % % B section @@ -196,26 +187,26 @@ LeadVox = \relative c' e4 r r c | % 35 g'4. g8 ~ g ( d ) d4 ~ | % 36 d4 r c8 d4 c8 | % 37 - f4. f8 ~ f ( e ) e4 ~ | % 38 + f4. f8 ~ f ( e ) e4 | % 38 % C section - r2 r8 c8 d e ~ | % - e8 c d e ~ e c4. | % - r2 r8 c8 d e ~ | % - e8 c d e ~ e c4. | % - r2 r8 c8 d e ~ | % - e8 c d e ~ e e16 ( f e4 ) | % - r1 | % - r1 | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e c4. | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e c4. | % + r2 r8 c8 d e ~ | % + e8 c d e ~ e e16 ( f e4 ) | % + r1 | % + r1 | % % Outro - r1 | % - e4. d8 ~ d4 e ~ | % - e2 r4 c | % - e4. d8 ~ d4 c ~ | % - c1-\fermata | % + r1 | % + e4. d8 ~ d4 e ~ | % + e2 r4 c | % + e4. d8 ~ d4 c ~ | % + c1-\fermata | % } @@ -293,9 +284,6 @@ LeadVoxTextD = \lyricmode Riffs = \relative c' { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro @@ -414,20 +402,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... -% Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash \override MultiMeasureRest #'expand-limit = 1 - -%Not small enough... \teeny -% \magnify #0.3 % Intro @@ -551,20 +531,12 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff - << - \new ChordNames \transpose c 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 c g \LeadVox \new Voice \transpose c g \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText @@ -572,17 +544,25 @@ Dynamics = \new Lyrics \lyricsto "lead" \LeadVoxTextC \new Lyrics \lyricsto "lead" \LeadVoxTextD >> + + \new ChoirStaff + << + \new ChordNames \transpose c g \Chords +%Capo 4 edition +% \new ChordNames \transpose b g \Chords + \new RhythmicStaff << \Rhythm \Dynamics >> + >> >> } \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))) % Spread staves vertically across last page (default: t) ragged-last-bottom = ##f @@ -593,6 +573,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) } +