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

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 9611239ca2457fcc185df46985a89eafb51156d9..8d81855a1b9a74a441e5606c4a02d4d34259eea6 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1256,7 +1256,7 @@
        (minimum-length . 1.5)
        (height-limit . 2.0)
        (ratio . 0.333)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1408,6 +1408,7 @@
        (stencil . ,ly:script-interface::print)
        (direction . ,ly:script-interface::calc-direction)
        (font-encoding . fetaMusic)
+       (cross-staff . ,ly:script-interface::calc-cross-staff)
        (meta . ((class . Item)
                 (interfaces . (script-interface
                                side-position-interface
@@ -1455,7 +1456,7 @@
        (height-limit . 2.0)
        (ratio . 0.25)
        (avoid-slur . inside)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1576,7 +1577,7 @@
        (Y-extent . ,ly:stem::height)
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
-       (cross-staff . ,ly:stem::cross-staff)
+       (cross-staff . ,ly:stem::calc-cross-staff)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1990,6 +1991,7 @@
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
        (control-points . ,ly:tuplet-bracket::calc-control-points)
        (stencil . ,ly:tuplet-bracket::print)
+       (cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
        
        (meta . ((class . Spanner)
                 (interfaces . (line-interface
@@ -2002,6 +2004,7 @@
        (font-shape . italic)
        (font-size . -2)
        (avoid-slur . inside)
+       (cross-staff . ,ly:tuplet-number::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (text-interface tuplet-number-interface
                                font-interface))))))
@@ -2081,6 +2084,7 @@
        (direction . ,UP)
        (padding . 1)
        (font-encoding . fetaNumber)
+       (minimum-Y-extent . (0 . 2))
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
        (side-axis . ,Y)
        (thickness . 1.6)  ;;  line-thickness