Fixes issue 1951 (script accidental collision).

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index db39b6889c20a562259c7620a671c8d12ed634dc..f86fe11f54f9ab9f65e7b7b17eca3e2acb48bc9f 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -80,6 +80,7 @@
        (side-axis . ,Y)
        (staff-padding . 0.25)
        (stencil . ,ly:accidental-interface::print)
+       (use-skylines . #t)
        (X-extent . ,ly:accidental-interface::width)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
@@ -383,15 +384,7 @@
 
        (gap . 0.8)
        (neutral-direction . ,DOWN)
-       (positions .  ,(ly:make-simple-closure
-                       (ly:make-simple-closure
-                        (list chain-grob-member-functions
-                          `(,cons 0 0)
-                          ly:beam::calc-least-squares-positions
-                          ly:beam::slope-damping
-                          ly:beam::shift-region-to-valid
-                          ly:beam::quanting
-                          ))))
+       (positions . ,ly:beam::quanting)
 
        ;; this is a hack to set stem lengths, if positions is set.
        (quantized-positions . ,ly:beam::set-stem-lengths)
@@ -1734,6 +1727,7 @@
        (staff-padding . 0.25)
 
        (stencil . ,ly:script-interface::print)
+       (use-skylines . #t)
        (X-offset . ,script-interface::calc-x-offset)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (meta . ((class . Item)
@@ -2701,7 +2695,7 @@
           (ly:eval-simple-closure (car args) unpure start end)
           (if (not (procedure? unpure))
               unpure
-              (apply (cdr pure)
+              (apply unpure
                      (append
                        (list (car args) start end)
                        (cdr args))))))