X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Ftuplet-nest.ly;h=a0a1810398bf8a299b6ab3b6cb1ebeaa09aa34ae;hb=e25cd2101741843667cc7c903fc55c32adc0fd3d;hp=afed1d3db34536ad86f32682b7cc7199ad7374ce;hpb=2b4664417d36bed2b408d769e3dfd96732710d54;p=lilypond.git diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index afed1d3db3..a0a1810398 100644 --- a/input/regression/tuplet-nest.ly +++ b/input/regression/tuplet-nest.ly @@ -1,33 +1,49 @@ -\version "1.7.6" + +\version "2.14.0" + \header { - texidoc="Manual hack for nested tuplets, move outer tuplet up." + texidoc=" Tuplets may be nested." } -#(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)))) +\paper { + ragged-right = ##t + indent = 0.0 +} -#(define text-checker-once #t) +\relative c'' { + \times 4/3 { + \times 2/3 { c8[ c c] } + \times 2/3 { c8[ c c] } + \times 2/3 { c8[ c c] } + } -\score { - \notes\relative c'' { + \times 4/3 { + \times 2/3 { a8[ a a] } + \times 2/3 { a8[ a a] } + \times 2/3 { a8[ a a] } + } - \property Voice.tupletNumberFormatFunction = #fraction-tuplet-formatter + \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 + } + } - \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. } + } -%% new-chords-done %% +