From bd3b595932c04f7eb329df944c474f89bce236af Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Sat, 16 Sep 2017 20:53:00 -0500 Subject: [PATCH] Update to ensure charts work with latest version of Lilypond. --- above-all.ly | 58 +- agnus-dei.ly | 47 +- all-creatures-of-our-god-and-king.ly | 22 +- almighty.ly | 61 +- amazing-love.ly | 695 +++++++++---------- angels-we-have-heard-on-high.ly | 56 +- as-the-deer.ly | 39 +- away-in-a-manger.ly | 50 +- be-still-and-know.ly | 40 +- be-thou-my-vision.ly | 71 +- better-is-one-day.ly | 27 +- bless-the-lord-o-my-soul.ly | 42 +- blessed-assurance.ly | 33 +- blessed-be-your-name.ly | 58 +- blessed-quietness-satb.ly | 20 +- breathe.ly | 61 +- brethren-we-have-met-to-worship.ly | 53 +- change-my-heart-o-god.ly | 50 +- child-of-love.ly | 46 +- come-and-see.ly | 41 +- come-just-as-you-are.ly | 31 +- come-let-us-worship-and-bow-down.ly | 58 +- come-now-is-the-time-to-worship.ly | 48 +- come-thou-fount-of-every-blessing.ly | 88 +-- create-in-me-a-clean-heart.ly | 240 +++---- creation-song.ly | 23 +- do-you-know.ly | 313 ++++----- fall-on-me.ly | 65 +- father's-will.ly | 1 + forever.ly | 24 +- from-the-inside-out.ly | 26 +- fum-fum-fum.ly | 17 +- give-thanks.ly | 39 +- go-tell-it-on-the-mountain-chorus.ly | 12 +- go-tell-it-on-the-mountain.ly | 72 +- god-is-great.ly | 524 +++++++------- god-is-my-redeemer.ly | 309 +++++---- god-of-our-fathers.ly | 12 +- god-of-wonders.ly | 58 +- great-is-the-lord.ly | 44 +- hallelujah.ly | 61 +- have-thine-own-way-lord-satb.ly | 26 +- he-knows-my-name.ly | 283 ++++---- he-leadeth-me.ly | 373 +++++----- he-who-began-a-good-work-in-you.ly | 576 +++++++-------- here-i-am-to-worship.ly | 74 +- holy-is-the-lord.ly | 84 +-- horizon-storm.ly | 2 +- hosanna-loud-hosanna.ly | 118 ++-- i-could-sing-of-your-love-forever.ly | 388 +++++------ i-have-decided-to-follow-jesus-shortened.ly | 4 +- i-have-decided-to-follow-jesus.ly | 79 +-- i-see-the-lord.ly | 67 +- i-stand-amazed-in-the-presence.ly | 270 ++++--- i-will-never-be.ly | 253 ++++--- i-will-praise-him-still.ly | 488 ++++++------- if-we-are-the-body.ly | 43 +- in-christ-alone.ly | 74 +- in-the-secret.ly | 426 ++++++------ infant-holy-infant-lowly.ly | 123 ++-- jesus-all-for-jesus.ly | 429 ++++++------ jesus-draw-me-close.ly | 300 ++++---- jesus-is-just-alright.ly | 621 ++++++++--------- joy-to-the-world+hark-the-herald.ly | 500 +++++++------ lamb-of-god.ly | 61 +- leaning-on-the-everlasting-arms.ly | 479 ++++++------- linus-and-lucy.ly | 47 +- lo-how-a-rose-e'er-blooming.ly | 37 +- lord-i-lift-your-name-on-high.ly | 185 +++-- lord-you-have-my-heart.ly | 565 ++++++++------- more-love-more-power.ly | 487 ++++++------- mourning-into-dancing.ly | 73 +- my-redeemer-lives.ly | 396 ++++++----- no-higher-calling.ly | 455 ++++++------ nothing-but-the-blood.ly | 368 ++++------ o-come-all-ye-faithful.ly | 150 ++-- o-come-o-come-emmanuel.ly | 409 +++++------ o-for-a-thousand-tongues.ly | 337 +++++---- o-holy-night.ly | 102 ++- o-little-town-of-bethlehem.ly | 272 +++----- one-small-child.ly | 89 +-- open-the-eyes-of-my-heart.ly | 369 +++++----- oxygen.ly | 495 +++++++------ refiner's-fire.ly | 304 ++++---- search-my-heart.ly | 129 ++-- shout-to-the-lord.ly | 24 +- shout-to-the-north.ly | 548 +++++++-------- show-me-your-glory.ly | 61 +- show-me-your-ways-o-lord.ly | 425 +++++------- silent-night.ly | 294 ++++---- spirit-of-god-descend-upon-my-heart-satb.ly | 84 +-- spirit-of-the-living-god.ly | 270 ++++--- stand-in-the-congregation.ly | 432 ++++++------ take-my-life-and-let-it-be-consecrated-sa.ly | 2 +- take-my-life-and-let-it-be-consecrated.ly | 237 +++---- template.ly | 334 +++++---- the-apostle's-creed.ly | 57 +- the-church's-one-foundation.ly | 93 +-- the-first-noel.ly | 409 ++++++----- the-heart-of-worship.ly | 430 ++++++------ the-lord's-prayer.ly | 53 +- there's-a-sweet-sweet-spirit.ly | 31 +- there-is-a-rock.ly | 69 +- this-is-my-father's-world-satb.ly | 85 ++- this-little-light-of-mine.ly | 72 +- wait-by-the-water.ly | 79 +-- we-are-an-offering.ly | 247 ++++--- we-are-one-in-the-spirit-vocals.ly | 52 +- we-are-one-in-the-spirit.ly | 57 +- we-fall-down.ly | 53 +- we-three-kings.ly | 464 ++++++------- we-will-glorify.ly | 39 +- we-will-worship-the-lamb-of-glory.ly | 241 +++---- what-child-is-this.ly | 402 +++++------ who-am-i.ly | 57 +- wonderful-merciful-savior.ly | 344 +++++---- word-of-god-speak.ly | 165 +---- worthy-of-my-praise.ly | 349 +++++----- you-are-my-all-in-all.ly | 206 +++--- you-have-been-good.ly | 68 +- 120 files changed, 9937 insertions(+), 11941 deletions(-) diff --git a/above-all.ly b/above-all.ly index cf9c8d9..4585099 100644 --- a/above-all.ly +++ b/above-all.ly @@ -12,8 +12,6 @@ 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 "Above All" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Michael W. Smith" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -24,23 +22,19 @@ staffSize = #18 % % Lead vocal % - LeadVox = \relative c'' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key bf \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \tiny r2 r8 d f bf | % 1 c8.f,16 f4 ~ f ~ f8 bf16 a | % 2 bf8. ef,16 ef4 ~ ef d | % 3 - 2 \normalsize r8 f,16 f ~ f bf8. \bar "||:" % 4 + 2 \normalsize r8 f,16 f ~ f bf8. \bar ".|:-||" % 4 % Verse @@ -152,12 +146,8 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro bf1:sus2 | % 1 @@ -235,18 +225,17 @@ Chords = \chordmode StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro c4 c c c | % 1 c4 c c c | % 2 c4 c c c | % 3 - c4 c c c \bar "||:" % 4 + c4 c c c \bar ".|:-||" % 4 % Verse @@ -312,36 +301,41 @@ StaffC = \relative c \score { << + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } + \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 { \RemoveEmptyStaffContext } -% 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" + "JazzText" + "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 } + diff --git a/agnus-dei.ly b/agnus-dei.ly index 66420d2..ed56d09 100644 --- a/agnus-dei.ly +++ b/agnus-dei.ly @@ -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 "Agnus Dei" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Michael W. Smith" } % arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \once \override TextScript #'padding = #2.0 @@ -47,7 +45,7 @@ Global = % Intro - s1*4 \bar "||:" % 1-4 + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { @@ -85,7 +83,7 @@ LeadVox = \relative c' { % \set Staff.instrument = #"Lead vox" \clef G - \override Staff.TimeSignature #'style = #'() +% \override Staff.TimeSignature #'style = #'() %Hm. Needed anymore? % \override Score.SpacingSpanner #'average-spacing-wishes = ##f @@ -121,6 +119,7 @@ LeadVox = \relative c' r1 | % 21 } + LeadVoxText = \lyricmode { Al -- _ _ le -- lu -- _ ia, _ @@ -200,14 +199,12 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 + % Intro c4 c c c | % 1 @@ -264,32 +261,32 @@ Dynamics = \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 >> - >> + \Global % The "roadmap" that everything else depends on - \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 ChordNames \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" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) ragged-last-bottom = ##f @@ -300,6 +297,4 @@ 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) } diff --git a/all-creatures-of-our-god-and-king.ly b/all-creatures-of-our-god-and-king.ly index bb806ea..e48a28d 100644 --- a/all-creatures-of-our-god-and-king.ly +++ b/all-creatures-of-our-god-and-king.ly @@ -25,7 +25,7 @@ staffSize = #20 Global = { \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 6/4 s1.*8 \bar "|." % 1-16 @@ -123,8 +123,9 @@ Chords = \chordmode %Cross = { \override NoteHead #'style = #'cross } Rhythm = \relative c { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Verse @@ -136,7 +137,7 @@ Rhythm = \relative c c4 c c c c c | % 5 c4 c c c c c | % 6 c4 c c c c c | % 7 - c4 c c c c c \bar "|." % 8 + c4 c c c c c | % 8 } @@ -165,7 +166,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << @@ -193,11 +194,11 @@ 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" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) % ragged-last-bottom = ##f @@ -208,6 +209,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) } + diff --git a/almighty.ly b/almighty.ly index c209d90..df6f448 100644 --- a/almighty.ly +++ b/almighty.ly @@ -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 "Almighty" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Gary Oliver" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -24,18 +22,12 @@ staffSize = #20 % % Lead vocal % - LeadVox = \relative c'' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"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 @@ -126,6 +118,7 @@ LeadVox = \relative c'' g1^\fermata^\markup { \italic { On cue } } \bar "|." } + LeadVoxText = \lyricmode { Al -- migh -- _ ty, most ho -- _ ly God _ @@ -182,16 +175,14 @@ LeadVoxTextB = \lyricmode % % Instrumental lines % - RhythmB = \relative c' { \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" \clef G \key d \major - \time 4/4 + \time 4/4 -%This structure, BTW, is totally wrong (from a different song) +%This structure, BTW, is totally wrong (from a different song) % Intro r1 | @@ -262,9 +253,6 @@ RhythmB = \relative c' Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s1 \bar "||" @@ -345,10 +333,10 @@ s1 | StaffC = \relative c { \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature + \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro @@ -425,35 +413,42 @@ 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 ChoirStaff = "Rhythm" + \new ChoirStaff << % \new Staff = "riff" \RhythmB - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC + \new ChordNames \Chords + \new RhythmicStaff \StaffC >> \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() >> - \layout { -% 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" + "JazzText" + "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 } + diff --git a/amazing-love.ly b/amazing-love.ly index 5476994..2c21305 100644 --- a/amazing-love.ly +++ b/amazing-love.ly @@ -1,348 +1,347 @@ -\version "2.16.0" -\include "pop-chords.ly" -\include "english.ly" - -% Good sizes are 16, 18, & 20 -staffSize = #18 -#(set-default-paper-size "letter") -#(set-global-staff-size staffSize) -#(ly:set-option (quote no-point-and-click)) - -%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %} - -\header -{ - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Amazing Love" } - composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Graham Kendrick" } - arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" } - tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) -} - - -% -% Lead vocal -% - -LeadVox = \relative c' -{ -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" - \override Staff.TimeSignature #'style = #'() - \clef G - \key d \major - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - - % Intro - - R1^\markup { Moderate half time feel } | % 1 - r2 r4 e | % 2 - - \repeat volta 3 - { - % Verse - -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - fs1 ~ | % 3 - fs2. fs4 | % 4 - fs4. e8 g2 ~ | % 5 - g2. e4 | % 6 - e1 ~ | % 7 - e2. g4 | % 8 - g4. ( fs8 ) fs2 | % 9 - r2 r4 e | % 10 - fs1 ~ | % 11 - fs2. fs4 | % 12 - fs4. e8 g2 ~ | % 13 - g2. r4 | % 14 - b1 | % 15 - a1 | % 16 - d1 ~ | % 17 - d2 r4 d \bar "||" % 18 - - % Chorus - -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - c4. b8 a2 ~ | % 19 - a2 g4 a | % 20 - a4. d,8 d2 ~ | % 21 - d2 r4 d' | % 22 - c4. b8 a2 ~ | % 23 - a2 g8 g a4 | % 24 - a1 ~ | % 25 - a2 r4 d | % 26 - - c4. b8 a2 ~ | % 27 - a2 g4 a | % 28 - a4. d,8 d2 ~ | % 29 - d2. fs4 | % 30 - g4. ( fs8 e2 ) ~ | % 31 - e2 b'4. ( a8 ) | % 32 - a1 ~ | % 33 - a2. fs4 | % 34 - g4. ( fs8 e2 ) ~ | % 35 - e2 b'4. ( a8 ) | % 36 - } - \alternative - { - { - a1 | % 37 - r2 r4 e | % 38 - } - { - a1 ~ | % 39 - } - } - - % Ending - - a2. fs4 \bar "||" % 40 - -%\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } } - - g4. ( fs8 e2 ) ~ | % 41 - e2^\fermata \breathe d' | % 42 - d1 ~ | % 43 - d1 | % 44 - R1 | % 45 - R1 | % 46 - r1^\fermata \bar "|." % 47 -} - - -LeadVoxText = \lyricmode -{ - My Lord, __ _ what love is this _ - that pays __ _ so dear -- _ ly; - That I, __ _ the guil -- ty one _ - may go free? __ _ - - A -- ma -- zing love, __ _ O what sac -- ri -- fice __ _ - The Son of God __ _ gi -- ven for me; __ _ - My debt he pays __ _ and my death he dies __ _ - That I __ _ _ _ might _ live, __ _ that I __ _ _ _ might _ live. - - And - live, __ _ - - that I __ _ _ _ might live. __ _ -} - -LeadVoxTextB = \lyricmode -{ - _ so, __ _ they watched him die _ - de -- spised, __ _ re -- jec -- _ ted; - But O, __ _ the blood he shed _ - flowed for me! __ -} - -LeadVoxTextC = \lyricmode -{ - _ now __ _ this love of Christ _ - shall flow __ _ like ri -- _ vers; - Come wash __ _ your guilt a -- way, _ - live a -- gain! __ -} - - -% -% Chord names -% - -Chords = \chordmode -{ -%Bah, can't we set this globally? -% \popChords - - % Intro - - d1 | % 1 - a2:sus4.7 a:7 | % 2 - - % Verse - - d1 | % 3 - s1 | % 4 - s2 e:m7 | % 5 - s1 | % 6 - a1:sus4.7 | % 7 - a1:7 | % 8 - g2 d | % 9 - s2 a:sus4.7 | % 10 - d1 | % 11 - s1 | % 12 - s2 e:m7 | % 13 - s1 | % 14 - g1 | % 15 - a1 | % 16 - d1 | % 17 - d4.:sus4 d s4 | % 18 - - % Chorus - - a1:m7 | % 19 - s1 | % 20 - d2.. d8:sus4 | % 21 - s4. d2 s8 | % 22 - f1:maj7 | % 23 - s1 | % 24 - a2..:sus2 a8 | % 25 - s1 | % 26 - - a1:m7 | % 27 - s1 | % 28 - d2.. d8:sus4 | % 29 - s4. d2 s8 | % 30 - a1:m7 | % 31 - s2 g | % 32 - d1 | % 33 - s1 | % 34 - a1:m7 | % 35 - s2 g | % 36 - - d1 | % 37 - s2 a:sus4.7 | % 38 - - d1 | % 39 - - % Ending - - s1 | % 40 - a1:m7 | % 41 - c1 | % 42 - d1 | % 43 - s1 | % 44 - a1:m7 | % 45 - c1 | % 46 - d1 | % 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.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 - \override NoteHead #'style = #'slash - - % Intro - - c4 c c c | % 1 - c4. c c4 | % 2 - - \repeat volta 3 - { - % Verse - - c4_\markup { \italic { fingerpick throughout verses } } c c c | % 3 - c4 c c c | % 4 - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4. c c4 \bar "||" % 18 - - % Chorus - - c4 r8 c c4 r8 c ~ | % 19 - c8 c c4 c8 c c4 | % 20 - c4 r8 c c4 c8 c ~ | % 21 - c8 c4 c8 ~ c c c4 | % 22 - c4 r8 c c4 r8 c | % 23 - r8 c c4 c8 c c4 | % 24 - c4 c c8 c r c | % 25 - r8 c c4 c8 c c c | % 26 - - c4 r8 c c4 r8 c ~ | % 27 - c8 c c4 c8 c c4 | % 28 - c4 r8 c c4 c8 c ~ | % 29 - c8 c4 c8 c4 c | % 30 - c4 r8 c c4 r8 c ~ | % 31 - c8 c c c c4 c8 c | % 32 - c4 r8 c c4 r8 c | % 33 - r8 c c4 c8 c c4 | % 34 - c4 r8 c c4 r8 c ~ | % 35 - c8 c c c c4. c8 | % 36 - } - \alternative - { - { - c4 r8 c c4 r8 c ~ | % 37 - c8 c c4 c2 | % 38 - } - { - c4 r8 c c4 c8 c ~ | % 39 - } - } - - % Ending - - c8 c c4 c8 c c4 \bar "||" % 40 - - c4 r8 c c4 c8 c | % 41 - c1^\fermata | % 42 - c4_\markup { \italic { a tempo } } c c c | % 43 - c4 c c c | % 44 - c4 c c c_\markup { \italic { rit. } } | % 45 - c4 c c c | % 46 - c1^\fermata \bar "|." % 47 -} - - -\score -{ - << -% \new ChoirStaff = "Vox" - << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Lyrics \lyricsto "lead" \LeadVoxText - \new Lyrics \lyricsto "lead" \LeadVoxTextB - \new Lyrics \lyricsto "lead" \LeadVoxTextC - >> - - \new ChoirStaff = "Rhythm" - << -% \new Staff = "riff" \RhythmB - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC - >> - - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() - >> - \layout - { -% ragged-last-bottom = ##t - ragged-last = ##t - } -} - - -\paper -{ - #(define fonts (make-pango-font-tree - "Times New Roman" - "DomCasual BT" - "Luxi Mono" - (/ staffSize 20))) -} +\version "2.16.0" +\include "pop-chords.ly" +\include "english.ly" + +% Good sizes are 16, 18, & 20 +staffSize = #18 +#(set-default-paper-size "letter") +#(set-global-staff-size staffSize) +#(ly:set-option (quote no-point-and-click)) + +%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %} + +\header +{ + title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Amazing Love" } + composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Graham Kendrick" } + arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" } + tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) +} + + +% +% Lead vocal +% + +LeadVox = \relative c' +{ + \numericTimeSignature + \clef G + \key d \major + \time 4/4 +\override Score.SpacingSpanner #'average-spacing-wishes = ##f + + % Intro + + R1^\markup { Moderate half time feel } | % 1 + r2 r4 e | % 2 + + \repeat volta 3 + { + % Verse + +\mark \markup { \override #'(font-family . sans) { \box { A } } } + + fs1 ~ | % 3 + fs2. fs4 | % 4 + fs4. e8 g2 ~ | % 5 + g2. e4 | % 6 + e1 ~ | % 7 + e2. g4 | % 8 + g4. ( fs8 ) fs2 | % 9 + r2 r4 e | % 10 + fs1 ~ | % 11 + fs2. fs4 | % 12 + fs4. e8 g2 ~ | % 13 + g2. r4 | % 14 + b1 | % 15 + a1 | % 16 + d1 ~ | % 17 + d2 r4 d \bar "||" % 18 + + % Chorus + +\mark \markup { \override #'(font-family . sans) { \box { B } } } + + c4. b8 a2 ~ | % 19 + a2 g4 a | % 20 + a4. d,8 d2 ~ | % 21 + d2 r4 d' | % 22 + c4. b8 a2 ~ | % 23 + a2 g8 g a4 | % 24 + a1 ~ | % 25 + a2 r4 d | % 26 + + c4. b8 a2 ~ | % 27 + a2 g4 a | % 28 + a4. d,8 d2 ~ | % 29 + d2. fs4 | % 30 + g4. ( fs8 e2 ) ~ | % 31 + e2 b'4. ( a8 ) | % 32 + a1 ~ | % 33 + a2. fs4 | % 34 + g4. ( fs8 e2 ) ~ | % 35 + e2 b'4. ( a8 ) | % 36 + } + \alternative + { + { + a1 | % 37 + r2 r4 e | % 38 + } + { + a1 ~ | % 39 + } + } + + % Ending + + a2. fs4 \bar "||" % 40 + +%\once \override Score.RehearsalMark #'self-alignment-X = #left +\mark \markup { \override #'(font-family . sans) { \box { C } } } + + g4. ( fs8 e2 ) ~ | % 41 + e2^\fermata \breathe d' | % 42 + d1 ~ | % 43 + d1 | % 44 + R1 | % 45 + R1 | % 46 + r1^\fermata \bar "|." % 47 +} + + +LeadVoxText = \lyricmode +{ + My Lord, __ _ what love is this _ + that pays __ _ so dear -- _ ly; + That I, __ _ the guil -- ty one _ + may go free? __ _ + + A -- ma -- zing love, __ _ O what sac -- ri -- fice __ _ + The Son of God __ _ gi -- ven for me; __ _ + My debt he pays __ _ and my death he dies __ _ + That I __ _ _ _ might _ live, __ _ that I __ _ _ _ might _ live. + + And + live, __ _ + + that I __ _ _ _ might live. __ _ +} + +LeadVoxTextB = \lyricmode +{ + _ so, __ _ they watched him die _ + de -- spised, __ _ re -- jec -- _ ted; + But O, __ _ the blood he shed _ + flowed for me! __ +} + +LeadVoxTextC = \lyricmode +{ + _ now __ _ this love of Christ _ + shall flow __ _ like ri -- _ vers; + Come wash __ _ your guilt a -- way, _ + live a -- gain! __ +} + + +% +% Chord names +% +Chords = \chordmode +{ + % Intro + + d1 | % 1 + a2:sus4.7 a:7 | % 2 + + % Verse + + d1 | % 3 + s1 | % 4 + s2 e:m7 | % 5 + s1 | % 6 + a1:sus4.7 | % 7 + a1:7 | % 8 + g2 d | % 9 + s2 a:sus4.7 | % 10 + d1 | % 11 + s1 | % 12 + s2 e:m7 | % 13 + s1 | % 14 + g1 | % 15 + a1 | % 16 + d1 | % 17 + d4.:sus4 d s4 | % 18 + + % Chorus + + a1:m7 | % 19 + s1 | % 20 + d2.. d8:sus4 | % 21 + s4. d2 s8 | % 22 + f1:maj7 | % 23 + s1 | % 24 + a2..:sus2 a8 | % 25 + s1 | % 26 + + a1:m7 | % 27 + s1 | % 28 + d2.. d8:sus4 | % 29 + s4. d2 s8 | % 30 + a1:m7 | % 31 + s2 g | % 32 + d1 | % 33 + s1 | % 34 + a1:m7 | % 35 + s2 g | % 36 + + d1 | % 37 + s2 a:sus4.7 | % 38 + + d1 | % 39 + + % Ending + + s1 | % 40 + a1:m7 | % 41 + c1 | % 42 + d1 | % 43 + s1 | % 44 + a1:m7 | % 45 + c1 | % 46 + d1 | % 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 +{ + \numericTimeSignature + \time 4/4 + \override NoteHead #'style = #'slash + \teeny + + % Intro + + c4 c c c | % 1 + c4. c c4 | % 2 + + \repeat volta 3 + { + % Verse + + c4_\markup { \italic { fingerpick throughout verses } } c c c | % 3 + c4 c c c | % 4 + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4. c c4 \bar "||" % 18 + + % Chorus + + c4 r8 c c4 r8 c ~ | % 19 + c8 c c4 c8 c c4 | % 20 + c4 r8 c c4 c8 c ~ | % 21 + c8 c4 c8 ~ c c c4 | % 22 + c4 r8 c c4 r8 c | % 23 + r8 c c4 c8 c c4 | % 24 + c4 c c8 c r c | % 25 + r8 c c4 c8 c c c | % 26 + + c4 r8 c c4 r8 c ~ | % 27 + c8 c c4 c8 c c4 | % 28 + c4 r8 c c4 c8 c ~ | % 29 + c8 c4 c8 c4 c | % 30 + c4 r8 c c4 r8 c ~ | % 31 + c8 c c c c4 c8 c | % 32 + c4 r8 c c4 r8 c | % 33 + r8 c c4 c8 c c4 | % 34 + c4 r8 c c4 r8 c ~ | % 35 + c8 c c c c4. c8 | % 36 + } + \alternative + { + { + c4 r8 c c4 r8 c ~ | % 37 + c8 c c4 c2 | % 38 + } + { + c4 r8 c c4 c8 c ~ | % 39 + } + } + + % Ending + + c8 c c4 c8 c c4 \bar "||" % 40 + + c4 r8 c c4 c8 c | % 41 + c1^\fermata | % 42 + c4_\markup { \italic { a tempo } } c c c | % 43 + c4 c c c | % 44 + c4 c c c_\markup { \italic { rit. } } | % 45 + c4 c c c | % 46 + c1^\fermata \bar "|." % 47 +} + + +\score +{ + << + \context Staff + << + \new Voice = "lead" \LeadVox + \new Lyrics \lyricsto "lead" \LeadVoxText + \new Lyrics \lyricsto "lead" \LeadVoxTextB + \new Lyrics \lyricsto "lead" \LeadVoxTextC + >> + + \new ChoirStaff + << +% \new Staff = "riff" \RhythmB + \new ChordNames \Chords + \new RhythmicStaff \StaffC + >> + + \set Score.skipBars = ##t + \set Score.melismaBusyProperties = #'() + >> +} + + +\paper +{ + #(define fonts (make-pango-font-tree + "Times New Roman" + "JazzText" + "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 +} + diff --git a/angels-we-have-heard-on-high.ly b/angels-we-have-heard-on-high.ly index a560c93..e237fbb 100644 --- a/angels-we-have-heard-on-high.ly +++ b/angels-we-have-heard-on-high.ly @@ -8,12 +8,10 @@ staffSize = #18 #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) -%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %} +%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %} \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Angels We Have Heard On High" } % subtitle = \markup { \override #'(font-family . sans) \fontsize #1.5 "Capo 3 Version" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } @@ -25,14 +23,11 @@ staffSize = #18 % % Lead vocal % - LeadVox = \relative c'' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override Score.SpacingSpanner #'average-spacing-wishes = ##f @@ -52,7 +47,7 @@ LeadVox = \relative c'' s1 | % 9 s1 | % 10 s1 | % 11 - s1 \bar "||:" % 12 + s1 \bar ".|:-||" % 12 \repeat volta 2 { @@ -151,7 +146,7 @@ LeadVox = \relative c'' LeadVoxText = \lyricmode { An -- gels we have heard on high - sweet -- ly sing -- ing o’er the plains, + sweet -- ly sing -- ing o’er the plains, And the moun -- tains in re -- ply e -- cho back their joy -- ous strains. @@ -188,7 +183,7 @@ Riffs = \relative c' { \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override Score.SpacingSpanner #'average-spacing-wishes = ##f @@ -211,12 +206,8 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro f4 s8. bf2:sus2/f s16 | % 1 @@ -325,11 +316,10 @@ Chords = \chordmode StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro @@ -345,7 +335,7 @@ StaffC = \relative c c4-> c-> c-> c-> | % 9 c4 c c c | % 10 c4-> c8. c16-> ~ c4 c | % 11 - c4-> c8. c16-> ~ c4 c \bar "||:" % 12 + c4-> c8. c16-> ~ c4 c \bar ".|:-||" % 12 \repeat volta 2 { @@ -458,31 +448,24 @@ Dynamics = \score { << + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords + \new ChordNames \Chords % Capo 3 version % \new ChordNames = "chords" \transpose f d \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new RhythmicStaff << \StaffC \Dynamics >> >> \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() >> - - \layout - { -% \context { \Staff \RemoveEmptyStaves } -% ragged-last-bottom = ##t - ragged-last = ##t - } } @@ -490,9 +473,18 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) -% top-margin = -0.25 \in +% 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 } + diff --git a/as-the-deer.ly b/as-the-deer.ly index 86ebac9..73932b0 100644 --- a/as-the-deer.ly +++ b/as-the-deer.ly @@ -20,20 +20,6 @@ staffSize = #20 tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) } - -%{ -tweak = #(define-music-function (parser location sym val arg) - (symbol? scheme? ly:music?) - - "Add @code{sym . val} to the @code{tweaks} property of @var{arg}." - - (set! - (ly:music-property arg 'tweaks) - (acons sym val - (ly:music-property arg 'tweaks))) - arg) -%} - % Useful tweak abbreviations (hn = harmony note) hn = #(define-music-function (parser location arg) (ly:music?) @@ -49,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -234,9 +220,10 @@ LeadVoxTextB = \lyricmode e -- ven though you _ are a king, I love you more than a -- ny o -- ther - so much more than a -- ny -- thing. + so much more than a -- ny -- thing. _ } + % % Riffs % @@ -264,9 +251,6 @@ Riffs = \relative c' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro c2 e:m/b | % 1 @@ -344,8 +328,9 @@ Chords = \chordmode Rhythm = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -439,11 +424,11 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << - \context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >> + << \new Voice = "lead" \LeadVox \new Voice \Riffs >> \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> @@ -464,12 +449,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" - "Luxi Mono" - (/ staffSize 20))) - #(define fonts (make-pango-font-tree - "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -482,6 +462,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) } + diff --git a/away-in-a-manger.ly b/away-in-a-manger.ly index 5f7051f..f5ca915 100644 --- a/away-in-a-manger.ly +++ b/away-in-a-manger.ly @@ -27,13 +27,13 @@ staffSize = #20 Global = { \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Intro \partial 4*1 s4 \bar "||" % 0 - s2.*5 \bar "||:" % 1-5 + s2.*5 \bar ".|:-||" % 1-5 \repeat volta 2 { @@ -72,12 +72,12 @@ LeadVox = \relative c'' % Intro - \partial 4*1 s4 \bar "||" % 0 + \partial 4*1 s4 | % 0 s2. | % 1 s2. | % 2 s2. | % 3 s2. | % 4 - s2 c4 \bar "||:" % 5 + s2 c4 | % 5 % Verse @@ -102,7 +102,7 @@ LeadVox = \relative c'' f,2. ~ | % 23 - f2 c'4 \bar "||" % 24 + f2 c'4 | % 24 % Last verse @@ -121,7 +121,7 @@ LeadVox = \relative c'' bf'4. a8 g4 | % 37 a4 g f | % 38 g d e | % 39 - f2.^\fermata \bar "|." % 40 + f2.^\fermata | % 40 } LeadVoxText = \lyricmode @@ -170,12 +170,8 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro \partial 4*1 s4 | % 0 @@ -225,10 +221,9 @@ Chords = \chordmode Rhythm = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -237,7 +232,7 @@ Rhythm = \relative c c4 c c | % 2 c4 c c | % 3 c4 c c | % 4 - c4 c c \bar "||:" % 5 + c4 c c \bar ".|:-||" % 5 % Verse @@ -283,10 +278,16 @@ Dynamics = \score { << - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() + \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 Staff + \new ChoirStaff << \new ChordNames \Chords %Capo 4 edition @@ -294,14 +295,8 @@ Dynamics = \new RhythmicStaff << \Rhythm \Dynamics >> >> - \new 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 - >> + \set Score.skipBars = ##t + \set Score.melismaBusyProperties = #'() >> } @@ -310,7 +305,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -323,6 +318,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) } + diff --git a/be-still-and-know.ly b/be-still-and-know.ly index e39ada7..ff8f115 100644 --- a/be-still-and-know.ly +++ b/be-still-and-know.ly @@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key b \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Intro @@ -49,7 +49,7 @@ Global = % Intro - s2.*8 \bar "||:" % 1-8 + s2.*8 \bar ".|:-||" % 1-8 \repeat volta 2 { @@ -92,11 +92,7 @@ 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 @@ -194,8 +190,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -328,10 +322,9 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -430,22 +423,22 @@ Dynamics = \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff + \context Staff << - \new ChordNames \Chords -%Capo 4 edition -% \new ChordNames \transpose b g \Chords - \new RhythmicStaff << \Rhythm \Dynamics >> - >> - - \new Staff - << - \Global % The "roadmap" that everything else depends on + \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 >> + >> >> } @@ -454,7 +447,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -467,6 +460,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) } + diff --git a/be-thou-my-vision.ly b/be-thou-my-vision.ly index dcf768c..6e55379 100644 --- 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 } + diff --git a/better-is-one-day.ly b/better-is-one-day.ly index 6645e16..15a68de 100644 --- a/better-is-one-day.ly +++ b/better-is-one-day.ly @@ -35,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -124,16 +124,6 @@ Global = \mark \markup { \override #'(font-family . sans) { \box { F } } } s1*7 \bar "|." % 60-66 - -%{ - -% \once \override TextScript #'padding = #2.0 -% s1*0^\markup { \large \bold { Moderately fast pop } } -%%Capo 3 version -%% s1*0^\markup { \large \bold { Moderately fast pop "(*** CAPO 3 ***)" } } -% s1*13 \bar "||:" % 1-13 - -%} } @@ -147,9 +137,7 @@ LeadVox = \relative c' % Intro - r1 | % 1 - r1 | % 2 - r1 | % 3 + R1*3 | % 1-3 r2 r4 r8 e | % 4 % Verse @@ -336,9 +324,6 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro e1:sus2 | % 1 @@ -443,8 +428,9 @@ Chords = \chordmode Rhythm = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -564,7 +550,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << @@ -598,7 +584,7 @@ Dynamics = (/ staffSize 20))) % Don't spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% 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) @@ -607,3 +593,4 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t } + diff --git a/bless-the-lord-o-my-soul.ly b/bless-the-lord-o-my-soul.ly index e4e952c..6f7b638 100644 --- a/bless-the-lord-o-my-soul.ly +++ b/bless-the-lord-o-my-soul.ly @@ -3,7 +3,7 @@ \include "english.ly" % Good sizes are 16, 18, & 20 -staffSize = #16 +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Bless The Lord, O My Soul" } subtitle = \markup { \override #'(font-family . sans) \fontsize #1.3 "(10,000 Reasons)" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Matt Redman" } @@ -42,7 +40,7 @@ Global = % Intro - s1*4 | % 1-4 + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { @@ -60,10 +58,12 @@ Global = \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } s1*6 | % 14-19 - s1*3 | % 20-22 + s1*2 | % 20-22 + s2... \once \override Score.RehearsalMark #'self-alignment-X = #right \mark \markup { \italic { to Coda } \musicglyph #"scripts.coda" } + s16 } \alternative { @@ -71,7 +71,7 @@ Global = s1 | % 23 } { - s1 | % 24 + s1 \bar "||" % 24 } } @@ -96,7 +96,7 @@ Global = % blank measure between last measure and coda % \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break - \stopStaff s1 \startStaff % That removed the spurious floating bar line from line break (DID IT???) + \stopStaff s1 \startStaff % \break % Meh \set Score.currentBarNumber = #41 @@ -136,16 +136,6 @@ Global = } s1 \bar "|." % 63 - -%{ - -% \once \override TextScript #'padding = #2.0 -% s1*0^\markup { \large \bold { Moderately fast pop } } -%%Capo 3 version -%% s1*0^\markup { \large \bold { Moderately fast pop "(*** CAPO 3 ***)" } } -% s1*13 \bar "||:" % 1-13 - -%} } @@ -155,7 +145,6 @@ Global = LeadVox = \relative c' { \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -262,7 +251,7 @@ LeadVoxText = \lyricmode { The sun comes up it's a new day daw -- ning, it's time to sing your song _ a -- gain, What -- e -- ver may _ pass _ and what -- e -- ver lies be -- fore _ me, - let me go sing -- ing when the eve -- ning comes. } + let me be sing -- ing when the eve -- ning comes. } \new Lyrics = "verse2" \with { alignBelowContext = #"verse1" } { \set associatedVoice = "Lead" @@ -376,7 +365,7 @@ Chords = \chordmode f2 c | % 16 g2 a:m | % 17 f2 c | % 18 - g2 a:m | % 19 + g2 a4:m r | % 19 (rest here shows as N.C.!!!) s2 f | % 20 c2 g4:sus4 g | % 21 c1 | % 22 @@ -453,13 +442,14 @@ 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 } Rhythm = { \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -488,8 +478,8 @@ Rhythm = c4 c c c | % 16 c4 c c c | % 17 c4 c c c | % 18 - c4 c c c-> | % 19 - c4-> c-> c c | % 20 + c4 c c \Cross c-> | % 19 + c4-> c-> \Slash c c | % 20 c4 c c c | % 21 c4 c c c | % 22 @@ -582,7 +572,7 @@ Dynamics = s2 s4 \< s \! | % 53 %} s1*18 - s2. s4_\markup { \italic { No chord } } +% s2. s4_\markup { \italic { No chord } } } @@ -622,7 +612,7 @@ Dynamics = (/ staffSize 20))) % Don't spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% 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) diff --git a/blessed-assurance.ly b/blessed-assurance.ly index 8613b6d..35506df 100644 --- a/blessed-assurance.ly +++ b/blessed-assurance.ly @@ -32,14 +32,11 @@ hn = #(define-music-function (parser location arg) (ly:music?) % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override Score.SpacingSpanner #'average-spacing-wishes = ##f @@ -409,11 +406,10 @@ Chords = \chordmode StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro @@ -587,35 +583,23 @@ Dynamics = s4_\markup { \hspace #0.0 \raise #-2.0 \italic { orig. half-time groove } } s2. | % 81 s1*2 | % 82-83 s2 s4_\markup { \hspace #0.0 \raise #-2.0 \italic { last X rit. } } s | % 84 - -%{ - s4_\mf s2. | % 1 - s1*22 | % 2-23 - s4 s \> | % 24 - s4 \! s2. | % 25 - s1*2 | % 26-27 - s4 \< s s \! s | % 28 - s1*4 | % 29-32 - s4 \< s s \! s | % 33 - s1*23 | % 34-56 - s2 s2_\markup { \italic { rit. } } | % 57 -%} } \score { << + \context Staff << - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox >> } + \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> \new ChoirStaff = "Rhythm" << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords + \new RhythmicStaff << \StaffC \Dynamics >> >> \set Score.skipBars = ##t @@ -641,6 +625,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope :-P] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/blessed-be-your-name.ly b/blessed-be-your-name.ly index d913ea1..6fbc468 100644 --- a/blessed-be-your-name.ly +++ b/blessed-be-your-name.ly @@ -24,23 +24,17 @@ staffSize = #18 % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key b \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - r1 | % 1 - r1 | % 2 - r1 | % 3 - r1 | % 4 + R1*4 | % 1-4 \repeat volta 3 { @@ -225,12 +219,8 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro b1 | % 1 @@ -359,10 +349,9 @@ Cross = { \override NoteHead #'style = #'cross } StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 + \teeny % \override NoteHead #'style = #'slash % Intro @@ -504,40 +493,43 @@ Dynamics = \score { << + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } + \new Voice = "lead" \LeadVox % \new Staff = leadStaff { \new Voice = "lead" \transpose b a \LeadVox } \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords -% \new ChordNames = "chords" \transpose b a \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords +% \new ChordNames \transpose b a \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" - "JazzText" - "Luxi Mono" - (/ staffSize 20))) - -% top-margin = -0.25 \in + "Times New Roman" + "JazzText" + "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 } + diff --git a/blessed-quietness-satb.ly b/blessed-quietness-satb.ly index c75eba4..4731b79 100644 --- a/blessed-quietness-satb.ly +++ b/blessed-quietness-satb.ly @@ -24,13 +24,12 @@ staffSize = #18 % % Lead vocal % - LeadVox = \relative c' { \set Staff.instrumentName = #"Sop." \clef G \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Verse @@ -62,7 +61,7 @@ AltoVox = \relative c' \set Staff.instrumentName = #"Alto" \clef G \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Verse @@ -94,7 +93,7 @@ TenorVox = \relative c \set Staff.instrumentName = #"Tenor" \clef F \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Verse @@ -126,7 +125,7 @@ BassVox = \relative c \set Staff.instrumentName = #"Bass" \clef F \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Verse @@ -253,10 +252,10 @@ Dynamics = \paper { #(define fonts (make-pango-font-tree - "Times New Roman" - "DomCasual BT" - "Luxi Mono" - (/ staffSize 20))) + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) ragged-last-bottom = ##f @@ -267,6 +266,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) } + diff --git a/breathe.ly b/breathe.ly index 37995f1..c9bcc90 100644 --- a/breathe.ly +++ b/breathe.ly @@ -37,10 +37,9 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = \transpose a g { \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -% \once \override TextScript #'padding = #2.0 s1*0^\markup { \italic \bold { 8th-note ballad } } % Capo 4 version % s1*0^\markup { \hspace #0.0 \raise #2.0 \bigger \bold { "Moderate pop (*** CAPO 4 ***)" } } @@ -115,11 +114,7 @@ Global = \transpose a 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) % Intro @@ -253,9 +248,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro @@ -309,11 +301,11 @@ Chords = \chordmode % Verse b1:sus2 | % 22 - e1:sus2/b | % 23 + e1:sus2/b | % 23 b8:sus2 \parenthesize fs/b s2. | % 24 e1:sus2/b | % 25 b2 fs/as | % 26 - gs2:m7 fs:5.11 | % 27 + gs2:m7 fs:3.5.11 | % 27 e2 gs:m7 | % 28 fs2 fs4:sus4 fs | % 29 @@ -357,12 +349,9 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" \override Staff.TimeSignature #'style = #'() \override NoteHead #'style = #'slash - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 @@ -401,7 +390,7 @@ Rhythm = \relative c % Verse c4 c c c | % 22 - c4 c c c | % 23 + c4 c c c | % 23 c4 c c c | % 24 c4 c c c | % 25 c4 c c c | % 26 @@ -443,15 +432,6 @@ Rhythm = \relative c Dynamics = { -% s1*4 | % 1-4 -% s4_\markup { \italic { 1st X: Melody, 2nd X+: Solos } } s2. | % 5 -% s1*38 | % 1-38 -% s4_\markup { \bold \italic { Double Chorus 2nd X } } s2. | % 39 -% s1*7 | % 40-46 -% s4_\markup { \bold { Tutti } } s2. | % 47 -% s4 | % 0 -% s2.*39 | % 1-39 -% s4_\markup { \large \bold \italic { Solo } } s2 | % 40 s4_\mp s2. | % 1 s1*20 | % 2-21 s4_\f s2. | % 22 @@ -477,15 +457,7 @@ Dynamics = \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff - << - \new ChordNames \transpose a 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 a g \LeadVox @@ -493,6 +465,14 @@ Dynamics = \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> + + \new ChoirStaff + << + \new ChordNames \transpose a g \Chords +%Capo 4 edition +% \new ChordNames \transpose b g \Chords + \new RhythmicStaff << \Rhythm \Dynamics >> + >> >> } @@ -500,13 +480,13 @@ Dynamics = \paper { #(define fonts (make-pango-font-tree - "Times New Roman" - "DomCasual BT" - "Luxi Mono" - (/ staffSize 20))) + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% 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) @@ -514,6 +494,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) } + diff --git a/brethren-we-have-met-to-worship.ly b/brethren-we-have-met-to-worship.ly index cc14665..3153a99 100644 --- a/brethren-we-have-met-to-worship.ly +++ b/brethren-we-have-met-to-worship.ly @@ -28,11 +28,9 @@ staffSize = #20 LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override Score.SpacingSpanner #'average-spacing-wishes = ##f @@ -82,9 +80,6 @@ LeadVoxText = \lyricmode Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - g1 | % 1 d2 g4 c | % 2 %{ @@ -128,11 +123,10 @@ g g c e C 8 StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override NoteHead #'style = #'slash + \teeny c4 c c c | % 1 c4 c c c | % 2 @@ -174,40 +168,41 @@ Dynamics = \score { << + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } -% \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText -% \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords -% \new ChordNames = "chords2" \ChordsSup - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords +% \new ChordNames \ChordsSup + \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 + "Times New Roman" + "JazzText" + "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 } + diff --git a/change-my-heart-o-god.ly b/change-my-heart-o-god.ly index 8b39d0d..77619a3 100644 --- a/change-my-heart-o-god.ly +++ b/change-my-heart-o-god.ly @@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -47,7 +47,7 @@ Global = % Capo 4 version % s1*0^\markup { \hspace #0.0 \raise #2.0 \larger \bold { "Moderate pop (*** CAPO 4 ***)" } } - s1*4 \bar "||:" % 1-4 + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { @@ -66,11 +66,7 @@ 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 @@ -116,8 +112,6 @@ LeadVoxText = \lyricmode Riffs = \relative c' { \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -135,9 +129,6 @@ Riffs = \relative c' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s1 | % 1 @@ -177,10 +168,9 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -234,21 +224,21 @@ Dynamics = \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \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 ChoirStaff << \new ChordNames \Chords %Capo 4 edition % \new ChordNames \transpose b g \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> - - \new Staff - << - \Global % The "roadmap" that everything else depends on - \new Voice = "lead" \LeadVox - \new Voice \Riffs - \new Lyrics \lyricsto "lead" \LeadVoxText - >> >> } @@ -256,20 +246,18 @@ Dynamics = \paper { #(define fonts (make-pango-font-tree - "Times New Roman" - "DomCasual BT" - "Luxi Mono" - (/ staffSize 20))) + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% ragged-last-bottom = ##f % Don't spread staves vertically across the page (default: f) - ragged-bottom = ##t +% 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 -%let's try this: [It works! Huzzah!] - obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } diff --git a/child-of-love.ly b/child-of-love.ly index 7329450..c9b26b5 100644 --- a/child-of-love.ly +++ b/child-of-love.ly @@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key b \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 2/2 % Intro @@ -85,11 +85,7 @@ 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 @@ -205,8 +201,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -239,9 +233,6 @@ Riffs = \relative c' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro b2:m b:m/a | % 1 @@ -341,10 +332,9 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -452,7 +442,16 @@ Dynamics = \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \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 @@ -460,14 +459,6 @@ Dynamics = \new RhythmicStaff << \Rhythm \Dynamics >> >> - \new 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 - >> >> } @@ -475,10 +466,10 @@ Dynamics = \paper { #(define fonts (make-pango-font-tree - "Times New Roman" - "DomCasual BT" - "Luxi Mono" - (/ staffSize 20))) + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) % ragged-last-bottom = ##f @@ -489,6 +480,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) } + diff --git a/come-and-see.ly b/come-and-see.ly index 44166bd..06a2f3c 100644 --- a/come-and-see.ly +++ b/come-and-see.ly @@ -29,7 +29,7 @@ staffSize = #18 Global = { \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -127,13 +127,9 @@ Global = % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -251,14 +247,12 @@ LeadVoxTextB = \lyricmode Come and give _ _ thanks un -- to _ the Lord _ Come be -- hold __ _ the Lamb Come and sing _ _ prais -- es of _ the __ _ King - Bow -- ing down _ be -- _ fore __ _ _ _ } % % Riffs % - Riffs = \relative c'' { %{ @@ -277,7 +271,6 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { % Intro @@ -360,15 +353,12 @@ s1 % % Chord rhythms % - Rhythm = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override NoteHead #'style = #'slash -\tiny + \teeny % Intro @@ -469,22 +459,22 @@ Dynamics = \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new ChoirStaff + \context Staff << - \new ChordNames \Chords -%Capo 3 edition -% \new ChordNames \transpose f d \Chords - \new RhythmicStaff << \Rhythm \Dynamics >> - >> - - \new Staff - << - \Global % The "roadmap" that everything else depends on + \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 3 edition +% \new ChordNames \transpose f d \Chords + \new RhythmicStaff << \Rhythm \Dynamics >> + >> >> } @@ -493,7 +483,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -506,6 +496,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) } + diff --git a/come-just-as-you-are.ly b/come-just-as-you-are.ly index 958c329..d56b9ff 100644 --- a/come-just-as-you-are.ly +++ b/come-just-as-you-are.ly @@ -35,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -124,16 +124,6 @@ Global = \mark \markup { \override #'(font-family . sans) { \box { F } } } s1*7 \bar "|." % 60-66 - -%{ - -% \once \override TextScript #'padding = #2.0 -% s1*0^\markup { \large \bold { Moderately fast pop } } -%%Capo 3 version -%% s1*0^\markup { \large \bold { Moderately fast pop "(*** CAPO 3 ***)" } } -% s1*13 \bar "||:" % 1-13 - -%} } @@ -143,13 +133,10 @@ Global = LeadVox = \relative c' { \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - r1 | % 1 - r1 | % 2 - r1 | % 3 + R1*3 | % 1-3 r2 r4 r8 e | % 4 % Verse @@ -333,9 +320,6 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro e1:sus2 | % 1 @@ -440,8 +424,9 @@ Chords = \chordmode Rhythm = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -560,7 +545,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << @@ -569,7 +554,6 @@ Dynamics = \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "v2" \LeadVoxEcho -% \new Lyrics \lyricsto "v2" \LeadVoxEcho >> \new ChoirStaff @@ -590,7 +574,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -603,6 +587,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) } + diff --git a/come-let-us-worship-and-bow-down.ly b/come-let-us-worship-and-bow-down.ly index 821b326..0daf81e 100644 --- a/come-let-us-worship-and-bow-down.ly +++ b/come-let-us-worship-and-bow-down.ly @@ -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 "Come Let Us Worship And Bow Down" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Dave Doherty" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -24,16 +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 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -129,12 +123,8 @@ LeadVoxText = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro \repeat volta 2 @@ -147,11 +137,11 @@ Chords = \chordmode d2 g:maj7 | % 3 d1 | % 4 - g4 g/fs e2 | % 5 + g4 g/fs e2:m | % 5 d4/a a2. | % 6 d2 g:maj7 | % 7 d1 | % 8 - g4 g/fs e2 | % 9 + g4 g/fs e2:m | % 9 d4/a a2. | % 10 % B section @@ -201,11 +191,10 @@ Chords = \chordmode StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro @@ -267,35 +256,40 @@ StaffC = \relative c \score { << + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } + \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText >> - \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" + "JazzText" + "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 } + diff --git a/come-now-is-the-time-to-worship.ly b/come-now-is-the-time-to-worship.ly index c690ab2..da59250 100644 --- a/come-now-is-the-time-to-worship.ly +++ b/come-now-is-the-time-to-worship.ly @@ -3,7 +3,7 @@ \include "english.ly" % Good sizes are 16, 18, & 20 -staffSize = #20 +staffSize = #22 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -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 "Come, Now is the Time to Worship" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "M. Barnett" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % \once \override TextScript #'padding = #2.0 @@ -47,7 +45,7 @@ Global = % Intro - s1*4 | % 1-4 + s1*4 \bar ".|:-||" % 1-4 % Verse @@ -115,19 +113,12 @@ 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 \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro - r1 | % 1 - r1 | % 2 - r1 | % 3 - r1 | % 4 + R1*4 | % 1-4 % Verse @@ -240,7 +231,7 @@ LeadVoxText = \lyricmode Come. One day ev’ -- ry tongue will con -- fess _ you are God, _ - One day ev’ -- ry knee will bow _ down, _ + One day ev’ -- ry knee _ will bow _ _ Still the great -- est trea -- sure re -- mains _ for those _ who glad -- _ ly choose _ you now. _ @@ -251,7 +242,7 @@ LeadVoxText = \lyricmode Come, One day ev’ -- ry tongue will con -- fess _ you are God, _ - One day ev’ -- ry knee will bow _ down, _ + One day ev’ -- ry knee _ will bow _ _ Still the great -- est trea -- sure re -- mains _ for those _ who glad -- _ ly choose _ you now. _ @@ -267,9 +258,6 @@ LeadVoxText = \lyricmode Riffs = \relative c' { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro @@ -403,12 +391,9 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 @@ -549,7 +534,7 @@ Dynamics = \new Staff << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText @@ -560,14 +545,14 @@ Dynamics = \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "Luxi Mono" - (/ staffSize 20))) + #(define fonts (make-pango-font-tree + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% 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) @@ -575,6 +560,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope, it doesn't :-/] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/come-thou-fount-of-every-blessing.ly b/come-thou-fount-of-every-blessing.ly index 771b053..f4a20a6 100644 --- a/come-thou-fount-of-every-blessing.ly +++ b/come-thou-fount-of-every-blessing.ly @@ -12,8 +12,6 @@ staffSize = #24 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Come Thou Fount Of Every Blessing" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" } @@ -24,16 +22,12 @@ staffSize = #24 % % 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 % Intro @@ -121,12 +115,6 @@ LeadVoxTextC = \lyricmode Riffs = \relative c' { - \clef G - \key d \major - \override Staff.TimeSignature #'style = #'() - \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \partial 4*1 \tiny fs8 e | % partial @@ -156,54 +144,14 @@ Riffs = \relative c' b4 a fs8 e | % 24 d2.^\fermata | % 25 \normalsize - -%{ - \tiny - \repeat "percent" 3 % 1 - 6 - { - << { \tiny f16 c f, ~ f, c' f f8 e } \\ { \tiny f,,2 c'4 } >> | % 1 - << { \tiny f'16 c f, ~ f, c' f f8 e } \\ { \tiny bf,2 c4 } >> | % 2 - } - << s2. \\ { \tiny d2 c4 } >> | % 7 - << s2. \\ { \tiny bf2. } >> | % 8 - - s2.*7 - - \voiceOne - \repeat "percent" 6 { f''16 c f, ~ f, c' f f8 e | } % 16-21 - \oneVoice - - s2.*7 - - \voiceOne - \repeat "percent" 2 { f16 c f, f' ~ f f, c' f f8 e | } % 29-30 - \oneVoice - - \key g \major - - \voiceOne - \repeat "percent" 2 { g16 d g, g' ~ g g, d' g g8 fs | } % 31-32 - \oneVoice - - s2.*7 - - \voiceOne - \repeat "percent" 4 { g16 d g, g' ~ g g, d' g g8 fs | } % 40-43 - \oneVoice - \normalsize -%} } % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s4 | % pickup @@ -261,11 +209,10 @@ Chords = \chordmode StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 \override NoteHead #'style = #'slash + \teeny % Intro @@ -333,30 +280,24 @@ Dynamics = \score { << + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC >> - \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 - } } @@ -368,5 +309,14 @@ Dynamics = "Luxi Mono" (/ staffSize 20))) -% top-margin = -0.25 \in +% 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 } + diff --git a/create-in-me-a-clean-heart.ly b/create-in-me-a-clean-heart.ly index 19aed0a..17caef3 100644 --- a/create-in-me-a-clean-heart.ly +++ b/create-in-me-a-clean-heart.ly @@ -2,8 +2,8 @@ \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Create In Me A Clean Heart" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -22,76 +20,105 @@ staffSize = #16 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1^\markup { 8th note ballad, s. stick & colors } | % 1 - R1 | % 2 - R1 | % 3 - r2 r4. d8 \bar "||" % 4 + s1^\markup { 8th note ballad, s. stick & colors } | % 1 + s1*3 \bar "||" % 2-4 % Verse -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - g8 g g g fs4 d8 ( fs | % 5 - e4 ) e16 ( d e8 ) d4 r | % 6 - r8 g16 g g a g8 fs fs g16 a8 ( g16 ) | % 7 - g2 r4. d8 | % 8 - g8 g g g fs4 d8 ( fs | % 9 - e4 ) e16 ( d e8 ) d4 r | % 10 - r8 g16 g g a g8 fs fs g16 a8 ( g16 ) | % 11 - g2 r \bar "||:" % 12 + s1*8 \bar ".|:-||" % 5-12 % Chorus \repeat volta 3 { -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - c8.^\markup { \italic { 2nd time snare } } c16 c8 b a4 g8 a | % 13 - b8 b4 a16 ( g ) g4 r8 g | % 14 - c4 c8 b a a a16 g a8 | % 15 - b2 r4. g8 | % 16 - c4. b16 ( a ) a4. r16 g | % 17 - b8. c16 b8 a g e ~ e4 | % 18 - r8 g16 g g a g8 fs fs g16 a8 ( g16 ) | % 19 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + + s8.^\markup { \italic { 2nd time snare } } s16 s2. | % 13 + s1*6 | % 14-19 } \alternative { { - g2 r | % 20 - r2 r4.^\markup { \hspace #0.0 \raise #0.65 \bold D.S. } d8 \bar "||" % 21 + s1 | % 20 + s2.. s8^\markup { \hspace #0.0 \raise #0.65 \bold D.S. } \bar "||" % 21 } { - g2 r | % 22 + s1 | % 22 } { - g2 r | % 23 + s1 | % 23 } } % Ending + s1*4 \bar "|." % 24-27 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + R1 | % 1 + R1 | % 2 + R1 | % 3 + r2 r4. d8 | % 4 + + % Verse + + g8 g g g fs4 d8 ( fs | % 5 + e4 ) e16 ( d e8 ) d4 r | % 6 + r8 g16 g g a g8 fs fs g16 a8 ( g16 ) | % 7 + g2 r4. d8 | % 8 + g8 g g g fs4 d8 ( fs | % 9 + e4 ) e16 ( d e8 ) d4 r | % 10 + r8 g16 g g a g8 fs fs g16 a8 ( g16 ) | % 11 + g2 r | % 12 + + % Chorus + + c8. c16 c8 b a4 g8 a | % 13 + b8 b4 a16 ( g ) g4 r8 g | % 14 + c4 c8 b a a a16 g a8 | % 15 + b2 r4. g8 | % 16 + c4 c8 b16 ( a ) a4. r16 g | % 17 + b8. c16 b8 a g e ~ e4 | % 18 + r8 g16 g g a g8 fs fs g16 a8 ( g16 ) | % 19 + + g2 r | % 20 + r2 r4. d8 | % 21 + + g2 r | % 22 + + g2 r | % 23 + + % Ending + r8 g16 g g a g8 fs fs fs16 a ( g8 ) | % 24 g2 r | % 25 r8 g16 g g a g8 fs fs fs16 a ( g8 ) | % 26 - g1^\fermata \bar "|." % 27 + g1^\fermata | % 27 } + LeadVoxText = \lyricmode { Cre -- ate in me a clean heart __ _ _ O __ _ _ God @@ -101,7 +128,7 @@ LeadVoxText = \lyricmode Cast me not a -- way from your pre -- sence O _ Lord And take not your Ho -- ly Spi -- rit from me - Re -- store to _ me the joy of your sal -- va -- tion _ + Re -- store un -- to _ me the joy of your sal -- va -- tion _ And re -- new a right spi -- rit wi -- thin _ me Cre -- @@ -116,12 +143,8 @@ LeadVoxText = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro g2 d/g | % 1 @@ -142,29 +165,20 @@ Chords = \chordmode % Chorus - \repeat volta 3 - { - c2 d/c | % 13 - b2:m7 e:m7 | % 14 - a2:m7 d | % 15 - g1:maj7 | % 16 - fs2:m7.5- b:7.9- | % 17 - e4:m7 e:m7/d c:maj7 g/b | % 18 - a2:m7 d | % 19 - } - \alternative - { - { - g2 d/g | % 20 - c2/g d/g | % 21 - } - { - g2 g8. a:m7 g8/b | % 22 - } - { - g2 b:m7 | % 23 - } - } + c2 d/c | % 13 + b2:m7 e:m7 | % 14 + a2:m7 d | % 15 + g1:maj7 | % 16 + fs2:m7.5- b:7.9- | % 17 + e4:m7 e:m7/d c:maj7 g/b | % 18 + a2:m7 d | % 19 + + g2 d/g | % 20 + c2/g d/g | % 21 + + g2 g8. a:m7 g8/b | % 22 + + g2 b:m7 | % 23 % Ending @@ -178,24 +192,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... - StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro c4_\mp c c c | % 1 c4 c c c | % 2 c4 c c c | % 3 - c4 c c c \bar "||" % 4 + c4 c c c | % 4 % Verse @@ -206,75 +214,73 @@ StaffC = \relative c c4 c c c | % 9 c4 c c c | % 10 c4 c c c | % 11 - c4 c c8.-> c16-> \< ~ c8 c \! \bar "||:" % 12 + c4 c c8.-> c16-> \< ~ c8 c \! | % 12 % Chorus - \repeat volta 3 - { - c4_\mf c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - } - \alternative - { - { - c4 c c c | % 20 - c4 c c c \bar "||" % 21 - } - { - c4 c c8.-> c16-> \< ~ c8 c \! | % 22 - } - { - c4 c c c | % 23 - } - } + c4_\mf c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + + c4 c c c | % 20 + c4 c c c \bar "||" % 21 + + c4 c c8.-> c16-> \< ~ c8 c \! | % 22 + + c4 c c c | % 23 % Ending c4 c c c | % 24 c4 c c c | % 25 c2 c_\markup { \italic { rit. } } | % 26 - c1^\fermata \bar "|." % 27 + c1^\fermata | % 27 } \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 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 } + diff --git a/creation-song.ly b/creation-song.ly index 058afd7..64f1691 100644 --- a/creation-song.ly +++ b/creation-song.ly @@ -12,14 +12,12 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Creation Song (Glory to the Lamb)" } -% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } + composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Fernando Ortega" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "Arr. John Wierick/Ed Smart" } tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) % Let's try a chord dictionary - subtitle = \markup { \center-column { G2 \fret-diagram-terse #"x;x;x;7;8;10;" } " " \center-column { F2 \fret-diagram-terse #"x;x;x;5;6;8;" } } + subtitle = \markup { \center-column { \fret-diagram-terse #"x;x;x;7;8;10;" \override #'(font-family . sans) G2 } " " \center-column { \fret-diagram-terse #"x;x;x;5;6;8;" \override #'(font-family . sans) F2 } } } % Useful tweak abbreviations (hn = harmony note) @@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 6/4 % Intro @@ -120,7 +118,6 @@ Global = LeadVox = \relative c' { \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -251,6 +248,7 @@ LeadVox = \relative c' s1. | % 100 } + LeadVoxText = \lyricmode { He wraps him -- self in light @@ -294,6 +292,7 @@ DescantText = \lyricmode _ _ and e -- ver and e -- ver _ } + % % Riffs % @@ -471,8 +470,9 @@ Chords = \chordmode Rhythm = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -538,7 +538,7 @@ Rhythm = c4 c c c c c | % 51 c4 c c c c c | % 52 - s1. % for Coda spacing + \stopStaff s1. \startStaff % for Coda spacing % Coda @@ -643,7 +643,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << @@ -671,7 +671,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -684,6 +684,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) } + diff --git a/do-you-know.ly b/do-you-know.ly index 6ae20a7..25a1361 100644 --- a/do-you-know.ly +++ b/do-you-know.ly @@ -3,7 +3,7 @@ \include "english.ly" % Good sizes are 16, 18, & 20 -staffSize = #16 +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Do You Know" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -22,84 +20,108 @@ staffSize = #16 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" - \clef G \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1^\markup { \italic { Light ballad } } | % 1 - R1 | % 2 - R1 | % 3 - r2 r4. cs16 [ d ] | % 4 + s1^\markup { \italic { Light ballad } } | % 1 + s1*3 | % 2-4 \repeat volta 4 { % Verse -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \small \italic { Solo 3rd time } } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \small \italic { Solo 3rd time } } - e8 [ e e fs ] ~ fs4 fs | % 5 - e4 d cs r8 cs16 [ d ] | % 6 -%\break - e8 [ e e fs ] ~ fs4 fs | % 7 - e4 b' a r8 a16 [ b ] | % 8 - cs2 b4 r8 b16 [ cs ] | % 9 - d4. cs8 cs4 r8 a16 [ gs ] | % 10 - fs8 [ gs a a ] ~ a4 b | % 11 - cs4 gs a2 \bar "||" % 12 + s1*8 \bar "||" % 5-12 % Refrain \time 2/4 + \mark \markup { \musicglyph #"scripts.segno" } -\mark \markup { \musicglyph #"scripts.segno" } - - r4^\markup { \hspace #0.0 \raise #1.0 \italic { end solo } } a8 [ b ] \bar "||" % 13 + s4^\markup { \hspace #0.0 \raise #1.0 \italic { end solo } } s \bar "||" % 13 \time 4/4 -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \small \italic { No groove on D.S. } } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \small \italic { No groove on D.S. } } - cs2 b4 b8 [ cs ] | % 14 - d2 cs4 r8 e, | % 15 - fs8 [ gs a cs ] ~ cs [ a ] a4 | % 16 - fs8 [ gs a cs ] ~ cs [ a ] a4 | % 17 -%\break - fs8 [ gs a cs ] ~ cs [ a ] a4 | % 18 + s1*5 | % 14-18 } \alternative { { \time 2/4 - b8 [ cs ] gs8. ([ a16 ]) | % 19 + s2 | % 19 \time 4/4 - a2 r | % 20 - r2 r4. cs,16 [ d ] | % 21 + s1*2 | % 20-21 } { - b'8 [ cs ] gs8. ([ a16 ]) a2^\markup { \hspace #1.8 \raise #0.6 { D.S. } } \bar "||" % 22 + s2 s^\markup { \hspace #1.8 \raise #0.6 { D.S. } } \bar "||" % 22 } { - b8 [ cs ] gs8. ([ a16 ]) a2-\fermata \bar "|." | % 23 + s1 \bar "|." % 23 } } } + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + + R1*3 | % 1-3 + r2 r4. cs16 [ d ] | % 4 + + % Verse + + e8 [ e e fs ] ~ fs4 fs | % 5 + e4 d cs r8 cs16 [ d ] | % 6 +%\break + e8 [ e e fs ] ~ fs4 fs | % 7 + e4 b' a r8 a16 [ b ] | % 8 + cs2 b4 r8 b16 [ cs ] | % 9 + d4. cs8 cs4 r8 a16 [ gs ] | % 10 + fs8 [ gs a a ] ~ a4 b | % 11 + cs4 gs a2 | % 12 + + % Refrain + + r4 a8 [ b ] | % 13 + + cs2 b4 b8 [ cs ] | % 14 + d2 cs4 r8 e, | % 15 + fs8 [ gs a cs ] ~ cs [ a ] a4 | % 16 + fs8 [ gs a cs ] ~ cs [ a ] a4 | % 17 +%\break + fs8 [ gs a cs ] ~ cs [ a ] a4 | % 18 + + b8 [ cs ] gs8. ([ a16 ]) | % 19 + + a2 r | % 20 + r2 r4. cs,16 [ d ] | % 21 + + b'8 [ cs ] gs8. ([ a16 ]) a2 | % 22 + + b8 [ cs ] gs8. ([ a16 ]) a2-\fermata | % 23 +} + LeadVoxText = \lyricmode { Do you know what the blood _ has done for me, @@ -123,14 +145,11 @@ LeadVoxText = \lyricmode % % Riff/rhythm figures % - StaffRiffs = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" \key a \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature + \time 4/4 % Intro @@ -140,14 +159,13 @@ StaffRiffs = \relative c' 8 [ a, a, ] [ a, a, ] | % 4 \stopStaff - s1*7 | % 5 - 12 - \time 2/4 + s1*8 | % 5-12 + s2 | % 13 - \time 4/4 - s1*6 | % 14 - 18 - \time 2/4 + + s1*5 | % 14-18 + s2 | % 19 - \time 4/4 \startStaff 8 [ a, a, ] [ a, a, ] | % 20 @@ -159,12 +177,8 @@ StaffRiffs = \relative c' % % Chord names % - Chords = \chordmode { -% Bah, can't we set this globally? -% \popChords - % Intro a1:sus2 | % 1 @@ -172,52 +186,35 @@ Chords = \chordmode a1:sus2 | % 3 d2:6.9 e:sus4 | % 4 - \repeat volta 4 - { - % Verse + % Verse - a2 d | % 5 - a4/e e:7 a2 | % 6 - a2 d | % 7 - a4/e f:dim7 fs2:m7 | % 8 - a2/e e | % 9 - b2:m7 fs:m7 | % 10 - b2:m7 a/cs | % 11 - d4:maj7 e a2 \bar "||" % 12 + a2 d | % 5 + a4/e e:7 a2 | % 6 + a2 d | % 7 + a4/e f:dim7 fs2:m7 | % 8 + a2/e e | % 9 + b2:m7 fs:m7 | % 10 + b2:m7 a/cs | % 11 + d4:maj7 e a2 | % 12 - % Refrain + % Refrain - \time 2/4 + e2/gs | % 13 - e2/gs \bar "||" % 13 + fs2:m7 e | % 14 + b2:m7 fs:m7 | % 15 + d4. a8/cs s2 | % 16 + b4.:m7 fs8:m7 s2 | % 17 + d4. a8/cs s2 | % 18 - \time 4/4 + b4:m7 e | % 19 - fs2:m7 e | % 14 - b2:m7 fs:m7 | % 15 - d4. a8/cs s2 | % 16 - b4.:m7 fs8:m7 s2 | % 17 - d4. a8/cs s2 | % 18 - } - \alternative - { - { - \time 2/4 - - b4:m7 e | % 19 + a1:sus2 | % 20 + d2:6.9 e:sus4 | % 21 - \time 4/4 + b4:m7 e a2 | % 22 - a1:sus2 | % 20 - d2:6.9 e:sus4 | % 21 - } - { - b4:m7 e a2 \bar "||" % 22 - } - { - b4:m7 e a2 \bar "|." | % 23 - } - } + b4:m7 e a2 | % 23 } @@ -230,11 +227,9 @@ Chords = \chordmode StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -243,60 +238,46 @@ StaffC = \relative c c4 c c c | % 3 c4 c c c | % 4 - \repeat volta 4 - { - % Verse - - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c \bar "||" % 12 + % Verse - % Refrain + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 - \time 2/4 + % Refrain - c4 c \bar "||" % 13 + c4 c | % 13 - \time 4/4 + c4 c c c | % 14 + c4 c c c | % 15 + c4. c8 ~ c2 | % 16 + c4. c8 ~ c2 | % 17 + c4. c8 ~ c2 | % 18 - c4 c c c | % 14 - c4 c c c | % 15 - c4. c8 ~ c2 | % 16 - c4. c8 ~ c2 | % 17 - c4. c8 ~ c2 | % 18 - } - \alternative - { - { - \time 2/4 + c4 c | % 19 - c4 c | % 19 + c4 c c c | % 20 + c4 c c c | % 21 - \time 4/4 + c4 c c c | % 22 - c4 c c c | % 20 - c4 c c c | % 21 - } - { - c4 c c c \bar "||" % 22 - } - { - c4-\markup { \italic { rit. } } c c2-\fermata \bar "|." | % 23 - } - } + c4-\markup { \italic { rit. } } c c2-\fermata | % 23 } \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 >> @@ -313,51 +294,12 @@ StaffC = \relative c \new ChoirStaff = "Rhythm" << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC + \new ChordNames \Chords + \new RhythmicStaff \StaffC >> \set Score.melismaBusyProperties = #'() >> - - \layout - { -% \context { \Staff \RemoveEmptyStaves } -% ragged-last-bottom = ##t -% ragged-last = ##t - - \context - { - \Score - \remove "Timing_translator" - \remove "Default_bar_line_engraver" - \remove "Repeat_acknowledge_engraver" - } - \context - { -% \Staff - \Staff \RemoveEmptyStaves - \consists "Timing_translator" - \consists "Default_bar_line_engraver" - \consists "Repeat_acknowledge_engraver" - } - \context - { - \RhythmicStaff - \consists "Timing_translator" - \consists "Default_bar_line_engraver" - \consists "Repeat_acknowledge_engraver" - } -%{ - \context - { - \ChordNames - \consists "Timing_translator" - \consists "Default_bar_line_engraver" - \consists "Repeat_acknowledge_engraver" - } -%} - } } @@ -365,7 +307,18 @@ StaffC = \relative c { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "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 } + diff --git a/fall-on-me.ly b/fall-on-me.ly index 7fea863..fd9c3d9 100644 --- a/fall-on-me.ly +++ b/fall-on-me.ly @@ -12,8 +12,6 @@ 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 "Fall On Me" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -35,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -63,7 +61,7 @@ Global = \mark \markup { \override #'(font-family . sans) { \box { B } } } - s1*16 | % 25-40 + s1*16 | % 25-40 \once \override Score.RehearsalMark #'self-alignment-X = #left \mark \markup { \musicglyph #"scripts.coda" \italic { to Coda } } s1*2 \bar "||" % 41-42 @@ -78,8 +76,8 @@ Global = % Coda % blank measure between last measure and coda -% \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break - \stopStaff s1 \startStaff % That removed the spurious floating bar line from line break + \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break +% \stopStaff s1 \startStaff % This is needed only because the above has to be enabled IFF the coda starts on a new line...:-P % \break % Meh \set Score.currentBarNumber = #59 @@ -103,7 +101,6 @@ Global = LeadVox = \relative c' { \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -115,7 +112,7 @@ LeadVox = \relative c' 8 ~ 2 r4 | % 5 4. ( 8 ) ~ 2 | % 6 r2 4 << { \voiceOne gs8 ( fs ) } \new Voice = "v" { \voiceTwo \once \override NoteHead #'font-size = #-3.5 a,4 } >> \oneVoice | % 7 -%disnowok r2 4 << { \voiceOne gs8 ( fs ) } \new Voice = "v" { \voiceTwo \hn a,4 } >> \oneVoice | % +%disnowok r2 4 << { \voiceOne gs8 ( fs ) } \new Voice = "v" { \voiceTwo \hn a,4 } >> \oneVoice | % %Also, the << \\ >> notation doesn't track lyrics correctly... Grrrrrrrrrrrrrr 2. 8 | % 8 8 ~ 2 r4 | % 9 @@ -142,7 +139,7 @@ LeadVox = \relative c' 8 ~ 2 r4 | % 25 4. ( 8 ) ~ 2 | % 26 r2 4 << { \voiceOne gs8 ( fs ) } \new Voice = "v" { \voiceTwo \once \override NoteHead #'font-size = #-3.5 a,4 } >> \oneVoice | % 27 -%disnowok r2 4 << { \voiceOne gs8 ( fs ) } \new Voice = "v" { \voiceTwo \hn a,4 } >> \oneVoice | % +%disnowok r2 4 << { \voiceOne gs8 ( fs ) } \new Voice = "v" { \voiceTwo \hn a,4 } >> \oneVoice | % %Also, the << \\ >> notation doesn't track lyrics correctly... Grrrrrrrrrrrrrr 2. 8 | % 28 8 ~ 2 r4 | % 29 @@ -242,33 +239,7 @@ Riffs = \relative c' r8 b e fs ~ fs e ~ e4 | % 2 r8 a, e' fs ~ fs e ~ e4 | % 3 r8 b e fs ~ fs4 s | % 4 - -%{ - % Intro - - \tiny - R1 | % 1 - R1 | % 2 - R1 | % 3 - R1 | % 4 - - c8 ( f ) ~ f2. | % 5 - e2 ~ e8 a4. | % 6 - d,1 ( | % 7 - c1 ) | % 8 - bf4 ( df2. ) | % 9 - df4 ( e2. ) | % 10 - ef1 | % 11 - d8 ef4 f8 ~ f4 bf-. | % 12 - d,2 s2 | % 13 - - s1*36 | % 14-49 - s2 | % 50 - s1*32 | % 51-82 - r8 df df df df ( c ) bf4 | % 83 - R1*8 | % 84-91 \normalsize -%} } @@ -277,9 +248,6 @@ Riffs = \relative c' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro e1:sus2 | % 1 @@ -377,8 +345,9 @@ Chords = \chordmode Rhythm = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -485,11 +454,12 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << - \context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >> + \new Voice = "lead" \LeadVox + \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> @@ -511,17 +481,18 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) -% Spread staves vertically across last page (default: t) -% ragged-last-bottom = ##f +% 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 +% 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 -%let's try this: [It works! Huzzah!] - obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/father's-will.ly b/father's-will.ly index c085554..c6a5094 100644 --- a/father's-will.ly +++ b/father's-will.ly @@ -281,6 +281,7 @@ StaffC = \relative c \override Staff.TimeSignature #'style = #'() \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro diff --git a/forever.ly b/forever.ly index aa6d206..5b04997 100644 --- a/forever.ly +++ b/forever.ly @@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -83,7 +83,7 @@ Global = % Prechorus \mark \markup { \override #'(font-family . sans) { \box { D } } } - s1*8 \bar "||:" % - + s1*8 \bar ".|:-||" % - % Chorus @@ -109,11 +109,7 @@ 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 @@ -270,8 +266,6 @@ LeadVoxTextC = \lyricmode Riffs = \relative c'' { \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -287,9 +281,6 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro g1:sus2 | % @@ -389,10 +380,9 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny r4 r8 c c4 | % 0 c4 c c | % 1 @@ -453,8 +443,6 @@ Dynamics = \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB -% \new Lyrics \lyricsto "lead" \LeadVoxTextC -% \new Lyrics \lyricsto "lead" \LeadVoxTextD >> >> } @@ -464,7 +452,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -477,6 +465,4 @@ 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) } diff --git a/from-the-inside-out.ly b/from-the-inside-out.ly index 9065ca1..8a7fa26 100644 --- a/from-the-inside-out.ly +++ b/from-the-inside-out.ly @@ -395,7 +395,7 @@ Chords = \chordmode f2 g | % 55 f2 g | % 56 f2 g | % 57 - g1 | % 58 + s1 | % 58 } @@ -539,38 +539,20 @@ Dynamics = \score { -%{ - << - << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } - \new Lyrics \lyricsto "lead" \LeadVoxText - >> - - \new ChoirStaff = "Rhythm" - << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> - >> - - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() - >> -%} << \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() + \Global % The "roadmap" that everything else depends on - \new Staff + \context Staff << - \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxTextA \new Lyrics \lyricsto "lead" \LeadVoxTextB >> -% \new Staff + \new ChoirStaff << \new ChordNames \Chords \new RhythmicStaff << \Rhythm \Dynamics >> diff --git a/fum-fum-fum.ly b/fum-fum-fum.ly index 1f0c78c..d57ee71 100644 --- a/fum-fum-fum.ly +++ b/fum-fum-fum.ly @@ -37,7 +37,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key a \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \once \override TextScript #'padding = #2.0 @@ -47,7 +47,7 @@ Global = % Intro - s1*4 \bar "||:" % 1-4 + s1*4 \bar ".|:-||" % 1-4 % The rest... @@ -202,15 +202,11 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 - % Intro % Intro @@ -291,7 +287,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -304,6 +300,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) } + diff --git a/give-thanks.ly b/give-thanks.ly index 3d88cfd..481d1e7 100644 --- a/give-thanks.ly +++ b/give-thanks.ly @@ -22,7 +22,6 @@ staffSize = #18 % or 16 % % Lead vocal % - LeadVox = \relative c'' { \set Voice.autoBeaming = ##f @@ -76,7 +75,7 @@ LeadVox = \relative c'' b4. e,8 fs4 g | % 17 a2. g4 | % 18 a2. d4 | % 19 - + d2. d8 [ d ] | % 20 d4 g, a b | % 21 c2. c8 [ c ] | % 22 @@ -136,12 +135,8 @@ LeadVoxText = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - g1 | % 1 d2:sus4 d | % 2 @@ -189,17 +184,13 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \override NoteHead #'style = #'slash + \teeny c4 c c c | % 1 c4 c c c | % 2 @@ -248,15 +239,16 @@ StaffC = \relative c \score { << + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } + \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC + \new ChordNames \Chords + \new RhythmicStaff \StaffC >> \set Score.skipBars = ##t @@ -266,8 +258,6 @@ StaffC = \relative c \layout { \context { \Staff \RemoveEmptyStaves } -% ragged-last-bottom = ##t -% ragged-last = ##t } } @@ -276,7 +266,18 @@ StaffC = \relative c { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "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 } + diff --git a/go-tell-it-on-the-mountain-chorus.ly b/go-tell-it-on-the-mountain-chorus.ly index 07c344a..a9dbc90 100644 --- a/go-tell-it-on-the-mountain-chorus.ly +++ b/go-tell-it-on-the-mountain-chorus.ly @@ -232,17 +232,11 @@ 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -347,6 +341,4 @@ 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) } diff --git a/go-tell-it-on-the-mountain.ly b/go-tell-it-on-the-mountain.ly index 4800049..a88e98b 100644 --- a/go-tell-it-on-the-mountain.ly +++ b/go-tell-it-on-the-mountain.ly @@ -12,8 +12,6 @@ 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 "Go Tell It On The Mountain" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart/Shamus & Deborah Hammons/J. & Kat Michaels/Chris Craig" } @@ -33,16 +31,12 @@ hn = #(define-music-function (parser location arg) (ly:music?) % % Lead vocal % - LeadVox = \relative c'' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -116,8 +110,8 @@ LeadVox = \relative c'' % Coda -%\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break -\stopStaff s1 \startStaff +\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break +%\stopStaff s1 \startStaff \set Score.currentBarNumber = #37 \once \override Score.RehearsalMark #'self-alignment-X = #left @@ -169,6 +163,7 @@ LeadVox = \relative c'' r1-\fermata \bar ".|" % 54 } + LeadVoxText = \lyricmode { Go tell it on the moun -- _ _ tain, _ @@ -230,10 +225,6 @@ LeadVoxTextC = \lyricmode Riffs = \relative c'' { \clef G - \key g \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -278,12 +269,8 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro \repeat volta 2 @@ -389,17 +376,11 @@ s1 % % 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -523,40 +504,43 @@ Dynamics = \score { << + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC >> - \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" + "JazzText" + "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 } + diff --git a/god-is-great.ly b/god-is-great.ly index 92067b6..f369d3e 100644 --- a/god-is-great.ly +++ b/god-is-great.ly @@ -12,44 +12,132 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "God Is Great" } -% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Twila Paris" } +% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } tagline = "Engraved by JLH and Lilypond 2.8.2" } % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - \partial 2 r2 | % 0 + \partial 2 s2 | % 0 \repeat volta 2 { - R1 | % 1 - R1 | % 2 - R1 | % 3 - R1 | % 4 + s1*4 | % 1-4 } % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } + + s1*16 \bar "||" % 5-20 + + s1*16 \bar "||" % 21-36 + + % Chorus + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + + s1*16 \bar "||" % 37-52 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { To Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + + % Midtro + + s1*4 \bar "||" % 53-56 + + % Verse + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + + s1*16 \bar "||" % 57-72 + + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. al Coda } } + + % Coda + +\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break +%\stopStaff s1 \startStaff +\set Score.currentBarNumber = #73 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + \repeat volta 2 + { + s1*4 | % 73-76 + } + + % Bridge + + \repeat volta 2 + { + s1*8 | % 77-84 + } + + s1*8 \bar "||" % 85-92 + + s1*8 \bar ".|:-||" % 93-100 + + % Chorus + + \repeat volta 2 + { + s1*8 \bar "||" % 101-108 + + s1*7 | % 109-115 + } + \alternative + { + { + s1 | % 116 + } + { + s1 | % 117 + } + } + + s1*4 | % 118-121 + + % Outro + + \repeat volta 2 + { + s1*4 | % 122-125 + } + + s1 \bar "|." % 126 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + + \partial 2 r2 | % 0 + + R1*4 | % 1-4 + + % Verse r2 cs8 e4 e8 ~ | % 5 e8 a,4 d8 ~ d cs4 b8 ~ | % 6 @@ -66,7 +154,7 @@ LeadVox = \relative c' a4 r r2 | % 17 R1 | % 18 R1 | % 19 - R1 \bar "||" % 20 + R1 | % 20 r2 cs8 e4 e8 ~ | % 21 e8 a,4 d8 ~ d cs4 b8 ~ | % 22 @@ -83,14 +171,10 @@ LeadVox = \relative c' a4 r r2 | % 33 R1 | % 34 R1 | % 35 - r2 a4 cs \bar "||" % 36 + r2 a4 cs | % 36 % Chorus -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } -%\musicglyph #"scripts.segno" \italic { band in } } - cs4 r a cs | % 37 cs4 r d cs8 b ~ | % 38 b8 r r4 d cs8 b ( | % 39 @@ -106,21 +190,15 @@ LeadVox = \relative c' cs4 a8 a ~ a cs4 cs8 ~ | % 49 cs8 a4 d8 ~ d cs ( b ) b ~ | % 50 b2. r8 e, | % 51 - cs'4 b8 b ~ b a4 a8 ~ \bar "||" % 52 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { To Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + cs'4 b8 b ~ b a4 a8 ~ | % 52 % Midtro a1 | % 53 - R1 | % 54 - R1 | % 55 - R1 \bar "||" % 56 + R1*3 | % 54-56 % Verse -\mark \markup { \override #'(font-family . sans) { \box { C } } } - r2 cs8 e4 e8 ~ | % 57 e8 a,4 d8 ~ d cs4 b8 ~ | % 58 b4 r r2 | % 59 @@ -136,41 +214,24 @@ LeadVox = \relative c' a1 | % 69 r2 r4 e8 d' ~ | % 70 d8 cs ( b ) b ~ b2 | % 71 - r2 a4 cs \bar "||" % 72 - -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. al Coda } } + r2 a4 cs | % 72 % Coda -%\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break -\stopStaff s1 \startStaff -\set Score.currentBarNumber = #73 - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + s1 % Spacer for coda - \repeat volta 2 - { - R1 | % 73 - R1 | % 74 - R1 | % 75 - R1 | % 76 - } + R1*4 | % 73-76 % Bridge - \repeat volta 2 - { - e2 e | % 77 - e a,4 ( b ) | % 78 - b1 | % 79 - r4 a8 d ~ d cs4 a8 ( | % 80 - fs1 ) | % 81 - r4 a8 d ~ d cs4 b8 ~ | % 82 - b1 | % 83 - R1 | % 84 - } + e2 e | % 77 + e a,4 ( b ) | % 78 + b1 | % 79 + r4 a8 d ~ d cs4 a8 ( | % 80 + fs1 ) | % 81 + r4 a8 d ~ d cs4 b8 ~ | % 82 + b1 | % 83 + R1 | % 84 e2 e | % 85 e a,4 ( b ) | % 86 @@ -179,7 +240,7 @@ LeadVox = \relative c' fs1 ) | % 89 r4 a8 d ~ d cs4 b8 ~ | % 90 b1 | % 91 - R1 \bar "||" % 92 + R1 | % 92 e2 e | % 93 e a,4 ( b ) | % 94 @@ -188,58 +249,41 @@ LeadVox = \relative c' fs1 ) | % 97 r4 a8 d ~ d cs4 b8 ~ | % 98 b1 | % 99 - r2 a4 cs \bar "||" % 100 + r2 a4 cs | % 100 % Chorus - \repeat volta 2 - { - cs4 r a cs | % 101 - cs4 r d cs8 b ~ | % 102 - b8 r r4 d cs8 b ( | % 103 - a8 ) a4 r8 a4 cs | % 104 - cs4 r8 a ~ a cs4 cs8 ~ | % 105 - cs4 a8 d ~ d4 cs8 cs ( | % 106 - b2 ) r | % 107 - r2 a4 cs \bar "||" % 108 - - cs4 r a cs | % 109 - cs4 r d cs8 b ~ | % 110 - b8 r r4 d cs8 b ( | % 111 - a8 ) a4 r8 a4 cs | % 112 - cs4 a8 a ~ a cs4 cs8 ~ | % 113 - cs8 a4 d8 ~ d cs ( b ) b ~ | % 114 - b2. r4 | % 115 -% cs'4 b8 b ~ b a4 a8 ~ | % 116 - } - \alternative - { - { - r2 a4 cs | % 116 - } - { - R1 | % 117 - } - } + cs4 r a cs | % 101 + cs4 r d cs8 b ~ | % 102 + b8 r r4 d cs8 b ( | % 103 + a8 ) a4 r8 a4 cs | % 104 + cs4 r8 a ~ a cs4 cs8 ~ | % 105 + cs4 a8 d ~ d4 cs8 cs ( | % 106 + b2 ) r | % 107 + r2 a4 cs \bar "||" % 108 + + cs4 r a cs | % 109 + cs4 r d cs8 b ~ | % 110 + b8 r r4 d cs8 b ( | % 111 + a8 ) a4 r8 a4 cs | % 112 + cs4 a8 a ~ a cs4 cs8 ~ | % 113 + cs8 a4 d8 ~ d cs ( b ) b ~ | % 114 + b2. r4 | % 115 + + r2 a4 cs | % 116 - R1 | % 118 - R1 | % 119 - R1 | % 120 - R1 | % 121 + R1 | % 117 + + R1*4 | % 118-121 % Outro - \repeat volta 2 - { - R1 | % 122 - R1 | % 123 - R1 | % 124 - R1 | % 125 - } + R1*4 | % 122-125 r1^\fermata | % 126 } + LeadVoxText = \lyricmode { All cre- a- _ tion cries _ to you _ @@ -306,10 +350,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { \clef G - \key a \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -361,13 +401,10 @@ Chords = \chordmode \partial 2 s2 | % 0 - \repeat volta 2 - { - a1 | % 1 - d1:sus2 | % 2 - e1:11^7.9 | % 3 - d1:sus2 | % 4 - } + a1 | % 1 + d1:sus2 | % 2 + e1:11^7.9 | % 3 + d1:sus2 | % 4 % Verse @@ -452,30 +489,23 @@ Chords = \chordmode % Coda -%\stopStaff s1 \startStaff -s1 + s1 % Blank for coda - \repeat volta 2 - { - d1 | % 73 - fs1:m7 | % 74 - e1:sus4 | % 75 - e1 | % 76 - } + d1 | % 73 + fs1:m7 | % 74 + e1:sus4 | % 75 + e1 | % 76 % Bridge - \repeat volta 2 - { - a2.. d8:sus2 | % 77 - s2.. e8:sus4 | % 78 - s2.. e8 | % 79 - s1 | % 80 - fs2..:m7 d8:sus2 | % 81 - s2.. e8:sus4 | % 82 - s2.. e8 | % 83 - s1 | % 84 - } + a2.. d8:sus2 | % 77 + s2.. e8:sus4 | % 78 + s2.. e8 | % 79 + s1 | % 80 + fs2..:m7 d8:sus2 | % 81 + s2.. e8:sus4 | % 82 + s2.. e8 | % 83 + s1 | % 84 a1 | % 85 d1:sus2 | % 86 @@ -497,34 +527,26 @@ s1 % Chorus - \repeat volta 2 - { - a1 | % 101 - d1:sus2 | % 102 - e1:sus4 | % 103 - d1:sus2 | % 104 - a1 | % 105 - fs1:m7 | % 106 - e1:sus4 | % 107 - e1 | % 108 - - a1 | % 109 - d1:sus2 | % 110 - e1:sus4 | % 111 - d1:sus2 | % 112 - fs1:m7 | % 113 - d1:sus2 | % 114 - e1:sus4 | % 115 - } - \alternative - { - { - e1:sus4 | % 116 - } - { - e1:sus4 | % 117 - } - } + a1 | % 101 + d1:sus2 | % 102 + e1:sus4 | % 103 + d1:sus2 | % 104 + a1 | % 105 + fs1:m7 | % 106 + e1:sus4 | % 107 + e1 | % 108 + + a1 | % 109 + d1:sus2 | % 110 + e1:sus4 | % 111 + d1:sus2 | % 112 + fs1:m7 | % 113 + d1:sus2 | % 114 + e1:sus4 | % 115 + + e1:sus4 | % 116 + + e1:sus4 | % 117 fs1:m7 | % 118 d1:sus2 | % 119 @@ -533,17 +555,15 @@ s1 % Outro - \repeat volta 2 - { - a1 | % 122 - d1:sus2 | % 123 - e1:11^7.9 | % 124 - d1:sus2 | % 125 - } + a1 | % 122 + d1:sus2 | % 123 + e1:11^7.9 | % 124 + d1:sus2 | % 125 a1 | % 126 } + % % Alternate chord changes (2nd verse) % @@ -563,32 +583,24 @@ ChordsSup = \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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro \partial 2 c4-> c-> | % 0 - \repeat volta 2 - { - c4. c8 ~ c4 c | % 1 - c4. c8 ~ c4 c | % 2 - c4. c8 ~ c4 c | % 3 - c4. c8 ~ c4 c | % 4 - } + c4. c8 ~ c4 c | % 1 + c4. c8 ~ c4 c | % 2 + c4. c8 ~ c4 c | % 3 + c4. c8 ~ c4 c | % 4 % Verse @@ -607,7 +619,7 @@ StaffC = \relative c c2. ~ c8 c ~ | % 17 c1 | % 18 c2. ~ c8 c ~ | % 19 - c2. ~ c8 c-> ~ \bar "||" % 20 + c2. ~ c8 c-> ~ | % 20 c4 c-> c8 c c c ~ | % 21 c4 c-> c8 c c c ~ | % 22 @@ -624,7 +636,7 @@ StaffC = \relative c c2. ~ c8 c ~ | % 33 c1 | % 34 c2. ~ c8 c ~ | % 35 - c1 \bar "||" % 36 + c1 | % 36 % Chorus @@ -643,7 +655,7 @@ StaffC = \relative c c4 c c c | % 49 c4 c c c | % 50 c4 c c c | % 51 - c4 c c c \bar "||" % 52 + c4 c c c | % 52 % Midtro @@ -669,35 +681,29 @@ StaffC = \relative c c4 c c c | % 69 c4 c c c8 c ~ | % 70 c4 c c c | % 71 - c4 c c c \bar "||" % 72 + c4 c c c | % 72 % Coda -%\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break -\stopStaff s1 \startStaff +\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break +%\stopStaff s1 \startStaff \set Score.currentBarNumber = #73 - \repeat volta 2 - { - c4 c c c | % 73 - c4 c c c | % 74 - c4 c c c | % 75 - c4 c c c | % 76 - } + c4 c c c | % 73 + c4 c c c | % 74 + c4 c c c | % 75 + c4 c c c | % 76 % Bridge - \repeat volta 2 - { - c4 c-> c8 c c c ~ | % 77 - c4 c-> c8 c c c ~ | % 78 - c4 c-> c8 c c c ~ | % 79 - c4 c-> c8 c c c | % 80 - c4 c-> c8 c c c ~ | % 81 - c4 c-> c8 c c c ~ | % 82 - c4 c-> c8 c c c ~ | % 83 - c4 c-> c8 c c c | % 84 - } + c4 c-> c8 c c c ~ | % 77 + c4 c-> c8 c c c ~ | % 78 + c4 c-> c8 c c c ~ | % 79 + c4 c-> c8 c c c | % 80 + c4 c-> c8 c c c ~ | % 81 + c4 c-> c8 c c c ~ | % 82 + c4 c-> c8 c c c ~ | % 83 + c4 c-> c8 c c c | % 84 c4 c c c | % 85 c4 c c c | % 86 @@ -706,7 +712,7 @@ StaffC = \relative c c4 c c c | % 89 c4 c c c | % 90 c4 c c c | % 91 - c4 c c c \bar "||" % 92 + c4 c c c | % 92 c4 c c c | % 93 c4 c c c | % 94 @@ -715,38 +721,30 @@ StaffC = \relative c c4 c c c | % 97 c4 c c c | % 98 c4 c c c | % 99 - c4 c c c \bar "||" % 100 + c4 c c c | % 100 % Chorus - \repeat volta 2 - { - c4 c2.-> ~ | % 101 - c4 c2.-> ~ | % 102 - c4 c2.-> ~ | % 103 - c4 c2.-> ~ | % 104 - c4 c2.-> ~ | % 105 - c4 c2.-> | % 106 - c8 c c c c c c c | % 107 - r8 c-> c4-> r8 c-> c-> c-> \bar "||" % 108 - - c4 c c c | % 109 - c4 c c c | % 110 - c4 c c c | % 111 - c4 c c c | % 112 - c4 c c c | % 113 - c4 c c c | % 114 - c4 c c c | % 115 - } - \alternative - { - { - c4 c c c | % 116 - } - { - c4 c c c | % 117 - } - } + c4 c2.-> ~ | % 101 + c4 c2.-> ~ | % 102 + c4 c2.-> ~ | % 103 + c4 c2.-> ~ | % 104 + c4 c2.-> ~ | % 105 + c4 c2.-> | % 106 + c8 c c c c c c c | % 107 + r8 c-> c4-> r8 c-> c-> c-> | % 108 + + c4 c c c | % 109 + c4 c c c | % 110 + c4 c c c | % 111 + c4 c c c | % 112 + c4 c c c | % 113 + c4 c c c | % 114 + c4 c c c | % 115 + + c4 c c c | % 116 + + c4 c c c | % 117 c4 c c c | % 118 c4 c c c | % 119 @@ -755,13 +753,10 @@ StaffC = \relative c % Outro - \repeat volta 2 - { - c4. c8 ~ c4 c | % 122 - c4. c8 ~ c4 c | % 123 - c4. c8 ~ c4 c | % 124 - c4. c8 ~ c4 c | % 125 - } + c4. c8 ~ c4 c | % 122 + c4. c8 ~ c4 c | % 123 + c4. c8 ~ c4 c | % 124 + c4. c8 ~ c4 c | % 125 c1^\fermata | % 126 } @@ -786,40 +781,45 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new ChordNames = "chords2" \ChordsSup - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords + \new ChordNames \ChordsSup + \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" + "JazzText" + "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 } + diff --git a/god-is-my-redeemer.ly b/god-is-my-redeemer.ly index 3ef7d82..b735219 100644 --- a/god-is-my-redeemer.ly +++ b/god-is-my-redeemer.ly @@ -18,118 +18,163 @@ staffSize = #18 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - \tiny - r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 1 - r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 2 - r4 g, fs e | % 3 - d1 | % 4 - \normalsize + s1*4 \bar ".|:-||" % 1-4 % Verse \repeat volta 3 { -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - fs2^\markup { \italic { 3rd time instr. solo to B } } e | % 5 - d2 r4. a'8 | % 6 - b2 ~ b8 [ a g a ] | % 7 - a2 r | % 8 - fs2 e | % 9 - d2. ~ d8 [ fs ] | % 10 - g4. g8 g8. [ fs16 ] ~ fs8 [ d ] | % 11 - e2. r8 a, \bar"||" % 12 - -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - fs'2 e | d2. ~ d8 [ a' ] | % 14 - b2 ~ b8 [ a g a ] | % 15 - a1 | % 16 - r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 17 - r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 18 - r4 g, fs e | % 19 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + + s2^\markup { \italic { 3rd time instr. solo to B } } s | % 5 + s1*7 \bar"||" % 6-12 + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + + s1*7 | % 14-19 } \alternative { { - d1 | % 20 + s1 | % 20 } { - d2 r | % 21 + s1 | % 21 } } % Outro -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + + s1*4 | % 22-25 + + \repeat volta 3 + { + \mark \markup { \override #'(font-family . sans) { \box { D } } } + + s4^\markup { \italic { 3x } } s2. | % 26 + s1 | % 27 + } + + % Ending + + s1*2 \bar "|." % 28-29 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + +%{ \tiny + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 1 + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 2 + r4 g, fs e | % 3 + d1 | % 4 + \normalsize%} + s1*4 | % 1-4 + + % Verse + + fs2 e | % 5 + d2 r4. a'8 | % 6 + b2 ~ b8 [ a g a ] | % 7 + a2 r | % 8 + fs2 e | % 9 + d2. ~ d8 [ fs ] | % 10 + g4. g8 g8. [ fs16 ] ~ fs8 [ d ] | % 11 + e2. r8 a, | % 12 + + fs'2 e | d2. ~ d8 [ a' ] | % 14 + b2 ~ b8 [ a g a ] | % 15 + a1 | % 16 + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 17 + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 18 + r4 g, fs e | % 19 + + d1 | % 20 + + d2 r | % 21 + + % Outro + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 22 r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 23 r4 g, fs e | % 24 d1 | % 25 - \repeat volta 3 - { -\mark \markup { \override #'(font-family . sans) { \box { D } } } -% \mark \default - r4^\markup { \italic { 3x } } 8 [ 16 16 ] ~ 8 [ ] 4 | % 26 - r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 27 - } + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 26 + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 27 % Ending r4 g, fs e | % 28 - d1^\fermata \bar "|." % 29 + d1^\fermata | % 29 } + LeadVoxText = \lyricmode { - _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ - - God is my re- dee- __ _ _ _ _ mer - He heals me _ with re- a- ssu- __ _ _ ring love - And I love my _ re- dee- __ _ _ _ _ mer - O- ver- whel- __ _ _ ming - o- ver- co- __ _ _ ming - re- dee- ming love + God is my re -- dee -- _ _ _ _ mer + He heals me _ with re -- as -- su -- _ _ ring love + And I love my _ re -- dee -- _ _ _ _ mer + O -- ver -- whel -- _ _ ming + o -- ver -- co -- _ _ ming + re -- dee -- ming love love - O- ver- whel- __ _ _ ming - o- ver- co- __ _ _ ming - re- dee- ming love + O -- ver -- whel -- _ _ ming + o -- ver -- co -- _ _ ming + re -- dee -- ming love - O- ver- whel- __ _ _ ming - o- ver- co- __ _ _ ming + O -- ver -- whel -- _ _ ming + o -- ver -- co -- _ _ ming - re- dee- ming love + re -- dee -- ming love } % -% Chord names +% Riffs/instrumental figures % +Riffs = \relative c' +{ + \clef G + + % Intro + + \tiny + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 1 + r4 8 [ 16 16 ] ~ 8 [ ] 4 | % 2 + r4 g, fs e | % 3 + d1 | % 4 + \normalsize +} + +% +% Chord names +% Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro g1 | % 1 @@ -139,34 +184,26 @@ Chords = \chordmode % Verse - \repeat volta 3 - { - d2 a | % 5 - b2:m7 b:m7/a | % 6 - g1 | % 7 - d1 | % 8 - d2 a/cs | % 9 - b2:m7 b:m7/a | % 10 - e1:m7 | % 11 - a2:sus4 a | % 12 - - d2 a/cs | % 13 - b2:m7 b:m7/a | % 14 - g1 | % 15 - d2 e4:m11 d/fs | % 16 - g1 | % 17 - d2./fs b4:m7 | % 18 - e2:m7 d4/a a | % 19 - } - \alternative - { - { - d2 g/a | % 20 - } - { - d2 e4:m11 d/fs | % 21 - } - } + d2 a | % 5 + b2:m7 b:m7/a | % 6 + g1 | % 7 + d1 | % 8 + d2 a/cs | % 9 + b2:m7 b:m7/a | % 10 + e1:m7 | % 11 + a2:sus4 a | % 12 + + d2 a/cs | % 13 + b2:m7 b:m7/a | % 14 + g1 | % 15 + d2 e4:m11 d/fs | % 16 + g1 | % 17 + d2./fs b4:m7 | % 18 + e2:m7 d4/a a | % 19 + + d2 g/a | % 20 + + d2 e4:m11 d/fs | % 21 % Outro @@ -175,33 +212,24 @@ Chords = \chordmode e2:m7 d4/a a | % 24 d2 e4:m11 d/fs | % 25 - \repeat volta 3 - { - g1 | % 26 - d2./fs b4:m7 | % 27 - } + g1 | % 26 + d2./fs b4:m7 | % 27 % Ending e2:m7 d4/a a | % 28 - d1 \bar "|." % 29 + d1 | % 29 } % % 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 @@ -212,34 +240,26 @@ StaffC = \relative c % Verse - \repeat volta 3 - { - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - } - \alternative - { - { - c4 c c c | % 20 - } - { - c4 c \< c c \! | % 21 - } - } + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + + c4 c c c | % 20 + + c4 c \< c c \! | % 21 % Outro @@ -248,25 +268,25 @@ StaffC = \relative c c4 c c c | % 24 c4 c \< c c \! | % 25 - \repeat volta 3 - { - c4 c c c | % 26 - c4 c c c | % 27 - } + c4 c c c | % 26 + c4 c c c | % 27 % Ending c2_\markup { \italic { rit. } } c4 c | % 28 - c1^\fermata \bar "|." % 29 + c1^\fermata | % 29 } \score { << + \Global % The "roadmap" that everything else depends on + \context Staff << \new Voice = "lead" \LeadVox + \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> @@ -284,14 +304,14 @@ StaffC = \relative c \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "Luxi Mono" - (/ staffSize 20))) + #(define fonts (make-pango-font-tree + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Don't spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% 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) @@ -300,3 +320,4 @@ StaffC = \relative c % To find out what's eating the space at the top... % annotate-spacing = ##t } + diff --git a/god-of-our-fathers.ly b/god-of-our-fathers.ly index 6ed62e3..e83ee17 100644 --- a/god-of-our-fathers.ly +++ b/god-of-our-fathers.ly @@ -29,7 +29,7 @@ LeadVox = \relative c' \set Staff.instrumentName = #"Sop." \clef G \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -67,7 +67,7 @@ AltoVox = \relative c' \set Staff.instrumentName = #"Alto" \clef G \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -105,7 +105,7 @@ TenorVox = \relative c' \set Staff.instrumentName = #"Tenor" \clef F \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -143,7 +143,7 @@ BassVox = \relative c \set Staff.instrumentName = #"Bass" \clef F \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -271,7 +271,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -284,6 +284,4 @@ 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) } diff --git a/god-of-wonders.ly b/god-of-wonders.ly index 5bcb1af..6957201 100644 --- a/god-of-wonders.ly +++ b/god-of-wonders.ly @@ -35,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key a \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -108,10 +108,7 @@ LeadVox = \relative c'' % Intro/midtro - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 + s1*4 | % 1-4 % Verse @@ -152,13 +149,7 @@ LeadVox = \relative c'' % Solo 1 | % 31 - R1 | % 32 - R1 | % 33 - R1 | % 34 - R1 | % 35 - R1 | % 36 - R1 | % 37 - R1 | % 38 + R1*7 | % 32-38 % Chorus @@ -275,25 +266,22 @@ Riffs = \relative c' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro/midtro - e2:5.11 s16 fs4:m7 s16 d8:sus2 | % 1 + e2:3.5.11 s16 fs4:m7 s16 d8:sus2 | % 1 s1 | % 2 - e2:5.11 s16 fs4:m7 s16 d8:sus2 | % 3 + e2:3.5.11 s16 fs4:m7 s16 d8:sus2 | % 3 s1 | % 4 % Verse - e2:5.11 s16 fs4:m7 s16 d8:sus2 | % 5 + e2:3.5.11 s16 fs4:m7 s16 d8:sus2 | % 5 s1 | % 6 - e2:5.11 s16 fs4:m7 s16 d8:sus2 | % 7 + e2:3.5.11 s16 fs4:m7 s16 d8:sus2 | % 7 s1 | % 8 - e2:5.11 s16 fs4:m7 s16 d8:sus2 | % 9 + e2:3.5.11 s16 fs4:m7 s16 d8:sus2 | % 9 s1 | % 10 - e2:5.11 s16 fs4:m7 s16 d8:sus2 | % 11 + e2:3.5.11 s16 fs4:m7 s16 d8:sus2 | % 11 s1 | % 12 % Chorus @@ -307,9 +295,9 @@ Chords = \chordmode b1:m9 | % 19 d1:maj7 | % 20 - d2:sus2 e:5.11 | % 21 - d2:sus2 e:5.11 | % 22 - d2:sus2 e:5.11 | % 23 + d2:sus2 e:3.5.11 | % 21 + d2:sus2 e:3.5.11 | % 22 + d2:sus2 e:3.5.11 | % 23 d1:sus2 | % 24 % Interlude @@ -345,11 +333,11 @@ Chords = \chordmode % Outro - d2:sus2 e:5.11 | % 47 - d2:sus2 e:5.11 | % 48 - d2:sus2 e:5.11 | % 49 - d2:sus2 e:5.11 | % 50 - d2:sus2 e:5.11 | % 51 + d2:sus2 e:3.5.11 | % 47 + d2:sus2 e:3.5.11 | % 48 + d2:sus2 e:3.5.11 | % 49 + d2:sus2 e:3.5.11 | % 50 + d2:sus2 e:3.5.11 | % 51 d1:sus2 | % 52 } @@ -357,14 +345,11 @@ 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 = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro/midtro @@ -481,7 +466,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << @@ -524,6 +509,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][Nope... :-/] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/great-is-the-lord.ly b/great-is-the-lord.ly index 50707ca..93e703a 100644 --- a/great-is-the-lord.ly +++ b/great-is-the-lord.ly @@ -24,13 +24,13 @@ staffSize = #20 % Global = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \key c \major \time 6/8 % Intro - s2.*4 \bar "||:" % 1-4 + s2.*4 \bar ".|:-||" % 1-4 \repeat volta 2 { @@ -65,20 +65,13 @@ Global = % % Lead vocal % - LeadVox = \relative c' { -% \set Staff.instrument = #"Lead vox" -% \override Staff.TimeSignature #'style = #'() \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R2. | % 1 - R2. | % 2 - R2. | % 3 - R2. \bar "||:" % 4 + R2.*4 \bar "||:" % 1-4 % A section @@ -147,16 +140,9 @@ LeadVoxText = \lyricmode % % Riffs % - Riffs = \relative c''' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" - \override Staff.TimeSignature #'style = #'() \clef G -% \key c \major -% \time 6/8 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -206,12 +192,8 @@ Riffs = \relative c''' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro c2.:^3 | % 1 @@ -260,15 +242,11 @@ 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 Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -334,7 +312,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << @@ -354,10 +332,9 @@ Dynamics = } \Riffs - \new ChoirStaff = "Rhythm" + \new ChoirStaff << -% \new Staff = "riff" \RhythmB - \new ChordNames = "chords" \Chords + \new ChordNames \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> @@ -371,7 +348,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "JazzText" "Luxi Mono" (/ staffSize 20))) @@ -384,6 +361,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) } + diff --git a/hallelujah.ly b/hallelujah.ly index 4bb3827..4798ae3 100644 --- a/hallelujah.ly +++ b/hallelujah.ly @@ -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 "Hallelujah (Your Love Is Amazing)" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % \once \override TextScript #'padding = #2.0 @@ -105,18 +103,12 @@ 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 \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro - r1 | % 1 - r1 | % 2 - r1 | % 3 + r1*3 | % 1-3 r2 e16 g8 g16 ~ g e8 a16 ~ | % 4 % Verse @@ -249,9 +241,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro @@ -336,17 +325,11 @@ 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 - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 @@ -437,43 +420,43 @@ Dynamics = \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 >> - >> + \Global % The "roadmap" that everything else depends on - \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 >> + >> >> } \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" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% 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 +% ragged-last = ##t % 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) } + diff --git a/have-thine-own-way-lord-satb.ly b/have-thine-own-way-lord-satb.ly index 3f99be8..74a533c 100644 --- a/have-thine-own-way-lord-satb.ly +++ b/have-thine-own-way-lord-satb.ly @@ -23,15 +23,13 @@ staffSize = #20 % % Lead vocal % - LeadVox = \relative c'' { \set Staff.instrumentName = #"Sop." \clef G \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 9/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse @@ -54,9 +52,8 @@ AltoVox = \relative c' \set Staff.instrumentName = #"Alto" \clef G \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 9/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse @@ -79,9 +76,8 @@ TenorVox = \relative c' \set Staff.instrumentName = #"Tenor" \clef F \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 9/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse @@ -104,9 +100,8 @@ BassVox = \relative c \set Staff.instrumentName = #"Bass" \clef F \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 9/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse @@ -203,11 +198,11 @@ 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" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) ragged-last-bottom = ##f @@ -218,6 +213,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) } + diff --git a/he-knows-my-name.ly b/he-knows-my-name.ly index dad67db..af774b1 100644 --- a/he-knows-my-name.ly +++ b/he-knows-my-name.ly @@ -3,15 +3,13 @@ \include "english.ly" % Good sizes are 16, 18, & 20 -staffSize = #20 +staffSize = #18 #(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 "He Knows My Name" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -28,80 +26,106 @@ hn = #(define-music-function (parser location arg) (ly:music?) % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \partial 8*1 s8 | % 0 - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } - r4 e8 fs ~ fs4 a8 gs ( ~ | % 5 - gs4 e8 ) cs ~ cs4 r | % 6 - r4 gs'8 a ( ~ a gs ) fs fs ~ | % 7 - fs2 r | % 8 - r4 e8 fs ~ fs4 gs8 a | % 9 - gs4 ( e8 ) cs ~ cs4. e8 | % 10 - gs4 gs8 fs ~ fs4 e8 e ~ | % 11 - e2 r \bar "||" % 12 + s1*8 \bar "||" % 5-12 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - - r4 8 ~ 4 8 ( ~ | % 13 - 4. 8 ) ~ 2 | % 14 - r4 8 ~ 4 8 ~ | % 15 - 4 8 ~ 2 | % 16 - r4 8 ~ 4 8 ~ | % 17 - 4 8 ~ 4 r8 | % 18 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } - 4 8 8 ~ 4 8 ~ | % 19 + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + + s1*6 | % 13-18 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + s1 | % 19 } \alternative { { - 2 r | % 20 + s1 | % 20 } { - 2 \repeatTie r \bar "||" % 21 + s1 \bar "||" % 21 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. al Coda } } + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. al Coda } } } } % Coda -\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break -%\stopStaff s1 \startStaff -\set Score.currentBarNumber = #22 + \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break + %\stopStaff s1 \startStaff + \set Score.currentBarNumber = #22 %blegh \break -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + s1*9 \bar "|." % 22-30 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + + \partial 8*1 s8 | % 0 + s1*4 | % 1-4 + + % Verse + + r4 e8 fs ~ fs4 a8 gs ( ~ | % 5 + gs4 e8 ) cs ~ cs4 r | % 6 + r4 gs'8 a ( ~ a gs ) fs fs ~ | % 7 + fs2 r | % 8 + r4 e8 fs ~ fs4 gs8 a | % 9 + gs4 ( e8 ) cs ~ cs4. e8 | % 10 + gs4 gs8 fs ~ fs4 e8 e ~ | % 11 + e2 r | % 12 + + % Chorus + + r4 8 ~ 4 8 ( ~ | % 13 + 4. 8 ) ~ 2 | % 14 + r4 8 ~ 4 8 ~ | % 15 + 4 8 ~ 2 | % 16 + r4 8 ~ 4 8 ~ | % 17 + 4 8 ~ 4 r8 | % 18 + 4 8 8 ~ 4 8 ~ | % 19 + + 2 r | % 20 + + 2 \repeatTie r | % 21 + + % Coda + + s1 % Extra bar for coda 4 8 8 ~ 4 8 ~ | % 22 2 r4 r8 | % 23 @@ -109,11 +133,10 @@ LeadVox = \relative c' 2. r8 e | % 25 e4 gs8 fs ~ fs4 e | % 26 \voiceTwo e1 \oneVoice | % 27 - s1 | % 28 - s1 | % 29 - s1 \bar "|." % 30 + s1*3 | % 28-30 } + LeadVoxText = \lyricmode { I have _ a mak -- _ _ er, _ @@ -145,10 +168,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { \clef G - \key e \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -170,56 +189,44 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro \partial 8*1 s8 | % 0 a4. b2 cs8:m7 | % 1 - r4. cs2:m7/b s8 | % 2 + s4. cs2:m7/b s8 | % 2 fs4.:m7 b a8/b e | % 3 s2 b4/e a/e | % 4 - \repeat volta 2 - { - % Verse + % Verse - e4. fs2:m11 e8/gs | % 5 - s4. a2 s8 | % 6 - e4./b a2:sus2/cs b8:sus4 | % 7 - s4. b2 s8 | % 8 - e4. fs2:m11 e8/gs | % 9 - s4. a2 s8 | % 10 - e4./b b a8/b e | % 11 - s2 fs4:m7 e/gs | % 12 + e4. fs2:m11 e8/gs | % 5 + s4. a2 s8 | % 6 + e4./b a2:sus2/cs b8:sus4 | % 7 + s4. b2 s8 | % 8 + e4. fs2:m11 e8/gs | % 9 + s4. a2 s8 | % 10 + e4./b b a8/b e | % 11 + s2 fs4:m7 e/gs | % 12 - % Chorus + % Chorus - a4. e2 b8 | % 13 - s4. e2 s8 | % 14 - a4. e2 b8 | % 15 - s4. e2 s8 | % 16 - a4. e2 b8 | % 17 - s4. cs2:m7 s8 | % 18 - fs4.:m7 b2 e8 | % 19 - } - \alternative - { - { - s2 a/b | % 20 - } - { - s2 fs4:m7 e/gs | % 21 - } - } + a4. e2 b8 | % 13 + s4. e2 s8 | % 14 + a4. e2 b8 | % 15 + s4. e2 s8 | % 16 + a4. e2 b8 | % 17 + s4. cs2:m7 s8 | % 18 + fs4.:m7 b2 e8 | % 19 + + s2 a/b | % 20 + + s2 fs4:m7 e/gs | % 21 % Coda -s1 + s1 % Extra bar for coda fs4.:m7 b2 cs8:m7 | % 22 s2 cs:m7/b | % 23 @@ -236,17 +243,11 @@ s1 % % 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -256,44 +257,35 @@ StaffC = \relative c c4. c8 ~ c4 c8 c ~ | % 3 c2 c4 c | % 4 - \repeat volta 2 - { - % Verse + % Verse - c4. c8 ~ c4. c8 ~ | % 5 - c4. c8 ~ c4 c | % 6 - c4. c8 ~ c4. c8 ~ | % 7 - c4. c8 ~ c2 | % 8 - c4. c8 ~ c4. c8 ~ | % 9 - c4. c8 ~ c4 c | % 10 - c4. c8 ~ c4 c8 c ~ | % 11 - c2 c4 c \bar "||" % 12 + c4. c8 ~ c4. c8 ~ | % 5 + c4. c8 ~ c4 c | % 6 + c4. c8 ~ c4. c8 ~ | % 7 + c4. c8 ~ c2 | % 8 + c4. c8 ~ c4. c8 ~ | % 9 + c4. c8 ~ c4 c | % 10 + c4. c8 ~ c4 c8 c ~ | % 11 + c2 c4 c | % 12 - % Chorus + % Chorus - c4. c8 ~ c4. c8 ~ | % 13 - c4. c8 ~ c4 c | % 14 - c4. c8 ~ c4. c8 ~ | % 15 - c4. c8 ~ c4 c | % 16 - c4. c8 ~ c4. c8 ~ | % 17 - c4. c8 ~ c4 c | % 18 - c4. c8 ~ c4. c8 ~ | % 19 - } - \alternative - { - { - c4 c c c | % 20 - } - { - c4 \repeatTie c c c | % 21 - } - } + c4. c8 ~ c4. c8 ~ | % 13 + c4. c8 ~ c4 c | % 14 + c4. c8 ~ c4. c8 ~ | % 15 + c4. c8 ~ c4 c | % 16 + c4. c8 ~ c4. c8 ~ | % 17 + c4. c8 ~ c4 c | % 18 + c4. c8 ~ c4. c8 ~ | % 19 + + c4 c c c | % 20 + + c4 \repeatTie c c c | % 21 % Coda \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break %\stopStaff s1 \startStaff -\set Score.currentBarNumber = #22 c4. c8 ~ c4. c8 ~ | % 22 c4 c c c | % 23 @@ -303,7 +295,7 @@ StaffC = \relative c c4. c8 ~ c4. c8 ~ | % 27 c4. c8 ~ c4 c | % 28 c4 c c c | % 29 - c1-\fermata \bar "|." % 30 + c1-\fermata | % 30 } @@ -325,39 +317,44 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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" + "JazzText" + "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 } + diff --git a/he-leadeth-me.ly b/he-leadeth-me.ly index 9b45bbd..f5bc67c 100644 --- a/he-leadeth-me.ly +++ b/he-leadeth-me.ly @@ -3,17 +3,15 @@ \include "english.ly" % Good sizes are 16, 18, & 20 -staffSize = #16 +staffSize = #18 #(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 "He Leadeth Me" } -% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Fernando Ortega" } +% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } tagline = "Engraved by JLH and Lilypond 2.8.2" } @@ -30,79 +28,115 @@ hn = #(define-music-function (parser location arg) (ly:music?) % % Lead vocal % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 - s1 | % 5 - s1 | % 6 - s1 | % 7 - \voiceTwo r2 r4 g \oneVoice | % 8 + s1*8 \bar ".|:-||" % 1-8 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } - e4. d8 c4 g' | % 9 - a4 f f a | % 10 - g4. e8 e4 d8 ( c ) | % 11 - e4 e d g | % 12 - e4. d8 c4 g' | % 13 - a4 f c' b8 ( a ) | % 14 - g4 e e8 ( d ) c ( d ) | % 15 - e4. d8 c4 \bar "||" % 16 + s1*8 \bar "||" % 16 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - 4 | % 17 - 4 8 ( ) 4 | % 18 - 4 8 ( ) ( ) | % 19 - 4 | % 20 - 4 | % 21 - 4 8 ( ) 4 | % 22 - 4 << { \voiceOne 8 ( ) c ( d ) } \context Voice = "v2" { \voiceTwo \tiny a4 a8 b \normalsize } \oneVoice >> | % 23 - \time 2/4 4 \time 4/4 | % 24 - \voiceTwo c1 \oneVoice | % 25 - s1 | % 26 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + + s1*7 | % 17-23 + \time 2/4 s2 \time 4/4 | % 24 + s1*2 | % 25-26 } \alternative { { - s1 | % 27 - \voiceTwo r2 r4 g' \oneVoice | % 28 + s1*2 | % 27-28 } { s1 | % 29 } } - s1 | % 30 - s1 | % 31 - s1 | % 32 - \voiceTwo r2 r4 \oneVoice \bar "||" % 33 + s1*4 \bar "||" % 30-33 \key d \major % Verse -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + + s1*8 \bar "||" % 34-41 + + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + + s1*8 \bar "||" % 42-49 + + % Outro + + \mark \markup { \override #'(font-family . sans) { \box { E } } } + + s1*9 \bar "|." % 50-58 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + \clef G + + % Intro + + s1*7 | % 1-7 + \voiceTwo r2 r4 g \oneVoice | % 8 + + + % Verse + + e4. d8 c4 g' | % 9 + a4 f f a | % 10 + g4. e8 e4 d8 ( c ) | % 11 + e4 e d g | % 12 + e4. d8 c4 g' | % 13 + a4 f c' b8 ( a ) | % 14 + g4 e e8 ( d ) c ( d ) | % 15 + e4. d8 c4 | % 16 + + % Chorus + + 4 | % 17 + 4 8 ( ) 4 | % 18 + 4 8 ( ) ( ) | % 19 + 4 | % 20 + 4 | % 21 + 4 8 ( ) 4 | % 22 + 4 << { \voiceOne 8 ( ) c ( d ) } \context Voice = "v2" { \voiceTwo \tiny a4 a8 b \normalsize } \oneVoice >> | % 23 + 4 | % 24 + \voiceTwo c1 \oneVoice | % 25 + s1 | % 26 + + s1 | % 27 + \voiceTwo r2 r4 g' \oneVoice | % 28 + + s1 | % 29 + + s1 | % 30 + s1 | % 31 + s1 | % 32 + \voiceTwo r2 r4 \oneVoice | % 33 + + % Verse 4. 8 4 | % 34 4 | % 35 @@ -111,12 +145,10 @@ LeadVox = \relative c'' 4. 8 4 | % 38 4 8 ( ) | % 39 4 << { \voiceOne 8 ( ) d ( e ) } \context Voice = "v2" { \voiceTwo \tiny b4 b8 cs \normalsize } \oneVoice >> | % 40 - 4. 8 4 \bar "||" % 41 + 4. 8 4 | % 41 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { D } } } - 4 | % 42 4 8 ( ) 4 | % 43 4 8 ( ) ( ) | % 44 @@ -124,23 +156,15 @@ LeadVox = \relative c'' 4 | % 46 4 8 ( ) 4 | % 47 4 << { \voiceOne 8 ( ) d ( ) } \context Voice = "v2" { \voiceTwo \tiny b4 b8 a \normalsize } \oneVoice >> | % 48 - 2 \bar "||" % 49 + 2 | % 49 % Outro -\mark \markup { \override #'(font-family . sans) { \box { E } } } - \voiceTwo d1 \oneVoice | % 50 - s1 | % 51 - s1 | % 52 - s1 | % 53 - s1 | % 54 - s1 | % 55 - s1 | % 56 - s1 | % 57 - s1 \bar "|." % 58 + s1*8 | % 51-58 } + LeadVoxText = \lyricmode { He lead- eth me, O bless- ed thought, @@ -180,10 +204,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { \clef G - \key c \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -197,42 +217,21 @@ Riffs = \relative c'' d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 7 \voiceOne 1 \oneVoice | % 8 - \repeat volta 2 - { - % Verse + % Verse - s1 | % 9 - s1 | % 10 - s1 | % 11 - s1 | % 12 - s1 | % 13 - s1 | % 14 - s1 | % 15 - s1 | % 16 + s1*8 | % 9-16 - % Chorus + % Chorus - s1 | % 17 - s1 | % 18 - s1 | % 19 - s1 | % 20 - s1 | % 21 - s1 | % 22 - s1 | % 23 - \time 2/4 s2 \time 4/4 | % 24 - \voiceOne r8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ \oneVoice | % 25 - c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ | % 26 - } - \alternative - { - { - d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 27 - \voiceOne 1 \oneVoice | % 28 - } - { - d8 \repeatTie g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 29 - } - } + s1*7 | % 17-23 + s2 | % 24 + \voiceOne r8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ \oneVoice | % 25 + c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ | % 26 + + d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 27 + \voiceOne 1 \oneVoice | % 28 + + d8 \repeatTie g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 29 c8 bf16 f ~ f2. | % 30 c'8 bf16 f ~ f4 ~ f8. af16 ~ af bf8. | % 31 @@ -241,25 +240,11 @@ Riffs = \relative c'' % Verse - s1 | % 34 - s1 | % 35 - s1 | % 36 - s1 | % 37 - s1 | % 38 - s1 | % 39 - s1 | % 40 - s1 | % 41 + s1*8 | % 34-41 % Chorus - s1 | % 42 - s1 | % 43 - s1 | % 44 - s1 | % 45 - s1 | % 46 - s1 | % 47 - s1 | % 48 - s1 | % 49 + s1*8 | % 42-49 % Outro @@ -279,12 +264,8 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro c2:sus2/a c:sus2/f | % 1 @@ -296,47 +277,39 @@ Chords = \chordmode c2:sus2/e c:sus2/f | % 7 g1:sus4 | % 8 - \repeat volta 2 - { - % Verse + % Verse - c2 c/e | % 9 - f2 d:m7 | % 10 - c2/g a:m7 | % 11 - c2/f g4:sus4 g | % 12 - c2 c/e | % 13 - f2 fs:dim | % 14 - c2/g a:m7 | % 15 - c4/g g c g:sus4.7 \bar "||" % 16 + c2 c/e | % 9 + f2 d:m7 | % 10 + c2/g a:m7 | % 11 + c2/f g4:sus4 g | % 12 + c2 c/e | % 13 + f2 fs:dim | % 14 + c2/g a:m7 | % 15 + c4/g g c g:sus4.7 | % 16 - % Chorus + % Chorus - c2 g | % 17 - f4 e8:m7 d:m7 c4 f | % 18 - c2/g a:m7 | % 19 - d2:9 g4:sus4.7 g:7 | % 20 - c2 g | % 21 - f4 e8:m7 d:m7 c4 f | % 22 - c2/e a:m7 | % 23 - \time 2/4 c4/f g \time 4/4 | % 24 - c2:sus2/a c:sus2/f | % 25 - g1:sus4 | % 26 - } - \alternative - { - { - c2:sus2/e c:sus2/f | % 27 - g1:sus4 | % 28 - } - { - c2:sus2/e c:sus2/ef | % 29 - } - } + c2 g | % 17 + f4 e8:m7 d:m7 c4 f | % 18 + c2/g a:m7 | % 19 + d2:9 g4:sus4.7 g:7 | % 20 + c2 g | % 21 + f4 e8:m7 d:m7 c4 f | % 22 + c2/e a:m7 | % 23 + c4/f g | % 24 + c2:sus2/a c:sus2/f | % 25 + g1:sus4 | % 26 + + c2:sus2/e c:sus2/f | % 27 + g1:sus4 | % 28 + + c2:sus2/e c:sus2/ef | % 29 bf1:sus2/d | % 30 df1:maj7 | % 31 f1/g | % 32 - g2/a a4 a:sus4.7 \bar "||" % 33 + g2/a a4 a:sus4.7 | % 33 % Verse @@ -347,7 +320,7 @@ Chords = \chordmode d4. e8:m7 d2/fs | % 38 g2 gs:dim | % 39 d2/a b:m7 | % 40 - d4/a a d d:sus4.7 \bar "||" % 41 + d4/a a d d:sus4.7 | % 41 % Chorus @@ -358,7 +331,7 @@ Chords = \chordmode d2 a | % 46 g4 fs8:m7 e:m7 d4 g | % 47 d2/fs b:m7 | % 48 - d2/g a \bar "||" % 49 + d2/g a | % 49 % Outro @@ -377,17 +350,11 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -400,47 +367,40 @@ StaffC = \relative c c4 c c c | % 7 c1 | % 8 - \repeat volta 2 - { - % Verse - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c-> \bar "||" % 16 + % Verse - % Chorus + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c-> | % 16 - c4 c c c | % 17 - c4 c8 c c4 c | % 18 - c4 c c c | % 19 - c4 c c c | % 20 - c4 c c c | % 21 - c4 c8 c c4 c | % 22 - c4 c c c | % 23 - \time 2/4 c4 c \time 4/4 | % 24 - c4 c c c | % 25 - c4 c c c | % 26 - } - \alternative - { - { - c4 c c c | % 27 - c4 c c c | % 28 - } - { - c4 c c c | % 29 - } - } + % Chorus + + c4 c c c | % 17 + c4 c8 c c4 c | % 18 + c4 c c c | % 19 + c4 c c c | % 20 + c4 c c c | % 21 + c4 c8 c c4 c | % 22 + c4 c c c | % 23 + c4 c | % 24 + c4 c c c | % 25 + c4 c c c | % 26 + + c4 c c c | % 27 + c4 c c c | % 28 + + c4 c c c | % 29 c4 c c c | % 30 c4 c c c | % 31 c4 c c c | % 32 - c4 c c c \bar "||" % 33 + c4 c c c | % 33 % Verse @@ -451,7 +411,7 @@ StaffC = \relative c c4. c8 c4 c | % 38 c4 c c c | % 39 c4 c c c | % 40 - c4 c c c-> \bar "||" % 41 + c4 c c c-> | % 41 % Chorus @@ -462,7 +422,7 @@ StaffC = \relative c c4 c c c | % 46 c4 c8 c c4 c | % 47 c4 c c c | % 48 - c2 c \bar "||" % 49 + c2 c | % 49 % Outro @@ -474,7 +434,7 @@ StaffC = \relative c c4 c c c | % 55 c4 c c c | % 56 c4 c c c | % 57 - c1^\fermata \bar "|." % 58 + c1^\fermata | % 58 } @@ -496,6 +456,8 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + \context Staff << \new Voice = "lead" \LeadVox @@ -518,19 +480,20 @@ Dynamics = \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "Luxi Mono" - (/ staffSize 20))) + #(define fonts (make-pango-font-tree + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Don't spread staves vertically across last page (default: t) - ragged-last-bottom = ##f +% 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 +% ragged-last = ##t % To find out what's eating the space at the top... % annotate-spacing = ##t } + diff --git a/he-who-began-a-good-work-in-you.ly b/he-who-began-a-good-work-in-you.ly index 817908c..47e36cb 100644 --- a/he-who-began-a-good-work-in-you.ly +++ b/he-who-began-a-good-work-in-you.ly @@ -19,42 +19,104 @@ staffSize = #16 % -% Lead vocal +% Song's structure % - -LeadXvoxA = \relative c' +Global = { -% \set Voice.autoBeaming = ##f - \set Staff.instrumentName = #"Lead vox" \clef G \key a \major + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - -% \set Score.markFormatter = #format-mark-box-letters \repeat volta 2 { - R1^"Moderately, not too slow" | % 1 - R1 | % 2 + s1^"Moderately, not too slow" | % 1 + s1 | % 2 } \alternative { { - R1 | % 3 - R1 | % 4 + s1*2 | % 3-4 } { - R1 | % 5 - R1 \bar "||" % 6 + s1*2 \bar "||" % 5-6 } } % Chorus -%\mark \markup { \override #'(font-family . sans) { \box { A } } } -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + + s1*12 | % 7-18 + + s2... \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } s16 | % 19 + + s1 \bar "||" % 20 + + % Interlude + + s1*4 \bar"||" % 21-24 + + % Verse + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + + s1*15 | % 25-39 + R1 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark "D.S. al Coda" + \bar "||" % 40 +% \break + + % Coda (chorus again) + +\stopStaff s1 \startStaff +% s1 +\set Score.currentBarNumber = #41 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + s1 \bar "||" % 43 + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + + s1*14 | % 42-55 + + % Ending + + \repeat volta 2 + { + s1*2 | % 56-57 + } + \alternative + { + { + s1*2 | % 58-59 + } + { + s1 | % 60 + } + } + + s1 \bar "|." % 61 +} + + +% +% Lead vocal +% +LeadXvoxA = \relative c' +{ + \clef G + + % Intro + + R1*6 | % 1-6 + + % Chorus \stemUp a'4. gs8 ~ gs4 r8 e | % 7 fs [ gs ] a [ b ~ ] b gs4 e8 ~ | % 8 @@ -69,10 +131,6 @@ LeadXvoxA = \relative c' d [ cs ] \stemUp b [ a ] \stemDown cs [ b ~ ] b4 | % 17 r2 r8 b cs [ d ~ ] | % 18 d [ cs ] \stemUp b [ a ~ ] a [ b ] \stemDown cs [ d ~ ] | % 19 -%\mark \markup { \musicglyph #"scripts.coda" } | % 19 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } - d [ cs ] \stemUp b [ a ] a [ b ] gs [ a ~ ] \bar "||" % 20 % Interlude @@ -80,12 +138,10 @@ LeadXvoxA = \relative c' a2 r | % 21 R1 | % 22 R1 | % 23 - r2. r8 cs,16 [ d ] \bar"||" % 24 + r2. r8 cs,16 [ d ] | % 24 % Verse -\mark \markup { \override #'(font-family . sans) { \box { B } } } - e8 [ e ] e [ e ~ ] e [ d ] cs4 | % 25 e8 [ fs ] gs [ a ~ ] a [ gs ] e [ d ~ ] | % 26 d4 r r8 e fs [ b, ] ~ | % 27 @@ -101,25 +157,13 @@ LeadXvoxA = \relative c' gs8 [ gs ] gs [ gs ~ ] gs fs4 e8 | % 37 \times 2/3 { gs4 gs gs } \times 2/3 { gs a \stemDown b } | % 38 \stemUp a1 | % 39 - R1 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark "D.S. al Coda" - \bar "||" % 40 -% \break + R1 | % 40 % Coda (chorus again) -%\stopStaff s1 \startStaff -s1 -\set Score.currentBarNumber = #41 - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } - - d8 \repeatTie [ cs ] \stemUp b [ a ] a [ b ] gs4 \bar "||" \mark \default % 43 - -\mark \markup { \override #'(font-family . sans) { \box { C } } } + s1 % Blank bar for coda + d8 \repeatTie [ cs ] \stemUp b [ a ] a [ b ] gs4 | % 41 \stemUp a4. gs8 ~ gs4 r8 e | % 42 fs [ gs ] a [ b ~ ] b gs4 e8 ~ | % 43 e2 r | % 44 @@ -133,88 +177,69 @@ s1 d [ cs ] \stemUp b [ a ] \stemDown cs [ b ~ ] b4 | % 52 r2 r8 b cs [ d ~ ] | % 53 d [ cs ] \stemUp b [ a ~ ] a [ b ] \stemDown cs [ d ~ ] | % 54 -% d [ cs ] \stemUp b [ a ] a [ b ] gs [ a ~ ] \bar "|:" % 55 d [ cs ] \stemUp b [ a ] a [ b ] gs4 | % 55 % Ending - \repeat volta 2 - { - a2 r | % 56 - R1 | % 57 - } - \alternative - { - { - R1 | % 58 - R1 | % 59 - } - { - R1 | % 60 - } - } + a2 r | % 56 + R1 | % 57 + + R1 | % 58 + R1 | % 59 - r1^\fermata \bar "|." % 61 + R1 | % 60 + + r1^\fermata | % 61 } + LeadXvoxATextA = \lyricmode { - He who _ be- gan a good work _ in you _ - He who _ be- gan a good work _ in you _ - _ Will be fai- _ thful to com- plete it _ - Will be fai- _ thful to com- plete it _ - He who start- _ ed the work _ will be fai- - _ thful to com- plete it in you _ - - If the trou- ble you're fac- _ ing is - slow- ly re- pla- _ cing your hope _ with des- pair _ - And the pro- cess is long _ and you're - lo- sing your songs _ in the night _ - You can be sure _ that the Lord has his hand _ on you - Safe and se- cure _ He will ne- ver a- band- _ on you - You are his trea- _ sure And - He finds His plea- sure in you - - _ thful to com- plete it in - - He who _ be- gan a good work _ in you _ - He who _ be- gan a good work _ in you _ - _ Will be fai- _ thful to com- plete it _ - Will be fai- _ thful to com- plete it _ - He who start- _ ed the work _ will be fai- - _ thful to com- plete it in you _ + He who _ be- gan a good work _ in you _ + He who _ be- gan a good work _ in you _ + _ Will be fai- _ thful to com- plete it _ + Will be fai- _ thful to com- plete it _ + He who start- _ ed the work _ will be fai- + _ thful to com- plete it in you _ + + If the trou- ble you're fac- _ ing is + slow- ly re- pla- _ cing your hope _ with des- pair _ + And the pro- cess is long _ and you're + lo- sing your songs _ in the night _ + You can be sure _ that the Lord has his hand _ on you + Safe and se- cure _ He will ne- ver a- band- _ on you + You are his trea- _ sure And + He finds His plea- sure in you + + _ thful to com- plete it in + + He who _ be- gan a good work _ in you _ + He who _ be- gan a good work _ in you _ + _ Will be fai- _ thful to com- plete it _ + Will be fai- _ thful to com- plete it _ + He who start- _ ed the work _ will be fai- + _ thful to com- plete it in you _ } % % Background vocals % - BgXvoxA = \relative c' { -% \set Voice.autoBeaming = ##f - \set Staff.instrumentName = #"BG vox" \clef G - \key a \major - \time 4/4 + \numericTimeSignature - \repeat volta 2 - { - R1 | % 1 - R1 | % 2 - } - \alternative - { - { - R1 | % 3 - R1 | % 4 - } - { - R1 | % 5 - R1 | % 6 - } - } - \bar "||" + % Intro + + R1 | % 1 + R1 | % 2 + + R1 | % 3 + R1 | % 4 + + R1 | % 5 + R1 | % 6 % Chorus @@ -275,9 +300,8 @@ BgXvoxA = \relative c' % Coda (chorus again) \stopStaff s1 \startStaff -\set Score.currentBarNumber = #41 - R1 \bar "||" % 41 + R1 | % 41 R1 | % 42 R1 | % 43 @@ -296,25 +320,18 @@ BgXvoxA = \relative c' % Ending - \repeat volta 2 - { - R1 | % 56 - R1 | % 57 - } - \alternative - { - { - R1 | % 58 - R1 | % 59 - } - { - R1 | % 60 - } - } + R1 | % 56 + R1 | % 57 - r1^\fermata \bar "|." % 61 + R1 | % 58 + R1 | % 59 + + R1 | % 60 + + r1^\fermata | % 61 } + BgXvoxATextA = \lyricmode { %\set associatedVoice = foo @@ -330,171 +347,96 @@ BgXvoxATextA = \lyricmode % % Instrumental lines % - RhythmB = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Rhythm" \clef G - \key a \major - \time 4/4 - - \repeat volta 2 - { - \stemDown a'8 [ b cs b ~ ] b [ e ~ ] e4 | - d8 [ e cs b ~ ] b2 | % 4 - } - \alternative - { - { - a8 [ b cs b ~ ] b [ e cs a ~ ] | - \stemUp a1 | - } - { - \stemDown a8 [ b cs b ~ ] b [ e cs a ~ ] | - \stemUp a1 | - } - } - \bar "||" + \tiny + + % Intro + + \stemDown a'8 [ b cs b ~ ] b [ e ~ ] e4 | % 1 + d8 [ e cs b ~ ] b2 | % 2 + + a8 [ b cs b ~ ] b [ e cs a ~ ] | % 3 + \stemUp a1 | % 4 + + \stemDown a8 [ b cs b ~ ] b [ e cs a ~ ] | % 5 + \stemUp a1 | % 6 % Chorus - R1 | % 9 - R1 | - R1 | % 11 - R1 | - R1 | % 13 - R1 | - R1 | % 15 - R1 | - R1 | % 17 - R1 | - R1 | % 19 - R1 | - R1 | % 21 - R1 | + s1*14 | % 7-20 % Interlude - \stemDown a8 [ b cs b ~ ] b [ e ~ ] e4 | - d8 [ e cs b ~ ] b2 | % 24 - a8 [ b cs b ~ ] b [ e cs a ~ ] | - \stemUp a1 | % 26 + \stemDown a8 [ b cs b ~ ] b [ e ~ ] e4 | % 21 + d8 [ e cs b ~ ] b2 | % 22 + a8 [ b cs b ~ ] b [ e cs a ~ ] | % 23 + \stemUp a1 | % 24 % Verse - R1 | - R1 | - R1 | % 29 - R1 | - R1 | % 31 - R1 | - R1 | % 33 - R1 | - R1 | % 35 - R1 | - R1 | % 37 - R1 | - R1 | % 39 - R1 | - R1 | % 41 - R1 | + s1*16 | % 25-40 % Coda (chorus again) -\stopStaff s1 \startStaff -\set Score.currentBarNumber = #41 + s1 % Blank bar for coda - R1 \bar "||" % 43 - R1 | - R1 | % 45 - R1 | - R1 | % 47 - R1 | - R1 | % 49 - R1 | - R1 | % 51 - R1 | - R1 | % 53 - R1 | - R1 | % 55 - R1 | - R1 | % 57 + s1*15 | % 41-55 % Ending - \repeat volta 2 - { - \stemDown a8 [ b cs b ~ ] b [ e ~ ] e4 | - d8 [ e cs b ~ ] b2 | % 4 - } - \alternative - { - { - a8 [ b cs b ~ ] b [ e cs a ~ ] | - \stemUp a1 | - } - { - \stemDown a8 [ b cs b ~ ] b [ e cs a ~ ] | - } - } + \stemDown a8 [ b cs b ~ ] b [ e ~ ] e4 | % 56 + d8 [ e cs b ~ ] b2 | % 57 + + a8 [ b cs b ~ ] b [ e cs a ~ ] | % 58 + \stemUp a1 | % 59 - \stemUp a1^\fermata \bar "|." + \stemDown a8 [ b cs b ~ ] b [ e cs a ~ ] | % 60 + + \stemUp a1^\fermata | % 61 } % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -%\set chordNameExceptions = #popChords -%\set chordRootNamer = #chord-name->pop-markup + % Intro -% \popChords + a4. cs4.:m7 s4 | % 1 + d4. e4.:sus4 e4 | % 2 - \repeat volta 2 - { - a4. cs4.:m7 s4 | - d4. e4.:sus4 e4 | % 4 - } - \alternative - { - { - a4. cs2:m7 d8 | - s2 d/e | - } - { - fs4.:m7 e2 d8 | - s2 d/e | - } - } + a4. cs2:m7 d8 | % 3 + s2 d/e | % 4 + + fs4.:m7 e2 d8 | % 5 + s2 d/e | % 6 % Chorus - a4. e4./gs s4 | - d4./fs e4./gs s8 cs8:m7 | % 10 - s1 | - b2:m7 d/e | % 12 - a4. e/gs s4 | - d4./fs e2/gs cs8:sus4.7 | % 14 - s2. s8 cs:7 | - s1 | % 16 - b1:m7 | - e4.:sus4 e s4 | % 18 - b1:m7 | - e4.:sus4 e s8 d8 | % 20 - s4. a2/cs b8:m7 | - s2 d4/e e | % 22 + a4. e4./gs s4 | % 7 + d4./fs e4./gs s8 cs8:m7 | % 8 + s1 | % 9 + b2:m7 d/e | % 10 + a4. e/gs s4 | % 11 + d4./fs e2/gs cs8:sus4.7 | % 12 + s2. s8 cs:7 | % 13 + s1 | % 14 + b1:m7 | % 15 + e4.:sus4 e s4 | % 16 + b1:m7 | % 17 + e4.:sus4 e s8 d8 | % 18 + s4. a2/cs b8:m7 | % 19 + s2 d4/e e | % 20 % Interlude - a4. cs4.:m7 s4 | - d4. e4.:sus4 e4 | % 24 - fs4.:m7 e2 d8 | - s2 d/e | % 26 + a4. cs4.:m7 s4 | % 21 + d4. e4.:sus4 e4 | % 22 + fs4.:m7 e2 d8 | % 23 + s2 d/e | % 24 % Verse @@ -522,7 +464,8 @@ Chords = \chordmode % Coda (chorus again) -s1 | +s1 % Blank bar for coda + b2:m7 d4/e e | % 43 a4. e4./gs s4 | d4./fs e4./gs s8 cs8:m7 | % 45 @@ -543,21 +486,14 @@ s1 | % Ending - \repeat volta 2 - { - a4. cs4.:m7 s4 | - d4. e4.:sus4 e4 | % 59 - } - \alternative - { - { - a4. cs2:m7 d8 | - s2 d/e | - } - { - fs4.:m7 e2 d8 | - } - } + + a4. cs4.:m7 s4 | + d4. e4.:sus4 e4 | % 59 + + a4. cs2:m7 d8 | + s2 d/e | + + fs4.:m7 e2 d8 | s1 | } @@ -566,35 +502,22 @@ s1 | % % Chord rhythms % - -% Use a RhythmicStaff on the chords instead of this? -% It almost works, but not quite. Doesn't collapse chords to single notes... - StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Rhythm" - \time 4/4 - + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny - \repeat volta 2 - { - \stemDown c'4. c8 ~ c4 c | %1 - c4. c8 ~ c4 c | % 2 - } - \alternative - { - { - c4. c8 ~ c4. c8 ~ | % 3 - c4 c c c | % 4 - } - { - c4. c8 ~ c4. c8 ~ | % 5 - c4 c c c | % 6 - } - } - \bar "||" + % Intro + + \stemDown c'4. c8 ~ c4 c | %1 + c4. c8 ~ c4 c | % 2 + + c4. c8 ~ c4. c8 ~ | % 3 + c4 c c c | % 4 + + c4. c8 ~ c4. c8 ~ | % 5 + c4 c c c | % 6 % Chorus @@ -644,9 +567,8 @@ StaffC = \relative c % Coda (chorus again) \stopStaff s1 \startStaff -\set Score.currentBarNumber = #41 - c4 c c c \bar "||" % 41 + c4 c c c | % 41 c4. c8 ~ c4 c | % 42 c4. c8-> c4 r8 c8 ~ | % 43 c4 c c c | % 44 @@ -665,58 +587,64 @@ StaffC = \relative c % Ending - \repeat volta 2 - { - \stemDown c4. c8 ~ c4 c | % 56 - c4. c8 ~ c4 c | % 57 - } - \alternative - { - { - c4. c8 ~ c4. c8 ~ | % 58 - c4 c c c | % 59 - } - { - c4._\markup { \italic { rit. } } c8 ~ c4. c8 ~ | % 60 - } - } - c1 ^\fermata \bar "|." % 61 + \stemDown c4. c8 ~ c4 c | % 56 + c4. c8 ~ c4 c | % 57 + + c4. c8 ~ c4. c8 ~ | % 58 + c4 c c c | % 59 + + c4._\markup { \italic { rit. } } c8 ~ c4. c8 ~ | % 60 + + c1 ^\fermata | % 61 } \score { << - \new ChoirStaff = "Vox" + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = LeadVox { \new Voice = "lead" \LeadXvoxA } + \new Voice = "lead" \LeadXvoxA \new Lyrics \lyricsto "lead" \LeadXvoxATextA - \new Staff = BgVox { \new Voice = "bg" \BgXvoxA } + \new Voice \RhythmB + >> + + \new Staff + << + \new Voice = "bg" \BgXvoxA \new Lyrics \lyricsto "bg" \BgXvoxATextA >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new Staff = "riff" \RhythmB - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC + \new ChordNames \Chords + \new RhythmicStaff \StaffC >> \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() >> - \layout { -% 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" + "JazzText" + "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 } + diff --git a/here-i-am-to-worship.ly b/here-i-am-to-worship.ly index 1a75d04..6699113 100644 --- a/here-i-am-to-worship.ly +++ b/here-i-am-to-worship.ly @@ -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 "Here I Am To Worship" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "T. Hughes" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -31,11 +29,10 @@ hn = #(define-music-function (parser location arg) (ly:music?) % % Song's structure % - Global = { \key a \major - % \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -54,17 +51,16 @@ Global = % Chorus -% \mark \markup { \override #'(font-family . sans) { \box { B } } } -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } s1*7 | % 15-21 } \alternative { { -\once \override Score.RehearsalMark #'self-alignment-X = #right -\once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible -\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + \once \override Score.RehearsalMark #'self-alignment-X = #right + \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } s1*2 | % 22-23 } { @@ -113,20 +109,14 @@ Global = % % Lead vocal % - LeadVox = \relative c'' { \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro s2 | % 0 - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 - s1 | % 5 + s1*5 | % 1-5 % Verse @@ -270,7 +260,6 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { % Intro @@ -348,10 +337,6 @@ 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 { \override NoteHead #'style = #'slash @@ -432,16 +417,6 @@ Rhythm = \relative c Dynamics = { -%{ - s1*12 | % 1-12 - s4_\markup { \italic { Add bass, pad } } s2. | % 13 - s1*7 | % 14-20 - s4_\markup { \italic { Add perc, Ac. gtrs. } } s2. | % 21 - s1*28 | % 22-49 - s4_\markup { \italic { Piano only, like intro } } s2. | % 50 - s1*2 | % 51-52 - s4_\markup { \italic { Full band } } s2. | % 53 -%} s2_\mf | % 0 s1*3 | % 1-3 s4_\markup { \italic { add cymbal colors } } s2. | % 5 @@ -478,38 +453,21 @@ Dynamics = \score { -%{ - << - << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } - \new Lyrics \lyricsto "lead" \LeadVoxText - >> - - \new ChoirStaff = "Rhythm" - << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> - >> - - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() - >> -%} << \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() - \new Staff + \Global % The "roadmap" that everything else depends on + + \context Staff << - \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxTextA \new Lyrics \lyricsto "lead" \LeadVoxTextB >> -% \new Staff + \new ChoirStaff << \new ChordNames \Chords \new RhythmicStaff << \Rhythm \Dynamics >> @@ -520,11 +478,11 @@ Dynamics = \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "Luxi Mono" - (/ staffSize 20))) + #(define fonts (make-pango-font-tree + "Times New Roman" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) % ragged-last-bottom = ##f diff --git a/holy-is-the-lord.ly b/holy-is-the-lord.ly index 0efa0c6..171cb37 100644 --- a/holy-is-the-lord.ly +++ b/holy-is-the-lord.ly @@ -10,12 +10,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 "Holy Is The Lord" } -% subtitle = \markup { \override #'(font-family . sans) \fontsize #3.5 "SA version" } +% subtitle = \markup { \override #'(font-family . sans) \fontsize #3.5 "" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Blake/Harriton" } -% arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart/Deborah Hammons" } +% arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) } @@ -26,7 +24,7 @@ staffSize = #20 Global = { \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % A section @@ -39,18 +37,15 @@ Global = \mark \markup { \override #'(font-family . sans) { \box { B } } } - s1*16 \bar ":|" % 17-32 + s1*16 \bar ":|." % 17-32 } % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G % A section @@ -118,51 +113,12 @@ LeadVoxText = \lyricmode Riffs = \relative c' { -%{ - \clef G - \key ef \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 - - % Intro - - \tiny - 16 d bf f ~ f4 ~ f4. g16 bf | % 1 - c1 | % 2 - 16 d bf f ~ f4 ~ f4. g16 bf | % 3 - c2 | % 4 - - s1*9 - s2 - -\voiceOne -\tieDown - 16 d bf f ~ f4 ~ f4. g16 bf | % 14 -\tieNeutral -\oneVoice - c1 | % 15 - 16 d bf f ~ f4 ~ f4. g16 bf | % 16 - c2 | % 17 - - 16 d bf f ~ f4 ~ f4. g16 bf | % 18 - c2 r | % 19 - - s1*10 - - \stemUp - 16 e c g ~ g4 ~ g4. a16 c | % 31 - \stemNeutral - d2 r | % 32 - 16 e c g ~ g4 ~ g4. a16 c | % 33 - d2 r | % 34 -%} } % % Chord names % - Chords = \chordmode { % A section @@ -210,17 +166,11 @@ 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 = #'() -% \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % A section @@ -288,22 +238,23 @@ Dynamics = \score { << -% \new Staff - << - \new ChordNames \Chords -%Capo 3 edition -% \new ChordNames \transpose f d \Chords - \new RhythmicStaff << \Rhythm \Dynamics >> - >> + \Global % The "roadmap" that everything else depends on - \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 ChoirStaff + << + \new ChordNames \Chords +%Capo 3 edition +% \new ChordNames \transpose f d \Chords + \new RhythmicStaff << \Rhythm \Dynamics >> + >> + \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() >> @@ -327,6 +278,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/horizon-storm.ly b/horizon-storm.ly index e800c44..57e4801 100644 --- a/horizon-storm.ly +++ b/horizon-storm.ly @@ -15,7 +15,7 @@ subtitle = "as recorded on 'The Harvest'" composer = "Tom Howard" arranger = "Transcribed by Shamus Hammons" - tagline = "Engraved by JLH and Lilypond 2.8.2" + tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) } rightHand = \relative c'' diff --git a/hosanna-loud-hosanna.ly b/hosanna-loud-hosanna.ly index b47bcdb..125c849 100644 --- a/hosanna-loud-hosanna.ly +++ b/hosanna-loud-hosanna.ly @@ -21,46 +21,64 @@ staffSize = #20 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key bf \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse - \partial 4*1 f4 | % 0 + \partial 4*1 s4 | % 0 + s1*4 | % 1-4 +\break % bleh + + s1*4 | % 5-8 +\break % bleh + + s1*4 | % 9-12 +\break % bleh + + s1*3 | % 13-15 + \partial 4*3 s2. \bar "|." % 16 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Verse + + f4 | % 0 bf4 a8 ( g ) f4 bf | % 1 d,4 ( ef ) f f | % 2 g8 ( a ) bf4 c c | % 3 d2. f,4 | % 4 -\break % bleh bf4 a8 ( g ) f4 bf | % 5 d,4 ( ef ) f f | % 6 g8 ( a ) bf4 bf a | % 7 bf2. bf8 ( c ) | % 8 -\break % bleh d4 c d ef | % 9 c4 ( a8 bf ) c4 bf8 ( c ) | % 10 d4 c d ef | % 11 c2. f,4 | % 12 -\break % bleh bf4 a8 ( g ) f4 bf | % 13 d,4 ( ef ) f f | % 14 g8 ( a ) bf4 bf a | % 15 - \partial 4*3 bf2. \bar "|." % 16 + bf2. | % 16 } + LeadVoxText = \lyricmode { Ho -- san -- na, _ loud ho -- san -- _ na, the lit -- _ tle chil -- dren sang; @@ -89,13 +107,9 @@ LeadVoxTextC = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - - \partial 4*1 s4 | % 0 + s4 | % 0 bf1 | % 1 g2:m bf | % 2 ef2 f | % 3 @@ -114,48 +128,7 @@ Chords = \chordmode bf1 | % 13 g2:m bf | % 14 ef2 f | % 15 - \partial 4*3 bf2. | % 16 -} - - -% -% 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 - \override NoteHead #'style = #'slash - - % Verse - - \partial 4*1 r4 | % 0 - c4 c c c | % 1 - c4 c c c | % 2 - c4 c c c | % 3 - c4 c c c | % 4 - - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - \partial 4*3 c2. \bar "|." % 16 + bf2. | % 16 } @@ -185,16 +158,16 @@ Dynamics = { << << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Lyrics \lyricsto "lead" \LeadVoxText - \new Lyrics \lyricsto "lead" \LeadVoxTextB - \new Lyrics \lyricsto "lead" \LeadVoxTextC + \new ChordNames \Chords >> - \new ChoirStaff = "Rhythm" + \new Staff << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \Global % The "roadmap" that everything else depends on + \new Voice = "lead" \LeadVox + \new Lyrics \lyricsto "lead" \LeadVoxText + \new Lyrics \lyricsto "lead" \LeadVoxTextB + \new Lyrics \lyricsto "lead" \LeadVoxTextC >> \set Score.skipBars = ##t @@ -205,11 +178,11 @@ 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" + "JazzText" + "Luxi Mono" + (/ staffSize 20))) % Spread staves vertically across last page (default: t) % ragged-last-bottom = ##f @@ -220,6 +193,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) } + diff --git a/i-could-sing-of-your-love-forever.ly b/i-could-sing-of-your-love-forever.ly index 92b79b4..ea683fd 100644 --- a/i-could-sing-of-your-love-forever.ly +++ b/i-could-sing-of-your-love-forever.ly @@ -1,7 +1,8 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) staffSize = #18 % or 16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -9,105 +10,66 @@ staffSize = #18 % or 16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) { \fontsize #3.5 "I Could Sing Of Your Love Forever" } } -% composer = \markup { \override #'(font-family . sans) "" } + composer = \markup { \override #'(font-family . sans) "Martin Smith" } arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" } tagline = "Engraved by JLH and Lilypond 2.8.2" } % -% 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 % Intro \repeat volta 2 { - R1 | % 1 - R1 | % 2 - R1 | % 3 - R1 | % 4 + s1*4 | % 1-4 } \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } - r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 5 - r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 6 - r8 c' c8 a16 a ~ a g8 g16 ~ g f8. | % 7 - g8 g g f16 a ~ a g8 g16 ~ g f f8 | % 8 - r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 9 - r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 10 - r8 c' c c c c c c | % 11 - d8 c c c a4 ( g8 f ) \bar "||" % 12 + s1*8 \bar "||" % 5-12 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { B } } } - r4 f8 f f g a c ~ | % 13 - c4 f,8 g ~ g a ~ a4 | % 14 - r4 f8 f f g a c ~ | % 15 - c4 a8 a ~ a g4 ( f8 ) | % 16 - r4 f8 f f g a c ~ | % 17 - c4 f,8 g ~ g a ~ a4 | % 18 - r4 f8 f f g a c ~ | % 19 - c4 a8 a ~ a g4 ( f8 ) | % 20 + s1*8 | % 13-20 } \alternative { { - R1 | % 21 - R1 | % 22 - R1 | % 23 - R1 | % 24 + s1*4 | % 21-24 } { - r2 bf16 a8 g16 ~ g f8. | % 25 + s1 | % 25 } } % Bridge - d8 f4. r2 | % 26 - r4 r8 f d'16 c8 c16 ~ c8 c | % 27 - a4 ( g ) r2 | % 28 - r4 r8 f bf16 a8 g16 ~ g f8. | % 29 - d4 f8 f r f f d' ~ | % 30 - d8 c4 c8 ~ c a c d ~ | % 31 - d8 c4 a8 ( ~ a g4 f8 ) \bar "||" % 32 + s1*7 \bar "||" % 26-32 % Solo -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } \key g \major - R1 | % 33 - R1 | % 34 - R1 | % 35 - R1 | % 36 - R1 | % 37 - R1 | % 38 - R1 | % 39 - R1 | % 40 + s1*8 | % 33-40 % Chorus (redux) @@ -115,19 +77,81 @@ LeadVox = \relative c' \repeat volta 2 { -\mark \markup { \override #'(font-family . sans) { \box { D } } } - - r4 f8 f f g a c ~ | % 41 - c4 f,8 g ~ g a ~ a4 | % 42 - r4 f8 f f g a c ~ | % 43 - c4 a8 a ~ a g4 ( f8 ) | % 44 - r4 f8 f f g a c ~ | % 45 - c4 f,8 g ~ g a ~ a4 | % 46 - r4 f8 f f g a c ~ | % 47 - c4 a8 a ~ a g4 ( f8 ) | % 48 + \mark \markup { \override #'(font-family . sans) { \box { D } } } + + s1*8 | % 41-48 } -\mark \markup { \override #'(font-family . sans) { \box { E } } } + \mark \markup { \override #'(font-family . sans) { \box { E } } } + + s1*9 \bar "|." % 49-57 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + + R1*4 | % 1-4 + + % Verse + + r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 5 + r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 6 + r8 c' c8 a16 a ~ a g8 g16 ~ g f8. | % 7 + g8 g g f16 a ~ a g8 g16 ~ g f f8 | % 8 + r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 9 + r8 c' c8 a16 a ~ a g8 g16 ~ g f f8 | % 10 + r8 c' c c c c c c | % 11 + d8 c c c a4 ( g8 f ) | % 12 + + % Chorus + + r4 f8 f f g a c ~ | % 13 + c4 f,8 g ~ g a ~ a4 | % 14 + r4 f8 f f g a c ~ | % 15 + c4 a8 a ~ a g4 ( f8 ) | % 16 + r4 f8 f f g a c ~ | % 17 + c4 f,8 g ~ g a ~ a4 | % 18 + r4 f8 f f g a c ~ | % 19 + c4 a8 a ~ a g4 ( f8 ) | % 20 + + R1 | % 21 + R1 | % 22 + R1 | % 23 + R1 | % 24 + + r2 bf16 a8 g16 ~ g f8. | % 25 + + % Bridge + + d8 f4. r2 | % 26 + r4 r8 f d'16 c8 c16 ~ c8 c | % 27 + a4 ( g ) r2 | % 28 + r4 r8 f bf16 a8 g16 ~ g f8. | % 29 + d4 f8 f r f f d' ~ | % 30 + d8 c4 c8 ~ c a c d ~ | % 31 + d8 c4 a8 ( ~ a g4 f8 ) | % 32 + + % Solo + + R1*8 | % 33-40 + + % Chorus (redux) + + r4 f8 f f g a c ~ | % 41 + c4 f,8 g ~ g a ~ a4 | % 42 + r4 f8 f f g a c ~ | % 43 + c4 a8 a ~ a g4 ( f8 ) | % 44 + r4 f8 f f g a c ~ | % 45 + c4 f,8 g ~ g a ~ a4 | % 46 + r4 f8 f f g a c ~ | % 47 + c4 a8 a ~ a g4 ( f8 ) | % 48 r4 f8 f f g a c ~ | % 49 c4 f,8 g ~ g a ~ a4 | % 50 @@ -137,9 +161,10 @@ LeadVox = \relative c' c4 f,8 g ~ g a ~ a4 | % 54 r4 f8 f f g a c ~ | % 55 c4 a8 a ~ a g4 ( f8 ) ~ | % 56 - f1^\fermata \bar "|." % 57 + f1^\fermata | % 57 } + LeadVoxText = \lyricmode { O- ver the moun- _ tains and _ the sea @@ -177,58 +202,43 @@ LeadVoxText = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \repeat volta 2 - { - f2.. g8:m11 | % 1 - s1 | % 2 - bf1:9^7 | % 3 - bf2/c c | % 4 - } + f2.. g8:m11 | % 1 + s1 | % 2 + bf1:9^7 | % 3 + bf2/c c | % 4 - \repeat volta 2 - { - % Verse + % Verse - f1 | % 5 - g1:m11 | % 6 - bf1:9^7 | % 7 - bf4..:/c c16 s2 | % 8 - f1 | % 9 - g1:m11 | % 10 - bf1:9^7 | % 11 - bf2/c c | % 12 + f1 | % 5 + g1:m11 | % 6 + bf1:9^7 | % 7 + bf4..:/c c16 s2 | % 8 + f1 | % 9 + g1:m11 | % 10 + bf1:9^7 | % 11 + bf2/c c | % 12 - % Chorus + % Chorus - f2.. g8:m11 | % 13 - s1 | % 14 - bf2..:9^7 bf8/c | % 15 - s2 c | % 16 - f2.. g8:m11 | % 17 - s1 | % 18 - bf2..:9^7 bf8/c | % 19 - s2 c | % 20 - } - \alternative - { - { - f2.. g8:m11 | % 21 - s1 | % 22 - bf2..:9^7 bf8/c | % 23 - s2 c | % 24 - } - { - g1:m11 | % 25 - } - } + f2.. g8:m11 | % 13 + s1 | % 14 + bf2..:9^7 bf8/c | % 15 + s2 c | % 16 + f2.. g8:m11 | % 17 + s1 | % 18 + bf2..:9^7 bf8/c | % 19 + s2 c | % 20 + + f2.. g8:m11 | % 21 + s1 | % 22 + bf2..:9^7 bf8/c | % 23 + s2 c | % 24 + + g1:m11 | % 25 % Bridge @@ -253,17 +263,14 @@ Chords = \chordmode % Chorus (redux) - \repeat volta 2 - { - f2.. g8:m11 | % 41 - s1 | % 42 - bf2..:maj7 bf8/c | % 43 - s4.. c16 s2 | % 44 - f2.. g8:m11 | % 45 - s1 | % 46 - bf2..:maj7 bf8/c | % 47 - s2 c | % 48 - } + f2.. g8:m11 | % 41 + s1 | % 42 + bf2..:maj7 bf8/c | % 43 + s4.. c16 s2 | % 44 + f2.. g8:m11 | % 45 + s1 | % 46 + bf2..:maj7 bf8/c | % 47 + s2 c | % 48 f2.. g8:m11 | % 49 s1 | % 50 @@ -280,64 +287,47 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \tiny % Intro - \repeat volta 2 - { - c4 c c c8 c ~ | % 1 - c4 c c c | % 2 - c4 c c c | % 3 - c4 c c c | % 4 - } + c4 c c c8 c ~ | % 1 + c4 c c c | % 2 + c4 c c c | % 3 + c4 c c c | % 4 - \repeat volta 2 - { - % Verse + % Verse - c4 ~ c8. c16 ~ c4 c | % 5 - c4 ~ c8. c16 ~ c4 c | % 6 - c4 ~ c8. c16 ~ c4 c | % 7 - c4 ~ c8. c16 ~ c4 c | % 8 - c4 ~ c8. c16 ~ c4 c | % 9 - c4 c8. c16 ~ c4 c | % 10 - c4 c c c | % 11 - c8-> c c c c c c c | % 12 + c4 ~ c8. c16 ~ c4 c | % 5 + c4 ~ c8. c16 ~ c4 c | % 6 + c4 ~ c8. c16 ~ c4 c | % 7 + c4 ~ c8. c16 ~ c4 c | % 8 + c4 ~ c8. c16 ~ c4 c | % 9 + c4 c8. c16 ~ c4 c | % 10 + c4 c c c | % 11 + c8-> c c c c c c c | % 12 - % Chorus + % Chorus - c4 c c c8 c ~ | % 13 - c4 c c c | % 14 - c4 c c c8 c-> ~ | % 15 - c4 c c c | % 16 - c4 c c c8 c ~ | % 17 - c4 c c c | % 18 - c4 c c c8 c-> ~ | % 19 - c4 c c c | % 20 - } - \alternative - { - { - c4 c c c8 c ~ | % 21 - c4 c c c | % 22 - c4 c c c8 c ~ | % 23 - c4 c c c | % 24 - } - { - c4. c8 ~ c4 c | % 25 - } - } + c4 c c c8 c ~ | % 13 + c4 c c c | % 14 + c4 c c c8 c-> ~ | % 15 + c4 c c c | % 16 + c4 c c c8 c ~ | % 17 + c4 c c c | % 18 + c4 c c c8 c-> ~ | % 19 + c4 c c c | % 20 + + c4 c c c8 c ~ | % 21 + c4 c c c | % 22 + c4 c c c8 c ~ | % 23 + c4 c c c | % 24 + + c4. c8 ~ c4 c | % 25 % Bridge @@ -362,17 +352,14 @@ StaffC = \relative c % Chorus (redux) - \repeat volta 2 - { - c4 c c c8 c-> ~ | % 41 - c4 c8. c16 ~ c4 c | % 42 - c4 c c c8 c-> ~ | % 43 - c4 c8. c16 ~ c4 c | % 44 - c4 c c c8 c-> ~ | % 45 - c4 c8. c16 ~ c4 c | % 46 - c4 c c c8 c-> ~ | % 47 - c4 c c c | % 48 - } + c4 c c c8 c-> ~ | % 41 + c4 c8. c16 ~ c4 c | % 42 + c4 c c c8 c-> ~ | % 43 + c4 c8. c16 ~ c4 c | % 44 + c4 c c c8 c-> ~ | % 45 + c4 c8. c16 ~ c4 c | % 46 + c4 c c c8 c-> ~ | % 47 + c4 c c c | % 48 c4-> c c c8 c ~ | % 49 c4 c-> c c-> | % 50 @@ -382,42 +369,49 @@ StaffC = \relative c c4 c c c | % 54 c4-> c c c | % 55 c2->_\markup { \italic { rit. } } c-> | % 56 - c1^\fermata \bar "|." % 57 + c1^\fermata | % 57 } \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 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" - "JazzText" - "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 } + diff --git a/i-have-decided-to-follow-jesus-shortened.ly b/i-have-decided-to-follow-jesus-shortened.ly index 244c75d..4002b31 100644 --- a/i-have-decided-to-follow-jesus-shortened.ly +++ b/i-have-decided-to-follow-jesus-shortened.ly @@ -2,7 +2,7 @@ \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) @@ -244,7 +244,7 @@ StaffC = \relative c \set Voice.autoBeaming = ##f % \set Staff.instrumentName = #"Rhythm" \override Staff.TimeSignature #'style = #'() - \time 4/4 + \time 4/4 \override NoteHead #'style = #'slash % Intro diff --git a/i-have-decided-to-follow-jesus.ly b/i-have-decided-to-follow-jesus.ly index 666e833..036f75b 100644 --- a/i-have-decided-to-follow-jesus.ly +++ b/i-have-decided-to-follow-jesus.ly @@ -1,8 +1,8 @@ -\version "2.18.1" +\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) @@ -15,32 +15,32 @@ staffSize = #20 arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" } tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) % Let's try a chord dictionary - subtitle = \markup { \override #'(font-family . sans) { \center-column { C9 \fret-diagram-terse #"x;3;2;3;3;x;" } " " \center-column { "B7#9" \fret-diagram-terse #"x;2;1;2;3;x;" } " " \center-column { { "B" \chordFlat "maj7" } \fret-diagram-terse #"x;1;3;2;3;x;" } " " \center-column { A7sus4 \fret-diagram-terse #"x;o;2;o;3;x;" } " " \center-column { "F#7#5" \fret-diagram-terse #"2;x;2;3;3;x;" } " " \center-column { "Ab7b5" \fret-diagram-terse #"4;5;4;5;x;x;" } " " \center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" } " " \center-column { "C#m11" \fret-diagram-terse #"x;4;4;4;5;4;" } " " \center-column { "F#7#9" \fret-diagram-terse #"2;4;2;3;2;5;" } } } + subtitle = \markup { + \override #'(font-family . sans) \override #'(baseline-skip . 2) { + \center-column { C9 \fret-diagram-terse #"x;3;2;3;3;x;" } " " + \center-column { \concat{"B7" \chordSharp "9"} \fret-diagram-terse #"x;2;1;2;3;x;" } " " + \center-column { \concat{"B" \chordFlat "maj7"} \fret-diagram-terse #"x;1;3;2;3;x;" } " " + \center-column { "A7sus4" \fret-diagram-terse #"x;o;2;o;3;x;" } " " + \center-column { \concat{"F" \chordSharp "7" \chordSharp "5"} \fret-diagram-terse #"2;x;2;3;3;x;" } " " + \center-column { \concat{"A" \chordFlat "7" \chordFlat "5"} \fret-diagram-terse #"4;5;4;5;x;x;" } " " + \center-column { "A13" \fret-diagram-terse #"x;o;2;o;2;2;" } " " + \center-column { \concat{"C" \chordSharp "m11"} \fret-diagram-terse #"x;4;4;4;5;4;" } " " + \center-column { \concat{"F" \chordSharp "7" \chordSharp "9"} \fret-diagram-terse #"2;4;2;3;2;5;" } } + } } % % Song's structure % - Global = { \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro -%{ - s1^\markup { \italic { Ac. guitar } } | % 1 - s1 | % 2 - s1^\markup { \italic { Guitar II in } } | % 3 - s1 | % 4 - s1^\markup { \italic { Bass in } } | % 5 - s1 | % 6 - s1^\markup { \italic { Drums in } } | % 7 - s1 | % 8 -%} s1*8 | % 1-8 % Verse @@ -86,10 +86,8 @@ Global = % % Lead vocal % - LeadVox = \relative c' { - \override Staff.TimeSignature #'style = #'() \clef G % Intro @@ -198,7 +196,6 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { % Intro @@ -267,14 +264,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 - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash \teeny @@ -368,46 +360,26 @@ Dynamics = \score { -%{ << -% \new ChoirStaff = "Vox" + \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 ChoirStaff = "Rhythm" + \new ChoirStaff << % \new Staff = "riff" \RhythmB - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC - >> - - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() - >> -%} - << - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() - -% \new Staff - << \new ChordNames \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> - \new Staff - << - \Global - \new Voice = "lead" \LeadVox - \new Voice \Riffs - \new Lyrics \lyricsto "lead" \LeadVoxText - \new Lyrics \lyricsto "lead" \LeadVoxTextB - \new Lyrics \lyricsto "lead" \LeadVoxTextC - >> + \set Score.skipBars = ##t + \set Score.melismaBusyProperties = #'() >> } @@ -416,7 +388,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "JazzText" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -429,6 +401,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][Nope...] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/i-see-the-lord.ly b/i-see-the-lord.ly index f94ea13..441cd61 100644 --- a/i-see-the-lord.ly +++ b/i-see-the-lord.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 "I See The Lord" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Chris Falson" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -37,7 +35,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -49,7 +47,7 @@ Global = % Intro - s1*4 \bar "||:" % 1-4 + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { @@ -87,18 +85,11 @@ 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 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 + s1*4 | % 1-4 % Verse @@ -189,10 +180,6 @@ LeadVoxText = \lyricmode Riffs = \relative c { - \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -280,19 +267,14 @@ 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 % Intro - \tiny r4. c8 ~ c2 | % 1 r4. c8 ~ c2 | % 2 r4. c8 ~ c2 | % 3 @@ -381,45 +363,44 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff + \context Staff + << + \new Voice = "lead" \LeadVox + \new Voice \Riffs + \new Lyrics \lyricsto "lead" \LeadVoxText + >> + + \new ChoirStaff << \new ChordNames \Chords %Capo 4 edition % \new ChordNames \transpose b g \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> - - \new Staff - << - \Global % The "roadmap" that everything else depends on - \new Voice = "lead" \LeadVox - \new Voice \Riffs - \new Lyrics \lyricsto "lead" \LeadVoxText - >> >> } \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 +% 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 + ragged-last = ##t % 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) } + diff --git a/i-stand-amazed-in-the-presence.ly b/i-stand-amazed-in-the-presence.ly index dbc1f8a..5b5b169 100644 --- a/i-stand-amazed-in-the-presence.ly +++ b/i-stand-amazed-in-the-presence.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" @@ -13,8 +13,6 @@ staffSize = #23 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "I Stand Amazed In The Presence" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Charles H. Gabriel" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -23,71 +21,96 @@ staffSize = #23 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \repeat volta 2 { - R1 | % 1 - R1 | % 2 - R1 | % 3 - r2 r4 r8 d | % 4 + s1*4 | % 1-4 } \repeat volta 3 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - d4 b ( d ) g8 a16 g | % 5 - b4. ( a16 g ) g4 g | % 6 - fs4 fs8 fs g4 a | % 7 - g2. d4 | % 8 - e4. e8 g4 fs8 e | % 9 - d4. ( g8 ) g4 a | % 10 - b4 b8 b a4 a | % 11 - g1 \bar "||" % 12 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 5-12 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - b4 b b8 a g4 | % 13 - d'4 d d8 c b4 | % 14 - a4 a a4. b8 | % 15 - c4 b a2 | % 16 - b4 b b8 a g4 | % 17 - d'4 d d8 c b4 | % 18 - a4 b8 ( c ) b4 a | % 19 - \time 2/4 g4 fs \time 4/4 | % 20 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*7 | % 13-19 + \time 2/4 s2 \time 4/4 | % 20 } \alternative { { - g1 | % 21 - r2 r4 r8 d | % 22 + s1*2 | % 21-22 } { - g1 \bar "||" % 23 + s1 \bar "||" % 23 } } % Chorus (redux) -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*8 \bar "||" % 24-31 + + % Outro + + s1*3 \bar "|." % 32-34 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + + R1*3 | % 1-3 + r2 r4 r8 d | % 4 + + % Verse + + d4 b ( d ) g8 a16 g | % 5 + b4. ( a16 g ) g4 g | % 6 + fs4 fs8 fs g4 a | % 7 + g2. d4 | % 8 + e4. e8 g4 fs8 e | % 9 + d4. ( g8 ) g4 a | % 10 + b4 b8 b a4 a | % 11 + g1 | % 12 + + % Chorus + + b4 b b8 a g4 | % 13 + d'4 d d8 c b4 | % 14 + a4 a a4. b8 | % 15 + c4 b a2 | % 16 + b4 b b8 a g4 | % 17 + d'4 d d8 c b4 | % 18 + a4 b8 ( c ) b4 a | % 19 + g4 fs | % 20 + + g1 | % 21 + r2 r4 r8 d | % 22 + + g1 | % 23 + + % Chorus (redux) b4 b b8 a g4 | % 24 d'4 d d8 c b4 | % 25 @@ -96,15 +119,16 @@ LeadVox = \relative c' b4 b b8 a g4 | % 28 d'4 d d8 c b4 | % 29 a4 b8 ( c ) b4 a | % 30 - g2 fs \bar "||" % 31 + g2 fs | % 31 % Outro g1 | % 32 R1 | % 33 - r1^\fermata \bar "|." % 34 + r1^\fermata | % 34 } + LeadVoxText = \lyricmode { I stand a -- _ mazed in the pre- __ _ _ sence @@ -157,56 +181,41 @@ LeadVoxTextC = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \repeat volta 2 - { - g2 s16 a4..:m11 | % 1 - c2:sus2 s16 d8.:sus4 d4 | % 2 - g2 s16 a4..:m11 | % 3 - c2:sus2 s16 d8.:sus4 d4 | % 4 - } + g2 s16 a4..:m11 | % 1 + c2:sus2 s16 d8.:sus4 d4 | % 2 + g2 s16 a4..:m11 | % 3 + c2:sus2 s16 d8.:sus4 d4 | % 4 - \repeat volta 3 - { - % Verse + % Verse - g2 a:m11 | % 5 - g2/b e:m7 | % 6 - d2 c:sus2 | % 7 - g1 | % 8 - c2:sus2 a:m11 | % 9 - g2 e:m7 | % 10 - g2/d d | % 11 - g2 d4:sus4 d | % 12 + g2 a:m11 | % 5 + g2/b e:m7 | % 6 + d2 c:sus2 | % 7 + g1 | % 8 + c2:sus2 a:m11 | % 9 + g2 e:m7 | % 10 + g2/d d | % 11 + g2 d4:sus4 d | % 12 - % Chorus + % Chorus - g2 a:m11 | % 13 - g2/b e:m7 | % 14 - a1:m7 | % 15 - d2:sus4 d | % 16 - g2 a:m11 | % 17 - g2/b e:m7 | % 18 - a2:m7 g4/b c:sus2 | % 19 - \time 2/4 g4/d d \time 4/4 | % 20 - } - \alternative - { - { - g2 a:m11 | % 21 - c2:sus2 d4:sus4 d | % 22 - } - { - g2 d4:sus4 d | % 23 - } - } + g2 a:m11 | % 13 + g2/b e:m7 | % 14 + a1:m7 | % 15 + d2:sus4 d | % 16 + g2 a:m11 | % 17 + g2/b e:m7 | % 18 + a2:m7 g4/b c:sus2 | % 19 + g4/d d | % 20 + + g2 a:m11 | % 21 + c2:sus2 d4:sus4 d | % 22 + + g2 d4:sus4 d | % 23 % Chorus (redux) @@ -230,63 +239,46 @@ 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \repeat volta 2 - { - c4 c r16 c c c c4 | % 1 - c4 c r16 c8. c4 | % 2 - c4 c r16 c c c c4 | % 3 - c4 c r16 c8. c4 | % 4 - } + c4 c r16 c c c c4 | % 1 + c4 c r16 c8. c4 | % 2 + c4 c r16 c c c c4 | % 3 + c4 c r16 c8. c4 | % 4 - \repeat volta 3 - { - % Verse + % Verse - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c \bar "||" % 12 -\break + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 +%\break - % Chorus + % Chorus - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - \time 2/4 c4 c \time 4/4 | % 20 - } - \alternative - { - { - c4 c c c | % 21 - c4 c c c | % 22 - } - { - c4 c c c \bar "||" % 23 - } - } + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c | % 20 + + c4 c c c | % 21 + c4 c c c | % 22 + + c4 c c c | % 23 % Chorus (redux) @@ -297,13 +289,13 @@ StaffC = \relative c c4 c c c | % 28 c4 c c c | % 29 c4 c c c | % 30 - c4 c c c \bar "||" % 31 + c4 c c c | % 31 % Outro c4 c r16 c c c c4 | % 32 c4 c r16 c8. c4 | % 33 - c1^\fermata \bar "|." % 34 + c1^\fermata | % 34 } @@ -321,17 +313,20 @@ 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 ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords + \new RhythmicStaff << \StaffC \Dynamics >> >> \set Score.skipBars = ##t @@ -344,7 +339,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -357,6 +352,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) } + diff --git a/i-will-never-be.ly b/i-will-never-be.ly index e86d489..8897179 100644 --- a/i-will-never-be.ly +++ b/i-will-never-be.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "I Will Never Be (The Same Again)" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Geoff Bullock" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -22,52 +20,102 @@ staffSize = #16 % -% 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 % Intro - s1 | % 1 - s1 | % 2 + s1*2 | % 1-2 % A section \repeat volta 2 { -\mark \markup { \override #'(font-family . sans) \box { A } } - r8 fs16 fs fs fs g8 ~ g4 r8 r16 g | % 3 - b4 a8 a ~ a4 r | % 4 - r8 d,16 d d e fs e ~ e4 r8 a | % 5 - a8 e4 fs8 ~ fs4 r | % 6 - r8 fs16 fs fs fs g8 ~ g4 r8 b | % 7 - b8 a4 a8 ~ a4 r8 fs | % 8 - d4 fs8 fs16 e ~ e4. d16 cs | % 9 + \mark \markup { \override #'(font-family . sans) \box { A } } + s1*7 | % 3-9 } \alternative { { - d4 cs8 d ~ d4 r | % 10 + s1 | % 10 } { - d4 cs8 d ~ d4 r | % 11 + s1 | % 11 } } % B section -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } -%\mark \markup { \override #'(font-family . sans) \box { B } } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + + s1*7 | % 12-18 + \time 2/4 s2 \time 4/4 | % 19 + s2... + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + s16 \bar "||" % 20 + + % A section + + \mark \markup { \override #'(font-family . sans) \box { C } } + s1*8 \bar "||" % 21-28 + + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. al Coda } } + +% \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break +\stopStaff s1 \startStaff +\set Score.currentBarNumber = #29 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + % Coda + + s1*8 \bar "||" % 29-36 + + % Outro + + \key ef \major + + \mark \markup { \override #'(font-family . sans) \box { D } } + s1*14 \bar "|." % 37-50 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + + s1*2 | % 1-2 + + % A section + + r8 fs16 fs fs fs g8 ~ g4 r8 r16 g | % 3 + b4 a8 a ~ a4 r | % 4 + r8 d,16 d d e fs e ~ e4 r8 a | % 5 + a8 e4 fs8 ~ fs4 r | % 6 + r8 fs16 fs fs fs g8 ~ g4 r8 b | % 7 + b8 a4 a8 ~ a4 r8 fs | % 8 + d4 fs8 fs16 e ~ e4. d16 cs | % 9 + + d4 cs8 d ~ d4 r | % 10 + + d4 cs8 d ~ d4 r | % 11 + + % B section g8 g4 g8 ~ g4. a8 ~ | % 12 a8 e4 fs8 ~ fs2 | % 13 @@ -76,15 +124,11 @@ LeadVox = \relative c' f8 f16 f ~ f f g8 ~ g8. g16 ~ g4 | % 16 g8 g16 g ~ g f a8 ~ a4 r8 fs | % 17 d8 d16 b' ~ b8 a ~ a4 r8 fs | % 18 - \time 2/4 g8 fs16 g ~ g b8. ( \time 4/4 | % 19 -%\once \override Score.RehearsalMark #'self-alignment-X = #right -%\mark \markup { \hspace #4.0 \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } -%Argh, needs to be adjusted by hand...! - a8 ) a2..^\markup { \hspace #9.0 \raise #0.0 \italic { \larger { to Coda } } \hspace #1.0 \musicglyph #"scripts.coda" } \bar "||" % 20 + g8 fs16 g ~ g b8. ( | % 19 + a8 ) a2.. | % 20 % A section -\mark \markup { \override #'(font-family . sans) \box { C } } r8 fs16 fs fs fs g8 ~ g4 r4 | % 21 r8 g16 g b8 a ~ a a4 r16 fs | % 22 d16 d b d ~ d fs8 e16 ~ e4 r8 a | % 23 @@ -92,17 +136,9 @@ LeadVox = \relative c' fs8 fs g g ~ g4 r8 b ~ | % 25 b8 a4 a8 ~ a4 r8 fs | % 26 d4 fs8 fs16 e ~ e4. d16 cs | % 27 - d4 cs8 d ~ d4 r \bar "||" % 28 + d4 cs8 d ~ d4 r | % 28 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. al Coda } } - -% \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break -\stopStaff s1 \startStaff -\set Score.currentBarNumber = #29 - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + s1 % blank bar for coda % Coda @@ -113,13 +149,10 @@ LeadVox = \relative c' r8 fs16 fs fs fs g8 ~ g4 r8 b | % 33 b8 a4 a8 ~ a4 r8 fs | % 34 d4 fs8 fs16 e ~ e4. d16 cs | % 35 - d4 cs8 d ~ d4 r \bar "||" % 36 + d4 cs8 d ~ d4 r | % 36 % Outro - \key ef \major - -\mark \markup { \override #'(font-family . sans) \box { D } } r8 g16 g g g af8 ~ af4 r8 r16 af | % 37 c4 bf8 bf ~ bf4 r | % 38 r8 ef,16 ef ef f g f ~ f4 r8 bf | % 39 @@ -134,9 +167,10 @@ LeadVox = \relative c' ef4 g8 g16 f ~ f4. ef16 d | % 47 ef2. d4 | % 48 \voiceTwo { ef2 r2 } \oneVoice | % 49 - s1 \bar "|." % 50 + s1 | % 50 } + LeadVoxText = \lyricmode { I will ne -- ver be _ the same a -- gain, _ @@ -173,12 +207,6 @@ LeadVoxText = \lyricmode Riffs = \relative c' { - \clef G - \key d \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -200,12 +228,8 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro g4. a2 s8 | % 1 @@ -213,25 +237,17 @@ Chords = \chordmode % A section - \repeat volta 2 - { - d4. g2/d s8 | % 3 - g4/b a8/cs d2 s8 | % 4 - g4.. a16 s2 | % 5 - g8/b a4/cs d4. a4:sus4 | % 6 - d4. e2:m11 s8 | % 7 - g8 a4 d4. d4/fs | % 8 - g4. a2 s8 | % 9 - } - \alternative - { - { - g4/b a8/cs d4. a4:sus4 | % 10 - } - { - g4/b a8/cs d2 s8 | % 11 - } - } + d4. g2/d s8 | % 3 + g4/b a8/cs d2 s8 | % 4 + g4.. a16 s2 | % 5 + g8/b a4/cs d4. a4:sus4 | % 6 + d4. e2:m11 s8 | % 7 + g8 a4 d4. d4/fs | % 8 + g4. a2 s8 | % 9 + + g4/b a8/cs d4. a4:sus4 | % 10 + + g4/b a8/cs d2 s8 | % 11 % B section @@ -242,7 +258,7 @@ Chords = \chordmode bf4. c2/bf s8 | % 16 a4.:m7 d2/a s8 | % 17 e4.:m11 d2/fs s8 | % 18 - \time 2/4 g2 \time 4/4 | % 19 + g2 | % 19 a2:sus4 a | % 20 % A section @@ -256,7 +272,7 @@ Chords = \chordmode g4. a2 s8 | % 27 g4/b a8/cs d2 s8 | % 28 -s1 + s1 % blank for coda % Coda @@ -287,20 +303,15 @@ s1 af8/c bf4./d ef2 | % 50 } + % % 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -309,25 +320,17 @@ StaffC = \relative c % A section - \repeat volta 2 - { - c4. c8 ~ c4 c | % 3 - c4 c8 c ~ c4 c | % 4 - c4 ~ c8. c16 ~ c4 c | % 5 - c8 c4 c8 ~ c4 c | % 6 - c4. c8 ~ c4 c | % 7 - c8 c4 c8 ~ c4 c | % 8 - c4. c8 ~ c4 c | % 9 - } - \alternative - { - { - c4 c8 c ~ c4 c-> | % 10 - } - { - c4 c8 c ~ c4 c | % 11 - } - } + c4. c8 ~ c4 c | % 3 + c4 c8 c ~ c4 c | % 4 + c4 ~ c8. c16 ~ c4 c | % 5 + c8 c4 c8 ~ c4 c | % 6 + c4. c8 ~ c4 c | % 7 + c8 c4 c8 ~ c4 c | % 8 + c4. c8 ~ c4 c | % 9 + + c4 c8 c ~ c4 c-> | % 10 + + c4 c8 c ~ c4 c | % 11 % B section @@ -338,8 +341,8 @@ StaffC = \relative c c4. c8-> ~ c4 c | % 16 c4. c8 ~ c4 c | % 17 c4.-> c8-> ~ c4 c | % 18 - \time 2/4 c4-> c \time 4/4 | % 19 - c4-> c c c \bar "||" % 20 + c4-> c | % 19 + c4-> c c c | % 20 % A section @@ -350,11 +353,10 @@ StaffC = \relative c c4. c8 ~ c4. c8 ~ | % 25 c8 c4 c8 ~ c4 c | % 26 c4. c8 ~ c4 c | % 27 - c4 c8 c ~ c4 c \bar "||" % 28 + c4 c8 c ~ c4 c | % 28 % \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break \stopStaff s1 \startStaff -\set Score.currentBarNumber = #29 % Coda @@ -365,7 +367,7 @@ StaffC = \relative c c4. c8 ~ c4 c | % 33 c8 c4 c8 ~ c4 c | % 34 c4. c8 ~ c4 c | % 35 - c4 c8 c ~ c4 c \bar "||" % 36 + c4 c8 c ~ c4 c | % 36 % Outro @@ -382,7 +384,7 @@ StaffC = \relative c c4. c8 ~ c4 c | % 47 c4 c c c-> | % 48 c4. c8 ~ c4 c | % 49 - c8 c4. c2-\fermata \bar "|." % 50 + c8 c4. c2-\fermata | % 50 } @@ -407,33 +409,25 @@ Dynamics = s4 s \< s2 | % 48 s4_\f s2. | % 49 s8 s_\markup { \italic { rit. } } s2. | % 50 - -%{ - s4_\markup { \italic { snare pat. } } s2 | % 1 - s4_\markup { \italic { simile } } s2 | % 2 - s2.*19 - s4_\markup { \italic { spacy } } s2 | % 22 - s2.*5 - s4 s \< s \! | % 28 - s2.*22 - s4_\markup { \italic { Last time } } s2 | % 51 -%} } \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> - \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 @@ -446,7 +440,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "JazzText" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -459,6 +453,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/i-will-praise-him-still.ly b/i-will-praise-him-still.ly index 08b46f5..dda2841 100644 --- a/i-will-praise-him-still.ly +++ b/i-will-praise-him-still.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,8 +12,6 @@ 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 "I Will Praise Him Still" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Fernando Ortega" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. John Wierick" } @@ -30,126 +28,180 @@ hn = #(define-music-function (parser location arg) (ly:music?) % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 - \time 2/4 s2 \time 4/4 | % 5 - r2 r4 g8 fs | % 6 + s1*4 | % 1-4 + \time 2/4 s2 \time 4/4 | % 5 + s1 | % 6 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } - e4 e d d8 g | % 7 - a4 a b b8 a | % 8 - g4 e d d8 g | % 9 - \time 2/4 a4 a \time 4/4 | % 10 - g2 r4 g8 fs | % 11 - - e4 e d d8 g | % 12 - a4 a b b8 a | % 13 - g4 e d d8 g | % 14 - \time 2/4 a4 a \time 4/4 | % 15 - g2 r4 b8 d \bar "||" % 16 + s1*3 | % 7-9 + \time 2/4 s2 \time 4/4 | % 10 + s1*4 | % 11-14 + \time 2/4 s2 \time 4/4 | % 15 + s1 \bar "||" % 16 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { B } } } - 4 4 b8 ( a16 g ) | % 17 - 4 b8 d | % 18 - 4 b8 a | % 19 - \time 2/4 g4 b \time 4/4 | % 20 + s1*3 | % 17-19 + \time 2/4 s2 \time 4/4 | % 20 } \alternative { { - a2 r4 g8 fs \bar "||" % 21 - e4 e d d8 g | % 22 - a4 a b b8 a | % 23 - g4 e d d8 g | % 24 - \time 2/4 a4 a \time 4/4 | % 25 - g2. r4 | % 26 - r2 r4 g8 fs | % 27 + s1 \bar "||" % 21 + s1*3 | % 22-24 + \time 2/4 s2 \time 4/4 | % 25 + s1*2 | % 26-27 } { - a2 r4 e'8 e | % 28 - d4 d d b8 ( a16 g ) | % 29 + s1*2 | % 28-29 } } + s1*2 | % 30-31 + \time 2/4 s2 \time 4/4 | % 32 + s1 \bar "||" % 33 + + % Verse + + s1*3 | % 34-36 + \time 2/4 s2 \time 4/4 | % 37 + s1*2 | % 38-39 + + \repeat volta 2 + { + % Interlude + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*4 | % 40-43 + } + + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s1*3 | % 44-46 + \time 2/4 s2 \time 4/4 | % 47 + s1*4 | % 48-51 + \time 2/4 s2 \time 4/4 | % 52 + s1 \bar "||" % 53 + + % Verse outro + + \mark \markup { \override #'(font-family . sans) { \box { E } } } + s1*3 | % 54-56 + \time 2/4 s2 \time 4/4 | % 57 + s1*2 \bar "|." % 58-59 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + \clef G + + % Intro + + s1*4 | % 1-4 + s2 | % 5 + r2 r4 g8 fs | % 6 + + % Verse + + e4 e d d8 g | % 7 + a4 a b b8 a | % 8 + g4 e d d8 g | % 9 + a4 a | % 10 + g2 r4 g8 fs | % 11 + + e4 e d d8 g | % 12 + a4 a b b8 a | % 13 + g4 e d d8 g | % 14 + a4 a | % 15 + g2 r4 b8 d | % 16 + + % Chorus + + 4 4 b8 ( a16 g ) | % 17 + 4 b8 d | % 18 + 4 b8 a | % 19 + g4 b | % 20 + + a2 r4 g8 fs | % 21 + e4 e d d8 g | % 22 + a4 a b b8 a | % 23 + g4 e d d8 g | % 24 + a4 a | % 25 + g2. r4 | % 26 + r2 r4 g8 fs | % 27 + + a2 r4 e'8 e | % 28 + d4 d d b8 ( a16 g ) | % 29 + a4 a b b8 d | % 30 e4 e d b8 a | % 31 - \time 2/4 g4 b \time 4/4 | % 32 - a2 r4 g8 fs \bar "||" % 33 + g4 b | % 32 + a2 r4 g8 fs | % 33 % Verse e4 e d d8 g | % 34 a4 a b b8 a | % 35 g4 e d d8 g | % 36 - \time 2/4 a4 a \time 4/4 | % 37 + a4 a | % 37 g2. r4 | % 38 R1 | % 39 - \repeat volta 2 - { - % Interlude - -\mark \markup { \override #'(font-family . sans) { \box { C } } } + % Interlude - s1 | % 40 - s1 | % 41 - s1 | % 42 - \voiceOne s2. 8 \oneVoice | % 43 - } + s1 | % 40 + s1 | % 41 + s1 | % 42 + \voiceOne s2. 8 \oneVoice | % 43 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { D } } } - d4 d d b8 ( a16 g ) | % 44 a4 a b b8 d | % 45 e4 e d b8 a | % 46 - \time 2/4 g4 b \time 4/4 | % 47 + g4 b | % 47 a2 r4 e'8 e | % 48 d4 d d b8 ( a16 g ) | % 49 a4 a b b8 d | % 50 e4 e d b8 a | % 51 - \time 2/4 g4 b \time 4/4 | % 52 - a2 r4 g8 fs \bar "||" % 53 + g4 b | % 52 + a2 r4 g8 fs | % 53 % Verse outro -\mark \markup { \override #'(font-family . sans) { \box { E } } } - e4 e d d8 g | % 54 a4 a b b8 a | % 55 g4 e d d8 g | % 56 - \time 2/4 a4 a \time 4/4 | % 57 + a4 a | % 57 g1 ~ | % 58 - g1^\fermata \bar "|." % 59 + g1^\fermata | % 59 } + LeadVoxText = \lyricmode { When the mor- ning falls on the far- thest hill @@ -186,65 +238,51 @@ LeadVoxText = \lyricmode Riffs = \relative c''' { - \clef G - \key g \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro -\tiny + \tiny r2. g8 fs | % 1 e4 e d d8 g | % 2 a4 a b b16 c32 b a16 g | % 3 g4 e d d8 g | % 4 - \time 2/4 a4 a \time 4/4 | % 5 + a4 a | % 5 g1 | % 6 - \repeat volta 2 - { - % Verse + % Verse - s1 | % 7 - s1 | % 8 - s1 | % 9 - \time 2/4 s2 \time 4/4 | % 10 - s1 | % 11 + s1 | % 7 + s1 | % 8 + s1 | % 9 + s2 | % 10 + s1 | % 11 - s1 | % 12 - s1 | % 13 - s1 | % 14 - \time 2/4 s2 \time 4/4 | % 15 - s1 | % 16 + s1 | % 12 + s1 | % 13 + s1 | % 14 + s2 | % 15 + s1 | % 16 - % Chorus + % Chorus - s1 | % 17 - s1 | % 18 - s1 | % 19 - \time 2/4 s2 \time 4/4 | % 20 - } - \alternative - { - { - s1 | % 21 - s1 | % 22 - s1 | % 23 - s1 | % 24 - \time 2/4 s2 \time 4/4 | % 25 - s1 | % 26 - s1 | % 27 - } - { - s1 | % 28 - s1 | % 29 - } - } + s1 | % 17 + s1 | % 18 + s1 | % 19 + s2 | % 20 + + s1 | % 21 + s1 | % 22 + s1 | % 23 + s1 | % 24 + s2 | % 25 + s1 | % 26 + s1 | % 27 + + s1 | % 28 + s1 | % 29 s1 | % 30 s1 | % 31 - \time 2/4 s2 \time 4/4 | % 32 + s2 | % 32 s1 | % 33 % Verse @@ -252,31 +290,28 @@ Riffs = \relative c''' s1 | % 34 s1 | % 35 s1 | % 36 - \time 2/4 s2 \time 4/4 | % 37 + s2 | % 37 s1 | % 38 s1 | % 39 - \repeat volta 2 - { - % Interlude + % Interlude - << { \tiny e4 e d d8 g } \\ { \tiny 2 } >> | % 40 - << { a'4 a b b8 a } \\ { 2 b16 c b a g8 fs } >> | % 41 - << { g'4 e d d8 g } \\ { e,4. g16 a b8 g d b' } >> | % 42 - << { a'4 a b16 c b a s4 } \\ { a,4. g16 fs g4 b8 g } >> | % 43 - } + << { \tiny e4 e d d8 g } \\ { \tiny 2 } >> | % 40 + << { a'4 a b b8 a } \\ { 2 b16 c b a g8 fs } >> | % 41 + << { g'4 e d d8 g } \\ { e,4. g16 a b8 g d b' } >> | % 42 + << { a'4 a b16 c b a s4 } \\ { a,4. g16 fs g4 b8 g } >> | % 43 % Chorus s1 | % 44 s1 | % 45 s1 | % 46 - \time 2/4 s2 \time 4/4 | % 47 + s2 | % 47 s1 | % 48 s1 | % 49 s1 | % 50 s1 | % 51 - \time 2/4 s2 \time 4/4 | % 52 + s2 | % 52 s1 | % 53 % Verse outro @@ -284,74 +319,62 @@ Riffs = \relative c''' s1 | % 54 s1 | % 55 s1 | % 56 - \time 2/4 s2 \time 4/4 | % 57 + s2 | % 57 s1 | % 58 - s1 \bar "|." % 59 -\normalsize + s1 | % 59 + \normalsize } % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s1 | % 1 c2/g g | % 2 d2/fs e:m | % 3 a2:m g/b | % 4 - \time 2/4 d2 \time 4/4 | % 5 + d2 | % 5 g1 | % 6 - \repeat volta 2 - { - % Verse + % Verse - c2 g/b | % 7 - d2 g | % 8 - a2:m g/b | % 9 - \time 2/4 d2 \time 4/4 | % 10 - g1 | % 11 + c2 g/b | % 7 + d2 g | % 8 + a2:m g/b | % 9 + d2 | % 10 + g1 | % 11 - c2/g g | % 12 - d2/fs e:m | % 13 - a2:m g/b | % 14 - \time 2/4 d2 \time 4/4 | % 15 - g1 | % 16 + c2/g g | % 12 + d2/fs e:m | % 13 + a2:m g/b | % 14 + d2 | % 15 + g1 | % 16 - % Chorus + % Chorus - d2 g | % 17 - d2/fs g | % 18 - e2:m b:m | % 19 - \time 2/4 c \time 4/4 | % 20 - } - \alternative - { - { - d1 | % 21 - c2 g/b | % 22 - d2 e:m | % 23 - a2:m g/b | % 24 - \time 2/4 d2 \time 4/4 | % 25 - g1 | % 26 - s1 | % 27 - } - { - d1 | % 28 - d2 g | % 29 - } - } + d2 g | % 17 + d2/fs g | % 18 + e2:m b:m | % 19 + c | % 20 + + d1 | % 21 + c2 g/b | % 22 + d2 e:m | % 23 + a2:m g/b | % 24 + d2 | % 25 + g1 | % 26 + s1 | % 27 + + d1 | % 28 + d2 g | % 29 d2/fs g | % 30 e2:m b:m | % 31 - \time 2/4 c2 \time 4/4 | % 32 + c2 | % 32 d1 | % 33 % Verse @@ -359,31 +382,28 @@ Chords = \chordmode c2 g/b | % 34 d2 e:m | % 35 a2:m7 g/b | % 36 - \time 2/4 d2 \time 4/4 | % 37 + d2 | % 37 g1 | % 38 s1 | % 39 - \repeat volta 2 - { - % Interlude + % Interlude - c2/g g | % 40 - d2/fs g | % 41 - c2/g g | % 42 - d2/fs g | % 43 - } + c2/g g | % 40 + d2/fs g | % 41 + c2/g g | % 42 + d2/fs g | % 43 % Chorus d2 g | % 44 d2:/fs g | % 45 e2:m b:m7 | % 46 - \time 2/4 c2 \time 4/4 | % 47 + c2 | % 47 d1 | % 48 d2 g | % 49 d2/fs g | % 50 e2:m b:m7 | % 51 - \time 2/4 c2 \time 4/4 | % 52 + c2 | % 52 d1 | % 53 % Verse outro @@ -391,7 +411,7 @@ Chords = \chordmode c2 g/b | % 54 d2 e:m | % 55 a2:m g/b | % 56 - \time 2/4 d2 \time 4/4 | % 57 + d2 | % 57 g1 | % 58 s1 | % 59 } @@ -400,17 +420,11 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -418,52 +432,44 @@ StaffC = \relative c c4 c c c | % 2 c4 c c c | % 3 c4 c c c | % 4 - \time 2/4 c4 c \time 4/4 | % 5 + c4 c | % 5 c4 c c c | % 6 - \repeat volta 2 - { - % Verse + % Verse - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - \time 2/4 c4 c \time 4/4 | % 10 - c4 c c c | % 11 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c | % 10 + c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - \time 2/4 c4 c \time 4/4 | % 15 - c4 c c c | % 16 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c | % 15 + c4 c c c | % 16 - % Chorus + % Chorus - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - \time 2/4 c4 c \time 4/4 | % 20 - } - \alternative - { - { - c4 c c c | % 21 - c4 c c c | % 22 - c4 c c c | % 23 - c4 c c c | % 24 - \time 2/4 c4 c \time 4/4 | % 25 - c4 c c c | % 26 - c4 c c c | % 27 - } - { - c4 c c c | % 28 - c4 c c c | % 29 - } - } + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c | % 20 + + c4 c c c | % 21 + c4 c c c | % 22 + c4 c c c | % 23 + c4 c c c | % 24 + c4 c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + + c4 c c c | % 28 + c4 c c c | % 29 c4 c c c | % 30 c4 c c c | % 31 - \time 2/4 c4 c \time 4/4 | % 32 + c4 c | % 32 c4 c c c | % 33 % Verse @@ -471,31 +477,28 @@ StaffC = \relative c c4 c c c | % 34 c4 c c c | % 35 c4 c c c | % 36 - \time 2/4 c4 c \time 4/4 | % 37 + c4 c | % 37 c4 c c c | % 38 c4 c c c | % 39 - \repeat volta 2 - { - % Interlude + % Interlude - c4 c c c | % 40 - c4 c c c | % 41 - c4 c c c | % 42 - c4 c c c | % 43 - } + c4 c c c | % 40 + c4 c c c | % 41 + c4 c c c | % 42 + c4 c c c | % 43 % Chorus c4 c c c | % 44 c4 c c c | % 45 c4 c c c | % 46 - \time 2/4 c4 c \time 4/4 | % 47 + c4 c | % 47 c4 c c c | % 48 c4 c c c | % 49 c4 c c c | % 50 c4 c c c | % 51 - \time 2/4 c4 c \time 4/4 | % 52 + c4 c | % 52 c1 | % 53 % Verse outro @@ -503,9 +506,9 @@ StaffC = \relative c c2 c | % 54 c2 c | % 55 c2 c | % 56 - \time 2/4 c4 c \time 4/4 | % 57 + c4 c | % 57 c1 ~ | % 58 - c1^\fermata \bar "|." % 59 + c1^\fermata | % 59 } @@ -521,15 +524,19 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> - \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 @@ -542,7 +549,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -555,6 +562,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) } + diff --git a/if-we-are-the-body.ly b/if-we-are-the-body.ly index 4437d33..c2acf32 100644 --- a/if-we-are-the-body.ly +++ b/if-we-are-the-body.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,11 +12,9 @@ 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 "If We Are The Body" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Casting Crowns" } -% 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)) } @@ -37,7 +35,7 @@ Global = % \key fs \minor % Transposed edition \key e \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -107,17 +105,6 @@ Global = } s1 \bar "|." % 74 - - -%{ - -% \once \override TextScript #'padding = #2.0 -% s1*0^\markup { \large \bold { Moderately fast pop } } -%%Capo 3 version -%% s1*0^\markup { \large \bold { Moderately fast pop "(*** CAPO 3 ***)" } } -% s1*13 \bar "||:" % 1-13 - -%} } @@ -127,7 +114,6 @@ Global = LeadVox = \relative c' { \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -225,6 +211,7 @@ LeadVox = \relative c' s1 | % 74 } + LeadVoxText = \lyricmode { It’s crowd -- ed _ in wor -- ship _ to -- day, _ @@ -310,9 +297,6 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro fs1:m7 | % 1 @@ -414,14 +398,11 @@ 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 = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -540,13 +521,14 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << % \context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >> % Transposed edition - \context Staff << \new Voice = "lead" \transpose fs e \LeadVox \new Voice \transpose fs e \Riffs >> + \new Voice = "lead" \transpose fs e \LeadVox + \new Voice \transpose fs e \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> @@ -569,7 +551,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -582,6 +564,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) } + diff --git a/in-christ-alone.ly b/in-christ-alone.ly index b736100..3e5f7bc 100644 --- a/in-christ-alone.ly +++ b/in-christ-alone.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 "In Christ Alone" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Stuart Townend/Keith Getty" } % arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. " } 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 d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Intro @@ -46,9 +42,9 @@ Global = s1*0^\markup { \large \bold { Not too fast } } % Capo 4 version % s1*0^\markup { \hspace #0.0 \raise #2.0 \larger \bold { "Moderate pop (*** CAPO 4 ***)" } } - - s2.*17 \bar "|." % 1-17 -% \mark \markup { \override #'(font-family . sans) { \box { A } } } + \partial 8*3 s4. | % 0 + s2.*15 | % 1-15 + \partial 8*3 s4. \bar "|." % 16 } @@ -57,13 +53,10 @@ 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 - r4 r8 a b8. d16 | % 0 +% r4 r8 a b8. d16 | % 0 + a8 b8. d16 | % 0 d4. a8 b d | % 1 e2 fs8 e16 d | % 2 b8 fs' e4. d8 | % 3 @@ -82,7 +75,8 @@ LeadVox = \relative c' d4. a8 b d | % 13 e2 fs8 e16 d | % 14 b8 fs' e4. d8 | % 15 - d4. r8 r4 | % 16 +% d4. r8 r4 | % 16 + d4. | % 16 } LeadVoxText = \lyricmode @@ -144,10 +138,6 @@ LeadVoxTextD = \lyricmode Riffs = \relative c'' { - \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro %{ @@ -162,10 +152,8 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - - s4. d8 g4/a | % 0 +% s4. d8 g4/a | % 0 + d8 g4/a | % 0 d2 g4 | % 1 a4:sus4 a b:m | % 2 g4 a4. g8/a | % 3 @@ -184,24 +172,22 @@ Chords = \chordmode d4:sus4 d g | % 13 a4:sus4 a b:m | % 14 g4 a4. g8/a | % 15 - d4. s | % 16 +% d4. s | % 16 + d4. | % 16 } % % 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 - r4 r8 c c4 | % 0 +% r4 r8 c c4 | % 0 + c8 c4 | % 0 c4 c c | % 1 c4 c c | % 2 c4 c4. c8 | % 3 @@ -220,7 +206,8 @@ Rhythm = \relative c c4 c c | % 13 c4 c c | % 14 c4 c4. c8 | % 15 - c4. r | % 16 +% c4. r | % 16 + c4. | % 16 } @@ -242,38 +229,38 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() - \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 Lyrics \lyricsto "lead" \LeadVoxTextC \new Lyrics \lyricsto "lead" \LeadVoxTextD + >> -% \new Staff + \new ChoirStaff << \new ChordNames \Chords %Capo 4 edition % \new ChordNames \transpose b g \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> - >> >> } \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "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 @@ -284,6 +271,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope, it does not] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/in-the-secret.ly b/in-the-secret.ly index 2e38c75..08dc6e2 100644 --- a/in-the-secret.ly +++ b/in-the-secret.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,8 +12,6 @@ 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 "In The Secret" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "A. Park" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -22,93 +20,146 @@ staffSize = #18 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key af \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \small "16th note rock" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \small "16th note rock" } - R1 | % 1 + s1 | % 1 \repeat volta 2 { - r8 c bf16 af8. bf c16 ~ c8 af ~ | % 2 - af4 r ef'8. f16 ~ f8 ef | % 3 + s1*2 | % 2-3 } \alternative { { - r8 c bf16 af8. bf f16 ~ f8 af ~ | % 4 - af1 | % 5 + s1*2 | % 4-5 } { - r8 c bf16 af8. bf c16 ~ c8 af ~ | % 6 + s1 | % 6 } } - af1 | % 7 - R1 \bar "||:" % 8 + s1*2 \bar ".|:-||" % 7-8 \repeat volta 3 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - r16 af af bf ~ bf c8. r16 af af bf ~ bf c8. | % 9 - bf16 ( af8. ) ~ af4 r2 | % 10 - r16 af af bf ~ bf c8. bf f16 ~ f8 bf ( | % 11 - af2 ) r2 | % 12 - r16 af af bf ~ bf c8. r16 af af bf ~ bf c8 df16 ~ | % 13 - df16 c bf af ~ af8. df16 ~ df c bf af ~ af4 | % 14 - r16 af af bf ~ bf c8. bf c16 ~ c8 bf ( | % 15 - af2. ) r4 \bar "||" % 16 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 9-16 % Chorus -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - r8 8. 16 ~ 4 | % 17 - r8 16 ~ 8. 16 ~ 8 | % 18 - r8 8. 16 ~ 8 << { \voiceOne ( | % 19 - 1 ) } \new Voice = "v" { \voiceThree s8 df8. c16 ~ c8 df ~ df2 } >> \oneVoice | % 20 - r8 8. 16 r4 | % 21 - r8 16 ~ 8. 16 ~ 8 | % 22 - r8 8. 16 r8 ( | % 23 + s1*7 | % 17-23 } \alternative { { - 1 ) | % 24 - R1 | % 25 + s1*2 | % 24-25 } { - af1^\markup { \hspace #18.0 \raise #1.0 \large \italic { D.S. } } \repeatTie \bar "||" % 26 + s1^\markup { \hspace #18.0 \raise #1.0 \large \italic { D.S. } } \bar "||" % 26 } { - af1 \repeatTie | % 27 + s1 | % 27 } } - R1 | % 28 - R1 \bar "||" % 29 + s1*2 \bar "||" % 28-29 % Chorus (reprise) -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*8 | % 30-37 + + \repeat volta 2 + { + % Chorus (outro) + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s1*8 | % 38-45 + } + + \mark \markup { \override #'(font-family . sans) { \box { E } } } + s1*4 \bar "|." % 46-49 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \clef G + + % Intro + + R1 | % 1 + + \repeat volta 2 + { + r8 c bf16 af8. bf c16 ~ c8 af ~ | % 2 + af4 r ef'8. f16 ~ f8 ef | % 3 + } + \alternative + { + { + r8 c bf16 af8. bf f16 ~ f8 af ~ | % 4 + af1 | % 5 + } + { + r8 c bf16 af8. bf c16 ~ c8 af ~ | % 6 + } + } + + af1 | % 7 + R1 | % 8 + + % Verse + + r16 af af bf ~ bf c8. r16 af af bf ~ bf c8. | % 9 + bf16 ( af8. ) ~ af4 r2 | % 10 + r16 af af bf ~ bf c8. bf f16 ~ f8 bf ( | % 11 + af2 ) r2 | % 12 + r16 af af bf ~ bf c8. r16 af af bf ~ bf c8 df16 ~ | % 13 + df16 c bf af ~ af8. df16 ~ df c bf af ~ af4 | % 14 + r16 af af bf ~ bf c8. bf c16 ~ c8 bf ( | % 15 + af2. ) r4 \bar "||" % 16 + + % Chorus + + r8 8. 16 ~ 4 | % 17 + r8 16 ~ 8. 16 ~ 8 | % 18 + r8 8. 16 ~ 8 << { \voiceOne ( | % 19 + 1 ) } \new Voice = "v" { \voiceThree s8 df8. c16 ~ c8 df ~ df2 } >> \oneVoice | % 20 + r8 8. 16 r4 | % 21 + r8 16 ~ 8. 16 ~ 8 | % 22 + r8 8. 16 r8 ( | % 23 + + 1 ) | % 24 + R1 | % 25 + + af1 \repeatTie | % 26 + + af1 \repeatTie | % 27 + + R1*2 | % 28-29 + + % Chorus (reprise) r8 af af ef' ef8. bf16 ~ bf4 | % 30 r8 af16 af ~ af ef'8. ef df16 ~ df8 c | % 31 @@ -120,30 +171,22 @@ LeadVox = \relative c' r8 8. 16 ~ 4 | % 36 r4 2. | % 37 - \repeat volta 2 - { - % Chorus (outro) - -\mark \markup { \override #'(font-family . sans) { \box { D } } } + % Chorus (outro) - r8 8. 16 ~ 4 | % 38 - r8 16 ~ 8. 16 ~ 8 | % 39 - r8 8. 16 ~ 8 << { \voiceOne ( | % 40 - 1 ) } \new Voice = "v" { \voiceThree s8 df8. c16 ~ c8 df ~ df2 } >> \oneVoice | % 41 - r8 8. 16 r4 | % 42 - r8 16 ~ 8. 16 ~ 8 | % 43 - r8 8. 16 r8 ( | % 44 - 1 ) | % 45 - } + r8 8. 16 ~ 4 | % 38 + r8 16 ~ 8. 16 ~ 8 | % 39 + r8 8. 16 ~ 8 << { \voiceOne ( | % 40 + 1 ) } \new Voice = "v" { \voiceThree s8 df8. c16 ~ c8 df ~ df2 } >> \oneVoice | % 41 + r8 8. 16 r4 | % 42 + r8 16 ~ 8. 16 ~ 8 | % 43 + r8 8. 16 r8 ( | % 44 + 1 ) | % 45 -\mark \markup { \override #'(font-family . sans) { \box { E } } } - - R1 | % 46 - R1 | % 47 - R1 | % 48 - r1-\fermata \bar "|." % 49 + R1*3 | % 46-48 + r1-\fermata | % 49 } + LeadVoxText = \lyricmode { Bah bah dah bah bah _ bah, _ doo doo _ doo @@ -190,12 +233,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { - \clef G - \key af \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - %{ \tiny r2 r8 d f bf | % 1 @@ -230,71 +267,50 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s1 | % 1 - \repeat volta 2 - { - af2 ef | % 2 - f8.:m ef df8 s2 | % 3 - } - \alternative - { - { - af2 ef | % 4 - df8. af/c df8 s2 | % 5 - } - { - f2:m ef | % 6 - } - } + af2 ef | % 2 + f8.:m ef df8 s2 | % 3 + + af2 ef | % 4 + df8. af/c df8 s2 | % 5 + + f2:m ef | % 6 df8. af/c df8 s2 | % 7 s1 | % 8 % Verse - \repeat volta 3 - { - af2 af/c | % 9 - df1 | % 10 - f2:m ef | % 11 - df1 | % 12 - af2 af/c | % 13 - df1 | % 14 - f2:m ef | % 15 - df1 | % 16 + af2 af/c | % 9 + df1 | % 10 + f2:m ef | % 11 + df1 | % 12 + af2 af/c | % 13 + df1 | % 14 + f2:m ef | % 15 + df1 | % 16 - % Chorus + % Chorus - af2 ef | % 17 - f8.:m ef df8 s2 | % 18 - af2 ef | % 19 - df8. af/c df8 s2 | % 20 - af2 ef | % 21 - f8.:m ef df8 s2 | % 22 - f2:m ef | % 23 - } - \alternative - { - { - df8. af/c df8 s2 | % 24 - s1 | % 25 - } - { - df8. af/c df8 s2 | % 26 - } - { - df8. af/c df8 s2 | % 27 - } - } + af2 ef | % 17 + f8.:m ef df8 s2 | % 18 + af2 ef | % 19 + df8. af/c df8 s2 | % 20 + af2 ef | % 21 + f8.:m ef df8 s2 | % 22 + f2:m ef | % 23 + + df8. af/c df8 s2 | % 24 + s1 | % 25 + + df8. af/c df8 s2 | % 26 + + df8. af/c df8 s2 | % 27 af1 | % 28 s1 | % 29 @@ -310,19 +326,16 @@ Chords = \chordmode f2:m ef | % 36 df8. af/c df af/c df4 | % 37 - \repeat volta 2 - { - % Chorus (outro) + % Chorus (outro) - af2 ef | % 38 - f8.:m ef df8 s2 | % 39 - af2 ef | % 40 - df8. af/c df8 s2 | % 41 - af2 ef | % 42 - f8.:m ef df8 s2 | % 43 - f2:m ef | % 44 - df8. af/c df8 s2 | % 45 - } + af2 ef | % 38 + f8.:m ef df8 s2 | % 39 + af2 ef | % 40 + df8. af/c df8 s2 | % 41 + af2 ef | % 42 + f8.:m ef df8 s2 | % 43 + f2:m ef | % 44 + df8. af/c df8 s2 | % 45 af2 ef | % 46 f8.:m ef d8 s2 | % 47 @@ -334,80 +347,57 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro c4 c c c | % 1 - \repeat volta 2 - { - c8 c ~ c4 c8 c ~ c4 | % 2 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 3 - } - \alternative - { - { - c8 c ~ c4 c8 c ~ c4 | % 4 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 5 - } - { - c8 c ~ c4 c8 c ~ c4 | % 6 - } - } + c8 c ~ c4 c8 c ~ c4 | % 2 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 3 + + c8 c ~ c4 c8 c ~ c4 | % 4 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 5 + + c8 c ~ c4 c8 c ~ c4 | % 6 c8. c16 ~ c8 c ~ c4 c | % 7 - c4 c c c \bar "||:" % 8 + c4 c c c | % 8 % Verse - \repeat volta 3 - { - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c \bar "||" % 16 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 - % Chorus + % Chorus - c8 c ~ c4 c8 c ~ c4 | % 17 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 18 - c8 c ~ c4 c8 c ~ c4 | % 19 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 20 - c8 c ~ c4 c8 c ~ c4 | % 21 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 22 - c8 c ~ c4 c8 c ~ c4 | % 23 - } - \alternative - { - { - c8.-> c16-> ~ c8 c-> ~ c4 c | % 24 - c4 c c c | % 25 - } - { - c8.-> c16-> ~ c8 c-> ~ c4 c | % 26 - } - { - c8.-> c16-> ~ c8 c-> ~ c4 c | % 27 - } - } + c8 c ~ c4 c8 c ~ c4 | % 17 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 18 + c8 c ~ c4 c8 c ~ c4 | % 19 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 20 + c8 c ~ c4 c8 c ~ c4 | % 21 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 22 + c8 c ~ c4 c8 c ~ c4 | % 23 + + c8.-> c16-> ~ c8 c-> ~ c4 c | % 24 + c4 c c c | % 25 + + c8.-> c16-> ~ c8 c-> ~ c4 c | % 26 + + c8.-> c16-> ~ c8 c-> ~ c4 c | % 27 c1 ~ | % 28 - c1 \bar "||" % 29 + c1 | % 29 % Chorus (reprise) @@ -420,24 +410,21 @@ StaffC = \relative c c2 c | % 36 c8.-> c16-> ~ c8 c-> ~ c16 c8.-> c4-> | % 37 - \repeat volta 2 - { - % Chorus (outro) + % Chorus (outro) - c8 c ~ c4 c8 c ~ c4 | % 38 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 39 - c8 c ~ c4 c8 c ~ c4 | % 40 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 41 - c8 c ~ c4 c8 c ~ c4 | % 42 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 43 - c8 c ~ c4 c8 c ~ c4 | % 44 - c8.-> c16-> ~ c8 c-> ~ c4 c | % 45 - } + c8 c ~ c4 c8 c ~ c4 | % 38 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 39 + c8 c ~ c4 c8 c ~ c4 | % 40 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 41 + c8 c ~ c4 c8 c ~ c4 | % 42 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 43 + c8 c ~ c4 c8 c ~ c4 | % 44 + c8.-> c16-> ~ c8 c-> ~ c4 c | % 45 c8 c ~ c4 c8 c ~ c4 | % 46 c8.-> c16-> ~ c8 c-> ~ c4 c | % 47 c8 c ~ c4 c8 c ~ c4 | % 48 - c8.-> c16-> ~ c8 c-> ~ c2-\fermata \bar "|." % 49 + c8.-> c16-> ~ c8 c-> ~ c2-\fermata | % 49 } @@ -460,32 +447,26 @@ Dynamics = s1*6 | % 31-36 s4_\f s s \< s | % 37 s4_\ff s2. | % 38 -%{ - s1*27 | % 1-27 - s4 s \< s \! s | % 28 - s4_\markup { \italic { add backbeat } } s2. | % 29 - s1*18 | % 30-47 - s4 s \< s \! s | % 48 - s1*8 | % 49-55 - s2 s_\markup { \italic { rit. } } | % 56 -%} } \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 @@ -498,7 +479,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -511,6 +492,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) } + diff --git a/infant-holy-infant-lowly.ly b/infant-holy-infant-lowly.ly index 701f034..4b500d3 100644 --- a/infant-holy-infant-lowly.ly +++ b/infant-holy-infant-lowly.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 "Infant Holy, Infant Lowly" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } 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-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 = { \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % \once \override TextScript #'padding = #2.0 @@ -93,16 +89,10 @@ 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 - \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro -%\partial 4*1 s4 | % 0 s2.*4 | % 1-4 s2 d8 d | % 5 @@ -146,17 +136,11 @@ LeadVox = \relative c' g8. g16 ~ g4 c8 b | % 36 a8. a16 ~ a4 b8 c | % 37 d4 c b8 a | % 38 - g2 s4 | % 39 + g2 r4 | % 39 % Solo - r2. | % 40 - r2. | % 41 - r2. | % 42 - r2. | % 43 - r2. | % 44 - r2. | % 45 - r2. | % 46 + R2.*7 | % 40-46 r2 g8 fs | % 47 % Refrain @@ -197,15 +181,11 @@ LeadVoxText = \lyricmode Riffs = \relative c' { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro \tiny - %\partial 1*4 8 | % 0 8. 16 ~ 4 8 | % 1 8. 16 ~ 4 8 | % 2 @@ -243,38 +223,37 @@ Chords = \chordmode { % Intro -%\partial 4*1 s4 | % 0 - c2.:5.9 | % 1 - d2.:5.9 | % 2 + c2.:3.5.9 | % 1 + d2.:3.5.9 | % 2 e2.:m7 | % 3 - d2.:5.9/fs | % 4 + d2.:3.5.9/fs | % 4 d2. | % 5 % Verse/Refrain g2. | % 6 d2. | % 7 - c2:5.9 d4 | % 8 + c2:3.5.9 d4 | % 8 g2 d4:7sus4 | % 9 g2. | % 10 - d2.:5.9/fs | % 11 + d2.:3.5.9/fs | % 11 a2:m7 d4 | % 12 g2. | % 13 - c2.:5.9 | % 14 - d2.:5.9 | % 15 + c2.:3.5.9 | % 14 + d2.:3.5.9 | % 15 e2.:m7 | % 16 - d2.:5.9/fs | % 17 + d2.:3.5.9/fs | % 17 a2:m7 g8/d d | % 18 g2. | % 19 % Midtro - c2.:5.9 | % 20 - d2.:5.9 | % 21 + c2.:3.5.9 | % 20 + d2.:3.5.9 | % 21 e2.:m7 | % 22 - d2.:5.9/fs | % 23 + d2.:3.5.9/fs | % 23 a2:m7 g8/d d | % 24 g2 d4:7sus4 | % 25 @@ -282,17 +261,17 @@ Chords = \chordmode g2. | % 26 d2. | % 27 - c2:5.9 d4 | % 28 + c2:3.5.9 d4 | % 28 g2 d4/fs | % 29 e2:m7 b4:m7 | % 30 a2:m7 d4 | % 31 - c2:5.9/e d4:5.9/fs | % 32 + c2:3.5.9/e d4:3.5.9/fs | % 32 g2. | % 33 - c2.:5.9 | % 34 - d2.:5.9 | % 35 + c2.:3.5.9 | % 34 + d2.:3.5.9 | % 35 e2.:m7 | % 36 - d2.:5.9/fs | % 37 + d2.:3.5.9/fs | % 37 a2:m7 g8/d d | % 38 g2 d4:7sus4 | % 39 @@ -300,18 +279,18 @@ Chords = \chordmode g2. | % 40 d2. | % 41 - c2:5.9 d4 | % 42 + c2:3.5.9 d4 | % 42 g2 d4/fs | % 43 e2:m7 b4:m7 | % 44 a2:m7 d4 | % 45 - c2:5.9/e d4:5.9/fs | % 46 + c2:3.5.9/e d4:3.5.9/fs | % 46 g2. | % 47 % Refrain - c2.:5.9 | % 48 - d2.:5.9 | % 49 - c2.:5.9/e | % 50 + c2.:3.5.9 | % 48 + d2.:3.5.9 | % 49 + c2.:3.5.9/e | % 50 f2.:maj7 | % 51 d2:sus4 b4:m7 | % 52 a2:m7 g8/d d | % 53 @@ -319,10 +298,10 @@ Chords = \chordmode % Outro - c2.:5.9 | % 55 - d2.:5.9 | % 56 - c2.:5.9/e | % 57 - f2:5.9 d4 | % 58 + c2.:3.5.9 | % 55 + d2.:3.5.9 | % 56 + c2.:3.5.9/e | % 57 + f2:3.5.9 d4 | % 58 a2:m7 g8/d d | % 59 g2. | % 60 } @@ -331,23 +310,16 @@ 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 - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 % Intro - \partial 4*1 s4 | % 0 c4 c c | % 1 c4 c c | % 2 @@ -449,35 +421,35 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff + \context Staff + << + \new Voice = "lead" \LeadVox + \new Voice \Riffs + \new Lyrics \lyricsto "lead" \LeadVoxText + >> + + \new ChoirStaff << \new ChordNames \Chords %Capo 4 edition % \new ChordNames \transpose b g \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> - - \new Staff - << - \Global % The "roadmap" that everything else depends on - \new Voice = "lead" \LeadVox - \new Voice \Riffs - \new Lyrics \lyricsto "lead" \LeadVoxText - >> >> } \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 @@ -488,6 +460,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) } + diff --git a/jesus-all-for-jesus.ly b/jesus-all-for-jesus.ly index 071a37f..1862424 100644 --- a/jesus-all-for-jesus.ly +++ b/jesus-all-for-jesus.ly @@ -1,9 +1,9 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #24 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -12,8 +12,6 @@ staffSize = #24 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Jesus, All For Jesus" } % composer = \markup { \override #'(font-family . sans) "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -30,6 +28,110 @@ hn = #(define-music-function (parser location arg) (ly:music?) (acons 'font-size -3.5 (ly:music-property arg 'tweaks))) arg) +% +% Song's structure +% +Global = +{ + \clef G + \key d \major + \numericTimeSignature + \time 4/4 + + % Intro + + \repeat volta 2 + { + s1*2 | % 1-2 + } + + s1*8 \bar ".|:-||" % 3-10 + + % A section + + \repeat volta 2 + { + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*5 | % 11-15 + } + \alternative + { + { + s1*3 | % 16-18 + } + { + s1 | % 19 + } + } + + s1*2 \bar ".|:-||" % 20-21 + + \repeat volta 2 + { + \mark \markup { \override #'(font-family . sans) { \box { B } } } + + s1*5 | % 22-26 + } + \alternative + { + { + s1*3 | % 27-29 + } + { + s1 % 30 + } + } + + s1*2 \bar "||" % 31-32 + + % B section + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + + s1*8 \bar "||" % 40 + + % A section + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + + s1*5 | % 41-45 + s1 | % 46 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + s1*2 \bar "||" % 47-48 + + % Midtro + + \mark \markup { \override #'(font-family . sans) { \box { E } } } + s1*8 \bar "||" % 49-56 + + % A section + + \mark \markup { \override #'(font-family . sans) { \box { F } } } + s1*5 | % 57-61 + s1*3 \bar "||" % 62-64 + + \mark \markup { \override #'(font-family . sans) { \box { G } } } + s1*8 \bar "||" % 65-72 + + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. al Coda } } + + % Coda + +%\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break +\stopStaff s1 \startStaff +\set Score.currentBarNumber = #73 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + s1*2 \bar "||" % 73-74 + s1*7 \bar "|." % 75-81 +} + + % Various melody lines melodyLineA = @@ -82,78 +184,45 @@ melodyLineC = % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G - \key d \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - \repeat volta 2 - { - R1 | % 1 - R1 | % 2 - } + R1*2 | % 1-2 s1*8 | % 3-10 % A section - \repeat volta 2 - { -\mark \markup { \override #'(font-family . sans) { \box { A } } } + fs4. ( e8 ) fs2 ~ | % 11 + fs2 fs4 a | % 12 + b4. ( a8 ) a2 ~ | % 13 + a2 b4 a | % 14 + e4. d8 e2 ~ | % 15 - fs4. ( e8 ) fs2 ~ | % 11 - fs2 fs4 a | % 12 - b4. ( a8 ) a2 ~ | % 13 - a2 b4 a | % 14 - e4. d8 e2 ~ | % 15 - } - \alternative - { - { - e4. e8 fs e d a | % 16 - b1 ( | % 17 - a2 ) r2 | % 18 - } - { - e'4. \repeatTie e8 fs e d cs | % 19 - } - } + e4. e8 fs e d a | % 16 + b1 ( | % 17 + a2 ) r2 | % 18 + + e'4. \repeatTie e8 fs e d cs | % 19 d1 ~ | % 20 d2 r | % 21 - \repeat volta 2 - { -\mark \markup { \override #'(font-family . sans) { \box { B } } } - 4. \melodyLineB % 22-26 - } - \alternative - { - { - \melodyLineBRptA % 27-29 - } - { - 4. \repeatTie \melodyLineBRptB % 30 - } - } + 4. \melodyLineB % 22-26 + + \melodyLineBRptA % 27-29 + + 4. \repeatTie \melodyLineBRptB % 30 1 | % 31 - r2 8 ( ) 4 \bar "||" % 32 + r2 8 ( ) 4 | % 32 % B section -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - 4. 8 2 ~ | % 33 4 8 ( a ) 4 | % 34 4. 8 2 ~ | % 35 @@ -161,56 +230,39 @@ LeadVox = \relative c' 4. 8 2 ~ | % 37 4 8 ( ) ( ) | % 38 2. 4 | % 39 - 1 \bar "||" % 40 + 1 | % 40 % A section -\mark \markup { \override #'(font-family . sans) { \box { D } } } - \melodyLineC % 41-45 4. \melodyLineBRptB % 46 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } 1 ~ | % 47 - 2 r \bar "||" % 48 + 2 r | % 48 % Midtro -\mark \markup { \override #'(font-family . sans) { \box { E } } } - - s1*8 \bar "||" % 49-56 + s1*8 | % 49-56 % A section -\mark \markup { \override #'(font-family . sans) { \box { F } } } - \melodyLineC % 57-61 - \melodyLineBRptA \bar "||" % 62-64 - -\mark \markup { \override #'(font-family . sans) { \box { G } } } + \melodyLineBRptA | % 62-64 4. \melodyLineB % 65-69 4. \melodyLineBRptB % 70 1 | % 71 - r2 8 ( ) 4 \bar "||" % 72 - -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. al Coda } } + r2 8 ( ) 4 | % 72 % Coda -%\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break -\stopStaff s1 \startStaff -\set Score.currentBarNumber = #73 - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + s1 % blank bar for coda 1 ~ | % 73 - 2 r \bar "||" % 74 - s1*7 \bar "|." % 75-81 + 2 r | % 74 + s1*7 | % 75-81 } + LeadVoxText = \lyricmode { Je -- _ sus, _ all for Je -- _ sus, _ @@ -246,14 +298,7 @@ LeadVoxText = \lyricmode % Riffs = \relative c' { - \clef G - \key d \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - \tiny - s1*2 | % 1-2 \melodyLineA d1 ~ | % 9 @@ -267,7 +312,6 @@ Riffs = \relative c' s1*19 | % 57-74 (+1 for coda) \melodyLineA d1^\fermata | % 81 - \normalsize } @@ -279,16 +323,10 @@ Riffs = \relative c' Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \repeat volta 2 - { - d4. a8/d d2 | % 1 - s1 | % 2 - } + d4. a8/d d2 | % 1 + s1 | % 2 d4. a8/d d2 | % 3 s1 | % 4 @@ -301,48 +339,32 @@ Chords = \chordmode % A section - \repeat volta 2 - { - d4. a8/d d2 | % 11 - s1 | % 12 - g2/d d | % 13 - s1 | % 14 - a4. a8:sus4 a2 | % 15 - } - \alternative - { - { - s1 | % 16 - b1:m | % 17 - a1 | % 18 - } - { - a1 | % 19 - } - } + d4. a8/d d2 | % 11 + s1 | % 12 + g2/d d | % 13 + s1 | % 14 + a4. a8:sus4 a2 | % 15 + + s1 | % 16 + b1:m | % 17 + a1 | % 18 + + a1 | % 19 d1 | % 20 s2 g/a | % 21 - \repeat volta 2 - { - d4. a8/d d2 | % 22 - s1 | % 23 - g2 d | % 24 - s1 | % 25 - a4. a8:sus4 a2 | % 26 - } - \alternative - { - { - s1 | % 27 - b1:m | % 28 - a1 | % 29 - } - { - a1 | % 30 - } - } + d4. a8/d d2 | % 22 + s1 | % 23 + g2 d | % 24 + s1 | % 25 + a4. a8:sus4 a2 | % 26 + + s1 | % 27 + b1:m | % 28 + a1 | % 29 + + a1 | % 30 d1 | % 31 s1 | % 32 @@ -396,7 +418,7 @@ Chords = \chordmode % Coda -s1 + s1 % blank bar for coda d1 | % 73 s2 g:sus2/a | % 74 @@ -413,25 +435,16 @@ s1 % % 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \repeat volta 2 - { - c8. c16 ~ c8 c c4 c | % 1 - c4 c c c | % 2 - } + c8. c16 ~ c8 c c4 c | % 1 + c4 c c c | % 2 c8. c16 ~ c8 c c4 c | % 3 c4 c c c | % 4 @@ -444,51 +457,35 @@ StaffC = \relative c % A section - \repeat volta 2 - { - c8. c16 ~ c8 c c4 c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c8. c16 ~ c8 c c4 c | % 15 - } - \alternative - { - { - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - } - { - c4 c c c | % 19 - } - } + c8. c16 ~ c8 c c4 c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c8. c16 ~ c8 c c4 c | % 15 + + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + + c4 c c c | % 19 c4 c c c | % 20 c4 c c c | % 21 - \repeat volta 2 - { - c8. c16 ~ c8 c c4 c | % 22 - c4 c c c | % 23 - c4 c c c | % 24 - c4 c c c | % 25 - c8. c16 ~ c8 c c4 c | % 26 - } - \alternative - { - { - c4 c c c | % 27 - c4 c c c | % 28 - c4 c c c | % 29 - } - { - c4 c c c | % 30 - } - } + c8. c16 ~ c8 c c4 c | % 22 + c4 c c c | % 23 + c4 c c c | % 24 + c4 c c c | % 25 + c8. c16 ~ c8 c c4 c | % 26 + + c4 c c c | % 27 + c4 c c c | % 28 + c4 c c c | % 29 + + c4 c c c | % 30 c4 c c c | % 31 - c4 c c c \bar "||" % 32 + c4 c c c | % 32 % B section @@ -499,7 +496,7 @@ StaffC = \relative c c4 c c c | % 37 c4 c c c | % 38 c4 c c c | % 39 - c4 c c c \bar "||" % 40 + c4 c c c | % 40 c8. c16 ~ c8 c c4 c | % 41 c4 c c c | % 42 @@ -508,7 +505,7 @@ StaffC = \relative c c8. c16 ~ c8 c c4 c | % 45 c4 c c c | % 46 c4 c c c | % 47 - c4 c c c \bar "||" % 48 + c4 c c c | % 48 c8. c16 ~ c8 c c4 c | % 49 c4 c c c | % 50 @@ -517,7 +514,7 @@ StaffC = \relative c c8. c16 ~ c8 c c4 c | % 53 c4 c c c | % 54 c4 c c c | % 55 - c4 c c c \bar "||" % 56 + c4 c c c | % 56 c8. c16 ~ c8 c c4 c | % 57 c4 c c c | % 58 @@ -526,7 +523,7 @@ StaffC = \relative c c8. c16 ~ c8 c c4 c | % 61 c4 c c c | % 62 c4 c c c | % 63 - c4 c c c \bar "||" % 64 + c4 c c c | % 64 c8. c16 ~ c8 c c4 c | % 65 c4 c c c | % 66 @@ -535,15 +532,14 @@ StaffC = \relative c c8. c16 ~ c8 c c4 c | % 69 c4 c c c | % 70 c4 c c c | % 71 - c4 c c c \bar "||" % 72 + c4 c c c | % 72 % Coda \stopStaff s1 \startStaff | -\set Score.currentBarNumber = #73 c4 c c c | % 73 - c4 c c c \bar "||" % 74 + c4 c c c | % 74 c8. c16 ~ c8 c c4 c | % 75 c4 c c c | % 76 @@ -551,7 +547,7 @@ StaffC = \relative c c4 c c c | % 78 c8. c16 ~ c8 c c4 c | % 79 c4 c c c | % 80 - c1^\fermata \bar "|." % 81 + c1^\fermata | % 81 } @@ -566,36 +562,43 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> - \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" - "JazzText" - "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 } + 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 } + diff --git a/jesus-is-just-alright.ly b/jesus-is-just-alright.ly index 8705886..ac9864c 100644 --- a/jesus-is-just-alright.ly +++ b/jesus-is-just-alright.ly @@ -1,17 +1,15 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" % Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) -staffSize = #18 +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 Is Just Alright" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Arthur Reynolds" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. The Doobie Brothers" } @@ -28,101 +26,63 @@ hn = #(define-music-function (parser location arg) (ly:music?) % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key e \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f -\override MultiMeasureRest #'expand-limit = 1 % Intro -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \hspace #0.0 \raise #1.8 \small "Bright rock" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \hspace #0.0 \raise #1.8 \small "Bright rock" } - R1*4 | % 1-4 + s1*4 | % 1-4 \repeat volta 2 { - 8 ~ 4 8 ~ | % 5 - 8 4 8 ~ 4 r | % 6 + s1*2 | % 5-6 } \alternative { { - 8 ~ 4 8 ~ | % 7 - 8 4 8 ~ 4 r | % 8 + s1*2 | % 7-8 } { - 8 ~ 4 8 ~ | % 9 + s1 | % 9 } } - 2 r | % 10 - R1 | % 11 - - s1 | % 12 - s1 | % 13 - s1 | % 14 - s1 \bar "||:" % 15 + s1*6 \bar ".|:-||" % 10-15 \repeat volta 2 { -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } % Verse - 8 ~ 4 8 ~ | % 16 - 8 4 8 ~ 4 r | % 17 - 8 ~ 4 8 ~ | % 18 - 8 4 8 ~ 4 r | % 19 - 8 ~ 4 8 ~ | % 20 - 8 4 8 ~ 4 r | % 21 - 8 ~ 4 8 ~ | % 22 - 4 r r2 | % 23 - R1 \bar "||" % 24 - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - 8 4 8 ~ 4 8 ~ | % 25 - 8 4 8 ~ 4 r | % 26 - 8 4 8 ~ 4 8 ~ | % 27 - 8 4 8 ~ 4 r | % 28 - 8 4 8 ~ 4 8 ~ | % 29 - 8 4 8 ~ 4 r | % 30 - 8 ~ 4 8 | % 31 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + s1*9 \bar "||" % 16-24 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } } + + s1*7 | % 25-31 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } } \alternative { { - r4 8 ~ 2 | % 32 - 8 ~ ( ) | % 33 - R1 | % 34 - r8 e4 ( g8 a2 ) \bar "||" % 35 - - 8 ~ 4 8 ~ | % 36 - 8 4 8 ~ 4 r | % 37 - 8 ~ 4 8 ~ | % 38 - 8 4 8 ~ 4 r | % 39 - 8 ~ 4 8 ~ | % 40 - 8 4 8 ~ 4 r | % 41 - 8 ~ 4 8 ~ | % 42 - 2 r4 r8 d | % 43 - g8 a a e g4 ef16 ( d c8 ) | % 44 + s1*4 \bar "||" % 32-35 + + s1*9 | % 36-44 } { - r4 8 ~ 2-\fermata | % 45 + s1 | % 45 } } @@ -130,17 +90,135 @@ LeadVox = \relative c'' \time 3/4 -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } \small "Moderate jazz waltz" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { C } } \small "Moderate jazz waltz" } + + \repeat volta 2 + { + s2.*4 | % 46-49 + } + + s2.*30 | % 50-79 \repeat volta 2 { - R2. | % 46 - R2. | % 47 - R2. | % 48 - R2. | % 49 + s2. | % 80 } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \small "Guitar solo" \bold "(rpt. 6x)" } + + \repeat volta 6 + { + s2.*4 | % 81-84 + } + + s2.*2 | % 85-86 + +%Ugh, only valid in size 18 +%\break + + \time 4/4 + + % Intro + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { D } } \small "Bright rock - Guitar solo" \bold "(rpt. 7x)" } + + \repeat volta 7 + { + s1*2 | % 87-88 + } + + s1*2 \bar "||" % 89-90 + + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. al Coda } } + + % Coda + +\stopStaff s1 \startStaff | +\set Score.currentBarNumber = #91 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + s1 \bar "|." % 91 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + \clef G +\override MultiMeasureRest #'expand-limit = 1 + + % Intro + + R1*4 | % 1-4 + + 8 ~ 4 8 ~ | % 5 + 8 4 8 ~ 4 r | % 6 + + 8 ~ 4 8 ~ | % 7 + 8 4 8 ~ 4 r | % 8 + + 8 ~ 4 8 ~ | % 9 + + 2 r | % 10 + R1 | % 11 + + s1 | % 12 + s1 | % 13 + s1 | % 14 + s1 | % 15 + + % Verse + + 8 ~ 4 8 ~ | % 16 + 8 4 8 ~ 4 r | % 17 + 8 ~ 4 8 ~ | % 18 + 8 4 8 ~ 4 r | % 19 + 8 ~ 4 8 ~ | % 20 + 8 4 8 ~ 4 r | % 21 + 8 ~ 4 8 ~ | % 22 + 4 r r2 | % 23 + R1 | % 24 + + 8 4 8 ~ 4 8 ~ | % 25 + 8 4 8 ~ 4 r | % 26 + 8 4 8 ~ 4 8 ~ | % 27 + 8 4 8 ~ 4 r | % 28 + 8 4 8 ~ 4 8 ~ | % 29 + 8 4 8 ~ 4 r | % 30 + 8 ~ 4 8 | % 31 + + r4 8 ~ 2 | % 32 + 8 ~ ( ) | % 33 + R1 | % 34 + r8 e4 ( g8 a2 ) | % 35 + + 8 ~ 4 8 ~ | % 36 + 8 4 8 ~ 4 r | % 37 + 8 ~ 4 8 ~ | % 38 + 8 4 8 ~ 4 r | % 39 + 8 ~ 4 8 ~ | % 40 + 8 4 8 ~ 4 r | % 41 + 8 ~ 4 8 ~ | % 42 + 2 r4 r8 d | % 43 + g8 a a e g4 ef16 ( d c8 ) | % 44 + + r4 8 ~ 2-\fermata | % 45 + + % Bridge + + R2. | % 46 + R2. | % 47 + R2. | % 48 + R2. | % 49 + e8 e ~ e2 ~ | % 50 e2. | % 51 R2. | % 52 @@ -175,60 +253,29 @@ LeadVox = \relative c'' d4 c8 ( a ) ~ a4 ~ | % 78 a2. | % 79 - \repeat volta 2 - { - R2. | % 80 - } - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \small "Guitar solo" \bold "(rpt. 6x)" } + R2. | % 80 - \repeat volta 6 - { - R2.*4 | % 81 -% R2. | % 82 -% R2. | % 83 -% R2. | % 84 - } + R2.*4 | % 81-84 R2. | % 85 R2. | % 86 -%Ugh, only valid in size 18 -\break - - \time 4/4 - % Intro -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { D } } \small "Bright rock - Guitar solo" \bold "(rpt. 7x)" } -%\once \override Score.RehearsalMark #'self-alignment-X = #left -%\mark \markup { \override \once #'(font-family . sans) { \box { B } } } - - \repeat volta 7 - { - s1 | % 87 - s1 | % 88 - } + s1 | % 87 + s1 | % 88 s1 | % 89 - s1 \bar "||" % 90 - -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. al Coda } } + s1 | % 90 % Coda -\stopStaff s1 \startStaff | -\set Score.currentBarNumber = #91 - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + s1 % blank bar for coda - r4 g'8 g ~ g2-\fermata \bar "|." % 91 + r4 g'8 g ~ g2-\fermata | % 91 } + LeadVoxText = \lyricmode { Do, do, do, do, _ do, do, _ do, do. _ @@ -286,12 +333,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { - \clef G - \key e \minor - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - \tiny s1*11 | % 1-11 @@ -314,31 +355,19 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s1*4 | % 1-4 - \repeat volta 2 - { - s1 | % 5 - s1 | % 6 - } - \alternative - { - { - s1 | % 7 - s1 | % 8 - } - { - s1 | % 9 - } - } + s1 | % 5 + s1 | % 6 + + s1 | % 7 + s1 | % 8 + + s1 | % 9 e1:7.9+ | % 10 f2:9 e:7.9+ | % 11 @@ -347,62 +376,49 @@ Chords = \chordmode s1 | % 14 s1 | % 15 - \repeat volta 2 - { - % Verse - - a4.:m a8:5^3 s2 | % 16 - s2. d4/a | % 17 - a4.:m a8:5^3 s2 | % 18 - s4. e8:7.9+ s2 | % 19 - a4.:m a8:5^3 s2 | % 20 - s2. d4/a | % 21 - a4.:m a8:5^3 s2 | % 22 - e1:7.9+ | % 23 - f2:9 e:7.9+ | % 24 - - a4.:m a8:5^3 s2 | % 25 - s2. d4/a | % 26 - a4.:m a8:5^3 s2 | % 27 - s4. e8:7.9+ s2 | % 28 - a4.:m a8:5^3 s2 | % 29 - s2. d4/a | % 30 - a4.:m a8:5^3 s2 | % 31 - } - \alternative - { - { - a4:m c2. | % 32 - a4.:m a8:5^3 s2 | % 33 - e1:7.9+ | % 34 - f2:9 e:7.9+ | % 35 - - a1:m | % 36 - s2. b4:m7 | % 37 - a1:m7 | % 38 - s2. e4:7.9+ | % 39 - a1:m7 | % 40 - s2. b4:m7 | % 41 - a1:m7 | % 42 - e1:7.9+ | % 43 - f2:9 e:7.9+ | % 44 - } - { - a4:m c2. | % 45 - } - } + % Verse + + a4.:m a8:5^3 s2 | % 16 + s2. d4/a | % 17 + a4.:m a8:5^3 s2 | % 18 + s4. e8:7.9+ s2 | % 19 + a4.:m a8:5^3 s2 | % 20 + s2. d4/a | % 21 + a4.:m a8:5^3 s2 | % 22 + e1:7.9+ | % 23 + f2:9 e:7.9+ | % 24 + + a4.:m a8:5^3 s2 | % 25 + s2. d4/a | % 26 + a4.:m a8:5^3 s2 | % 27 + s4. e8:7.9+ s2 | % 28 + a4.:m a8:5^3 s2 | % 29 + s2. d4/a | % 30 + a4.:m a8:5^3 s2 | % 31 + + a4:m c2. | % 32 + a4.:m a8:5^3 s2 | % 33 + e1:7.9+ | % 34 + f2:9 e:7.9+ | % 35 + + a1:m | % 36 + s2. b4:m7 | % 37 + a1:m7 | % 38 + s2. e4:7.9+ | % 39 + a1:m7 | % 40 + s2. b4:m7 | % 41 + a1:m7 | % 42 + e1:7.9+ | % 43 + f2:9 e:7.9+ | % 44 + + a4:m c2. | % 45 % Bridge - \time 3/4 - - \repeat volta 2 - { - a2.:m7 | % 46 - s2. | % 47 - d2. | % 48 - s2. | % 49 - } + a2.:m7 | % 46 + s2. | % 47 + d2. | % 48 + s2. | % 49 a2.:m7 | % 50 s2. | % 51 @@ -438,38 +454,27 @@ Chords = \chordmode a2.:m7 | % 78 s2. | % 79 - \repeat volta 2 - { - d2. | % 80 - } + d2. | % 80 - \repeat volta 6 - { - a2.:m7 | % 81 - s2. | % 82 - d2. | % 83 - s2. | % 84 - } + a2.:m7 | % 81 + s2. | % 82 + d2. | % 83 + s2. | % 84 a2.:m7 | % 85 s2. | % 86 - \time 4/4 - % Intro - \repeat volta 7 - { - s1 | % 87 - s1 | % 88 - } + s1 | % 87 + s1 | % 88 s1 | % 89 s1 | % 90 % Coda -s1 + s1 % blank bar for coda a4:m c2. | % 91 } @@ -478,102 +483,75 @@ s1 % % 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 \override MultiMeasureRest #'expand-limit = 1 + \teeny % Intro R1*4 | % 1-4 - \repeat volta 2 - { - r1 | % 5 - r1 | % 6 - } - \alternative - { - { - r1 | % 7 - r1 | % 8 - } - { - r1 | % 9 - } - } + r1 | % 5 + r1 | % 6 + + r1 | % 7 + r1 | % 8 + + r1 | % 9 c4 c r2 | % 10 c4 c c c | % 11 r1 | % 12 r1 | % 13 r1 | % 14 - r1 \bar "||:" % 15 - - \repeat volta 2 - { - % Verse - - c4 r8 c r c r c | % 16 - r8 c r c r c c r | % 17 - c4 r8 c r c r c | % 18 - r8 c r c ~ c4 c8 r | % 19 - c4 r8 c r c r c | % 20 - r8 c r c r c c r | % 21 - c4 r8 c r c r c | % 22 - c4 c r2 | % 23 - c4 c c c \bar "||" % 24 - - c4 r8 c r c r c | % 25 - r8 c r c r c c r | % 26 - c4 r8 c r c r c | % 27 - r8 c r c ~ c4 c8 r | % 28 - c4 r8 c r c r c | % 29 - r8 c r c r c c r | % 30 - c4 r8 c r c r c | % 31 - } - \alternative - { - { - c8 r c c ~ c2 | % 32 - c4 r8 c r c r c | % 33 - c4 c r2 | % 34 - c4 c c c \bar "||" % 35 - - c8 r r4 r2 | % 36 - r2 r4 c | % 37 - c4 r r2 | % 38 - r2 r4 c | % 39 - c8 r r4 r2 | % 40 - r2 r4 c | % 41 - c4 r r2 | % 42 - c4 c r2 | % 43 - c4 c c c | % 44 - } - { - c8 r c c ~ c2-\fermata | % 45 - } - } + r1 | % 15 + + % Verse + + c4 r8 c r c r c | % 16 + r8 c r c r c c r | % 17 + c4 r8 c r c r c | % 18 + r8 c r c ~ c4 c8 r | % 19 + c4 r8 c r c r c | % 20 + r8 c r c r c c r | % 21 + c4 r8 c r c r c | % 22 + c4 c r2 | % 23 + c4 c c c \bar "||" % 24 + + c4 r8 c r c r c | % 25 + r8 c r c r c c r | % 26 + c4 r8 c r c r c | % 27 + r8 c r c ~ c4 c8 r | % 28 + c4 r8 c r c r c | % 29 + r8 c r c r c c r | % 30 + c4 r8 c r c r c | % 31 + + c8 r c c ~ c2 | % 32 + c4 r8 c r c r c | % 33 + c4 c r2 | % 34 + c4 c c c | % 35 + + c8 r r4 r2 | % 36 + r2 r4 c | % 37 + c4 r r2 | % 38 + r2 r4 c | % 39 + c8 r r4 r2 | % 40 + r2 r4 c | % 41 + c4 r r2 | % 42 + c4 c r2 | % 43 + c4 c c c | % 44 + + c8 r c c ~ c2-\fermata | % 45 % Bridge - \time 3/4 - - \repeat volta 2 - { - c4 c c | % 46 - c4 c c | % 47 - c4 c c | % 48 - c4 c c | % 49 - } + c4 c c | % 46 + c4 c c | % 47 + c4 c c | % 48 + c4 c c | % 49 c4 c c | % 50 c4 c c | % 51 @@ -609,31 +587,20 @@ StaffC = \relative c c4 c c | % 78 c4 c c | % 79 - \repeat volta 2 - { - c8 c r2 | % 80 - } + c8 c r2 | % 80 - \repeat volta 6 - { - c4 c c | % 81 - c4 c c | % 82 - c4 c c | % 83 - c4 c c | % 84 - } + c4 c c | % 81 + c4 c c | % 82 + c4 c c | % 83 + c4 c c | % 84 c2. ~ | % 85 c2.-\fermata | % 86 - \time 4/4 - % Intro - \repeat volta 7 - { - r1 | % 87 - r1 | % 88 - } + r1 | % 87 + r1 | % 88 r1 | % 89 r1 | % 90 @@ -641,9 +608,8 @@ StaffC = \relative c % Coda \stopStaff s1 \startStaff | -\set Score.currentBarNumber = #91 - c8 r c c ~ c2-\fermata \bar "|." % 91 + c8 r c c ~ c2-\fermata | % 91 } @@ -660,39 +626,44 @@ Dynamics = \score { << + \Global % The "roadmap": that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 } + diff --git a/joy-to-the-world+hark-the-herald.ly b/joy-to-the-world+hark-the-herald.ly index f153004..c14e970 100644 --- a/joy-to-the-world+hark-the-herald.ly +++ b/joy-to-the-world+hark-the-herald.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -10,8 +10,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Joy To The World / Hark The Herald Angels Sing" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "George Friedrich Handel/Felix Mendelssohn" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart/Craig Harris" } @@ -20,59 +18,35 @@ staffSize = #16 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 - s1 | % 5 - s1 | % 6 - s1 | % 7 - s1 \bar "||:" % 8 + s1*8 \bar ".|:-||" % 1-8 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - d4 cs8. b16 a4. g8 | % 9 - fs4 e d4. a'8 | % 10 - b4. b8 cs4. cs8 | % 11 - d2.. d8 \bar "||" % 12 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*4 \bar "||" % 9-12 -\mark \markup { \override #'(font-family . sans) { \box { A5 } } } - - d8 ( cs ) b ( a ) a8. ( g16 fs8 ) d' | % 13 - d8 ( cs ) b ( a ) a8. ( g16 fs8 ) fs | % 14 - fs8 fs fs fs16 ( g ) a4. g16 ( fs ) | % 15 - e8 e e e16 ( fs ) g4. fs16 ( e ) | % 16 - d8 ( d'4 ) b8 a8. ( g16 fs8 ) g8 | % 17 - - \time 2/4 fs4 e \time 4/4 | % 18 - - \voiceThree d2 \oneVoice s2 | % 19 - s1 | % 20 + \mark \markup { \override #'(font-family . sans) { \box { A5 } } } + s1*5 | % 13-17 + \time 2/4 s2 \time 4/4 | % 18 + s1*2 | % 19-20 } \alternative { { - s1 | % 21 - s1 | % 22 + s1*2 | % 21-22 } { s1 | % 23 @@ -83,28 +57,15 @@ LeadVox = \relative c'' \key ef \major -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { B } } } - ef'4 d8. c16 bf4. af8 | % 25 - g4 f ef4. bf'8 | % 26 - c4. c8 d4. d8 | % 27 - ef2.. ef8 \bar "||" % 28 + s1*4 \bar "||" % 25-28 -\mark \markup { \override #'(font-family . sans) { \box { B5 } } } + \mark \markup { \override #'(font-family . sans) { \box { B5 } } } - ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) ef' | % 29 - ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) g | % 30 - g8 g g g16 ( af ) bf4. af16 ( g ) | % 31 - f8 f f f16 ( g ) af4. g16 ( f ) | % 32 - ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 | % 33 - g4 f ef4. g16 ( f ) | % 34 - ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 | % 35 - g2 f \bar "||" % 36 + s1*8 \bar "||" % 29-36 - \voiceThree ef2 \oneVoice s2 | % 37 - s1 | % 38 - s1 | % 39 - s1 \bar "||" % 40 + s1*4 \bar "||" % 37-40 \key f \major @@ -112,52 +73,118 @@ LeadVox = \relative c'' { % Verse -\mark \markup { \override #'(font-family . sans) { \box { C } } } - - c4 f f4. e8 | % 41 - f4 a a ( g ) | % 42 - c4 c c4. bf8 | % 43 - a4 g a2 | % 44 - c,4 f f4. e8 | % 45 - f4 a a ( g ) | % 46 - c4 g g4. e8 | % 47 - e4 d c2 \bar "||" % 48 - -\mark \markup { \override #'(font-family . sans) { \box { C9 } } } - - c'4 c c f, | % 49 - bf4 a a ( g ) | % 50 - c4 c c f, | % 51 - bf4 a a ( g ) | % 52 - d'4 d d c | % 53 - bf4 a bf2 | % 54 - g4 a8 ( bf ) c4. f,8 | % 55 - f4 g a2 | % 56 - d4. d8 d4 c | % 57 - bf4 a bf2 | % 58 - g4 a8 ( bf ) c4. f,8 | % 59 + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*8 \bar "||" % 48 + + \mark \markup { \override #'(font-family . sans) { \box { C9 } } } + s1*11 | % 49-59 } \alternative { { - \time 2/4 f4 g \time 4/4 | % 60 - f2 s2 | % 61 - s1 | % 62 + \time 2/4 s2 \time 4/4 | % 60 + s1*2 | % 61-62 } { - f4 g a2 | % 63 + s1 | % 63 } } + s1*7 \bar "|." % 64-70 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + \clef G + + % Intro + + s1*8 | % 1-8 + + % Verse + + d4 cs8. b16 a4. g8 | % 9 + fs4 e d4. a'8 | % 10 + b4. b8 cs4. cs8 | % 11 + d2.. d8 | % 12 + + d8 ( cs ) b ( a ) a8. ( g16 fs8 ) d' | % 13 + d8 ( cs ) b ( a ) a8. ( g16 fs8 ) fs | % 14 + fs8 fs fs fs16 ( g ) a4. g16 ( fs ) | % 15 + e8 e e e16 ( fs ) g4. fs16 ( e ) | % 16 + d8 ( d'4 ) b8 a8. ( g16 fs8 ) g8 | % 17 + + fs4 e | % 18 + + \voiceThree d2 \oneVoice s2 | % 19 + s1 | % 20 + + s1 | % 21 + s1 | % 22 + + s1 | % 23 + + s1 | % 24 + + ef'4 d8. c16 bf4. af8 | % 25 + g4 f ef4. bf'8 | % 26 + c4. c8 d4. d8 | % 27 + ef2.. ef8 | % 28 + + ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) ef' | % 29 + ef8 ( d ) c ( bf ) bf8. ( af16 g8 ) g | % 30 + g8 g g g16 ( af ) bf4. af16 ( g ) | % 31 + f8 f f f16 ( g ) af4. g16 ( f ) | % 32 + ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 | % 33 + g4 f ef4. g16 ( f ) | % 34 + ef8 ( ef'4 ) c8 bf8. ( af16 g8 ) af8 | % 35 + g2 f | % 36 + + \voiceThree ef2 \oneVoice s2 | % 37 + s1*3 | % 38-40 + + % Verse + + c4 f f4. e8 | % 41 + f4 a a ( g ) | % 42 + c4 c c4. bf8 | % 43 + a4 g a2 | % 44 + c,4 f f4. e8 | % 45 + f4 a a ( g ) | % 46 + c4 g g4. e8 | % 47 + e4 d c2 | % 48 + + c'4 c c f, | % 49 + bf4 a a ( g ) | % 50 + c4 c c f, | % 51 + bf4 a a ( g ) | % 52 + d'4 d d c | % 53 + bf4 a bf2 | % 54 + g4 a8 ( bf ) c4. f,8 | % 55 + f4 g a2 | % 56 + d4. d8 d4 c | % 57 + bf4 a bf2 | % 58 + g4 a8 ( bf ) c4. f,8 | % 59 + + f4 g | % 60 + f2 s2 | % 61 + s1 | % 62 + + f4 g a2 | % 63 + d4. d8 d4 c | % 64 bf4 a bf2 | % 65 g4 a8 bf c4. f,8 | % 66 f2 g | % 67 f2 s2 | % 68 - s1 | % 69 - s1 \bar "|." % 70 + s1*2 | % 69-70 } + LeadVoxText = \lyricmode { Joy to the world! the Lord is come: @@ -227,12 +254,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c''' { - \clef G - \key d \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -275,7 +296,7 @@ Riffs = \relative c''' \voiceTwo c,4 \oneVoice f f4. e8 | % 68 f4 a a g | % 69 - f1-\fermata \bar "|." % 70 + f1-\fermata | % 70 \normalsize } @@ -283,53 +304,41 @@ Riffs = \relative c''' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - d1:5.9 | % 1 + d1:3.5.9 | % 1 s1 | % 2 - c1:5.9 | % 3 + c1:3.5.9 | % 3 s1 | % 4 - d1:5.9 | % 5 + d1:3.5.9 | % 5 s1 | % 6 - c2..:5.9 s16 g/a | % 7 + c2..:3.5.9 s16 g/a | % 7 s2 a | % 8 - \repeat volta 2 - { - % Verse + % Verse - d4 a8./d g16/d d4. g8 | % 9 - d4/a a d2 | % 10 - g2 a | % 11 - b4:m s16 a8/cs d16 s2 | % 12 + d4 a8./d g16/d d4. g8 | % 9 + d4/a a d2 | % 10 + g2 a | % 11 + b4:m s16 a8/cs d16 s2 | % 12 - d4 g/d a8./d d16 s4 | % 13 - d4 g/d a8./d d16 s4 | % 14 - d2 s8. d16/fs s4 | % 15 - a2 s8. a16/cs s4 | % 16 - g4/b a/cs d g:maj7 | % 17 + d4 g/d a8./d d16 s4 | % 13 + d4 g/d a8./d d16 s4 | % 14 + d2 s8. d16/fs s4 | % 15 + a2 s8. a16/cs s4 | % 16 + g4/b a/cs d g:maj7 | % 17 - \time 2/4 d4/a a \time 4/4 | % 18 + d4/a a | % 18 - d1:5.9 | % 19 - s1 | % 20 - } - \alternative - { - { - c2..:5.9 s16 g/a | % 21 - s2 a | % 22 - } - { - c2..:5.9 s16 af/bf | % 23 - } - } + d1:3.5.9 | % 19 + s1 | % 20 + + c2..:3.5.9 s16 g/a | % 21 + s2 a | % 22 + + c2..:3.5.9 s16 af/bf | % 23 s2 bf | % 24 @@ -347,45 +356,37 @@ Chords = \chordmode ef4 af:maj7 g:m7 c:m7 | % 35 ef2/bf bf | % 36 - ef1:5.9 | % 37 + ef1:3.5.9 | % 37 s1 | % 38 - df2..:5.9 s16 bf/c | % 39 + df2..:3.5.9 s16 bf/c | % 39 s2 c | % 40 - \repeat volta 2 - { - f2 g:m11 | % 41 - f2/a f4/c c | % 42 - f2/a bf | % 43 - f4/c c f2 | % 44 - f2 f/e | % 45 - d2:m7 g:9 | % 46 - a4:m g/b c2 | % 47 - c4/g g c2 | % 48 - - f2. f4/a | % 49 - bf4 d:m7 f/c c/bf | % 50 - f2/a bf | % 51 - g2:m7 f4/c c | % 52 - bf2. d4:7.9- | % 53 - g4:m d:7.9- g2:m7 | % 54 - c4 c/bf f2/a | % 55 - f4/c c f2 | % 56 - bf2 d:aug/a | % 57 - g4:m7 d:7.9- g2:m7 | % 58 - c2/e f/a | % 59 - } - \alternative - { - { - \time 2/4 f4/c c \time 4/4 | % 60 - f2 g:m11 | % 61 - f2/a f4/c c | % 62 - } - { - f4/c c f2 | % 63 - } - } + f2 g:m11 | % 41 + f2/a f4/c c | % 42 + f2/a bf | % 43 + f4/c c f2 | % 44 + f2 f/e | % 45 + d2:m7 g:9 | % 46 + a4:m g/b c2 | % 47 + c4/g g c2 | % 48 + + f2. f4/a | % 49 + bf4 d:m7 f/c c/bf | % 50 + f2/a bf | % 51 + g2:m7 f4/c c | % 52 + bf2. d4:7.9- | % 53 + g4:m d:7.9- g2:m7 | % 54 + c4 c/bf f2/a | % 55 + f4/c c f2 | % 56 + bf2 d:aug/a | % 57 + g4:m7 d:7.9- g2:m7 | % 58 + c2/e f/a | % 59 + + f4/c c | % 60 + f2 g:m11 | % 61 + f2/a f4/c c | % 62 + + f4/c c f2 | % 63 bf2 d:aug/a | % 64 g4:m7 d:7.9- g2:m7 | % 65 @@ -400,17 +401,11 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -421,45 +416,37 @@ StaffC = \relative c c4 c c c8. c16-> ~ | % 5 c1 | % 6 c4 c c c8. c16-> ~ | % 7 - c4 c c c \bar "||:" % 8 + c4 c c c | % 8 - \repeat volta 2 - { - % Verse + % Verse - c4 c8. c16 c4. c8 | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c8.-> c16-^ ~ c c8-^ c16-> ~ c2 \bar "||" % 12 + c4 c8. c16 c4. c8 | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c8.-> c16-^ ~ c c8-^ c16-> ~ c2 | % 12 - c4 c c8. c16 ~ c4 | % 13 - c4 c c8. c16 ~ c4 | % 14 - c4-^ c-^ r8. c16-> ~ c4 | % 15 - c4-^ c-^ r8. c16-> ~ c4 | % 16 - c4 c c c | % 17 + c4 c c8. c16 ~ c4 | % 13 + c4 c c8. c16 ~ c4 | % 14 + c4-^ c-^ r8. c16-> ~ c4 | % 15 + c4-^ c-^ r8. c16-> ~ c4 | % 16 + c4 c c c | % 17 - \time 2/4 c4 c \time 4/4 | % 18 + c4 c | % 18 - c4 c c c8. c16 ~ | % 19 - c1 | % 20 - } - \alternative - { - { - c4 c c c8. c16-> ~ | % 21 - c4 c c c | % 22 - } - { - c4 c c c8. c16-> ~ | % 23 - } - } + c4 c c c8. c16 ~ | % 19 + c1 | % 20 + + c4 c c c8. c16-> ~ | % 21 + c4 c c c | % 22 - c4 c c c \bar "||" % 24 + c4 c c c8. c16-> ~ | % 23 + + c4 c c c | % 24 c2.. c8 | % 25 c4 c c c | % 26 c4 c c c | % 27 - c8.-> c16-^ ~ c c8-^ c16-> ~ c2 \bar "||" % 28 + c8.-> c16-^ ~ c c8-^ c16-> ~ c2 | % 28 c4 c c8. c16 ~ c4 | % 29 c4 c c8. c16 ~ c4 | % 30 @@ -468,47 +455,39 @@ StaffC = \relative c c4 c c c | % 33 c4 c c c | % 34 c4 c c c | % 35 - c2 c \bar "||" % 36 + c2 c | % 36 c4 c c c8. c16 ~ | % 37 c1 | % 38 c4 c c c8. c16 ~ | % 39 - c4 c c c \bar "||" % 40 - - \repeat volta 2 - { - c4 c c c | % 41 - c4 c c c | % 42 - c4 c c c | % 43 - c4 c c c | % 44 - c4 c c c | % 45 - c4 c c c | % 46 - c4 c c c | % 47 - c4 c c c \bar "||" % 48 - - c2.-> c4-> | % 49 - c4 c c c | % 50 - c4 c c c | % 51 - c4 c c c | % 52 - c4 c c c | % 53 - c4 c c c | % 54 - c4 c c c | % 55 - c4 c c c | % 56 - c4 c c c | % 57 - c4 c c c | % 58 - c4 c c c | % 59 - } - \alternative - { - { - \time 2/4 c4 c \time 4/4 | % 60 - c4 c c c | % 61 - c4 c c c | % 62 - } - { - c4 c c c | % 63 - } - } + c4 c c c | % 40 + + c4 c c c | % 41 + c4 c c c | % 42 + c4 c c c | % 43 + c4 c c c | % 44 + c4 c c c | % 45 + c4 c c c | % 46 + c4 c c c | % 47 + c4 c c c \bar "||" % 48 + + c2.-> c4-> | % 49 + c4 c c c | % 50 + c4 c c c | % 51 + c4 c c c | % 52 + c4 c c c | % 53 + c4 c c c | % 54 + c4 c c c | % 55 + c4 c c c | % 56 + c4 c c c | % 57 + c4 c c c | % 58 + c4 c c c | % 59 + + c4 c | % 60 + c4 c c c | % 61 + c4 c c c | % 62 + + c4 c c c | % 63 c4 c c c | % 64 c4 c c c | % 65 @@ -516,7 +495,7 @@ StaffC = \relative c c2 c | % 67 c4 c c c | % 68 c4 c c c | % 69 - c1-\fermata \bar "|." % 70 + c1-\fermata | % 70 } @@ -543,39 +522,44 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 } + diff --git a/lamb-of-god.ly b/lamb-of-god.ly index 7161a15..97e76a6 100644 --- a/lamb-of-god.ly +++ b/lamb-of-god.ly @@ -1,10 +1,10 @@ % Still need hairpins, directions, dynamics, etc... -\version "2.18.1" +\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,8 +14,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 "Lamb of God" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Twila Paris" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" } @@ -29,7 +27,7 @@ staffSize = #20 Global = { \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Intro @@ -89,7 +87,7 @@ Global = s2. | % 46 } { - s2. \bar "||" % 47 + s2. \bar "|." % 47 } } } @@ -98,13 +96,9 @@ Global = % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -180,6 +174,7 @@ LeadVox = \relative c' d,2.^\fermata | % 47 } + LeadVoxText = \lyricmode { Your on -- ly son, no sin to hide, @@ -222,7 +217,6 @@ LeadVoxText = \lyricmode % % Riffs % - Riffs = \relative c' { \teeny @@ -248,7 +242,6 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { % Intro @@ -329,15 +322,11 @@ Chords = \chordmode % % Chord rhythms % - Rhythm = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" \override Staff.TimeSignature #'style = #'() - \time 4/4 \override NoteHead #'style = #'slash -\tiny + \teeny % Intro @@ -424,39 +413,30 @@ Dynamics = s4. s4._\markup { \italic { Band in } } | % 11 s2.*34 | % 12-44 (+1 for blank coda) s4 s2_\markup { \italic { Rit. last time } } | % 45 - -%{ - % Intro - s4_\markup { \italic { Ac. gtr only } } s2. | % 1 - - s1*3 | % 2-4 - - s4_\markup { \italic { Band in } } s2. | % 5 -%} } \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new ChoirStaff + \context Staff + << + \new Voice = "lead" \LeadVox + \new Voice \Riffs + \new Lyrics \lyricsto "lead" \LeadVoxText + >> + + \new ChoirStaff << \new ChordNames \Chords %Capo 3 edition % \new ChordNames \transpose f d \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> - - \new Staff - << - \Global % The "roadmap" that everything else depends on - \new Voice = "lead" \LeadVox - \new Voice \Riffs - \new Lyrics \lyricsto "lead" \LeadVoxText - >> >> } @@ -465,7 +445,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -480,12 +460,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) - - % This doesn't quite do what I want :-P - system-system-spacing #'padding = #1 - markup-system-spacing #'padding = #4 - score-markup-spacing #'padding = #4 - score-system-spacing #'padding = #4 } + diff --git a/leaning-on-the-everlasting-arms.ly b/leaning-on-the-everlasting-arms.ly index 8fbaaba..0022662 100644 --- a/leaning-on-the-everlasting-arms.ly +++ b/leaning-on-the-everlasting-arms.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) @@ -10,10 +10,7 @@ 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 "Leaning On The Everlasting Arms" } -% title = \markup { \override #'(font-name . "DomCasual BT") % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) @@ -30,126 +27,163 @@ hn = #(define-music-function (parser location arg) (ly:music?) % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \repeat volta 2 { - R1 | % 1 - R1 | % 2 + s1*2 | % 1-2 } \repeat volta 2 { - R1 | % 3 - R1 | % 4 + s1*2 | % 3-4 } \repeat volta 2 { % Verse -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \italic { 1st X unison } } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \italic { 1st X unison } } - 4 8 4 | % 5 - 4 8 4 | % 6 - 4 8 | % 7 - 8. 16 ~ 8 8 ~ 2 | % 8 - 4 8 4 | % 9 - 4 8 4 | % 10 - 4 8 | % 7 - 8. 16 ~ 8 r2 \bar "||" % 12 + s1*8 \bar "||" % 5-12 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - 4. ~ 16 ~ 2 | % 13 - 4. ~ 16 ~ 2 | % 14 - 4 8 4 | % 15 - 8. 16 ~ 8 ~ 4 r | % 16 - 4. ~ 16 ~ 2 | % 17 - 4. ~ 16 ~ 2 | % 18 - 4 8 | % 19 - \time 2/4 8. 16 ~ 8 ~ \time 4/4 | % 20 - - 4 r r2 | % 21 - R1 | % 22 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*7 | % 13-19 + \time 2/4 s2 \time 4/4 | % 20 + s1*2 | % 21-22 } \alternative { { - R1 | % 23 - R1 | % 24 + s1*2 | % 23-24 } { - R1 | % 25 + s1 | % 25 } } - R1 | % 26 + s1 | % 26 \key a \major \repeat volta 2 { - R1 | % 27 - R1 | % 28 + s1*2 | % 27-28 } % Verse -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } \italic { bass & drums only } } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { C } } \italic { bass & drums only } } + + s1*4 | % 29-32 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \italic { full band } } + + s1*4 | % 33-36 + + \repeat volta 2 + { + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s1*8 | % 37-44 + } + + s1*4 \bar "|." % 45-48 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + \clef G + + % Intro + + R1*2 | % 1-2 + + R1*2 | % 3-4 + + % Verse + + 4 8 4 | % 5 + 4 8 4 | % 6 + 4 8 | % 7 + 8. 16 ~ 8 8 ~ 2 | % 8 + 4 8 4 | % 9 + 4 8 4 | % 10 + 4 8 | % 7 + 8. 16 ~ 8 r2 | % 12 + + % Chorus + + 4. ~ 16 ~ 2 | % 13 + 4. ~ 16 ~ 2 | % 14 + 4 8 4 | % 15 + 8. 16 ~ 8 ~ 4 r | % 16 + 4. ~ 16 ~ 2 | % 17 + 4. ~ 16 ~ 2 | % 18 + 4 8 | % 19 + \time 2/4 8. 16 ~ 8 ~ \time 4/4 | % 20 + + 4 r r2 | % 21 + R1 | % 22 + + R1*2 | % 23-24 + + R1 | % 25 + + R1 | % 26 + + + R1*2 | % 27-28 + + % Verse cs4 cs cs8 b a4 | % 29 b4 b b8 a fs4 | % 30 e4 e a8 gs a b | % 31 cs8. cs16 ~ cs8 b ~ b2 | % 32 -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \italic { full band } } - 4 8 4 | % 33 4 8 4 | % 34 4 8 | % 35 8. 16 ~ 8 r2 | % 36 - \repeat volta 2 - { - % Chorus + % Chorus -\mark \markup { \override #'(font-family . sans) { \box { D } } } - - 4. ~ 16 ~ 2 | % 37 - 4. ~ 16 ~ 2 | % 38 - 4 8 4 | % 39 - 8. 16 ~ 8 ~ 4 r | % 40 - 4. ~ 16 ~ 2 | % 41 - 4. ~ 16 ~ 2 | % 42 - 4 8 | % 43 - 8. 16 ~8 ~ 4 r | % 44 - } + 4. ~ 16 ~ 2 | % 37 + 4. ~ 16 ~ 2 | % 38 + 4 8 4 | % 39 + 8. 16 ~ 8 ~ 4 r | % 40 + 4. ~ 16 ~ 2 | % 41 + 4. ~ 16 ~ 2 | % 42 + 4 8 | % 43 + 8. 16 ~8 ~ 4 r | % 44 4 8 | % 45 8. 16 ~8 ~ 4 r | % 46 e4 e a8 gs a b | % 47 - cs4 b a2^\fermata \bar "|." % 48 + cs4 b a2^\fermata | % 48 } + LeadVoxText = \lyricmode { What a fel -- low -- ship, what a joy di -- vine, @@ -187,115 +221,57 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { -%{ - \clef G - \key ef \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 - - % Intro - - \tiny - 16 d bf f ~ f4 ~ f4. g16 bf | % 1 - c1 | % 2 - 16 d bf f ~ f4 ~ f4. g16 bf | % 3 - c2 | % 4 - - s1*9 - s2 - -\voiceOne -\tieDown - 16 d bf f ~ f4 ~ f4. g16 bf | % 14 -\tieNeutral -\oneVoice - c1 | % 15 - 16 d bf f ~ f4 ~ f4. g16 bf | % 16 - c2 | % 17 - - 16 d bf f ~ f4 ~ f4. g16 bf | % 18 - c2 r | % 19 - - s1*10 - - \stemUp - 16 e c g ~ g4 ~ g4. a16 c | % 31 - \stemNeutral - d2 r | % 32 - 16 e c g ~ g4 ~ g4. a16 c | % 33 - d2 r | % 34 -%} } % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \repeat volta 2 - { - s1 | % 1 - s1 | % 2 - } + s1 | % 1 + s1 | % 2 - \repeat volta 2 - { - g1:7 | % 3 - g1:7 | % 4 - } + g1:7 | % 3 + g1:7 | % 4 - \repeat volta 2 - { - % Verse + % Verse - g2 g/b | % 5 - c2:6 a:m7 | % 6 - g2 e:m7 | % 7 - g2/d d | % 8 - g2 g/b | % 9 - c2:6 a:m7 | % 10 - g2/b c | % 11 - g4/d d g2 \bar "||" % 12 + g2 g/b | % 5 + c2:6 a:m7 | % 6 + g2 e:m7 | % 7 + g2/d d | % 8 + g2 g/b | % 9 + c2:6 a:m7 | % 10 + g2/b c | % 11 + g4/d d g2 \bar "||" % 12 - % Chorus + % Chorus - g2 g:7/b | % 13 - c2 a:m7 | % 14 - g2 e:m7 | % 15 - a2:7 d4:sus4 d | % 16 - g2 g:7/b | % 17 - c2 a:m7 | % 18 - g2/b c | % 19 - \time 2/4 g4/d d \time 4/4 | % 20 - - g1:7 | % 21 - g1:7 | % 22 - } - \alternative - { - { - g1:7 | % 23 - g1:7 | % 24 - } - { - g1:7 | % 25 - } - } + g2 g:7/b | % 13 + c2 a:m7 | % 14 + g2 e:m7 | % 15 + a2:7 d4:sus4 d | % 16 + g2 g:7/b | % 17 + c2 a:m7 | % 18 + g2/b c | % 19 + g4/d d | % 20 + + g1:7 | % 21 + g1:7 | % 22 + + g1:7 | % 23 + g1:7 | % 24 + + g1:7 | % 25 g1:7 | % 26 - \repeat volta 2 - { - a1:7 | % 27 - a1:7 | % 28 - } + + a1:7 | % 27 + a1:7 | % 28 % Verse @@ -308,19 +284,16 @@ Chords = \chordmode a2/cs d | % 35 a4/e e a2 | % 36 - \repeat volta 2 - { - % Chorus + % Chorus - a2 a:7/cs | % 37 - d2 b:m7 | % 38 - a2 fs:m7 | % 39 - b2:7 e4:sus4 e | % 40 - a2 a:7/cs | % 41 - d2 b:m7 | % 42 - a2/cs d | % 43 - a4/e e a2 | % 44 - } + a2 a:7/cs | % 37 + d2 b:m7 | % 38 + a2 fs:m7 | % 39 + b2:7 e4:sus4 e | % 40 + a2 a:7/cs | % 41 + d2 b:m7 | % 42 + a2/cs d | % 43 + a4/e e a2 | % 44 a2/cs d | % 45 a4/e e a2 | % 46 @@ -332,77 +305,54 @@ 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \repeat volta 2 - { - R1 | % 1 - R1 | % 2 - } + R1 | % 1 + R1 | % 2 - \repeat volta 2 - { - c4-> c-> r2 | % 3 - c8-> c-> r4 r2 | % 4 - } + c4-> c-> r2 | % 3 + c8-> c-> r4 r2 | % 4 - \repeat volta 2 - { - % Verse + % Verse - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c-> r \bar "||" % 12 + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c-> r | % 12 - % Chorus + % Chorus - c2 c4 c | % 13 - c2 c4 c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c2 c4 c | % 17 - c2 c4 c | % 18 - c4 c c c | % 19 - \time 2/4 c4 c \time 4/4 | % 20 - - c4-> c-> r2 | % 21 - c8-> c-> r4 r2 | % 22 - } - \alternative - { - { - c4-> c-> r2 | % 23 - c8-> c-> r4 r2 | % 24 - } - { - c4-> c-> r2 | % 25 - } - } + c2 c4 c | % 13 + c2 c4 c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c2 c4 c | % 17 + c2 c4 c | % 18 + c4 c c c | % 19 + c4 c | % 20 + + c4-> c-> r2 | % 21 + c8-> c-> r4 r2 | % 22 + + c4-> c-> r2 | % 23 + c8-> c-> r4 r2 | % 24 + + c4-> c-> r2 | % 25 c8-> c-> r4 r2 | % 26 - \repeat volta 2 - { - c4-> c-> r2 | % 27 - c8-> c-> r4 r2 | % 28 - } + c4-> c-> r2 | % 27 + c8-> c-> r4 r2 | % 28 % Verse @@ -415,24 +365,21 @@ StaffC = \relative c c4 c c c | % 35 c4 c c c | % 36 - \repeat volta 2 - { - % Chorus + % Chorus - c2 c4 c | % 37 - c2 c4 c | % 38 - c4 c c c | % 39 - c4 c c c | % 40 - c2 c4 c | % 41 - c2 c4 c | % 42 - c4 c c c | % 43 - c4 c c c | % 44 - } + c2 c4 c | % 37 + c2 c4 c | % 38 + c4 c c c | % 39 + c4 c c c | % 40 + c2 c4 c | % 41 + c2 c4 c | % 42 + c4 c c c | % 43 + c4 c c c | % 44 c4 c c c | % 45 c4 c c c | % 46 c2-> c-> | % 47 - c4-> c-> c2^\fermata \bar "|." % 48 + c4-> c-> c2^\fermata | % 48 } @@ -445,58 +392,50 @@ Dynamics = s4_\markup { \italic { 1st X bass & drums only } } s2. | % 5 s1*7 | % 6-12 s4_\markup { \italic { full band } } s2. | % 13 -%{ - s4_\markup { \italic { snare pat. } } s2 | % 1 - s4_\markup { \italic { simile } } s2 | % 2 - s2.*19 - s4_\markup { \italic { spacy } } s2 | % 22 - s2.*5 - s4 s \< s \! | % 28 - s2.*22 - s4_\markup { \italic { Last time } } s2 | % 51 -%} } \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff - { - << - \new Voice = "lead" \LeadVox - \new Voice = "riffs" \Riffs - >> - } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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))) + #(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 } + diff --git a/linus-and-lucy.ly b/linus-and-lucy.ly index 970094e..d53bd96 100644 --- a/linus-and-lucy.ly +++ b/linus-and-lucy.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,15 +12,11 @@ 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 "Linus and Lucy" } subtitle = \markup { \override #'(font-family . sans) \fontsize #1.3 "Main Theme" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Vince Guaraldi" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. S. Hammons" } 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) @@ -38,7 +34,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key af \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -61,11 +57,8 @@ Global = % LeftHand = \relative c, { -% \set Staff.instrument = #"Lead vox" \clef F - \override Staff.TimeSignature #'style = #'() -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f + \numericTimeSignature \ottava #-1 af8 ef' af af, ef' af4 af,8 ~ | @@ -113,11 +106,8 @@ LeftHand = \relative c, % RightHand = \relative c' { -% \set Staff.instrument = #"Lead vox" \clef G - \override Staff.TimeSignature #'style = #'() -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f + \numericTimeSignature r1 | r1 | @@ -165,11 +155,8 @@ RightHand = \relative c' Riffs = \relative c'' { \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - %{ \tiny \normalsize @@ -182,9 +169,6 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? YES!!! -% \popChords - s4. d8 g4/a | % 0 d2 g4 | % 1 a4:sus4 a b:m | % 2 @@ -211,15 +195,11 @@ 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 r4 r8 c c4 | % 0 c4 c c | % 1 @@ -290,11 +270,11 @@ Dynamics = \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "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 @@ -305,6 +285,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) } + diff --git a/lo-how-a-rose-e'er-blooming.ly b/lo-how-a-rose-e'er-blooming.ly index fb3577c..f6f5735 100644 --- a/lo-how-a-rose-e'er-blooming.ly +++ b/lo-how-a-rose-e'er-blooming.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) @@ -10,13 +10,11 @@ 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 "Lo! How a Rose E’er Blooming" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "German Carol" } -% poet = \markup { \override #'(font-family . sans) \fontsize #1.3 "George Atkins" } -% arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" } - tagline = "Engraved by JLH and Lilypond 2.8.8" +% poet = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } +% arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr." } + tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) } @@ -24,9 +22,8 @@ Soprano = \relative c'' { \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 6/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f \voiceOne c2 c4 c d c | % 1 @@ -50,9 +47,8 @@ Alto = \relative c'' { \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 6/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f \voiceTwo a2 a4 f f f | % 1 @@ -76,9 +72,8 @@ Tenor = \relative c' { \clef F \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 6/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f \voiceThree c2 c4 a bf a | % 1 @@ -102,9 +97,8 @@ Bass = \relative c { \clef F \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 6/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f \voiceFour f2 f4 f bf f | % 1 @@ -184,11 +178,11 @@ VerseC = \lyricmode \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 @@ -199,6 +193,5 @@ VerseC = \lyricmode % 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) } + diff --git a/lord-i-lift-your-name-on-high.ly b/lord-i-lift-your-name-on-high.ly index ede85dc..e90e409 100644 --- a/lord-i-lift-your-name-on-high.ly +++ b/lord-i-lift-your-name-on-high.ly @@ -1,8 +1,9 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -staffSize = #18 % or 16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -15,79 +16,100 @@ staffSize = #18 % or 16 { \fontsize #3.5 "Lord I Lift Your Name On High" } } % composer = \markup { \override #'(font-family . sans) "" } arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart/Shamus Hammons" } - tagline = "Engraved by JLH and Lilypond 2.8.2" + 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.instrumentName = #"Lead vox" \clef F \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \repeat volta 2 { -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \small \italic { Bass line througout } } - -\tiny - g8 [ g ] r a16 [ b ] c8 [ c ] r d16 [ e ] | % 1 - d8 [ d ] r a16 [ b ] c [ c8 c16 ] ~ c [ c b a ] | % 2 - g8 [ g ] r a16 [ b ] c8 [ c ] r d16 [ e ] | % 3 - d8 [ d ] r a16 [ b ] c [ c8 c16 ] ~ c [ c b a ] | % 4 -\normalsize + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \small \italic { Bass line througout } } + s1*4 | % 1-4 } + \clef G \repeat volta 2 { -\mark \markup { \override #'(font-family . sans) { \box { A } } } - % Verse - r4 b'8 [ d ] g [ fs16 e ] ~ e8 [ d ] ~ | % 5 - d8 [ d ] ~ d2 r4 | % 6 - r4 b8 [ d ] g [ fs16 e ] ~ e8 [ d ] | % 7 - e8 ([ d ]) d2 r4 | % 8 - r4 b8 [ d ] g [ fs16 e ] ~ e8 [ d ] ~ | % 9 - d8 [ d ] ~ d2 r4 | % 10 - r4 b8 [ d ] g [ fs16 e ] ~ e8 [ d ] | % 11 - e8 ([ d ]) d2 r4 \bar"||" % 12 - -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar"||" % 5-12 % Chorus - r8 b' b [ b ] c4 b8 [ g16 a ] | % 13 - r4 d c4. b16 [ b ] | % 14 - r4 b8 [ b16 c (] ~ c8 [ b ]) a [ g16 a ] | % 15 - r4 d c4. b16 [ b ] | % 16 - r4 b8 [ b16 c (] ~ c8 [ b ]) a8 [ g16 a ] ~ | % 17 - a4 a8 [ a16 b (] ~ b8 [ a ]) g8 [ fs16 g ] ~ | % 18 - g4 e8 [ g ] a [ g16 fs ] ~ fs8 [ g ] ~ | % 19 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*7 | % 13-19 } \alternative { { - g8 [ g ] ~ g2. | % 20 - R1 | % 21 + s1*2 | % 20-21 } { - g8 \repeatTie [ g ] ~ g2. | % 22 + s1 | % 22 } } -\mark \markup { \override #'(font-family . sans) { \box { C } } } + % Chorus (redux) + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*8 | % 23-30 + + % Tag + + s1*4 \bar "|." % 31-34 +} + + +% +% Lead vocal +% +LeadVox = \relative c +{ + \set Voice.autoBeaming = ##f + + % Intro + + s1*4 | % 1-4 + + % Verse + + r4 b'8 [ d ] g [ fs16 e ] ~ e8 [ d ] ~ | % 5 + d8 [ d ] ~ d2 r4 | % 6 + r4 b8 [ d ] g [ fs16 e ] ~ e8 [ d ] | % 7 + e8 ([ d ]) d2 r4 | % 8 + r4 b8 [ d ] g [ fs16 e ] ~ e8 [ d ] ~ | % 9 + d8 [ d ] ~ d2 r4 | % 10 + r4 b8 [ d ] g [ fs16 e ] ~ e8 [ d ] | % 11 + e8 ([ d ]) d2 r4 | % 12 + + % Chorus + + r8 b' b [ b ] c4 b8 [ g16 a ] | % 13 + r4 d c4. b16 [ b ] | % 14 + r4 b8 [ b16 c (] ~ c8 [ b ]) a [ g16 a ] | % 15 + r4 d c4. b16 [ b ] | % 16 + r4 b8 [ b16 c (] ~ c8 [ b ]) a8 [ g16 a ] ~ | % 17 + a4 a8 [ a16 b (] ~ b8 [ a ]) g8 [ fs16 g ] ~ | % 18 + g4 e8 [ g ] a [ g16 fs ] ~ fs8 [ g ] ~ | % 19 + + g8 [ g ] ~ g2. | % 20 + R1 | % 21 + + g8 \repeatTie [ g ] ~ g2. | % 22 % Chorus (redux) @@ -105,16 +127,12 @@ LeadVox = \relative c r4 e8 [ g ] a [ g16 fs ] ~ fs8 [ g ] ~ | % 31 g8 [ g ] ~ g2. | % 32 r4 e8 [ g ] a [ g16 fs ] ~ fs8 [ g ] ~ | % 33 - g8 [ g ] ~ g2.-\fermata \bar "|." % 34 + g8 [ g ] ~ g2.-\fermata | % 34 } + LeadVoxText = \lyricmode { - _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ - Lord I lift your name _ on _ high _ Lord I love to sing _ your prai- _ ses I'm so glad you're in _ my _ life _ @@ -144,14 +162,26 @@ LeadVoxText = \lyricmode % -% Chord names +% Riffs % +Riffs = \relative c +{ + \set Voice.autoBeaming = ##f + + \tiny + g8 [ g ] r a16 [ b ] c8 [ c ] r d16 [ e ] | % 1 + d8 [ d ] r a16 [ b ] c [ c8 c16 ] ~ c [ c b a ] | % 2 + g8 [ g ] r a16 [ b ] c8 [ c ] r d16 [ e ] | % 3 + d8 [ d ] r a16 [ b ] c [ c8 c16 ] ~ c [ c b a ] | % 4 + \normalsize +} + +% +% Chord names +% Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro g2 c | % 1 @@ -208,17 +238,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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -277,42 +302,50 @@ StaffC = \relative c c4 c c c | % 31 c4 c c c | % 32 c4 c c_\markup { \italic { rit. } } c | % 33 - c1-\fermata \bar "|." % 34 + c1-\fermata | % 34 } \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 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 } + diff --git a/lord-you-have-my-heart.ly b/lord-you-have-my-heart.ly index c524990..1b40378 100644 --- a/lord-you-have-my-heart.ly +++ b/lord-you-have-my-heart.ly @@ -1,8 +1,10 @@ -\version "2.16.0" +% Chart needs to be added + +\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) @@ -10,154 +12,193 @@ 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 "Lord You Have My Heart" } } % composer = \markup { \override #'(font-family . sans) "" } arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.2" + 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.instrumentName = #"Lead vox" \clef G \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1 | % 1 - R1 | % 2 - R1 | % 3 - R1 \bar "||:" % 4 + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { - R1 | % 5 - R1 | % 6 - R1 | % 7 - R1 | % 8 + s1*4 | % 5-8 } \repeat volta 2 { % Verse - - R1 | % 9 - R1 | % 10 - R1 | % 11 - R1 | % 12 - R1 | % 13 - R1 | % 14 - R1 | % 15 - R1 | % 16 - - R1 | % 17 - R1 | % 18 - R1 | % 19 - R1 | % 20 - R1 | % 21 - R1 | % 22 - R1 | % 23 - R1 | % 24 + + s1*16 | % 9-24 % Chorus - R1 \bar "||" % 25 - R1 | % 26 - R1 | % 27 - R1 | % 28 - R1 | % 29 - R1 | % 30 - R1 | % 31 - R1 | % 32 - R1 | % 33 - R1 | % 34 - R1 | % 35 + s1 \bar "||" % 25 + s1*10 | % 26-35 } \alternative { { - R1 | % 36 - R1 | % 37 - R1 \bar "||" % 38 - - R1 | % 39 - R1 | % 40 - R1 | % 41 - R1 | % 42 + s1*3 \bar "||" % 36-38 + + s1*4 | % 39-42 } { - R1 | % 43 + s1 | % 43 } } - R1 | % 44 - R1 | % 45 - R1 | % 46 - R1 | % 47 - R1 | % 48 - R1 \bar "||" % 49 + s1*6 \bar "||" % 44-49 - R1 | % 50 - R1 | % 51 - R1 | % 52 - R1 \bar "||" % 53 + s1*4 \bar "||" % 50-53 - R1 | % 54 - R1 | % 55 - R1 | % 56 - R1 \bar "||:" % 57 + s1*4 \bar ".|:-||" % 54-57 \repeat volta 2 { - R1 | % 58 - R1 | % 59 - R1 | % 60 + s1*3 | % 58-60 } \alternative { { - R1 | % 61 + s1 | % 61 } { - R1 | % 62 + s1 | % 62 } } \repeat volta 2 { - R1 | % 63 - R1 | % 64 - R1 | % 65 - R1 | % 66 + s1*4 | % 63-66 } + s1*7 \bar "|." % 67-73 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + R1 | % 1 + R1 | % 2 + R1 | % 3 + R1 | % 4 + + R1 | % 5 + R1 | % 6 + R1 | % 7 + R1 | % 8 + + % Verse + + c1 | % 9 + R1 | % 10 + R1 | % 11 + R1 | % 12 + R1 | % 13 + R1 | % 14 + R1 | % 15 + R1 | % 16 + + R1 | % 17 + R1 | % 18 + R1 | % 19 + R1 | % 20 + R1 | % 21 + R1 | % 22 + R1 | % 23 + R1 | % 24 + + % Chorus + + R1 | % 25 + R1 | % 26 + R1 | % 27 + R1 | % 28 + R1 | % 29 + R1 | % 30 + R1 | % 31 + R1 | % 32 + R1 | % 33 + R1 | % 34 + R1 | % 35 + + R1 | % 36 + R1 | % 37 + R1 | % 38 + + R1 | % 39 + R1 | % 40 + R1 | % 41 + R1 | % 42 + + R1 | % 43 + + R1 | % 44 + R1 | % 45 + R1 | % 46 + R1 | % 47 + R1 | % 48 + R1 | % 49 + + R1 | % 50 + R1 | % 51 + R1 | % 52 + R1 | % 53 + + R1 | % 54 + R1 | % 55 + R1 | % 56 + R1 | % 57 + + R1 | % 58 + R1 | % 59 + R1 | % 60 + + R1 | % 61 + + R1 | % 62 + + R1 | % 63 + R1 | % 64 + R1 | % 65 + R1 | % 66 + R1 | % 67 R1 | % 68 R1 | % 69 R1 | % 70 R1 | % 71 R1 | % 72 - r1^\fermata \bar "|." % 73 + r1^\fermata | % 73 } + LeadVoxText = \lyricmode { Lord, you have my heart and I will search for yours, - Je- sus take my life and lead me on. + Je -- sus take my life and lead me on. Lord, you have my heart and I will search for yours, - Let me be to you a sa- cri- fice. + Let me be to you a sa -- cri -- fice. And I will praise you Lord } @@ -166,12 +207,8 @@ LeadVoxText = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro | % 1 @@ -179,68 +216,57 @@ Chords = \chordmode | % 3 | % 4 - \repeat volta 2 - { - | % 5 - | % 6 - | % 7 - | % 8 - } - - \repeat volta 2 - { - % Verse - - | % 9 - | % 10 - | % 11 - | % 12 - | % 13 - | % 14 - | % 15 - | % 16 - - | % 17 - | % 18 - | % 19 - | % 20 - | % 21 - | % 22 - | % 23 - | % 24 - - % Chorus - - | % 25 - | % 26 - | % 27 - | % 28 - | % 29 - | % 30 - | % 31 - | % 32 - | % 33 - | % 34 - | % 35 - } - \alternative - { - { - | % 36 - | % 37 - | % 38 - - | % 39 - | % 40 - | % 41 - | % 42 - } - { - | % 43 - } - } - - | % 44 + | % 5 + | % 6 + | % 7 + | % 8 + + % Verse + + | % 9 + | % 10 + | % 11 + | % 12 + | % 13 + | % 14 + | % 15 + | % 16 + + | % 17 + | % 18 + | % 19 + | % 20 + | % 21 + | % 22 + | % 23 + | % 24 + + % Chorus + + | % 25 + | % 26 + | % 27 + | % 28 + | % 29 + | % 30 + | % 31 + | % 32 + | % 33 + | % 34 + | % 35 + + | % 36 + | % 37 + | % 38 + + | % 39 + | % 40 + | % 41 + | % 42 + + | % 43 + + | % 44 | % 45 | % 46 | % 47 @@ -257,29 +283,19 @@ Chords = \chordmode | % 56 | % 57 - \repeat volta 2 - { - | % 58 - | % 59 - | % 60 - } - \alternative - { - { - | % 61 - } - { - | % 62 - } - } - \repeat volta 2 - { - | % 63 - | % 64 - | % 65 - | % 66 - } + | % 58 + | % 59 + | % 60 + + | % 61 + + | % 62 + + | % 63 + | % 64 + | % 65 + | % 66 | % 67 | % 68 @@ -294,126 +310,99 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro c4 c c c | % 1 c4 c c c | % 2 c4 c c c | % 3 - c4 c c c \bar "||:" % 4 - - \repeat volta 2 - { - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - } - - \repeat volta 2 - { - % Verse - - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - c4 c c c | % 20 - c4 c c c | % 21 - c4 c c c | % 22 - c4 c c c | % 23 - c4 c c c | % 24 - - % Chorus - - c4 c c c \bar "||" % 25 - c4 c c c | % 26 - c4 c c c | % 27 - c4 c c c | % 28 - c4 c c c | % 29 - c4 c c c | % 30 - c4 c c c | % 31 - c4 c c c | % 32 - c4 c c c | % 33 - c4 c c c | % 34 - c4 c c c | % 35 - } - \alternative - { - { - c4 c c c | % 36 - c4 c c c | % 37 - c4 c c c \bar "||" % 38 - - c4 c c c | % 39 - c4 c c c | % 40 - c4 c c c | % 41 - c4 c c c | % 42 - } - { - c4 c c c | % 43 - } - } + c4 c c c | % 4 + + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + + % Verse + + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c c c | % 20 + c4 c c c | % 21 + c4 c c c | % 22 + c4 c c c | % 23 + c4 c c c | % 24 + + % Chorus + + c4 c c c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + c4 c c c | % 28 + c4 c c c | % 29 + c4 c c c | % 30 + c4 c c c | % 31 + c4 c c c | % 32 + c4 c c c | % 33 + c4 c c c | % 34 + c4 c c c | % 35 + + c4 c c c | % 36 + c4 c c c | % 37 + c4 c c c | % 38 + + c4 c c c | % 39 + c4 c c c | % 40 + c4 c c c | % 41 + c4 c c c | % 42 + + c4 c c c | % 43 c4 c c c | % 44 c4 c c c | % 45 c4 c c c | % 46 c4 c c c | % 47 c4 c c c | % 48 - c4 c c c \bar "||" % 49 + c4 c c c | % 49 c4 c c c | % 50 c4 c c c | % 51 c4 c c c | % 52 - c4 c c c \bar "||" % 53 + c4 c c c | % 53 c4 c c c | % 54 c4 c c c | % 55 c4 c c c | % 56 - c4 c c c \bar "||:" % 57 + c4 c c c | % 57 - \repeat volta 2 - { - c4 c c c | % 58 - c4 c c c | % 59 - c4 c c c | % 60 - } - \alternative - { - { - c4 c c c | % 61 - } - { - c4 c c c | % 62 - } - } - \repeat volta 2 - { - c4 c c c | % 63 - c4 c c c | % 64 - c4 c c c | % 65 - c4 c c c | % 66 - } + c4 c c c | % 58 + c4 c c c | % 59 + c4 c c c | % 60 + + c4 c c c | % 61 + + c4 c c c | % 62 + + c4 c c c | % 63 + c4 c c c | % 64 + c4 c c c | % 65 + c4 c c c | % 66 c4 c c c | % 67 c4 c c c | % 68 @@ -421,43 +410,49 @@ StaffC = \relative c c4 c c c | % 70 c4 c c c | % 71 c4 c c c | % 72 - c1^\fermata \bar "|." % 73 + c1^\fermata | % 73 } \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 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 } + diff --git a/more-love-more-power.ly b/more-love-more-power.ly index 09adfc7..36ad05c 100644 --- a/more-love-more-power.ly +++ b/more-love-more-power.ly @@ -1,8 +1,10 @@ -\version "2.16.0" +% This is missing everything from the chart + +\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) @@ -10,153 +12,88 @@ 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 "More Love, More Power" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Del Hierro" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.6" + 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.instrumentName = #"Lead vox" \clef G \key e \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \repeat volta 2 { - c4 c c c | % 1 - c4 c c c | % 2 - c4 c c c | % 3 - c4 c c c | % 4 + s1*4 | % 1-4 } \repeat volta 2 { % Verse - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c \bar "||" % 12 + s1*8 \bar "||" % 5-12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - c4 c c c \bar "||" % 20 + s1*8 \bar "||" % 13-20 % Chorus - c4 c c c | % 21 - c4 c c c | % 22 - c4 c c c | % 23 - c4 c c c | % 24 - c4 c c c | % 25 - c4 c c c | % 26 - c4 c c c | % 27 - c4 c c c | % 28 - c4 c c c | % 29 - c4 c c c | % 30 - c4 c c c | % 31 - c4 c c c | % 32 - c4 c c c | % 33 - c4 c c c | % 34 - c4 c c c | % 35 + s1*15 | % 21-35 } \alternative { { - c4 c c c | % 36 - c4 c c c | % 37 - c4 c c c | % 38 - c4 c c c | % 39 - c4 c c c | % 40 - c4 c c c | % 41 - c4 c c c | % 42 - c4 c c c | % 43 - c4 c c c | % 44 + s1*9 | % 36-44 } { - c4 c c c | % 45 + s1 | % 45 } } \repeat volta 4 { - c4 c c c | % 46 - c4 c c c | % 47 + s1*2 | % 46-47 } \alternative { { - c4 c c c | % 48 - c4 c c c | % 49 + s1*2 | % 48-49 } { - c4 c c c | % 50 - c4 c c c | % 51 + s1*2 | % 50-51 } } \repeat volta 2 { - c4 c c c | % 52 - c4 c c c | % 53 - c4 c c c | % 54 - c4 c c c | % 55 - c4 c c c | % 56 - c4 c c c | % 57 - c4 c c c | % 58 - c4 c c c | % 59 - c4 c c c | % 60 - c4 c c c | % 61 - c4 c c c | % 62 - c4 c c c | % 63 - c4 c c c | % 64 - c4 c c c | % 65 + s1*14 | % 52-65 } \alternative { { - c4 c c c | % 66 - c4 c c c | % 67 + s1*2 | % 66-67 } { - c4 c c c | % 68 + s1 | % 68 } } - c4 c c c | % 69 + s1 | % 69 \repeat volta 2 { - c4 c c c | % 70 - c4 c c c | % 71 - c4 c c c | % 72 - c4 c c c | % 73 + s1*4 | % 70-73 } - c1^\fermata \bar "|." % 74 + s1 \bar "|." % 74 @@ -219,26 +156,12 @@ LeadVox = \relative c' %} } -LeadVoxText = \lyricmode -{ - More love, more po- wer - more of you in my life - More love, more po- wer - more of you in my life - - And I will wor- ship you with all of my heart -} - % -% Chord names +% Lead vocal % - -Chords = \chordmode +LeadVox = \relative c' { -%Bah, can't we set this globally? -% \popChords - % Intro \repeat volta 2 @@ -362,184 +285,268 @@ Chords = \chordmode c4 c c c | % 73 } - c1 | % 74 + c1^\fermata | % 74 +} + + +LeadVoxText = \lyricmode +{ + More love, more po- wer + more of you in my life + More love, more po- wer + more of you in my life + + And I will wor- ship you with all of my heart } % -% Chord rhythms +% Chord names % +Chords = \chordmode +{ + % Intro + + c4 c c c | % 1 + c4 c c c | % 2 + c4 c c c | % 3 + c4 c c c | % 4 + + % Verse + + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c c c | % 20 + + % Chorus + + c4 c c c | % 21 + c4 c c c | % 22 + c4 c c c | % 23 + c4 c c c | % 24 + c4 c c c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + c4 c c c | % 28 + c4 c c c | % 29 + c4 c c c | % 30 + c4 c c c | % 31 + c4 c c c | % 32 + c4 c c c | % 33 + c4 c c c | % 34 + c4 c c c | % 35 + + c4 c c c | % 36 + c4 c c c | % 37 + c4 c c c | % 38 + c4 c c c | % 39 + c4 c c c | % 40 + c4 c c c | % 41 + c4 c c c | % 42 + c4 c c c | % 43 + c4 c c c | % 44 + + c4 c c c | % 45 + + c4 c c c | % 46 + c4 c c c | % 47 + + c4 c c c | % 48 + c4 c c c | % 49 + + c4 c c c | % 50 + c4 c c c | % 51 + + c4 c c c | % 52 + c4 c c c | % 53 + c4 c c c | % 54 + c4 c c c | % 55 + c4 c c c | % 56 + c4 c c c | % 57 + c4 c c c | % 58 + c4 c c c | % 59 + c4 c c c | % 60 + c4 c c c | % 61 + c4 c c c | % 62 + c4 c c c | % 63 + c4 c c c | % 64 + c4 c c c | % 65 + + c4 c c c | % 66 + c4 c c c | % 67 + + c4 c c c | % 68 + + c4 c c c | % 69 + + c4 c c c | % 70 + c4 c c c | % 71 + c4 c c c | % 72 + c4 c c c | % 73 + + c1 | % 74 +} -% Use a RhythmicStaff on the chords instead of this? -% It almost works, but not quite. Doesn't collapse chords above to single notes... +% +% Chord rhythms +% 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 - \repeat volta 2 - { - c4 c c c | % 1 - c4 c c c | % 2 - c4 c c c | % 3 - c4 c c c | % 4 - } - - \repeat volta 2 - { - % Verse - - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c \bar "||" % 12 - - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - c4 c c c \bar "||" % 20 + c4 c c c | % 1 + c4 c c c | % 2 + c4 c c c | % 3 + c4 c c c | % 4 - % Chorus + % Verse - c4 c c c | % 21 - c4 c c c | % 22 - c4 c c c | % 23 - c4 c c c | % 24 - c4 c c c | % 25 - c4 c c c | % 26 - c4 c c c | % 27 - c4 c c c | % 28 - c4 c c c | % 29 - c4 c c c | % 30 - c4 c c c | % 31 - c4 c c c | % 32 - c4 c c c | % 33 - c4 c c c | % 34 - c4 c c c | % 35 - } - \alternative - { - { - c4 c c c | % 36 - c4 c c c | % 37 - c4 c c c | % 38 - c4 c c c | % 39 - c4 c c c | % 40 - c4 c c c | % 41 - c4 c c c | % 42 - c4 c c c | % 43 - c4 c c c | % 44 - } - { - c4 c c c | % 45 - } - } + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c c c | % 20 - \repeat volta 4 - { - c4 c c c | % 46 - c4 c c c | % 47 - } - \alternative - { - { - c4 c c c | % 48 - c4 c c c | % 49 - } - { - c4 c c c | % 50 - c4 c c c | % 51 - } - } + % Chorus - \repeat volta 2 - { - c4 c c c | % 52 - c4 c c c | % 53 - c4 c c c | % 54 - c4 c c c | % 55 - c4 c c c | % 56 - c4 c c c | % 57 - c4 c c c | % 58 - c4 c c c | % 59 - c4 c c c | % 60 - c4 c c c | % 61 - c4 c c c | % 62 - c4 c c c | % 63 - c4 c c c | % 64 - c4 c c c | % 65 - } - \alternative - { - { - c4 c c c | % 66 - c4 c c c | % 67 - } - { - c4 c c c | % 68 - } - } + c4 c c c | % 21 + c4 c c c | % 22 + c4 c c c | % 23 + c4 c c c | % 24 + c4 c c c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + c4 c c c | % 28 + c4 c c c | % 29 + c4 c c c | % 30 + c4 c c c | % 31 + c4 c c c | % 32 + c4 c c c | % 33 + c4 c c c | % 34 + c4 c c c | % 35 + + c4 c c c | % 36 + c4 c c c | % 37 + c4 c c c | % 38 + c4 c c c | % 39 + c4 c c c | % 40 + c4 c c c | % 41 + c4 c c c | % 42 + c4 c c c | % 43 + c4 c c c | % 44 + + c4 c c c | % 45 + + c4 c c c | % 46 + c4 c c c | % 47 + + c4 c c c | % 48 + c4 c c c | % 49 + + c4 c c c | % 50 + c4 c c c | % 51 + + c4 c c c | % 52 + c4 c c c | % 53 + c4 c c c | % 54 + c4 c c c | % 55 + c4 c c c | % 56 + c4 c c c | % 57 + c4 c c c | % 58 + c4 c c c | % 59 + c4 c c c | % 60 + c4 c c c | % 61 + c4 c c c | % 62 + c4 c c c | % 63 + c4 c c c | % 64 + c4 c c c | % 65 + + c4 c c c | % 66 + c4 c c c | % 67 + + c4 c c c | % 68 c4 c c c | % 69 - \repeat volta 2 - { - c4 c c c | % 70 - c4 c c c | % 71 - c4 c c c | % 72 - c4 c c c | % 73 - } + c4 c c c | % 70 + c4 c c c | % 71 + c4 c c c | % 72 + c4 c c c | % 73 - c1^\fermata \bar "|." % 74 + c1^\fermata | % 74 } \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 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 } + diff --git a/mourning-into-dancing.ly b/mourning-into-dancing.ly index 8964e81..a456792 100644 --- a/mourning-into-dancing.ly +++ b/mourning-into-dancing.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 "Mourning Into Dancing" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Tommy Walker" } 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) @@ -36,8 +32,9 @@ hn = #(define-music-function (parser location arg) (ly:music?) % Global = { + \clef F \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 \once \override TextScript #'padding = #2.0 @@ -47,11 +44,8 @@ Global = % Intro -%\clef f -% s1*3 -% s2. -%\clef g - s1*4 \bar "||:" % 1-4 + s1*3 + s2. \clef G s4 \bar ".|:-||" % 1-4 \repeat volta 2 { @@ -82,7 +76,7 @@ Global = \mark \markup { \override #'(font-family . sans) { \box { C } } } - s1*8 \bar "||:" % 31-38 + s1*8 \bar ".|:-||" % 31-38 \repeat volta 2 { @@ -106,18 +100,12 @@ Global = % LeadVox = \relative c' { -% \set Staff.instrument = #"Lead vox" - \clef F - \override Staff.TimeSignature #'style = #'() -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro s1 | % 1 s1 | % 2 s1 | % 3 - s2. \clef G e8 g | % 4 + s2. e8 g | % 4 % Verse @@ -219,10 +207,6 @@ LeadVoxText = \lyricmode Riffs = \relative c { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -325,17 +309,11 @@ 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 - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 @@ -421,35 +399,35 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff + \context Staff + << + \new Voice = "lead" \LeadVox + \new Voice \Riffs + \new Lyrics \lyricsto "lead" \LeadVoxText + >> + + \new ChoirStaff << \new ChordNames \Chords %Capo 4 edition % \new ChordNames \transpose b g \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> - - \new Staff - << - \Global % The "roadmap" that everything else depends on - \new Voice = "lead" \LeadVox - \new Voice \Riffs - \new Lyrics \lyricsto "lead" \LeadVoxText - >> >> } \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 @@ -460,6 +438,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) } + diff --git a/my-redeemer-lives.ly b/my-redeemer-lives.ly index 3b22c6a..829c845 100644 --- a/my-redeemer-lives.ly +++ b/my-redeemer-lives.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) @@ -10,8 +10,6 @@ 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 "My Redeemer Lives" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Reuben Morgan" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Drippin’ Soul" } @@ -20,89 +18,116 @@ staffSize = #18 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \repeat volta 2 { - R1 | % 1 - R1 | % 2 + s1*2 | % 1-2 } \repeat volta 3 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - r4 gs gs4. fs8 | % 3 - fs8 e cs e ~ e4 r | % 4 - r4 gs gs4. fs8 | % 5 - fs8 e cs e ~ e e fs gs ~ ( | % 6 - gs2 ~ gs4. ~ gs16 fs | % 7 - e4 ) r r8 a a a ( | % 8 - gs4 ) r r2 | % 9 - R1 | % 10 - r4 gs gs4. fs8 | % 11 - fs8 e cs e ~ e4 r | % 12 - r4 gs gs4. fs8 | % 13 - fs8 e cs e ~ e e fs gs ~ ( | % 14 - gs2 ~ gs4. ~ gs16 fs | % 15 - e4 ) r r8 a a a ( | % 16 - gs4 ) r r2 | % 17 - R1 \bar "||" % 18 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*16 \bar "||" % 3-18 % Prechorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - r4 fs fs e8 fs ~ | % 19 - fs8 gs4. r2 | % 20 - r8 e a4 a r8 a8 | % 21 - a8 gs a8 b ~ b r gs b \bar "||" % 22 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*4 \bar "||" % 19-22 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - b2 gs4. e8 ~ | % 23 - e4 r r gs8 b | % 24 - b2 gs4. a16 ( gs | % 25 - fs4 ) r r gs8 b | % 26 - b2 gs4. e8 ~ | % 27 - e4 r r gs8 b | % 28 + s1*6 | % 23-28 } \alternative { { - b2 gs4. a16 ( gs | % 29 - fs2. ) r4 | % 30 + s1*2 | % 29-30 } { - b2 gs4. a16 ( gs | % 31 - fs2. ) r4^\markup { \hspace #0.0 \raise #0.6 { D.S. } } \bar "||" % 32 + s1 | % 31 + s2. s4^\markup { \hspace #0.0 \raise #0.6 { D.S. } } \bar "||" % 32 } { - b2 gs4. a16 ( gs | % 33 - fs2. ) r4 | % 34 + s1*2 | % 33-34 } } - r1-\fermata \bar "|." % 35 + s1 \bar "|." % 35 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + R1 | % 1 + R1 | % 2 + + % Verse + + r4 gs gs4. fs8 | % 3 + fs8 e cs e ~ e4 r | % 4 + r4 gs gs4. fs8 | % 5 + fs8 e cs e ~ e e fs gs ~ ( | % 6 + gs2 ~ gs4. ~ gs16 fs | % 7 + e4 ) r r8 a a a ( | % 8 + gs4 ) r r2 | % 9 + R1 | % 10 + r4 gs gs4. fs8 | % 11 + fs8 e cs e ~ e4 r | % 12 + r4 gs gs4. fs8 | % 13 + fs8 e cs e ~ e e fs gs ~ ( | % 14 + gs2 ~ gs4. ~ gs16 fs | % 15 + e4 ) r r8 a a a ( | % 16 + gs4 ) r r2 | % 17 + R1 | % 18 + + % Prechorus + + r4 fs fs e8 fs ~ | % 19 + fs8 gs4. r2 | % 20 + r8 e a4 a r8 a8 | % 21 + a8 gs a8 b ~ b r gs b | % 22 + + % Chorus + + b2 gs4. e8 ~ | % 23 + e4 r r gs8 b | % 24 + b2 gs4. a16 ( gs | % 25 + fs4 ) r r gs8 b | % 26 + b2 gs4. e8 ~ | % 27 + e4 r r gs8 b | % 28 + + b2 gs4. a16 ( gs | % 29 + fs2. ) r4 | % 30 + + b2 gs4. a16 ( gs | % 31 + fs2. ) r4 | % 32 + + b2 gs4. a16 ( gs | % 33 + fs2. ) r4 | % 34 + + r1-\fermata | % 35 } + LeadVoxText = \lyricmode { I know he res -- cued my soul, __ _ @@ -134,15 +159,8 @@ LeadVoxText = \lyricmode % % Riff/rhythm figures % - Riffs = \relative c'' { - \clef G - \key e \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro %{ @@ -186,74 +204,56 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Needed??? - \override SeparatingGroupSpanner #'padding = #'2.0 -% Bah, can't we set this globally? -% \popChords - % Intro - \repeat volta 2 - { - e1:7 | % 1 - a1:7 | % 2 - } - - \repeat volta 3 - { - % Verse - - e1:7 | % 3 - a1 | % 4 - e1:7 | % 5 - a1 | % 6 - e1:7 | % 7 - a1:7 | % 8 - e1:7 | % 9 - a1:7 | % 10 - e1:7 | % 11 - a1 | % 12 - e1:7 | % 13 - a1 | % 14 - e1:7 | % 15 - a1:7 | % 16 - e1:7 | % 17 - a1:7 | % 18 - - % Prechorus - - b1:sus4 | % 19 - s1 | % 20 - a1 | % 21 - a1/b | % 22 - - % Chorus - - e1 | % 23 - a1 | % 24 - cs1:m7 | % 25 - b1:sus4 | % 26 - e1 | % 27 - a1 | % 28 - } - \alternative - { - { - cs1:m7 | % 29 - b1:sus4 | % 30 - } - { - cs1:m7 | % 31 - b1:sus4 | % 32 - } - { - cs1:m7 | % 33 - b1:sus4 | % 34 - } - } + e1:7 | % 1 + a1:7 | % 2 + + % Verse + + e1:7 | % 3 + a1 | % 4 + e1:7 | % 5 + a1 | % 6 + e1:7 | % 7 + a1:7 | % 8 + e1:7 | % 9 + a1:7 | % 10 + e1:7 | % 11 + a1 | % 12 + e1:7 | % 13 + a1 | % 14 + e1:7 | % 15 + a1:7 | % 16 + e1:7 | % 17 + a1:7 | % 18 + + % Prechorus + + b1:sus4 | % 19 + s1 | % 20 + a1 | % 21 + a1/b | % 22 + + % Chorus + + e1 | % 23 + a1 | % 24 + cs1:m7 | % 25 + b1:sus4 | % 26 + e1 | % 27 + a1 | % 28 + + cs1:m7 | % 29 + b1:sus4 | % 30 + + cs1:m7 | % 31 + b1:sus4 | % 32 + + cs1:m7 | % 33 + b1:sus4 | % 34 e1:^3 | % 35 } @@ -262,80 +262,62 @@ 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \repeat volta 2 - { - c4 c c c | % 1 - c4 c c c | % 2 - } - - \repeat volta 3 - { - % Verse - - c4 c c c | % 3 - c4 c c c | % 4 - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c \bar "||" % 18 - - % Prechorus - - c4 c c c | % 19 - c4 c c c | % 20 - c4 c c c | % 21 - c4 c c c \bar "||" % 22 - - % Chorus - - c4 c c c | % 23 - c4 c c c | % 24 - c4 c c c | % 25 - c4 c c c | % 26 - c4 c c c | % 27 - c4 c c c | % 28 - } - \alternative - { - { - c4 c c c | % 29 - c4 c c c | % 30 - } - { - c4 c c c | % 31 - c4 c c c | % 32 - } - { - c4 c c c | % 33 - c4 c c c | % 34 - } - } - - c1-\fermata \bar "|." % 35 + c4 c c c | % 1 + c4 c c c | % 2 + + % Verse + + c4 c c c | % 3 + c4 c c c | % 4 + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + + % Prechorus + + c4 c c c | % 19 + c4 c c c | % 20 + c4 c c c | % 21 + c4 c c c | % 22 + + % Chorus + + c4 c c c | % 23 + c4 c c c | % 24 + c4 c c c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + c4 c c c | % 28 + + c4 c c c | % 29 + c4 c c c | % 30 + + c4 c c c | % 31 + c4 c c c | % 32 + + c4 c c c | % 33 + c4 c c c | % 34 + + c1-\fermata | % 35 } @@ -354,16 +336,19 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> - \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 @@ -381,9 +366,20 @@ 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))) + +% 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 } + diff --git a/no-higher-calling.ly b/no-higher-calling.ly index aba36b6..88df9c2 100644 --- a/no-higher-calling.ly +++ b/no-higher-calling.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) @@ -10,139 +10,156 @@ 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 "No Higher Calling" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.8" + 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.instrumentName = #"Lead vox" \clef G \key bf \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f \repeat volta 2 { % Intro -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \small "Light half-time feel" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \small "Light half-time feel" } - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 + s1*4 | % 1-4 } % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - f2. d8 f | % 5 - a2 bf4. g8 ~ | % 6 - g2. f8 ef | % 7 - d2 c4. ( d8 ) | % 8 - d2 r4 d8 f | % 9 - a2 bf4. g8 ~ | % 10 - g2. g4 | % 11 - gf2 f4. f8 ~ | % 12 - f2. f4 | % 13 - gf2 af4. ( bf8 ) | % 14 - bf1 ~ | % 15 - bf2 r | % 16 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*12 | % 5-16 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - f2. d8 f | % 17 - a2 bf4. g8 ~ | % 18 - g2. f8 ef | % 19 - d2 c4. ( d8 ) | % 20 - d2 r4 d8 f | % 21 - a2 bf4. g8 ~ | % 22 - g2. g4 | % 23 - gf2 f4. f8 ~ | % 24 - f2. f4 | % 25 - gf2 af4. ( bf8 ) | % 26 - bf1 ~ | % 27 - bf2. 8 \bar "||" % 28 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*12 \bar "||" % 17-28 % Chorus -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - - 2. 8 | % 29 - 4. ( 8 ) 2 | % 30 - 2. 8 | % 31 - 4. ( 8 ) 4 8 | % 32 - 2. 4 | % 33 - 4 8 ~ 4 8 ~ | % 34 - 1 | % 35 - r2 r4 8 | % 36 - 2. 8 | % 37 - 4. 8 ~ 4. 8 | % 38 - 2. 8 | % 39 - 4. 8 ~ 4 bf | % 40 - bf2. bf4 | % 41 - bf4 a8 g ~ g a ~ a4 | % 42 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { C } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + + s1*14 | % 29-42 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } } \alternative { { - \voiceTwo - bf1 | % 43 - \oneVoice - s1 | % 44 - s1 | % 45 - s1 | % 46 + s1*4 | % 43-46 } { - bf1 | % 47 + s1 | % 47 } } - r2 r4 8 \bar "||" % 48 + s1 \bar "||" % 48 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. al Coda } } + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. al Coda } } % Coda -\stopStaff s1 \startStaff | +\stopStaff s1 \startStaff \set Score.currentBarNumber = #49 -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + s1*9 \bar "|." % 49-57 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s1 | % 1 + s1 | % 2 + s1 | % 3 + s1 | % 4 + + % Verse + + f2. d8 f | % 5 + a2 bf4. g8 ~ | % 6 + g2. f8 ef | % 7 + d2 c4. ( d8 ) | % 8 + d2 r4 d8 f | % 9 + a2 bf4. g8 ~ | % 10 + g2. g4 | % 11 + gf2 f4. f8 ~ | % 12 + f2. f4 | % 13 + gf2 af4. ( bf8 ) | % 14 + bf1 ~ | % 15 + bf2 r | % 16 + + % Verse + + f2. d8 f | % 17 + a2 bf4. g8 ~ | % 18 + g2. f8 ef | % 19 + d2 c4. ( d8 ) | % 20 + d2 r4 d8 f | % 21 + a2 bf4. g8 ~ | % 22 + g2. g4 | % 23 + gf2 f4. f8 ~ | % 24 + f2. f4 | % 25 + gf2 af4. ( bf8 ) | % 26 + bf1 ~ | % 27 + bf2. 8 \bar "||" % 28 + + % Chorus + + 2. 8 | % 29 + 4. ( 8 ) 2 | % 30 + 2. 8 | % 31 + 4. ( 8 ) 4 8 | % 32 + 2. 4 | % 33 + 4 8 ~ 4 8 ~ | % 34 + 1 | % 35 + r2 r4 8 | % 36 + 2. 8 | % 37 + 4. 8 ~ 4. 8 | % 38 + 2. 8 | % 39 + 4. 8 ~ 4 bf | % 40 + bf2. bf4 | % 41 + bf4 a8 g ~ g a ~ a4 | % 42 + + \voiceTwo bf1 \oneVoice | % 43 + s1*3 | % 44-46 + + bf1 | % 47 + + r2 r4 8 | % 48 + + % Coda + + s1 % extra bar for coda bf2 s | % 49 - s1 | % 50 - s1 | % 51 - s1 | % 52 - s1 | % 53 - s1 | % 54 - s1 | % 55 - s1 | % 56 - s1 \bar "|." % 57 + s1*8 | % 50-57 } + LeadVoxText = \lyricmode { Down at your feet, O Lord, _ @@ -173,12 +190,6 @@ LeadVoxText = \lyricmode Riffs = \relative c' { - \clef G - \key bf \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - \tiny r2 r8 d f bf | % 1 bf4. af8 ~ af4. af8 | % 2 @@ -187,9 +198,7 @@ Riffs = \relative c' s1*38 | % 5-42 - \voiceOne - r2 r8 d f bf | % 43 - \oneVoice + \voiceOne r2 r8 d f bf \oneVoice | % 43 bf4. af8 ~ af4. af8 | % 44 af4. g8 ~ g4. f8 | % 45 f1 | % 46 @@ -204,28 +213,21 @@ Riffs = \relative c' bf4. af8 ~ af4. af8 | % 54 af4. g8 ~ g4. f8 | % 55 f1 | % 56 - r1-\fermata \bar "|." % 57 + r1-\fermata | % 57 } % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - - \repeat volta 2 - { - % Intro + % Intro - bf1 | % 1 - af4.:6.9 af8:sus2 s2 | % 2 - af4./ef ef8 s2 | % 3 - f2:sus4 f | % 4 - } + bf1 | % 1 + af4.:6.9 af8:sus2 s2 | % 2 + af4./ef ef8 s2 | % 3 + f2:sus4 f | % 4 % Verse @@ -242,52 +244,44 @@ Chords = \chordmode bf1:sus2 | % 15 bf2 ef/f | % 16 - \repeat volta 2 - { - % Verse - - bf1 | % 17 - f2/d bf/d | % 18 - ef1 | % 19 - bf2/f f | % 20 - bf1 | % 21 - f2/g g:m7 | % 22 - ef1 | % 23 - ef2:m af:sus2 | % 24 - bf1 | % 25 - gf2:6 af:sus2 | % 26 - bf1 | % 27 - bf1:sus2/d | % 28 - - % Chorus + % Verse - ef1 | % 29 - g2:m7 f | % 30 - d1:m7 | % 31 - f2/g g:m7 | % 32 - c1:m7 | % 33 - ef2/f f | % 34 - bf1 | % 35 - bf1/d | % 36 - ef1 | % 37 - g2:m7 f | % 38 - d1:7/fs | % 39 - c2:m/g g:m7 | % 40 - ef1 | % 41 - bf4./f ef4/f f4. | % 42 - } - \alternative - { - { - bf1 | % 43 - af4.:6.9 af8:sus2 s2 | % 44 - af4./ef ef8 s2 | % 45 - f2:sus4 f | % 46 - } - { - bf1 | % 47 - } - } + bf1 | % 17 + f2/d bf/d | % 18 + ef1 | % 19 + bf2/f f | % 20 + bf1 | % 21 + f2/g g:m7 | % 22 + ef1 | % 23 + ef2:m af:sus2 | % 24 + bf1 | % 25 + gf2:6 af:sus2 | % 26 + bf1 | % 27 + bf1:sus2/d | % 28 + + % Chorus + + ef1 | % 29 + g2:m7 f | % 30 + d1:m7 | % 31 + f2/g g:m7 | % 32 + c1:m7 | % 33 + ef2/f f | % 34 + bf1 | % 35 + bf1/d | % 36 + ef1 | % 37 + g2:m7 f | % 38 + d1:7/fs | % 39 + c2:m/g g:m7 | % 40 + ef1 | % 41 + bf4./f ef4/f f4. | % 42 + + bf1 | % 43 + af4.:6.9 af8:sus2 s2 | % 44 + af4./ef ef8 s2 | % 45 + f2:sus4 f | % 46 + + bf1 | % 47 bf1:sus2/d | % 48 @@ -310,27 +304,18 @@ s1 % % 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 - \repeat volta 2 - { - % Intro + % Intro - c4 c c c | % 1 - c4. c8 ~ c2 | % 2 - c4. c8 ~ c2 | % 3 - c4 c c c | % 4 - } + c4 c c c | % 1 + c4. c8 ~ c2 | % 2 + c4. c8 ~ c2 | % 3 + c4 c c c | % 4 % Verse @@ -347,59 +332,50 @@ StaffC = \relative c c4 c c c | % 15 c4 c c c | % 16 - \repeat volta 2 - { - % Verse - - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - c4 c c c | % 20 - c4 c c c | % 21 - c4 c c c | % 22 - c4 c c c | % 23 - c4 c c c | % 24 - c4 c c c | % 25 - c4 c c c | % 26 - c4 c c c | % 27 - c4 c c c \bar "||" % 28 - - % Chorus - - c4 c c c | % 29 - c4 c c c | % 30 - c4 c c c | % 31 - c4 c c c | % 32 - c4 c c c | % 33 - c4 c c c | % 34 - c4 c c c | % 35 - c4 c c c | % 36 - c4 c c c | % 37 - c4 c c c | % 38 - c4 c c c | % 39 - c4 c c c | % 40 - c4 c c c | % 41 - c4. c8 ~ c c4. | % 42 - } - \alternative - { - { - c4 c c c | % 43 - c4. c8 ~ c2 | % 44 - c4. c8 ~ c2 | % 45 - c4 c c c | % 46 - } - { - c4 c c c | % 47 - } - } + % Verse - c4 c c c \bar "||" % 48 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c c c | % 20 + c4 c c c | % 21 + c4 c c c | % 22 + c4 c c c | % 23 + c4 c c c | % 24 + c4 c c c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + c4 c c c \bar "||" % 28 + + % Chorus + + c4 c c c | % 29 + c4 c c c | % 30 + c4 c c c | % 31 + c4 c c c | % 32 + c4 c c c | % 33 + c4 c c c | % 34 + c4 c c c | % 35 + c4 c c c | % 36 + c4 c c c | % 37 + c4 c c c | % 38 + c4 c c c | % 39 + c4 c c c | % 40 + c4 c c c | % 41 + c4. c8 ~ c c4. | % 42 + + c4 c c c | % 43 + c4. c8 ~ c2 | % 44 + c4. c8 ~ c2 | % 45 + c4 c c c | % 46 + + c4 c c c | % 47 + + c4 c c c | % 48 % Coda \stopStaff s1 \startStaff | -\set Score.currentBarNumber = #49 c4 c c c | % 49 c4. c8 ~ c2 | % 50 @@ -409,7 +385,7 @@ StaffC = \relative c c4. c8 ~ c2 | % 54 c4. c8 ~ c2 | % 55 c4 c c c | % 56 - c1-\fermata \bar "|." % 57 + c1-\fermata | % 57 } @@ -428,38 +404,43 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> - \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 } + diff --git a/nothing-but-the-blood.ly b/nothing-but-the-blood.ly index e771867..7e29212 100644 --- a/nothing-but-the-blood.ly +++ b/nothing-but-the-blood.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) @@ -10,173 +10,122 @@ 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 "Nothing But The Blood" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Roger Freeland" } - tagline = "Engraved by JLH and Lilypond 2.8.2" + 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.instrumentName = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro/midtro - R1^\markup { \hspace #0.0 \raise #1.0 { Moderate folk-rock } } | % 1 - R1 | % 2 - R1 | % 3 - R1 | % 4 + s1^\markup { \hspace #0.0 \raise #1.0 { Moderate folk-rock } } | % 1 + s1*3 \bar ".|:-||" % 2-4 \repeat volta 3 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - f4 f f g | % 5 - a4 c a2 | % 6 - f8 [ f f g ] a4 a | % 7 - g4. ( f8 ) f4 r | % 8 - f4 f f g | % 9 - a4 c a2 | % 10 - f8 [ f f g ] a4 a | % 11 - g4. ( f8 ) f4 r \bar "||" % 12 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 5-12 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - -% Bah, some ppl don't like syncopation -%{ - c'4. a8 ~ a g4 a8 ~ | % 13 - a4 c8 [ a ] ~ a4 r | % 14 - g4. g8 ~ g8 f4 g8 ~ | % 15 - g8 g4 a8 ( \stemUp c4 ) \stemNeutral r | % 16 - c4. a8 ~ a g4 a8 ~ | % 17 - a8 c4 a8 ~ a4 r | % 18 - f8 [ f f g ] a4 a | % 19 - g4. ( f8 ) f4 r | % 20 -%} -% Straight as a stretched out wire... :-( - c'2 a4 g | % 13 - a4 c a r | % 14 - g2 g4 f | % 15 - g4 g a ( \stemUp c ) \stemNeutral | % 16 - c2 a4 g | % 17 - a4 c a r | % 18 - f8 [ f f g ] a4 a | % 19 -% g4. ( f8 ) f4 r | % 20 - g2.. ( f8 ) | % 20 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*8 | % 13-20 } \alternative { { - f4 r r2 | % 21 - R1 | % 22 - R1 | % 23 - R1 | % 24 + s1*4 | % 21-24 } { - f4 r r2 | % 25 + s1 | % 25 } } - R1 | % 26 + s1 | % 26 % Outro \repeat volta 2 { -\mark \markup { \override #'(font-family . sans) { \box { C } } } - - f8 [ f f g ] a4 a | % 27 - g4. ( f8 ) f4 r | % 28 - f8 [ f f g ] a4 a | % 29 - g4. ( f8 ) f4 r | % 30 + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*4 | % 27-30 } % Ending - R1 | % 31 - R1 \bar "|." % 32 + s1*2 \bar "|." % 31-32 } -% This isn't the hymnal melody, but I like it. So there! :-P -LeadVoxAlt = \relative c'' + +% +% Lead vocal +% +LeadVox = \relative c' { \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" - \clef G - \key f \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - \repeat volta 3 - { - % Intro/midtro + % Intro/midtro - R1^\markup { Moderate folk-rock } | % 1 - R1 | % 2 - R1 | % 3 - R1 \bar "||" % 4 + R1*4 | % 1-4 - % Verse + % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - c4 a8 [ a ] ~ a4 g8 [ a ] ~ | % 5 - a4 c8 [ c ] ~ c2 | % 6 - f,8 [ f f g ] a4 f | % 7 - g4. a8 ~ a4 r | % 8 - c4 a8 [ a ] ~ a4 g8 [ a ] ~ | % 9 - a4 c8 [ c ] ~ c2 | % 10 - f,8 [ f f g ] a4 f | % 11 - g4. f8 ~ f4 r \bar "||" % 12 + f4 f f g | % 5 + a4 c a2 | % 6 + f8 [ f f g ] a4 a | % 7 + g4. ( f8 ) f4 r | % 8 + f4 f f g | % 9 + a4 c a2 | % 10 + f8 [ f f g ] a4 a | % 11 + g4. ( f8 ) f4 r \bar "||" % 12 - % Chorus + % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - c'4. a8 ~ a g4 a8 ~ | % 13 - a4 c8 [ c ] ~ c4 r | % 14 - d4. f8 ~ f8 d4 d8 ~ | % 15 - d8 c4 c8 ~ c4 r | % 16 - c4. a8 ~ a g4 a8 ~ | % 17 - a8 c4 c8 ~ c4 r | % 18 - f,8 [ f f g ] a4 f | % 19 - g4. f8 ~ f4 r | % 20 - } + c'2 a4 g | % 13 + a4 c a r | % 14 + g2 g4 f | % 15 + g4 g a ( \stemUp c ) \stemNeutral | % 16 + c2 a4 g | % 17 + a4 c a r | % 18 + f8 [ f f g ] a4 a | % 19 + g2.. ( f8 ) | % 20 - % Outro + f4 r r2 | % 21 + R1 | % 22 + R1 | % 23 + R1 | % 24 - \repeat volta 2 - { -\mark \markup { \override #'(font-family . sans) { \box { C } } } + f4 r r2 | % 25 - f8 [ f f g ] a4 f | % 21 - g4. a8 ~ a4 r | % 22 - f8 [ f f g ] a4 f | % 23 - g4. f8 ~ f4 r | % 24 - } + R1 | % 26 + + % Outro + + f8 [ f f g ] a4 a | % 27 + g4. ( f8 ) f4 r | % 28 + f8 [ f f g ] a4 a | % 29 + g4. ( f8 ) f4 r | % 30 % Ending - R1 | % 25 - R1 \bar "|." % 26 + R1 | % 31 + R1 | % 32 } + LeadVoxText = \lyricmode { What can wash a- way my sin? @@ -184,14 +133,6 @@ LeadVoxText = \lyricmode What can make me whole a- gain? No- thing but the blood of Je- _ sus. -% Bah, some ppl don't like syncopation... -%{ - Oh, pre- _ cious is _ the flow _ - That makes _ me white _ as snow; _ - No o- _ ther fount _ I know, _ - No- thing but the blood of Je- _ sus. -%} -% Straight as a stretched out wire... :-( Oh, pre- cious is the flow That makes me white as snow; _ No o- ther fount I know, @@ -248,10 +189,10 @@ LeadVoxTextAltC = \lyricmode This is all _ my right- _ eous- _ ness, } + % % Chord names % - Chords = \chordmode { % Intro/midtro @@ -261,54 +202,43 @@ Chords = \chordmode f4./a bf2:sus2 s8 | % 3 c4.:^3 d2:m7 s8 | % 4 - \repeat volta 3 - { - % Verse + % Verse - f4./a bf2:sus2 s8 | % 5 - c4.:^3 d2:m7 s8 | % 6 - f4./a bf2:sus2 s8 | % 7 - c4.:^3 d2:m7 s8 | % 8 - f4./a bf2:sus2 s8 | % 9 - c4.:^3 d2:m7 s8 | % 10 - f4./a bf2:sus2 s8 | % 11 - c4.:^3 d2:m7 s8 | % 12 + f4./a bf2:sus2 s8 | % 5 + c4.:^3 d2:m7 s8 | % 6 + f4./a bf2:sus2 s8 | % 7 + c4.:^3 d2:m7 s8 | % 8 + f4./a bf2:sus2 s8 | % 9 + c4.:^3 d2:m7 s8 | % 10 + f4./a bf2:sus2 s8 | % 11 + c4.:^3 d2:m7 s8 | % 12 - % Chorus + % Chorus - f4. c2 s8 | % 13 - d4.:m7 f2 s8 | % 14 - bf4. f2/a s8 | % 15 - bf2 c | % 16 - f4./a bf2 s8 | % 17 - c4.:^3 d2:m7 s8 | % 18 - f4./a bf2 s8 | % 19 - c1:^3 | % 20 - } - \alternative - { - { - f4./a bf2:sus2 s8 | % 21 - c4.:^3 d2:m7 s8 | % 22 - f4./a bf2:sus2 s8 | % 23 - c4.:^3 d2:m7 s8 | % 24 - } - { - f4./a bf2:sus2 s8 | % 25 - } - } + f4. c2 s8 | % 13 + d4.:m7 f2 s8 | % 14 + bf4. f2/a s8 | % 15 + bf2 c | % 16 + f4./a bf2 s8 | % 17 + c4.:^3 d2:m7 s8 | % 18 + f4./a bf2 s8 | % 19 + c1:^3 | % 20 + + f4./a bf2:sus2 s8 | % 21 + c4.:^3 d2:m7 s8 | % 22 + f4./a bf2:sus2 s8 | % 23 + c4.:^3 d2:m7 s8 | % 24 + + f4./a bf2:sus2 s8 | % 25 c4.:^3 d2:m7 s8 | % 26 % Outro - \repeat volta 2 - { - f4./a bf2:sus2 s8 | % 27 - c4.:^3 d2:m7 s8 | % 28 - f4./a bf2:sus2 s8 | % 29 - c4.:^3 d2:m7 s8 | % 30 - } + f4./a bf2:sus2 s8 | % 27 + c4.:^3 d2:m7 s8 | % 28 + f4./a bf2:sus2 s8 | % 29 + c4.:^3 d2:m7 s8 | % 30 % Ending @@ -320,17 +250,11 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro/midtro @@ -339,96 +263,92 @@ StaffC = \relative c c4. c8 ~ c4 c | % 3 c4. c8 ~ c4 c | % 4 - \repeat volta 3 - { - % Verse + % Verse - c4. c8 ~ c4 c | % 5 - c4. c8 ~ c4 c | % 6 - c4. c8 ~ c4 c | % 7 - c4. c8 ~ c4 c | % 8 - c4. c8 ~ c4 c | % 9 - c4. c8 ~ c4 c | % 10 - c4. c8 ~ c4 c | % 11 - c4. c8 ~ c4 c | % 12 + c4. c8 ~ c4 c | % 5 + c4. c8 ~ c4 c | % 6 + c4. c8 ~ c4 c | % 7 + c4. c8 ~ c4 c | % 8 + c4. c8 ~ c4 c | % 9 + c4. c8 ~ c4 c | % 10 + c4. c8 ~ c4 c | % 11 + c4. c8 ~ c4 c | % 12 - % Chorus + % Chorus - c4. c8 ~ c4 c | % 13 - c4. c8 ~ c4 c | % 14 - c4. c8 ~ c4 c | % 15 - c4 c c c | % 16 - c4. c8 ~ c4 c | % 17 - c4. c8 ~ c4 c | % 18 - c4. c8 ~ c4 c | % 19 - c4 c c c | % 20 - } - \alternative - { - { - c4. c8 ~ c4 c | % 21 - c4. c8 ~ c4 c | % 22 - c4. c8 ~ c4 c | % 23 - c4. c8 ~ c4 c | % 24 - } - { - c4. c8 ~ c4 c | % 25 - } - } + c4. c8 ~ c4 c | % 13 + c4. c8 ~ c4 c | % 14 + c4. c8 ~ c4 c | % 15 + c4 c c c | % 16 + c4. c8 ~ c4 c | % 17 + c4. c8 ~ c4 c | % 18 + c4. c8 ~ c4 c | % 19 + c4 c c c | % 20 + + c4. c8 ~ c4 c | % 21 + c4. c8 ~ c4 c | % 22 + c4. c8 ~ c4 c | % 23 + c4. c8 ~ c4 c | % 24 + + c4. c8 ~ c4 c | % 25 c4. c8 ~ c4 c | % 26 % Outro - \repeat volta 2 - { - c4. c8 ~ c4 c | % 27 - c4. c8 ~ c4 c | % 28 - c4. c8 ~ c4 c | % 29 - c4. c8 ~ c4 c | % 30 - } + c4. c8 ~ c4 c | % 27 + c4. c8 ~ c4 c | % 28 + c4. c8 ~ c4 c | % 29 + c4. c8 ~ c4 c | % 30 % Ending c4._\markup { \italic { on cue } } c8 ~ c4 c | % 31 - c4. c8 ~ c2^\fermata \bar "|." % 32 + c4. c8 ~ c2^\fermata | % 32 } \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 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" - "JazzText" - "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 } + diff --git a/o-come-all-ye-faithful.ly b/o-come-all-ye-faithful.ly index 131f243..c4ea60d 100644 --- a/o-come-all-ye-faithful.ly +++ b/o-come-all-ye-faithful.ly @@ -1,49 +1,70 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(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 "O Come, All Ye Faithful" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" } - tagline = "Engraved by JLH and Lilypond 2.8.6" + 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.instrumentName = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \partial 4*1 s4 \bar "||" % 0 - s1 | % 1 - s1 | % 2 - s1 | % 3 - s2. f4 \bar "||" % 4 + s1*4 \bar "||" % 1-4 + + % Verse + + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*21 \bar "||" % 5-25 + + % Verse + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*14 | % 26-39 + +%\break %Bah, only valid for size 16!!! + + s1*6 \bar "||" % 40-45 % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*25 \bar "|." % 46-70 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s4 | % 0 + s1*3 | % 1-3 + s2. f4 | % 4 + + % Verse f2 c4 f | % 5 g2 c, | % 6 @@ -65,12 +86,10 @@ LeadVox = \relative c' e2 f4 ( bf ) | % 22 a2 ( g4. ) f8 | % 23 f1 ~ | % 24 - f1 \bar "||" % 25 + f1 | % 25 % Verse -\mark \markup { \override #'(font-family . sans) { \box { B } } } - f2 c4 f | % 26 g2 c, | % 27 a'4 g a bf | % 28 @@ -86,19 +105,17 @@ LeadVox = \relative c' f4 e f g | % 38 f2 c4 a' | % 39 -\break %Bah, only valid for size 16!!! +%\break %Bah, only valid for size 16!!! a4 g a bf | % 40 a2 g4 a | % 41 bf a g f | % 42 e2 f4 ( bf ) | % 43 a2 ( g4. ) f8 | % 44 - f1 \bar "||" % 45 + f1 | % 45 % Verse -\mark \markup { \override #'(font-family . sans) { \box { C } } } - f2 c4 f | % 46 g2 c, | % 47 a'4 g a bf | % 48 @@ -123,9 +140,10 @@ LeadVox = \relative c' e2 f4 ( bf ) | % 67 a1-> ( | % 68 g2. ) ~ g8 f | % 69 - f1^\fermata \bar "|." % 70 + f1^\fermata | % 70 } + LeadVoxText = \lyricmode { O come, all ye fai -- thful, @@ -165,16 +183,10 @@ LeadVoxText = \lyricmode Riffs = \relative c'' { - \clef G - \key f \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny - \partial 4*1 a4 | % 0 + a4 | % 0 bf4-> a-> g-> f-> | % 1 e2 f4 bf | % 2 a2 g4. f8 | % 3 @@ -186,15 +198,11 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \partial 4*1 d4:7/fs | % 0 + d4:7/fs | % 0 g4:m f/a g:m/bf g:7/b | % 1 c4 c/bf f/a bf:m/df | % 2 f2/c g4:m7/c c:9 | % 3 @@ -202,7 +210,7 @@ Chords = \chordmode % Verse - f1:5.9 | % 5 + f1:3.5.9 | % 5 g2:m7 c:sus4.7 | % 6 f4 c/e f c:7/g | % 7 f2/a g4:m7/c a:aug7/cs | % 8 @@ -280,25 +288,19 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \partial 4*1 c4 \bar "||" % 0 + c4 | % 0 c4 c c c | % 1 c4 c c c | % 2 c4 c c c | % 3 - c4 c c c \bar "||" % 4 + c4 c c c | % 4 % Verse @@ -322,7 +324,7 @@ StaffC = \relative c c4 c c c | % 22 c4 c c c | % 23 c4 c c c | % 24 - c4 c c c \bar "||" % 25 + c4 c c c | % 25 % Verse @@ -345,7 +347,7 @@ StaffC = \relative c c4 c c c | % 42 c4 c c c | % 43 c4 c c c | % 44 - c4 c c c \bar "||" % 45 + c4 c c c | % 45 % Verse @@ -373,7 +375,7 @@ StaffC = \relative c c4 c c c | % 67 c4 c c c | % 68 c4 c c c | % 69 - c1^\fermata \bar "|." % 70 + c1^\fermata | % 70 } @@ -414,39 +416,43 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText -% \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 } + diff --git a/o-come-o-come-emmanuel.ly b/o-come-o-come-emmanuel.ly index fd3f227..e760b62 100644 --- a/o-come-o-come-emmanuel.ly +++ b/o-come-o-come-emmanuel.ly @@ -1,9 +1,9 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #20 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -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 "O Come, O Come, Emmanuel" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Thomas Helmore" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -22,88 +20,108 @@ staffSize = #20 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key e \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro s1^\markup { \hspace #0.0 \raise #1.0 { Half time feel } } | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 - s1 | % 5 - s1 | % 6 - s1 | % 7 - s2. e4 | % 8 + s1*7 | % 2-8 \repeat volta 3 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - g4 b b b | % 9 - a4 ( c b ) a | % 10 - g2. a4 | % 11 - b4 g e g | % 12 - a4 ( fs e ) d | % 13 - e2. a4 | % 14 - a4 e e fs | % 15 - g2 ( fs4 ) e | % 16 - d2. g4 | % 17 - a4 b b b | % 18 - a4 ( c b ) a | % 19 - g2. d'4 \bar "||" % 20 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*12 \bar "||" % 9-20 % Chorus -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - d2. b4 | % 21 - b2. b4 | % 22 - a4 ( c b ) a | % 23 - g2. a4 | % 24 - b4 g e g | % 25 - a4 ( fs e ) d | % 26 -\break % Bleh. + s1*6 | % 21-26 } \alternative { { - e1 | % 27 - s1 | % 28 - s1 | % 29 - s2. e4 | % 30 + s1*4 | % 27-30 } { - e1 | % 31 - s1 | % 32 - s1 | % 33 - s2.^\markup { \hspace #5.0 \raise #1.0 { D.S. } } \stemUp d'4 \stemNeutral \bar "||" % 34 + s1*3 | % 31-33 + s2. s4^\markup { \hspace #0.0 \raise #0.6 { D.S. } } \bar "||" % 34 } { - e,1 | % 35 + s1 | % 35 } } - s2. a4 \bar "||" % 36 + s1 \bar "||" % 36 + + s1*3 \bar "|." % 37-39 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s1*7 | % 1-7 + s2. e4 | % 8 + + % Verse + + g4 b b b | % 9 + a4 ( c b ) a | % 10 + g2. a4 | % 11 + b4 g e g | % 12 + a4 ( fs e ) d | % 13 + e2. a4 | % 14 + a4 e e fs | % 15 + g2 ( fs4 ) e | % 16 + d2. g4 | % 17 + a4 b b b | % 18 + a4 ( c b ) a | % 19 + g2. d'4 | % 20 + + % Chorus + + d2. b4 | % 21 + b2. b4 | % 22 + a4 ( c b ) a | % 23 + g2. a4 | % 24 + b4 g e g | % 25 + a4 ( fs e ) d | % 26 + + e1 | % 27 + s1 | % 28 + s1 | % 29 + s2. e4 | % 30 + + e1 | % 31 + s1 | % 32 + s1 | % 33 + s2. \stemUp d'4 \stemNeutral | % 34 + + e,1 | % 35 + + s2. a4 | % 36 b4 g e g | % 37 a4 ( fs e ) d | % 38 - e1^\fermata \bar "|." % 39 + e1^\fermata | % 39 } + LeadVoxText = \lyricmode { O come, O come, Em -- ma -- _ _ nu -- el, @@ -136,12 +154,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { - \clef G - \key e \minor - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -170,52 +182,15 @@ Riffs = \relative c'' 2. s4 | % 36 \normalsize -%{ - % Intro - - \tiny - \repeat "percent" 3 % 1 - 6 - { - << { \tiny f16 c f, ~ f, c' f f8 e } \\ { \tiny f,,2 c'4 } >> | % 1 - << { \tiny f'16 c f, ~ f, c' f f8 e } \\ { \tiny bf,2 c4 } >> | % 2 - } - << s2. \\ { \tiny d2 c4 } >> | % 7 - << s2. \\ { \tiny bf2. } >> | % 8 - - s2.*7 - - \voiceOne - \repeat "percent" 6 { f''16 c f, ~ f, c' f f8 e | } % 16-21 - \oneVoice - - s2.*7 - - \voiceOne - \repeat "percent" 2 { f16 c f, f' ~ f f, c' f f8 e | } % 29-30 - \oneVoice - - \key g \major - - \voiceOne - \repeat "percent" 2 { g16 d g, g' ~ g g, d' g g8 fs | } % 31-32 - \oneVoice - - s2.*7 - - \voiceOne - \repeat "percent" 4 { g16 d g, g' ~ g g, d' g g8 fs | } % 40-43 - \oneVoice - \normalsize -%} } + RiffsBass = \relative c { \clef F \key e \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -252,12 +227,8 @@ RiffsBass = \relative c % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s1 | % 1 @@ -269,50 +240,41 @@ Chords = \chordmode s2.. b8:m11 | % 7 s1 | % 8 - \repeat volta 3 - { - % Verse - - e1:m7 | % 9 - a1:m9 | % 10 - e1:m7 | % 11 - c1:maj7 | % 12 - a2:m7 b:m7 | % 13 - e1:m7 | % 14 - a1:m9 | % 15 - e2:m7 d4/c c | % 16 - b1:m7 | % 17 - g2:maj7 e:m7 | % 18 - a2:m7 c:maj7/d | % 19 - g2:sus2 g | % 20 - - % Chorus - - d2. e4:m7 | % 21 - b1:m7 | % 22 - a2:m7 b:7.9-.13- | % 23 - e2.:m7 d4 | % 24 - c2:maj7 a:m7 | % 25 - fs:m7.5- b:m7 | % 26 - } - \alternative - { - { - s1 | % 27 - s1 | % 28 - s2.. b8:m11 | % 29 - s1 | % 30 - } - { - s1 | % 31 - s1 | % 32 - s2.. b8:m11 | % 33 - s1 | % 34 - } - { - s2.. b8:m11 | % 35 - } - } + % Verse + + e1:m7 | % 9 + a1:m9 | % 10 + e1:m7 | % 11 + c1:maj7 | % 12 + a2:m7 b:m7 | % 13 + e1:m7 | % 14 + a1:m9 | % 15 + e2:m7 d4/c c | % 16 + b1:m7 | % 17 + g2:maj7 e:m7 | % 18 + a2:m7 c:maj7/d | % 19 + g2:sus2 g | % 20 + + % Chorus + + d2. e4:m7 | % 21 + b1:m7 | % 22 + a2:m7 b:7.9-.13- | % 23 + e2.:m7 d4 | % 24 + c2:maj7 a:m7 | % 25 + fs:m7.5- b:m7 | % 26 + + s1 | % 27 + s1 | % 28 + s2.. b8:m11 | % 29 + s1 | % 30 + + s1 | % 31 + s1 | % 32 + s2.. b8:m11 | % 33 + s1 | % 34 + + s2.. b8:m11 | % 35 s1 | % 36 @@ -325,17 +287,11 @@ 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -348,56 +304,47 @@ StaffC = \relative c r2.. c8 ~ | % 7 c1 | % 8 - \repeat volta 3 - { - % Verse + % Verse - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - c4 c c c \bar "||" % 20 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c c c | % 20 - % Chorus + % Chorus - c4 c c c | % 21 - c4 c c c | % 22 - c4 c c c | % 23 - c4 c c c | % 24 - c4 c c c | % 25 - c4 c c c | % 26 - } - \alternative - { - { - r1 | % 27 - r1 | % 28 - r2.. c8 ~ | % 29 - c1 | % 30 - } - { - r1 | % 31 - r1 | % 32 - r2.. c8 ~ | % 33 - c8 c c c c c c c | % 34 - } - { - r2.. c8 ~ | % 35 - } - } + c4 c c c | % 21 + c4 c c c | % 22 + c4 c c c | % 23 + c4 c c c | % 24 + c4 c c c | % 25 + c4 c c c | % 26 - c1 \bar "||" % 36 + r1 | % 27 + r1 | % 28 + r2.. c8 ~ | % 29 + c1 | % 30 + + r1 | % 31 + r1 | % 32 + r2.. c8 ~ | % 33 + c8 c c c c c c c | % 34 + + r2.. c8 ~ | % 35 + + c1 | % 36 c2 c | % 37 c2 c | % 38 - c1^\fermata \bar "|." % 39 + c1^\fermata | % 39 } @@ -436,8 +383,12 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> @@ -446,10 +397,10 @@ Dynamics = \new Staff = leadStaffBass { \new Voice = "leadbass" \RiffsBass } >> - \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 @@ -459,50 +410,26 @@ Dynamics = \layout { \context { \Staff \RemoveEmptyStaves } - ragged-last-bottom = ##t - ragged-last = ##t } } -% Alternate score (for dorks) -%{ - << - \new ChoirStaff = "Rhythm" - << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> - >> - - << - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } - \new Lyrics \lyricsto "lead" \LeadVoxText - \new Lyrics \lyricsto "lead" \LeadVoxTextB - >> - - << - \new Staff = leadStaffBass { \new Voice = "leadbass" \RiffsBass } - >> - - \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 } + diff --git a/o-for-a-thousand-tongues.ly b/o-for-a-thousand-tongues.ly index a19962b..85a7cba 100644 --- a/o-for-a-thousand-tongues.ly +++ b/o-for-a-thousand-tongues.ly @@ -1,82 +1,115 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #18 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #20 #(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 "O For A Thousand Tongues" } -% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Twila Paris" } +% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.2" + 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.instrumentName = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - s2. | % 1 - s2. | % 2 - s2. | % 3 - s2. | % 4 - s2. | % 5 - s2. | % 6 - s2. | % 7 - r2 c4 \bar "||:" % 8 + s2.*8 \bar ".|:-||" % 1-8 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - f8 f g4 g | % 9 - a8 g f4 g | % 10 - a8 a bf4 a | % 11 - g4. r8 c4 | % 12 - c8 a a4 f | % 13 - f8 d d4 f8 ( d ) | % 14 - c8 f f4 g | % 15 - - \voiceTwo f2. | % 16 - s2. | % 17 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s2.*9 | % 9-17 } \alternative { { - s2. | % 18 - r2 c4 | % 19 + s2.*2 | % 18-19 } { s2. | % 20 } } - r2 c4 \oneVoice \bar "||" % 21 + s2. \bar "||" % 21 + + % Verse + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s2.*7 \bar "||" % 22-28 + + s2.*2 | % 29-30 + + \key g \major + + s2.*2 \bar "||" % 31-32 % Verse -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s2.*7 \bar "||" % 22-28 + + % Ending + + s2.^\markup { \hspace #0.0 \raise #3.0 \italic { Play figure throughout D } } | % 40 + s2.*3 | % 41-43 + + \repeat volta 2 + { + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s2.*8 | % 44-51 + } +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s2.*7 | % 1-7 + r2 c4 | % 8 + + % Verse + + f8 f g4 g | % 9 + a8 g f4 g | % 10 + a8 a bf4 a | % 11 + g4. r8 c4 | % 12 + c8 a a4 f | % 13 + f8 d d4 f8 ( d ) | % 14 + c8 f f4 g | % 15 + + \voiceTwo f2. | % 16 + s2. | % 17 + + s2. | % 18 + r2 c4 | % 19 + + s2. | % 20 + + r2 c4 \oneVoice | % 21 + + % Verse f8 f g4 g | % 22 a8 g f4 g | % 23 @@ -84,50 +117,42 @@ LeadVox = \relative c' g4. r8 c4 | % 25 c8 a a4 f | % 26 f8 d d4 f8 ( d ) | % 27 - c8 f f4 g \bar "||" % 28 + c8 f f4 g | % 28 \voiceTwo f2. | % 29 s2. | % 30 - \key g \major - s2. | % 31 - r2 d4 \oneVoice \bar "||" % 32 + r2 d4 \oneVoice | % 32 % Verse -\mark \markup { \override #'(font-family . sans) { \box { C } } } - g8 g a4 a | % 22 b8 a g4 a | % 23 b8 b c4 b | % 24 a4. r8 d4 | % 25 d8 b b4 g | % 26 g8 e e4 g8 ( e ) | % 27 - d8 g g4 a \bar "||" % 28 + d8 g g4 a | % 28 % Ending - \voiceTwo g2.^\markup { \hspace #0.0 \raise #3.0 \italic { Play figure throughout D } } | % 40 + \voiceTwo g2. | % 40 s2. | % 41 s2. | % 42 r2 d4 \oneVoice | % 43 - \repeat volta 2 - { -\mark \markup { \override #'(font-family . sans) { \box { D } } } - - g8 g16 a ( ~ a4. g8 ) | % 44 - g2 r4 | % 45 - r4 a4. g8 | % 46 - g2 d4 | % 47 - g8 g16 a ( ~ a4. g8 ) | % 48 - g2 r4 | % 49 - r4 a4. b8 | % 50 - g2^\fermata d4 | % 51 - } + g8 g16 a ( ~ a4. g8 ) | % 44 + g2 r4 | % 45 + r4 a4. g8 | % 46 + g2 d4 | % 47 + g8 g16 a ( ~ a4. g8 ) | % 48 + g2 r4 | % 49 + r4 a4. b8 | % 50 + g2^\fermata d4 | % 51 } + LeadVoxText = \lyricmode { O for a thou- sand tongues to sing @@ -163,12 +188,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { - \clef G - \key f \major - \override Staff.TimeSignature #'style = #'() - \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -210,12 +229,8 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro f2. | % 1 @@ -227,31 +242,23 @@ Chords = \chordmode d2.:m9 | % 7 bf2. | % 8 - \repeat volta 2 - { - % Verse + % Verse - f4 c2/e | % 9 - d8:m c bf2 | % 10 - f4/c bf/c f/c | % 11 - c2 c4/e | % 12 - f2 f4/a | % 13 - bf2 g4:m7 | % 14 - f4/c bf/c c | % 15 + f4 c2/e | % 9 + d8:m c bf2 | % 10 + f4/c bf/c f/c | % 11 + c2 c4/e | % 12 + f2 f4/a | % 13 + bf2 g4:m7 | % 14 + f4/c bf/c c | % 15 - f2. | % 16 - bf2. | % 17 - } - \alternative - { - { - f2. | % 18 - bf2. | % 19 - } - { - d2.:m9 | % 20 - } - } + f2. | % 16 + bf2. | % 17 + + f2. | % 18 + bf2. | % 19 + + d2.:m9 | % 20 bf2. | % 21 @@ -288,27 +295,22 @@ Chords = \chordmode e2.:m9 | % 42 c2. | % 43 - \repeat volta 2 - { - g2. | % 44 - c2. | % 45 - g2. | % 46 - c2. | % 47 - g2. | % 48 - c2. | % 49 - e2.:m9 | % 50 - c2. | % 51 - } + g2. | % 44 + c2. | % 45 + g2. | % 46 + c2. | % 47 + g2. | % 48 + c2. | % 49 + e2.:m9 | % 50 + c2. | % 51 } + % % Alternate chord changes (2nd verse) % ChordsSup = \chordmode { -%Bah, can't we set this globally? - \popChords - % Intro s2.*8 | % 1-8 @@ -321,20 +323,15 @@ ChordsSup = \chordmode c2:sus4 c4 | % 12 } + % % 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 3/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -345,35 +342,27 @@ StaffC = \relative c c4 c c | % 5 c4 c c | % 6 c4 c c | % 7 - c4 c c \bar "||:" % 8 + c4 c c | % 8 - \repeat volta 2 - { - % Verse + % Verse - c4 c2 | % 9 - c8 c c4 c | % 10 - c4 c c | % 11 - c4 c c-> | % 12 - c4 c c | % 13 - c4 c c | % 14 - c4 c c | % 15 + c4 c2 | % 9 + c8 c c4 c | % 10 + c4 c c | % 11 + c4 c c-> | % 12 + c4 c c | % 13 + c4 c c | % 14 + c4 c c | % 15 - c4 c c | % 16 - c4 c c | % 17 - } - \alternative - { - { - c4 c c | % 18 - c4 c c | % 19 - } - { - c4 c c | % 20 - } - } + c4 c c | % 16 + c4 c c | % 17 + + c4 c c | % 18 + c4 c c | % 19 + + c4 c c | % 20 - c4 c c \bar "||" % 21 + c4 c c | % 21 % Verse @@ -383,13 +372,13 @@ StaffC = \relative c c2 c4-> | % 25 c4-> c-> c | % 26 c4 c c | % 27 - c4 c c \bar "||" % 28 + c4 c c | % 28 c4 c c | % 29 c4 c c | % 30 c4 c c | % 31 - c4 c c \bar "||" % 32 + c4 c c | % 32 % Verse @@ -399,7 +388,7 @@ StaffC = \relative c c4 c c | % 36 c4 c c | % 37 c4 c c | % 38 - c4 c c \bar "||" % 39 + c4 c c | % 39 % Ending @@ -408,17 +397,14 @@ StaffC = \relative c c4 c c | % 42 c4 c c | % 43 - \repeat volta 2 - { - c4 c c | % 44 - c4 c c | % 45 - c4 c c | % 46 - c4 c c | % 47 - c4 c c | % 48 - c4 c c | % 49 - c4 c c | % 50 - c4^\fermata c c | % 51 - } + c4 c c | % 44 + c4 c c | % 45 + c4 c c | % 46 + c4 c c | % 47 + c4 c c | % 48 + c4 c c | % 49 + c4 c c | % 50 + c4^\fermata c c | % 51 } @@ -438,40 +424,45 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new ChordNames = "chords2" \ChordsSup - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords + \new ChordNames \ChordsSup + \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 } + diff --git a/o-holy-night.ly b/o-holy-night.ly index eab3b7d..7286cea 100644 --- a/o-holy-night.ly +++ b/o-holy-night.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 "O Holy Night" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } 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-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 = { \key bf \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % \once \override TextScript #'padding = #2.0 @@ -47,7 +43,7 @@ Global = % Intro - s1*2 \bar "||:" % 1-2 + s1*2 \bar ".|:-||" % 1-2 \repeat volta 2 { @@ -116,11 +112,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 \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro @@ -246,9 +237,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f \set tupletSpannerDuration = #(ly:make-moment 1 4) % Intro @@ -261,7 +249,7 @@ Riffs = \relative c s1*4 | % 5-8 s2 | % 9 s1*18 | % 10-27 - \times 2/3 { r8 f bf c bf f ~ f f bf c bf f' ~ } | % 28 + \times 2/3 { r8 f, bf c bf f ~ f f bf c bf f' ~ } | % 28 \times 2/3 { f8 f, bf c bf f ~ f f bf c bf f' } | % 29 \normalsize } @@ -274,18 +262,18 @@ Chords = \chordmode { % Intro - bf1:5.9 | % 1 + bf1:3.5.9 | % 1 s1 | % 2 % Verse - bf1:5.9 | % 3 - ef2:5.9 | % 4 - bf1:5.9 | % 5 + bf1:3.5.9 | % 3 + ef2:3.5.9 | % 4 + bf1:3.5.9 | % 5 s2 ef4/f f:7 | % 6 - bf1:5.9 | % 7 - bf1:5.9 | % 8 - ef4:5.9 ef/f | % 9 + bf1:3.5.9 | % 7 + bf1:3.5.9 | % 8 + ef4:3.5.9 ef/f | % 9 g1:m11 | % 10 d2:m7 g4:m9 a:7.9- | % 11 d1:m7 | % 12 @@ -301,48 +289,42 @@ Chords = \chordmode g1:m11 | % 20 bf2/f f/ef | % 21 - bf2/d ef:5.9 | % 22 + bf2/d ef:3.5.9 | % 22 bf2/f ef4/f f:7 | % 23 - bf1:5.9 | % 24 + bf1:3.5.9 | % 24 f2 f/ef | % 25 - bf2/d ef:5.9 | % 26 + bf2/d ef:3.5.9 | % 26 bf2/f ef/f | % 27 - bf1:5.9 | % 28 + bf1:3.5.9 | % 28 s1 | % 29 - bf1:5.9 | % 30 + bf1:3.5.9 | % 30 % Coda s1 % Placeholder for blank measure between end and Coda f2 f/ef | % 31 - bf2/d ef:5.9 | % 32 + bf2/d ef:3.5.9 | % 32 bf/f ef/f | % 33 - bf1:5.9 | % 34 - ef1:5.9 | % 35 - bf1:5.9 | % 36 - ef1:5.9 | % 37 - bf1:5.9 | % 38 + bf1:3.5.9 | % 34 + ef1:3.5.9 | % 35 + bf1:3.5.9 | % 36 + ef1:3.5.9 | % 37 + bf1:3.5.9 | % 38 } % % 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 - -%Not small enough... +%Not small enough... (?) \teeny % \magnify #0.3 @@ -389,7 +371,7 @@ Rhythm = \relative c % Coda - s1 % Placeholder for blank measure between end and Coda +\stopStaff s1 \startStaff % Placeholder for blank measure between end and Coda c4 c c c | % 31 c4 c c2 | % 32 @@ -417,36 +399,36 @@ 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 >> + >> >> } \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 @@ -457,6 +439,4 @@ 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) } diff --git a/o-little-town-of-bethlehem.ly b/o-little-town-of-bethlehem.ly index 55bbd86..80b7604 100644 --- a/o-little-town-of-bethlehem.ly +++ b/o-little-town-of-bethlehem.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) @@ -10,67 +10,79 @@ 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 "O Little Town Of Bethlehem" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Lewis H. Redner" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" } - tagline = "Engraved by JLH and Lilypond 2.8.8" + 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.instrumentName = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - \partial 4*1 a4 | % 0 + \partial 4*1 s4 | % 0 \repeat volta 2 { -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - a4 a af a | % 1 - c4 bf d, g | % 2 - f4 e8 ( f ) g4 c, | % 3 - a'2. a4 | % 4 - a4 a d c | % 5 - c4 bf d, g | % 6 - f4 e8 ( f ) a4 g | % 7 - f2. a4 \bar "||" % 8 - -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - a4 a g f | % 9 - e2 e4 e | % 10 - d4 e f g | % 11 - a2. a4 | % 12 - a4 a af a | % 13 - c4 bf d, d' | % 14 - c4 f, a4. g8 | % 15 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 1-8 + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*7 | % 9-15 } \alternative { { - f2. a4 | % 16 + s1 | % 16 } { - f1^\fermata \bar "|." % 17 + s1 \bar "|." % 17 } } } + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + a4 | % 0 + + a4 a af a | % 1 + c4 bf d, g | % 2 + f4 e8 ( f ) g4 c, | % 3 + a'2. a4 | % 4 + a4 a d c | % 5 + c4 bf d, g | % 6 + f4 e8 ( f ) a4 g | % 7 + f2. a4 | % 8 + + a4 a g f | % 9 + e2 e4 e | % 10 + d4 e f g | % 11 + a2. a4 | % 12 + a4 a af a | % 13 + c4 bf d, d' | % 14 + c4 f, a4. g8 | % 15 + + f2. a4 | % 16 + + f1^\fermata | % 17 +} + + LeadVoxText = \lyricmode { O lit -- tle town of Beth -- le -- hem, how still we _ see thee lie! @@ -93,92 +105,66 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - - \partial 4*1 s4 | % 0 - - \repeat volta 2 - { - f2 f4:dim7 f | % 1 - bf2:5.9 g:m7 | % 2 - f2/c g4:m7/c c:7.9- | % 3 - f1:maj7 | % 4 - f2/ef d:7 | % 5 - g2.:m bf4:m6 | % 6 - f2/c g4:m7/c c:7.9- | % 7 - f2:sus4 f | % 8 - - f2 g4:dim7 gs:dim7 | % 9 - a1 | % 10 - d4:m a:7/e f:6 g:m/bf | % 11 - a2:sus4 a | % 12 - f2 f4:dim7 f | % 13 - bf2:5.9 g:7/b | % 14 - f2/c g4:m/c c:7.9- | % 15 - } - \alternative - { - { - f2:sus4 f | % 16 - } - { - f2:sus4 f | % 17 - } - } + s4 | % 0 + + f2 f4:dim7 f | % 1 + bf2:3.5.9 g:m7 | % 2 + f2/c g4:m7/c c:7.9- | % 3 + f1:maj7 | % 4 + f2/ef d:7 | % 5 + g2.:m bf4:m6 | % 6 + f2/c g4:m7/c c:7.9- | % 7 + f2:sus4 f | % 8 + + f2 g4:dim7 gs:dim7 | % 9 + a1 | % 10 + d4:m a:7/e f:6 g:m/bf | % 11 + a2:sus4 a | % 12 + f2 f4:dim7 f | % 13 + bf2:3.5.9 g:7/b | % 14 + f2/c g4:m/c c:7.9- | % 15 + + f2:sus4 f | % 16 + + f2:sus4 f | % 17 } % % 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 - \partial 4*1 s4 | % 0 + s4 | % 0 - \repeat volta 2 - { - c4 c c c | % 1 - c4 c c c | % 2 - c4 c c c | % 3 - c4 c c c | % 4 - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c \bar "||" % 8 - - c4 c-> c-> c-> | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - } - \alternative - { - { - c4 c c c | % 16 - } - { - c2 c^\fermata \bar "|." % 17 - } - } + c4 c c c | % 1 + c4 c c c | % 2 + c4 c c c | % 3 + c4 c c c | % 4 + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + + c4 c-> c-> c-> | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + + c4 c c c | % 16 + + c2 c^\fermata | % 17 } @@ -192,77 +178,49 @@ Dynamics = s4_\markup { \dynamic mf \italic { band in } } s2. | % 8 s1*6 s4_\markup { \italic { rit. 2nd X } } s2. | % 15 - -%{ - \override TextScript #'extra-offset = #'( 0.0 . -1.0 ) - - \partial 4*1 s4_\f | % 0 - s4_\markup { \italic { full band, snare } } s2. | % 1 - s1*2 - s4 s \> s s \! | % 4 - s4_\markup { \dynamic mf \italic { piano only } } s2. | % 5 - s1*11 - s4_\markup { \dynamic mp \italic { bass in, cym } } s2. | % 17 - s1*2 - s4 s \< s s_\f | % 20 - s1*2 - s2 s_\markup { \italic { dr. fill } } | % 23 - s4_\markup { \italic { dr. groove, s-stick 2&4 } } s2. | % 24 - s1*13 - s4_\markup { \dynamic mp \italic { no backbeat } } s2. | % 38 - s1*2 - s4 s \< s s_\f | % 41 - s4_\markup { \italic { backbeat } } s2. | % 42 - s1*2 - s2 s_\markup { \italic { dr. fill } } | % 45 - s4_\markup { \italic { Majestic, slower w/snare } } s2. | % 46 - s1*11 - s4_\markup { \dynamic mp \italic { no backbeat } } s2. | % 58 - s1*2 - s4 s \< s_\markup { \hspace #0.0 \raise #-2.0 \italic { dr.fill } } s_\f | % 61 - s4_\markup { \italic { backbeat } } s2. | % 62 - s1*6 - s4_\markup { \italic { rit. } } s2. | % 69 -%} } \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } -% \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 } + diff --git a/one-small-child.ly b/one-small-child.ly index 6e8715f..0c1cf14 100644 --- a/one-small-child.ly +++ b/one-small-child.ly @@ -1,35 +1,21 @@ -\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) #(ly:set-option (quote no-point-and-click)) -%{ Some useful characters: ‘ ’ “ ” – — † ‡ • … %} - \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "One Small Child" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "D. Meece" } 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-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) - -hn = #(define-music-function (parser location arg) (ly:music?) -;; Harmony Note: Set the tweaks property of the passed in note to use a smaller font - - (set! (ly:music-property arg 'tweaks) - (acons 'font-size -3.0 (ly:music-property arg 'tweaks))) arg) - % % Song's structure @@ -37,14 +23,9 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key d \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -% \once \override TextScript #'padding = #2.0 -% s1*0^\markup { \large \bold { Samba } } -% Capo 4 version -% s1*0^\markup { \hspace #0.0 \raise #2.0 \bigger \bold { "Moderate pop (*** CAPO 4 ***)" } } - % Intro s1*4 \bar "||" % 1-4 @@ -58,7 +39,7 @@ Global = \once \override Score.RehearsalMark #'self-alignment-X = #right \mark \markup { { To Coda } \hspace #0.5 \musicglyph #"scripts.coda" } - s1 \bar "||:" % 14 + s1 \bar ".|:-||" % 14 \repeat volta 2 { @@ -80,10 +61,11 @@ Global = \time 6/4 s1. | % 32 } { - s1. \bar "||" % 33 + \time 6/4 s1. \bar "||" % 33 } } + \time 4/4 \once \override Score.RehearsalMark #'self-alignment-X = #right \mark \markup { \hspace #0.0 \raise #1.0 \italic { D.C. al Coda } } @@ -91,14 +73,14 @@ Global = % blank measure between last measure and coda % \stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break - \stopStaff s1 \startStaff % That removed the spurious floating bar line from line break + \stopStaff s1 \startStaff % \break % Meh \set Score.currentBarNumber = #34 \once \override Score.RehearsalMark #'self-alignment-X = #left \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } - \time 4/4 s1*5 \bar "|." % 34-38 + s1*5 \bar "|." % 34-38 } @@ -107,12 +89,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 @@ -215,10 +191,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c''' { -% \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -305,19 +277,11 @@ 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 - -%Not small enough... \teeny -% \magnify #0.3 % Intro @@ -368,7 +332,7 @@ Rhythm = \relative c % Coda - s1 % For blank measure +\stopStaff s1 \startStaff % For blank measure c4 c c c | % 34 c4 c c2-\fermata | % 35 @@ -392,36 +356,36 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff + \context Staff << - \new ChordNames \Chords -%Capo 4 edition -% \new ChordNames \transpose b g \Chords - \new RhythmicStaff << \Rhythm \Dynamics >> - >> - - \new 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 >> + >> >> } \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 @@ -432,6 +396,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) } + diff --git a/open-the-eyes-of-my-heart.ly b/open-the-eyes-of-my-heart.ly index 04c9ea6..47d37da 100644 --- a/open-the-eyes-of-my-heart.ly +++ b/open-the-eyes-of-my-heart.ly @@ -1,17 +1,15 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #18 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #20 #(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 "Open The Eyes Of My Heart" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -20,50 +18,35 @@ staffSize = #18 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { - \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - - \set Score.markFormatter = #format-mark-box-letters % Intro - r1^\markup { Mid-tempo rock } | % 1 - r1 | % 2 - r1 | % 3 - r1 | % 4 + s1^\markup { Mid-tempo rock } | % 1 + s1*3 | % 2-4 % Verse \repeat volta 2 { -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - - gs8 [ b b b ] ~ b [ gs b b ] ~ | % 5 - b8 [ gs ] ~ gs4 r2 | % 6 - gs8 [ b b b ] ~ b [ gs b b ] ~ | % 7 - b4 r \times 2/3 { gs4 fs e } | % 8 - fs4. e8 ~ e2 | % 9 - r2 \times 2/3 { gs4 fs e } | % 10 - fs4. e8 ~ e2 | % 11 + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + s1*7 | % 5-11 } \alternative { { - r1 | % 12 + s1 | % 12 } { - r4. e8 gs4 b | % 13 + s1 | % 13 } } @@ -71,30 +54,21 @@ LeadVox = \relative c'' \repeat volta 3 { -% \mark #2 -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - b4 b8 [ b ] ~ b4 cs8 [ cs ] ~ | % 14 - cs4 r4 r2 | % 15 - cs8 [ b b b ] cs [ b gs gs ] ~ | % 16 - gs [ fs ] ~ fs4 r2 | % 17 - gs8. [ b16 ] ~ b8 [ b ] b [ gs b cs ] ~ | % 18 - cs4 r8 gs gs4 b | % 19 - cs4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 20 - gs8 [ fs ] ~ fs4 r2 | % 21 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*8 | % 14-21 } \alternative { { - r1 \bar "||" % 22 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. } } + s1 \bar "||" % 22 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. } } } { - r4. e8 gs4 b | % 23 + s1 | % 23 } { - r1 | % 24 + s1 | % 24 } } @@ -102,20 +76,67 @@ LeadVox = \relative c'' \repeat volta 2 { -% \mark #3 -\mark \markup { \override #'(font-family . sans) { \box { C } } } - - cs4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 25 - gs8 [ fs ] ( e4 ) ~ e2 | % 26 - cs'4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 27 - gs8 [ fs ] ( e4 ) ~ e2 | % 28 - cs'4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 29 - gs8 [ fs ] ( e4 ) \times 2/3 { gs fs e } | % 30 - fs4. e8 ~ e2 ~ | % 31 - e2. r4 | % 32 + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*8 | % 25-32 } } + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + \set Voice.autoBeaming = ##f + + % Intro + + r1*4 | % 1-4 + + % Verse + + gs8 [ b b b ] ~ b [ gs b b ] ~ | % 5 + b8 [ gs ] ~ gs4 r2 | % 6 + gs8 [ b b b ] ~ b [ gs b b ] ~ | % 7 + b4 r \times 2/3 { gs4 fs e } | % 8 + fs4. e8 ~ e2 | % 9 + r2 \times 2/3 { gs4 fs e } | % 10 + fs4. e8 ~ e2 | % 11 + + r1 | % 12 + + r4. e8 gs4 b | % 13 + + % Chorus + + b4 b8 [ b ] ~ b4 cs8 [ cs ] ~ | % 14 + cs4 r4 r2 | % 15 + cs8 [ b b b ] cs [ b gs gs ] ~ | % 16 + gs [ fs ] ~ fs4 r2 | % 17 + gs8. [ b16 ] ~ b8 [ b ] b [ gs b cs ] ~ | % 18 + cs4 r8 gs gs4 b | % 19 + cs4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 20 + gs8 [ fs ] ~ fs4 r2 | % 21 + + r1 | % 22 + + r4. e8 gs4 b | % 23 + + r1 | % 24 + + % Outro + + cs4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 25 + gs8 [ fs ] ( e4 ) ~ e2 | % 26 + cs'4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 27 + gs8 [ fs ] ( e4 ) ~ e2 | % 28 + cs'4 b8 [ b ] ~ b4 gs8 [ gs ] ~ | % 29 + gs8 [ fs ] ( e4 ) \times 2/3 { gs fs e } | % 30 + fs4. e8 ~ e2 ~ | % 31 + e2. r4 | % 32 +} + + LeadVoxText = \lyricmode { O -- pen the eyes _ of my heart _ Lord _ @@ -142,15 +163,8 @@ LeadVoxText = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - - \override Staff.TimeSignature #'style = #'() - \time 4/4 - % Intro e1:sus2 | % 1 @@ -160,82 +174,56 @@ Chords = \chordmode % Verse - \repeat volta 2 - { - e1:sus2 | % 5 - s1 | % 6 - b1:sus2/ds | % 7 - r1 | % 8 - a1:sus2/cs | % 9 - a1 | % 10 - a4.:6/e e8 s2 | % 11 - } - \alternative - { - { - a1/b | % 12 - } - { - e1 | % 13 - } - } + e1:sus2 | % 5 + s1 | % 6 + b1:sus2/ds | % 7 + r1 | % 8 + a1:sus2/cs | % 9 + a1 | % 10 + a4.:6/e e8 s2 | % 11 + + a1/b | % 12 + + e1 | % 13 % Chorus - \repeat volta 3 - { - b1 | % 14 - cs1:m | % 15 - a2.. b8:sus4 | % 16 - s2 b | % 17 - gs1:m | % 18 - cs1:m | % 19 - fs2..:m a8/b | % 20 - s2.. a8/b | % 21 - } - \alternative - { - { - s1 \bar "||" % 22 - } - { - a1/b | % 23 - } - { - a1/b | % 24 - } - } + b1 | % 14 + cs1:m | % 15 + a2.. b8:sus4 | % 16 + s2 b | % 17 + gs1:m | % 18 + cs1:m | % 19 + fs2..:m a8/b | % 20 + s2.. a8/b | % 21 + + s1 | % 22 + + a1/b | % 23 + + a1/b | % 24 % Outro - \repeat volta 2 - { - e1:sus2 | % 25 - s1 | % 26 - b1:sus2/ds | % 27 - s1 | % 28 - a1:sus2/cs | % 29 - fs2:m a/b | % 30 - a4.:6/e e8 s2 | % 31 - a1/b | % 32 - } + e1:sus2 | % 25 + s1 | % 26 + b1:sus2/ds | % 27 + s1 | % 28 + a1:sus2/cs | % 29 + fs2:m a/b | % 30 + a4.:6/e e8 s2 | % 31 + a1/b | % 32 } % % 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -246,109 +234,88 @@ StaffC = \relative c % Verse - \repeat volta 2 - { - c1-\markup { \dynamic mf \italic { Colors 1st time, sidestick on DS } } | % 5 - c1 | % 6 - c1 | % 7 - c1 | % 8 - c1 | % 9 - c1 | % 10 - c4. c8 ~ c2 | % 11 - } - \alternative - { - { - c1 | % 12 - } - { -% c4-> \f c-> \< r2-\markup { \italic { dr. fill } } \ff | % 13 - << { \voiceOne c4_> c_> r2_\markup { \italic { dr. fill } } } - \new Voice = "v" { \voiceTwo s4 \f s s4. \< s8 \ff } >> + c1-\markup { \dynamic mf \italic { Colors 1st time, sidestick on DS } } | % 5 + c1 | % 6 + c1 | % 7 + c1 | % 8 + c1 | % 9 + c1 | % 10 + c4. c8 ~ c2 | % 11 -%{ - r2 r4 r8 << { \voiceOne ~ } \new Voice = "v" { \voiceTwo fs8 ~ } >> | % 12 - << { \voiceOne 1 ~ } \context Voice = v { \voiceTwo fs2 ~ fs4. f8 ~ } >> | % 13 - << { \voiceOne 2 } \context Voice = v { \voiceTwo f2 } >> \oneVoice r2 | % 14 -%} + c1 | % 12 - } - } + << { \voiceOne c4_> c_> r2_\markup { \italic { dr. fill } } } + \new Voice = "v" { \voiceTwo s4 \f s s4. \< s8 \ff } >> % Chorus - \repeat volta 3 - { - c4._\markup { \italic { Rock 4 } } c8 ~ c2 | % 14 - c4. c8 ~ c2 | % 15 - c4. c8 ~ c4. c8 ~ | % 16 - c2 c4_\markup { \italic { dr. fill } } c | % 17 - c4. c8 ~ c2 | % 18 - c4. c8 ~ c2 | % 19 - c4. c8 ~ c4. c8 ~ | % 20 - c4 c c c8 [ c ] ~ | % 21 - } - \alternative - { - { - c1 | % 22 - } - { - c4_> c_> r2_\markup { \italic { dr. fill } } | % 23 - } - { -% << c1 \\ { s4 \> s2 s4 \! } >> | % 24 - << { \voiceOne c1 } \context Voice = v { \voiceTwo s4 \> s2 s4 \! } >> | % 24 - } - } + c4._\markup { \italic { Rock 4 } } c8 ~ c2 | % 14 + c4. c8 ~ c2 | % 15 + c4. c8 ~ c4. c8 ~ | % 16 + c2 c4_\markup { \italic { dr. fill } } c | % 17 + c4. c8 ~ c2 | % 18 + c4. c8 ~ c2 | % 19 + c4. c8 ~ c4. c8 ~ | % 20 + c4 c c c8 [ c ] ~ | % 21 + + c1 | % 22 + + c4_> c_> r2_\markup { \italic { dr. fill } } | % 23 + + << { \voiceOne c1 } \context Voice = v { \voiceTwo s4 \> s2 s4 \! } >> | % 24 % Outro - \repeat volta 2 - { - c1_\markup { \dynamic mf \italic { Floating } } | % 25 - c1 | % 26 - c1 | % 27 - c1 | % 28 - c1 | % 29 - c2 c | % 30 - c4. c8^\fermata _\markup { \italic { Last time } } ~ c2 | % 31 - c1 | % 32 - } + c1_\markup { \dynamic mf \italic { Floating } } | % 25 + c1 | % 26 + c1 | % 27 + c1 | % 28 + c1 | % 29 + c2 c | % 30 + c4. c8^\fermata _\markup { \italic { Last time } } ~ c2 | % 31 + c1 | % 32 } \score { << -% \new ChoirStaff = "Vox" + \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 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 - { -% 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 } + diff --git a/oxygen.ly b/oxygen.ly index e4e1c9b..a62ebbc 100644 --- a/oxygen.ly +++ b/oxygen.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) @@ -28,35 +28,109 @@ hn = #(define-music-function (parser location arg) (ly:music?) % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \clef G \key a \major \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1^\markup { \italic { perc. } } \bar "||" % 1 + s1^\markup { \italic { perc. } } \bar "||" % 1 + s1*8 \bar ".|:-||" % 2-9 + + % Verse + + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 10-17 - R1 | % 2 - R1 | % 3 - R1 | % 4 - R1 | % 5 - R1 | % 6 - R1 | % 7 - R1 | % 8 - r2 r4 r8 cs \bar "||:" % 9 + \mark \markup { \override #'(font-family . sans) { \box { A9 } } } + s1*8 \bar "||" % 18-25 + + % Prechorus + + \mark \markup { \override #'(font-family . sans) { \box { A17 } } } + s1*4 \bar "||" % 26-29 + + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*12 \bar "||" % 30-41 % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \key c \major + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*8 \bar "||" % 42-49 + + \mark \markup { \override #'(font-family . sans) { \box { C9 } } } + s1*8 \bar "||" % 50-57 + + % Prechorus + + \mark \markup { \override #'(font-family . sans) { \box { C17 } } } + s1*4 \bar "||" % 58-61 + + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s1*10 \bar "||" % 62-71 + + % Bridge + + \mark \markup { \override #'(font-family . sans) { \box { E } } } + s1*12 \bar "||" % 72-83 + + % Prechorus + + \mark \markup { \override #'(font-family . sans) { \box { F } } } + s1*5 | % 84-88 + + \repeat volta 4 + { + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { G } } } + s1*7 | % 89-95 + } + \alternative + { + { + s1 | % 96 + } + { + s1 | % 97 + } + } + + % Outro + + \mark \markup { \override #'(font-family . sans) { \box { H } } } + + \repeat volta 2 + { + s1*4 | % 98-101 + } + + s1 \bar "|." % 102 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + R1*8 | % 1-8 + r2 r4 r8 cs | % 9 + + % Verse e8 e4 e8 ~ e4. cs8 | % 10 e8 e4 e8 ~ e cs4 a8 ~ | % 11 @@ -65,9 +139,7 @@ LeadVox = \relative c' cs4 cs8 cs ~ cs4 r8 a | % 14 b8 b4 b8 ~ b gs4 gs8 | % 15 a4. a8 ~ a4 fs8 fs ~ | % 16 - fs2 r4 r8 cs'8 \bar "||" % 17 - -\mark \markup { \override #'(font-family . sans) { \box { A9 } } } + fs2 r4 r8 cs'8 | % 17 e8 e4 e8 ~ e4. cs8 | % 18 e8 e4 e8 ~ e cs4 a8 ~ | % 19 @@ -76,21 +148,17 @@ LeadVox = \relative c' cs4 cs8 cs ~ cs4 r8 a | % 22 b8 b4 b8 ~ b gs4 r8 | % 23 a4 a8 a8 ~ a4 fs8 fs ~ | % 24 - fs2 r4 r8 g \bar "||" % 25 + fs2 r4 r8 g | % 25 % Prechorus -\mark \markup { \override #'(font-family . sans) { \box { A17 } } } - d'4 ( c8 ) c ~ c r4 b8 | % 26 a8 a4 b8 ~ b8 r4 g8 | % 27 d'4 ( c8 ) c ~ c r4 b8 | % 28 - d8 d4 e8 ~ e4 d8 d \bar "||" % 29 + d8 d4 e8 ~ e4 d8 d | % 29 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - r4 fs8 fs ~ fs4 fs | % 30 fs4 d8 d4. r8 a | % 31 d4 d8 d ~ d4 r8 a | % 32 @@ -103,14 +171,10 @@ LeadVox = \relative c' b1 | % 38 R1 | % 39 R1 | % 40 - r2 r4 r8 e \bar "||" % 41 + r2 r4 r8 e | % 41 % Verse - \key c \major - -\mark \markup { \override #'(font-family . sans) { \box { C } } } - g8 g4 g8 ~ g4. e8 | % 42 g8 g4 g8 ~ g e4 c8 ~ | % 43 c4 r r2 | % 44 @@ -118,9 +182,7 @@ LeadVox = \relative c' e4 e8 e ~ e4 r8 c | % 46 d8 d4 d8 ~ d b4 b8 | % 47 c4 c8 c8 ~ c8 g ( a ) a ~ | % 48 - a2 r4 r8 e'8 \bar "||" % 49 - -\mark \markup { \override #'(font-family . sans) { \box { C9 } } } + a2 r4 r8 e'8 | % 49 g8 g4 g8 ~ g4. e8 | % 50 g8 g4 g8 ~ g d'4. ~ | % 51 @@ -129,21 +191,17 @@ LeadVox = \relative c' e4 e8 e ~ e4 r8 c | % 54 d8 d4 d8 ~ d b4 b8 | % 55 c4 c8 c8 ~ c8 g ( a ) a ~ | % 56 - a2 r4 bf \bar "||" % 57 + a2 r4 bf | % 57 % Prechorus -\mark \markup { \override #'(font-family . sans) { \box { C17 } } } - f'4 ( ef8 ) ef ~ ef r4 d8 | % 58 c8 c4 d8 ~ d8 r4 bf8 | % 59 f'4 ( ef8 ) ef ~ ef r4 d8 | % 60 - f8 f4 g8 ~ g4 f8 f \bar "||" % 61 + f8 f4 g8 ~ g4 f8 f | % 61 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { D } } } - \voiceOne r4 a8 a ~ a4 a \oneVoice | % 62 a4 f8 f4. r8 c | % 63 f4 f8 \tieUp f ~ f4 r8 c | % 64 @@ -153,12 +211,10 @@ LeadVox = \relative c' e8 ) e4 \slurNeutral c8 ~ c r g' f ( | % 68 d4 ) d8 d ~ d4 c8 d ~ | % 69 d1 | % 70 - R1 \bar "||" % 71 + R1 | % 71 % Bridge -\mark \markup { \override #'(font-family . sans) { \box { E } } } - r4 \voiceOne d8 d ~ d f4 f8 | % 72 \oneVoice r4 \voiceOne d8 f ~ f a4 a8 ~ | % 73 a2 \oneVoice r4. \voiceOne a,8 | % 74 @@ -170,25 +226,18 @@ LeadVox = \relative c' f4 \oneVoice r4 r2 | % 80 \voiceOne a4. g8 ~ g f4 f8 ~ | % 81 f4 \oneVoice r r d8 e8 ~ | % 82 - e2. r8 d \bar "||" % 83 + e2. r8 d | % 83 % Prechorus -\mark \markup { \override #'(font-family . sans) { \box { F } } } - f4 ( ef8 ) ef ~ ( ef d ) d ( c ) | % 84 c8 c4 c8 ~ c8 r4 d8 | % 85 f4. \tieUp ef8 ~ ef d4 ef8 ~ | % 86 ef8 \tieNeutral r f4 g8 f4 f8 ( ~ | % 87 f8 d16 c d8 f ~ f 4 8 | % 88 - \repeat volta 4 - { - % Chorus - -\mark \markup { \override #'(font-family . sans) { \box { G } } } + % Chorus -% a2. ) r4 | % 89 << { \voiceOne 2. ) r4 } \context Voice = "v2" { \voiceTwo r4 a8 a ~ a4 a } >> \oneVoice | % 89 a4 f8 f4. r8 c | % 90 f4 f8 f ~ f4 r8 c | % 91 @@ -196,30 +245,19 @@ LeadVox = \relative c' r4 f8 g8 ~ g4 a | % 93 a4 f8 f4 r8 a \slurUp g ( | % 94 e8 ) \slurNeutral e4 c8 ~ c r g' f ( | % 95 - } - \alternative - { - { - d4 ) d8 d ~ d4 c8 d | % 96 - } - { - d4 d8 d ~ d4 c8 d | % 97 - } - } - % Outro + d4 ) d8 d ~ d4 c8 d | % 96 -\mark \markup { \override #'(font-family . sans) { \box { H } } } + d4 d8 d ~ d4 c8 d | % 97 - \repeat volta 2 - { - R1 | % 98 - R1 | % 99 - R1 | % 100 - R1 | % 101 - } + % Outro + + R1 | % 98 + R1 | % 99 + R1 | % 100 + R1 | % 101 - r1^\fermata \bar "|." % 102 + r1^\fermata | % 102 } @@ -281,43 +319,43 @@ LeadVoxText = \lyricmode _ what life’s _ a -- bout %{ -I take each breath as if it is my first -I hold it there, so deep inside me -'Til I'm about to burst -I speak each word as if it is Your name -I move my lips ... I see the whisper -Stir the gentle flame - -Your heart beats and so does mine -Your love moves -And I know I'm alive - -You are my oxygen -I breathe You in -I breathe You out -You are my oxygen -You are my love -You are what life's about - -I take each breath as if it is my last -You never know what came so slowly -Could leave us, oh, so fast -I take each step as if it is to You -I hear Your voice -I feel Your presence -In everything I do - -My soul sleeps, Your love revives -Our hearts meet -And I know I'm alive - -The air is think, the flower sweet -The shadow comes down -Tonight the moon is at my feet -And I breathe You in -I breathe You in to me - -I'm nobody without You +I take each breath as if it is my first +I hold it there, so deep inside me +'Til I'm about to burst +I speak each word as if it is Your name +I move my lips ... I see the whisper +Stir the gentle flame + +Your heart beats and so does mine +Your love moves +And I know I'm alive + +You are my oxygen +I breathe You in +I breathe You out +You are my oxygen +You are my love +You are what life's about + +I take each breath as if it is my last +You never know what came so slowly +Could leave us, oh, so fast +I take each step as if it is to You +I hear Your voice +I feel Your presence +In everything I do + +My soul sleeps, Your love revives +Our hearts meet +And I know I'm alive + +The air is think, the flower sweet +The shadow comes down +Tonight the moon is at my feet +And I breathe You in +I breathe You in to me + +I'm nobody without You If You were not here what would I do %} } @@ -336,20 +374,11 @@ LeadVoxTextC = \lyricmode % % Harmonies % - BGVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"BG vox" - \override Staff.TimeSignature #'style = #'() - \clef G - \key a \major - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro - s1 \bar "||" % 1 + s1 | % 1 s1 | % 2 s1 | % 3 @@ -358,7 +387,7 @@ BGVox = \relative c' s1 | % 6 s1 | % 7 s1 | % 8 - s1 \bar "||:" % 9 + s1 | % 9 % Verse @@ -369,7 +398,7 @@ BGVox = \relative c' s1 | % 14 s1 | % 15 s1 | % 16 - s1 \bar "||" % 17 + s1 | % 17 s1 | % 18 s1 | % 19 @@ -378,14 +407,14 @@ BGVox = \relative c' s1 | % 22 s1 | % 23 s1 | % 24 - s1 \bar "||" % 25 + s1 | % 25 % Prechorus s1 | % 26 s1 | % 27 s1 | % 28 - s1 \bar "||" % 29 + s1 | % 29 % Chorus @@ -401,12 +430,10 @@ BGVox = \relative c' s1 | % 38 s1 | % 39 s1 | % 40 - s1 \bar "||" % 41 + s1 | % 41 % Verse - \key c \major - s1 | % 42 s1 | % 43 s1 | % 44 @@ -414,7 +441,7 @@ BGVox = \relative c' s1 | % 46 s1 | % 47 s1 | % 48 - s1 \bar "||" % 49 + s1 | % 49 s1 | % 50 s1 | % 51 @@ -423,14 +450,14 @@ BGVox = \relative c' s1 | % 54 s1 | % 55 s1 | % 56 - s1 \bar "||" % 57 + s1 | % 57 % Prechorus s1 | % 58 s1 | % 59 s1 | % 60 - s1 \bar "||" % 61 + s1 | % 61 % Chorus @@ -447,7 +474,7 @@ BGVox = \relative c' \oneVoice \normalsize s1 | % 70 - s1 \bar "||" % 71 + s1 | % 71 % Bridge @@ -463,7 +490,7 @@ BGVox = \relative c' d4 \oneVoice s4 s2 | % 80 \voiceTwo f4. e8 ~ e d4 c8 ~ | % 81 c4 \oneVoice s s2 | % 82 - s1 \bar "||" % 83 + s1 | % 83 \normalsize % Prechorus @@ -478,51 +505,36 @@ BGVox = \relative c' \normalsize s1 | % 88 - \repeat volta 4 - { - s4 \context Voice = "v2" { <\hn f \hn c>8 <\hn e \hn c> ~ <\hn e \hn c>4 <\hn e \hn c> } | % 89 + s4 \context Voice = "v2" { <\hn f \hn c>8 <\hn e \hn c> ~ <\hn e \hn c>4 <\hn e \hn c> } | % 89 \tiny \voiceTwo - 4 8 ( ~ 2 | % 90 - 1 ) | % 91 - s1 | % 92 - s4 8 ~ 4 | % 93 - 4 8 ( ~ 2 | % 94 - 1 ) | % 95 + 4 8 ( ~ 2 | % 90 + 1 ) | % 91 + s1 | % 92 + s4 8 ~ 4 | % 93 + 4 8 ( ~ 2 | % 94 + 1 ) | % 95 \oneVoice \normalsize - } - \alternative - { - { - s1 | % 96 - } - { - s1 | % 97 - } - } - \repeat volta 2 - { - s1 | % 98 - s1 | % 99 - s1 | % 100 - s1 | % 101 - } + s1 | % 96 - s1 \bar "|." % 102 + s1 | % 97 + + s1 | % 98 + s1 | % 99 + s1 | % 100 + s1 | % 101 + + s1 | % 102 } % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s1 | % 1 @@ -645,35 +657,24 @@ Chords = \chordmode % Chorus - \repeat volta 4 - { - d4.:m7 c s4 | % 30 - bf1:maj7 | % 31 - f1 | % 32 - c4. a:m7 s4 | % 33 - bf4. c s4 | % 34 - f4. bf s4 | % 35 - c4. a:m7 s4 | % 36 - } - \alternative - { - { - bf1 | % 70 - } - { - bf1 | % 71 - } - } + d4.:m7 c s4 | % 30 + bf1:maj7 | % 31 + f1 | % 32 + c4. a:m7 s4 | % 33 + bf4. c s4 | % 34 + f4. bf s4 | % 35 + c4. a:m7 s4 | % 36 + + bf1 | % 70 + + bf1 | % 71 % Outro - \repeat volta 2 - { - d1:m7 | % 72 - s1 | % 73 - s1 | % 74 - s1 | % 75 - } + d1:m7 | % 72 + s1 | % 73 + s1 | % 74 + s1 | % 75 d1:m7 | % 76 } @@ -682,22 +683,15 @@ 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash \teeny % Intro - c1:16 \p \< \bar "||" % 1 + c1:16 \p \< | % 1 c4. \mf c8 ~ c4. c8 ~ | % 2 c1 | % 3 @@ -706,7 +700,7 @@ StaffC = \relative c c4. c8 ~ c4. c8 ~ | % 6 c1 | % 7 c4. c8 ~ c4. c8 ~ | % 8 - c1 \bar "||:" % 9 + c1 | % 9 % Verse @@ -717,7 +711,7 @@ StaffC = \relative c c4 c c c | % 14 c4 c c c | % 15 c4. c8 ~ c4. c8 ~ | % 16 - c4 c c c \bar "||" % 17 + c4 c c c | % 17 c4 c c c | % 18 c4 c c c | % 19 @@ -726,14 +720,14 @@ StaffC = \relative c c4 c c c | % 22 c4 c c c | % 23 c4. c8 ~ c4. c8 ~ | % 24 - c4 c c c \bar "||" % 25 + c4 c c c | % 25 % Prechorus c4 c c c | % 26 c4 c c c | % 27 c4 c c c | % 28 - c4 c c c \bar "||" % 29 + c4 c c c | % 29 % Chorus @@ -749,7 +743,7 @@ StaffC = \relative c c4. c8 ~ c4. c8 ~ | % 38 c4 c c c | % 39 c4. c8 ~ c4. c8 ~ | % 40 - c1 \bar "||" % 41 + c1 | % 41 % Verse @@ -760,7 +754,7 @@ StaffC = \relative c c4 c c c | % 46 c4 c c c | % 47 c4. c8 ~ c4. c8 ~ | % 48 - c4 c c c \bar "||" % 49 + c4 c c c | % 49 c4 c c c | % 50 c4 c c c | % 51 @@ -769,14 +763,14 @@ StaffC = \relative c c4 c c c | % 54 c4 c c c | % 55 c4. c8 ~ c4. c8 ~ | % 56 - c4 c c c \bar "||" % 57 + c4 c c c | % 57 % Prechorus c4 c c c | % 58 c4 c c c | % 59 c4 c c c | % 60 - c4 c c c \bar "||" % 61 + c4 c c c | % 61 % Chorus @@ -790,7 +784,7 @@ StaffC = \relative c c4 c c c | % 69 c1 ~ | % 70 - c1 \bar "||" % 71 + c1 | % 71 % Bridge @@ -805,7 +799,7 @@ StaffC = \relative c c4 r8 c ~ c4 c | % 80 c4. c8 ~ c c ~ c4 | % 81 c1 | % 82 - c1 \bar "||" % 83 + c1 | % 83 % Prechorus @@ -817,74 +811,71 @@ StaffC = \relative c % Chorus - \repeat volta 4 - { - c4._\markup { \dynamic f \italic { ad lib throughout } } c8 ~ c2 | % 89 - c4. c8 ~ c2 | % 90 - c4. c8 ~ c2 | % 91 - c4. c8 ~ c2 | % 92 - c4. c8 ~ c2 | % 93 - c4. c8 ~ c2 | % 94 - c4. c8 ~ c2 | % 95 - } - \alternative - { - { - c4 c c c | % 96 - } - { - c4 \> c c c \! | % 97 - } - } + c4._\markup { \dynamic f \italic { ad lib throughout } } c8 ~ c2 | % 89 + c4. c8 ~ c2 | % 90 + c4. c8 ~ c2 | % 91 + c4. c8 ~ c2 | % 92 + c4. c8 ~ c2 | % 93 + c4. c8 ~ c2 | % 94 + c4. c8 ~ c2 | % 95 + + c4 c c c | % 96 + + c4 \> c c c \! | % 97 % Outro - \repeat volta 2 - { - c4 c c c | % 98 - c4 c c c | % 99 - c4 c c c | % 100 - c4 c c c | % 101 - } + c4 c c c | % 98 + c4 c c c | % 99 + c4 c c c | % 100 + c4 c c c | % 101 - c1^\fermata \bar "|." % 102 + c1^\fermata | % 102 } \score { << -% \new ChoirStaff = "Vox" + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "harmony" \BGVox >> } + \new Voice = "lead" \LeadVox + \new Voice = "harmony" \BGVox \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "v2" \LeadVoxTextB \new Lyrics \lyricsto "v3" \LeadVoxTextC >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << -% \new Staff = "riff" \RhythmB - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC + \new ChordNames \Chords + \new RhythmicStaff \StaffC >> \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() >> - \layout - { -% 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 } + diff --git a/refiner's-fire.ly b/refiner's-fire.ly index ac7f70c..5ed6275 100644 --- a/refiner's-fire.ly +++ b/refiner's-fire.ly @@ -1,103 +1,120 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -staffSize = #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 "Refiner's Fire" } } % composer = \markup { \override #'(font-family . sans) "" } arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.2" + 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.instrumentName = #"Lead vox" \clef G \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1 | % 1 - R1 | % 2 - R1 | % 3 - R1 \bar "||:" % 4 + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - gs4 b8 fs ~ fs4 gs | % 5 - e2 e8 fs gs a | % 6 - a2. r8 e | % 7 - e4 ds e fs | % 8 - gs4 b8 fs ~ fs4 gs | % 9 - e2 e8 fs gs a | % 10 - a1 | % 11 - gs4. ( fs8 ) fs2 \bar "||" % 12 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 5-12 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - gs2 a4 gs8 fs8 ~ | % 13 - fs2 r | % 14 - gs4 b a gs8 fs ~ | % 15 - fs2 r4 e8 b' | % 16 - b1 | % 17 - b8 ( fs ) fs4 r2 | % 18 - b8 ( a ) gs a ~ a e ( fs ) gs ~ | % 19 - gs8 fs4. r8 e e b' | % 20 - b1 | % 21 - b8 ( fs ) fs4 r2 | % 22 - b8 ( a ) gs a ~ a e ( fs ) gs ~ | % 23 - gs4 a8 gs ~ gs fs4. | % 24 - a8 gs fs e ~ e ds4. | % 25 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*13 | % 13-25 } \alternative { { - e1 | % 26 - R1 | % 27 - R1 | % 28 - R1 | % 29 + s1*4 | % 26-29 } { - e1 \bar "||" % 30 + s1 \bar "||" % 30 } } % Outro -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*6 \bar "|." % 31-36 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + R1*4 | % 1-4 + + % Verse + + gs4 b8 fs ~ fs4 gs | % 5 + e2 e8 fs gs a | % 6 + a2. r8 e | % 7 + e4 ds e fs | % 8 + gs4 b8 fs ~ fs4 gs | % 9 + e2 e8 fs gs a | % 10 + a1 | % 11 + gs4. ( fs8 ) fs2 | % 12 + + % Chorus + + gs2 a4 gs8 fs8 ~ | % 13 + fs2 r | % 14 + gs4 b a gs8 fs ~ | % 15 + fs2 r4 e8 b' | % 16 + b1 | % 17 + b8 ( fs ) fs4 r2 | % 18 + b8 ( a ) gs a ~ a e ( fs ) gs ~ | % 19 + gs8 fs4. r8 e e b' | % 20 + b1 | % 21 + b8 ( fs ) fs4 r2 | % 22 + b8 ( a ) gs a ~ a e ( fs ) gs ~ | % 23 + gs4 a8 gs ~ gs fs4. | % 24 + a8 gs fs e ~ e ds4. | % 25 + + e1 | % 26 + R1 | % 27 + R1 | % 28 + R1 | % 29 + + e1 | % 30 + + % Outro a8 gs fs e ~ e ds4. | % 31 e2 r2 | % 32 a8 gs fs e ~ e ds4. | % 33 e2 r2 | % 34 R1 | % 35 - r1^\fermata \bar "|." % 36 + r1^\fermata | % 36 } + LeadVoxText = \lyricmode { Pu- ri- fy _ my heart, let me be as gold @@ -131,12 +148,8 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro e4. e8:sus4 s2 | % 1 @@ -144,47 +157,39 @@ Chords = \chordmode e4. e8:sus4 s2 | % 3 e1 | % 4 - \repeat volta 2 - { - % Verse - - e4. b8/ds s2 | % 5 - cs1:m | % 6 - fs1:m7 | % 7 - e4/b b a/b b | % 8 - e4. b8/ds s2 | % 9 - cs1:m | % 10 - fs1:m7 | % 11 - e4./b b8 s2 | % 12 - - % Chorus - - e2 a4. b8 | % 13 - s1 | % 14 - e2 a4. b8 | % 15 - s1 | % 16 - e1 | % 17 - b1 | % 18 - e4./gs a2 e8/b | % 19 - s8 b2.. | % 20 - e1 | % 21 - b1 | % 22 - e4./gs a2 e8/b | % 23 - s4. b2 s8 | % 24 - fs4.:m b4:sus4 b4. | % 25 - } - \alternative - { - { - e4. e8:sus4 s2 | % 26 - e4. e8:sus4 s2 | % 27 - e4. e8:sus4 s2 | % 28 - e1 | % 29 - } - { - cs1:m | % 30 - } - } + % Verse + + e4. b8/ds s2 | % 5 + cs1:m | % 6 + fs1:m7 | % 7 + e4/b b a/b b | % 8 + e4. b8/ds s2 | % 9 + cs1:m | % 10 + fs1:m7 | % 11 + e4./b b8 s2 | % 12 + + % Chorus + + e2 a4. b8 | % 13 + s1 | % 14 + e2 a4. b8 | % 15 + s1 | % 16 + e1 | % 17 + b1 | % 18 + e4./gs a2 e8/b | % 19 + s8 b2.. | % 20 + e1 | % 21 + b1 | % 22 + e4./gs a2 e8/b | % 23 + s4. b2 s8 | % 24 + fs4.:m b4:sus4 b4. | % 25 + + e4. e8:sus4 s2 | % 26 + e4. e8:sus4 s2 | % 27 + e4. e8:sus4 s2 | % 28 + e1 | % 29 + + cs1:m | % 30 % Outro @@ -200,16 +205,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... - StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash % Intro @@ -217,49 +215,41 @@ StaffC = \relative c c4. c8 ~ c4 c | % 1 c4. c8 ~ c4 c | % 2 c4. c8 ~ c4 c | % 3 - c1 \bar "||:" % 4 - - \repeat volta 2 - { - % Verse - - c4. c8 ~ c4 c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4. c8 ~ c4 c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4. c8 ~ c4 c \bar "||" % 12 - - % Chorus - - c4 c c4. c8 ~ | % 13 - c4 c c c | % 14 - c4 c c4. c8 ~ | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4. c8 ~ c4. c8 ~ | % 19 - c8 c4. ~ c4 c | % 20 - c4 c c c | % 21 - c4 c c c | % 22 - c4. c8 ~ c4. c8 ~ | % 23 - c4. c8 ~ c4 c | % 24 - c4. c8 ~ c c4. | % 25 - } - \alternative - { - { - c4. c8 ~ c4 c | % 26 - c4. c8 ~ c4 c | % 27 - c4. c8 ~ c4 c | % 28 - c1 | % 29 - } - { - c4 c c c | % 30 - } - } + c1 | % 4 + + % Verse + + c4. c8 ~ c4 c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4. c8 ~ c4 c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4. c8 ~ c4 c | % 12 + + % Chorus + + c4 c c4. c8 ~ | % 13 + c4 c c c | % 14 + c4 c c4. c8 ~ | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4. c8 ~ c4. c8 ~ | % 19 + c8 c4. ~ c4 c | % 20 + c4 c c c | % 21 + c4 c c c | % 22 + c4. c8 ~ c4. c8 ~ | % 23 + c4. c8 ~ c4 c | % 24 + c4. c8 ~ c c4. | % 25 + + c4. c8 ~ c4 c | % 26 + c4. c8 ~ c4 c | % 27 + c4. c8 ~ c4 c | % 28 + c1 | % 29 + + c4 c c c | % 30 % Outro @@ -268,23 +258,26 @@ StaffC = \relative c c4. c8 ~ c c4. | % 33 c4. c8 ~ c2 | % 34 c4. c8_\markup { \italic { rit. } } ~ c2 | % 35 - c1^\fermata \bar "|." % 36 + c1^\fermata | % 36 } \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 ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" \StaffC + \new ChordNames \Chords + \new RhythmicStaff \StaffC >> \set Score.skipBars = ##t @@ -295,11 +288,11 @@ StaffC = \relative c \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 @@ -310,6 +303,5 @@ StaffC = \relative c % 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) } + 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) } + diff --git a/shout-to-the-lord.ly b/shout-to-the-lord.ly index 35b890c..6d1df8a 100644 --- a/shout-to-the-lord.ly +++ b/shout-to-the-lord.ly @@ -1,9 +1,9 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Shout To The Lord" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Darlene Zschech" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "Arr. Ed Smart" } @@ -36,7 +34,7 @@ Global = { % \key bf \major \key g \major % New key! - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -382,14 +380,11 @@ 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 = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -517,7 +512,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on %nowok \transpose bf g \context Staff @@ -546,7 +541,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -559,6 +554,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) } + diff --git a/shout-to-the-north.ly b/shout-to-the-north.ly index 779e8d8..bed85d0 100644 --- a/shout-to-the-north.ly +++ b/shout-to-the-north.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -29,68 +29,125 @@ hn = #(define-music-function (parser location arg) (ly:music?) % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 6/8 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f \repeat volta 4 { - r2. | % 1 + s2. | % 1 + } + \alternative + { + { + s2. | % 2 + } + { + s2. | % 3 + } + } + + \repeat volta 2 + { + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s2.*9 | % 4-12 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \italic \smaller { (1st X unison) } } + s2.*7 | % 13-19 } \alternative { { - r2. | % 2 + s2.*2 | % 20-21 } { - r4. r8 g a | % 3 + s2. | % 22 } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s2.*9 \bar "||" % 23-31 + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s2.*9 | % 32-40 + \repeat volta 2 { -\mark \markup { \override #'(font-family . sans) { \box { A } } } - b4 d,8 a'4 fs8 | % 4 - g4. r8 g g | % 5 - b4 d,8 a'4 fs8 | % 6 - g4. r8 g a | % 7 - b4 d,8 a'4 fs8 | % 8 - g4. r8 g g | % 9 - b4 d,8 a'4 fs8 | % 10 - a16 ( g ) ~ g4 ~ g4. | % 11 - r2. | % 12 - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \italic \smaller { (1st X unison) } } - 4. 4 8 | % 13 - 8 4. | % 14 - 4. 4 8 | % 15 - 8 4. | % 16 - 4. 4 8 | % 17 - 8 4. | % 18 - 4 8 16 8. 8 | % 19 + \mark \markup { \override #'(font-family . sans) { \box { E } } } + s2.*7 | % 41-47 } \alternative { { - 2. | % 20 - r2 g8 a | % 21 + s2. | % 48 } { - g2. | % 22 + s2. | % 49 } } -\mark \markup { \override #'(font-family . sans) { \box { C } } } + s2. \bar "||" % 50 + + \mark \markup { \override #'(font-family . sans) { \box { F } } } + s2.*9 | % 51-59 + + \repeat volta 2 + { + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { G } } \italic \smaller { (1st X kids, 2nd X all) } } + s2.*8 | % 60-67 + } + + \repeat volta 2 + { + \mark \markup { \override #'(font-family . sans) { \box { H } } } + s2.*8 | % 68-75 + } + + s2.*6 \bar "|." % 76-81 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + r2. | % 1 + + r2. | % 2 + + r4. r8 g a | % 3 + + b4 d,8 a'4 fs8 | % 4 + g4. r8 g g | % 5 + b4 d,8 a'4 fs8 | % 6 + g4. r8 g a | % 7 + b4 d,8 a'4 fs8 | % 8 + g4. r8 g g | % 9 + b4 d,8 a'4 fs8 | % 10 + a16 ( g ) ~ g4 ~ g4. | % 11 + r2. | % 12 + + 4. 4 8 | % 13 + 8 4. | % 14 + 4. 4 8 | % 15 + 8 4. | % 16 + 4. 4 8 | % 17 + 8 4. | % 18 + 4 8 16 8. 8 | % 19 + + 2. | % 20 + r2 g8 a | % 21 + + g2. | % 22 + 4. 4 8 | % 23 8 4. | % 24 4. 4 8 | % 25 @@ -99,9 +156,8 @@ LeadVox = \relative c'' 8 4. | % 28 4 8 16 8. 8 | % 29 2. | % 30 - r2. \bar "||" % 31 + r2. | % 31 -\mark \markup { \override #'(font-family . sans) { \box { D } } } 8 ( ) r | % 32 8 4. | % 33 8 | % 34 @@ -112,30 +168,20 @@ LeadVox = \relative c'' 2. ~ | % 39 4. r8 g, g | % 40 - \repeat volta 2 - { -\mark \markup { \override #'(font-family . sans) { \box { E } } } - 4. 4 8 | % 41 - 8 4. | % 42 - 4. 4 8 | % 43 - 8 4. | % 44 - 4. 4 8 | % 45 - 8 4. | % 46 - 4 8 16 8. 8 | % 47 - } - \alternative - { - { - 4. r8 g g | % 48 - } - { - 2. | % 49 - } - } + 4. 4 8 | % 41 + 8 4. | % 42 + 4. 4 8 | % 43 + 8 4. | % 44 + 4. 4 8 | % 45 + 8 4. | % 46 + 4 8 16 8. 8 | % 47 + + 4. r8 g g | % 48 - r2 g8 a \bar "||" % 50 + 2. | % 49 + + r2 g8 a | % 50 -\mark \markup { \override #'(font-family . sans) { \box { F } } } b4 d,8 a'4 fs8 | % 51 g4. r8 g g | % 52 b4 d,8 a'4 fs8 | % 53 @@ -146,41 +192,33 @@ LeadVox = \relative c'' a16 ( g ) ~ g4 ~ g4. | % 58 r2. | % 59 - \repeat volta 2 - { -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { G } } \italic \smaller { (1st X kids, 2nd X all) } } - d'4. d4 g,8 | % 60 - c8 c b a4. | % 61 - d4. d4 g,8 | % 62 - c8 c b a4. | % 63 - d4. d4 g,8 | % 64 - c8 c b a4. | % 65 - c4 b8 a16 g8. g8 | % 66 - g2. | % 67 - } - - \repeat volta 2 - { -\mark \markup { \override #'(font-family . sans) { \box { H } } } - 4. 4 8 | % 68 - 8 4. | % 69 - 4. 4 8 | % 70 - 8 4. | % 71 - 4. 4 8 | % 72 - 8 4. | % 73 - 4 8 16 8. 8 | % 74 - 2. | % 75 - } + d'4. d4 g,8 | % 60 + c8 c b a4. | % 61 + d4. d4 g,8 | % 62 + c8 c b a4. | % 63 + d4. d4 g,8 | % 64 + c8 c b a4. | % 65 + c4 b8 a16 g8. g8 | % 66 + g2. | % 67 + + 4. 4 8 | % 68 + 8 4. | % 69 + 4. 4 8 | % 70 + 8 4. | % 71 + 4. 4 8 | % 72 + 8 4. | % 73 + 4 8 16 8. 8 | % 74 + 2. | % 75 4 8 16 8. 8 | % 76 2. | % 77 4 8 16 8. 8 | % 78 2. | % 79 c4 b8 a16 g8. g8 | % 80 - g2.-\fermata \bar "|." % 81 + g2.-\fermata | % 81 } + LeadVoxText = \lyricmode { Men of faith, rise up and sing @@ -248,56 +286,36 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords + g2.:5^3 | % 1 - \repeat volta 4 - { - g2.:5^3 | % 1 - } - \alternative - { - { - s4. g:sus4 | % 2 - } - { - g2.:5^3 | % 3 - } - } + s4. g:sus4 | % 2 - \repeat volta 2 - { - g4. d | % 4 - c2. | % 5 - g4. d | % 6 - c2. | % 7 - g4. d | % 8 - c2. | % 9 - g4. d | % 10 - c2.:sus2 | % 11 - s2. \bar "||" % 12 - - g2. | % 13 - c4. d | % 14 - g2. | % 15 - c4. d | % 16 - g2. | % 17 - c4. d | % 18 - c4. d:sus4 | % 19 - } - \alternative - { - { - g2. | % 20 - s2. | % 21 - } - { - g2. | % 22 - } - } + g2.:5^3 | % 3 + + g4. d | % 4 + c2. | % 5 + g4. d | % 6 + c2. | % 7 + g4. d | % 8 + c2. | % 9 + g4. d | % 10 + c2.:sus2 | % 11 + s2. | % 12 + + g2. | % 13 + c4. d | % 14 + g2. | % 15 + c4. d | % 16 + g2. | % 17 + c4. d | % 18 + c4. d:sus4 | % 19 + + g2. | % 20 + s2. | % 21 + + g2. | % 22 g2. | % 23 c4. d | % 24 @@ -319,25 +337,17 @@ Chords = \chordmode d2. | % 39 d2.:sus4 | % 40 - \repeat volta 2 - { - g2. | % 41 - c4. d | % 42 - g2. | % 43 - c4. d | % 44 - e2.:m7 | % 45 - c4. d | % 46 - c4. d:sus4 | % 47 - } - \alternative - { - { - g2. | % 48 - } - { - g2. | % 49 - } - } + g2. | % 41 + c4. d | % 42 + g2. | % 43 + c4. d | % 44 + e2.:m7 | % 45 + c4. d | % 46 + c4. d:sus4 | % 47 + + g2. | % 48 + + g2. | % 49 s2. | % 50 @@ -351,29 +361,23 @@ Chords = \chordmode c2.:sus2 | % 58 s2. | % 59 - \repeat volta 2 - { - g2. | % 60 - c4. d | % 61 - g2. | % 62 - c4. d | % 63 - g2. | % 64 - c4. d | % 65 - c4. d:sus4 | % 66 - g2. | % 67 - } - - \repeat volta 2 - { - g2. | % 68 - c4. d | % 69 - g2. | % 70 - c4. d | % 71 - e2.:m7 | % 72 - c4. d | % 73 - c4. d:sus4 | % 74 - g2. | % 75 - } + g2. | % 60 + c4. d | % 61 + g2. | % 62 + c4. d | % 63 + g2. | % 64 + c4. d | % 65 + c4. d:sus4 | % 66 + g2. | % 67 + + g2. | % 68 + c4. d | % 69 + g2. | % 70 + c4. d | % 71 + e2.:m7 | % 72 + c4. d | % 73 + c4. d:sus4 | % 74 + g2. | % 75 c4. d:sus4 | % 76 g2. | % 77 @@ -388,62 +392,43 @@ 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 6/8 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny - \repeat volta 4 - { - c8-> c c c-> c c | % 1 - } - \alternative - { - { - c8-> c c c-> c c | % 2 - } - { - c2.-> | % 3 - } - } + c8-> c c c-> c c | % 1 - \repeat volta 2 - { - c8 c c c c c | % 4 - c8 c c c c c | % 5 - c8 c c c c c | % 6 - c8 c c c c c | % 7 - c8 c c c c c | % 8 - c8 c c c c c | % 9 - c8 c c c c c | % 10 - c8 c c c c c | % 11 - c8 c c c c c | % 12 - - c8 c c c c c | % 13 - c8 c c c c c | % 14 - c8 c c c c c | % 15 - c8 c c c c c | % 16 - c8 c c c c c | % 17 - c8 c c c c c | % 18 - c8 c c c c c | % 19 - } - \alternative - { - { - g2. ~ | % 20 - g2. | % 21 - } - { - c8 c c c c c | % 22 - } - } + c8-> c c c-> c c | % 2 + + c2.-> | % 3 + + c8 c c c c c | % 4 + c8 c c c c c | % 5 + c8 c c c c c | % 6 + c8 c c c c c | % 7 + c8 c c c c c | % 8 + c8 c c c c c | % 9 + c8 c c c c c | % 10 + c8 c c c c c | % 11 + c8 c c c c c | % 12 + + c8 c c c c c | % 13 + c8 c c c c c | % 14 + c8 c c c c c | % 15 + c8 c c c c c | % 16 + c8 c c c c c | % 17 + c8 c c c c c | % 18 + c8 c c c c c | % 19 + + g2. ~ | % 20 + g2. | % 21 + + c8 c c c c c | % 22 c8 c c c c c | % 23 c8 c c c c c | % 24 @@ -453,7 +438,7 @@ StaffC = \relative c c8 c c c c c | % 28 c8 c c c c c | % 29 c8 c c c c c | % 30 - c8 c c c c c \bar "||" % 31 + c8 c c c c c | % 31 c8 c c c c c | % 32 c8 c c c c c | % 33 @@ -465,27 +450,19 @@ StaffC = \relative c c8 c c c c c | % 39 c8 c c c c c | % 40 - \repeat volta 2 - { - c8 c c c c c | % 41 - c8 c c c c c | % 42 - c8 c c c c c | % 43 - c8 c c c c c | % 44 - c8 c c c c c | % 45 - c8 c c c c c | % 46 - c8 c c c c c | % 47 - } - \alternative - { - { - c8 c c c c c | % 48 - } - { - c2. ~ | % 49 - } - } + c8 c c c c c | % 41 + c8 c c c c c | % 42 + c8 c c c c c | % 43 + c8 c c c c c | % 44 + c8 c c c c c | % 45 + c8 c c c c c | % 46 + c8 c c c c c | % 47 + + c8 c c c c c | % 48 + + c2. ~ | % 49 - c2. \bar "||" % 50 + c2. | % 50 c8 c c c c c | % 51 c8 c c c c c | % 52 @@ -497,36 +474,30 @@ StaffC = \relative c c8 c c c c c | % 58 c8 c c c c c | % 59 - \repeat volta 2 - { - c8 c c c c c | % 60 - c8 c c c c c | % 61 - c8 c c c c c | % 62 - c8 c c c c c | % 63 - c8 c c c c c | % 64 - c8 c c c c c | % 65 - c8 c c c c c | % 66 - c8 c c c c c | % 67 - } - - \repeat volta 2 - { - c8 c c c c c | % 68 - c8 c c c c c | % 69 - c8 c c c c c | % 70 - c8 c c c c c | % 71 - c8 c c c c c | % 72 - c8 c c c c c | % 73 - c8 c c c c c | % 74 - c8 c c c c c | % 75 - } + c8 c c c c c | % 60 + c8 c c c c c | % 61 + c8 c c c c c | % 62 + c8 c c c c c | % 63 + c8 c c c c c | % 64 + c8 c c c c c | % 65 + c8 c c c c c | % 66 + c8 c c c c c | % 67 + + c8 c c c c c | % 68 + c8 c c c c c | % 69 + c8 c c c c c | % 70 + c8 c c c c c | % 71 + c8 c c c c c | % 72 + c8 c c c c c | % 73 + c8 c c c c c | % 74 + c8 c c c c c | % 75 c8 c c c c c | % 76 c8 c c c c c | % 77 c8 c c c c c | % 78 c8 c c c c c | % 79 c8 c c c c c | % 80 - c2.-\fermata \bar "|." % 81 + c2.-\fermata | % 81 } @@ -551,39 +522,25 @@ Dynamics = s2.*6 | % 61-66 s8 \< s s2 | % 67 s8_\ff s s2 | % 68 -%{ - s4_\markup { \italic { snare on 4, bass 8th notes } } s2. | % 1 - s1*26 | % 2-27 - s2 s4 \< s | % 28 - s4_\f s_\markup { \hspace #0.0 \raise #-2.0 \italic { snare 2 & 4 } } s2 | % 29 - s1*8 | % 30-37 - s2 s4 \< s \! | % 38 - s1 | % 39 - s2. s8 \> s \! | % 40 - s4_\markup { \hspace #0.0 \raise #-2.0 \italic { bass 8th notes, band builds each repeat } } s2. | % 41 - s1*8 | % 42-49 - s4 \< s2. | % 50 - s4_\f s2. | % 51 - s1*5 | % 52-56 - s4_\markup { \hspace #0.0 \raise #-2.0 \italic { rit. last time } } s2. | % 57 - s2 s4 \< s \! | % 58 -%} } \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 ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords + \new RhythmicStaff << \StaffC \Dynamics >> >> \set Score.skipBars = ##t @@ -594,11 +551,11 @@ 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 @@ -609,6 +566,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) } + diff --git a/show-me-your-glory.ly b/show-me-your-glory.ly index 582da14..715dc21 100644 --- a/show-me-your-glory.ly +++ b/show-me-your-glory.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 "Show Me Your Glory" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Third Day" } 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-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 = { \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -102,12 +98,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 - r1 | % 1 r1 | % 2 r1 | % 3 @@ -160,6 +150,7 @@ LeadVox = \relative c'' r1-\fermata | % 40 } + LeadVoxText = \lyricmode { Caught a glimpse of your splen -- dor @@ -200,11 +191,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { - \clef G - \override NoteHead #'style = #'cross -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro %{ \tiny @@ -283,11 +269,9 @@ Chords = \chordmode % Rhythm = \relative c { -%% \set Voice.autoBeaming = ##f -%% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash -\teeny + \teeny c4 c c c | % 1 c4 c c8. c16 ~ c8 c ~ | % 2 @@ -364,36 +348,36 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff + \context Staff << - \new ChordNames \Chords -%Capo 4 edition -% \new ChordNames \transpose b g \Chords - \new RhythmicStaff << \Rhythm \Dynamics >> - >> - - \new 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 >> + >> >> } \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 @@ -404,6 +388,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) } + diff --git a/show-me-your-ways-o-lord.ly b/show-me-your-ways-o-lord.ly index fe7e0f1..ca55f3b 100644 --- a/show-me-your-ways-o-lord.ly +++ b/show-me-your-ways-o-lord.ly @@ -1,100 +1,133 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(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 "Show Me Your Ways, O Lord" } } composer = \markup { \override #'(font-family . sans) "Ed Smart" } -% arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.2" +% arranger = \markup { \override #'(font-family . sans) "arr." } + 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.instrumentName = #"Lead vox" \clef G \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1 | % 1 - R1 | % 2 - R1 | % 3 - r2 r4. d8 \bar "||:" % 4 - - % Verse + s1*4 \bar ".|:-||" % 1-4 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - d4 d8 e ~ e4 e8 g ~ | % 5 - g8 fs e fs ~ fs2 | % 6 - r4 b,8 cs d4 fs8 e ~ | % 7 - e2. r8 d | % 8 - d4 d8 e ~ e e e g ~ | % 9 - g8 fs e fs ~ fs2 | % 10 - r4 b,8 cs d4 e8 fs ~ | % 11 - fs8 g fs e ~ e2 \bar "||" % 12 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 5-12 % Prechorus -\mark \markup { \override #'(font-family . sans) { \box { A9 } } } - - r4 b'8 b b4 b8 a ~ | % 13 - a4 a8 fs ~ fs4. d8 | % 14 - b'8 b b b ~ b b4 as8 ~ | % 15 - as8 as4 b8 ~ b cs ~ cs4 \bar "||" % 16 + \mark \markup { \override #'(font-family . sans) { \box { A9 } } } + s1*4 \bar "||" % 13-16 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - d8 d d cs ~ cs4 a16 ( fs ) b8 ~ | % 17 - b2 r | % 18 - d4. cs8 ~ cs4 a16 ( fs ) b8 ~ | % 19 - b2 r | % 20 - b8 b b b as b cs d ~ | % 21 - d4. e8 ( ~ e d ) cs cs ~ | % 22 - cs8 b ~ b2 d8 b ~ | % 23 - b8 a8 ~ a2 fs8 fs ( ~ | % 24 - fs8 g ) ~ g2. ~ | % 25 - g4. g8 g fs d d ~ | % 26 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*10 | % 17-26 } \alternative { { - d2 r | % 27 - R1 | % 28 - R1 | % 29 - r2 r4. d8 | % 30 + s1*4 | % 27-30 } { - d2 \repeatTie r | % 31 + s1 | % 31 } } - + + % Bridge + + s1*7 \bar "||" % 32-38 + + % Prechorus + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*4 \bar "||" % 39-42 + + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s1*14 \bar "||" % 43-56 + + % Ending + + \mark \markup { \override #'(font-family . sans) { \box { E } } } + s1*5 \bar "|." % 57-61 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + R1*3 | % 1-3 + r2 r4. d8 | % 4 + + % Verse + + d4 d8 e ~ e4 e8 g ~ | % 5 + g8 fs e fs ~ fs2 | % 6 + r4 b,8 cs d4 fs8 e ~ | % 7 + e2. r8 d | % 8 + d4 d8 e ~ e e e g ~ | % 9 + g8 fs e fs ~ fs2 | % 10 + r4 b,8 cs d4 e8 fs ~ | % 11 + fs8 g fs e ~ e2 \bar "||" % 12 + + % Prechorus + + r4 b'8 b b4 b8 a ~ | % 13 + a4 a8 fs ~ fs4. d8 | % 14 + b'8 b b b ~ b b4 as8 ~ | % 15 + as8 as4 b8 ~ b cs ~ cs4 \bar "||" % 16 + + % Chorus + + d8 d d cs ~ cs4 a16 ( fs ) b8 ~ | % 17 + b2 r | % 18 + d4. cs8 ~ cs4 a16 ( fs ) b8 ~ | % 19 + b2 r | % 20 + b8 b b b as b cs d ~ | % 21 + d4. e8 ( ~ e d ) cs cs ~ | % 22 + cs8 b ~ b2 d8 b ~ | % 23 + b8 a8 ~ a2 fs8 fs ( ~ | % 24 + fs8 g ) ~ g2. ~ | % 25 + g4. g8 g fs d d ~ | % 26 + + d2 r | % 27 + R1 | % 28 + R1 | % 29 + r2 r4. d8 | % 30 + + d2 \repeatTie r | % 31 + % Bridge r2 g8 fs d d ~ | % 32 @@ -104,31 +137,17 @@ LeadVox = \relative c' << { \voiceTwo r2 g8 fs d d ~ } \context Voice = vb { \voiceOne fs8 d ~ d2. } >> | % 36 \oneVoice d4 r r2 | % 37 - R1 \bar "||" % 38 - -%{ - << { gs,8 b e gs, b e a, b ds a b ds } - \context Voice = vb { \stemUp gs2 fs4 b \stemNeutral } >> | % 8 - - r2 fs8 g a d ~ | % 33 - d8 c b c ~ c b a a ~ | % 34 - a2. d,16 e fs8 ~ | % 35 - fs8 d ~ d2. | % 36 -%} + R1 | % 38 % Prechorus -\mark \markup { \override #'(font-family . sans) { \box { C } } } - r4 b'8 b b4 b8 a ~ | % 39 a8 a4 fs8 ~ fs4. d8 | % 40 b'8 b b b b4 b8 as ~ | % 41 - as8 as4 b8 ~ b cs ~ cs4 \bar "||" % 42 + as8 as4 b8 ~ b cs ~ cs4 | % 42 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { D } } } - d8 d d cs ~ cs4 a16 ( fs ) b8 ~ | % 43 b2 r | % 44 d4. cs8 ~ cs4 a16 ( fs ) b8 ~ | % 45 @@ -142,19 +161,18 @@ LeadVox = \relative c' cs8 b4. ~ b4 d8 b ~ | % 53 b8 a4. ~ a4 fs8 fs ( ~ | % 54 fs8 g8 ) ~ g2. ~ | % 55 - g4. g8 g fs d d ~ \bar "||" % 56 + g4. g8 g fs d d ~ | % 56 % Ending -\mark \markup { \override #'(font-family . sans) { \box { E } } } - d4 r r2 | % 57 r2 g8 fs d d ~ | % 58 d4 r r2 | % 59 r2 g8 fs d4 | % 60 - d1^\fermata \bar "|." % 61 + d1^\fermata | % 61 } + LeadVoxText = \lyricmode { To you O Lord, _ I lift _ up my soul _ @@ -193,58 +211,6 @@ LeadVoxText = \lyricmode For you are my God _ You are my God _ You are my God - -%{ -To you, Oh Lord, I lift up my soul -For in you I trust -In all your ways you are faithful and true -So to you I give all my hope -You Oh Lord are truly good -And you are the one that I desire - -Show me your ways, Oh Lord -Teach me your paths -Guide me in the light of your truth -Lord, and teach me -Oh teach me -My Lord -For you are my God - -My eyes will ever look to you Lord -For in you I trust -And I will never be ashamed -For its you that's giving me hope -You Oh Lord are truly good -And you are the one that I desire - -Show me your ways, Oh Lord -Teach me your paths -Guide me in the light of your truth -Lord, and teach me -Oh teach me -My Lord -For you are my God - -You are my God (You are my God and my Savior) -You are my God (You are my God) -You are my God - -You Oh Lord are truly good -Please guide me in the way that you desire - -Show me your ways, Oh Lord -Teach me your paths -Guide me in the light of your truth - -Lord, and teach me - -Please teach me -Oh teach me -My Lord -For you are my God -You are my God -You are my God -%} } LeadVoxTextB = \lyricmode @@ -261,15 +227,12 @@ LeadDescant = \lyricmode You are my _ God _ } + % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro d2.. a8:m11 | % 1 @@ -279,52 +242,42 @@ Chords = \chordmode % Verse - \repeat volta 2 - { - % Verse + d4. a2:m11 g8 | % 5 + s4. d s4 | % 6 + g2.. a8:sus4 | % 7 + s2 a | % 8 + b4.:m7 a2:11^9.7 g8 | % 9 + s4. d s4 | % 10 + g2.. d8/a | % 11 + s4. a s4 | % 12 - d4. a2:m11 g8 | % 5 - s4. d s4 | % 6 - g2.. a8:sus4 | % 7 - s2 a | % 8 - b4.:m7 a2:11^9.7 g8 | % 9 - s4. d s4 | % 10 - g2.. d8/a | % 11 - s4. a s4 | % 12 + % Prechorus - % Prechorus + g2.. d8/fs | % 13 + s1 | % 14 + g2..:maj7 fs8:7 | % 15 + s1 | % 16 - g2.. d8/fs | % 13 - s1 | % 14 - g2..:maj7 fs8:7 | % 15 - s1 | % 16 + % Chorus - % Chorus + b4.:m7 a2:11^9.7 g8 | % 17 + s1 | % 18 + b4.:m7 fs2:m7 g8 | % 19 + s1 | % 20 + g2:maj7 fs4.:7 b8:m7 | % 21 + s4. a2 g8:sus2 | % 22 + s2.. d8/fs | % 23 + s2.. a8:m11 | % 24 + s1 | % 25 + c1:sus2 | % 26 + + d2.. a8:m11 | % 27 + s2 c:sus2 | % 28 + d2.. a8:m11 | % 29 + s2 c:sus2 | % 30 + + d2.. a8:m11 | % 31 - b4.:m7 a2:11^9.7 g8 | % 17 - s1 | % 18 - b4.:m7 fs2:m7 g8 | % 19 - s1 | % 20 - g2:maj7 fs4.:7 b8:m7 | % 21 - s4. a2 g8:sus2 | % 22 - s2.. d8/fs | % 23 - s2.. a8:m11 | % 24 - s1 | % 25 - c1:sus2 | % 26 - } - \alternative - { - { - d2.. a8:m11 | % 27 - s2 c:sus2 | % 28 - d2.. a8:m11 | % 29 - s2 c:sus2 | % 30 - } - { - d2.. a8:m11 | % 31 - } - } - % Bridge s2 c:sus2 | % 32 @@ -372,16 +325,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... - StaffC = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash % Intro @@ -389,56 +335,46 @@ StaffC = \relative c c4_\mf c c r8 c ~ | % 1 c4 c c c | % 2 c4 c c r8 c ~ | % 3 - c4 c c c \bar "||:" % 4 + c4 c c c | % 4 % Verse - \repeat volta 2 - { - % Verse + c4._\markup { \italic { piano/vocal, shaker 1st time } } c8 ~ c4. c8 ~ | % 5 + c4. c8 ~ c4 c | % 6 + c4 c c r8 c ~ | % 7 + c4 c c c | % 8 + c4. c8 ~ c4. c8 ~ | % 9 + c4. c8 ~ c4 c | % 10 + c4 c c r8 c ~ | % 11 + c4. c8 ~ c4 c | % 12 - c4._\markup { \italic { piano/vocal, shaker 1st time } } c8 ~ c4. c8 ~ | % 5 - c4. c8 ~ c4 c | % 6 - c4 c c r8 c ~ | % 7 - c4 c c c | % 8 - c4. c8 ~ c4. c8 ~ | % 9 - c4. c8 ~ c4 c | % 10 - c4 c c r8 c ~ | % 11 - c4. c8 ~ c4 c \bar "||" % 12 + % Prechorus - % Prechorus + c4 c c r8 c ~ | % 13 + c4 c c c | % 14 + c4 c c r8 c ~ | % 15 + c8 c4 << { c8 ~ c c ~ c4 } \context Voice = vc { s8 s16 \< s4. s16 \! } >> | % 16 - c4 c c r8 c ~ | % 13 - c4 c c c | % 14 - c4 c c r8 c ~ | % 15 - c8 c4 << { c8 ~ c c ~ c4 } \context Voice = vc { s8 s16 \< s4. s16 \! } >> \bar "||" % 16 + % Chorus - % Chorus + c4._\markup { \dynamic f \italic { bass in } } c8 ~ c4. c8 ~ | % 17 + c4 c c c | % 18 + c4. c8 ~ c4. c8 ~ | % 19 + c4 c c c | % 20 + c4 c c r8 c ~ | % 21 + c4. c8 ~ c4. c8 ~ | % 22 + c4 c c r8 c ~ | % 23 + c4 c c r8 c ~ | % 24 + c4 c c c | % 25 + c4 c c << c \context Voice = vc { s16 \< s s s \! } >> | % 26 + + c4_\markup { \italic { band in w/conga } } c c r8 c ~ | % 27 + c4 c c c | % 28 + c4 c c r8 c ~ | % 29 + c4 c c c | % 30 + + c4_\ff c c r8 c ~ | % 31 - c4._\markup { \dynamic f \italic { bass in } } c8 ~ c4. c8 ~ | % 17 - c4 c c c | % 18 - c4. c8 ~ c4. c8 ~ | % 19 - c4 c c c | % 20 - c4 c c r8 c ~ | % 21 - c4. c8 ~ c4. c8 ~ | % 22 - c4 c c r8 c ~ | % 23 - c4 c c r8 c ~ | % 24 - c4 c c c | % 25 - c4 c c << c \context Voice = vc { s16 \< s s s \! } >> | % 26 - } - \alternative - { - { - c4_\markup { \italic { band in w/conga } } c c r8 c ~ | % 27 - c4 c c c | % 28 - c4 c c r8 c ~ | % 29 - c4 c c c | % 30 - } - { - c4_\ff c c r8 c ~ | % 31 - } - } - % Bridge c4 c c c | % 32 @@ -447,14 +383,14 @@ StaffC = \relative c c4 c c r8 c ~ | % 35 c4 c c c | % 36 c4 c c r8 c ~ | % 37 - c4 c c c \bar "||" % 38 + c4 c c c | % 38 % Prechorus c4 c c r8 c ~ | % 39 c4 c c c | % 40 c4 c c r8 c ~ | % 41 - c8 c4 c8 ~ c c ~ c4 \bar "||" % 42 + c8 c4 c8 ~ c c ~ c4 | % 42 % Chorus @@ -471,7 +407,7 @@ StaffC = \relative c c4 c c r8 c ~ | % 53 c4 c c r8 c ~ | % 54 c4 c c c | % 55 - c1 \bar "||" % 56 + c1 | % 56 % Ending @@ -479,44 +415,51 @@ StaffC = \relative c c4 c c c | % 58 c4 c c r8 c ~ | % 59 c4_\markup { \italic { rit. } } c c c | % 60 - c1^\fermata \bar "|." % 61 + c1^\fermata | % 61 } \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 "vb" \LeadDescant >> - \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 } + diff --git a/silent-night.ly b/silent-night.ly index 0fac93b..88827dd 100644 --- a/silent-night.ly +++ b/silent-night.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) @@ -10,78 +10,88 @@ 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 "Silent Night" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Franz Gruber" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.8" + 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.instrumentName = #"Lead vox" \clef G \key bf \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - r2. | % 1 - r2. | % 2 - r2. | % 3 - r2. | % 4 + s2.*4 | % 1-4 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - f4. ( g8 ) f4 | % 5 - d2. | % 6 - f4. ( g8 ) f4 | % 7 - d2. | % 8 - c'2 c4 | % 9 - a2. | % 10 - bf2 bf4 | % 11 - f2. \bar "||" % 12 - -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - g2 g4 | % 13 - bf4. ( a8 ) g4 | % 14 - f4. g8 f4 | % 15 - d2. | % 16 - g2 g4 | % 17 - bf4. ( a8 ) g4 | % 18 - f4. g8 f4 | % 19 - d2. \bar "||" % 20 - - c'2 c4 | % 21 - ef4. c8 a4 | % 22 - bf2. ( | % 23 - d2. ) | % 24 - bf4 ( f ) d | % 25 - f4. ef8 c4 | % 26 - bf2. ~ | % 27 - bf2. | % 28 - - r2. | % 29 - r2. | % 30 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s2.*8 \bar "||" % 5-12 + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s2.*8 \bar "||" % 13-20 + s2.*10 | % 21-30 } - r2.^\fermata \bar "|." % 31 + s2. \bar "|." % 31 } + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + r2.*4 | % 1-4 + + % Verse + + f4. ( g8 ) f4 | % 5 + d2. | % 6 + f4. ( g8 ) f4 | % 7 + d2. | % 8 + c'2 c4 | % 9 + a2. | % 10 + bf2 bf4 | % 11 + f2. | % 12 + + g2 g4 | % 13 + bf4. ( a8 ) g4 | % 14 + f4. g8 f4 | % 15 + d2. | % 16 + g2 g4 | % 17 + bf4. ( a8 ) g4 | % 18 + f4. g8 f4 | % 19 + d2. | % 20 + + c'2 c4 | % 21 + ef4. c8 a4 | % 22 + bf2. ( | % 23 + d2. ) | % 24 + bf4 ( f ) d | % 25 + f4. ef8 c4 | % 26 + bf2. ~ | % 27 + bf2. | % 28 + + r2. | % 29 + r2. | % 30 + + r2.^\fermata | % 31 +} + + LeadVoxText = \lyricmode { Si -- _ lent night, ho -- _ ly night, @@ -118,12 +128,8 @@ LeadVoxTextC = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro bf2.:sus2 | % 1 @@ -131,37 +137,37 @@ Chords = \chordmode bf2.:sus2 | % 3 ef2.:maj9 | % 4 - \repeat volta 2 - { - % Verse - - bf2.:sus2 | % 5 - ef2.:maj9 | % 6 - bf2.:sus2 | % 7 - bf2. | % 8 - c2.:m11 | % 9 - f2.:7 | % 10 - bf2. | % 11 - f2.:m7/bf | % 12 - ef2.:maj7 | % 13 - c2.:m11 | % 14 - d2.:m7 | % 15 - g2.:m11 | % 16 - ef2.:maj7 | % 17 - c2.:m11 | % 18 - d2.:m7 | % 19 - g2.:m11 | % 20 - af2.:5.9 | % 21 - ef2/f f4:7 | % 22 - g2.:m7 | % 23 - c2.:sus2/e | % 24 - bf2./f | % 25 - ef2./f | % 26 - bf2.:sus2 | % 27 - ef2.:maj9 | % 28 - bf2.:sus2 | % 29 - ef2.:maj9 | % 30 - } + % Verse + + bf2.:sus2 | % 5 + ef2.:maj9 | % 6 + bf2.:sus2 | % 7 + bf2. | % 8 + c2.:m11 | % 9 + f2.:7 | % 10 + bf2. | % 11 + f2.:m7/bf | % 12 + + ef2.:maj7 | % 13 + c2.:m11 | % 14 + d2.:m7 | % 15 + g2.:m11 | % 16 + ef2.:maj7 | % 17 + c2.:m11 | % 18 + d2.:m7 | % 19 + g2.:m11 | % 20 + + af2.:3.5.9 | % 21 + ef2/f f4:7 | % 22 + g2.:m7 | % 23 + c2.:sus2/e | % 24 + bf2./f | % 25 + ef2./f | % 26 + bf2.:sus2 | % 27 + ef2.:maj9 | % 28 + + bf2.:sus2 | % 29 + ef2.:maj9 | % 30 bf2.:sus2 | % 31 } @@ -170,17 +176,11 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 3/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -189,39 +189,39 @@ StaffC = \relative c c4 c c | % 3 c4 c c | % 4 - \repeat volta 2 - { - % Verse - - c4 c c | % 5 - c4 c c | % 6 - c4 c c | % 7 - c4 c c | % 8 - c4 c c | % 9 - c4 c c | % 10 - c4 c c | % 11 - c4 c c | % 12 - c4 c c | % 13 - c4 c c | % 14 - c4 c c | % 15 - c4 c c | % 16 - c4 c c | % 17 - c4 c c | % 18 - c4 c c | % 19 - c4 c c | % 20 - c4 c c | % 21 - c4 c c | % 22 - c4 c c | % 23 - c4 c c | % 24 - c4 c c | % 25 - c4 c c | % 26 - c4 c c | % 27 - c4 c c | % 28 - c4 c c | % 29 - c4 c c | % 30 - } - - c2.^\fermata \bar "|." % 31 + % Verse + + c4 c c | % 5 + c4 c c | % 6 + c4 c c | % 7 + c4 c c | % 8 + c4 c c | % 9 + c4 c c | % 10 + c4 c c | % 11 + c4 c c | % 12 + + c4 c c | % 13 + c4 c c | % 14 + c4 c c | % 15 + c4 c c | % 16 + c4 c c | % 17 + c4 c c | % 18 + c4 c c | % 19 + c4 c c | % 20 + + c4 c c | % 21 + c4 c c | % 22 + c4 c c | % 23 + c4 c c | % 24 + c4 c c | % 25 + c4 c c | % 26 + c4 c c | % 27 + c4 c c | % 28 + + c4 c c | % 29 + c4 c c | % 30 + + c2.^\fermata | % 31 } @@ -237,40 +237,44 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff { \new Voice = "lead" \LeadVox } -% \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC >> - \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 } + diff --git a/spirit-of-god-descend-upon-my-heart-satb.ly b/spirit-of-god-descend-upon-my-heart-satb.ly index a84f47b..e9383e4 100644 --- a/spirit-of-god-descend-upon-my-heart-satb.ly +++ b/spirit-of-god-descend-upon-my-heart-satb.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) @@ -22,16 +22,29 @@ staffSize = #20 % -% Lead vocal +% Song's structure % +Global = +{ +% \clef G + \key bf \major + \numericTimeSignature + \time 4/4 + + % Verse + + s1*16 \bar "||" % 1-16 + s1 \bar "|." % 17 +} + +% +% Lead vocal +% LeadVox = \relative c' { \set Staff.instrumentName = #"Sop." \clef G - \key bf \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 % Verse @@ -53,17 +66,15 @@ LeadVox = \relative c' d2 c4 bf | % 13 a4 g f bf | % 14 f2 f | % 15 - f1 \bar "||" % 16 - g2 f \bar "|." % 17 + f1 | % 16 + g2 f | % 17 } + AltoVox = \relative c' { \set Staff.instrumentName = #"Alto" \clef G - \key bf \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 % Verse @@ -85,17 +96,15 @@ AltoVox = \relative c' d2 ef4 f | % 13 f4 ef d ef | % 14 d2 ef | % 15 - d1 \bar "||" % 16 - ef2 d \bar "|." % 17 + d1 | % 16 + ef2 d | % 17 } + TenorVox = \relative c { \set Staff.instrumentName = #"Tenor" \clef F - \key bf \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 % Verse @@ -117,17 +126,15 @@ TenorVox = \relative c bf4 ( g ) a bf | % 13 bf4 bf bf bf | % 14 bf2 a | % 15 - bf1 \bar "||" % 16 - bf2 bf \bar "|." % 17 + bf1 | % 16 + bf2 bf | % 17 } + BassVox = \relative c { \set Staff.instrumentName = #"Bass" \clef F - \key bf \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 % Verse @@ -149,14 +156,8 @@ BassVox = \relative c bf,2 c4 d | % 13 ef4 ef f g | % 14 f2 f | % 15 - bf,1 \bar "||" % 16 - ef2 bf \bar "|." % 17 -} - - -Riffs = \relative c' -{ - \teeny + bf,1 | % 16 + ef2 bf | % 17 } @@ -226,17 +227,19 @@ Dynamics = \score { << - \new ChoirStaff = "Rhythm" +% \Global % The "roadmap" that everything else depends on + + \new ChoirStaff << - \new Staff = UpperStaffA { \new Voice = "lead" \LeadVox } + \new Staff << \Global \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 Lyrics \lyricsto "lead" \LeadVoxTextE - \new Staff = UpperStaffB { \new Voice = "alto" \AltoVox } - \new Staff = LowerStaffA { \new Voice = "tenor" \TenorVox } - \new Staff = LowerStaffB { \new Voice = "bass" \BassVox } + \new Staff << \Global \new Voice = "alto" \AltoVox >> + \new Staff << \Global \new Voice = "tenor" \TenorVox >> + \new Staff << \Global \new Voice = "bass" \BassVox >> >> \set Score.skipBars = ##t @@ -247,11 +250,11 @@ 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 @@ -262,6 +265,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) } + diff --git a/spirit-of-the-living-god.ly b/spirit-of-the-living-god.ly index 603cf03..c04c583 100644 --- a/spirit-of-the-living-god.ly +++ b/spirit-of-the-living-god.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) @@ -10,84 +10,103 @@ 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 "Spirit of the Living God" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.6" + 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.instrumentName = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1 | % 1 - R1 | % 2 - R1 | % 3 - R1 \bar "||:" % 4 + s1*4 \bar ".|:-||" % 4 \repeat volta 3 { % A section -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - a4. a8 a4 a | % 5 - g4 a bf2 | % 6 - a4. f8 f4 g | % 7 - a1 | % 8 - - a4. a8 a4 a | % 9 - g4 a bf2 | % 10 - a4. f8 f4 g | % 11 - f1 \bar "||" % 12 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 5-12 % B section -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - bf2 bf | % 13 - a2 a | % 14 - b2 b | % 15 - c2 c4 ( bf ) \bar "||" % 16 + s1*4 \bar "||" % 13-16 % A section -\mark \markup { \override #'(font-family . sans) { \box { C } } } - - a4. a8 a4 a | % 17 - g4 a bf2 | % 18 - a4. f8 f4 g | % 19 + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*3 | % 17-19 } \alternative { { - f1 | % 20 + s1 | % 20 } { - f1^\markup { \hspace #8.0 \raise #1.0 \bold { D.S. } } \bar "||" % 21 + s1^\markup { \hspace #8.0 \raise #1.0 \bold { D.S. } } \bar "||" % 21 } { - f1^\fermata \bar "|." % 22 + s1 \bar "|." % 22 } } } + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + R1*4 | % 1-4 + + % A section + + a4. a8 a4 a | % 5 + g4 a bf2 | % 6 + a4. f8 f4 g | % 7 + a1 | % 8 + + a4. a8 a4 a | % 9 + g4 a bf2 | % 10 + a4. f8 f4 g | % 11 + f1 | % 12 + + % B section + + bf2 bf | % 13 + a2 a | % 14 + b2 b | % 15 + c2 c4 ( bf ) | % 16 + + % A section + + a4. a8 a4 a | % 17 + g4 a bf2 | % 18 + a4. f8 f4 g | % 19 + + f1 | % 20 + + f1 | % 21 + + f1^\fermata | % 22 +} + + LeadVoxText = \lyricmode { Spi- rit of the li- ving God @@ -110,12 +129,8 @@ LeadVoxText = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro f2 f4:maj7 f:7 | % 1 @@ -123,144 +138,127 @@ Chords = \chordmode f2/c bf4/c c | % 3 f2 bf/c | % 4 - \repeat volta 3 - { - % A section + % A section - f2 f4:maj7 f:7 | % 5 - bf4:6 d:7/a g2:m7 | % 6 - f2/c bf4/c c | % 7 - f2 bf/c | % 8 + f2 f4:maj7 f:7 | % 5 + bf4:6 d:7/a g2:m7 | % 6 + f2/c bf4/c c | % 7 + f2 bf/c | % 8 - f2 f4:maj7 f:7 | % 9 - bf4:6 d:7/a g2:m7 | % 10 - f2/c bf4/c c | % 11 - f2 f:7 | % 12 + f2 f4:maj7 f:7 | % 9 + bf4:6 d:7/a g2:m7 | % 10 + f2/c bf4/c c | % 11 + f2 f:7 | % 12 - % B section + % B section - bf2 g:m7 | % 13 - f1 | % 14 - g1:7 | % 15 - c4 bf:sus2/d c2:7/e | % 16 + bf2 g:m7 | % 13 + f1 | % 14 + g1:7 | % 15 + c4 bf:sus2/d c2:7/e | % 16 - % A section + % A section - f2 f4:maj7 f:7 | % 17 - bf4:6 d:7/a g2:m7.5- | % 18 - f2/c bf4/c c | % 19 - } - \alternative - { - { - f2 bf/c | % 20 - } - { - f2 f:7 | % 21 - } - { - f1 | % 22 - } - } + f2 f4:maj7 f:7 | % 17 + bf4:6 d:7/a g2:m7.5- | % 18 + f2/c bf4/c c | % 19 + + f2 bf/c | % 20 + + f2 f:7 | % 21 + + f1 | % 22 } % % 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 c4 c c c | % 1 c4 c c c | % 2 c4 c c c | % 3 - c4 c c c \bar "||:" % 4 + c4 c c c | % 4 - \repeat volta 3 - { - % A section + % A section - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c \bar "||" % 12 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 - % B section + % B section - c4 c c c | % 13 - c4 c c c | % 14 - c4 c c c | % 15 - c4 c c c \bar "||" % 16 + c4 c c c | % 13 + c4 c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 - % A section + % A section - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - } - \alternative - { - { - c4 c c c | % 20 - } - { - c4 c c c | % 21 - } - { - c1^\fermata \bar "|." % 22 - } - } + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + + c4 c c c | % 20 + + c4 c c c | % 21 + + c1^\fermata | % 22 } \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 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 } + diff --git a/stand-in-the-congregation.ly b/stand-in-the-congregation.ly index 13e4d11..ca94fc5 100644 --- a/stand-in-the-congregation.ly +++ b/stand-in-the-congregation.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) @@ -21,101 +21,57 @@ staffSize = #18 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f \repeat volta 2 { % Intro - r1 | % 1 - r1 | % 2 + s1*2 | % 1-2 } \alternative { { - r1 | % 3 - r1 | % 4 + s1*2 | % 3-4 } { - r1 | % 5 + s1 | % 5 } } - r2 ef4 f \bar "||" % 6 + + s1 \bar "||" % 6 % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - g4 g8 g g4 f8 f ~ | % 7 - f8 ef4 bf8 ef4 f8 ef | % 8 - g2 ( f4. ) ef8 ~ | % 9 - ef4 r d ef | % 10 - f4 f8 f f4 f8 f ~ | % 11 - f bf,4 bf8 ef4 f8 ef | % 12 - g2 ( f4. ) ef8 ~ | % 13 - ef4 r ef f | % 14 - g8 g g g ~ g f4 f8 ~ | % 15 - f8 ef ~ ef4 ef f | % 16 - g2 bf4. af8 ~ | % 17 - af2 r4 c | % 18 - bf2 ( g4 ef ) | % 19 - g2 ( f4. ) ef8 ~ | % 20 - ef1 | % 21 - r2 ef4 f \bar "||:" % 22 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*16 \bar ".|:-||" % 7-22 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - g4 g8 g g4 f8 f ~ | % 23 - f8 ef4 bf8 ef4 f8 ef | % 24 - g2 ( f4.) ef8 ~ | % 25 - ef4 r d ef | % 26 - f4 f8 f f4 f8 f ~ | % 27 - f bf,4 bf8 ef4 f8 ef | % 28 - g2 ( f4. ) ef8 ~ | % 29 - ef4 r ef f | % 30 - g8 g g g ~ g f4 f8 ~ | % 31 - f8 ef ~ ef4 ef f | % 32 - g2 bf4. af8 ~ | % 33 - af2 r4 c | % 34 - bf2 ( g4 ef ) | % 35 - g2 ( f4. ) ef8 ~ | % 36 - ef1 | % 37 - r2 ef4 bf' \bar "||" % 38 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*16 \bar "||" % 23-38 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { C } } } - - bf2 ( ~ bf8 f4 ) f8 ~ | % 39 - f2 ef4 bf' | % 40 - bf2 ( ~ bf8 g4 ) g8 ~ | % 41 - g2 ef4 bf' | % 42 - c2 ( ~ c8 bf4 ) af8 ~ | % 43 - af2 f4 c' | % 44 - d2 ( c4. ) bf8 ~ | % 45 + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*7 | % 39-45 } \alternative { { - bf4 r ef, f | % 46 + s1 | % 46 } { - bf4 r f g \bar "||" % 47 + s1 \bar "||" % 47 } } @@ -123,7 +79,93 @@ LeadVox = \relative c' \key f \major -\mark \markup { \override #'(font-family . sans) { \box { D } } } + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s1*12 | % 48-59 + + \repeat volta 2 + { + s1*4 | % 60-63 + } + + s1*5 \bar "|." % 64-68 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + \repeat volta 2 + { + % Intro + + r1*2 | % 1-2 + } + \alternative + { + { + r1*2 | % 3-4 + } + { + r1 | % 5 + } + } + r2 ef4 f | % 6 + + % Verse + + g4 g8 g g4 f8 f ~ | % 7 + f8 ef4 bf8 ef4 f8 ef | % 8 + g2 ( f4. ) ef8 ~ | % 9 + ef4 r d ef | % 10 + f4 f8 f f4 f8 f ~ | % 11 + f bf,4 bf8 ef4 f8 ef | % 12 + g2 ( f4. ) ef8 ~ | % 13 + ef4 r ef f | % 14 + g8 g g g ~ g f4 f8 ~ | % 15 + f8 ef ~ ef4 ef f | % 16 + g2 bf4. af8 ~ | % 17 + af2 r4 c | % 18 + bf2 ( g4 ef ) | % 19 + g2 ( f4. ) ef8 ~ | % 20 + ef1 | % 21 + r2 ef4 f | % 22 + + % Verse + + g4 g8 g g4 f8 f ~ | % 23 + f8 ef4 bf8 ef4 f8 ef | % 24 + g2 ( f4.) ef8 ~ | % 25 + ef4 r d ef | % 26 + f4 f8 f f4 f8 f ~ | % 27 + f bf,4 bf8 ef4 f8 ef | % 28 + g2 ( f4. ) ef8 ~ | % 29 + ef4 r ef f | % 30 + g8 g g g ~ g f4 f8 ~ | % 31 + f8 ef ~ ef4 ef f | % 32 + g2 bf4. af8 ~ | % 33 + af2 r4 c | % 34 + bf2 ( g4 ef ) | % 35 + g2 ( f4. ) ef8 ~ | % 36 + ef1 | % 37 + r2 ef4 bf' | % 38 + + % Chorus + + bf2 ( ~ bf8 f4 ) f8 ~ | % 39 + f2 ef4 bf' | % 40 + bf2 ( ~ bf8 g4 ) g8 ~ | % 41 + g2 ef4 bf' | % 42 + c2 ( ~ c8 bf4 ) af8 ~ | % 43 + af2 f4 c' | % 44 + d2 ( c4. ) bf8 ~ | % 45 + + bf4 r ef, f | % 46 + + bf4 r f g | % 47 + + % Verse a4 a8 a a4 g8 g ~ | % 48 g8 f4 c8 f4 g8 f | % 49 @@ -138,21 +180,19 @@ LeadVox = \relative c' a2 c4. bf8 ~ | % 58 bf2 r4 d4 | % 59 - \repeat volta 2 - { - c2 ( a4 f ) | % 60 - a2 ( g4. ) f8 ~ | % 61 - f1 | % 62 - r2 r4 d' | % 63 - } + c2 ( a4 f ) | % 60 + a2 ( g4. ) f8 ~ | % 61 + f1 | % 62 + r2 r4 d' | % 63 c2 ( a4 f ) | % 64 a2 ( g4. ) f8 ~ | % 65 f1 | % 66 r1 | % 67 - r1 \bar "|." % 68 + r1 | % 68 } + LeadVoxText = \lyricmode { I will stand in the con -- gre -- ga -- _ tion @@ -213,31 +253,18 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -% Do we need this anymore??? -% \override SeparatingGroupSpanner #'padding = #'2.0 -%Bah, can't we set this globally? -% \popChords + % Intro - \repeat volta 2 - { - % Intro + df2./ef s8 af8/ef | % 1 + s1 | % 2 + + ef1 | % 3 + s1 | % 4 + + ef2. s8 af8/bf | % 5 - df2./ef s8 af8/ef | % 1 - s1 | % 2 - } - \alternative - { - { - ef1 | % 3 - s1 | % 4 - } - { - ef2. s8 af8/bf | % 5 - } - } s1 | % 6 % Verse @@ -259,46 +286,38 @@ Chords = \chordmode ef2. s8 af/bf | % 21 s1 | % 22 - \repeat volta 2 - { - % Verse - - ef1 | % 23 - s2 af/ef | % 24 - ef1 | % 25 - s1 | % 26 - bf1 | % 27 - s1 | % 28 - ef1 | % 29 - s2 af/bf | % 30 - ef1 | % 31 - s1 | % 32 - ef2./g s8 af | % 33 - s1 | % 34 - ef1/bf | % 35 - af2/bf bf | % 36 - ef2 s8 f4:m7 ef8/g | % 37 - s1 | % 38 - - % Chorus + % Verse - bf1 | % 29 - s1 | % 30 - ef1 | % 31 - s1 | % 32 - f1:7 | % 33 - s1 | % 34 - bf2:7 af4./c bf8/d | % 35 - } - \alternative - { - { - s1 | % 36 - } - { - s2 bf/c | % 37 - } - } + ef1 | % 23 + s2 af/ef | % 24 + ef1 | % 25 + s1 | % 26 + bf1 | % 27 + s1 | % 28 + ef1 | % 29 + s2 af/bf | % 30 + ef1 | % 31 + s1 | % 32 + ef2./g s8 af | % 33 + s1 | % 34 + ef1/bf | % 35 + af2/bf bf | % 36 + ef2 s8 f4:m7 ef8/g | % 37 + s1 | % 38 + + % Chorus + + bf1 | % 29 + s1 | % 30 + ef1 | % 31 + s1 | % 32 + f1:7 | % 33 + s1 | % 34 + bf2:7 af4./c bf8/d | % 35 + + s1 | % 36 + + s2 bf/c | % 37 % Verse @@ -315,13 +334,10 @@ Chords = \chordmode f2./a s8 bf | % 48 s1 | % 49 - \repeat volta 2 - { - f1/c | % 50 - bf2/c c | % 51 - d2.:m7 s8 bf | % 52 - s1 | % 53 - } + f1/c | % 50 + bf2/c c | % 51 + d2.:m7 s8 bf | % 52 + s1 | % 53 f1/c | % 54 bf2/d c/e | % 55 @@ -335,37 +351,26 @@ 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 - \repeat volta 2 - { - % Intro - c4 c c r8 c ~ | % 1 - c4 c c c | % 2 - } - \alternative - { - { - c4 c c c | % 3 - c4 c c c | % 4 - } - { - c4 c c r8 c ~ | % 5 - } - } - c4 c c c \bar "||" % 6 + % Intro + + c4 c c r8 c ~ | % 1 + c4 c c c | % 2 + + c4 c c c | % 3 + c4 c c c | % 4 + + c4 c c r8 c ~ | % 5 + + c4 c c c | % 6 % Verse @@ -384,48 +389,40 @@ StaffC = \relative c c4 c c c | % 19 c4 c c c | % 20 c4 c c r8 c ~ | % 21 - c4 c c c \bar "||:" % 22 + c4 c c c | % 22 - \repeat volta 2 - { - % Verse + % Verse - c4 c c c | % 23 - c4 c c c | % 24 - c4 c c c | % 25 - c4 c c c | % 26 - c4 c c c | % 27 - c4 c c c | % 28 - c4 c c c | % 29 - c4 c c c | % 30 - c4 c c c | % 31 - c4 c c c | % 32 - c4 c c r8 c ~ | % 33 - c4 c c c | % 34 - c4 c c c | % 35 - c4 c c c | % 36 - c4 c r8 c4 c8 ~ | % 37 - c4 c c c \bar "||" % 38 + c4 c c c | % 23 + c4 c c c | % 24 + c4 c c c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + c4 c c c | % 28 + c4 c c c | % 29 + c4 c c c | % 30 + c4 c c c | % 31 + c4 c c c | % 32 + c4 c c r8 c ~ | % 33 + c4 c c c | % 34 + c4 c c c | % 35 + c4 c c c | % 36 + c4 c r8 c4 c8 ~ | % 37 + c4 c c c | % 38 - % Chorus + % Chorus - c4 c c c | % 29 - c4 c c c | % 30 - c4 c c c | % 31 - c4 c c c | % 32 - c4 c c c | % 33 - c4 c c c | % 34 - c4 c c4. c8 ~ | % 35 - } - \alternative - { - { - c4 c c c | % 36 - } - { - c4 c c c | % 37 - } - } + c4 c c c | % 29 + c4 c c c | % 30 + c4 c c c | % 31 + c4 c c c | % 32 + c4 c c c | % 33 + c4 c c c | % 34 + c4 c c4. c8 ~ | % 35 + + c4 c c c | % 36 + + c4 c c c | % 37 % Verse @@ -442,19 +439,16 @@ StaffC = \relative c c4 c c r8 c ~ | % 48 c4 c c c | % 49 - \repeat volta 2 - { - c4 c c c | % 50 - c4 c c c | % 51 - c4 c c r8 c ~ | % 52 - c4 c c c | % 53 - } + c4 c c c | % 50 + c4 c c c | % 51 + c4 c c r8 c ~ | % 52 + c4 c c c | % 53 c4 c c c | % 54 c2 c | % 55 c4 c c r8 c ~ | % 56 c4 c c c | % 57 - c4-^ c-^ r2 \bar "|." % 58 + c4-^ c-^ r2 | % 58 } @@ -483,23 +477,24 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new ChoirStaff = "Rhythm" - << - \new ChordNames = "chords" \Chords -% Capo 3 Edition -% \new ChordNames = "chords" \transpose ef c \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> - >> - - \new Staff + \context Staff << \new Voice = "lead" \LeadVox \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> + + \new ChoirStaff + << + \new ChordNames \Chords +% Capo 3 Edition +% \new ChordNames \transpose ef c \Chords + \new RhythmicStaff << \StaffC \Dynamics >> + >> >> } @@ -508,7 +503,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -521,6 +516,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) } + diff --git a/take-my-life-and-let-it-be-consecrated-sa.ly b/take-my-life-and-let-it-be-consecrated-sa.ly index 479132d..e2dacaa 100644 --- a/take-my-life-and-let-it-be-consecrated-sa.ly +++ b/take-my-life-and-let-it-be-consecrated-sa.ly @@ -2,7 +2,7 @@ \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) diff --git a/take-my-life-and-let-it-be-consecrated.ly b/take-my-life-and-let-it-be-consecrated.ly index 744f5c9..f1f1049 100644 --- a/take-my-life-and-let-it-be-consecrated.ly +++ b/take-my-life-and-let-it-be-consecrated.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -10,68 +10,42 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Take My Life And Let It Be Consecrated" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.6" + 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.instrumentName = #"Lead vox" \clef G \key ef \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - s1 | % 1 - s1 | % 2 - s1 | % 3 - s1 | % 4 + s1*4 | % 1-4 % Verse \repeat volta 3 { -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*9 | % 5-13 - ef4 ef ef8 ( bf ) ef ( g ) | % 5 - bf4 af g2 | % 6 - g4 g g8 ( f ) af ( f ) | % 7 - ef4 d8 ( f ) ef2 | % 8 - g4 g f f8 ( g ) | % 9 - af4 bf af ( g ) | % 10 - bf4 bf c bf | % 11 - bf8 ( af ) af ( g ) g4 ( f ) | % 12 - ef4 f g af8 ( f ) | % 13 + \time 2/4 s2 \time 4/4 | % 14 - \time 2/4 - - ef4 d | % 14 - - \time 4/4 - -\voiceTwo - ef1 | % 15 -\oneVoice - s1 | % 16 + s1*2 | % 15-16 } \alternative { { - s1 | % 17 - s1 | % 18 + s1*2 | % 17-18 } { s1 | % 19 @@ -82,7 +56,41 @@ LeadVox = \relative c' \key f \major -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*15 \bar "|." % 21-35 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s1*4 | % 1-4 + + % Verse + + ef4 ef ef8 ( bf ) ef ( g ) | % 5 + bf4 af g2 | % 6 + g4 g g8 ( f ) af ( f ) | % 7 + ef4 d8 ( f ) ef2 | % 8 + g4 g f f8 ( g ) | % 9 + af4 bf af ( g ) | % 10 + bf4 bf c bf | % 11 + bf8 ( af ) af ( g ) g4 ( f ) | % 12 + ef4 f g af8 ( f ) | % 13 + ef4 d | % 14 + \voiceTwo ef1 \oneVoice | % 15 + s1 | % 16 + + s1 | % 17 + s1 | % 18 + + s1 | % 19 + + s1 | % 20 f4 f f8 ( c ) f ( a ) | % 21 c4 bf a2 | % 22 @@ -98,9 +106,10 @@ LeadVox = \relative c' s1 | % 32 s1 | % 33 s1 | % 34 - r1^\fermata \bar "|." % 35 + r1^\fermata | % 35 } + LeadVoxText = \lyricmode { Take my life _ and _ let it be @@ -137,11 +146,6 @@ LeadVoxTextC = \lyricmode Riffs = \relative c' { - \clef G - \key ef \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 - % Intro \tiny @@ -179,7 +183,6 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { % Intro @@ -191,37 +194,23 @@ Chords = \chordmode % Verse - \repeat volta 4 - { - ef2 f:m11 | % 5 - af2:sus2 ef | % 6 - c2:m7 af:sus2 | % 7 - ef4/bf bf ef2 | % 8 - c2:m7 bf:11^9.7 | % 9 - f2:m11 af4/ef ef | % 10 - ef2/g af4 ef/g | % 11 - f2:m11 ef4/bf bf | % 12 - af4/c bf/d ef af:sus2 | % 13 - - \time 2/4 + ef2 f:m11 | % 5 + af2:sus2 ef | % 6 + c2:m7 af:sus2 | % 7 + ef4/bf bf ef2 | % 8 + c2:m7 bf:11^9.7 | % 9 + f2:m11 af4/ef ef | % 10 + ef2/g af4 ef/g | % 11 + f2:m11 ef4/bf bf | % 12 + af4/c bf/d ef af:sus2 | % 13 + ef4/bf bf | % 14 + c1:m11 | % 15 + af1:sus2 | % 16 - ef4/bf bf | % 14 + c1:m11 | % 17 + af2 bf:sus4.7 | % 18 - \time 4/4 - - c1:m11 | % 15 - af1:sus2 | % 16 - } - \alternative - { - { - c1:m11 | % 17 - af2 bf:sus4.7 | % 18 - } - { - c1:m11 | % 19 - } - } + c1:m11 | % 19 af2:sus2 g:m11 | % 20 @@ -239,24 +228,18 @@ Chords = \chordmode bf1:sus2 | % 32 f1 | % 33 bf1:sus2 | % 34 - f | % 35 + f1 | % 35 } % % 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 @@ -267,39 +250,25 @@ StaffC = \relative c % Verse - \repeat volta 3 - { - c4_\markup { \italic { piano 1st X } } c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 + c4_\markup { \italic { piano 1st X } } c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c | % 14 + c4_\markup { \italic { band in 1st X } } c c c | % 15 + c4 c c c | % 16 - \time 2/4 + c4 c c c | % 17 + c4 c c c | % 18 - c4 c | % 14 + c4 c c c | % 19 - \time 4/4 - - c4_\markup { \italic { band in 1st X } } c c c | % 15 - c4 c c c | % 16 - } - \alternative - { - { - c4 c c c | % 17 - c4 c c c | % 18 - } - { - c4 c c c | % 19 - } - } - - c4 c c \< c \! \bar "||" % 20 + c4 c c \< c \! | % 20 c4_\markup { \italic { snare } } c c c | % 21 c4 c c c | % 22 @@ -315,42 +284,33 @@ StaffC = \relative c c4 c c c | % 32 c4 c c c | % 33 c4 c c_\markup { \italic { rit. } } c | % 34 - c1^\fermata \bar "|." % 35 + c1^\fermata | % 35 } \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << - \new Staff = leadStaff - { - << - \new Voice = "lead" \LeadVox - \new Voice = "riffs" \Riffs - >> - } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC >> - \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 - } } @@ -358,7 +318,18 @@ StaffC = \relative c { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "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 } + diff --git a/template.ly b/template.ly index a3786b0..8d2d324 100644 --- a/template.ly +++ b/template.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -12,73 +12,105 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "O For A Thousand Tongues" } + title = \markup { \override #'(font-family . sans) \fontsize #3.5 "A Template" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } - arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } + arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Some One" } 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 f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - s2. | % 1 - s2. | % 2 - s2. | % 3 - s2. | % 4 - s2. | % 5 - s2. | % 6 - s2. | % 7 - r2 c4 \bar "||:" % 8 + s2.*8 \bar ".|:-||" % 1-8 \repeat volta 2 { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - f8 f g4 g | % 9 - a8 g f4 g | % 10 - a8 a bf4 a | % 11 - g4. r8 c4 | % 12 - c8 a a4 f | % 13 - f8 d d4 f8 ( d ) | % 14 - c8 f f4 g | % 15 - - \voiceTwo f2. | % 16 - s2. | % 17 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s2.*9 | % 9-17 } \alternative { { - s2. | % 18 - r2 c4 | % 19 + s2.*2 | % 18-19 } { s2. | % 20 } } - r2 c4 \oneVoice \bar "||" % 21 + s2. \bar "||" % 21 % Verse -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s2.*7 \bar "||" % 22-28 + s2.*2 | % 29-30 + + \key g \major + + s2.*2 \oneVoice \bar "||" % 31-32 + + % Verse + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s2.*7 \bar "||" % 22-28 + + % Ending + + s2.^\markup { \hspace #0.0 \raise #3.0 \italic { Play figure throughout D } } | % 40 + s2.*3 | % 41-43 + + \repeat volta 2 + { + \mark \markup { \override #'(font-family . sans) { \box { D } } } + s2.*8 | % 44-51 + } +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s2.*7 | % 1-7 + r2 c4 | % 8 + + % Verse + + f8 f g4 g | % 9 + a8 g f4 g | % 10 + a8 a bf4 a | % 11 + g4. r8 c4 | % 12 + c8 a a4 f | % 13 + f8 d d4 f8 ( d ) | % 14 + c8 f f4 g | % 15 + + \voiceTwo f2. | % 16 + s2. | % 17 + + s2. | % 18 + r2 c4 | % 19 + + s2. | % 20 + + r2 c4 \oneVoice | % 21 + + % Verse f8 f g4 g | % 22 a8 g f4 g | % 23 @@ -86,50 +118,42 @@ LeadVox = \relative c' g4. r8 c4 | % 25 c8 a a4 f | % 26 f8 d d4 f8 ( d ) | % 27 - c8 f f4 g \bar "||" % 28 + c8 f f4 g | % 28 \voiceTwo f2. | % 29 s2. | % 30 - \key g \major - s2. | % 31 - r2 d4 \oneVoice \bar "||" % 32 + r2 d4 | % 32 % Verse -\mark \markup { \override #'(font-family . sans) { \box { C } } } - g8 g a4 a | % 22 b8 a g4 a | % 23 b8 b c4 b | % 24 a4. r8 d4 | % 25 d8 b b4 g | % 26 g8 e e4 g8 ( e ) | % 27 - d8 g g4 a \bar "||" % 28 + d8 g g4 a | % 28 % Ending - \voiceTwo g2.^\markup { \hspace #0.0 \raise #3.0 \italic { Play figure throughout D } } | % 40 + \voiceTwo g2. | % 40 s2. | % 41 s2. | % 42 r2 d4 \oneVoice | % 43 - \repeat volta 2 - { -\mark \markup { \override #'(font-family . sans) { \box { D } } } - - g8 g16 a ( ~ a4. g8 ) | % 44 - g2 r4 | % 45 - r4 a4. g8 | % 46 - g2 d4 | % 47 - g8 g16 a ( ~ a4. g8 ) | % 48 - g2 r4 | % 49 - r4 a4. b8 | % 50 - g2^\fermata d4 | % 51 - } + g8 g16 a ( ~ a4. g8 ) | % 44 + g2 r4 | % 45 + r4 a4. g8 | % 46 + g2 d4 | % 47 + g8 g16 a ( ~ a4. g8 ) | % 48 + g2 r4 | % 49 + r4 a4. b8 | % 50 + g2^\fermata d4 | % 51 } + LeadVoxText = \lyricmode { O for a thou -- sand tongues to sing @@ -165,12 +189,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { - \clef G - \key f \major - \override Staff.TimeSignature #'style = #'() - \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -212,12 +230,8 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro f2. | % 1 @@ -229,31 +243,23 @@ Chords = \chordmode d2.:m9 | % 7 bf2. | % 8 - \repeat volta 2 - { - % Verse + % Verse - f4 c2/e | % 9 - d8:m c bf2 | % 10 - f4/c bf/c f/c | % 11 - c2 c4/e | % 12 - f2 f4/a | % 13 - bf2 g4:m7 | % 14 - f4/c bf/c c | % 15 + f4 c2/e | % 9 + d8:m c bf2 | % 10 + f4/c bf/c f/c | % 11 + c2 c4/e | % 12 + f2 f4/a | % 13 + bf2 g4:m7 | % 14 + f4/c bf/c c | % 15 - f2. | % 16 - bf2. | % 17 - } - \alternative - { - { - f2. | % 18 - bf2. | % 19 - } - { - d2.:m9 | % 20 - } - } + f2. | % 16 + bf2. | % 17 + + f2. | % 18 + bf2. | % 19 + + d2.:m9 | % 20 bf2. | % 21 @@ -290,27 +296,22 @@ Chords = \chordmode e2.:m9 | % 42 c2. | % 43 - \repeat volta 2 - { - g2. | % 44 - c2. | % 45 - g2. | % 46 - c2. | % 47 - g2. | % 48 - c2. | % 49 - e2.:m9 | % 50 - c2. | % 51 - } + g2. | % 44 + c2. | % 45 + g2. | % 46 + c2. | % 47 + g2. | % 48 + c2. | % 49 + e2.:m9 | % 50 + c2. | % 51 } + % % Alternate chord changes (2nd verse) % ChordsSup = \chordmode { -%Bah, can't we set this globally? - \popChords - % Intro s2.*8 | % 1-8 @@ -323,20 +324,15 @@ ChordsSup = \chordmode c2:sus4 c4 | % 12 } + % % 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 \override NoteHead #'style = #'slash + \teeny % Intro @@ -347,35 +343,27 @@ StaffC = \relative c c4 c c | % 5 c4 c c | % 6 c4 c c | % 7 - c4 c c \bar "||:" % 8 + c4 c c | % 8 - \repeat volta 2 - { - % Verse + % Verse - c4 c2 | % 9 - c8 c c4 c | % 10 - c4 c c | % 11 - c4 c c-> | % 12 - c4 c c | % 13 - c4 c c | % 14 - c4 c c | % 15 + c4 c2 | % 9 + c8 c c4 c | % 10 + c4 c c | % 11 + c4 c c-> | % 12 + c4 c c | % 13 + c4 c c | % 14 + c4 c c | % 15 - c4 c c | % 16 - c4 c c | % 17 - } - \alternative - { - { - c4 c c | % 18 - c4 c c | % 19 - } - { - c4 c c | % 20 - } - } + c4 c c | % 16 + c4 c c | % 17 + + c4 c c | % 18 + c4 c c | % 19 + + c4 c c | % 20 - c4 c c \bar "||" % 21 + c4 c c | % 21 % Verse @@ -385,13 +373,13 @@ StaffC = \relative c c2 c4-> | % 25 c4-> c-> c | % 26 c4 c c | % 27 - c4 c c \bar "||" % 28 + c4 c c | % 28 c4 c c | % 29 c4 c c | % 30 c4 c c | % 31 - c4 c c \bar "||" % 32 + c4 c c | % 32 % Verse @@ -401,7 +389,7 @@ StaffC = \relative c c4 c c | % 36 c4 c c | % 37 c4 c c | % 38 - c4 c c \bar "||" % 39 + c4 c c | % 39 % Ending @@ -410,17 +398,14 @@ StaffC = \relative c c4 c c | % 42 c4 c c | % 43 - \repeat volta 2 - { - c4 c c | % 44 - c4 c c | % 45 - c4 c c | % 46 - c4 c c | % 47 - c4 c c | % 48 - c4 c c | % 49 - c4 c c | % 50 - c4^\fermata c c | % 51 - } + c4 c c | % 44 + c4 c c | % 45 + c4 c c | % 46 + c4 c c | % 47 + c4 c c | % 48 + c4 c c | % 49 + c4 c c | % 50 + c4^\fermata c c | % 51 } @@ -440,40 +425,45 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \Chords - \new ChordNames = "chords2" \ChordsSup - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \Chords + \new ChordNames \ChordsSup + \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 } + diff --git a/the-apostle's-creed.ly b/the-apostle's-creed.ly index 052039a..62fbe6c 100644 --- a/the-apostle's-creed.ly +++ b/the-apostle's-creed.ly @@ -1,10 +1,8 @@ -% Still need hairpins, directions, dynamics, etc... - -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20, 24 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) staffSize = #20 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -14,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 "The Apostle’s Creed" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Ed Smart" } % arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -29,7 +25,7 @@ staffSize = #20 Global = { \key bf \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -66,20 +62,11 @@ Global = % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" - \clef G -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro - r1 | % 1 - r1 | % 2 - r1 | % 3 - r1 | % 4 + r1*4 | % 1-4 % Part I @@ -138,6 +125,7 @@ LeadVox = \relative c' f1-\fermata | % 45 } + LeadVoxText = \lyricmode { We be -- lieve _ in God, _ @@ -174,7 +162,6 @@ LeadVoxText = \lyricmode % % Riffs % - Riffs = \relative c'' { %{ @@ -193,7 +180,6 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { % Intro @@ -264,15 +250,11 @@ Chords = \chordmode % % Chord rhythms % - Rhythm = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash -\tiny + \teeny % Intro @@ -373,26 +355,26 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new ChoirStaff - << - \new ChordNames \Chords -% C edition -% \new ChordNames \transpose bf c \Chords - \new RhythmicStaff << \Rhythm \Dynamics >> - >> - - \new Staff + \context Staff << - \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox % C edition % \new Voice = "lead" \transpose bf c' \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> + + \new ChoirStaff + << + \new ChordNames \Chords +% C edition +% \new ChordNames \transpose bf c \Chords + \new RhythmicStaff << \Rhythm \Dynamics >> + >> >> } @@ -401,7 +383,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -414,6 +396,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) } + 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 } + diff --git a/the-first-noel.ly b/the-first-noel.ly index cd7ae19..68d2226 100644 --- a/the-first-noel.ly +++ b/the-first-noel.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) @@ -10,105 +10,123 @@ 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 "The First Noel" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "English Carol" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.6" + 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.instrumentName = #"Lead vox" \clef G \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \partial 4*1 s4 \bar "||" % 0 - s2. | % 1 - s2. | % 2 - s2. | % 3 - s2. | % 4 + s2.*4 | % 1-4 \repeat volta 3 { - s2. | % 5 - s2. | % 6 - s2. | % 7 -\break % Bleah - s2 fs8 e \bar "||" % 8 + s2.*4 \bar "||" % 5-8 % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - d4. ( e8 ) fs ( g ) | % 9 - a2 b8 ( cs ) | % 10 - d4 cs b | % 11 - a2 b8 cs | % 12 - d4 ( cs ) b | % 13 - a4 ( b ) cs | % 14 - d4 ( a ) g | % 15 - fs2 fs8 ( e ) | % 16 - -\mark \markup { \override #'(font-family . sans) { \box { A9 } } } - - d4. ( e8 ) fs ( g ) | % 17 - a2 b8 ( cs ) | % 18 - d4 ( cs ) b | % 19 - a2 b8 ( cs ) | % 20 - d4 cs b | % 21 - a4 ( b ) cs | % 22 - d4 ( a ) g | % 23 - fs2 fs8 ( e ) \bar "||" % 24 -\break % bah, only valid for size 18 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s2.*8 | % 9-16 + + \mark \markup { \override #'(font-family . sans) { \box { A9 } } } + s2.*8 \bar "||" % 17-24 +%\break % bah, only valid for size 18 % Chorus -%\mark \markup { \override #'(font-family . sans) { \box { B } } } -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - d4. ( e8 ) fs ( g ) | % 25 - a2 d8 ( cs ) | % 26 - b2 b4 | % 27 - a2. | % 28 - d4 cs b | % 29 - a4 ( b ) cs | % 30 + s2.*6 | % 25-30 } \alternative { { - d4 ( a ) g | % 31 - d2. | % 32 + s2.*2 | % 31-32 } { - d'4 ( a ) g | % 33 - fs2^\markup { \hspace #3.0 \raise #1.0 { D.S. } } fs8 ( e ) \bar "||" % 34 + s2. | % 33 + s2^\markup { \hspace #3.0 \raise #1.0 { D.S. } } s4 \bar "||" % 34 } { - d'4 ( a ) g | % 35 - d2. | % 36 + s2.*2 | % 35-36 } } - s2. | % 37 - s2. | % 38 - s2. | % 39 - s2. \bar "|." % 40 + s2.*4 \bar "|." % 37-40 } + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s4 | % 0 + s2.*4 | % 1-4 + + s2. | % 5 + s2. | % 6 + s2. | % 7 + s2 fs8 e | % 8 + + % Verse + + d4. ( e8 ) fs ( g ) | % 9 + a2 b8 ( cs ) | % 10 + d4 cs b | % 11 + a2 b8 cs | % 12 + d4 ( cs ) b | % 13 + a4 ( b ) cs | % 14 + d4 ( a ) g | % 15 + fs2 fs8 ( e ) | % 16 + + d4. ( e8 ) fs ( g ) | % 17 + a2 b8 ( cs ) | % 18 + d4 ( cs ) b | % 19 + a2 b8 ( cs ) | % 20 + d4 cs b | % 21 + a4 ( b ) cs | % 22 + d4 ( a ) g | % 23 + fs2 fs8 ( e ) | % 24 + + % Chorus + + d4. ( e8 ) fs ( g ) | % 25 + a2 d8 ( cs ) | % 26 + b2 b4 | % 27 + a2. | % 28 + d4 cs b | % 29 + a4 ( b ) cs | % 30 + + d4 ( a ) g | % 31 + d2. | % 32 + + d'4 ( a ) g | % 33 + fs2 fs8 ( e ) | % 34 + + d'4 ( a ) g | % 35 + d2. | % 36 + + s2.*4 \bar "|." % 37-40 +} + + LeadVoxText = \lyricmode { The _ first _ no -- _ el the _ an -- gel did say @@ -136,16 +154,10 @@ LeadVoxTextB = \lyricmode Riffs = \relative c' { - \clef G - \key d \major - \override Staff.TimeSignature #'style = #'() - \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny - \partial 4*1 fs8 e | % 0 + fs8 e | % 0 d4. e8 fs g | % 1 a2 d8 cs | % 2 b2 b4 | % 3 @@ -156,12 +168,12 @@ Riffs = \relative c' d4 a g | % 7 fs2 s4 | % 8 - s2.*28 + s2.*28 | % 9-36 - d'4 cs b | % - a4 b cs | % - d4 a g | % - fs2.^\fermata | % + d'4 cs b | % 37 + a4 b cs | % 38 + d4 a g | % 39 + fs2.^\fermata | % 40 \normalsize } @@ -169,71 +181,58 @@ Riffs = \relative c' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \partial 4*1 d4/a | % 0 + d4/a | % 0 d2.:9^7 | % 1 a2.:9^7 | % 2 g2.:9^7 | % 3 d2 a4:9^7/cs | % 4 - \repeat volta 3 - { - % Verse - - g4:6/b a:11^9.7 g | % 5 - d4:sus2 g fs:m | % 6 - e2:m7 a4:sus4.7 | % 7 - d2 d4/a | % 8 - - d2.:9^7 | % 9 - fs2.:m7 | % 10 - g2.:maj7 | % 11 - d2.:9^7/fs | % 12 - g2.:maj9 | % 13 - d2./fs | % 14 - e2.:m7 | % 15 - a4:13 b:m a/cs | % 16 - - d2.:9^7 | % 17 - a2.:sus2/cs | % 18 - g2./b | % 19 - d2./a | % 20 - g2.:maj9 | % 21 - d2.:9^7/fs | % 22 - e2:m7 a4:sus4.7 | % 23 - d4 a:13 a:7 | % 24 - - % Chorus - - d2.:9^7 | % 25 - a2:9^7 d4:9^7/fs | % 26 - g2. | % 27 - d2 a4:sus2/cs | % 28 - g4:6/b a:11^9.7 g | % 29 - d4:sus2/fs g fs:m | % 30 - } - \alternative - { - { - e2:m7 a4:sus4.7 | % 31 - d2 d4/cs | % 32 - } - { - e2:m7 a4:sus4.7 | % 33 - d2 d4/a | % 34 - } - { - e2:m7 a4:sus4.7 | % 35 - d2 d4/cs | % 36 - } - } + % Verse + + g4:6/b a:11^9.7 g | % 5 + d4:sus2 g fs:m | % 6 + e2:m7 a4:sus4.7 | % 7 + d2 d4/a | % 8 + + d2.:9^7 | % 9 + fs2.:m7 | % 10 + g2.:maj7 | % 11 + d2.:9^7/fs | % 12 + g2.:maj9 | % 13 + d2./fs | % 14 + e2.:m7 | % 15 + a4:13 b:m a/cs | % 16 + + d2.:9^7 | % 17 + a2.:sus2/cs | % 18 + g2./b | % 19 + d2./a | % 20 + g2.:maj9 | % 21 + d2.:9^7/fs | % 22 + e2:m7 a4:sus4.7 | % 23 + d4 a:13 a:7 | % 24 + + % Chorus + + d2.:9^7 | % 25 + a2:9^7 d4:9^7/fs | % 26 + g2. | % 27 + d2 a4:sus2/cs | % 28 + g4:6/b a:11^9.7 g | % 29 + d4:sus2/fs g fs:m | % 30 + + e2:m7 a4:sus4.7 | % 31 + d2 d4/cs | % 32 + + e2:m7 a4:sus4.7 | % 33 + d2 d4/a | % 34 + + e2:m7 a4:sus4.7 | % 35 + d2 d4/cs | % 36 g4:6/b a:11^9.7 g | % 37 d4:sus2/fs g fs:m | % 38 @@ -245,82 +244,67 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 3/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \partial 4*1 c4 \bar "||" % 0 + c4 | % 0 c4 c c | % 1 c4 c c | % 2 c4 c c | % 3 c4 c c | % 4 - \repeat volta 3 - { - % Verse - - c4 c c | % 5 - c4 c c | % 6 - c4 c c | % 7 - c4 c c \bar "||" % 8 - - c4 c c | % 9 - c4 c c | % 10 - c4 c c | % 11 - c4 c c | % 12 - c4 c c | % 13 - c4 c c | % 14 - c4 c c | % 15 - c4 c c | % 16 - - c4 c c | % 17 - c4 c c | % 18 - c4 c c | % 19 - c4 c c | % 20 - c4 c c | % 21 - c4 c c | % 22 - c4 c c | % 23 - c4 c c \bar "||" % 24 - - % Chorus - - c4 c c | % 25 - c4 c c | % 26 - c4 c c | % 27 - c4 c c | % 28 - c4 c c | % 29 - c4 c c | % 30 - } - \alternative - { - { - c4 c c | % 31 - c4 c c | % 32 - } - { - c4 c c | % 33 - c4 c c | % 34 - } - { - c4 c c | % 35 - c4 c c | % 36 - } - } + % Verse + + c4 c c | % 5 + c4 c c | % 6 + c4 c c | % 7 + c4 c c | % 8 + + c4 c c | % 9 + c4 c c | % 10 + c4 c c | % 11 + c4 c c | % 12 + c4 c c | % 13 + c4 c c | % 14 + c4 c c | % 15 + c4 c c | % 16 + + c4 c c | % 17 + c4 c c | % 18 + c4 c c | % 19 + c4 c c | % 20 + c4 c c | % 21 + c4 c c | % 22 + c4 c c | % 23 + c4 c c | % 24 + + % Chorus + + c4 c c | % 25 + c4 c c | % 26 + c4 c c | % 27 + c4 c c | % 28 + c4 c c | % 29 + c4 c c | % 30 + + c4 c c | % 31 + c4 c c | % 32 + + c4 c c | % 33 + c4 c c | % 34 + + c4 c c | % 35 + c4 c c | % 36 c4 c c | % 37 c4 c c | % 38 c4 c c | % 39 - c2.^\fermata \bar "|." % 40 + c2.^\fermata | % 40 } @@ -345,39 +329,44 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 } + diff --git a/the-heart-of-worship.ly b/the-heart-of-worship.ly index e61f367..76792a3 100644 --- a/the-heart-of-worship.ly +++ b/the-heart-of-worship.ly @@ -1,10 +1,10 @@ % Still needs hairpins/etc -\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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -12,113 +12,73 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) { \fontsize #3.5 "The Heart Of Worship" } } composer = \markup { \override #'(font-family . sans) "Michael W. Smith" } arranger = \markup { \override #'(font-family . sans) "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.2" + 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.instrumentName = #"Lead vox" \clef G \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - r8^\markup { \hspace #0.0 \raise #1.5 { 8th note ballad } } \tiny a a a a d, d b' ~ | % 1 - b8 a4 fs8 ~ fs e4 d16 d | % 2 - fs8 fs16 g ~ g8 fs ~ fs2 | % 3 - fs8 fs16 g ~ g8 fs ~ fs e4. ~ | % 4 - e1 \normalsize \bar "||:" % 5 + s8^\markup { \hspace #0.0 \raise #1.5 { 8th note ballad } } s2.. | % 1 + s1*4 \normalsize \bar ".|:-||" % 2-5 \repeat volta 2 { % Verse - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \italic { 1st time piano } } - - r4. a16 a a8 d,4 e8 ~ | % 6 - e2 fs8 e e d16 d ~ | % 7 - d4. a'16 a a8 d,4 e8 ~ | % 8 - e2 r | % 9 - r4. a16 a a8 d,4 e8 ~ | % 10 - e2 fs8 e e d16 d ~ | % 11 - d4. a'16 a a8 d,4 e8 ~ | % 12 - e2 r \bar "||" % 13 - + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \italic { 1st time piano } } + + s1*8 \bar "||" % 6-13 + % Prechorus - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" \italic { band in } } - - r8 g g g fs e d e ~ | % 14 - e4. e16 d fs8 e d b | % 15 - r8 g' g g fs e d e ~ | % 16 - e2 r | % 17 - r8 g g g fs e d e ~ | % 18 - e4. e16 d fs8 e d b | % 19 - r8 g' g g a fs b fs16 e ~ | % 20 - e2 r \bar "||" % 21 - + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" \italic { band in } } + + s1*8 \bar "||" % 14-21 + % Chorus - -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } \italic { snare } } - - r8 a a a a d, d b' ~ | % 22 - b8 a4 fs8 ~ fs e r d16 d | % 23 - fs8 fs16 g ~ g8 fs ~ fs2 | % 24 - fs8 fs16 g ~ g8 fs ~ fs e4 d8 | % 25 - r8 a' a a a d, d b' ~ | % 26 - b8 a4 fs8 ~ fs e r d16 d | % 27 - fs8 fs16 g ~ g8 fs ~ fs2 | % 28 -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { C } } \italic { snare } } + + s1*7 | % 22-28 + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { to Coda } \hspace #1.0 \musicglyph #"scripts.coda" } } \alternative { { - fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ | % 29 - d2 r | % 30 - R1 | % 31 + s1*3 | % 29-31 } { - fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ \bar "||" % 32 + s1 \bar "||" % 32 } } % Solo -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { D } } \italic { solo } } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { D } } \italic { solo } } - d2 r | % 33 -%blegh -\break - R1 | % 34 - R1 | % 35 - R1 | % 36 - R1 | % 37 - R1 | % 38 - R1 | % 39 - R1 \bar "||" % 40 - -\once \override Score.RehearsalMark #'self-alignment-X = #right -\mark \markup { \italic { D.S. al Coda } } + s1*8 \bar "||" % 33-40 + + \once \override Score.RehearsalMark #'self-alignment-X = #right + \mark \markup { \italic { D.S. al Coda } } % Coda @@ -126,12 +86,73 @@ LeadVox = \relative c'' \stopStaff s1 \startStaff \set Score.currentBarNumber = #41 -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + s1 \bar "||" % 41 + + \mark \markup { \override #'(font-family . sans) { \box { E } } } + s1*13 \bar "|." % 42-54 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + s1*5 | % 1-5 + + % Verse + + r4. a16 a a8 d,4 e8 ~ | % 6 + e2 fs8 e e d16 d ~ | % 7 + d4. a'16 a a8 d,4 e8 ~ | % 8 + e2 r | % 9 + r4. a16 a a8 d,4 e8 ~ | % 10 + e2 fs8 e e d16 d ~ | % 11 + d4. a'16 a a8 d,4 e8 ~ | % 12 + e2 r | % 13 + + % Prechorus + + r8 g g g fs e d e ~ | % 14 + e4. e16 d fs8 e d b | % 15 + r8 g' g g fs e d e ~ | % 16 + e2 r | % 17 + r8 g g g fs e d e ~ | % 18 + e4. e16 d fs8 e d b | % 19 + r8 g' g g a fs b fs16 e ~ | % 20 + e2 r | % 21 + + % Chorus - fs8 fs16 g ~ g8 fs ~ fs e4 d8 \bar "||" % 41 + r8 a a a a d, d b' ~ | % 22 + b8 a4 fs8 ~ fs e r d16 d | % 23 + fs8 fs16 g ~ g8 fs ~ fs2 | % 24 + fs8 fs16 g ~ g8 fs ~ fs e4 d8 | % 25 + r8 a' a a a d, d b' ~ | % 26 + b8 a4 fs8 ~ fs e r d16 d | % 27 + fs8 fs16 g ~ g8 fs ~ fs2 | % 28 -\mark \markup { \override #'(font-family . sans) { \box { E } } } + fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ | % 29 + d2 r | % 30 + R1 | % 31 + + fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ | % 32 + + % Solo + + d2 r | % 33 + R1*7 | % 33-40 + + % Coda + + s1 % blank bar for coda + + fs8 fs16 g ~ g8 fs ~ fs e4 d8 | % 41 r8 a' a a a d, d b' ~ | % 42 b8 a4 fs8 ~ fs e r d16 d | % 43 @@ -147,14 +168,12 @@ LeadVox = \relative c'' fs8 fs16 g ~ g8 fs ~ fs2 | % 50 fs8 fs16 g ~ g8 fs ~ fs e4 d8 ~ | % 53 - d1^\fermata \bar "|." % 54 + d1^\fermata | % 54 } + LeadVoxText = \lyricmode { - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - When the mu- sic fades _ all is stripped a- way _ And I simp- ly come _ Long- ing just to bring _ some- thing that's of worth _ @@ -185,9 +204,6 @@ LeadVoxText = \lyricmode LeadVoxTextB = \lyricmode { - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - _ _ _ _ _ _ _ _ _ _ _ _ _ _ - King of end- less worth _ no one could ex- press _ How much you de- serve _ Though I'm weak and poor _ all I have is yours _ @@ -196,14 +212,27 @@ LeadVoxTextB = \lyricmode % -% Chord names +% Riffs % +Riffs = \relative c'' +{ + % Intro + + \tiny + r8 a a a a d, d b' ~ | % 1 + b8 a4 fs8 ~ fs e4 d16 d | % 2 + fs8 fs16 g ~ g8 fs ~ fs2 | % 3 + fs8 fs16 g ~ g8 fs ~ fs e4. ~ | % 4 + e1 | % 5 + \normalsize +} + +% +% Chord names +% Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro d1 | % 1 @@ -212,51 +241,43 @@ Chords = \chordmode g4. a:sus4 s4 | % 4 a1 | % 5 - \repeat volta 2 - { - % Verse - - d1 | % 6 - a1 | % 7 - e1:m7 | % 8 - a2:sus4 a | % 9 - d1 | % 10 - a1:sus2/cs | % 11 - e1:m7 | % 12 - a2:sus4 a | % 13 - - % Prechorus - - e2:m7 d:sus2/fs | % 14 - a2:sus4 d/fs | % 15 - e2:m7 d:sus2/fs | % 16 - a2:sus4 a | % 17 - e2:m7 d:sus2/fs | % 18 - a2:sus4 d/fs | % 19 - e2:m7 d:sus2/fs | % 20 - a2:sus4 a | % 21 - - % Chorus - - d1 | % 22 - a1:sus2/cs | % 23 - e4.:m7 d:sus2/fs s4 | % 24 - g4. a:sus4 a4 | % 25 - d1 | % 26 - a1:sus2/cs | % 27 - e4.:m7 d:sus2/fs s4 | % 28 - } - \alternative - { - { - g4. a:sus4 a4 | % 29 - d1 | % 30 - a2:sus4 a | % 31 - } - { - g4. a:sus4 a4 | % 32 - } - } + % Verse + + d1 | % 6 + a1 | % 7 + e1:m7 | % 8 + a2:sus4 a | % 9 + d1 | % 10 + a1:sus2/cs | % 11 + e1:m7 | % 12 + a2:sus4 a | % 13 + + % Prechorus + + e2:m7 d:sus2/fs | % 14 + a2:sus4 d/fs | % 15 + e2:m7 d:sus2/fs | % 16 + a2:sus4 a | % 17 + e2:m7 d:sus2/fs | % 18 + a2:sus4 d/fs | % 19 + e2:m7 d:sus2/fs | % 20 + a2:sus4 a | % 21 + + % Chorus + + d1 | % 22 + a1:sus2/cs | % 23 + e4.:m7 d:sus2/fs s4 | % 24 + g4. a:sus4 a4 | % 25 + d1 | % 26 + a1:sus2/cs | % 27 + e4.:m7 d:sus2/fs s4 | % 28 + + g4. a:sus4 a4 | % 29 + d1 | % 30 + a2:sus4 a | % 31 + + g4. a:sus4 a4 | % 32 % Solo @@ -271,7 +292,7 @@ Chords = \chordmode % Coda -s1 + s1 % blank bar for coda g4. a:sus4 a4 | % 41 d1 | % 42 @@ -293,17 +314,11 @@ s1 % % 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 @@ -313,51 +328,43 @@ StaffC = \relative c c4.-> c8-> ~ c2 | % 4 c1 | % 5 - \repeat volta 2 - { - % Verse - - c4-\mp c c c | % 6 - c4 c c c | % 7 - c4 c c c | % 8 - c4 c c c | % 9 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c \bar "||" % 13 - - % Prechorus - - c4-\mf c c c | % 14 - c4 c c c | % 15 - c4 c c c | % 16 - c4 c c c | % 17 - c4 c c c | % 18 - c4 c c c | % 19 - c4 c c c | % 20 - c4 c c c \bar "||" % 21 - - % Chorus - - c4-\f c c c | % 22 - c4 c c c | % 23 - c4.-> c8-> ~ c4 c | % 24 - c4.-> c8-> ~ c4 c | % 25 - c4 c c c | % 26 - c4 c c c | % 27 - c4.-> c8-> ~ c4 c | % 28 - } - \alternative - { - { - c4.-> c8-> ~ c4 c | % 29 - c4 c c c | % 30 - c4 c c c | % 31 - } - { - c4.-> c8-> ~ c4 c \bar "||" % 32 - } - } + % Verse + + c4-\mp c c c | % 6 + c4 c c c | % 7 + c4 c c c | % 8 + c4 c c c | % 9 + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + + % Prechorus + + c4-\mf c c c | % 14 + c4 c c c | % 15 + c4 c c c | % 16 + c4 c c c | % 17 + c4 c c c | % 18 + c4 c c c | % 19 + c4 c c c | % 20 + c4 c c c | % 21 + + % Chorus + + c4-\f c c c | % 22 + c4 c c c | % 23 + c4.-> c8-> ~ c4 c | % 24 + c4.-> c8-> ~ c4 c | % 25 + c4 c c c | % 26 + c4 c c c | % 27 + c4.-> c8-> ~ c4 c | % 28 + + c4.-> c8-> ~ c4 c | % 29 + c4 c c c | % 30 + c4 c c c | % 31 + + c4.-> c8-> ~ c4 c | % 32 % Solo @@ -373,9 +380,8 @@ StaffC = \relative c % Coda \stopStaff s1 \startStaff | -\set Score.currentBarNumber = #41 - c4.-> c8-> ~ c4 c \bar "||" % 41 + c4.-> c8-> ~ c4 c | % 41 c4 c c c | % 42 c4 c c c | % 43 c4.-> c8-> ~ c4 c | % 44 @@ -388,43 +394,51 @@ StaffC = \relative c c4.-> c8-> ~ c4 c | % 51 c4.-> c8-> ~ c4 c | % 52 c4.-> c8->_\markup { \italic { rit. } } ~ c4 c | % 53 - c1^\fermata \bar "|." % 54 + c1^\fermata | % 54 } \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 \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 } + diff --git a/the-lord's-prayer.ly b/the-lord's-prayer.ly index 87107cc..9e1e23d 100644 --- a/the-lord's-prayer.ly +++ b/the-lord's-prayer.ly @@ -1,11 +1,11 @@ % Still need hairpins, directions, dynamics, etc... -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #24 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -14,10 +14,8 @@ staffSize = #24 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "The Lord’s Prayer" } -% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Lenny LeBlanc" } +% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) } @@ -31,7 +29,7 @@ Global = \key bf \major %New key! % \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -81,14 +79,8 @@ Global = % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" - \clef G -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro r1 | % 1 @@ -179,7 +171,6 @@ LeadVoxText = \lyricmode % % Riffs % - Riffs = \relative c'' { %{ @@ -198,7 +189,6 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { % Intro @@ -272,15 +262,11 @@ Chords = \chordmode % % Chord rhythms % - Rhythm = \relative c { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash -\tiny + \teeny % Intro @@ -366,26 +352,26 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new ChoirStaff - << - \new ChordNames \Chords -% C edition -% \new ChordNames \transpose bf c \Chords - \new RhythmicStaff << \Rhythm \Dynamics >> - >> - - \new Staff + \context Staff << - \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox % C edition % \new Voice = "lead" \transpose bf c' \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> + + \new ChoirStaff + << + \new ChordNames \Chords +% C edition +% \new ChordNames \transpose bf c \Chords + \new RhythmicStaff << \Rhythm \Dynamics >> + >> >> } @@ -394,7 +380,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -407,6 +393,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) } + diff --git a/there's-a-sweet-sweet-spirit.ly b/there's-a-sweet-sweet-spirit.ly index 8742413..b5db2f2 100644 --- a/there's-a-sweet-sweet-spirit.ly +++ b/there's-a-sweet-sweet-spirit.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,8 +12,6 @@ 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’s A Sweet, Sweet Spirit" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Doris Akers" } % arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } @@ -35,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key g \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -77,9 +75,6 @@ s2 s^\markup { \fret-diagram-terse #"x;2;3;2;3;x;" } % LeadVox = \relative c' { - \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Lead in r2 b4 c | % 1 @@ -212,9 +207,6 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Lead in s1 | % 1 @@ -265,14 +257,11 @@ 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 = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Lead in @@ -336,11 +325,12 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << - \context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >> + \new Voice = "lead" \LeadVox + \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC @@ -364,7 +354,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -377,6 +367,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) } + diff --git a/there-is-a-rock.ly b/there-is-a-rock.ly index 83ac9d4..f9d8a59 100644 --- 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) } + diff --git a/this-is-my-father's-world-satb.ly b/this-is-my-father's-world-satb.ly index 919ac5b..c3ab33c 100644 --- a/this-is-my-father's-world-satb.ly +++ b/this-is-my-father's-world-satb.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) @@ -20,21 +20,33 @@ staffSize = #20 % -% Lead vocal +% Song's structure % +Global = +{ + \key ef \major + \numericTimeSignature + \time 4/4 + + % Verse + + \partial 4*1 s4 | % 0 + s1*15 | % 1-15 + \partial 4*3 s2. \bar "|." % 16 +} + +% +% Lead vocal +% LeadVox = \relative c' { \set Staff.instrumentName = #"Sop." \clef G - \key ef \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse - \partial 4 ef8 f | % 0 + ef8 f | % 0 g4 bf g f | % 1 ef2. f8 g | % 2 af4 c bf g | % 3 @@ -53,22 +65,18 @@ LeadVox = \relative c' bf4 g g f8 ef | % 13 g4 f ef bf | % 14 ef8 f g4 bf f8 ( g ) | % 15 -% \partial 2. - ef2. \bar "|." % 16 + ef2. | % 16 } + AltoVox = \relative c' { \set Staff.instrumentName = #"Alto" \clef G - \key ef \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse - \partial 4 ef4 | % 0 + ef4 | % 0 ef4 ef ef d | % 1 ef2. ef4 | % 2 f4 f f ef | % 3 @@ -87,22 +95,18 @@ AltoVox = \relative c' ef4 ef d d8 ( ef ) | % 13 b4 d c bf | % 14 ef4 ef ef d8 ~ d | % 15 -% \partial 2. ef2. | % 16 } + TenorVox = \relative c' { \set Staff.instrumentName = #"Tenor" \clef F - \key ef \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse - \partial 4 g8 af | % 0 + g8 af | % 0 bf4 bf bf af | % 1 g2. c4 | % 2 c4 af f g8 af | % 3 @@ -121,22 +125,18 @@ TenorVox = \relative c' g4 bf g g8 ~ g | % 13 g4 g g f | % 14 g8 af bf4 bf af8 ( bf ) | % 15 -% \partial 2. g2. | % 16 } + BassVox = \relative c { \set Staff.instrumentName = #"Bass" \clef F - \key ef \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -%\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Verse - \partial 4 ef4 | % 0 + ef4 | % 0 ef4 g, bf bf | % 1 c2. af'8 g | % 2 f4 ef d ef | % 3 @@ -155,10 +155,10 @@ BassVox = \relative c ef4 ef b c8 ~ c | % 13 g4 b c d | % 14 ef4 ef g, bf8 ~ bf | % 15 -% \partial 2. ef2. | % 16 } + LeadVoxText = \lyricmode { This _ is my Fa -- ther’s world, @@ -224,21 +224,15 @@ Dynamics = \score { << -% \new ChoirStaff = "Rhythm" -% << -% \new ChordNames = "chords" \Chords -% \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> -% >> - - \new ChoirStaff = "Vox" + \new ChoirStaff << - \new Staff = UpperStaffA { \new Voice = "lead" \LeadVox } + \new Staff << \Global \new Voice = "lead" \LeadVox >> \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC - \new Staff = UpperStaffB { \new Voice = "alto" \AltoVox } - \new Staff = LowerStaffA { \new Voice = "tenor" \TenorVox } - \new Staff = LowerStaffB { \new Voice = "bass" \BassVox } + \new Staff << \Global \new Voice = "alto" \AltoVox >> + \new Staff << \Global \new Voice = "tenor" \TenorVox >> + \new Staff << \Global \new Voice = "bass" \BassVox >> >> \set Score.skipBars = ##t @@ -249,11 +243,11 @@ 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 @@ -264,6 +258,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!] - page-top-space = 0 } + diff --git a/this-little-light-of-mine.ly b/this-little-light-of-mine.ly index 6fdb3b4..e44ffcb 100644 --- a/this-little-light-of-mine.ly +++ b/this-little-light-of-mine.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 "This Little Light Of Mine" } -% composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Group" } + composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Group" } 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 = { \key e \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -75,18 +71,7 @@ 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 - - s1*4 | % 1-4 - - r1 | % 5 - r1 | % 6 - r1 | % 7 - r1 | % 8 + s1*8 | % 1-8 b8 cs16 b e fs8 e16 ~ e4 r | % 9 gs8 gs 16 gs gs fs8 e16 ~ e4 r | % 10 @@ -117,6 +102,7 @@ LeadVox = \relative c' r1 | % 30 } + LeadVoxText = \lyricmode { This lit -- tle light of mine, _ @@ -162,10 +148,7 @@ LeadVoxTextC = \lyricmode Riffs = \relative c' { - \clef G \override NoteHead #'style = #'cross -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -173,7 +156,9 @@ Riffs = \relative c' \stemDown e8[ r e] r e[ r e] r | % 1 e8[ r e] r e[ r e] r \stemNeutral | % 2 << \override NoteHead #'style = #'cross { r8 b'[ r b] r b[ r b] } \\ \override NoteHead #'style = #'cross { e,8[ r e] r e[ r e] r } >> | % 3 - << { r8 b'[ r b] r b[ r b] } \\ { e,8[ r e] r e[ r e] r } >> | % 4 + + \repeat "percent" 5 + { << { r8 b'[ r b] r b[ r b] } \\ { e,8[ r e] r e[ r e] r } >> } | % 4-8 \normalsize } @@ -185,9 +170,9 @@ Chords = \chordmode { s1*4 | % 1-4 - e2 r8 cs:m d4 | % 5 - e2 r8 g a4 | % 6 - e2 r8 cs:m d4 | % 7 + e2 s8 cs:m d4 | % 5 + e2 s8 g a4 | % 6 + e2 s8 cs:m d4 | % 7 e1 | % 8 e1 | % 9 @@ -213,9 +198,9 @@ Chords = \chordmode e2/b b | % 25 e1 | % 26 - e2 r8 cs:m d4 | % 27 - e2 r8 g a4 | % 28 - e2 r8 cs:m d4 | % 29 + e2 s8 cs:m d4 | % 27 + e2 s8 g a4 | % 28 + e2 s8 cs:m d4 | % 29 e1 | % 30 } @@ -223,15 +208,11 @@ 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 s1*4 | % 1-4 @@ -276,7 +257,7 @@ Dynamics = s1 | % 2 s4_\markup { \italic { add clap } } s2. | % 3 s1 | % 4 - s4_\markup { \italic { w/stomp & clap } } s2. | % 5 + s4_\markup { \italic { band in } } s2. | % 5 } @@ -286,7 +267,7 @@ Dynamics = \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() -% \new Staff +% \new ChoirStaff << \new ChordNames \Chords %Capo 4 edition @@ -296,7 +277,7 @@ Dynamics = \new Staff << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText @@ -309,11 +290,11 @@ 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 @@ -324,6 +305,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!] - page-top-space = 0 } + diff --git a/wait-by-the-water.ly b/wait-by-the-water.ly index 9028c8c..2d15058 100644 --- a/wait-by-the-water.ly +++ b/wait-by-the-water.ly @@ -1,9 +1,9 @@ -\version "2.18.2" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #20 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #23 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -12,15 +12,11 @@ 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 "Wait By The Water" } subtitle = \markup { \override #'(font-family . sans) \fontsize #1.3 "Honoring The MoRanch Professional Women’s Group" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Helen Currie Foster" } % arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" } 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) @@ -38,15 +34,12 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 \once \override Score.RehearsalMark #'self-alignment-X = #left \mark \markup { \override #'(font-family . sans) { \box { A } } } -% \once \override TextScript #'padding = #2.0 s2.*0^\markup { \large \italic { Refrain } } -% Capo 4 version -% s1*0^\markup { \hspace #0.0 \raise #2.0 \larger \bold { "Moderate pop (*** CAPO 4 ***)" } } % Refrain @@ -56,35 +49,6 @@ Global = \mark \markup { \override #'(font-family . sans) { \box { B } } } s2.*0^\markup { \large \italic { Verse } } s2.*16 \bar ":|." % 16-32 - -%{ - s1*4 | % 15-18 - - s1*2 | % 19-20 - } - \alternative - { - { - s1 | % 21 - } - { - s1 | % 22 - } - } - - \repeat volta 2 - { - \mark \markup { \override #'(font-family . sans) { \box { C } } } - - s1*0^\markup { \large \bold \italic { Solos } } - s1*2 | % 23-24 - } - - % Coda - - s2. s4^\markup { \large \bold \italic { Free Time } } | % 39 - s1*3 \bar ":||" % 40-42 -%} } @@ -93,12 +57,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 - % Refrain e4 g4. d8 | % 1 @@ -119,7 +77,6 @@ LeadVox = \relative c' bf4 c d | % 15 c2. | % 16 - % Verse g'4 c c | % 17 @@ -191,10 +148,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c { - \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro % \tiny @@ -254,19 +207,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 - -%Not small enough... \teeny -% \magnify #0.3 + % Refrain | % 1 @@ -348,11 +294,11 @@ 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 @@ -363,6 +309,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } + diff --git a/we-are-an-offering.ly b/we-are-an-offering.ly index 33a6bc7..a5bb67c 100644 --- a/we-are-an-offering.ly +++ b/we-are-an-offering.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) @@ -13,50 +13,41 @@ staffSize = #18 title = \markup { \override #'(font-family . sans) \fontsize #3.5 "We Are An Offering" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Dwight Liles" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" } - tagline = "Engraved by JLH and Lilypond 2.8.6" + 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.instrumentName = #"Lead vox" - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \clef G \key c \major \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - R1^\markup { Moderately slow ballad } | % 1 - R1 | % 2 - R1 | % 3 - r2 r8 c c d | % 4 + s1^\markup { Moderately slow ballad } | % 1 + s1*3 \bar ".|:-||" % 2-4 % A section \repeat volta 2 { -%\mark \markup { \override #'(font-family . sans) { \box { A } } } -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - e16 ( d ) c8 ~ c4 r8 c e f | % 5 - g2 r8 c, e g | % 6 - a4. b16 c g4 \times 2/3 { e8 f g } | % 7 + s1*3 | % 5-7 } \alternative { { - f16 e d8 ~ d4 r8 c c d | % 8 + s1 | % 8 } { - f16 e d8 ~ d2 r4 | % 9 + s1 | % 9 } } @@ -64,29 +55,65 @@ LeadVox = \relative c' { % B section -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - g4. f16 g e2 | % 10 - a4. g16 a f4. r8 | % 11 - b4. a16 b c8 b a b | % 12 - c4. b8 g4 r8 a | % 13 - bf4. a8 f2 | % 14 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*5 | % 10-14 } \alternative { { \time 2/4 - r8 c8 c d^\markup { \hspace #-1.8 \raise #1.5 \bold "D.S." } \bar "||" % 15 + s4. s8^\markup { \hspace #-1.8 \raise #1.5 \bold "D.S." } \bar "||" % 15 \time 4/4 } { - \time 2/4 r8 c8 c d \bar "||" \time 4/4 % 16 + \time 2/4 s2 \bar "||" \time 4/4 % 16 } } % A section -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*4 | % 17-20 + + % Ending + + s1*3 \bar "|." % 21-23 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + R1*3 | % 1-3 + r2 r8 c c d | % 4 + + % A section + + e16 ( d ) c8 ~ c4 r8 c e f | % 5 + g2 r8 c, e g | % 6 + a4. b16 c g4 \times 2/3 { e8 f g } | % 7 + + f16 e d8 ~ d4 r8 c c d | % 8 + + f16 e d8 ~ d2 r4 | % 9 + + % B section + + g4. f16 g e2 | % 10 + a4. g16 a f4. r8 | % 11 + b4. a16 b c8 b a b | % 12 + c4. b8 g4 r8 a | % 13 + bf4. a8 f2 | % 14 + + r8 c8 c d | % 15 + + r8 c8 c d | % 16 + + % A section e16 ( d ) c8 ~ c4 r8 c e f | % 17 g2 r8 c, e g | % 18 @@ -97,7 +124,7 @@ LeadVox = \relative c' e16 d c8 ~ c2. ~ | % 21 c2 r | % 22 - r1^\fermata \bar "|." % 23 + r1^\fermata | % 23 } @@ -139,12 +166,8 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro c2 d:m7 | % 1 @@ -154,41 +177,25 @@ Chords = \chordmode % A section - \repeat volta 2 - { - c2 d:m7 | % 5 - c1/e | % 6 - f2 c | % 7 - } - \alternative - { - { - bf2 g | % 8 - } - { - bf2 g4:sus4.7 g | % 9 - } - } + c2 d:m7 | % 5 + c1/e | % 6 + f2 c | % 7 - \repeat volta 2 - { - % B section + bf2 g | % 8 - e2:m7 a:m7 | % 10 - d2:m7 g | % 11 - e2:7 a:m | % 12 - f2 c | % 13 - bf2 d:m7/g | % 14 - } - \alternative - { - { - \time 2/4 g2 \time 4/4 | % 15 - } - { - \time 2/4 g2 \time 4/4 | % 16 - } - } + bf2 g4:sus4.7 g | % 9 + + % B section + + e2:m7 a:m7 | % 10 + d2:m7 g | % 11 + e2:7 a:m | % 12 + f2 c | % 13 + bf2 d:m7/g | % 14 + + g2 | % 15 + + g2 | % 16 % A section @@ -208,17 +215,11 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -229,41 +230,25 @@ StaffC = \relative c % A section - \repeat volta 2 - { - c4 c c c | % 5 - c4 c c c | % 6 - c4 c c c | % 7 - } - \alternative - { - { - c4 c c c | % 8 - } - { - c4 c c c | % 9 - } - } + c4 c c c | % 5 + c4 c c c | % 6 + c4 c c c | % 7 - \repeat volta 2 - { - % B section + c4 c c c | % 8 - c4 c c c | % 10 - c4 c c c | % 11 - c4 c c c | % 12 - c4 c c c | % 13 - c4 c c c | % 14 - } - \alternative - { - { - \time 2/4 c2 \time 4/4 \bar "||" % 15 - } - { - \time 2/4 c2 \time 4/4 \bar "||" % 16 - } - } + c4 c c c | % 9 + + % B section + + c4 c c c | % 10 + c4 c c c | % 11 + c4 c c c | % 12 + c4 c c c | % 13 + c4 c c c | % 14 + + c2 | % 15 + + c2 | % 16 % A section @@ -276,42 +261,50 @@ StaffC = \relative c c4 c c c | % 21 c4 c c c | % 22 - c1^\fermata \bar "|." % 23 + c1^\fermata | % 23 } \score { << -% \new ChoirStaff = "Vox" + \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 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 - { -% 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 } + diff --git a/we-are-one-in-the-spirit-vocals.ly b/we-are-one-in-the-spirit-vocals.ly index 5bc624d..c6fb499 100644 --- a/we-are-one-in-the-spirit-vocals.ly +++ b/we-are-one-in-the-spirit-vocals.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 "We Are One In The Spirit" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" } 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 \once \override TextScript #'padding = #2.0 @@ -48,7 +44,7 @@ Global = % Intro s1*4 \bar "||" % 1-4 - s1*4 \bar "||:" % 5-8 + s1*4 \bar ".|:-||" % 5-8 \repeat volta 3 { @@ -91,12 +87,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 r1 | % 1 @@ -164,7 +154,7 @@ LeadVoxTextB = \lyricmode We will work with each oth -- er, We will work side by side. And we’ll guard each one’s dig -- ni -- ty - And save _ each one’s pride. + And save _ each one’s pride. _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ @@ -178,16 +168,12 @@ LeadVoxTextC = \lyricmode We will walk with each oth -- er, We will walk hand in hand. And to -- ge -- ther we’ll spread the news - that God is in our land. + that God is in our land. } Riffs = \relative c { - \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro % \tiny @@ -234,7 +220,7 @@ Chords = \chordmode % Verse - e4.:m9 a8:5.9 s2 | % 23 + e4.:m9 a8:3.5.9 s2 | % 23 e4.:m9 a8:9 s2 | % 24 % Coda @@ -249,19 +235,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 - -%Not small enough... \teeny -% \magnify #0.3 + % Intro | % 1 @@ -346,11 +325,11 @@ 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 @@ -361,6 +340,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) } + diff --git a/we-are-one-in-the-spirit.ly b/we-are-one-in-the-spirit.ly index ee9874a..ab12580 100644 --- a/we-are-one-in-the-spirit.ly +++ b/we-are-one-in-the-spirit.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 "We Are One In The Spirit" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Craig Harris" } 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 \once \override TextScript #'padding = #2.0 @@ -48,11 +44,10 @@ Global = % Intro s1*4 \bar "||" % 1-4 - s1*4 \bar "||:" % 5-8 + s1*4 \bar ".|:-||" % 5-8 \repeat volta 2 { -% \mark \markup { \override #'(font-family . sans) { \box { A } } } \once \override Score.RehearsalMark #'self-alignment-X = #left \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } @@ -109,7 +104,7 @@ Global = %bleh \break -s2. s4^\markup { \large \bold \italic { Free Time } } | % 39 + s2. s4^\markup { \large \bold \italic { Free Time } } | % 39 s1*3 \bar "|." % 40-42 } @@ -119,12 +114,6 @@ s2. s4^\markup { \large \bold \italic { Free Time } } | % 39 % 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 r1 | % 1 @@ -199,10 +188,6 @@ LeadVoxText = \lyricmode Riffs = \relative c { - \clef G -%Hm. Needed anymore? -% \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro % \tiny @@ -249,7 +234,7 @@ Chords = \chordmode % Verse - e4.:sus4.7 a8:5.9 s2 | % 23 + e4.:sus4.7 a8:3.5.9 s2 | % 23 e4.:m9 a8:9 s2 | % 24 e4.:m9 a8:9 s2 | % 25 @@ -284,19 +269,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 - -%Not small enough... \teeny -% \magnify #0.3 + % Intro | % 1 @@ -379,17 +357,13 @@ Dynamics = % \new Staff << \new ChordNames \Chords -%Capo 4 edition -% \new ChordNames \transpose b g \Chords \new RhythmicStaff << \Rhythm \Dynamics >> >> \new Staff << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox -% \new Voice \Riffs -% \new Lyrics \lyricsto "lead" \LeadVoxText >> >> } @@ -397,11 +371,11 @@ 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 @@ -412,6 +386,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) } + diff --git a/we-fall-down.ly b/we-fall-down.ly index e0b2a32..65c9af2 100644 --- a/we-fall-down.ly +++ b/we-fall-down.ly @@ -1,8 +1,8 @@ -\version "2.19.48" +\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 "We Fall Down" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "C. Tomlin" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. S. Hammons" } @@ -31,11 +29,10 @@ hn = #(define-music-function (parser location arg) (ly:music?) % % Song's structure % - Global = { \key a \major - % \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -67,9 +64,6 @@ Global = LeadVox = \relative c' { - \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro R1 | % 1 @@ -195,12 +189,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 { + \numericTimeSignature \override NoteHead #'style = #'slash \teeny @@ -278,37 +269,19 @@ Dynamics = \score { -%{ - << - << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } - \new Lyrics \lyricsto "lead" \LeadVoxText - >> - - \new ChoirStaff = "Rhythm" - << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> - >> - - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() - >> -%} << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() - \new Staff + \context Staff << - \Global % The "roadmap" that everything else depends on \new Voice = "lead" \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxTextA >> -% \new Staff + \new ChoirStaff << \new ChordNames \Chords \new RhythmicStaff << \Rhythm \Dynamics >> @@ -319,11 +292,11 @@ Dynamics = \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "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 @@ -334,7 +307,5 @@ Dynamics = % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope... :-/] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } diff --git a/we-three-kings.ly b/we-three-kings.ly index d82f5e8..5745051 100644 --- a/we-three-kings.ly +++ b/we-three-kings.ly @@ -1,37 +1,31 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(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 "We Three Kings" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "John H. Hopkins, Jr." } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } - tagline = "Engraved by JLH and Lilypond 2.8.6" + 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.instrumentName = #"Lead vox" \clef G \key e \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro @@ -42,99 +36,133 @@ LeadVox = \relative c'' { % Interlude -\mark \markup { \override #'(font-family . sans) { \box { 1 } } } - - s2. | % 3 - r2. | % 4 - r2. | % 5 - r2. | % 6 - r2. | % 7 - r2. | % 8 - r2. | % 9 - r2. \bar "||" % 10 + \mark \markup { \override #'(font-family . sans) { \box { 1 } } } + s2.*8 \bar "||" % 3-10 -\break %bleh, only valid for size 16 +%\break %bleh, only valid for size 16 % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s2.*8 \bar "||" % 11-18 - b2 a4 | % 11 - g2 e4 | % 12 - fs4 g fs | % 13 - e2. | % 14 - b'2 a4 | % 15 - g2 e4 | % 16 - fs4 ( g ) fs | % 17 - e2. \bar "||" % 18 + s2.*2 | % 19-20 - g2 g4 | % 19 - a2 a4 | % 20 +%\break %bleh, only valid for size 16 -\break %bleh, only valid for size 16 - - b2 b4 | % 21 - d4 ( c ) b | % 22 - a4 b a | % 23 - g2 fs4 | % 24 - e2. | % 25 - fs2. ( | % 26 - a2. ) \bar "||" % 27 + s2.*7 \bar "||" % 21-27 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } + \mark \markup { \override #'(font-family . sans) { \box { B } } } - g2 g4 | % 28 - g2 d4 | % 29 + s2.*2 | % 28-29 -\break %bleh, only valid for size 16 +%\break %bleh, only valid for size 16 - g2 e4 | % 30 - g2 r4 | % 31 - g2 g4 | % 32 - g2 d4 | % 33 - g2 e4 | % 34 - g2. | % 35 - g2 g4 | % 36 - a2 b4 | % 37 - c2 b4 | % 38 - a2 b4 | % 39 + s2.*10 | % 30-39 -\break %bleh, only valid for size 16 +%\break %bleh, only valid for size 16 - g2 g4 | % 40 - g2 d4 | % 41 + s2.*2 | % 40-41 } \alternative { { - g2 e4 | % 42 - g2. | % 43 + s2.*2 | % 42-43 } { - g2. | % 44 + s2. | % 44 } } - e2. | % 45 + s2. | % 45 % Outro \repeat volta 2 { + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s2.*4 | % 46-49 + } -\mark \markup { \override #'(font-family . sans) { \box { C } } } + s2. \bar "|." % 50 +} - g2. | % 46 - r2. | % 47 - r2. | % 48 - r2. | % 49 - } - r2.-\fermata \bar "|." % 50 +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + s2.*2 | % 1-2 + + % Interlude + + s2. | % 3 + r2.*7 | % 4-10 + + % Verse + + b2 a4 | % 11 + g2 e4 | % 12 + fs4 g fs | % 13 + e2. | % 14 + b'2 a4 | % 15 + g2 e4 | % 16 + fs4 ( g ) fs | % 17 + e2. | % 18 + + g2 g4 | % 19 + a2 a4 | % 20 + + b2 b4 | % 21 + d4 ( c ) b | % 22 + a4 b a | % 23 + g2 fs4 | % 24 + e2. | % 25 + fs2. ( | % 26 + a2. ) | % 27 + + % Chorus + + g2 g4 | % 28 + g2 d4 | % 29 + + g2 e4 | % 30 + g2 r4 | % 31 + g2 g4 | % 32 + g2 d4 | % 33 + g2 e4 | % 34 + g2. | % 35 + g2 g4 | % 36 + a2 b4 | % 37 + c2 b4 | % 38 + a2 b4 | % 39 + + g2 g4 | % 40 + g2 d4 | % 41 + + g2 e4 | % 42 + g2. | % 43 + + g2. | % 44 + + e2. | % 45 + + % Outro + + g2. | % 46 + r2. | % 47 + r2. | % 48 + r2. | % 49 + + r2.-\fermata | % 50 } + LeadVoxText = \lyricmode { We three kings of O -- ri -- ent are @@ -170,12 +198,6 @@ LeadVoxTextC = \lyricmode Riffs = \relative c'' { - \clef G - \key e \minor - \override Staff.TimeSignature #'style = #'() - \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -189,82 +211,67 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s2. | % 1 s2. | % 2 - \repeat volta 3 - { - s8 e2:m7 s8 | % 3 - a2.:m9 | % 4 - s8 e2:m7 s8 | % 5 - c4.:9 b:7.5+.9- | % 6 - s8 e2:m7 s8 | % 7 - a2.:m9 | % 8 - s8 e2:m7 s8 | % 9 - c4.:9 b:7.5+.9- | % 10 - - e2.:m7 | % 11 - c2.:maj7 | % 12 - b2.:7.5+.9- | % 13 - e2.:m7 | % 14 - c2.:maj7 | % 15 - a2.:m7 | % 16 - b2.:7.5+.9- | % 17 - e4.:m7 d/fs | % 18 - - g2. | % 19 - d2. | % 20 - c2.:maj7 | % 21 - b2:m7 e4:m7 | % 22 - a2.:m7 | % 23 - b2.:7.5+.9- | % 24 - e2.:m7 | % 25 - d2. | % 26 - d2.:7 | % 27 - - g2. | % 28 - s2. | % 29 - c2.:maj7 | % 30 - g2. | % 31 - s2. | % 32 - s2. | % 33 - c2.:maj7 | % 34 - g4. d/fs | % 35 - e2.:m7 | % 36 - b4.:m7 e:m7 | % 37 - a2.:m7 | % 38 - b2.:7.5+.9- | % 39 - c2.:maj7 | % 40 - b2.:m7 | % 41 - } - \alternative - { - { - a2.:m7 | % 42 - g4. g/fs | % 43 - } - { - a2.:m7 | % 44 - } - } + s8 e2:m7 s8 | % 3 + a2.:m9 | % 4 + s8 e2:m7 s8 | % 5 + c4.:9 b:7.5+.9- | % 6 + s8 e2:m7 s8 | % 7 + a2.:m9 | % 8 + s8 e2:m7 s8 | % 9 + c4.:9 b:7.5+.9- | % 10 + + e2.:m7 | % 11 + c2.:maj7 | % 12 + b2.:7.5+.9- | % 13 + e2.:m7 | % 14 + c2.:maj7 | % 15 + a2.:m7 | % 16 + b2.:7.5+.9- | % 17 + e4.:m7 d/fs | % 18 + + g2. | % 19 + d2. | % 20 + c2.:maj7 | % 21 + b2:m7 e4:m7 | % 22 + a2.:m7 | % 23 + b2.:7.5+.9- | % 24 + e2.:m7 | % 25 + d2. | % 26 + d2.:7 | % 27 + + g2. | % 28 + s2. | % 29 + c2.:maj7 | % 30 + g2. | % 31 + s2. | % 32 + s2. | % 33 + c2.:maj7 | % 34 + g4. d/fs | % 35 + e2.:m7 | % 36 + b4.:m7 e:m7 | % 37 + a2.:m7 | % 38 + b2.:7.5+.9- | % 39 + c2.:maj7 | % 40 + b2.:m7 | % 41 + + a2.:m7 | % 42 + g4. g/fs | % 43 + + a2.:m7 | % 44 a2.:m7/d | % 45 - \repeat volta 2 - { - s8 g2 s8 | % 46 - c2.:maj7 | % 47 - s8 g2 s8 | % 48 - c2.:maj7 | % 49 - } + s8 g2 s8 | % 46 + c2.:maj7 | % 47 + s8 g2 s8 | % 48 + c2.:maj7 | % 49 g2. | % 50 } @@ -273,90 +280,74 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 3/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro r2. | % 1 r2. | % 2 - \repeat volta 3 - { - r8 c4.-> c4-^ | % 3 - c2. | % 4 - r8 c4.-> c4-^ | % 5 - c4. c | % 6 - r8 c4.-> c4-^ | % 7 - c2. | % 8 - r8 c4.-> c4-^ | % 9 - c4. c \bar "||" % 10 - - c2. | % 11 - c2. | % 12 - c2. | % 13 - c2. | % 14 - c2. | % 15 - c2. | % 16 - c2. | % 17 - c4. c \bar "||" % 18 - - c2. | % 19 - c2. | % 20 - c2. | % 21 - c2 c4 | % 22 - c2. | % 23 - c2. | % 24 - c2. | % 25 - c2.-> | % 26 - c4 c c \bar "||" % 27 - - c4 c c | % 28 - c4 c c | % 29 - c4 c c | % 30 - c4 c c | % 31 - c4 c c | % 32 - c4 c c | % 33 - c4 c c | % 34 - c4. c | % 35 - c4 c c | % 36 - c4. c | % 37 - c4 c c | % 38 - c4 c c | % 39 - c4 c c | % 40 - c4 c c | % 41 - } - \alternative - { - { - c4 c c | % 42 - c4. c | % 43 - } - { - c4 c c | % 44 - } - } + r8 c4.-> c4-^ | % 3 + c2. | % 4 + r8 c4.-> c4-^ | % 5 + c4. c | % 6 + r8 c4.-> c4-^ | % 7 + c2. | % 8 + r8 c4.-> c4-^ | % 9 + c4. c | % 10 + + c2. | % 11 + c2. | % 12 + c2. | % 13 + c2. | % 14 + c2. | % 15 + c2. | % 16 + c2. | % 17 + c4. c | % 18 + + c2. | % 19 + c2. | % 20 + c2. | % 21 + c2 c4 | % 22 + c2. | % 23 + c2. | % 24 + c2. | % 25 + c2.-> | % 26 + c4 c c | % 27 + + c4 c c | % 28 + c4 c c | % 29 + c4 c c | % 30 + c4 c c | % 31 + c4 c c | % 32 + c4 c c | % 33 + c4 c c | % 34 + c4. c | % 35 + c4 c c | % 36 + c4. c | % 37 + c4 c c | % 38 + c4 c c | % 39 + c4 c c | % 40 + c4 c c | % 41 + + c4 c c | % 42 + c4. c | % 43 + + c4 c c | % 44 c4 c c | % 45 - \repeat volta 2 - { - r8 c4.-> c4-^ | % 46 - c2. | % 47 - r8 c4.-> c4-^ | % 48 - c2. | % 49 - } - c2.-\fermata \bar "|." % 50 + r8 c4.-> c4-^ | % 46 + c2. | % 47 + r8 c4.-> c4-^ | % 48 + c2. | % 49 + + c2.-\fermata | % 50 } @@ -375,40 +366,45 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC >> - \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 } + diff --git a/we-will-glorify.ly b/we-will-glorify.ly index 3bda98a..eb51965 100644 --- a/we-will-glorify.ly +++ b/we-will-glorify.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 "We Will Glorify" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Twila Paris" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -35,19 +33,14 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 % Intro \partial 4*1 s4 | % 0 -% \once \override TextScript #'padding = #2.0 -% s1*0^\markup { \large \bold { Moderately fast pop } } -%%Capo 3 version -%% s1*0^\markup { \large \bold { Moderately fast pop "(*** CAPO 3 ***)" } } -% s1*13 \bar "||:" % 1-13 - \repeat volta 3 + \repeat volta 4 { % Verse @@ -61,7 +54,7 @@ Global = s2. | % 8 } { - s2. | % 9 + s2. \bar "||" % 9 } } @@ -83,9 +76,6 @@ Global = % LeadVox = \relative c'' { - \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro s4 | % 0 @@ -126,6 +116,7 @@ LeadVox = \relative c'' e2.-\fermata | % 24 } + LeadVoxText = \lyricmode { glor -- i -- fy the King of Kings, @@ -160,7 +151,6 @@ LeadVoxTextB = \lyricmode % Riffs = \relative c' { - % Intro \tiny @@ -180,9 +170,6 @@ Riffs = \relative c' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro d4/fs | % 0 @@ -227,14 +214,11 @@ 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 = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -300,7 +284,7 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << @@ -328,7 +312,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -341,6 +325,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) } + diff --git a/we-will-worship-the-lamb-of-glory.ly b/we-will-worship-the-lamb-of-glory.ly index 34c609a..7373c18 100644 --- a/we-will-worship-the-lamb-of-glory.ly +++ b/we-will-worship-the-lamb-of-glory.ly @@ -1,16 +1,15 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -staffSize = #18 % or 16 +% 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 "We Will Worship The Lamb Of Glory" } } % composer = \markup { \override #'(font-family . sans) "" } @@ -20,50 +19,36 @@ staffSize = #18 % or 16 % -% 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 % Intro - R1^\markup { 8th note ballad } | % 1 - R1 | % 2 - R1 | % 3 - R1 | % 4 + s1^\markup { 8th note ballad } | % 1 + s1*3 \bar ".|:-||" % 2-4 % Verse \repeat volta 2 { -%\mark \markup { \override #'(font-family . sans) { \box { A } } } -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - - r4 a8 a a g f g ~ | % 5 - g4 f8 a ~ a g4. | % 6 - r4 a8 a a g f g ~ | % 7 - g4 a8 g ~ g4 r | % 8 - r4 a8 a a g f g ~ | % 9 - g4 a8 g ( ~ g f ) d4 | % 10 + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + + s1*6 | % 5-10 } \alternative { { - r4 f8 f g a g f ~ | % 11 - f2 r | % 12 + s1*2 | % 11-12 } { - r4 f8 f g a g f | % 13 - r8 c' c c c bf a c ~ | % 14 + s1*2 | % 13-14 } } @@ -71,46 +56,88 @@ LeadVox = \relative c'' \repeat volta 3 { -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - c8 c c bf ~ bf c d c | % 15 - r8 c c c c bf a c ~ | % 16 - c8 c c c bf c d c | % 17 - r8 c c c c bf a d ~ | % 18 - d8 c bf c ~ c bf a bf ~ | % 19 - bf8 a g f ~ f g a bf ~ | % 20 - bf8 a g f f g e f ~ | % 21 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*7 | % 15-21 } \alternative { { - f2 r | % 22 - << R1 \\ { s2. s4^\markup { \bold \italic { D.S. } } } >> \bar "||" % 23 + s1 | % 22 + s2. s4^\markup { \hspace #-1.8 \raise #0.2 \bold "D.S." } \bar "||" % 23 % R1^\markup { \bold \italic { D.S. } } \bar "||" % 23 %\once \override Score.RehearsalMark #'self-alignment-X = #right %\mark \markup { \italic { D.S. } } } { - r8 c' c c c bf a c ~ | % 24 + s1 | % 24 } { - f,2 \repeatTie r8 g a bf ~ | % 25 + s1 | % 25 } } % Outro + s1*3 \bar "||" % 26-28 + s1*5 \bar "|." % 29-33 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + R1*4 | % 1-4 + + % Verse + + r4 a8 a a g f g ~ | % 5 + g4 f8 a ~ a g4. | % 6 + r4 a8 a a g f g ~ | % 7 + g4 a8 g ~ g4 r | % 8 + r4 a8 a a g f g ~ | % 9 + g4 a8 g ( ~ g f ) d4 | % 10 + + r4 f8 f g a g f ~ | % 11 + f2 r | % 12 + + r4 f8 f g a g f | % 13 + r8 c' c c c bf a c ~ | % 14 + + % Chorus + + c8 c c bf ~ bf c d c | % 15 + r8 c c c c bf a c ~ | % 16 + c8 c c c bf c d c | % 17 + r8 c c c c bf a d ~ | % 18 + d8 c bf c ~ c bf a bf ~ | % 19 + bf8 a g f ~ f g a bf ~ | % 20 + bf8 a g f f g e f ~ | % 21 + + f2 r | % 22 + R1 | % 23 + + r8 c' c c c bf a c \laissezVibrer | % 24 + + f,2 \repeatTie r8 g a bf ~ | % 25 + + % Outro + bf8 a g f f g e f ~ | % 26 f2 r8 g a bf ~ | % 27 - bf8 a g f f g e4 \bar "||" % 28 + bf8 a g f f g e4 | % 28 f4 r r2 | % 29 R1 | % 30 R1 | % 31 R1 | % 32 - r1^\fermata \bar "|." % 33 + r1^\fermata | % 33 } + LeadVoxText = \lyricmode { We will wor- ship the lamb _ of glo- _ ry @@ -148,12 +175,8 @@ LeadVoxTextB = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro f2.. c8/f | % 1 @@ -210,73 +233,50 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro c4-\markup { \small \italic { sidestick } } c c c8 c ~ | % 1 c4 c c c | % 2 c4 c c c | % 3 - c4 c c c \bar "||:" % 4 + c4 c c c | % 4 % Verse - \repeat volta 2 - { - c4_\mf c c c8 c ~ | % 5 - c4 c c c | % 6 - c4 c c c8 c ~ | % 7 - c4 c c c | % 8 - c4 c c c8 c ~ | % 9 - c4 c c c | % 10 - } - \alternative - { - { - c4 c c c8 c ~ | % 11 - c4 c8 c ~ c4 c | % 12 - } - { - c4 c c c8 c ~ | % 13 - c8 c c c c c c c ~ | % 14 - } - } + c4_\mf c c c8 c ~ | % 5 + c4 c c c | % 6 + c4 c c c8 c ~ | % 7 + c4 c c c | % 8 + c4 c c c8 c ~ | % 9 + c4 c c c | % 10 + + c4 c c c8 c ~ | % 11 + c4 c8 c ~ c4 c | % 12 + + c4 c c c8 c ~ | % 13 + c8 c c c c c c c ~ | % 14 % Chorus - \repeat volta 3 - { - c4_\markup { \italic { snare } } c8 c ~ c4 c8 c ~ | % 15 - c8 c c c c c c c ~ | % 16 - c4 c8 c ~ c4 c8 c ~ | % 17 - c8 c c c c c c c ~ | % 18 - c4 c8 c ~ c4 c8 c ~ | % 19 - c4 c8 c ~ c4 c8 c ~ | % 20 - c4 c8 c ~ c4 c | % 21 - } - \alternative - { - { - c4 c c c8 c ~ | % 22 - c4 c c c | % 23 - } - { - c8 c c c c c c c | % 24 (repeat tie on the last c - } - { - c4. c8 ~ c4 c8 c ~ | % 25 - } - } + c4_\markup { \italic { snare } } c8 c ~ c4 c8 c ~ | % 15 + c8 c c c c c c c ~ | % 16 + c4 c8 c ~ c4 c8 c ~ | % 17 + c8 c c c c c c c ~ | % 18 + c4 c8 c ~ c4 c8 c ~ | % 19 + c4 c8 c ~ c4 c8 c ~ | % 20 + c4 c8 c ~ c4 c | % 21 + + c4 c c c8 c ~ | % 22 + c4 c c c | % 23 + + c8 c c c c c c c | % 24 (repeat tie on the last c + + c4. c8 ~ c4 c8 c ~ | % 25 % Outro @@ -288,43 +288,50 @@ StaffC = \relative c c4 c c c | % 30 c4 c c c | % 31 c4 c c c | % 32 - c1^\fermata \bar "|." % 33 + c1^\fermata | % 33 } \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 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 } + diff --git a/what-child-is-this.ly b/what-child-is-this.ly index 10e7cb7..9e8dd47 100644 --- a/what-child-is-this.ly +++ b/what-child-is-this.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 = #24 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -12,8 +12,6 @@ staffSize = #24 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "What Child Is This, Who, Laid to Rest?" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Traditional" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Shamus Hammons" } @@ -22,30 +20,19 @@ staffSize = #24 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c'' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" \clef G \key a \minor - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro \partial 4*1 s4 | % 0 - s2. | % 1 - s2. | % 2 - s2. | % 3 - s2. | % 4 - s2. | % 5 - s2. | % 6 - s2. | % 7 - s2 a4 \bar "||:" % 8 + s2.*8 \bar ".|:-||" % 1-8 \break % bah @@ -53,66 +40,93 @@ LeadVox = \relative c'' { % Verse -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - c2 d4 | % 9 - e4. ( fs8 ) e4 | % 10 - d2 b4 | % 11 - g4. ( a8 ) b4 | % 12 - c2 a4 | % 13 - a4. ( gs8 ) a4 | % 14 - b2 ( gs4 ) | % 15 - e2 b'4 | % 16 - - c2 d4 | % 17 - e4. ( fs8 ) e4 | % 18 - d2 b4 | % 19 - g4. ( a8 ) b4 | % 20 - c4. ( b8 ) a4 | % 21 - gs4. ( fs8 ) gs4 | % 22 - a2. | % 23 - a2. \bar "||" % 24 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s2.*16 \bar "||" % 9-24 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - g'2. | % 25 - g4. ( fs8 ) e4 | % 26 - d2 b4 | % 27 - g4. ( a8 ) b4 | % 28 - c2 a4 | % 29 - a4. ( gs8 ) a4 | % 30 - b2 gs4 | % 31 - e2. | % 32 - - g'2. | % 33 - g4. ( fs8 ) e4 | % 34 - d2 b4 | % 35 - g4. ( a8 ) b4 | % 36 - c4. ( b8 ) a4 | % 37 - gs4. ( fs8 ) gs4 | % 38 - a2. | % 39 - a2 s4 \bar "||" % 40 - + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s2.*16 \bar "||" % 25-40 s2. | % 41 } \alternative { { - s2. | % 42 - s2. | % 43 - s2 a4 | % 44 + s2.*3 | % 42-44 } { s2. | % 45 } } + s2.*2 \bar "|." % 46-47 +} + + +% +% Lead vocal +% +LeadVox = \relative c'' +{ + % Intro + + s4 | % 0 + s2.*7 | % 1-7 + s2 a4 | % 8 + + % Verse + + c2 d4 | % 9 + e4. ( fs8 ) e4 | % 10 + d2 b4 | % 11 + g4. ( a8 ) b4 | % 12 + c2 a4 | % 13 + a4. ( gs8 ) a4 | % 14 + b2 ( gs4 ) | % 15 + e2 b'4 | % 16 + + c2 d4 | % 17 + e4. ( fs8 ) e4 | % 18 + d2 b4 | % 19 + g4. ( a8 ) b4 | % 20 + c4. ( b8 ) a4 | % 21 + gs4. ( fs8 ) gs4 | % 22 + a2. | % 23 + a2. \bar "||" % 24 + + % Chorus + + g'2. | % 25 + g4. ( fs8 ) e4 | % 26 + d2 b4 | % 27 + g4. ( a8 ) b4 | % 28 + c2 a4 | % 29 + a4. ( gs8 ) a4 | % 30 + b2 gs4 | % 31 + e2. | % 32 + + g'2. | % 33 + g4. ( fs8 ) e4 | % 34 + d2 b4 | % 35 + g4. ( a8 ) b4 | % 36 + c4. ( b8 ) a4 | % 37 + gs4. ( fs8 ) gs4 | % 38 + a2. | % 39 + a2 s4 | % 40 + + s2. | % 41 + + s2. | % 42 + s2. | % 43 + s2 a4 | % 44 + + s2. | % 45 + s2. | % 46 - s2. \bar "|." % 47 + s2. | % 47 } + LeadVoxText = \lyricmode { What child is this, _ who, laid to rest, _ @@ -154,16 +168,10 @@ LeadVoxTextC = \lyricmode Riffs = \relative c'' { - \clef G - \key a \minor - \override Staff.TimeSignature #'style = #'() - \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny - \partial 4*1 a4 | % 0 + a4 | % 0 << { \tiny c2 d4 } \\ { \tiny a,2 b4 } >> | % 1 << { e'4. fs8 e4 } \\ { c,2. } >> | % 2 << { d'2 b4 } \\ { g,2. } >> | % 3 @@ -185,7 +193,7 @@ Riffs = \relative c'' << { \tiny gs'4. fs8 gs4 } \\ { \tiny e,2. } >> | % 45 << { a'2. } \\ { a,2. } >> | % 46 - << { 2.-\fermata } \\ { a,2. } >> \bar "|." % 47 + << { 2.-\fermata } \\ { a,2. } >> | % 47 \normalsize } @@ -193,15 +201,11 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \partial 4*1 s4 | % 0 + s4 | % 0 a2.:m | % 1 c2. | % 2 g2. | % 3 @@ -211,61 +215,53 @@ Chords = \chordmode a2.:m | % 7 s2. | % 8 - \repeat volta 3 - { - % Verse - - a2.:m | % 9 - c2. | % 10 - g2. | % 11 - g2./b | % 12 - a2.:m | % 13 - f2. | % 14 - e2. | % 15 - s2. | % 16 - - a2.:m | % 17 - c2. | % 18 - g2. | % 19 - g2./b | % 20 - a2.:m | % 21 - e2. | % 22 - a2.:m | % 23 - s2. | % 24 - - % Chorus - - c2. | % 25 - c2. | % 26 - g2. | % 27 - g2./b | % 28 - a2.:m | % 29 - f2. | % 30 - e2. | % 31 - s2. | % 32 - - c2. | % 33 - c2. | % 34 - g2. | % 35 - g2./b | % 36 - a2.:m | % 37 - e2. | % 38 - a2.:m | % 39 - s2. | % 40 - - a2.:m | % 41 - } - \alternative - { - { - e2. | % 42 - a2.:m | % 43 - s2. | % 44 - } - { - e2. | % 45 - } - } + % Verse + + a2.:m | % 9 + c2. | % 10 + g2. | % 11 + g2./b | % 12 + a2.:m | % 13 + f2. | % 14 + e2. | % 15 + s2. | % 16 + + a2.:m | % 17 + c2. | % 18 + g2. | % 19 + g2./b | % 20 + a2.:m | % 21 + e2. | % 22 + a2.:m | % 23 + s2. | % 24 + + % Chorus + + c2. | % 25 + c2. | % 26 + g2. | % 27 + g2./b | % 28 + a2.:m | % 29 + f2. | % 30 + e2. | % 31 + s2. | % 32 + + c2. | % 33 + c2. | % 34 + g2. | % 35 + g2./b | % 36 + a2.:m | % 37 + e2. | % 38 + a2.:m | % 39 + s2. | % 40 + + a2.:m | % 41 + + e2. | % 42 + a2.:m | % 43 + s2. | % 44 + + e2. | % 45 a2.:m | % 46 a2. | % 47 @@ -275,21 +271,15 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 3/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \partial 4*1 s4 | % 0 + s4 | % 0 c4 c c | % 1 c4 c c | % 2 c4 c c | % 3 @@ -297,66 +287,58 @@ StaffC = \relative c c4 c c | % 5 c4 c c | % 6 c4 c c | % 7 - c4 c c \bar "||:" % 8 - - \repeat volta 3 - { - % Verse - - c4 c c | % 9 - c4 c c | % 10 - c4 c c | % 11 - c4 c c | % 12 - c4 c c | % 13 - c4 c c | % 14 - c4 c c | % 15 - c4 c c | % 16 - - c4 c c | % 17 - c4 c c | % 18 - c4 c c | % 19 - c4 c c | % 20 - c4 c c | % 21 - c4 c c | % 22 - c4 c c | % 23 - c4 c c \bar "||" % 24 - - % Chorus - - c4 c c | % 25 - c4 c c | % 26 - c4 c c | % 27 - c4 c c | % 28 - c4 c c | % 29 - c4 c c | % 30 - c4 c c | % 31 - c4 c c | % 32 - - c4 c c | % 33 - c4 c c | % 34 - c4 c c | % 35 - c4 c c | % 36 - c4 c c | % 37 - c4 c c | % 38 - c4 c c | % 39 - c4 c c \bar "||" % 40 - - c4 c c | % 41 - } - \alternative - { - { - c4 c c | % 42 - c4 c c | % 43 - c4 c c | % 44 - } - { - c4 c c | % 45 - } - } + c4 c c | % 8 + + % Verse + + c4 c c | % 9 + c4 c c | % 10 + c4 c c | % 11 + c4 c c | % 12 + c4 c c | % 13 + c4 c c | % 14 + c4 c c | % 15 + c4 c c | % 16 + + c4 c c | % 17 + c4 c c | % 18 + c4 c c | % 19 + c4 c c | % 20 + c4 c c | % 21 + c4 c c | % 22 + c4 c c | % 23 + c4 c c | % 24 + + % Chorus + + c4 c c | % 25 + c4 c c | % 26 + c4 c c | % 27 + c4 c c | % 28 + c4 c c | % 29 + c4 c c | % 30 + c4 c c | % 31 + c4 c c | % 32 + + c4 c c | % 33 + c4 c c | % 34 + c4 c c | % 35 + c4 c c | % 36 + c4 c c | % 37 + c4 c c | % 38 + c4 c c | % 39 + c4 c c | % 40 + + c4 c c | % 41 + + c4 c c | % 42 + c4 c c | % 43 + c4 c c | % 44 + + c4 c c | % 45 c4 c c | % 46 - c2.-\fermata \bar "|." % 47 + c2.-\fermata | % 47 } @@ -390,18 +372,21 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \transpose a e \LeadVox \new Voice = "riffs" \transpose a e \Riffs >> } + \new Voice = "lead" \transpose a e \LeadVox + \new Voice = "riffs" \transpose a e \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC >> - \new ChoirStaff = "Rhythm" + \new ChoirStaff << - \new ChordNames = "chords" \transpose a e \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> + \new ChordNames \transpose a e \Chords + \new RhythmicStaff << \StaffC \Dynamics >> >> \set Score.skipBars = ##t @@ -412,11 +397,11 @@ 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 @@ -427,6 +412,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) } + diff --git a/who-am-i.ly b/who-am-i.ly index 4e00bed..6a9a726 100644 --- a/who-am-i.ly +++ b/who-am-i.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Who Am I" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Mark Hall" } % arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. " } @@ -35,7 +33,7 @@ hn = #(define-music-function (parser location arg) (ly:music?) Global = { \key b \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 2/2 % Intro @@ -140,12 +138,6 @@ Global = % LeadVox = \relative c'' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" - \clef G -%Hm. Needed anymore? - \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro s1*8 | % 1-8 @@ -232,7 +224,7 @@ LeadVox = \relative c'' % Coda - \stopStaff s1 \startStaff % That removed the spurious floating bar line from line break +s1 % Extra bar for coda r2 r8 b as b ~ | % 71 b1 ~ | % 72 @@ -242,7 +234,7 @@ LeadVox = \relative c'' r2 r8 b as b ~ | % 76 b1 | % 77 - r2 r8 b as b ~ ( | % 78 + r2 r8 b as b ( | % 78 cs16 ds cs4. ~ cs8 b4. ~ | % 79 b4 as gs8 fs4. ) | % 80 r1 | % 81 @@ -252,7 +244,7 @@ LeadVox = \relative c'' r8 ds'4 cs8 ~ cs b4 b8 ~ | % 85 b8 ds4 cs8 ~ cs b4 b8 ~ | % 86 b4 r r2 | % 87 - r4 fs8 b ~ b b4 b8 ~ ( | % 88 + r4 fs8 b ~ b b4 b8 ( | % 88 cs16 ds cs8 ~ cs2 b4 ~ | % 89 b2 ) r8 b gs cs ~ ( | % 90 cs8 b ~ b2 ) r4 | % 91 @@ -269,6 +261,7 @@ LeadVox = \relative c'' r1-\fermata | % 98 } + LeadVoxText = \lyricmode { Who am I, _ that the lord of all _ the earth _ @@ -319,10 +312,6 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { - \clef G -%Hm. Needed anymore? - \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -354,9 +343,6 @@ Riffs = \relative c'' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro b2.. e8:sus2 | % 1 @@ -455,7 +441,7 @@ Chords = \chordmode % Coda - \stopStaff s1 \startStaff % That removed the spurious floating bar line from line break +s1 % Extra bar for coda e2 fs | % 71 gs1:m7 | % 72 @@ -489,22 +475,16 @@ Chords = \chordmode s1 | % 97 - e1:5.9 | % 98 + e1:3.5.9 | % 98 } % % 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 = #'() -% \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash \teeny @@ -656,8 +636,8 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on -% \transpose b g \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on +% \transpose b g \Global % The "roadmap" that everything else depends on \context Staff << @@ -685,11 +665,11 @@ 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 @@ -700,6 +680,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) } + diff --git a/wonderful-merciful-savior.ly b/wonderful-merciful-savior.ly index e1ca109..d8e31d1 100644 --- a/wonderful-merciful-savior.ly +++ b/wonderful-merciful-savior.ly @@ -1,9 +1,9 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #20 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) #(ly:set-option (quote no-point-and-click)) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Wonderful, Merciful Savior" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "Dawn Rodgers/Eric Wyse" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -30,76 +28,108 @@ hn = #(define-music-function (parser location arg) (ly:music?) % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro - s2. | % 1 - s2. | % 2 - s2. | % 3 - s2. | % 4 - s2. | % 5 - s2. | % 6 - s2. | % 7 - s2. \bar "||:" % 8 -%\break % bleah + s2.*8 \bar ".|:-||" % 1-8 \repeat volta 2 { % Verse -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \italic \smaller { 1st X piano only, unison } } - 4. 8 4 | % 9 - 4. 8 4 | % 10 - 2. | % 11 - 2. | % 12 - 4 | % 13 - 4 8 ( ) | % 14 - 2. ~ | % 15 - 2. | % 16 - 4 8 ~ | % 17 - 4 | % 18 - 2. | % 19 - 2 r4 | % 20 - 4 | % 21 - 2 4 | % 22 - 2. | % 23 - << { \voiceOne a'4 ( b ) c } \context Voice = "v2" { \voiceTwo <\hn f, \hn c>2 <\hn f \hn a,>4 } \oneVoice >> | % 24 - 4 | % 25 - 2 4 | % 26 + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \italic \smaller { 1st X piano only, unison } } + s2.*18 | % 9-26 } \alternative { { - c2. | % 27 - s2. | % 28 - s2. | % 29 - s2. | % 30 + s2.*4 | % 27-30 } { -\set Score.repeatCommands = #'((volta "2.–3.") end-repeat) % That's an ndash in there... - c2. | % 31 -\set Score.repeatCommands = #'((volta #f)) + \set Score.repeatCommands = #'((volta "2.–3.") end-repeat) % That's an ndash in there... + s2. | % 31 + \set Score.repeatCommands = #'((volta #f)) } } - r2. \bar "||" % 32 + s2. \bar "||" % 32 + + % Chorus + + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s2.*18 | % 33-50 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \musicglyph #"scripts.coda" \italic { to Coda } } + s2.*4 \bar ":|." % 51-54 + +%\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break +%\break % Meh +\stopStaff s2. \startStaff +\set Score.currentBarNumber = #55 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { { \musicglyph #"scripts.coda" } "Coda" } + + % Coda + + s2.*2 \bar "||" % 55-56 + + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s2.*27 \bar "|." % 57-83 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s2.*8 | % 1-8 + + % Verse + + 4. 8 4 | % 9 + 4. 8 4 | % 10 + 2. | % 11 + 2. | % 12 + 4 | % 13 + 4 8 ( ) | % 14 + 2. ~ | % 15 + 2. | % 16 + 4 8 ~ | % 17 + 4 | % 18 + 2. | % 19 + 2 r4 | % 20 + 4 | % 21 + 2 4 | % 22 + 2. | % 23 + << { \voiceOne a'4 ( b ) c } \context Voice = "v2" { \voiceTwo <\hn f, \hn c>2 <\hn f \hn a,>4 } \oneVoice >> | % 24 + 4 | % 25 + 2 4 | % 26 + + c2. | % 27 + s2. | % 28 + s2. | % 29 + s2. | % 30 + + c2. | % 31 + + r2. | % 32 % Chorus -\mark \markup { \override #'(font-family . sans) { \box { B } } } 4 8 ~ | % 33 4 | % 34 2. ( | % 35 @@ -118,26 +148,19 @@ LeadVox = \relative c' << { \voiceOne a'4 ( b ) c } \context Voice = "v2" { \voiceTwo <\hn f, \hn c>2 <\hn f \hn a,>4 } \oneVoice >> | % 48 4 | % 49 4 2 | % 50 -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \musicglyph #"scripts.coda" \italic { to Coda } } + c2. | % 51 s2. | % 52 s2. | % 53 - s2. \bar ":|" % 54 + s2. | % 54 -%\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break -%\break % Meh -\stopStaff s2. \startStaff -\set Score.currentBarNumber = #55 +s2. -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } % Coda c2. ~ | % 55 - c2. \bar "||" % 56 + c2. | % 56 -\mark \markup { \override #'(font-family . sans) { \box { C } } } 4 8 ~ | % 57 4 | % 58 2. ( | % 59 @@ -165,9 +188,10 @@ LeadVox = \relative c' s2. | % 80 s2. | % 81 s2. | % 82 - s2. \bar "|." % 83 + s2. | % 83 } + LeadVoxText = \lyricmode { Won -- der -- ful, mer -- ci -- ful sav -- ior, @@ -219,12 +243,6 @@ LeadVoxTextC = \lyricmode Riffs = \relative c'' { - \clef G - \key c \major - \override Staff.TimeSignature #'style = #'() - \time 3/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny @@ -269,12 +287,8 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro s2. | % 1 @@ -284,45 +298,37 @@ Chords = \chordmode c2. | % 5 d2.:m/c | % 6 c2. | % 7 - d2.:m/c \bar "||:" % 8 - - \repeat volta 2 - { - % Verse - - c2. | % 9 - d2.:m/c | % 10 - c2. | % 11 - s2. | % 12 - e2.:m | % 13 - f2. | % 14 - g2.:sus4 | % 15 - g2. | % 16 - a2.:m | % 17 - s2. | % 18 - f2. | % 19 - s2. | % 20 - c2. | % 21 - g2. | % 22 - a2.:m | % 23 - f2. | % 24 - c2./g | % 25 - g2.:6 | % 26 - } - \alternative - { - { - c2. | % 27 - d2.:m/c | % 28 - c2. | % 29 - d2.:m/c | % 30 - } - { - c2. | % 31 - } - } - - c2./b \bar "||" % 32 + d2.:m/c | % 8 + + % Verse + + c2. | % 9 + d2.:m/c | % 10 + c2. | % 11 + s2. | % 12 + e2.:m | % 13 + f2. | % 14 + g2.:sus4 | % 15 + g2. | % 16 + a2.:m | % 17 + s2. | % 18 + f2. | % 19 + s2. | % 20 + c2. | % 21 + g2. | % 22 + a2.:m | % 23 + f2. | % 24 + c2./g | % 25 + g2.:6 | % 26 + + c2. | % 27 + d2.:m/c | % 28 + c2. | % 29 + d2.:m/c | % 30 + + c2. | % 31 + + c2./b | % 32 % Chorus @@ -388,17 +394,11 @@ s2. % % 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 \override NoteHead #'style = #'slash + \teeny % Intro @@ -409,45 +409,37 @@ StaffC = \relative c c4 c c | % 5 c4 c c | % 6 c4 c c | % 7 - c4 c c \bar "||:" % 8 - - \repeat volta 2 - { - % Verse - - c4 c c | % 9 - c4 c c | % 10 - c4 c c | % 11 - c4 c c | % 12 - c4 c c | % 13 - c4 c c | % 14 - c4 c c | % 15 - c4 c c | % 16 - c4 c c | % 17 - c4 c c | % 18 - c4 c c | % 19 - c4 c c | % 20 - c4 c c | % 21 - c4 c c | % 22 - c4 c c | % 23 - c4 c c | % 24 - c4 c c | % 25 - c4 c c | % 26 - } - \alternative - { - { - c4 c c | % 27 - c4 c c | % 28 - c4 c c | % 29 - c4 c c | % 30 - } - { - c4 c c | % 31 - } - } - - c4 c c \bar "||" % 32 + c4 c c | % 8 + + % Verse + + c4 c c | % 9 + c4 c c | % 10 + c4 c c | % 11 + c4 c c | % 12 + c4 c c | % 13 + c4 c c | % 14 + c4 c c | % 15 + c4 c c | % 16 + c4 c c | % 17 + c4 c c | % 18 + c4 c c | % 19 + c4 c c | % 20 + c4 c c | % 21 + c4 c c | % 22 + c4 c c | % 23 + c4 c c | % 24 + c4 c c | % 25 + c4 c c | % 26 + + c4 c c | % 27 + c4 c c | % 28 + c4 c c | % 29 + c4 c c | % 30 + + c4 c c | % 31 + + c4 c c | % 32 % Chorus @@ -472,19 +464,15 @@ StaffC = \relative c c4 c c | % 51 c4 c c | % 52 c4 c c | % 53 - c4 c c \bar ":|" % 54 + c4 c c | % 54 %\stopStaff s1 \bar "" \startStaff % That removed the spurious floating bar line from line break \stopStaff s2. \startStaff -\set Score.currentBarNumber = #55 - -%\once \override Score.RehearsalMark #'self-alignment-X = #left -%\mark \markup { { \musicglyph #"scripts.coda" } "Coda" } % Coda c4 c c | % 55 - c4 c c \bar "||" % 56 + c4 c c | % 56 c4-> r2 | % 57 r2. | % 58 @@ -512,7 +500,7 @@ StaffC = \relative c c4 c c | % 80 c4 c c | % 81 c4 c c | % 82 - c2.-\fermata \bar "|." % 83 + c2.-\fermata | % 83 } @@ -534,18 +522,21 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB \new Lyrics \lyricsto "lead" \LeadVoxTextC >> - \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 @@ -556,11 +547,11 @@ 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 @@ -571,6 +562,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) } + diff --git a/word-of-god-speak.ly b/word-of-god-speak.ly index 408046f..3840cb1 100644 --- a/word-of-god-speak.ly +++ b/word-of-god-speak.ly @@ -1,17 +1,15 @@ -\version "2.16.0" +\version "2.19.0" \include "pop-chords.ly" \include "english.ly" -% Good sizes are 16, 18, & 20 -staffSize = #16 +% Good sizes are 16, 18, & 20 (11, 13, 14, 23, 26) +staffSize = #18 #(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 "Word Of God, Speak" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -29,11 +27,10 @@ hn = #(define-music-function (parser location arg) (ly:music?) % % Song's structure % - Global = { \key c \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 % Intro @@ -79,17 +76,8 @@ Global = % % Lead vocal % - LeadVox = \relative c' { -% \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" - \clef G - \key c \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro r1 | % 1 @@ -171,6 +159,7 @@ LeadVox = \relative c' d8 c ~ c2.-\fermata | % 53 } + LeadVoxText = \lyricmode { I'm find -- ing my -- self _ _ at a loss _ for words _ @@ -206,109 +195,12 @@ LeadVoxText = \lyricmode Riffs = \relative c'' { -%{ - \clef G - \key c \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - - % Intro - -\tiny - r8 g16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ | % 1 - c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ | % 2 - d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ | % 3 - c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ | % 4 - d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ | % 5 - c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ | % 6 - d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 7 - \voiceOne 1 \oneVoice | % 8 - - \repeat volta 2 - { - % Verse - - s1 | % 9 - s1 | % 10 - s1 | % 11 - s1 | % 12 - s1 | % 13 - s1 | % 14 - s1 | % 15 - s1 | % 16 - - % Chorus - - s1 | % 17 - s1 | % 18 - s1 | % 19 - s1 | % 20 - s1 | % 21 - s1 | % 22 - s1 | % 23 - \time 2/4 s2 \time 4/4 | % 24 - \voiceOne r8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. ~ \oneVoice | % 25 - c8 g16 d' ~ d c8 b16 ~ b8. c16 ~ c16 d8. ~ | % 26 - } - \alternative - { - { - d8 g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 27 - \voiceOne 1 \oneVoice | % 28 - } - { - d8 \repeatTie g,16 d' ~ d c8 g16 ~ g8 g16 d' ~ d c8. | % 29 - } - } - - c8 bf16 f ~ f2. | % 30 - c'8 bf16 f ~ f4 ~ f8. af16 ~ af bf8. | % 31 - c1 | % 32 - \voiceOne d2 e \oneVoice | % 33 - - % Verse - - s1 | % 34 - s1 | % 35 - s1 | % 36 - s1 | % 37 - s1 | % 38 - s1 | % 39 - s1 | % 40 - s1 | % 41 - - % Chorus - - s1 | % 42 - s1 | % 43 - s1 | % 44 - s1 | % 45 - s1 | % 46 - s1 | % 47 - s1 | % 48 - s1 | % 49 - - % Outro - - \voiceOne r8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ \oneVoice | % 50 - d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ | % 51 - e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ | % 52 - d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ | % 53 - e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ | % 54 - d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 e8. ~ | % 55 - e8 a,16 e' ~ e d8 a16 ~ a8 a16 e' ~ e d8. ~ | % 56 - d8 a16 e' ~ e d8 cs16 ~ cs8. d16 ~ d16 cs8. ~ | % 57 - 1^\fermata | % 59 -\normalsize -%} } % % Chord names % - Chords = \chordmode { % Intro @@ -396,16 +288,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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash \teeny @@ -505,37 +390,19 @@ Dynamics = \score { -%{ - << - << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } - \new Lyrics \lyricsto "lead" \LeadVoxText - >> - - \new ChoirStaff = "Rhythm" - << - \new ChordNames = "chords" \Chords - \new RhythmicStaff = "chordRhythm" << \StaffC \Dynamics >> - >> - - \set Score.skipBars = ##t - \set Score.melismaBusyProperties = #'() - >> -%} << + \Global % The "roadmap" that everything else depends on \set Score.skipBars = ##t \set Score.melismaBusyProperties = #'() - \new Staff + \context Staff << - \Global \new Voice = "lead" \LeadVox \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText >> -% \new Staff + \new ChoirStaff << \new ChordNames \Chords \new RhythmicStaff << \Rhythm \Dynamics >> @@ -546,22 +413,20 @@ Dynamics = \paper { - #(define fonts (make-pango-font-tree - "Times New Roman" - "JazzText" - "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 % Don't spread staves vertically across the page (default: f) % ragged-bottom = ##t % Allow partial line for last stave (default: f) - ragged-last = ##t +% ragged-last = ##t % To find out what's eating the space at the top... % annotate-spacing = ##t -%let's try this: [It works! Huzzah!][nope... :-/] -% obsolete-page-top-space = 0 top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space) } diff --git a/worthy-of-my-praise.ly b/worthy-of-my-praise.ly index f40b13f..42478e5 100644 --- a/worthy-of-my-praise.ly +++ b/worthy-of-my-praise.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -10,8 +10,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "Worthy Of My Praise" } composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "David Ruis" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -20,65 +18,38 @@ staffSize = #16 % -% 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 % Intro \repeat volta 2 { - R1 | % 1 - R1 | % 2 - R1 | % 3 - R1 | % 4 + s1*4 | % 1-4 } % Verse \repeat volta 2 { -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { A } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - f4. c8 c4 f ~ | % 5 -<< -{ \voiceOne - f2.. f8 | % 6 - f8 f4 g8 ~ g ef ~ ef4 ~ | % 7 - ef1 | % 8 - bf'4. f8 f4 bf ~ | % 9 - bf2. \tiny bf8 \normalsize bf\noBeam | % 10 - bf8 a4 g8 f2 | % 11 -} -\context Voice = v { \voiceTwo -\tiny - f4. c8 c4 f ~ | % 6 - f2.. f8 | % 7 - f8 f4 g8 ~ g ef ~ ef4 ~ | % 8 - ef1 | % 9 - bf'4. f8 f4 bf ~ | % 10 - bf2. r8 bf | % 11 -} ->> -\oneVoice + s1*7 | % 5-11 } \alternative { { - \context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } | % 12 + s1 | % 12 } { - \context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } | % 13 + s1 | % 13 } } @@ -86,35 +57,93 @@ LeadVox = \relative c' \repeat volta 3 { -\mark \markup { \override #'(font-family . sans) { \box { B } } } - - r4 c'8. c16 c4. c8 | % 14 - c4. bf8 a ( g ) g4 | % 15 - r4 bf8. bf16 bf4. bf8 | % 16 - bf4 a g8 ( f e f ) | % 17 - r4 c'8. c16 c4. c8 | % 18 - c4. bf8 a ( g ) g4 | % 19 - r4 bf8. bf16 bf4. bf8 | % 20 + \mark \markup { \override #'(font-family . sans) { \box { B } } } + s1*7 | % 14-20 } \alternative { { - bf4 a g8 ( f ) e ( f ) | % 21 - f2 r | % 22 - R1^\markup { \bold D.S. } \bar "||" % 23 + s1*2 | % 21-22 + s1^\markup { \bold D.S. } \bar "||" % 23 } { - bf4 a g8 ( f ) e f | % 24 + s1 | % 24 } { - bf4 a g8 ( f ) e f \bar "||" % 25 + s1 \bar "||" % 25 } } % Outro -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } \small \italic { a capella } } + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { C } } \small \italic { a capella } } + + s1*7 | % 26-32 + + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \small \italic { tutti } } + + s1*2 \bar "|." % 33-34 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + R1*4 | % 1-4 + + % Verse + + f4. c8 c4 f ~ | % 5 +<< +{ \voiceOne + f2.. f8 | % 6 + f8 f4 g8 ~ g ef ~ ef4 ~ | % 7 + ef1 | % 8 + bf'4. f8 f4 bf ~ | % 9 + bf2. \tiny bf8 \normalsize bf\noBeam | % 10 + bf8 a4 g8 f2 | % 11 +} +\context Voice = v { \voiceTwo +\tiny + f4. c8 c4 f ~ | % 6 + f2.. f8 | % 7 + f8 f4 g8 ~ g ef ~ ef4 ~ | % 8 + ef1 | % 9 + bf'4. f8 f4 bf ~ | % 10 + bf2. r8 bf | % 11 +} +>> +\oneVoice + + \context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } | % 12 + + \context Voice = v { \voiceTwo bf4 a g8 ( f e f ) } | % 13 + + % Chorus + + r4 c'8. c16 c4. c8 | % 14 + c4. bf8 a ( g ) g4 | % 15 + r4 bf8. bf16 bf4. bf8 | % 16 + bf4 a g8 ( f e f ) | % 17 + r4 c'8. c16 c4. c8 | % 18 + c4. bf8 a ( g ) g4 | % 19 + r4 bf8. bf16 bf4. bf8 | % 20 + + bf4 a g8 ( f ) e ( f ) | % 21 + f2 r | % 22 + R1 | % 23 + + bf4 a g8 ( f ) e f | % 24 + + bf4 a g8 ( f ) e f | % 25 + + % Outro r4 c'8. c16 c4. c8 | % 26 c4. bf8 a ( g ) g4 | % 27 @@ -124,13 +153,11 @@ LeadVox = \relative c' c4. bf8 a ( g ) g4 | % 31 r4 bf8. bf16 bf4. bf8 | % 32 -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \small \italic { tutti } } - bf4 a g8 ( f ) e ( f ) | % 33 - f1^\fermata \bar "|." % 34 + f1^\fermata | % 34 } + LeadVoxText = \lyricmode { I will wor -- ship _ @@ -208,70 +235,46 @@ LeadVoxTextD = \lyricmode % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro - \repeat volta 2 - { - f1:sus2 | % 1 - s1 | % 2 - ef1:sus2 | % 3 - s1 | % 4 - } + f1:sus2 | % 1 + s1 | % 2 + ef1:sus2 | % 3 + s1 | % 4 % Verse - \repeat volta 2 - { - f1:sus2 | % 5 - s1 | % 6 - ef1:sus2 | % 7 - s1 | % 8 - bf1 | % 9 - s1 | % 10 - f1 | % 11 - } - \alternative - { - { - g2:m7 bf4/c c | % 12 - } - { - g2:m7 bf4/c c | % 13 - } - } + f1:sus2 | % 5 + s1 | % 6 + ef1:sus2 | % 7 + s1 | % 8 + bf1 | % 9 + s1 | % 10 + f1 | % 11 + + g2:m7 bf4/c c | % 12 + + g2:m7 bf4/c c | % 13 % Chorus - \repeat volta 3 - { - f1 | % 14 - c1/e | % 15 - bf1/d | % 16 - g4:m7 f/a bf:6 c | % 17 - f1 | % 18 - c1/e | % 19 - g1:m7 | % 20 - } - \alternative - { - { - g4:m7 f/a bf:6 c | % 21 - f1 | % 22 - bf1/c | % 23 - } - { - g4:m7 f/a bf:6 c | % 24 - } - { - g4:m7 f/a bf:6 c | % 25 - } - } + f1 | % 14 + c1/e | % 15 + bf1/d | % 16 + g4:m7 f/a bf:6 c | % 17 + f1 | % 18 + c1/e | % 19 + g1:m7 | % 20 + + g4:m7 f/a bf:6 c | % 21 + f1 | % 22 + bf1/c | % 23 + + g4:m7 f/a bf:6 c | % 24 + + g4:m7 f/a bf:6 c | % 25 % Outro @@ -290,76 +293,50 @@ 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.instrumentName = #"Rhythm" - \override Staff.TimeSignature #'style = #'() - \time 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro - \repeat volta 2 - { - c1 ~ | % 1 - c1 | % 2 - c1 ~ | % 3 - c1 | % 4 - } + c1 ~ | % 1 + c1 | % 2 + c1 ~ | % 3 + c1 | % 4 % Verse - \repeat volta 2 - { - c1 ~ | % 5 - c1 | % 6 - c1 ~ | % 7 - c1 | % 8 - c1 ~ | % 9 - c1 | % 10 - c1 | % 11 - } - \alternative - { - { - c2 c4 c | % 12 - } - { - c4 c c c | % 13 - } - } + c1 ~ | % 5 + c1 | % 6 + c1 ~ | % 7 + c1 | % 8 + c1 ~ | % 9 + c1 | % 10 + c1 | % 11 + + c2 c4 c | % 12 + + c4 c c c | % 13 % Chorus - \repeat volta 3 - { - c4 c-> c c-> | % 14 - c4 c-> c c-> | % 15 - c4 c-> c c-> | % 16 - c4-> c c c | % 17 - c4 c-> c c-> | % 18 - c4 c-> c c-> | % 19 - c4 c-> c c-> | % 20 - } - \alternative - { - { - c4 c c c | % 21 - c4 c c c | % 22 - c1 \bar "||" % 23 - } - { - c4 c c c | % 24 - } - { - c4 c c c \bar "||" % 25 - } - } + c4 c-> c c-> | % 14 + c4 c-> c c-> | % 15 + c4 c-> c c-> | % 16 + c4-> c c c | % 17 + c4 c-> c c-> | % 18 + c4 c-> c c-> | % 19 + c4 c-> c c-> | % 20 + + c4 c c c | % 21 + c4 c c c | % 22 + c1 | % 23 + + c4 c c c | % 24 + + c4 c c c | % 25 % Outro @@ -371,25 +348,28 @@ StaffC = \relative c c1 | % 31 c1 | % 32 c4_\markup { \italic { rit. } } c c c | % 33 - c1^\fermata \bar "|." % 34 + c1^\fermata | % 34 } \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 + \new ChordNames \Chords + \new RhythmicStaff \StaffC >> \set Score.skipBars = ##t @@ -400,21 +380,20 @@ StaffC = \relative c \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 % Don't spread staves vertically across the page (default: f) % ragged-bottom = ##t % Allow partial line for last stave (default: f) - ragged-last = ##t +% ragged-last = ##t % 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) } + diff --git a/you-are-my-all-in-all.ly b/you-are-my-all-in-all.ly index 838ad2b..bb7846b 100644 --- a/you-are-my-all-in-all.ly +++ b/you-are-my-all-in-all.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) @@ -10,8 +10,6 @@ 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 "You Are My All In All" } % composer = \markup { \override #'(font-family . sans) \fontsize #1.3 "" } arranger = \markup { \override #'(font-family . sans) \fontsize #1.3 "arr. Ed Smart" } @@ -20,79 +18,106 @@ staffSize = #18 % -% Lead vocal +% Song's structure % - -LeadVox = \relative c' +Global = { -% \set Voice.autoBeaming = ##f -% \set Staff.instrument = #"Lead vox" \clef G \key f \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f % Intro s1^\markup { \hspace #0.0 \raise #2.0 { 16th note ballad } } | % 1 s1 | % 2 \time 2/4 s2 \time 4/4 | % 3 - s1 \bar "||:" % 4 + s1 \bar ".|:-||" % 4 \repeat volta 3 { % A section -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - r4 f16 g a8 g g f e | % 5 - f4 f16 g a8 c, c f e | % 6 - d4 d16 e f8 f4 e | % 7 - f4. ( g16 f e2 ) | % 8 - - r4 f16 g a8 g g f e | % 9 - f4 f16 g a8 c, c f e | % 10 - d4 d16 e f8 f4 e | % 11 - f2. r4 \bar "||" % 12 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + s1*8 \bar "||" % 5-12 % B section -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - - a2 g | % 13 - f4 c' a2 | % 14 - bf4 bf a g | % 15 - a4. ( bf16 a g2 ) | % 16 + \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - a2 g | % 17 - f4 c' a2 | % 18 - bf4 bf a g | % 19 + s1*7 | % 13-19 } \alternative { { - f2. r4 | % 20 + s1 | % 20 } { - f2. r4^\markup { \hspace #-2.0 \raise #1.0 \bold { D.S. } } \bar "||" % 21 + s2. s4^\markup { \hspace #-2.0 \raise #1.0 \bold { D.S. } } \bar "||" % 21 } { - f2. r4 \bar "||" % 22 + s1 \bar "||" % 22 } } % Ending -\mark \markup { \override #'(font-family . sans) { \box { C } } } + \mark \markup { \override #'(font-family . sans) { \box { C } } } + s1*4 \bar "|." % 23-26 +} + + +% +% Lead vocal +% +LeadVox = \relative c' +{ + % Intro + + s1 | % 1 + s1 | % 2 + s2 | % 3 + s1 | % 4 + + % A section + + r4 f16 g a8 g g f e | % 5 + f4 f16 g a8 c, c f e | % 6 + d4 d16 e f8 f4 e | % 7 + f4. ( g16 f e2 ) | % 8 + + r4 f16 g a8 g g f e | % 9 + f4 f16 g a8 c, c f e | % 10 + d4 d16 e f8 f4 e | % 11 + f2. r4 | % 12 + + % B section + + a2 g | % 13 + f4 c' a2 | % 14 + bf4 bf a g | % 15 + a4. ( bf16 a g2 ) | % 16 + + a2 g | % 17 + f4 c' a2 | % 18 + bf4 bf a g | % 19 + + f2. r4 | % 20 + + f2. r4 | % 21 + + f2. r4 | % 22 + + % Ending a2 g | % 23 f4 c' a2 | % 24 bf4 bf a g | % 25 - f1^\fermata \bar "|." % 26 + f1^\fermata | % 26 } + LeadVoxText = \lyricmode { You are my strength when I am weak; @@ -129,19 +154,13 @@ LeadVoxTextB = \lyricmode Riffs = \relative c'' { - \clef G - \key f \major - \override Staff.TimeSignature #'style = #'() - \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro \tiny r4 f16 g a8 g g16 f ~ f e8 f16 ~ | % 1 f4 f16 g a8 c, c16 f ~ f e8 d16 ~ | % 2 - \time 2/4 d4 d16 e f8 \time 4/4 | % 3 - f2 e \bar "||:" % 4 + d4 d16 e f8 | % 3 + f2 e | % 4 \normalsize } @@ -149,22 +168,16 @@ Riffs = \relative c'' % % Chord names % - Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro f2 c/e | % 1 d2:m f/a | % 2 - \time 2/4 bf2 \time 4/4 | % 3 + bf2 | % 3 f2/c c | % 4 - \repeat volta 3 - { - % A section + % A section f2 c/e | % 5 d2:m f/a | % 6 @@ -176,7 +189,7 @@ Chords = \chordmode g2:m7 f4/c c | % 11 bf2/f f | % 12 - % B section + % B section f2 c/e | % 13 d2:m f/a | % 14 @@ -187,19 +200,11 @@ Chords = \chordmode bf4/d c/e f2 | % 18 g2:m7 f4/c c | % 19 - } - \alternative - { - { - bf2/f f | % 20 - } - { - bf2/f f | % 21 - } - { - bf2/f f | % 22 - } - } + bf2/f f | % 20 + + bf2/f f | % 21 + + bf2/f f | % 22 % Ending @@ -213,28 +218,20 @@ 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 4/4 + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro c4 c c c | % 1 c4 c c c | % 2 - \time 2/4 c4 c \time 4/4 | % 3 + c4 c | % 3 c4 c c c | % 4 - \repeat volta 3 - { - % A section + % A section c4 c c c | % 5 c4 c c c | % 6 @@ -246,7 +243,7 @@ StaffC = \relative c c4 c c c | % 11 c4 c c c | % 12 - % B section + % B section c4 c c c | % 13 c4 c c c | % 14 @@ -257,26 +254,19 @@ StaffC = \relative c c4 c c c | % 18 c4 c c c | % 19 - } - \alternative - { - { - c4 c c c | % 20 - } - { - c4 c c c | % 21 - } - { - c4 c c c \bar "||" % 22 - } - } + c4 c c c | % 20 + + c4 c c c | % 21 + + c4 c c c | % 22 % Ending c2 c | % 23 c4 c c2 | % 24 c2 c4 c | % 25 - c2 c^\fermata \bar "|." % 26 + c2 c^\fermata | % 26 + \normalsize } @@ -305,17 +295,20 @@ Dynamics = \score { << + \Global % The "roadmap" that everything else depends on + + \context Staff << -% \new Staff = leadStaff { \new Voice = "lead" \LeadVox } - \new Staff = leadStaff { << \new Voice = "lead" \LeadVox \new Voice = "riffs" \Riffs >> } + \new Voice = "lead" \LeadVox + \new Voice = "riffs" \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> - \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 @@ -326,11 +319,11 @@ 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 @@ -341,6 +334,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) } + diff --git a/you-have-been-good.ly b/you-have-been-good.ly index 9091ae8..bb283ee 100644 --- a/you-have-been-good.ly +++ b/you-have-been-good.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 = #16 #(set-default-paper-size "letter") #(set-global-staff-size staffSize) @@ -12,8 +12,6 @@ staffSize = #16 \header { -%Let's bump up the title size and switch to the chord font. :-) - title = \markup { \override #'(font-family . sans) \fontsize #3.5 "You Have Been Good" } % Neat! % subtitle = \markup { \fret-diagram #"6-3;5-x;4-2;3-o;2-3;1-3;" " - " \fret-diagram-terse #"3-(;6;;5;4;3-);" } @@ -26,56 +24,39 @@ staffSize = #16 % % Song's structure % -Global = +Global = { \key d \major - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \time 12/8 % Intro - s1. | % 1 - s1. | % 2 - s1. | % 3 - s1. \bar "||:" % 4 + s1.*3 | % 1-3 + s1. \bar ".|:-||" % 4 \repeat volta 3 { % A section \mark \markup { \override #'(font-family . sans) { \box { A } } } - - s1. | % 5 - s1. | % 6 - s1. | % 7 - s1. | % 8 - - s1. | % 9 - s1. | % 10 - s1. | % 11 - s1. \bar "||" % 12 + s1.*8 \bar "||" % 5-12 % B section \once \override Score.RehearsalMark #'self-alignment-X = #left \mark \markup { \override #'(font-family . sans) { \box { B } } \hspace #1.0 \raise #2.0 \musicglyph #"scripts.segno" } - s1. | % 13 - s1. | % 14 - s1. | % 15 - s1. \bar "||" % 16 + s1.*4 \bar "||" % 13-16 % A section - s1. | % 17 - s1. | % 18 - s1. | % 19 + s1.*3 | % 17-19 } \alternative { { - s1. | % 20 - s1. | % 21 + s1.*2 | % 20-21 } { s2. s4. s8^\markup { \hspace #4.0 \raise #1.0 \bold { D.S. } } s s \bar "||" % 22 @@ -87,10 +68,7 @@ Global = % Ending - s1. | % 24 - s1. | % 25 - s1. | % 26 - s1. \bar "|." % 27 + s1.*4 \bar "|." % 24-27 } @@ -99,9 +77,6 @@ Global = % LeadVox = \relative c' { - \clef G - \override Score.SpacingSpanner #'average-spacing-wishes = ##f - % Intro s1. | % 1 @@ -149,6 +124,7 @@ LeadVox = \relative c' d1.^\fermata | % 27 } + LeadVoxText = \lyricmode { O Lord, _ you have been good, _ @@ -194,9 +170,6 @@ Riffs = \relative c' % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro d4. d:sus4 d g | % 1 @@ -248,14 +221,11 @@ 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 = { - \override Staff.TimeSignature #'style = #'() + \numericTimeSignature \override NoteHead #'style = #'slash + \teeny % Intro @@ -336,11 +306,12 @@ Dynamics = \score { << - \Global % The "roadmap" that everything else depends on + \Global % The "roadmap" that everything else depends on \context Staff << - \context Staff << \new Voice = "lead" \LeadVox \new Voice \Riffs >> + \new Voice = "lead" \LeadVox + \new Voice \Riffs \new Lyrics \lyricsto "lead" \LeadVoxText \new Lyrics \lyricsto "lead" \LeadVoxTextB >> @@ -361,7 +332,7 @@ Dynamics = { #(define fonts (make-pango-font-tree "Times New Roman" - "DomCasual BT" + "LilyJAZZText" "Luxi Mono" (/ staffSize 20))) @@ -374,6 +345,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) } + -- 2.37.2