Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm
index ef5cde47788bb246dcabda9f1e615787636722b4..e99387864dd8c3dd97783b01771f2a27db2807b2 100644 (file)
--- a/scm/layout-beam.scm
+++ b/scm/layout-beam.scm
@@ -1,9 +1,9 @@
 ;;;;
-;;;; beam.scm -- Beam scheme stuff
+;;;; layout-beam.scm -- Beam scheme stuff
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 
 (define ((check-beam-quant posl posr) beam posns)
@@ -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))