X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftuplet-nest.ly;h=720b15f5a4d582e4b97e8939e000ec20374d1aa4;hb=3dce66bcb7ad778c9cddf4fbd636987e1bc10abf;hp=a26fddbc3d698d4c2e1ecdff4d936d386a9217df;hpb=3db08de4502e30616808fc348b054d32822e5cc4;p=lilypond.git diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index a26fddbc3d..720b15f5a4 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,33 +1,37 @@ -\version "1.7.18" -\header { - texidoc="Manual hack for nested tuplets, move outer tuplet up." -} -#(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)))) +\version "2.10.0" -#(define text-checker-once #t) +\header { + texidoc=" Tuplets may be nested." +} -\score { - \notes\relative c'' { +\paper { + ragged-right = ##t + indent = 0.0 +} - \property Voice.tupletNumberFormatFunction = #fraction-tuplet-formatter +\relative c'' { + \override TupletNumber #'text = #tuplet-number::calc-fraction-text + \times 4/6 { + \times 2/3 { + a a a + } + \times 3/5 { + a 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} + }