X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fmusic-box.ly;h=9fe7c8d54275d62a64f5f1362f089edcf191ae87;hb=4ef4476a60ebdb17cd963ed95ee2460f5278e85f;hp=74e4e1ef8817b83ce1489926350e315714a9eccb;hpb=3db08de4502e30616808fc348b054d32822e5cc4;p=lilypond.git

diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index 74e4e1ef88..9fe7c8d542 100644
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "1.7.18"
+\version "1.9.8"
 \include "deutsch.ly"
 % possible rename to scheme- something.  -gp
 % TODO: ask if it needs to have so many empty bars in the middle.  -gp
@@ -62,30 +62,28 @@ using Scheme functions to avoid typing work. " }
 
 
 
-\version "1.7.18"
+\version "1.9.8"
 
 pat = \notes \transpose c c' \repeat unfold 2 {
-  < { \context Staff=up {r8 e16 f g e f g } }
-    { \context Staff=down <
+  << { \context Staff=up {r8 e16 f g e f g } }
+    { \context Staff=down <<
       \context Voice=vup  { \stemUp \tieUp r16 d8.~d4 }
       \context Voice=vdwn { \stemDown  c2 }
-    > }
-  >
+    >> }
+  >>
 }
 
 enda = \notes { r8 f,16 a, c f c a, \stemUp c \translator Staff = down
       a, f, a, f, d, f, d, \translator Staff = up \stemBoth
-      r8 g16 h d' f' d' h d' h g h d f e-\prall d <<e g c'>>1^\fermata \bar "|."
+      r8 g16 h d' f' d' h d' h g h d f e\prall d <e g c'>1^\fermata \bar "|."
 }
 endb = \notes {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."}
 endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata }
 
 \score {
-  \notes \transpose c c' \context PianoStaff <
-    \context Staff=up   { \clef "G" s1*32 \enda }
-    \context Staff=down { \clef "F" s1*32 < \context Voice=vup \endb
-			                     \context Voice=vdwn \endc
-			> }
+  \notes \transpose c c' \context PianoStaff <<
+    \context Staff=up   { \clef "G"  }
+    \context Staff=down { \clef "F" }
     { \apply #transform {\pat {c e g c' e' }
                          \pat {c d a d' f' }
 			 \pat {h, d g d' f' }
@@ -130,7 +128,7 @@ endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata }
 			 \pat {c,, c, g, b, e }
 			%}
     }
-  >
+  >>
   \paper {
     \translator {
       \PianoStaffContext