X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ftuplet-nest.ly;h=c090b2beb7627aeab2e4124503c9411b7c8150a9;hb=d05985c8cde96ecef43b0d2f96eb5de91a79be8a;hp=82191457844316207f48a542a3517cc2c5c4b57b;hpb=397619f8d14da1248ddc4a40231ae9360df40486;p=lilypond.git diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index 8219145784..c090b2beb7 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,31 +1,37 @@ -\header { - texidoc="Manual hack for nested tuplets" -} -#(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.12.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) + 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. } + } +