release: 1.3.41

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

diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly
index e4bbe8d76e540131a0d87e915f2daa8eee38905c..87bbd5595c2631ead19578e4d391fb5c9e06fbf8 100644 (file)
--- a/input/star-spangled-banner.ly
+++ b/input/star-spangled-banner.ly
@@ -4,6 +4,8 @@ http://www.Arkkra.com/doc/star.html
 http://www.Arkkra.com/doc/star.ps
 %}
 
+
+
 \header{
        title="The Star Spangled Banner";
        subtitle="The United States National Anthem";
@@ -101,7 +103,7 @@ textxx = \lyrics {
     { 
       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 
+       " " " " " "  " "% _ _ _ _ % UGH UGH UGH 
        stream- ing
   And the rock- ets' red glare, the bombs
   burst- ing in air, gave proof through the night that
@@ -112,7 +114,7 @@ textxx = \lyrics {
 }}
 
 
-beginmatter = \notes {\time 3/4; \key D;  s4 | }
+beginmatter = \notes {\time 3/4; \key d;  s4 | }
                        
 
 automaticLyrics = \notes \context GrandStaff < 
@@ -120,25 +122,25 @@ automaticLyrics = \notes \context GrandStaff <
                \context Staff=staffA <
                        \beginmatter
                        \clef treble;
-                       \property Staff.automaticMelismata = "1"
-                       \notes \transpose c'' {\voiceone \$staff1_voice_1 \bar "|.";} 
-                       \notes \transpose c'' {\voicetwo \$staff1_voice_2 } 
+                       \property Staff.automaticMelismata = ##t
+                       \context Voice = one \transpose c'' {\stemup \$staff1_voice_1 \bar "|.";} 
+                       \context Voice = two \transpose c'' {\stemdown \$staff1_voice_2 } 
                >
                \context LyricVoice \textxx
                \context Staff=staffB <
                        \beginmatter
                        \clef bass;
-               \property Staff.noVoltaBraces = "1"
-                       {\voiceone \$staff2_voice_1 \bar "|."; } 
-                       {\voicetwo \$staff2_voice_2 } 
+               \property Staff.noVoltaBraces = ##t
+                       \context Voice = three {\stemup \$staff2_voice_1 \bar "|."; } 
+                       \context Voice = four {\stemdown \$staff2_voice_2 } 
                >
        >
 
 handLyrics = \notes \context GrandStaff < 
                \context Staff=staffA <
                        \beginmatter
-                       \notes \transpose c'' {\voiceone \$staff1_voice_1 \bar "|.";} 
-                       \notes \transpose c'' {\voicetwo \$staff1_voice_2 } 
+                        \transpose c'' {\voiceone \$staff1_voice_1 \bar "|.";} 
+                        \transpose c'' {\voicetwo \$staff1_voice_2 } 
                >
                \nonRepeatText
                \context Staff=staffB <
@@ -164,10 +166,17 @@ handLyrics = \notes \context GrandStaff <
                        \GrandStaffContext
                        \accepts "Lyrics";
                }
-%              castingalgorithm = \Wordwrap;
+               \translator {
+                       \LyricsContext
+               }
+               \translator {
+                       \LyricsVoiceContext
+                       \consists "Bar_engraver";
+                       
+               }
        }
        \midi {}
 }
 
 
-\version "1.2.0";
+\version "1.3.4";