patch::: 1.1.23.mb1

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

diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 9c1fc724c71d2e4757b9a88d176772a549e2b795..fbe02806b1387fdb5ce439dc058cee39dd1d4676 100644 (file)
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,49 +6,74 @@ copyright =    "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "1.0.1";
+\version "1.0.14";
 
-multipart = \melodic{ 
+multipart = \notes \relative c'{ 
     \type StaffGroup < 
-                { 
+                \type Staff = one { 
                    c4
                    c 
                    c c 
                 }
-                { 
+                \type Staff = two { 
                    [c8 c] 
                    [c c] 
                    [c c] [c c] 
                 }
-                { 
-                   [2/3 c8 c c]1/1 
-                   [2/3 c c c]1/1 
-                   [2/3c c c]1/1 [2/3c c c]1/1 
+                \type Staff = three { 
+                   \times 2/3 { [c8 c c] } 
+                   \times 2/3 { [c  c c] } 
+                   \times 2/3 { [c  c c] } \times 2/3 { [c c c] } 
                 }
-                { 
-                   [2/4 c8 c c c]1/1
-                   [2/4 c c c c]1/1 
-                   [2/4c c c c]1/1 [2/4c c c c]1/1 
+                \type Staff = four { 
+                   \times 2/4 { [c8 c c c] }
+                   \times 2/4 { [c  c c c] } 
+                   \times 2/4 { [c  c c c] } \times 2/4 { [c c c c] } 
                 }
-                { 
-                   [2/5 c8 c c c c]1/1 
-                   [2/5 c c c c c]1/1 
-                   [2/5c c c c c]1/1 [2/5c c c c c]1/1 
+                \type Staff = five { 
+                   \times 2/5 { [c8 c c c c] } 
+                   \times 2/5 { [c  c c c c] } 
+                   \times 2/5 { [c  c c c c] } \times 2/5 { [c c c c c] } 
+               }
+                \type Staff = six { 
+                   \times 2/6 { [c8 c c c c c] } 
+                   \times 2/6 { [c  c c c c c] } 
+                   \times 2/6 { [c  c c c c c] } \times 2/6 { [c c c c c c] } 
                 }
-                { 
-                   [2/6c8 c c c c c]1/1 
-                   [2/6c  c c c c c]1/1 
-                   [2/6c c c c c c]1/1 [2/6c c c c c c]1/1 
+                \type Staff = seven { 
+                   \times 2/7 { [c8 c c c c c c] } 
+                   \times 2/7 { [c  c c c c c c] } 
+                   \times 2/7 { [c  c c c c c c] } 
+                  \times 2/7 { [c  c c c c c c] } 
                 }
-                { 
-                   [2/7c8 c c c c c c]1/1 
-                   [2/7c c  c c c c c]1/1 
-                   [2/7c c c c c c c]1/1 [2/7c c c c c c c]1/1 
+                \type Staff = eight { 
+                   \times 2/8 { [c8 c c c c c c c] } 
+                   \times 2/8 { [c  c c c c c c c] } 
+                   \times 2/8 { [c  c c c c c c c] } 
+                  \times 2/8 { [c  c c c c c c c] } 
+               }
+                \type Staff = nine { 
+                   \times 2/9 { [c8 c c c c c c c c] } 
+                   \times 2/9 { [c  c c c c c c c c] } 
+                   \times 2/9 { [c  c c c c c c c c] } 
+                  \times 2/9 { [c  c c c c c c c c] } 
+               }
+                \type Staff = ten { 
+                   \times 2/10 { [c8 c c c c c c c c c] } 
+                   \times 2/10 { [c  c c c c c c c c c] } 
+                   \times 2/10 { [c  c c c c c c c c c] } 
+                  \times 2/10 { [c  c c c c c c c c c] } 
+               }
+                \type Staff = eleven { 
+                   \times 2/11 { [c8 c c c c c c c c c c] } 
+                   \times 2/11 { [c  c c c c c c c c c c] } 
+                   \times 2/11 { [c  c c c c c c c c c c] } 
+                  \times 2/11 { [c  c c c c c c c c c c] } 
                 }
             >
        }
 
-singlepart = \melodic{ 
+singlepart = \notes{ 
        c4 d e f
        c4 d e [f8 f]
        c4 d e f8 [f16 f]
@@ -59,7 +84,7 @@ singlepart = \melodic{
     }
     
     \score{
-    \melodic { 
+    \notes { 
 %      \singlepart 
        \multipart 
     }