Give time signature space during layout (Fix issue 2094)

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2009b46dee82a81b74b1d79ab01283edcb445ed0..5479401f32134ccebb5b0fbde0cb2d4dc1f5fd24 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -507,6 +507,7 @@
        (font-size . 1.5)
        (stencil . ,ly:text-interface::print)
        (extra-spacing-height . (0.2 . -0.2))
+       (extra-spacing-width . (-0.5 . 0.5))
        (word-space . 0.0)
        (meta . ((class . Item)
                 (interfaces . (chord-name-interface
@@ -1636,6 +1637,7 @@
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (stencil . ,ly:slur::print)
        (thickness . 1.1)
+       (vertical-skylines . ,ly:slur::vertical-skylines)
        (Y-extent . ,ly:slur::height)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
@@ -1793,6 +1795,7 @@
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        (stencil . ,ly:slur::print)
        (thickness . 1.2)
+       (vertical-skylines . ,ly:slur::vertical-skylines)
        (Y-extent . ,ly:slur::height)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
@@ -1994,9 +1997,16 @@
        (stencil . ,ly:stem-tremolo::print)
        (style . ,ly:stem-tremolo::calc-style)
        (X-extent . ,ly:stem-tremolo::width)
+       (X-offset . ,(ly:make-simple-closure
+                     `(,+
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::centered-on-x-parent))
+                       ,(ly:make-simple-closure
+                         (list ly:self-alignment-interface::x-aligned-on-self)))))
        (Y-offset . ,ly:stem-tremolo::calc-y-offset)
        (meta . ((class . Item)
-                (interfaces . (stem-tremolo-interface))))))
+                (interfaces . (self-alignment-interface
+                                stem-tremolo-interface))))))
 
     (StringNumber
      . (
@@ -2391,6 +2401,7 @@
 
     (TupletBracket
      . (
+       (avoid-scripts . #t)
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
        (cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
        (direction  . ,ly:tuplet-bracket::calc-direction)
@@ -2640,6 +2651,7 @@
    ly:dots::print
    ly:clef::print
    ly:flag::print
+   ly:time-signature::print
    default-flag
    normal-flag
    mensural-flag