Yoshinobu Ishizaki's multiple header definition patch. Thanks!

[lilypond.git] / scm / beam.scm

diff --git a/scm/beam.scm b/scm/beam.scm
index 87739bbbcd9e06735e1135f3b998732a1877030b..e92edc0e84c44a0fd5c060a1f6ad92c5cda1879c 100644 (file)
--- a/scm/beam.scm
+++ b/scm/beam.scm
@@ -3,7 +3,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 
 ;;
@@ -76,25 +76,24 @@
     (if (or (not (almost-equal want-l (car posns)))
            (not (almost-equal want-r (cdr posns))))
        (begin
-         (ly:warn
-          "Error in beam quanting found. Want (~S,~S) found (~S)."
-          want-l want-r posns )
+         (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) ""))))
+
 (define ((check-beam-slope-sign comparison) beam)
   "Check whether the slope of BEAM is correct wrt. COMPARISON."
   (let* ((posns (ly:grob-property beam 'positions))
         (slope-sign (- (cdr posns) (car posns)))
         (correct (comparison slope-sign 0)))
 
-    
     (if (not correct)
        (begin
-         (ly:warn "Error in beam quanting found. Want ~S 0 found ~S."
-                  (procedure-name comparison) slope-sign)
+         (ly:warning (_ "Error in beam quanting.  Expected ~S 0, found ~S.")
+                     (procedure-name comparison) "0" slope-sign)
          (set! (ly:grob-property beam 'quant-score)
-               (format "~S 0" (procedure-name comparison) )))
+               (format "~S 0" (procedure-name comparison))))
        (set! (ly:grob-property beam 'quant-score) ""))))
 
 (define-public (check-quant-callbacks l r)