Merge branch 'master' of 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 14f57fedd65e861d817cf24a2ca9edaa584f6f0d..956a8e0045a039e60528a806eb043076ea589415 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -702,6 +702,7 @@
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
        (positioning-done . ,ly:script-interface::calc-positioning-done)
+       (cross-staff . ,ly:side-position-interface::calc-cross-staff)
 
        (text . ,fingering::calc-text) 
        (font-encoding . fetaNumber)
@@ -783,6 +784,7 @@
        (after-line-breaking . ,ly:hairpin::after-line-breaking)
        (grow-direction . ,hairpin::calc-grow-direction)
        (circled-tip . #f)
+       (to-barline . #t)
        (thickness . 1.0)
        (height . 0.6666)
        (minimum-length . 2.0)
@@ -1149,6 +1151,7 @@
        (axes . (,X ,Y))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
+       (prefer-dotted-right . #t)
        (positioning-done . ,ly:note-collision-interface::calc-positioning-done)
        (meta . ((class . Item)
                 (interfaces . (note-collision-interface
@@ -1413,6 +1416,7 @@
        (Y-extent . ,ly:rest::height)
        (Y-offset . ,ly:rest::y-offset-callback)
        (minimum-distance . 0.25)
+       (cross-staff . ,ly:rest::calc-cross-staff)
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                rhythmic-head-interface
@@ -1883,6 +1887,7 @@
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (avoid-slur . inside)
        (direction . ,ly:tie::calc-direction)
+       (neutral-direction . ,UP)
        (stencil . ,ly:tie::print)
        (font-size . -6)
        (details . (