X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=f8d1cb739ffc59c20a5da2c7f85cb4136bf2b6cd;hb=5003ea937ca2d718fbbfb8479457d6b68f10f122;hp=381647b94554ea6ddb3e073536b7a8d607dac6a4;hpb=2729f45d9ba3a256637d2a3487c90b83150a12e0;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 381647b945..f8d1cb739f 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,14 +3,19 @@ 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 "axis-group-interface.hh" +#include "lookup.hh" +#include "note-head.hh" +#include "stencil.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 @@ -18,7 +23,6 @@ Separation_item::add_item (Grob *s, Item *i) { assert (i); Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"), i); - s->add_dependency (i); } void @@ -27,140 +31,137 @@ 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) +Real +Separation_item::set_distance (Item *l, Item *r, Real padding) { - Interval w = width (me); - - Item *item = dynamic_cast (me); - Paper_column *pc = item->get_column (); - - for (SCM s = me->get_property ("conditional-elements"); scm_is_pair (s); s = scm_cdr (s)) + Drul_array lines (Skyline_pair::unsmob (l->get_property ("horizontal-skylines")), + Skyline_pair::unsmob (r->get_property ("horizontal-skylines"))); + Skyline right = conditional_skyline (r, l); + right.merge ((*lines[RIGHT])[LEFT]); + + Real dist = padding + (*lines[LEFT])[RIGHT].distance (right); + if (dist > 0) { - SCM elt = scm_car (s); - if (!unsmob_grob (elt)) - continue; + Rod rod; - 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*/ - } - - 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)); - } + rod.item_drul_ = Drul_array (l, r); + + rod.distance_ = dist; + rod.add_to_cols (); } - SCM pad = me->get_property ("padding"); + return max (dist, 0.0); +} - w.widen (robust_scm2double (pad, 0.0)); - return w; +bool +Separation_item::is_empty (Grob *me) +{ + Skyline_pair *sky = Skyline_pair::unsmob (me->get_property ("horizontal-skylines")); + return (!sky || sky->is_empty ()); } -Interval -Separation_item::width (Grob *me) +/* + Return the width of ME given that we are considering the object on + the LEFT. +*/ +Skyline +Separation_item::conditional_skyline (Grob *me, Grob *left) { - SCM sw = me->get_property ("X-extent"); - if (is_number_pair (sw)) - { - return ly_scm2interval (sw); - } + 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 (); - Interval w; - for (SCM s = me->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s)) + 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_relevant_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++) { - SCM elt = scm_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); - } - } - - SCM pad = me->get_property ("padding"); + continue; - w.widen (robust_scm2double (pad, 0.0)); + /* ugh. We want to exclude groups of grobs (so that we insert each grob + individually into the skyline instead of adding a single box that + bounds all of them). However, we can't exclude an axis-group that + adds to its childrens' stencil. Currently, this is just TrillPitchGroup; + hence the check for note-head-interface. */ + if (Axis_group_interface::has_interface (il) + && !Note_head::has_interface (il)) + continue; - me->set_property ("X-extent", ly_interval2scm (w)); + 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); + + if (!x.is_empty () && !y.is_empty ()) + out.push_back (Box (x, y)); + } - return w; + return out; } -Interval -Separation_item::relative_width (Grob *me, Grob *common) +extern bool debug_skylines; +MAKE_SCHEME_CALLBACK (Separation_item, print, 1) +SCM +Separation_item::print (SCM smob) { - Interval iv = width (me); + if (!debug_skylines) + return SCM_BOOL_F; - 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 *col = dynamic_cast (separation_item)->get_column (); - last_ext->set_empty (); - Grob *last_grob = 0; - for (SCM s = separation_item->get_property ("elements"); - scm_is_pair (s); s = scm_cdr (s)) + Grob *me = unsmob_grob (smob); + Stencil ret; + if (Skyline_pair *s = Skyline_pair::unsmob (me->get_property ("horizontal-skylines"))) { - Grob *break_item = unsmob_grob (scm_car (s)); - - if (!scm_is_symbol (break_item->get_property ("break-align-symbol"))) - 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_ext = ext; - last_grob = break_item; - } + ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[LEFT].to_points (Y_AXIS)).in_color (255, 255, 0)); + ret.add_stencil (Lookup::points_to_line_stencil (0.1, (*s)[RIGHT].to_points (Y_AXIS)).in_color (0, 255, 255)); } - - return last_grob; + return ret.smobbed_copy (); } -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"); + , + + "X-extent " + "conditional-elements " + "elements " + "padding " + "horizontal-skylines " + );