Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / spacing-multi-tuplet.ly

diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly
index 27dc5f034a3627656261aa62eeee89f072364225..aafa19a53124412c2262044d64225a3763b6bc79 100644 (file)
--- a/input/regression/spacing-multi-tuplet.ly
+++ b/input/regression/spacing-multi-tuplet.ly
@@ -1,70 +1,31 @@
-\version "1.7.18"
-\header{
-texidoc =  "Concurrent tuplets should be spaced equidistantly on
-all staffs" 
+\version "2.11.51"
+
+ \header{
+
+  texidoc = "Concurrent tuplets should be equidistant on all staves.
+Such equidistant spacing is at odds with elegant engraver spacing;
+hence it must be switched on explicitly with the
+@code{uniform-stretching} property of @code{SpacingSpanner}."
 }
 
 
 
-multipart =  \notes \relative c'{ 
-    \context StaffGroup < 
-                \context Staff = one \context Voice { 
-                   c4
-                   c 
-                }
-                \context Staff = two \context Voice { 
-                    c8-[ c] 
-                    c-[ c] 
-                }
-                \context Staff = three \context Voice { 
-                   \times 2/3 {  c8-[ c c] } 
-                   \times 2/3 {  c-[  c c] } 
-                }
-                \context Staff = four \context Voice { 
-                   \times 2/4 {  c8-[ c c c] }
-                   \times 2/4 {  c-[  c c c] } 
-                }
-                \context Staff = five \context Voice { 
-                   \times 2/5 {  c8-[ 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] } 
-                }
-                \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] } 
-                }
-                \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] } 
-               }
-                \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] } 
-               }
-                \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] } 
-               }
-                \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] } 
-                }
-            >
-       }
-    
-\score{
-    \notes { 
-       \multipart 
+\relative c' { 
+  \new Score \with
+  {
+    \override SpacingSpanner #'uniform-stretching = ##t 
+  }
+  \context StaffGroup << 
+    \new Staff  \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] } 
+    }
+    \new Staff  \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] } 
     }
+  >>
+}
 
-% with raggedright it tests the natural distances, without the
-% stretching distances.
-    
-%    \paper { raggedright = ##t }
 
-}
 
-%% new-chords-done %%