X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=617c6fd4ebc9e25b641a2a83332f960e79d1427f;hb=76324bbc6789847e80b4bbdd4e8246d6e4eae8d1;hp=f318a62f7e105e95668340177f3a89c4f1adc10c;hpb=46c1dd95d637b86046407b1364794511dd9516c1;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index f318a62f7e..617c6fd4eb 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -1,144 +1,181 @@ -/* - separation-item.cc -- implement Separation_item - +/* + separation-item.cc -- implement Separation_item + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ + + (c) 1998--2007 Han-Wen Nienhuys +*/ #include "separation-item.hh" + +#include "accidental-placement.hh" +#include "axis-group-interface.hh" +#include "lookup.hh" +#include "note-column.hh" +#include "note-head.hh" #include "paper-column.hh" +#include "pointer-group-interface.hh" +#include "skyline-pair.hh" +#include "stencil.hh" #include "warn.hh" -#include "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) +Real +Separation_item::set_distance (Item *l, Item *r, Real padding) { - Interval w = width (me); + 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]); - Item *item = dynamic_cast (me); - Paper_column * pc = item->column_l (); - - - for (SCM s = me->get_grob_property ("conditional-elements"); gh_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->column_l ()) - { - /* 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"))) - { - continue; - } - - if (Accidental_placement::has_interface (il)) - { - w.unite (Accidental_placement::get_relevant_accidental_extent (il, pc, left)); - } - } + Rod rod; - SCM pad = me->get_grob_property ("padding"); + rod.item_drul_ = Drul_array (l, r); - if (gh_number_p (pad)) - { - w[RIGHT] += gh_scm2double (pad)/2; - w[LEFT] -= gh_scm2double (pad)/2; + rod.distance_ = dist; + rod.add_to_cols (); } - return w; + + return max (dist, 0.0); +} + +bool +Separation_item::is_empty (Grob *me) +{ + Skyline_pair *sky = Skyline_pair::unsmob (me->get_property ("horizontal-skylines")); + return (!sky || sky->is_empty ()); +} + +/* + 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); +} + + +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 (); } -Interval -Separation_item::width (Grob *me) +/* 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) { - SCM sw = me->get_grob_property ("extent-X"); - if (ly_number_pair_p (sw)) + 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; + + if (left) + elts = Accidental_placement::get_relevant_accidentals (read_only_elts, left); + else { - return ly_scm2interval (sw); + elts = read_only_elts; + + /* This is a special-case for NoteColumn: we want to include arpeggio in its + skyline (so spacing takes it into account) but we don't want to include it + in the NoteColumn's extent because some spanners (eg. Hairpin) bound themselves + on the NoteColumn and we don't want them to include arpeggios in their bounds. + */ + if (Grob *a = Note_column::arpeggio (me)) { + elts.push_back (a); + } } - Item *item = dynamic_cast (me); - Paper_column * pc = item->column_l (); - Interval w; + 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; - Item *il = unsmob_item (elt); - if (pc != il->column_l ()) - { - /* 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"))) - { - continue; - } - - Interval iv (il->extent (pc, X_AXIS)); - if (!iv.empty_b ()) - { - w.unite (iv); - } - } - - SCM pad = me->get_grob_property ("padding"); - - if (gh_number_p (pad)) - { - w[RIGHT] += gh_scm2double (pad)/2; - w[LEFT] -= gh_scm2double (pad)/2; - } + /* 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; + Interval y (il->pure_height (ycommon, 0, very_large)); + Interval x (il->extent (pc, X_AXIS)); + + Interval extra_width = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"), + Interval (-0.1, 0.1)); + Interval extra_height = robust_scm2interval (elts[i]->get_property ("extra-spacing-height"), + Interval (-0.1, 0.1)); + + x[LEFT] += extra_width[LEFT]; + x[RIGHT] += extra_width[RIGHT]; + y[DOWN] += extra_height[DOWN]; + y[UP] += extra_height[UP]; + + if (!x.is_empty () && !y.is_empty ()) + out.push_back (Box (x, y)); + } - me->set_grob_property ("extent-X", ly_interval2scm (w)); - - - return w; - // add this->offset_ ? this-> relative_coordinate ()? + return out; } +MAKE_SCHEME_CALLBACK (Separation_item, print, 1) +SCM +Separation_item::print (SCM smob) +{ + if (!debug_skylines) + return SCM_BOOL_F; + Grob *me = unsmob_grob (smob); + Stencil ret; + if (Skyline_pair *s = Skyline_pair::unsmob (me->get_property ("horizontal-skylines"))) + { + 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 ret.smobbed_copy (); +} +ADD_INTERFACE (Separation_item, + "Item that computes widths to generate spacing rods.", - -ADD_INTERFACE (Separation_item,"separation-item-interface", - "Item that computes widths to generate spacing rods. - -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 -", - "extent-X conditional-elements elements"); + /* properties */ + "X-extent " + "conditional-elements " + "elements " + "padding " + "horizontal-skylines " + );