X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=4a9eec3ea6291915d455a046a39792fccf69d0b0;hb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;hp=2e46c597719bff580a14187c317561cd7d4e4f1b;hpb=9079cd048c47b4119b6a19e19667e75e1f323269;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 2e46c59771..4a9eec3ea6 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2007 Han-Wen Nienhuys + (c) 1998--2008 Han-Wen Nienhuys */ #include "separation-item.hh" @@ -135,15 +135,18 @@ Separation_item::boxes (Grob *me, Grob *left) Interval y (il->pure_height (ycommon, 0, very_large)); Interval x (il->extent (pc, X_AXIS)); - Interval extra = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"), - Interval (-0.1, 0.1)); - x[LEFT] += extra[LEFT]; - x[RIGHT] += extra[RIGHT]; - if (to_boolean (elts[i]->get_property ("infinite-spacing-height"))) - y = Interval (-infinity_f, infinity_f); + 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)); + + 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)); + out.push_back (Box (x, y)); } return out;