X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=o-holy-night.ly;h=7286cea02367790bafe2e842f29e88571575a9db;hb=bd3b595932c04f7eb329df944c474f89bce236af;hp=eab3b7d894335874877eee0cd464d1252a1f96da;hpb=6f8ca2d1ddc26dc34f0be9b733d6ef860005c06d;p=music 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) }