release: 1.3.94

[lilypond.git] / input / test / orchestscore.ly

diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly
index 46806afd5042358b7534e0855b9a74cd93116ae6..f938c5bc3fa7c073e9fb3dc0ff3f12c58aa705d6 100644 (file)
--- a/input/test/orchestscore.ly
+++ b/input/test/orchestscore.ly
@@ -1,10 +1,16 @@
-\version "1.0.16";
+\version "1.3.93";
 
 m = \notes \relative c''{
-c1 | c2 c | c c | c c | c c | c c | c c | c c | 
+
+c1 | c2 c | c c | c c | \break c c | c c | c c | c c | 
+}
+
+M = \notes \relative c''{
+
+c1 | c2 c | c c | R1*5 
 }
 
-\score{ <
+\score{ < 
   \context StaffGroup = wood <
     \context Staff = flauto <
       \property Staff.instrument = "Flauto"
@@ -36,24 +42,24 @@ c1 | c2 c | c c | c c | c c | c c | c c | c c |
     \context Staff = cor <
       \property Staff.instrument = "2 Corni in F"
       \property Staff.instr = "Cor."
-      \context Voice = corI { \stemup \m }
-      \context Voice = corII { \stemdown \m }
+      \context Voice = corI { \stemUp \M }
+      \context Voice = corII { \stemDown \M }
     >
     \context Staff = trp <
       \property Staff.instrument = "2 Trp. in B\\textflat  "
       \property Staff.instr = "Trp."
-      \context Voice = trpI { \stemup \m }
-      \context Voice = trpII { \stemdown \m }
+      \context Voice = trpI { \stemUp \M }
+      \context Voice = trpII { \stemDown \M }
     >
   >
     \context StaffGroup = percussion <\context Staff = timpani <
       \property Staff.instrument = "Timpani"
       \property Staff.instr = "Timp."
-      \m
+      \notes{c''1 R1*8}
     >
   >
   \context StaffGroup = strings <
-%    \context GrandStaff = violins <
+    \context GrandStaff = violins <
       \context Staff = viI <
         \property Staff.instrument = "Violin I"
         \property Staff.instr = "Vi. I"
@@ -64,7 +70,7 @@ c1 | c2 c | c c | c c | c c | c c | c c | c c |
         \property Staff.instr = "Vi. II"
         \m
       >
-%    >
+    >
     \context Staff = vla <
       \property Staff.instrument = "Viola"
       \property Staff.instr = "Vla."
@@ -88,10 +94,11 @@ c1 | c2 c | c c | c c | c c | c c | c c | c c |
     textheight = 260.\mm;
     \translator {
        \OrchestralScoreContext
-        minVerticalAlign = 2.5*\staffheight;
+       barNumberScriptPadding = 10;
     }
-    \translator { \StaffContext
-       \consists "Staff_margin_engraver";
+    \translator { \HaraKiriStaffContext
+        marginScriptPadding = 15.0;
+%        StaffMinimumVerticalExtent = #(cons -0.0 0.0)
     }
   }
 }