X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flayout-beam.scm;h=59f3b2fcc6e6c61461dbdc7fb72c624e298773bb;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=6c790e02b5e3f37aafb4b0a071fbe71be41b410c;hpb=203a92f82635caff2c1eec57d64c7ba581adbc82;p=lilypond.git

diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm
index 6c790e02b5..59f3b2fcc6 100644
--- a/scm/layout-beam.scm
+++ b/scm/layout-beam.scm
@@ -1,75 +1,73 @@
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; beam.scm -- Beam scheme stuff
+;;;; Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2000--2005 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/>.
 
-;;
-;; width in staff space.
-;;
-(define (beam-flag-width-function type)
-  (cond
-   ((eq? type 1) 1.98) 
-   ((eq? type 1) 1.65) ;; FIXME: check what this should be and why
-   (else 1.32)))
-
-(define ((check-beam-quant posl posr) beam)
-  "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) 
+(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* ((posns (ly:grob-property beam 'positions))
-	 (thick (ly:grob-property beam 'thickness))
-	 (layout (ly:grob-layout beam))
-	 (lthick (ly:output-def-lookup layout 'linethickness))
-	 (staff-thick lthick) ; fixme.
-	 (quant->coord (lambda (p q)
-			 (if (= 2 (abs q))
-			     (+ p (/ q 4.0))
-			     (+ p (- (* 0.5 q thick) (* 0.5 q lthick))))))
-	 (want-l (quant->coord (car posl) (cdr posl))) 
-	 (want-r (quant->coord (car posr) (cdr posr)))
-	 (almost-equal (lambda (x y) (< (abs (- x y)) 1e-3))))
-    
-    (if (or (not (almost-equal want-l (car posns)))
-	    (not (almost-equal want-r (cdr posns))))
-	(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) ""))))
+      (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.
+             (quant->coord (lambda (p q)
+                             (if (= 2 (abs q))
+                                 (+ p (/ q 4.0))
+                                 (+ p (- (* 0.5 q thick) (* 0.5 q lthick))))))
+             (want-l (quant->coord (car posl) (cdr posl)))
+             (want-r (quant->coord (car posr) (cdr posr)))
+             (almost-equal (lambda (x y) (< (abs (- x y)) 1e-3))))
 
-(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 (or (not (almost-equal want-l (car posns)))
+                (not (almost-equal want-r (cdr posns))))
+            (begin
+              (ly:warning (_ "Error in beam quanting.  Expected (~S,~S) found ~S.")
+                          want-l want-r posns)
+              (set! (ly:grob-property beam 'annotation)
+                    (format #f "(~S,~S)" want-l want-r))))
+        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) slope-sign)
+              (set! (ly:grob-property beam 'annotation)
+                    (format #f "~S 0" (procedure-name comparison))))
+            (set! (ly:grob-property beam 'annotation) ""))
+        posns))))
 
-    (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)
-		(format "~S 0" (procedure-name comparison))))
-	(set! (ly:grob-property beam 'quant-score) ""))))
 
 (define-public (check-quant-callbacks l r)
-  (list Beam::least_squares
-	Beam::check_concave
-	Beam::slope_damping
-	Beam::shift_region_to_valid
-	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 Beam::least_squares
-	Beam::check_concave
-	Beam::slope_damping
-	Beam::shift_region_to_valid
-	Beam::quanting
-	(check-beam-slope-sign comparison)))
-
+  (lambda (grob)
+    ((check-beam-slope-sign comparison)
+     grob
+     (beam::place-broken-parts-individually grob))))