X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=0a6c085afcf41a7f1f433f9f4b1a2cf319c0792a;hb=e239130aac777f163b436dd0fe5715417f964734;hp=cd73e38a9d57b63e97c47961c0c1135b889d0a0e;hpb=95e2d8f397c7552dd6fa6ef5b498af7d8aee4cee;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index cd73e38a9d..0a6c085afc 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -28,59 +28,43 @@ Separation_item::add_conditional_item (Grob *me, Grob *e) } void -Separation_item::set_distance (Item *l, Item *r, - Real padding) +Separation_item::set_skyline_distance (Drul_array items, + Real padding) { - Interval li (Separation_item::width (l)); - Interval ri (Separation_item::conditional_width (r, l)); - if (!li.is_empty () && !ri.is_empty ()) + 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_[LEFT] = l; - rod.item_drul_[RIGHT] = r; + rod.item_drul_ = items; - rod.distance_ = li[RIGHT] - ri[LEFT] + padding; + rod.distance_ = dist; + rod.add_to_cols (); + } +} - if (rod.distance_ > 0) - 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); - - Item *item = dynamic_cast (me); - Paper_column *pc = item->get_column (); - - extract_grob_set (me, "conditional-elements", elts); - 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*/ - } - - 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)); - } - - SCM pad = me->get_property ("padding"); - - w.widen (robust_scm2double (pad, 0.0)); - return w; + vector bs = boxes (me, left); + return Skyline (bs, 0.1, Y_AXIS, LEFT); } @@ -89,29 +73,31 @@ SCM Separation_item::calc_skylines (SCM smob) { Item *me = unsmob_item (smob); - SCM lines = scm_cons (SCM_BOOL_F,SCM_BOOL_F); - - Direction d = LEFT; - do - { - Skyline l (boxes (me), X_AXIS, d); - index_set_cell (lines, d, ly_offsets2scm (l.to_points ())); - } - while (flip (&d) != LEFT); - - return lines; + 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) +Separation_item::boxes (Grob *me, Grob *left) { Item *item = dynamic_cast (me); int very_large = INT_MAX; Paper_column *pc = item->get_column (); vector out; - extract_grob_set (me, "elements", elts); + 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); @@ -126,10 +112,13 @@ Separation_item::boxes (Grob *me) if (to_boolean (il->get_property ("no-spacing-rods"))) continue; - Box b (il->extent (pc, X_AXIS), - il->pure_height (ycommon, 0, very_large)); + Interval y (il->pure_height (ycommon, 0, very_large)); + Interval x (il->extent (pc, X_AXIS)); - out.push_back (b); + SCM padding = elts[i]->get_property ("padding"); + x.widen (robust_scm2double (padding, 0)); + + out.push_back (Box (x, y)); } return out; @@ -139,39 +128,7 @@ 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 (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*/ - } - - 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 @@ -223,10 +180,11 @@ Separation_item::extremal_break_aligned_grob (Grob *me, ADD_INTERFACE (Separation_item, "Item that computes widths to generate spacing rods. " - "This is done in concert with @ref{separation-spanner-interface}.", + "This is done in concert with @ref{separating-group-spanner-interface}.", "X-extent " "conditional-elements " - "elements" + "elements " "padding " + "skylines " );