X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftuplet-nest.ly;h=a0a1810398bf8a299b6ab3b6cb1ebeaa09aa34ae;hb=8ddd20baf6dd3b1e12364f46722740aa71147a8b;hp=51e62b3b0be16e0cede37a7c4ab3f8834d20585e;hpb=34881554afeaf03a55a3a983caf9cfeaaf3ea060;p=lilypond.git

diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 51e62b3b0b..a0a1810398 100644
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,40 +1,49 @@
 
-\version "2.3.22"
-
+\version "2.14.0"
 
 \header {
+    texidoc=" Tuplets may be nested."
+}
 
-    texidoc=" Nested tuplets can be printed, using a manual hack to
-  move the outer bracket up."
-
+\paper {
+  ragged-right = ##t  
+  indent = 0.0
 }
 
-#(define (make-text-checker-once text)
-  (lambda (grob) (and text-checker-once
-		      (if (equal? text (ly:grob-property grob 'text))
-			  (begin
-			    (set! text-checker-once #f) #t)
-			  #f))))
-
-#(define text-checker-once #t)
-
-\score {
-    \relative c'' {
-
-    \set tupletNumberFormatFunction = #fraction-tuplet-formatter
-
-    \applyoutput #(lambda (gr org cur)
-		   (if (equal? (ly:grob-property gr 'text) "6:4")
-		    (set! (ly:grob-property gr 'extra-offset) '(0 . 1.5))))
-    \times 4/6 {
-      \times 2/3 {
-        a a a
-      }
-      \times 3/5 {
-        a a a a a
-      }
+\relative c'' {
+  \times 4/3 {
+    \times 2/3 { c8[ c c] }
+    \times 2/3 { c8[ c c] }
+    \times 2/3 { c8[ c c] }
+  }
+
+  \times 4/3 {
+    \times 2/3 { a8[ a a] }
+    \times 2/3 { a8[ a a] }
+    \times 2/3 { a8[ a a] }
+  }
+
+  \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
+    }
+  }
+
+  s1*1/6
+  
+  \stemUp
+  \times 4/6 {
+    \times 2/3 {
+      a1*1/6 a f'
+    }
+    \times 3/5 {
+      c f g a b 
     }
   }
-  \layout { raggedright = ##t}
+  
 }