X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=013e457034bea442ae397211d431178888f0357c;hb=94ecf2d9c75797163920353c5199d02c43e0a4e6;hp=2e46c597719bff580a14187c317561cd7d4e4f1b;hpb=bec6d0f547819d4003c5ce987f8fe589818e4712;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 2e46c59771..013e457034 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,9 +1,20 @@ /* - separation-item.cc -- implement Separation_item + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Han-Wen Nienhuys - (c) 1998--2007 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "separation-item.hh" @@ -69,7 +80,8 @@ Skyline Separation_item::conditional_skyline (Grob *me, Grob *left) { vector bs = boxes (me, left); - return Skyline (bs, 0.1, Y_AXIS, LEFT); + Real horizon_padding = robust_scm2double (me->get_property ("skyline-vertical-padding"), 0.0); + return Skyline (bs, horizon_padding, Y_AXIS, LEFT); } @@ -79,8 +91,8 @@ 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 (); + Real horizon_padding = robust_scm2double (me->get_property ("skyline-vertical-padding"), 0.0); + return Skyline_pair (bs, horizon_padding, Y_AXIS).smobbed_copy (); } /* if left is non-NULL, get the boxes corresponding to the @@ -135,15 +147,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.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)); + out.push_back (Box (x, y)); } return out; @@ -175,4 +190,5 @@ ADD_INTERFACE (Separation_item, "elements " "padding " "horizontal-skylines " + "skyline-vertical-padding " );