;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
;;;;
-(define ((check-beam-quant posl posr) beam)
+(define ((check-beam-quant posl posr) beam posns)
"Check whether BEAM has POSL and POSR quants. POSL are (POSITION
. QUANT) pairs, where QUANT is -1 (hang), 0 (center), 1 (sit) or -2/ 2 (inter)
"
- (let* ((posns (ly:grob-property beam 'positions))
- (thick (ly:grob-property beam 'thickness))
+ (let* ((thick (ly:grob-property beam 'thickness))
(layout (ly:grob-layout beam))
- (lthick (ly:output-def-lookup layout 'linethickness))
+ (lthick (ly:output-def-lookup layout 'line-thickness))
(staff-thick lthick) ; fixme.
(quant->coord (lambda (p q)
(if (= 2 (abs q))
(begin
(ly:warning (_ "Error in beam quanting. Expected (~S,~S) found ~S.")
want-l want-r posns)
- (set! (ly:grob-property beam 'quant-score)
- (format "(~S,~S)" want-l want-r)))
- (set! (ly:grob-property beam 'quant-score) ""))))
+ (set! (ly:grob-property beam 'annotation)
+ (format "(~S,~S)" want-l want-r))))
+ posns
+ ))
-(define ((check-beam-slope-sign comparison) beam)
+
+(define ((check-beam-slope-sign comparison) beam posns)
"Check whether the slope of BEAM is correct wrt. COMPARISON."
- (let* ((posns (ly:grob-property beam 'positions))
- (slope-sign (- (cdr posns) (car posns)))
+ (let* ((slope-sign (- (cdr posns) (car posns)))
(correct (comparison slope-sign 0)))
-
(if (not correct)
(begin
(ly:warning (_ "Error in beam quanting. Expected ~S 0, found ~S.")
- (procedure-name comparison) "0" slope-sign)
- (set! (ly:grob-property beam 'quant-score)
+ (procedure-name comparison) slope-sign)
+ (set! (ly:grob-property beam 'annotation)
(format "~S 0" (procedure-name comparison))))
- (set! (ly:grob-property beam 'quant-score) ""))))
+ (set! (ly:grob-property beam 'annotation) ""))
+ posns))
+
(define-public (check-quant-callbacks l r)
- (list Beam::least_squares
- Beam::check_concave
- Beam::slope_damping
- Beam::shift_region_to_valid
- Beam::quanting
- (check-beam-quant l r)))
+ (list ly:beam::calc-least-squares-positions
+ ly:beam::slope-damping
+ ly:beam::shift-region-to-valid
+ ly:beam::quanting
+ (check-beam-quant l r)
+ ))
(define-public (check-slope-callbacks comparison)
- (list Beam::least_squares
- Beam::check_concave
- Beam::slope_damping
- Beam::shift_region_to_valid
- Beam::quanting
- (check-beam-slope-sign comparison)))
+ (list ly:beam::calc-least-squares-positions
+ ly:beam::slope-damping
+ ly:beam::shift-region-to-valid
+ ly:beam::quanting
+ (check-beam-slope-sign comparison)
+ ))