From cdf57606f385bc4493fed4e3860bce0ce657dc40 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Sun, 16 Mar 2014 11:48:06 -0500 Subject: [PATCH] Fixes to file permissions, updated I Have Decided To Follow Jesus. --- above-all.ly | 0 almighty.ly | 0 amazing-love.ly | 0 as-the-deer.ly | 0 blessed-assurance.ly | 0 brethren-we-have-met-to-worship.ly | 0 come-let-us-worship-and-bow-down.ly | 0 come-thou-fount-of-every-blessing.ly | 0 create-in-me-a-clean-heart.ly | 0 do-you-know.ly | 0 fall-on-me.ly | 0 give-thanks.ly | 0 god-is-great.ly | 0 god-is-my-redeemer.ly | 0 great-is-the-lord.ly | 0 he-leadeth-me.ly | 0 he-who-began-a-good-work-in-you.ly | 0 horizon-storm.ly | 0 i-could-sing-of-your-love-forever.ly | 0 i-have-decided-to-follow-jesus.ly | 343 +++++++++++++--------- i-stand-amazed-in-the-presence.ly | 0 i-will-praise-him-still.ly | 0 jesus-all-for-jesus.ly | 0 jesus-draw-me-close.ly | 0 leaning-on-the-everlasting-arms.ly | 0 lord-i-lift-your-name-on-high.ly | 0 lord-you-have-my-heart.ly | 0 moonlight-1st.ly | 0 more-love-more-power.ly | 0 no-higher-calling.ly | 0 nothing-but-the-blood.ly | 0 o-come-o-come-emmanuel.ly | 0 o-for-a-thousand-tongues.ly | 0 open-the-eyes-of-my-heart.ly | 0 pop-chords-test.ly | 0 pop-chords.ly | 0 refiner's-fire.ly | 0 show-me-your-ways-o-lord.ly | 0 silent-night.ly | 0 spirit-of-the-living-god.ly | 0 take-my-life-and-let-it-be-consecrated.ly | 0 template.ly | 0 the-first-noel.ly | 0 the-heart-of-worship.ly | 0 we-are-an-offering.ly | 0 we-will-worship-the-lamb-of-glory.ly | 0 word-of-god-speak.ly | 37 ++- worthy-of-my-praise.ly | 0 you-are-my-all-in-all.ly | 0 you-have-been-good.ly | 0 50 files changed, 240 insertions(+), 140 deletions(-) mode change 100755 => 100644 above-all.ly mode change 100755 => 100644 almighty.ly mode change 100755 => 100644 amazing-love.ly mode change 100755 => 100644 as-the-deer.ly mode change 100755 => 100644 blessed-assurance.ly mode change 100755 => 100644 brethren-we-have-met-to-worship.ly mode change 100755 => 100644 come-let-us-worship-and-bow-down.ly mode change 100755 => 100644 come-thou-fount-of-every-blessing.ly mode change 100755 => 100644 create-in-me-a-clean-heart.ly mode change 100755 => 100644 do-you-know.ly mode change 100755 => 100644 fall-on-me.ly mode change 100755 => 100644 give-thanks.ly mode change 100755 => 100644 god-is-great.ly mode change 100755 => 100644 god-is-my-redeemer.ly mode change 100755 => 100644 great-is-the-lord.ly mode change 100755 => 100644 he-leadeth-me.ly mode change 100755 => 100644 he-who-began-a-good-work-in-you.ly mode change 100755 => 100644 horizon-storm.ly mode change 100755 => 100644 i-could-sing-of-your-love-forever.ly mode change 100755 => 100644 i-have-decided-to-follow-jesus.ly mode change 100755 => 100644 i-stand-amazed-in-the-presence.ly mode change 100755 => 100644 i-will-praise-him-still.ly mode change 100755 => 100644 jesus-all-for-jesus.ly mode change 100755 => 100644 jesus-draw-me-close.ly mode change 100755 => 100644 leaning-on-the-everlasting-arms.ly mode change 100755 => 100644 lord-i-lift-your-name-on-high.ly mode change 100755 => 100644 lord-you-have-my-heart.ly mode change 100755 => 100644 moonlight-1st.ly mode change 100755 => 100644 more-love-more-power.ly mode change 100755 => 100644 no-higher-calling.ly mode change 100755 => 100644 nothing-but-the-blood.ly mode change 100755 => 100644 o-come-o-come-emmanuel.ly mode change 100755 => 100644 o-for-a-thousand-tongues.ly mode change 100755 => 100644 open-the-eyes-of-my-heart.ly mode change 100755 => 100644 pop-chords-test.ly mode change 100755 => 100644 pop-chords.ly mode change 100755 => 100644 refiner's-fire.ly mode change 100755 => 100644 show-me-your-ways-o-lord.ly mode change 100755 => 100644 silent-night.ly mode change 100755 => 100644 spirit-of-the-living-god.ly mode change 100755 => 100644 take-my-life-and-let-it-be-consecrated.ly mode change 100755 => 100644 template.ly mode change 100755 => 100644 the-first-noel.ly mode change 100755 => 100644 the-heart-of-worship.ly mode change 100755 => 100644 we-are-an-offering.ly mode change 100755 => 100644 we-will-worship-the-lamb-of-glory.ly mode change 100755 => 100644 word-of-god-speak.ly mode change 100755 => 100644 worthy-of-my-praise.ly mode change 100755 => 100644 you-are-my-all-in-all.ly mode change 100755 => 100644 you-have-been-good.ly diff --git a/above-all.ly b/above-all.ly old mode 100755 new mode 100644 diff --git a/almighty.ly b/almighty.ly old mode 100755 new mode 100644 diff --git a/amazing-love.ly b/amazing-love.ly old mode 100755 new mode 100644 diff --git a/as-the-deer.ly b/as-the-deer.ly old mode 100755 new mode 100644 diff --git a/blessed-assurance.ly b/blessed-assurance.ly old mode 100755 new mode 100644 diff --git a/brethren-we-have-met-to-worship.ly b/brethren-we-have-met-to-worship.ly old mode 100755 new mode 100644 diff --git a/come-let-us-worship-and-bow-down.ly b/come-let-us-worship-and-bow-down.ly old mode 100755 new mode 100644 diff --git a/come-thou-fount-of-every-blessing.ly b/come-thou-fount-of-every-blessing.ly old mode 100755 new mode 100644 diff --git a/create-in-me-a-clean-heart.ly b/create-in-me-a-clean-heart.ly old mode 100755 new mode 100644 diff --git a/do-you-know.ly b/do-you-know.ly old mode 100755 new mode 100644 diff --git a/fall-on-me.ly b/fall-on-me.ly old mode 100755 new mode 100644 diff --git a/give-thanks.ly b/give-thanks.ly old mode 100755 new mode 100644 diff --git a/god-is-great.ly b/god-is-great.ly old mode 100755 new mode 100644 diff --git a/god-is-my-redeemer.ly b/god-is-my-redeemer.ly old mode 100755 new mode 100644 diff --git a/great-is-the-lord.ly b/great-is-the-lord.ly old mode 100755 new mode 100644 diff --git a/he-leadeth-me.ly b/he-leadeth-me.ly old mode 100755 new mode 100644 diff --git a/he-who-began-a-good-work-in-you.ly b/he-who-began-a-good-work-in-you.ly old mode 100755 new mode 100644 diff --git a/horizon-storm.ly b/horizon-storm.ly old mode 100755 new mode 100644 diff --git a/i-could-sing-of-your-love-forever.ly b/i-could-sing-of-your-love-forever.ly old mode 100755 new mode 100644 diff --git a/i-have-decided-to-follow-jesus.ly b/i-have-decided-to-follow-jesus.ly old mode 100755 new mode 100644 index ceeb0c0..f3fa2e1 --- a/i-have-decided-to-follow-jesus.ly +++ b/i-have-decided-to-follow-jesus.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.18.1" \include "pop-chords.ly" \include "english.ly" @@ -13,82 +13,126 @@ staffSize = #20 title = \markup { \override #'(font-family . sans) \fontsize #3.5 "I Have Decided To Follow Jesus" } 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)) % Let's try a chord dictionary - subtitle = \markup { \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 { Bbmaj7 \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;" } } + subtitle = \markup { \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 { Bbmaj7 \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;" } } } % -% Lead vocal +% Song's structure % -LeadVox = \relative c' +Global = { - \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Lead vox" - \override Staff.TimeSignature #'style = #'() - \clef G \key d \major + \override Staff.TimeSignature #'style = #'() \time 4/4 -\override Score.SpacingSpanner #'average-spacing-wishes = ##f - -% \set Score.markFormatter = #format-mark-box-letters % Intro - r1^\markup { \italic { Ac. guitar } } | % 1 - r1 | % 2 - r1^\markup { \italic { Guitar II in } } | % 3 - r1 | % 4 - r1^\markup { \italic { Bass in } } | % 5 - r1 | % 6 - r1^\markup { \italic { Drums in } } | % 7 - r4 d d fs | % 8 +%{ + 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 \repeat volta 3 { -\mark \markup { \override #'(font-family . sans) { \box { A } } } - - a4. a8 ~ a8 r8 r4 | % 9 - r4 a b a | % 10 - fs4. d8 ~ d8 r8 r4 | % 11 - r4 d' d d | % 12 - d4. d8 ~ d8 r8 r4 | % 13 - r4 d e d | % 14 - b4. a8 ~ a8 r8 r4 | % 15 - r4 d, d fs | % 16 - - a4. a8 ~ a8 r8 r4 | % 17 - r4 a b a | % 18 - fs4. d8 ~ d8 r8 r4 | % 19 - r4 a' b a | % 20 - fs4. r8 r2 | % 21 - r4 d fs e | % 22 + \mark \markup { \override #'(font-family . sans) { \box { A } } } + + s1*14 | % 9-22 } \alternative { { - d4. r8 r2 | % 23 - r1 | % 24 - r1 | % 25 - r4 d d fs | % 26 + s1*4 | % 23-26 } { - d4. r8 r2 | % 27 - r1 | % 28 - r1 | % 29 + s1*3 | % 27-29 } } - r4 d' d fs \bar "|:" % 30 + s1 | % 30 % Tag -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { B } } \small \italic { Women 8vb throughout } } + \repeat volta 1 + { +% \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { B } } } %\small \italic { Women 8vb throughout } } + + s1*8 | % 31-38 + } + + % Ending + +% \once \override Score.RehearsalMark #'self-alignment-X = #left + \mark \markup { \override #'(font-family . sans) { \box { C } } } % \small \italic { On cue } } + + s1*6 | % 39-44 + s1 \bar "|." % 45 +} + + +% +% Lead vocal +% + +LeadVox = \relative c' +{ + \override Staff.TimeSignature #'style = #'() + \clef G + + % Intro + + r1 | % 1 + r1 | % 2 + r1 | % 3 + r1 | % 4 + r1 | % 5 + r1 | % 6 + r1 | % 7 + r4 d d fs | % 8 + + % Verse + + a4. a8 ~ a8 r8 r4 | % 9 + r4 a b a | % 10 + fs4. d8 ~ d8 r8 r4 | % 11 + r4 d' d d | % 12 + d4. d8 ~ d8 r8 r4 | % 13 + r4 d e d | % 14 + b4. a8 ~ a8 r8 r4 | % 15 + r4 d, d fs | % 16 + + a4. a8 ~ a8 r8 r4 | % 17 + r4 a b a | % 18 + fs4. d8 ~ d8 r8 r4 | % 19 + r4 a' b a | % 20 + fs4. r8 r2 | % 21 + r4 d fs e | % 22 + + d4. r8 r2 | % 23 + r1 | % 24 + r1 | % 25 + r4 d d fs | % 26 + + d4. r8 r2 | % 27 + r1 | % 28 + r1 | % 29 + + r4 d' d fs | % 30 + + % Tag fs4 r r2 | % 31 r4 d d fs | % 32 @@ -97,22 +141,17 @@ LeadVox = \relative c' fs4 r r2 | % 35 r4 d d fs | % 36 fs4 r r2 | % 37 - r4 d d fs \bar ":|" % 38 + r4 d d fs | % 38 % Ending -\once \override Score.RehearsalMark #'self-alignment-X = #left -\mark \markup { \override #'(font-family . sans) { \box { C } } \small \italic { On cue } } - r1 | % 39 r1 | % 40 r1 | % 41 r1 | % 42 r1 | % 43 -% r1 | % 44 -% r1 | % 45 - r1 | % 46 - r1^\fermata \bar "|." % 47 + r1 | % 44 + r1^\fermata | % 45 } @@ -151,15 +190,17 @@ LeadVoxTextC = \lyricmode } +Riffs = \relative c' +{ +} + + % % Chord names % Chords = \chordmode { -%Bah, can't we set this globally? -% \popChords - % Intro c4.:9 b2:7.9+ bf8:7+ | % 1 @@ -173,38 +214,30 @@ Chords = \chordmode % Verse - \repeat volta 3 - { - d2..:7+ g8:/a | % 9 - s1 | % 10 - d2..:7+ fs8:aug7 | % 11 - s1 | % 12 - g4.:7+ d2:/fs e8:m7 | % 13 - s4. a2:sus4.7 s8 | % 14 - d2..:7+ g8:m/a | % 15 - s1 | % 16 - - d2..:7+ cs8:m11 | % 17 - s4. fs2:7.9+ b8:m7 | % 18 - s2.. e8:9 | % 19 - s1 | % 20 - e2..:m9 a8:13 | % 21 - s2.. c8:9 | % 22 - } - \alternative - { - { - s4. b2:7.9+ bf8:7+ | % 23 - s4. a2:sus4.7 c8:9 | % 24 - s4. b2:7.9+ bf8:7+ | % 25 - s4. a2:sus4.7 s8 | % 26 - } - { - s4. b2:7.9+ bf8:7+ | % 27 - s4. a2:sus4.7 c8:9 | % 28 - s4. b2:7.9+ bf8:7+ | % 29 - } - } + d2..:7+ g8:/a | % 9 + s1 | % 10 + d2..:7+ fs8:aug7 | % 11 + s1 | % 12 + g4.:7+ d2:/fs e8:m7 | % 13 + s4. a2:sus4.7 s8 | % 14 + d2..:7+ g8:m/a | % 15 + s1 | % 16 + + d2..:7+ cs8:m11 | % 17 + s4. fs2:7.9+ b8:m7 | % 18 + s2.. e8:9 | % 19 + s1 | % 20 + e2..:m9 a8:13 | % 21 + s2.. c8:9 | % 22 + + s4. b2:7.9+ bf8:7+ | % 23 + s4. a2:sus4.7 c8:9 | % 24 + s4. b2:7.9+ bf8:7+ | % 25 + s4. a2:sus4.7 s8 | % 26 + + s4. b2:7.9+ bf8:7+ | % 27 + s4. a2:sus4.7 c8:9 | % 28 + s4. b2:7.9+ bf8:7+ | % 29 s4 a:sus4.7 s2 | % 30 @@ -226,10 +259,8 @@ Chords = \chordmode s4. b2:7.9+ bf8:7+ | % 41 s4. a2:sus4.7 c8:9 | % 42 s4. b2:7.9+ bf8:7+ | % 43 -% s4. a2:sus4.7 c8:9 | % 44 -% s4. b2:7.9+ bf8:7+ | % 45 - s4. a2:sus4.7 s8 | % 46 - d1:7+ | % 47 + s4. a2:sus4.7 s8 | % 44 + d1:7+ | % 45 } @@ -240,13 +271,12 @@ Chords = \chordmode % 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 +Rhythm = \relative c { - \set Voice.autoBeaming = ##f -% \set Staff.instrumentName = #"Rhythm" +% \set Voice.autoBeaming = ##f \override Staff.TimeSignature #'style = #'() - \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro @@ -261,40 +291,32 @@ StaffC = \relative c % Verse - \repeat volta 3 - { - c4 c c r8 c ~ | % 9 - c4 c c c | % 10 - c4 c c r8 c ~ | % 11 - c4 c c c | % 12 - c4. c8 ~ c4. c8 ~ | % 13 - c4. c8 ~ c2 | % 14 - c4 c c c8 c ~ | % 15 - c4 c c c | % 16 - - c4 c c r8 c ~ | % 17 - c4. c8 ~ c4. c8 ~ | % 18 - c4 c c r8 c ~ | % 19 - c4 c c c | % 20 - c4 c c r8 c ~ | % 21 - c4 c c r8 c ~ | % 22 - } - \alternative - { - { - c4. c8 ~ c4. c8 ~ | % 23 - c4. c8 ~ c4. c8 ~ | % 24 - c4. c8 ~ c4. c8 ~ | % 25 - c4. c8 ~ c2 | % 26 - } - { - c4. c8 ~ c4. c8 ~ | % 27 - c4. c8 ~ c4. c8 ~ | % 28 - c4. c8 ~ c4. c8 ~ | % 29 - } - } - - c4 c r2 \bar "|:" % 30 + c4 c c r8 c ~ | % 9 + c4 c c c | % 10 + c4 c c r8 c ~ | % 11 + c4 c c c | % 12 + c4. c8 ~ c4. c8 ~ | % 13 + c4. c8 ~ c2 | % 14 + c4 c c c8 c ~ | % 15 + c4 c c c | % 16 + + c4 c c r8 c ~ | % 17 + c4. c8 ~ c4. c8 ~ | % 18 + c4 c c r8 c ~ | % 19 + c4 c c c | % 20 + c4 c c r8 c ~ | % 21 + c4 c c r8 c ~ | % 22 + + c4. c8 ~ c4. c8 ~ | % 23 + c4. c8 ~ c4. c8 ~ | % 24 + c4. c8 ~ c4. c8 ~ | % 25 + c4. c8 ~ c2 | % 26 + + c4. c8 ~ c4. c8 ~ | % 27 + c4. c8 ~ c4. c8 ~ | % 28 + c4. c8 ~ c4. c8 ~ | % 29 + + c4 c r2 | % 30 % Tag @@ -305,7 +327,7 @@ StaffC = \relative c c4 c c r8 c ~ | % 35 c4 c c c | % 36 c4. c8 ~ c4. c8 ~ | % 37 - c4. c8 ~ c2 \bar ":|" % 38 + c4. c8 ~ c2 | % 38 % Ending @@ -313,16 +335,40 @@ StaffC = \relative c c4. c8 ~ c4. c8 ~ | % 40 c4. c8 ~ c4. c8 ~ | % 41 c4. c8 ~ c4. c8 ~ | % 42 - c4._\markup { \italic rit. } c8 ~ c4. c8 ~ | % 43 -% c4. c8 ~ c4. c8 ~ | % 44 -% c4. c8 ~ c4. c8 ~ | % 45 - c4. c8 ~ c2 | % 46 - c1^\fermata \bar "|." % 47 + c4. c8 ~ c4. c8 ~ | % 43 + c4. c8 ~ c2 | % 44 + c1^\fermata | % 45 +} + + +Dynamics = +{ + s1_\markup { \small \italic { Ac. guitar } } | % 1 + s1 | % 2 + s1_\markup { \small \italic { Guitar II in } } | % 3 + s1 | % 4 + s1_\markup { \small \italic { Bass in } } | % 5 + s1 | % 6 + s1_\markup { \small \italic { Drums in } } | % 7 + s1 | % 8 + + s1*21 | % 9-29 + s4_\markup { \small \italic { Women 8vb throughout } } s2. | % 30 + + s1*8 | % 31-38 +% s1 | % 38 + + % Ending + + s4_\markup { \small \italic { On cue } } s2. | % 39 + s1*3 | % 40-42 + s4_\markup { \small \italic { rit. } } s2. | % 43 } \score { +%{ << % \new ChoirStaff = "Vox" << @@ -342,6 +388,27 @@ StaffC = \relative c \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 + >> + >> } diff --git a/i-stand-amazed-in-the-presence.ly b/i-stand-amazed-in-the-presence.ly old mode 100755 new mode 100644 diff --git a/i-will-praise-him-still.ly b/i-will-praise-him-still.ly old mode 100755 new mode 100644 diff --git a/jesus-all-for-jesus.ly b/jesus-all-for-jesus.ly old mode 100755 new mode 100644 diff --git a/jesus-draw-me-close.ly b/jesus-draw-me-close.ly old mode 100755 new mode 100644 diff --git a/leaning-on-the-everlasting-arms.ly b/leaning-on-the-everlasting-arms.ly old mode 100755 new mode 100644 diff --git a/lord-i-lift-your-name-on-high.ly b/lord-i-lift-your-name-on-high.ly old mode 100755 new mode 100644 diff --git a/lord-you-have-my-heart.ly b/lord-you-have-my-heart.ly old mode 100755 new mode 100644 diff --git a/moonlight-1st.ly b/moonlight-1st.ly old mode 100755 new mode 100644 diff --git a/more-love-more-power.ly b/more-love-more-power.ly old mode 100755 new mode 100644 diff --git a/no-higher-calling.ly b/no-higher-calling.ly old mode 100755 new mode 100644 diff --git a/nothing-but-the-blood.ly b/nothing-but-the-blood.ly old mode 100755 new mode 100644 diff --git a/o-come-o-come-emmanuel.ly b/o-come-o-come-emmanuel.ly old mode 100755 new mode 100644 diff --git a/o-for-a-thousand-tongues.ly b/o-for-a-thousand-tongues.ly old mode 100755 new mode 100644 diff --git a/open-the-eyes-of-my-heart.ly b/open-the-eyes-of-my-heart.ly old mode 100755 new mode 100644 diff --git a/pop-chords-test.ly b/pop-chords-test.ly old mode 100755 new mode 100644 diff --git a/pop-chords.ly b/pop-chords.ly old mode 100755 new mode 100644 diff --git a/refiner's-fire.ly b/refiner's-fire.ly old mode 100755 new mode 100644 diff --git a/show-me-your-ways-o-lord.ly b/show-me-your-ways-o-lord.ly old mode 100755 new mode 100644 diff --git a/silent-night.ly b/silent-night.ly old mode 100755 new mode 100644 diff --git a/spirit-of-the-living-god.ly b/spirit-of-the-living-god.ly old mode 100755 new mode 100644 diff --git a/take-my-life-and-let-it-be-consecrated.ly b/take-my-life-and-let-it-be-consecrated.ly old mode 100755 new mode 100644 diff --git a/template.ly b/template.ly old mode 100755 new mode 100644 diff --git a/the-first-noel.ly b/the-first-noel.ly old mode 100755 new mode 100644 diff --git a/the-heart-of-worship.ly b/the-heart-of-worship.ly old mode 100755 new mode 100644 diff --git a/we-are-an-offering.ly b/we-are-an-offering.ly old mode 100755 new mode 100644 diff --git a/we-will-worship-the-lamb-of-glory.ly b/we-will-worship-the-lamb-of-glory.ly old mode 100755 new mode 100644 diff --git a/word-of-god-speak.ly b/word-of-god-speak.ly old mode 100755 new mode 100644 index ea9c022..746c369 --- a/word-of-god-speak.ly +++ b/word-of-god-speak.ly @@ -15,7 +15,7 @@ staffSize = #18 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" } - tagline = "Engraved by JLH and Lilypond 2.8.2" + tagline = $(string-append "Engraved by JLH and Lilypond " (lilypond-version)) } % Useful tweak abbreviations (hn = harmony note) @@ -26,6 +26,18 @@ hn = #(define-music-function (parser location arg) (ly:music?) (set! (ly:music-property arg 'tweaks) (acons 'font-size -3.0 (ly:music-property arg 'tweaks))) arg) +% +% Song's structure +% + +Global = +{ + \clef G + \key c \major + \override Staff.TimeSignature #'style = #'() + \time 4/4 +} + % % Lead vocal @@ -363,13 +375,14 @@ Chords = \chordmode % 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 +Rhythm = \relative c { % \set Voice.autoBeaming = ##f % \set Staff.instrumentName = #"Rhythm" \override Staff.TimeSignature #'style = #'() \time 4/4 \override NoteHead #'style = #'slash + \teeny % Intro @@ -479,6 +492,7 @@ Dynamics = \score { +%{ << << % \new Staff = leadStaff { \new Voice = "lead" \LeadVox } @@ -495,6 +509,25 @@ Dynamics = \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 + >> + >> } diff --git a/worthy-of-my-praise.ly b/worthy-of-my-praise.ly old mode 100755 new mode 100644 diff --git a/you-are-my-all-in-all.ly b/you-are-my-all-in-all.ly old mode 100755 new mode 100644 diff --git a/you-have-been-good.ly b/you-have-been-good.ly old mode 100755 new mode 100644 -- 2.37.2