Revert "Apply scripts/auxiliar/fixscm.sh"

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d016c7a2e2a8416989546def3eaa9697793e2b28..4d015b76582ddbd80573962d5aa1d19672e3967e 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -188,10 +188,12 @@
      . (
        (annotation-balloon . #t)
        (annotation-line . #t)
+       (extra-spacing-width . (+inf.0 . -inf.0))
        (stencil . ,ly:balloon-interface::print)
        (text . ,(grob::calc-property-by-copy 'text))
        (X-offset . ,(grob::calc-property-by-copy 'X-offset))
        (Y-offset . ,(grob::calc-property-by-copy 'Y-offset))
+       (Y-extent . ,grob::always-Y-extent-from-stencil)
        (meta . ((class . Item)
                 (interfaces . (balloon-interface
                                font-interface
@@ -409,6 +411,8 @@
        (positions . ,beam::place-broken-parts-individually)
        (springs-and-rods . ,ly:beam::calc-springs-and-rods)
        (X-positions . ,ly:beam::calc-x-positions)
+        (transparent . ,(grob::inherit-parent-property
+                         X 'transparent))
 
        ;; this is a hack to set stem lengths, if positions is set.
        (quantized-positions . ,ly:beam::set-stem-lengths)
@@ -573,6 +577,10 @@
                               X 'break-visibility))
        (font-shape . italic)
        (font-size . -4)
+        (transparent . ,(grob::inherit-parent-property
+                         X 'transparent))
+        (color . ,(grob::inherit-parent-property
+                   X 'color))
        (self-alignment-X . ,CENTER)
        (staff-padding . 0.2)
        (stencil . ,ly:text-interface::print)
@@ -1448,11 +1456,10 @@
        (break-visibility . ,end-of-line-invisible)
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
-       (outside-staff-horizontal-padding . 0.12)
+       (outside-staff-horizontal-padding . 0.2)
        (outside-staff-priority . 1000)
        (padding . 0.8)
        (side-axis . ,Y)
-       (skyline-horizontal-padding . 0.2)
        (stencil . ,ly:text-interface::print)
        (vertical-skylines . ,grob::always-vertical-skylines-from-stencil)
        (Y-offset . ,side-position-interface::y-aligned-side)