patch::: 1.5.40.jcn1

[lilypond.git] / scm / grob-description.scm

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 78a8fad33851632aca807b21665c394e3be00456..405e280dbc18bbb36763c3a77aed4d160ae68a9d 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -97,31 +97,21 @@
      . (
        ;; todo: clean this up a bit: the list is getting
        ;; rather long.
-       ;(molecule-callback . ,Beam::brew_molecule)
-       (molecule-callback . ,New_beam::brew_molecule)
+       (molecule-callback . ,Beam::brew_molecule)
        (concaveness-threshold . 0.08)
-       (position . (#f . #f))
-       (y-dy-callbacks . (,Beam::least_squares
-                          ,Beam::check_concave
-                          ,Beam::slope_damping
-                          ,Beam::quantise_dy
-                          ,Beam::user_override
-                          ,Beam::do_quantise_y))
-
-       (position-callbacks . (,New_beam::least_squares
-                              ,New_beam::check_concave
-                              ,New_beam::slope_damping
-                              ,New_beam::quantise_position))
+       (positions . (#f . #f))
+       (position-callbacks . (,Beam::least_squares
+                              ,Beam::check_concave
+                              ,Beam::slope_damping
+                              ,Beam::quantise_position))
        
        (thickness . 0.48) ; in staff-space
        (before-line-breaking-callback . ,Beam::before_line_breaking)
-       ;;(after-line-breaking-callback . ,Beam::after_line_breaking)
-       (after-line-breaking-callback . (,New_beam::after_line_breaking
-                                        ,New_beam::end_after_line_breaking))
+       (after-line-breaking-callback . (,Beam::after_line_breaking
+                                        ,Beam::end_after_line_breaking))
        (neutral-direction . -1)
        (dir-function . ,beam-dir-majority)
-       (height-quant-function .  ,default-beam-dy-quants)
-       (vertical-position-quant-function . ,default-beam-y-quants)
+       (vertical-position-quant-function . ,default-beam-pos-quants)
        (beamed-stem-shorten . (1.0 0.5))
        (outer-stem-length-limit . 0.2)
        (slope-limit . 0.2)