X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fbeam-quant-standard.ly;h=40cfd61fa499464c5c94e8c1c1519f1e61326987;hb=7680952372689f3ce5674d47af42edfc475cface;hp=9dca8fb87eff80b4890d46edd7684b5102a0cae5;hpb=ae974ac543cabbe01714c8a2fa8a6bbd67f5216c;p=lilypond.git diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly index 9dca8fb87e..40cfd61fa4 100644 --- a/input/regression/beam-quant-standard.ly +++ b/input/regression/beam-quant-standard.ly @@ -1,144 +1,146 @@ \header { - texidoc = "This file tests a few standard beam quants, taken from + texidoc = "This file tests a few standard beam quants, taken from Ted Ross' book. If LilyPond finds another quant, the correct quant is printed over the beam." - + } +%% FIXME: This file should actually NOT produce any warnings! +#(ly:set-option 'warning-as-error #f) -\version "2.6.0" +\version "2.17.6" \layout { - raggedright = ##t -% #(define debug-beam-quanting #t) + ragged-right = ##t + #(define debug-beam-quanting #t) } -filler = \new Voice \relative { - \hideNotes - e4 e +filler = \new Voice \relative c' { + \hideNotes + e4 e } -% +% %% %% Ross p108--112 -primes = \relative { - \time 3/4 - \assertBeamQuant #'(0 . 0) #'(0 . 0) - c8[ c] - \filler - \assertBeamQuant #'(1 . -1) #'(1 . -1) - d8[ d] - - \filler - - \assertBeamQuant #'(1 . 0) #'(1 . 0) - e8[ e] - \filler - - - \assertBeamQuant #'(2 . -1) #'(2 . -1) - f8[ f] - \filler - - - \assertBeamQuant #'(2 . 0) #'(2 . 0) - g8[ g] - \filler - - - \assertBeamQuant #'(2 . 1) #'(2 . 1) - a8[ a] - \filler - +primes = \relative c' { + \time 3/4 + \assertBeamQuant #'(0 . 0) #'(0 . 0) + c8[ c] + \filler + \assertBeamQuant #'(1 . -1) #'(1 . -1) + d8[ d] + + \filler + + \assertBeamQuant #'(1 . 0) #'(1 . 0) + e8[ e] + \filler + + + \assertBeamQuant #'(2 . -1) #'(2 . -1) + f8[ f] + \filler + + + \assertBeamQuant #'(2 . 0) #'(2 . 0) + g8[ g] + \filler + + + \assertBeamQuant #'(2 . 1) #'(2 . 1) + a8[ a] + \filler + %{ - \once \override Beam #'inspect-quants = #'(2.2 . 2.2) - \assertBeamQuant - a8[ a] - \filler - + \once \override Beam.inspect-quants = #'(2.2 . 2.2) + \assertBeamQuant + a8[ a] + \filler + %} - + } -seconds = \relative { - - \assertBeamQuant #'(0 . 0) #'(0 . 1) - a8[ b] - \filler - - - \assertBeamQuant #'(0 . 0) #'(0 . 1) - b8[ c] - \filler - - - \assertBeamQuant #'(0 . 0) #'(0 . 1) - c8[ d] - \filler - - \assertBeamQuant #'(1 . -1) #'(1 . 0) - d8[ e] - \filler - - - \assertBeamQuant #'(1 . 0) #'(1 . 1) - e8[ f] - \filler - - - \assertBeamQuant #'(2 . -1) #'(2 . 0) - f8[ g] - \filler - - - \assertBeamQuant #'(2 . 0) #'(2 . 1) - g8[ a] - \filler - - \assertBeamQuant #'(3 . -1) #'(3 . 0) - a8[ b] - \filler +seconds = \relative c' { + + \assertBeamQuant #'(0 . 0) #'(0 . 1) + a8[ b] + \filler + + + \assertBeamQuant #'(0 . 0) #'(0 . 1) + b8[ c] + \filler + + + \assertBeamQuant #'(0 . 0) #'(0 . 1) + c8[ d] + \filler + + \assertBeamQuant #'(1 . -1) #'(1 . 0) + d8[ e] + \filler + + + \assertBeamQuant #'(1 . 0) #'(1 . 1) + e8[ f] + \filler + + + \assertBeamQuant #'(2 . -1) #'(2 . 0) + f8[ g] + \filler + + + \assertBeamQuant #'(2 . 0) #'(2 . 1) + g8[ a] + \filler + + \assertBeamQuant #'(3 . -1) #'(3 . 0) + a8[ b] + \filler } -filler = \new Voice \relative { - \hideNotes - e4 e4. +filler = \new Voice \relative c' { + \hideNotes + e4 e4. } -% Ross, p122 -primeSixteenths = \relative { - \stemUp - \assertBeamQuant #'(0 . -1) #'(0 . -1) - g16[ g] - \filler - \assertBeamQuant #'(0 . -1) #'(0 . -1) - a16[ a] - \filler - \assertBeamQuant #'(0 . -1) #'(0 . -1) - b16[ b] - \filler - \assertBeamQuant #'(0 . 0) #'(0 . 0) - c16[ c] - \filler - \assertBeamQuant #'(1 . -1) #'(1 . -1) - d16[ d] - \filler - \assertBeamQuant #'(1 . 0) #'(1 . 0) - e16[ e] - \filler - \assertBeamQuant #'(2 . -1) #'(2 . -1) - f16[ f] - \filler - \assertBeamQuant #'(2 . 0) #'(2 . 0) - g16[ g] - \filler - \assertBeamQuant #'(3 . -1) #'(3 . -1) - a16[ a] - \filler - \assertBeamQuant #'(3 . 0) #'(3 . 0) - b16[ b] - \filler +% Ross, p122 +primeSixteenths = \relative c' { + \stemUp + \assertBeamQuant #'(0 . -1) #'(0 . -1) + g16[ g] + \filler + \assertBeamQuant #'(0 . -1) #'(0 . -1) + a16[ a] + \filler + \assertBeamQuant #'(0 . -1) #'(0 . -1) + b16[ b] + \filler + \assertBeamQuant #'(0 . 0) #'(0 . 0) + c16[ c] + \filler + \assertBeamQuant #'(1 . -1) #'(1 . -1) + d16[ d] + \filler + \assertBeamQuant #'(1 . 0) #'(1 . 0) + e16[ e] + \filler + \assertBeamQuant #'(2 . -1) #'(2 . -1) + f16[ f] + \filler + \assertBeamQuant #'(2 . 0) #'(2 . 0) + g16[ g] + \filler + \assertBeamQuant #'(3 . -1) #'(3 . -1) + a16[ a] + \filler + \assertBeamQuant #'(3 . 0) #'(3 . 0) + b16[ b] + \filler } \new Voice { \primes \seconds \primeSixteenths }