Imported Upstream version 2.18.0

[lilypond.git] / input / regression / tuplet-nest.ly

diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 8b727c2a5ccd6570629082cdea9d2371f4d0805a..093c57f28961a7c519b8ce6041180b1210bb872f 100644 (file)
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,5 +1,5 @@
 
-\version "2.16.0"
+\version "2.17.11"
 
 \header {
     texidoc=" Tuplets may be nested."
@@ -11,24 +11,24 @@
 }
 
 \relative c'' {
-  \times 4/3 {
-    \times 2/3 { c8[ c c] }
-    \times 2/3 { c8[ c c] }
-    \times 2/3 { c8[ c c] }
+  \tuplet 3/4 {
+    \tuplet 3/2 { c8[ c c] }
+    \tuplet 3/2 { c8[ c c] }
+    \tuplet 3/2 { c8[ c c] }
   }
 
-  \times 4/3 {
-    \times 2/3 { a8[ a a] }
-    \times 2/3 { a8[ a a] }
-    \times 2/3 { a8[ a a] }
+  \tuplet 3/4 {
+    \tuplet 3/2 { a8[ a a] }
+    \tuplet 3/2 { a8[ a a] }
+    \tuplet 3/2 { a8[ a a] }
   }
 
-  \override TupletNumber #'text = #tuplet-number::calc-fraction-text
-  \times 4/6 {
-    \times 2/3 {
+  \override TupletNumber.text = #tuplet-number::calc-fraction-text
+  \tuplet 6/4 {
+    \tuplet 3/2 {
       a4 a a
     }
-    \times 3/5 {
+    \tuplet 5/3 {
       a4 a a a a
     }
   }
@@ -36,11 +36,11 @@
   s1*1/6
   
   \stemUp
-  \times 4/6 {
-    \times 2/3 {
+  \tuplet 6/4 {
+    \tuplet 3/2 {
       a1*1/6 a f'
     }
-    \times 3/5 {
+    \tuplet 5/3 {
       c f g a b 
     }
   }