Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3c1988c9c8c027cf52bf50040da70610eb3856a7..5e2dd4d86c14ea0572aadc11d7d5ae6a9e2f28b1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -51,6 +51,7 @@
                                accidental-suggestion-interface
                                self-alignment-interface
                                font-interface))))))
+
     (AccidentalPlacement
      . (
        (left-padding . 0.2)
@@ -421,6 +422,7 @@
        (stencil . ,ly:clef::print)
        (glyph-name . ,ly:clef::calc-glyph-name)
        (non-musical . #t)
+       (avoid-slur . inside)
        (font-family . music)
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
@@ -792,6 +794,7 @@
     (KeySignature
      . (
        (stencil . ,ly:key-signature-interface::print)
+       (avoid-slur . inside)
        (space-alist . (
                        (time-signature . (extra-space . 1.15))
                        (staff-bar . (extra-space . 1.1))
@@ -1312,7 +1315,7 @@
     (Rest
      . (
        (stencil . ,ly:rest::print)
-       (duration-log . ,note-head::calc-duration-log)
+       (duration-log . ,stem::calc-duration-log)
        (X-extent . ,ly:rest::width)
        (Y-extent . ,ly:rest::height)
        (Y-offset . ,ly:rest::y-offset-callback)
@@ -1500,7 +1503,7 @@
     (Stem
      . (
        (direction . ,ly:stem::calc-direction)
-       (duration-log . ,note-head::calc-duration-log)
+       (duration-log . ,stem::calc-duration-log)
        (default-direction . ,ly:stem::calc-default-direction)
        (stem-end-position . ,ly:stem::calc-stem-end-position)
 
@@ -1640,6 +1643,7 @@
        (axes . (0 1))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
+       (skyline-spacing . #t)
        (meta . ((class . System)
                 (interfaces . (system-interface
                                axis-group-interface))))))
@@ -1707,7 +1711,6 @@
      . (
        (stencil . ,ly:text-interface::print)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
-       (duration-log . ,note-head::calc-duration-log)
        (font-size . -2)
        (stem-attachment . (0.0 . 1.35))
        (font-series . bold)
@@ -1808,6 +1811,7 @@
        (stencil . ,ly:time-signature::print)
        (break-align-symbol . time-signature)
        (break-visibility . ,all-visible)
+       (avoid-slur . inside)
        (space-alist . (
                        (first-note . (fixed-space . 2.0))
                        (right-edge . (extra-space . 0.5))
@@ -1964,6 +1968,7 @@
        (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)
+       (skyline-spacing . #t)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                hara-kiri-group-interface