+;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; beam.scm -- Beam scheme stuff
+;;;; Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
;;;;
-;;;; source file of the GNU LilyPond music typesetter
-;;;;
-;;;; (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-(define ((check-beam-quant posl posr) beam posns)
+(define check-beam-quant
+ (lambda (posl posr)
+ (lambda (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* ((thick (ly:grob-property beam 'thickness))
+ (let* ((thick (ly:grob-property beam 'beam-thickness))
(layout (ly:grob-layout beam))
(lthick (ly:output-def-lookup layout 'line-thickness))
(staff-thick lthick) ; fixme.
(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) ""))
-
- posns
- ))
-
+ (set! (ly:grob-property beam 'annotation)
+ (format "(~S,~S)" want-l want-r))))
+ posns))))
-(define ((check-beam-slope-sign comparison) beam posns)
+(define check-beam-slope-sign
+ (lambda (comparison)
+ (lambda (beam posns)
"Check whether the slope of BEAM is correct wrt. COMPARISON."
(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) ""))
- posns))
+ (set! (ly:grob-property beam 'annotation) ""))
+ posns))))
(define-public (check-quant-callbacks l r)