X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftuplet-nest.ly;h=8c10cdcd1b695976121f7d35bb1d7a49ab55b8e9;hb=3cdc909d8cea64c8faef90d3a6a391f32a424ba2;hp=ebf21bbacd0628000e5ed4e2cc715e8ac5160cd7;hpb=955f829883aa125b2b633b1e71f6256da5b773fa;p=lilypond.git

diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index ebf21bbacd..8c10cdcd1b 100644
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,34 +1,49 @@
-#(ly:set-option 'old-relative)
-\version "1.9.0"
+
+\version "2.19.21"
+
 \header {
-  texidoc="Manual hack for nested tuplets, move outer tuplet up."
+    texidoc=" Tuplets may be nested."
+}
+
+\paper {
+  ragged-right = ##t  
+  indent = 0.0
 }
 
-#(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))))
-
-#(define text-checker-once #t)
-
-\score {
-  \notes\relative c'' {
-
-    \property Voice.tupletNumberFormatFunction = #fraction-tuplet-formatter
-
-    \outputproperty #(make-text-checker-once "2:3")
-      #'extra-offset = #'(0 . 1.5)
-    \times 2/3 {
-      \times 2/3 {
-        a a a
-      }
-      \times 3/5 {
-        a a a a a
-      }
+\relative {
+  \tuplet 3/4 {
+    \tuplet 3/2 { c''8[ c c] }
+    \tuplet 3/2 { c8[ c c] }
+    \tuplet 3/2 { c8[ c c] }
+  }
+
+  \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
+  \tuplet 6/4 {
+    \tuplet 3/2 {
+      a4 a a
+    }
+    \tuplet 5/3 {
+      a4 a a a a
+    }
+  }
+
+  s1*1/6
+  
+  \stemUp
+  \tuplet 6/4 {
+    \tuplet 3/2 {
+      a1*1/6 a f'
+    }
+    \tuplet 5/3 {
+      c f g a b 
     }
   }
-  \paper { raggedright = ##t}
+  
 }