X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftuplet-nest.ly;h=8bba889660c1982e3fd49936df58284384e397db;hb=6d910958ea621e4ab878a118bd77e61ae210a6ef;hp=d59418ea07737b4c9638b9e1c56382ba1d9ad79d;hpb=45bd5b4b26658517f5d8f25c2c5e228e9867818b;p=lilypond.git diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index d59418ea07..8bba889660 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,31 +1,37 @@ -\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.11.51" -#(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 { linewidth = -1. } + } +