release: 1.2.14

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

diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 710df30c48583e3e9a504b4ec726f05f6a1e51eb..92e3edccc9624d561cf6ada10a5ed11bba92c814 100644 (file)
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,49 +6,75 @@ copyright =    "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "0.1.10";
+\version "1.2.0";
 
-multipart = \melodic{ 
-    \multi 3 < 
-                { 
+multipart = \notes \relative c'{ 
+    \context StaffGroup < 
+                \context Staff = one \context Voice { 
                    c4
                    c 
                    c c 
                 }
-                { 
+                \context Staff = two \context Voice { 
                    [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 
+                \context Staff = three \context Voice { 
+                   \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 
+                \context Staff = four \context Voice { 
+                   \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 
+                \context Staff = five \context Voice { 
+                   \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] } 
+               }
+                \context Staff = six \context Voice { 
+                   \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 
+                \context Staff = seven \context Voice { 
+                   \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 
+                \context Staff = eight \context Voice { 
+                   \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] } 
+               }
+                \context Staff = nine  \context Voice { 
+                   \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] } 
+               }
+                \context Staff = ten  \context Voice { 
+                   \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] } 
+               }
+                \context Staff = eleven  \context Voice { 
+                   \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 +85,7 @@ singlepart = \melodic{
     }
     
     \score{
-    \melodic { 
+    \notes { 
 %      \singlepart 
        \multipart 
     }