patch::: 1.1.5.jcn2: extender

[lilypond.git] / input / test / stars-and-stripes.ly

diff --git a/input/test/stars-and-stripes.ly b/input/test/stars-and-stripes.ly
index 8c9f99f51512e32c491a342314d13426c9b3e9f6..9dbecdeb71cc213cffffaee0404f81a21d53e4e4 100644 (file)
--- a/input/test/stars-and-stripes.ly
+++ b/input/test/stars-and-stripes.ly
@@ -14,49 +14,58 @@ copyright="public domain";
 }
 
 $staff1_voice_1 = \notes {
-  [a8.()fis16] d4 fis4 a4 d'2 [fis'8. e'16] d'4 fis4 gis4 a2 [a8 a8] fis'4.  e'8
-  d'4 cis'2 [b8. cis'16] d'4 d'4 a4 fis4 d4 [a8. fis16] fis4 d4 [fis'8.
-  fis'16] fis'4 g'4 a'4 a'2 [g'8 fis'8] e'4 fis'4 g'4 g'2 g'4 fis'4. e'8 d'4
-  cis'2 [b8. cis'16] d'4 fis4 gis4 a2 a4 d'4 d'4 [d'8()cis'8] b4 b4 b4 e'4 [g'8
-()fis'8] [e'8()d'8] d'4~cis'4 [a8. a16] d'4.~e'8 [fis'8 g'8] a'2 [d'8 e'8]
-  fis'4. g'8 e'4 d'2 s4 }
+  [a8.()fis16] d4 fis4 a4 d'2 [fis'8. e'16] d'4 fis4 gis4 a2 [a8 a8]
+  fis'4.  e'8 d'4 cis'2 [b8. cis'16] d'4 d'4 a4 fis4 d4 [a8. fis16]
+  fis4 d4 [fis'8.  fis'16] fis'4 g'4 a'4 a'2 [g'8 fis'8] e'4 fis'4
+  g'4 g'2 g'4 fis'4. e'8 d'4 cis'2 [b8. cis'16] d'4 fis4 gis4 a2 a4
+  d'4 d'4 [d'8()cis'8] b4 b4 b4 e'4 [g'8 ()fis'8] [e'8()d'8]
+  d'4~cis'4 [a8. a16] d'4.~e'8 [fis'8 g'8] a'2 [d'8 e'8] fis'4. g'8
+  e'4 d'2 s4 
+}
 
 $staff1_voice_2 = \notes { 
-  [a8.()fis16] a,4 d4 e4 d4~fis4 [fis8. fis16] fis4 d4 d4 cis2 [e8 e8] a4. a8
-  a4 a2 [a8. a16] a4 a4 a4 fis4 d4 [a8. fis16] fis4 d4 r4 a4 a4 d'4 d'2
-  [a8 a8] cis'4 cis'4 cis'4 cis'2 a4 a4. a8 a4 a2 [a8. a16] d4 d4 d4
-  cis2 e4 fis4 e4 d4 d4 d4 dis4 g4 [g8()dis8] e4 e2 [e8. e16] d4.~a8 [a8 a8]
-  a2 [g8 g8] a4. a8 g4 fis2 s4 }
+  [a8.()fis16] a,4 d4 e4 d4~fis4 [fis8. fis16] fis4 d4 d4 cis2 [e8
+  e8] a4. a8 a4 a2 [a8. a16] a4 a4 a4 fis4 d4 [a8. fis16] fis4 d4 r4
+  a4 a4 d'4 d'2 [a8 a8] cis'4 cis'4 cis'4 cis'2 a4 a4. a8 a4 a2 [a8.
+  a16] d4 d4 d4 cis2 e4 fis4 e4 d4 d4 d4 dis4 g4 [g8()dis8] e4 e2
+  [e8. e16] d4.~a8 [a8 a8] a2 [g8 g8] a4. a8 g4 fis2 s4 
+}
 
 $staff2_voice_1 = \notes { 
-  r4 fis4 a4 a4 b2 [cis'8. cis'16] b4 b4 b4 a2 [cis'8 cis'8] d'4. cis'8
-  d'4 e'2 [e'8. e'16] d'4 d'4 a4 fis4 d4 r4 fis4 d4 r4 d4 e4 fis4 fis'2
-  [e'8 d'8] e'4 e'4 e'4 e'2 cis'4  d'4. cis'8 d'4 e'2 [e'8. e'16] a4 a4
-  e4 e2 cis'4 a4 a4 a4 g4 g4 b4 b4 b4 b4 a2 [cis'8. cis'16] a4.~cis'8
-  [d'8 d'8] d'2 [d'8 d'8] d'4. d'8 cis'4 a2 s4 }
+  r4 fis4 a4 a4 b2 [cis'8. cis'16] b4 b4 b4 a2 [cis'8 cis'8] d'4.
+  cis'8 d'4 e'2 [e'8. e'16] d'4 d'4 a4 fis4 d4 r4 fis4 d4 r4 d4 e4
+  fis4 fis'2 [e'8 d'8] e'4 e'4 e'4 e'2 cis'4  d'4. cis'8 d'4 e'2
+  [e'8. e'16] a4 a4 e4 e2 cis'4 a4 a4 a4 g4 g4 b4 b4 b4 b4 a2
+  [cis'8. cis'16] a4.~cis'8 [d'8 d'8] d'2 [d'8 d'8] d'4. d'8 cis'4
+  a2 s4 
+}
 
 $staff2_voice_2 = \notes { 
-  r4 d4 d4 cis4 b,2 [ais,8. ais,16] b,4 b,4 e4 a,2 [a8 a8] d4. e8 [fis8 g8]
-  a2 [g8. g16] fis4 fis4 a4 fis4 d4 r4 fis4 d4 r4 d4 d4 d4 d2 [d8 d8] a4
-  a4 a4 a2 a,4 d4. e8 [fis8 g8] a2 [g8. g16] fis4 d4 e4 a,2 a4 d4 e4 fis4
-  g4 g4 fis4 e4 [e8()fis8] [g8()gis8] a2 [g8. g16] fis4.~a,8 [d8 e8] fis2 [b8 b8]
-  a4. a8 a,4 d2 s4 }
+  r4 d4 d4 cis4 b,2 [ais,8. ais,16] b,4 b,4 e4 a,2 [a8 a8] d4. e8
+  [fis8 g8] a2 [g8. g16] fis4 fis4 a4 fis4 d4 r4 fis4 d4 r4 d4 d4 d4
+  d2 [d8 d8] a4 a4 a4 a2 a,4 d4. e8 [fis8 g8] a2 [g8. g16] fis4 d4
+  e4 a,2 a4 d4 e4 fis4 g4 g4 fis4 e4 [e8()fis8] [g8()gis8] a2 [g8.
+  g16] fis4.~a,8 [d8 e8] fis2 [b8 b8] a4. a8 a,4 d2 s4 
+}
 
 $text1 = \lyrics{
-  Oh4 say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 so8 proud-4. ly8 we4 hailed,2
-  At8. the16 twi-4 light's last gleam- ing. Whose8. broad16
+  Oh4 __ say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8
+  so8 proud-4. ly8 we4 hailed,2 At8. the16 twi-4 light's last gleam-
+  ing. Whose8. broad16 
 }
 
 $text2 = \lyrics{
-  _4 stripes and bright stars,2 through8 the8 per-4 il- ous fight,2 O'er8 the8 ram-4. parts8
-  we4 watched,2 were8. so16 gal-4 lant- ly _ _ _
+  _4 stripes and bright stars,2 through8 the8 per-4 il- ous fight,2
+  O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly
+  _ _ _ 
 }
 
 $text3 = \lyrics{
-  stream-4 ing. And8. the16 rock-4 ets' red glare,2 the8 bombs8 burst-4 ing in air,2 gave4
-  proof4. through8 the4 night2 that8. our16 flag4 was still there,2 Oh4 say, does that
-  star- span- gled ban- ner yet wave,2 O'er8. the16 land2 of8 the8 free2 and8 the8
-  home4. of8 the4 brave.2
+  stream-4 ing. And8. the16 rock-4 ets' red glare,2 the8 bombs8
+  burst-4 ing in air,2 gave4 proof4. through8 the4 night2 that8.
+  our16 flag4 was still there,2 Oh4 say, does that star- span-
+  gled ban- ner yet wave,2 __ O'er8. the16 land2 __ of8 the8 free2
+  and8 the8 home4. of8 the4 brave.2
 }
 
 global = \notes {
@@ -77,9 +86,7 @@ global = \notes {
 \score{ 
        \type GrandStaff < 
                \type Staff=staffA < 
-                       % urg, ugly bug
-                       %\global
-                       \notes \transpose c'' \global
+                       \global
                        \notes \transpose c'' {\voiceone \$staff1_voice_1 } 
                        \notes \transpose c'' {\voicetwo \$staff1_voice_2 } 
                >