release commit

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

diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly
index f3033e00f88135268cbabedd0c3e356f29da8738..9e9fa12aef15fd027267f3372b18e3a46536c1c0 100644 (file)
--- a/input/star-spangled-banner.ly
+++ b/input/star-spangled-banner.ly
@@ -1,45 +1,29 @@
+\version "1.7.6"
 %{
 Converted from star.mup with the aid of mup2ly.py
-http://www.Arkkra.com/doc/star.html
-http://www.Arkkra.com/doc/star.ps
+http://www.arkkra.com/doc/star.html
+http://www.arkkra.com/doc/star.ps
 %}
 
-\version "1.3.96";
 
-% TODO: 
-%
-%  * centre non-melismata lyrics (where there's only one verse!) under 
-%    notehead:
-%
-%      l       c    c    c    l
-%        ___
-%       |   |   |    |    |    |    |
-%      x|()x|  x|   x|   x|   x|( )x|
-%      Oh_____say  can  you   see
-%
-%  NOT!
-%
-%
-%  * slur/lyric clash
-%
 
 \header{
-       title="The Star Spangled Banner";
-       subtitle="The United States National Anthem";
-       poet="Text by Francis Scott Key";
-       composer="J. S. Smith";
-       arranger="Arranged by William J. Krauss";
-       enteredby="jcn";
-       copyright="public domain";
+       title="The Star Spangled Banner"
+       subtitle="The United States National Anthem"
+       poet="Text by Francis Scott Key"
+       composer="J. S. Smith"
+       arranger="Arranged by William J. Krauss"
+       enteredby="jcn"
+       copyright="public domain"
 }
 
-global = \notes {
-  \time 3/4; 
-  \key d \major;
-  \partial 4;
+global =  \notes {
+  \time 3/4 
+  \key d \major
+  \partial 4
 }
 
-$staff1_voice_1 = \notes {
+staffBVoiceB =  \notes {
   a8.()fis16 
   \repeat volta 2 { 
     d4 fis4 a4 d'2 fis'8. e'16 d'4 fis4 gis4 a2 a8 a8 
@@ -56,7 +40,7 @@ $staff1_voice_1 = \notes {
   e'4 d'2 s4 
 }
 
-$staff1_voice_2 = \notes { 
+staffBVoiceC =  \notes { 
   a8.()fis16 
   \repeat volta 2 { 
     a,4 d4 e4 d4 () fis4 fis8. fis16 fis4 d4 d4 cis2
@@ -71,7 +55,7 @@ $staff1_voice_2 = \notes {
   e8. e16 d4.()a8 a8 a8 a2 g8 g8 a4. a8 g4 fis2 s4 
 }
 
-$staff2_voice_1 = \notes { 
+staffCVoiceB =  \notes { 
   r4 
   \repeat volta 2 { 
     fis4 a4 a4 b2 cis'8. cis'16 b4 b4 b4 a2 cis'8 cis'8 
@@ -87,7 +71,7 @@ $staff2_voice_1 = \notes {
   a2 s4 
 }
 
-$staff2_voice_2 = \notes { 
+staffCVoiceC =  \notes { 
   r4 
   \repeat volta 2 { 
     d4 d4 cis4 b,2 ais,8. ais,16 b,4 b,4 e4 a,2 a8 a8 
@@ -102,7 +86,7 @@ $staff2_voice_2 = \notes {
   g8. g16 fis4.()a,8 d8 e8 fis2 b8 b8 a4. a8 a,4 d2 s4 
 }
 
-text = \lyrics {  
+text =  \lyrics {  
   Oh __ \repeat "fold" 2 { }
   \alternative {
     { 
@@ -112,9 +96,9 @@ text = \lyrics {
       % 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 "|.";
+      Whose broad \bar "|."
     }
-    \context LyricVoice = "one-2" 
+    \context LyricsVoice = "one-2" 
     { 
       stripes and bright stars, through the per -- il -- ous fight,
       O'er the ram -- parts we watched, were so gal -- lant -- ly
@@ -129,60 +113,55 @@ text = \lyrics {
   }
 }
 
-\include "paper16.ly";
+\include "paper16.ly"
 
 \score{ 
        \context GrandStaff \notes < 
                \addlyrics
                \context Staff=upper <
                        \global
-                       \clef treble;
+                       \clef treble
                        \property Staff.automaticMelismata = ##t
-                       \context Voice = one \transpose c'' {
-                               \stemUp
-                               \$staff1_voice_1
-                               \bar "|.";
+                       \context Voice = one \transpose c c' {
+                               \voiceOne
+                               \staffBVoiceB
+                               \bar "|."
                        } 
-                       \context Voice = two \transpose c'' {
-                               \stemDown
-                               \$staff1_voice_2
+                       \context Voice = two \transpose c c' {
+                               \voiceTwo
+                               \staffBVoiceC
                        }
                >
-               \context LyricVoice = "one-1" \text
+               \context LyricsVoice = "one-1" \text
                \context Staff=lower <
                        \global
-                       \clef bass;
-                       \property Staff.noVoltaBraces = ##t
+                       \clef bass
+                       \property Staff.VoltaBracket = \turnOff
                        \context Voice = three {
-                               \stemUp
-                               \$staff2_voice_1
+                               \voiceOne
+                               \staffCVoiceB
                        } 
                        \context Voice = four {
-                               \stemDown
-                               \$staff2_voice_2
+                               \voiceTwo
+                               \staffCVoiceC
                        } 
                >
        >
        \paper{
-               \paper_sixteen
-               textheight = 230.\mm;
-               linewidth= 180.\mm;
+               \paperSixteen
+               textheight = 230.\mm
+               linewidth= 180.\mm
                \translator {
                        \GrandStaffContext
-                       \accepts "Lyrics";
+                       \accepts "Lyrics"
                }
-% 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";
+                       \consists "Bar_engraver"
                }
        }
        \midi {
-               \tempo 4 = 60;
+               \tempo 4 = 60
        }
 }