patch::: 1.5.40.jcn1

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

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index d441d1aa37eea700e58bf3c07dcc11e2c34875ba..405e280dbc18bbb36763c3a77aed4d160ae68a9d 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -20,7 +20,7 @@
        (after-line-breaking-callback . ,Local_key_item::after_line_breaking)
        (direction . -1)
        (left-padding . 0.2)
-       (right-padding . 0.4)
+       (right-padding . 0.5)
        (paren-cautionaries . #t)
        (font-family . music)
        (meta . ,(grob-description accidentals-interface font-interface side-position-interface))
@@ -52,7 +52,7 @@
                        (time-signature . (extra-space . 0.75)) 
                        (custos . (minimum-space . 2.0))
                        (clef .   (minimum-space . 1.0))
-                       (begin-of-note . (extra-space . 1.0))
+                       (begin-of-note . (extra-space . 1.3))
                        ))
 
        ;;
@@ -98,25 +98,20 @@
        ;; todo: clean this up a bit: the list is getting
        ;; rather long.
        (molecule-callback . ,Beam::brew_molecule)
-;;     (concaveness . 0.8)
-       (concaveness . 0.08)
-       (concaveness-no-slope . #t)
-       (concaveness-square . #t)
-       (ideal-lengthen . #t)
-       (y-dy-callbacks . (,Beam::least_squares
-                          ,Beam::check_concave
-                          ,Beam::slope_damping
-                          ,Beam::quantise_dy
-                          ,Beam::user_override
-                          ,Beam::do_quantise_y))
-
+       (concaveness-threshold . 0.08)
+       (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 . (,Beam::after_line_breaking
+                                        ,Beam::end_after_line_breaking))
        (neutral-direction . -1)
        (dir-function . ,beam-dir-majority)
-       (height-quants .  ,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)
@@ -636,6 +631,7 @@
 
        (shortest-duration-space . 2.0)
        (spacing-increment . 1.2)
+       
        (X-extent-callback . #f)
        (Y-extent-callback . #f)