X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=20de8fbbd57b6816723815e66c71753dbddd78b0;hb=520362dfc7d3864a52caf50ce7d9068375e018e1;hp=1c46854c5ce0d12eea616f4286f82abc4f102ccb;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 1c46854c5c..20de8fbbd5 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,144 +1,268 @@ -/* - separation-item.cc -- implement Separation_item - +/* + separation-item.cc -- implement Separation_item + source file of the GNU LilyPond music typesetter - - (c) 1998--2003 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); } +void +Separation_item::set_skyline_distance (Drul_array items, + Real padding) +{ + Drul_array lines; + Direction d = LEFT; + + do + { + SCM prop = items[d]->get_property ("skylines"); + lines[d] = Skyline::unsmob (index_get_cell (prop, -d)); + } + while (flip (&d) != LEFT); + + Real dist = padding + lines[LEFT]->distance (*lines[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) +{ + if (!Item::is_non_musical (items[LEFT]) + && !Item::is_non_musical (items[RIGHT])) + { + set_skyline_distance (items, padding); + return true; + } + + Interval li (Separation_item::width (items[LEFT])); + Interval ri (Separation_item::conditional_width (items[RIGHT], items[LEFT])); + if (!li.is_empty () && !ri.is_empty ()) + { + Rod rod; + + rod.item_drul_ = items; + + rod.distance_ = li[RIGHT] - ri[LEFT] + padding; + + if (rod.distance_ > 0) + rod.add_to_cols (); + return true; + } + return false; +} + /* Return the width of ME given that we are considering the object on the LEFT. - */ +*/ Interval -Separation_item::conditional_width (Grob * me, Grob * left) +Separation_item::conditional_width (Grob *me, Grob *left) { Interval w = width (me); - - Item *item = dynamic_cast (me); - Paper_column * pc = item->get_column (); - - - for (SCM s = me->get_grob_property ("conditional-elements"); gh_pair_p (s); s = ly_cdr (s)) + + 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++) { - 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_grob_property ("no-spacing-rods"))) - { + programming_error ("Separation_item element from wrong column"); 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)); - } + w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left)); } - SCM pad = me->get_grob_property ("padding"); + SCM pad = me->get_property ("padding"); - if (gh_number_p (pad)) - { - w[RIGHT] += gh_scm2double (pad)/2; - w[LEFT] -= gh_scm2double (pad)/2; - } + w.widen (robust_scm2double (pad, 0.0)); return w; } -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_grob_property ("X-extent"); - if (ly_number_pair_p (sw)) + Item *me = unsmob_item (smob); + SCM lines = scm_cons (SCM_BOOL_F,SCM_BOOL_F); + + Direction d = LEFT; + vector bs = boxes (me); + do { - return ly_scm2interval (sw); + /* todo: the horizon_padding is somewhat arbitrary */ + Skyline l (bs, 0.1, Y_AXIS, d); + index_set_cell (lines, d, l.smobbed_copy ()); } + while (flip (&d) != LEFT); - Item *item = dynamic_cast (me); - Paper_column * pc = item->get_column (); - Interval w; + return lines; +} + + +vector +Separation_item::boxes (Grob *me) +{ + Item *item = dynamic_cast (me); + + int very_large = INT_MAX; + Paper_column *pc = item->get_column (); + vector out; + extract_grob_set (me, "elements", elts); + + Grob *ycommon = common_refpoint_of_array (elts, me, Y_AXIS); - for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s)) + for (vsize i = 0; i < elts.size (); i++) { - SCM elt = ly_car (s); - if (!unsmob_grob (elt)) + Item *il = dynamic_cast (elts[i]); + if (pc != il->get_column ()) + { + continue; + } + + if (to_boolean (il->get_property ("no-spacing-rods"))) continue; - Item *il = unsmob_item (elt); + Interval y (il->pure_height (ycommon, 0, very_large)); + Box b (il->extent (pc, X_AXIS), y); + + out.push_back (b); + } + + 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 (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*/ + programming_error ("Separation_item: I've been drinking too much"); + continue; /*UGH UGH*/ } - if (to_boolean (il->get_grob_property ("no-spacing-rods"))) - { - continue; - } + if (to_boolean (il->get_property ("no-spacing-rods"))) + continue; Interval iv (il->extent (pc, X_AXIS)); - if (!iv.empty_b ()) - { - w.unite (iv); - } + if (!iv.is_empty ()) + w.unite (iv); } - SCM pad = me->get_grob_property ("padding"); + SCM pad = me->get_property ("padding"); - if (gh_number_p (pad)) - { - w[RIGHT] += gh_scm2double (pad)/2; - w[LEFT] -= gh_scm2double (pad)/2; - } + w.widen (robust_scm2double (pad, 0.0)); + me->set_property ("X-extent", ly_interval2scm (w)); - me->set_grob_property ("X-extent", ly_interval2scm (w)); - - return w; - // add this->offset_ ? this-> relative_coordinate ()? } +Interval +Separation_item::relative_width (Grob *me, Grob *common) +{ + Interval iv = width (me); + + 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 *me, + Direction d, + Interval *last_ext) +{ + Grob *col = dynamic_cast (me)->get_column (); + last_ext->set_empty (); + Grob *last_grob = 0; + + extract_grob_set (me, "elements", elts); + for (vsize i = elts.size (); i--;) + { + 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_ext = ext; + last_grob = break_item; + } + } + return last_grob; +} -ADD_INTERFACE (Separation_item,"separation-item-interface", - "Item that computes widths to generate spacing rods. +ADD_INTERFACE (Separation_item, + "Item that computes widths to generate spacing rods. " + "This is done in concert with @ref{separating-group-spanner-interface}.", -Calc dimensions for the Separating_group_spanner; this has to be -an item to get dependencies correct. It can't be an grob_group -since these usually are in a different X_group -", - "X-extent conditional-elements elements"); + "X-extent " + "conditional-elements " + "elements " + "padding " + "skylines " + );