Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2ef83b3d30853237beb3c7e29a7d1b4e504e253f..f75e454de048e40daef9b669f49aba08f0ac596a 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)
@@ -834,6 +835,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
@@ -1148,6 +1150,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
@@ -1951,7 +1954,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)))
@@ -2267,6 +2274,7 @@
 (define pure-functions
   (list
    parenthesize-elements
+   ly:rest::y-offset-callback
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))