Fix 1120.

Don't add vertical padding to the skylines that are used for
horizontal spacing, since it can lead to unwanted horizontal space.

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 838e6dc6f829be86461d217cdd6635aa52f85f29..56ed817e170987566f4e31be1e70d22159260b86 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -80,7 +80,7 @@ Skyline
 Separation_item::conditional_skyline (Grob *me, Grob *left)
 {
   vector<Box> bs = boxes (me, left);
-  return Skyline (bs, 0.1, Y_AXIS, LEFT);
+  return Skyline (bs, 0.0, Y_AXIS, LEFT);
 }
 
 
@@ -91,7 +91,7 @@ Separation_item::calc_skylines (SCM smob)
   Item *me = unsmob_item (smob);
   vector<Box> bs = boxes (me, 0);
   /* todo: the horizon_padding is somewhat arbitrary */
-  return Skyline_pair (bs, 0.1, Y_AXIS).smobbed_copy ();
+  return Skyline_pair (bs, 0.0, Y_AXIS).smobbed_copy ();
 }
 
 /* if left is non-NULL, get the boxes corresponding to the
@@ -149,13 +149,13 @@ Separation_item::boxes (Grob *me, Grob *left)
       Interval extra_width = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"),
                                                  Interval (-0.1, 0.1));
       Interval extra_height = robust_scm2interval (elts[i]->get_property ("extra-spacing-height"),
-                                                  Interval (-0.1, 0.1));
+                                                  Interval (0.0, 0.0));
 
       x[LEFT] += extra_width[LEFT];
       x[RIGHT] += extra_width[RIGHT];
       y[DOWN] += extra_height[DOWN];
       y[UP] += extra_height[UP];
- 
+
       if (!x.is_empty () && !y.is_empty ())
        out.push_back (Box (x, y));
     }

diff --git a/ly/gregorian.ly b/ly/gregorian.ly
index 367dbbf16b62d8e323b3c50df749c95bf38e2a2d..8fbc6fdee850924ec9bf67fc70989aaa9454ae20 100644 (file)
--- a/ly/gregorian.ly
+++ b/ly/gregorian.ly
@@ -138,6 +138,7 @@ finalis = {
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
   \once \override BreathingSign  #'extra-X-extent = #'(-1.0 . 0)
+  \once \override BreathingSign  #'extra-spacing-height = #'(-0.5 . 0.5)
 
   \breathe
 }

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index aa761fce54ca5a3b51ea76ed390fbc0039f466b0..778c0cfdc12c3658925f0ae090b95901d385d5ba 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -501,6 +501,7 @@
                        (next-note . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))))
        (stencil . ,ly:clef::print)
+       (extra-spacing-height . (-0.5 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
                 (interfaces . (break-aligned-interface
@@ -581,6 +582,7 @@
        (dot-count . ,dots::calc-dot-count)
        (staff-position . ,dots::calc-staff-position)
        (stencil . ,ly:dots::print)
+       (extra-spacing-height . (-0.5 . 0.5))
        (meta . ((class . Item)
                 (interfaces . (dots-interface
                                font-interface
@@ -979,6 +981,7 @@
        (head-direction . ,LEFT)
        (stencil  . ,laissez-vibrer::print)
        (thickness . 1.0)
+       (extra-spacing-height . (-0.5 . 0.5))
        (meta . ((class . Item)
                 (interfaces . (semi-tie-interface))))))
 
@@ -1486,6 +1489,7 @@
        (head-direction . ,RIGHT)
        (stencil  . ,ly:tie::print)
        (thickness . 1.0)
+       (extra-spacing-height . (-0.5 . 0.5))
        (meta . ((class . Item)
                 (interfaces . (semi-tie-interface))))))
 
@@ -2357,6 +2361,7 @@
    ly:note-head::print
    ly:dots::print
    ly:clef::print
+   ly:percent-repeat-item-interface::beat-slash
    ly:text-interface::print
    ly:script-interface::print))