Run `make grand-replace'.

[lilypond.git] / scm / layout-beam.scm

diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm
index a5a81ed75f1b90d07161d0df468d1b0bece628b8..040421a98bdc90cdfa426ac38847abc61f7fbca9 100644 (file)
--- a/scm/layout-beam.scm
+++ b/scm/layout-beam.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 
 (define ((check-beam-quant posl posr) beam posns)
@@ -13,7 +13,7 @@
 "
   (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))
@@ -28,10 +28,8 @@
        (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
     ))
 
@@ -40,15 +38,13 @@
   "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) ""))
+       (set! (ly:grob-property beam 'annotation) ""))
     posns))
 
 
@@ -59,7 +55,7 @@
        ly:beam::quanting
        (check-beam-quant l r)
        ))
-                       
+
 
 (define-public (check-slope-callbacks comparison)
   (list ly:beam::calc-least-squares-positions
@@ -68,3 +64,4 @@
        ly:beam::quanting
        (check-beam-slope-sign comparison)      
        ))
+