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 187218c6173dc545f627806720a91efee63ede76..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)
@@ -820,6 +822,7 @@
        (X-offset . ,ly:side-position-interface::x-aligned-side)
        (direction . ,LEFT)
        (self-alignment-Y . ,CENTER)
+       (self-alignment-X . ,CENTER)
        (meta . ((class . Spanner)
                 (interfaces . (system-start-text-interface
                                side-position-interface
@@ -833,6 +836,7 @@
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (staff-padding . 2)
        (direction . ,UP)
+       (side-axis . ,Y)
        (self-alignment-X . ,CENTER)
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
@@ -1147,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
@@ -1411,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
@@ -1503,7 +1509,9 @@
      . (
        (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 1000)
        (side-axis . ,Y)
        (staff-padding . 1.0)
        (padding . 1.2)
@@ -1716,7 +1724,9 @@
      . (
        (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 1000)
        (side-axis . ,Y)
        (padding . 1.2)
        (staff-padding . 1.2)
@@ -1877,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 . (
@@ -1946,7 +1957,11 @@
                                   (Y . 0)
                                   (stencil-offset . (-0.5 . 0))
                                   (padding . 1.5)
-                                  (attach-dir . ,LEFT)
+                                  (attach-dir . ,CENTER)
+                                  ;; this isn't CENTER because the trill glyph's origin
+                                  ;; is not centered in its extent; to have the trill
+                                  ;; spanner aligned the same as a trill, we need a slight offset
+                                  (anchor-alignment . 0.15)
                                   ))
                          (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)))
@@ -2062,7 +2077,9 @@
      . (
        (axes . (,Y))
        (Y-extent . ,ly:axis-group-interface::height)
+       (X-extent . ,ly:axis-group-interface::width)
        (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (outside-staff-priority . 1000)
        (side-axis . ,Y)
        (padding . 1.2)
        (staff-padding . 1.2)
@@ -2260,6 +2277,7 @@
 (define pure-functions
   (list
    parenthesize-elements
+   ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))