X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftuplet-nest.ly;h=8b727c2a5ccd6570629082cdea9d2371f4d0805a;hb=84df877933ef6b3b9915e58bf0ca8bd7d92fea3d;hp=a26fddbc3d698d4c2e1ecdff4d936d386a9217df;hpb=3db08de4502e30616808fc348b054d32822e5cc4;p=lilypond.git

diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index a26fddbc3d..8b727c2a5c 100644
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,33 +1,49 @@
-\version "1.7.18"
+
+\version "2.16.0"
+
 \header {
-  texidoc="Manual hack for nested tuplets, move outer tuplet up."
+    texidoc=" Tuplets may be nested."
 }
 
-#(define (make-text-checker-once text)
-  (lambda (grob) (and text-checker-once
-		      (if (equal? text (ly:get-grob-property grob 'text))
-			  (begin
-			    (set! text-checker-once #f) #t)
-			  #f))))
+\paper {
+  ragged-right = ##t  
+  indent = 0.0
+}
 
-#(define text-checker-once #t)
+\relative c'' {
+  \times 4/3 {
+    \times 2/3 { c8[ c c] }
+    \times 2/3 { c8[ c c] }
+    \times 2/3 { c8[ c c] }
+  }
 
-\score {
-  \notes\relative c'' {
+  \times 4/3 {
+    \times 2/3 { a8[ a a] }
+    \times 2/3 { a8[ a a] }
+    \times 2/3 { a8[ a a] }
+  }
 
-    \property Voice.tupletNumberFormatFunction = #fraction-tuplet-formatter
+  \override TupletNumber #'text = #tuplet-number::calc-fraction-text
+  \times 4/6 {
+    \times 2/3 {
+      a4 a a
+    }
+    \times 3/5 {
+      a4 a a a a
+    }
+  }
 
-    \outputproperty #(make-text-checker-once "2:3")
-      #'extra-offset = #'(0 . 1.5)
+  s1*1/6
+  
+  \stemUp
+  \times 4/6 {
     \times 2/3 {
-      \times 2/3 {
-        a a a
-      }
-      \times 3/5 {
-        a a a a a
-      }
+      a1*1/6 a f'
+    }
+    \times 3/5 {
+      c f g a b 
     }
   }
-  \paper { raggedright = ##t}
+  
 }