X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flayout-beam.scm;fp=scm%2Flayout-beam.scm;h=f72afacf0dd1c8ffbcc5972ff760a40e375906e7;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=4ef49e975989978bfdeeb1af595aa567f76fc06f;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm
index 4ef49e9759..f72afacf0d 100644
--- a/scm/layout-beam.scm
+++ b/scm/layout-beam.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2000--2012 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
@@ -40,7 +40,7 @@
 	  (ly:warning (_ "Error in beam quanting.  Expected (~S,~S) found ~S.")
 		      want-l want-r posns)
 	  (set! (ly:grob-property beam 'annotation)
-		(format "(~S,~S)" want-l want-r))))
+		(format #f "(~S,~S)" want-l want-r))))
     posns))))
 
 (define check-beam-slope-sign
@@ -54,25 +54,21 @@
 	  (ly:warning (_ "Error in beam quanting.  Expected ~S 0, found ~S.")
 		      (procedure-name comparison) slope-sign)
 	  (set! (ly:grob-property beam 'annotation)
-		(format "~S 0" (procedure-name comparison))))
+		(format #f "~S 0" (procedure-name comparison))))
 	(set! (ly:grob-property beam 'annotation) ""))
     posns))))
 
 
 (define-public (check-quant-callbacks 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)
-	))
+  (lambda (grob)
+    ((check-beam-quant l r)
+       grob
+       (beam::place-broken-parts-individually grob))))
 
 
 (define-public (check-slope-callbacks 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)	
-	))
+  (lambda (grob)
+    ((check-beam-slope-sign comparison)
+       grob
+       (beam::place-broken-parts-individually grob))))