Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b7d25131bfee6c4afb5885162ad072105a7fa2cc..eefc76fe1343181c821de59f2792f3e4dc52b0c1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -319,6 +319,7 @@
        (beaming . ,ly:beam::calc-beaming)
        (stencil . ,ly:beam::print)
        (clip-edges . #t)
+       (cross-staff . ,ly:beam::cross-staff)
 
        (details .  ((hint-direction-penalty . 20)))
        ;; TODO: should be in SLT.
@@ -591,7 +592,6 @@
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (staff-padding . 0.1)
        (padding . 0.6)
-       (avoid-slur . outside)
        (slur-padding . 0.3)
        (minimum-space . 1.2)
        (direction . ,DOWN)
@@ -620,7 +620,6 @@
        (font-series . bold)
        (font-encoding . fetaDynamic)
        (font-shape . italic)
-       (avoid-slur . around)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-priority . 250)
        (meta . ((class . Item)
@@ -1257,6 +1256,7 @@
        (minimum-length . 1.5)
        (height-limit . 2.0)
        (ratio . 0.333)
+       (cross-staff . ,ly:slur::cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1455,6 +1455,7 @@
        (height-limit . 2.0)
        (ratio . 0.25)
        (avoid-slur . inside)
+       (cross-staff . ,ly:slur::cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1575,6 +1576,7 @@
        (Y-extent . ,ly:stem::height)
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
+       (cross-staff . ,ly:stem::cross-staff)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1702,6 +1704,7 @@
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
        (skylines . ,ly:axis-group-interface::calc-skylines)
+       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
        (skyline-horizontal-padding . 1.0)
        (meta . ((class . System)
                 (interfaces . (system-interface
@@ -2052,6 +2055,7 @@
        (stacking-dir . -1)
        (padding . 0.5)
        (skylines . ,ly:axis-group-interface::combine-skylines)
+       (max-stretch . ,ly:align-interface::calc-max-stretch)
        (meta . ((class . Spanner)
                 (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common)))
                 (interfaces . (align-interface
@@ -2062,7 +2066,8 @@
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
        (X-extent . ,ly:axis-group-interface::width)
-       (skylines . ,ly:axis-group-interface::calc-skylines);
+       (skylines . ,ly:axis-group-interface::calc-skylines)
+       (max-stretch . ,ly:axis-group-interface::calc-max-stretch)
        (meta . ((class . Spanner)
                 (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common)))
                 (interfaces . (axis-group-interface