X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=0867007375deff202948ba4c7c88a6eb663df03b;hb=33fbdf85712cd828a6bdaef005969128fd24858d;hp=ab879f067ef70e76f3b2fd14fb6b4344fcf8ca2c;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index ab879f067e..0867007375 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,175 +1,191 @@ -/* - separation-item.cc -- implement Separation_item - +/* + separation-item.cc -- implement Separation_item + source file of the GNU LilyPond music typesetter - - (c) 1998--2004 Han-Wen Nienhuys - - */ + + (c) 1998--2006 Han-Wen Nienhuys +*/ #include "separation-item.hh" + +#include "skyline.hh" #include "paper-column.hh" #include "warn.hh" -#include "group-interface.hh" +#include "pointer-group-interface.hh" #include "accidental-placement.hh" void -Separation_item::add_item (Grob*s,Item* i) +Separation_item::add_item (Grob *s, Item *i) { assert (i); - Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"),i); - s->add_dependency (i); + Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"), i); } void -Separation_item::add_conditional_item (Grob* me , Grob *e) +Separation_item::add_conditional_item (Grob *me, Grob *e) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e); } -/* - Return the width of ME given that we are considering the object on - the LEFT. - */ -Interval -Separation_item::conditional_width (Grob * me, Grob * left) +void +Separation_item::set_skyline_distance (Drul_array items, + Real padding) { - Interval w = width (me); - - Item *item = dynamic_cast (me); - Paper_column * pc = item->get_column (); + 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]); - - for (SCM s = me->get_property ("conditional-elements"); ly_pair_p (s); s = ly_cdr (s)) + Real dist = padding + (*lines[LEFT])[RIGHT].distance (right); + if (dist > 0) { - SCM elt = ly_car (s); - if (!unsmob_grob (elt)) - continue; - - Item *il = unsmob_item (elt); - 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*/ - } + Rod rod; - if (to_boolean (il->get_property ("no-spacing-rods"))) - { - continue; - } + rod.item_drul_ = items; - if (Accidental_placement::has_interface (il)) - { - w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left)); - } - } + rod.distance_ = dist; + rod.add_to_cols (); + } +} - SCM pad = me->get_property ("padding"); +bool +Separation_item::set_distance (Drul_array items, + Real padding) +{ + set_skyline_distance (items, padding); + return true; +} - w.widen (robust_scm2double (pad, 0.0)); - return w; +/* + Return the width of ME given that we are considering the object on + the LEFT. +*/ +Skyline +Separation_item::conditional_skyline (Grob *me, Grob *left) +{ + vector bs = boxes (me, left); + return Skyline (bs, 0.1, Y_AXIS, LEFT); } -Interval -Separation_item::width (Grob *me) + +MAKE_SCHEME_CALLBACK(Separation_item,calc_skylines,1); +SCM +Separation_item::calc_skylines (SCM smob) { - SCM sw = me->get_property ("X-extent"); - if (is_number_pair (sw)) - { - return ly_scm2interval (sw); - } + 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); + + 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; - Item *item = dynamic_cast (me); - Paper_column * pc = item->get_column (); - Interval w; + 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 (SCM s = me->get_property ("elements"); ly_pair_p (s); s = ly_cdr (s)) + for (vsize i = 0; i < elts.size (); i++) { - SCM elt = ly_car (s); - if (!unsmob_grob (elt)) - continue; - - Item *il = unsmob_item (elt); + 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); - } + 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 out; +} - me->set_property ("X-extent", ly_interval2scm (w)); - - return w; +Interval +Separation_item::width (Grob *me) +{ + SCM sw = me->get_property ("X-extent"); + return ly_scm2interval (sw); } Interval -Separation_item::relative_width (Grob * me, Grob * common) +Separation_item::relative_width (Grob *me, Grob *common) { Interval iv = width (me); - return dynamic_cast(me)->get_column ()->relative_coordinate (common, X_AXIS) + iv ; + return dynamic_cast (me)->get_column ()->relative_coordinate (common, X_AXIS) + iv; } - /* Try to find the break-aligned symbol in SEPARATION_ITEM that is sticking out at direction D. The x size is put in LAST_EXT */ -Grob* -Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d, - Interval * last_ext) +Grob * +Separation_item::extremal_break_aligned_grob (Grob *me, + Direction d, + Interval *last_ext) { - Grob *col = dynamic_cast (separation_item)->get_column (); + Grob *col = dynamic_cast (me)->get_column (); last_ext->set_empty (); Grob *last_grob = 0; - for (SCM s = separation_item->get_property ("elements"); - ly_pair_p (s); s = ly_cdr (s)) + + extract_grob_set (me, "elements", elts); + for (vsize i = elts.size (); i--;) { - Grob * break_item = unsmob_grob (ly_car (s)); - - if (!ly_symbol_p (break_item->get_property ("break-align-symbol"))) + Grob *break_item = elts[i]; + if (!scm_is_symbol (break_item->get_property ("break-align-symbol"))) + continue; + + if (!scm_is_pair (break_item->get_property ("space-alist"))) continue; Interval ext = break_item->extent (col, X_AXIS); if (ext.is_empty ()) continue; + if (!last_grob - || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0) ) + || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0)) { *last_ext = ext; - last_grob = break_item; + last_grob = break_item; } } - return last_grob; + 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 " + );