X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=0e3a075100402c3fba1432e5a8097171b8c1eef0;hb=00e3e15364b9d3c94cda1bcab9f889bb95f6832d;hp=78126e69b25bc4238d22d68003904ac2bf0ba7bc;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 78126e69b2..0e3a075100 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,11 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Han-Wen Nienhuys + (c) 1998--2007 Han-Wen Nienhuys */ #include "separation-item.hh" +#include "skyline.hh" #include "paper-column.hh" #include "warn.hh" #include "pointer-group-interface.hh" @@ -26,79 +27,109 @@ Separation_item::add_conditional_item (Grob *me, Grob *e) Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e); } +void +Separation_item::set_skyline_distance (Drul_array items, + Real padding) +{ + Drul_array lines (Skyline_pair::unsmob (items[LEFT]->get_property ("skylines")), + Skyline_pair::unsmob (items[RIGHT]->get_property ("skylines"))); + Skyline right = conditional_skyline (items[RIGHT], items[LEFT]); + right.merge ((*lines[RIGHT])[LEFT]); + + Real dist = padding + (*lines[LEFT])[RIGHT].distance (right); + if (dist > 0) + { + Rod rod; + + rod.item_drul_ = items; + + rod.distance_ = dist; + rod.add_to_cols (); + } +} + +bool +Separation_item::set_distance (Drul_array items, + Real padding) +{ + set_skyline_distance (items, padding); + return true; +} + /* Return the width of ME given that we are considering the object on the LEFT. */ -Interval -Separation_item::conditional_width (Grob *me, Grob *left) +Skyline +Separation_item::conditional_skyline (Grob *me, Grob *left) { - Interval w = width (me); + vector bs = boxes (me, left); + return Skyline (bs, 0.1, Y_AXIS, LEFT); +} + + +MAKE_SCHEME_CALLBACK (Separation_item, calc_skylines,1); +SCM +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 (); +} +/* if left is non-NULL, get the boxes corresponding to the + conditional-elements (conditioned on the grob LEFT). This + sounds more general than it is: conditional-elements are + always accidentals attached to a tied note. +*/ +vector +Separation_item::boxes (Grob *me, Grob *left) +{ Item *item = dynamic_cast (me); - Paper_column *pc = item->get_column (); - extract_grob_set (me, "conditional-elements", elts); - for (int i = 0; i < elts.size (); i++) + int very_large = INT_MAX; + Paper_column *pc = item->get_column (); + vector out; + extract_grob_set (me, left ? "conditional-elements" : "elements", read_only_elts); + vector elts; + + if (left) + elts = Accidental_placement::get_break_reminder_accidentals (read_only_elts, left); + else + elts = read_only_elts; + + Grob *ycommon = common_refpoint_of_array (elts, me, Y_AXIS); + + for (vsize i = 0; i < elts.size (); i++) { Item *il = dynamic_cast (elts[i]); if (pc != il->get_column ()) { - /* this shouldn't happen, but let's continue anyway. */ - programming_error ("Separation_item: I've been drinking too much"); - continue; /*UGH UGH*/ + continue; } - if (to_boolean (il->get_property ("no-spacing-rods"))) - continue; - - if (Accidental_placement::has_interface (il)) - w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, 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, 0)); + x[LEFT] += extra[LEFT]; + x[RIGHT] += extra[RIGHT]; + if (to_boolean (elts[i]->get_property ("infinite-spacing-height"))) + y = Interval (-infinity_f, infinity_f); + + out.push_back (Box (x, y)); } - SCM pad = me->get_property ("padding"); - - w.widen (robust_scm2double (pad, 0.0)); - return w; + return out; } Interval Separation_item::width (Grob *me) { SCM sw = me->get_property ("X-extent"); - if (is_number_pair (sw)) - return ly_scm2interval (sw); - - Item *item = dynamic_cast (me); - Paper_column *pc = item->get_column (); - Interval w; - - extract_grob_set (me, "elements", elts); - for (int i = 0; i < elts.size (); i++) - { - Item *il = dynamic_cast (elts[i]); - if (pc != il->get_column ()) - { - /* this shouldn't happen, but let's continue anyway. */ - programming_error ("Separation_item: I've been drinking too much"); - continue; /*UGH UGH*/ - } - - if (to_boolean (il->get_property ("no-spacing-rods"))) - continue; - - Interval iv (il->extent (pc, X_AXIS)); - if (!iv.is_empty ()) - w.unite (iv); - } - - SCM pad = me->get_property ("padding"); - - w.widen (robust_scm2double (pad, 0.0)); - - me->set_property ("X-extent", ly_interval2scm (w)); - - return w; + return ly_scm2interval (sw); } Interval @@ -123,7 +154,7 @@ Separation_item::extremal_break_aligned_grob (Grob *me, Grob *last_grob = 0; extract_grob_set (me, "elements", elts); - for (int i = elts.size (); i--;) + for (vsize i = elts.size (); i--;) { Grob *break_item = elts[i]; if (!scm_is_symbol (break_item->get_property ("break-align-symbol"))) @@ -148,7 +179,13 @@ Separation_item::extremal_break_aligned_grob (Grob *me, return last_grob; } -ADD_INTERFACE (Separation_item, "separation-item-interface", +ADD_INTERFACE (Separation_item, "Item that computes widths to generate spacing rods. " - "This is done in concert with @ref{separation-spanner-interface}.", - "padding X-extent conditional-elements elements"); + "This is done in concert with @ref{separating-group-spanner-interface}.", + + "X-extent " + "conditional-elements " + "elements " + "padding " + "skylines " + );