release: 1.3.103

[lilypond.git] / input / star-spangled-banner.ly

diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly
index 1bb791a16589032b80cbcf7e8940cd1a08f57b21..f3033e00f88135268cbabedd0c3e356f29da8738 100644 (file)
--- a/input/star-spangled-banner.ly
+++ b/input/star-spangled-banner.ly
@@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html
 http://www.Arkkra.com/doc/star.ps
 %}
 
-\version "1.3.59";
+\version "1.3.96";
 
 % TODO: 
 %
@@ -106,23 +106,24 @@ text = \lyrics {
   Oh __ \repeat "fold" 2 { }
   \alternative {
     { 
-      say, can you | see, by the dawn's ear- ly light 
-      What so proud- ly we hailed, 
-      At the twi- light's last gleam- ing. 
+      say, can you | see, by the dawn's ear -- ly light 
+      What so proud -- ly we hailed, 
+      At the twi -- light's last gleam -- ing. 
       % Ah, it seems that this context stops to exist just before
       % the :| barline is set, and doesn't see its width?
       % Ugly fix:
       Whose broad \bar "|.";
     }
+    \context LyricVoice = "one-2" 
     { 
-      stripes and bright stars, through the per- il- ous fight,
-      O'er the ram- parts we watched, were so gal- lant- ly
+      stripes and bright stars, through the per -- il -- ous fight,
+      O'er the ram -- parts we watched, were so gal -- lant -- ly
       " " " " " "  " "% UGH UGH UGH 
-      stream- ing
+      stream -- ing
 
-      And the rock- ets' red glare, the bombs burst- ing in air, 
+      And the rock -- ets' red glare, the bombs burst -- ing in air, 
       gave proof through the night that our flag was still there, 
-      Oh say, does that star- span- gled ban- ner yet wave, __ 
+      Oh say, does that star -- span -- gled ban -- ner yet wave, __ 
       O'er the land __ of the free and the home of the brave.
     }
   }
@@ -138,26 +139,26 @@ text = \lyrics {
                        \clef treble;
                        \property Staff.automaticMelismata = ##t
                        \context Voice = one \transpose c'' {
-                               \stemup
+                               \stemUp
                                \$staff1_voice_1
                                \bar "|.";
                        } 
                        \context Voice = two \transpose c'' {
-                               \stemdown
+                               \stemDown
                                \$staff1_voice_2
                        }
                >
-               \context LyricVoice \text
+               \context LyricVoice = "one-1" \text
                \context Staff=lower <
                        \global
                        \clef bass;
                        \property Staff.noVoltaBraces = ##t
                        \context Voice = three {
-                               \stemup
+                               \stemUp
                                \$staff2_voice_1
                        } 
                        \context Voice = four {
-                               \stemdown
+                               \stemDown
                                \$staff2_voice_2
                        } 
                >
@@ -170,10 +171,11 @@ text = \lyrics {
                        \GrandStaffContext
                        \accepts "Lyrics";
                }
-               \translator {
-                       \LyricsContext
-                       \consists "Span_bar_engraver";
-               }
+% We have a Span_bar_engraver in GrandStaff; we only get grief if we add it here too.
+%              \translator {
+%                      \LyricsContext
+%                      \consists "Span_bar_engraver";
+%              }
                \translator {
                        \LyricsVoiceContext
                        \consists "Bar_engraver";