X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=the-church%27s-one-foundation.ly;h=087166af1e6ef9e42e7626f3c7d1929c230be93a;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=ecc908d2cd74d7f4f3c3530235a94d3d7284d7e0;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music diff --git a/the-church's-one-foundation.ly b/the-church's-one-foundation.ly index ecc908d..087166a 100644 --- a/the-church's-one-foundation.ly +++ b/the-church's-one-foundation.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) @@ -14,28 +14,37 @@ staffSize = #20 { title = \markup { \override #'(font-family . sans) \fontsize #3.5 "The Church’s One Foundation" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Samuel S. Wesley/Samuel J. Stone" } - arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Hammons/Dannemiller" } + arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. S. Hammons/S. Dannemiller" } tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) } % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse - \partial 4*1 fs4 | % 0 + \partial 4*1 s4 | % 0 + s1*15 | % 1-15 + \partial 4*3 s2. \bar "|." % 16 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Verse + + fs4 | % 0 fs4 fs g fs | % 1 fs2 e4 d | % 2 d4 b' a g | % 3 @@ -54,9 +63,10 @@ LeadVox = \relative c' fs4 fs g fs | % 13 fs2 e4 d | % 14 d4 e d cs | % 15 - \partial 4*3 d2. \bar "|." % 16 + d2. | % 16 } + LeadVoxText = \lyricmode { The Church -- ’s one foun -- da -- tion is Je -- sus Christ her Lord, @@ -93,14 +103,9 @@ LeadVoxTextD = \lyricmode % % Chord names % - Chords = \chordmode { - \override SeparatingGroupSpanner #'padding = #'2.0 -%Bah, can't we set this globally? -% \popChords - - \partial 4*1 s4 | % 0 + s4 | % 0 d2 g4 d | % 1 d2 g | % 2 e2:m7 a:7 | % 3 @@ -127,21 +132,18 @@ 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... - %Slash = { \override NoteHead #'style = #'slash } %Cross = { \override NoteHead #'style = #'cross } StaffC = \relative c { - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Verse - \partial 4*1 r4 | % 0 + r4 | % 0 c4 c c c | % 1 c4 c c c | % 2 c4 c c c | % 3 @@ -160,7 +162,7 @@ StaffC = \relative c c4 c c c | % 13 c4 c c c | % 14 c4 c c c | % 15 - c2. \bar "|." % 16 + c2. | % 16 } @@ -189,40 +191,45 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \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 \new Lyrics \lyricsto "lead" \LeadVoxTextD >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords + \new RhythmicStaff << \StaffC \Dynamics >> >> \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))) - -% top-margin = -0.25 \in + #(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 } +