X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fseparation-item.cc;h=56ed817e170987566f4e31be1e70d22159260b86;hb=f530eeb5bbaf470235e17161a3a4605ecdcfb8dd;hp=838e6dc6f829be86461d217cdd6635aa52f85f29;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 838e6dc6f8..56ed817e17 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -80,7 +80,7 @@ Skyline Separation_item::conditional_skyline (Grob *me, Grob *left) { vector 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 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)); }