Fixups for 'Christmas Time Is Here'.

diff --git a/christmas-time-is-here.ly b/christmas-time-is-here.ly
index 530f49217ef71fa4ff3f4cc1c496e14870fea468..a5fef122b0943c9c98c212894d477b1ad372be27 100644 (file)
--- a/christmas-time-is-here.ly
+++ b/christmas-time-is-here.ly
@@ -1,12 +1,18 @@
 \version "2.16.0"
 \language "english"
 
+% 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))
+
 \header
 {
   title = "Christmas Time Is Here"
 %%  subtitle = "Second Movement"
   composer = "V. Guaraldi"
-  arranger = "S. Hammons"
+  arranger = "arr. S. Hammons"
   meter = "Largo"
 }
 
@@ -22,36 +28,76 @@ playRH =  \relative d''
        \key f \major
        \time 3/4
 
-       << { <g a c>2. } \\ { e8 c c4. a8 } >>
-       << { <df ef f>2. } \\ { a2 r4 } >>
+       %% A section
+
+       \mark \markup { \override #'(font-family . sans) { \box { A } } }
+
+       << { e8 c c4. a8 } \\ { <g a c>2. } >> |
+       << { a2 r4 } \\ { <df, ef f>2. } >> |
+
+       << { e'8 c c4. a8 } \\ { <g a c>2. } >> |
+       << { a2 r4 } \\ { <df, ef f>2. } >> |
+
+       << { a'8 f f4 e } \\ { <b d f>2 <bf df e>4 } >> |
+       << { g'8 e e4 ef } \\ { <a, c e>2 <af cf ef>4 } >> |
+
+       << { d8 f d4 f } \\ { <g, bf>2 <bf d>4 } >> |
+       <a c e g>2 r4 \bar "||"
+
+       %% A section
+
+       \mark \markup { \override #'(font-family . sans) { \box { B } } }
+
+       << { e''8 c c4. a8 } \\ { <g a c>2. } >> |
+       << { a2 r4 } \\ { <df, ef f>2. } >> |
+
+       << { e'8 c c4. a8 } \\ { <g a c>2. } >> |
+       << { a2 r4 } \\ { <df, ef f>2. } >> |
+
+       << { a'8 f f4 e } \\ { <b d f>2 <bf df e>4 } >> |
+       << { g'8 e e4 ef } \\ { <a, c e>2 <af cf ef>4 } >> |
+
+       << { d8 f d4 f } \\ { <g, bf>2 <bf d>4 } >> |
+       <a c e g>2 r4 \bar "||"
+
+       %% B Section
+
+       \mark \markup { \override #'(font-family . sans) { \box { C } } }
+
+       << { c'8 af af4. c8 } \\ { <ef, f>2. } >> |
+       << { c'2. } \\ { <df, e af>2. } >> |
 
+       << { c'8 af af4. c8 } \\ { <ef, f>2. } >> |
+       << { c'2. } \\ { <df, e af>2. } >> |
 
+       << { c'8 a a4 c } \\ { <e, g>2 <ef g>4 } >> |
+       << { c'8 a a4 bf } \\ { <d, fs>2 <d fs>4 } >> |
 
-       <c-4 af-2>2 <bf g>4 | % 1
-       <ef-5 af,-2>-. ) r <df f,>-. | % 2
-       <c-4 af>4-. r <bf g>-. | % 3
-       af4-. r <gf'-5 df-1> ( | % 4
-       <f-4 df-2>2 <ef c>4 | % 5
-       <af df,>4-. ) r <gf bf,>-. | % 6
-       <f df>4-. r <ef c>-. | % 7
-       df4-. r <df-4 df,> ( ~ | % 8
+       << { bf'8 g g4 a } \\ { <d, f>2. } >> |
+       << { a'2. } \\ { <bf, d f> } >> \bar "||"
 
-       <df df,>4 <c-5 c,> ) << { bf ~ ( } \\ { bf,-. } >> | % 9
-       << { bf'4 ef ) df-5 ( } \\ { ef,4-. r f-. } >> | % 10
-       << { df'4 c ) bf-4 ~ ( } \\ { af-. r g-. } >> | % 11
-       << { bf4 af-3 ) } \\ { s2 } >> <gf' gf,>4 ~ ( | % 12
-       <gf gf,>4 <f f,> ) << { ef ~ ( } \\ { ef,-. } >> | % 13
-       << { ef'4 af ) gf ~ ( } \\ { af,-. r bf-. } >> | % 14
-       << { gf'4 f ) ef-4 ~ ( } \\ { df-. r c-. } >> | % 15
-       \partial 2 << { ef4 df-3 ) } \\ { s2 } >> | % 16
+       %% A section
 
+       \mark \markup { \override #'(font-family . sans) { \box { D } } }
+
+       << { e'8 c c4. a8 } \\ { <g a c>2. } >> |
+       << { a2 r4 } \\ { <df, ef f>2. } >> |
+
+       << { e'8 c c4. a8 } \\ { <g a c>2. } >> |
+       << { a2 r4 } \\ { <df, ef f>2. } >> |
+
+       << { a'8 f f4 e } \\ { <b d f>2 <bf df e>4 } >> |
+       << { g'8 e e4 ef } \\ { <a, c e>2 <af cf ef>4 } >> |
+
+       << { d8 f d4 f } \\ { <g, bf>2 <bf d>4 } >> |
+       <a c e g>2 r4 \bar "||"
 }
 
 playDyn =
 {
 }
 
-playLH =  \relative f'
+playLH =  \relative f
 {
        \clef bass
        \key f \major
@@ -65,11 +111,11 @@ playLH =  \relative f'
        f2.
        ef2.
 
-       b2 bf1
-       a2 af1
+       b2 bf4
+       a2 af4
 
-       g2.
-       c2.
+       g2 c4
+       f2.
 
        %% A Section
 
@@ -79,11 +125,11 @@ playLH =  \relative f'
        f2.
        ef2.
 
-       b2 bf1
-       a2 af1
+       b2 bf4
+       a2 af4
 
-       g2.
-       c2.
+       g2 c4
+       f2.
 
        %% B Section
 
@@ -93,11 +139,11 @@ playLH =  \relative f'
        df2.
        gf2.
 
-       a2 ef1
+       a2 ef4
        d2.
 
        g2.
-       c2.
+       c,2.
 
        %% A Section
 
@@ -107,13 +153,38 @@ playLH =  \relative f'
        f2.
        ef2.
 
-       b2 bf1
-       a2 af1
+       b2 bf4
+       a2 af4
 
-       g2.
-       c2.
+       g2 c4
+       f2.
 }
 
+
+LeadVoxText = \lyricmode
+{
+       Christ8 -- mas time4. is8 here,2.
+       Hap8 -- pi -- ness4. and8 cheer,2.
+       Fun8 for all4 that chil8 -- dren call4
+       Their fav’8 -- rite time4 of year.2.
+
+       Snow8 -- flakes in4. the8 air,2.
+       Ca8 -- rols ev’4. -- ry-8 where,2.
+       Ol8 -- den times4 and anc8 -- ient rhymes4
+       Of love8 and dreams4 to share.2.
+
+       Sleigh8 bells in4. the8 air,2.
+       Beau8 -- ty ev’4. -- ry8 -- where,2.
+       Yule8 -- tide by4 the fi8 -- re -- side4
+       And joy8 -- ful mem’4 -- ries there.2.
+
+       Christ8 -- mas time4. is8 here,2.
+       We’ll8 be draw4. -- ing8 near,2.
+       Oh,8 that we4 could al8 -- ways see4
+       Such spi8 -- rit through4 the year.2.
+}
+
+
 scoreAll =
 {
     \new PianoStaff
@@ -133,6 +204,7 @@ scoreAll =
                 >>
                 \bar "|."
             }
+                       \new Lyrics  \LeadVoxText
             \context Staff = "lh"
             {
                 \set Staff.pedalSustainStyle = #'bracket
@@ -151,7 +223,7 @@ scoreAll =
         \scoreAll
     }
     \layout {}
-    \midi
+%{    \midi
     {
         \tempo 4 = 50
         %% Remove the dynamics from the midi output
@@ -162,4 +234,5 @@ scoreAll =
 %            \remove "Span_dynamic_performer"
         }
     }
+%}
 }