X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=f8d1cb739ffc59c20a5da2c7f85cb4136bf2b6cd;hb=5bd2d1080a904b9171ccf67520f5a172a8c3014b;hp=0a6c085afcf41a7f1f433f9f4b1a2cf319c0792a;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 0a6c085afc..f8d1cb739f 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,11 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2006 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" @@ -27,13 +31,12 @@ 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) +Real +Separation_item::set_distance (Item *l, Item *r, Real padding) { - 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]); + 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); @@ -41,19 +44,20 @@ Separation_item::set_skyline_distance (Drul_array items, { Rod rod; - rod.item_drul_ = items; + rod.item_drul_ = Drul_array (l, r); rod.distance_ = dist; rod.add_to_cols (); - } + } + + return max (dist, 0.0); } bool -Separation_item::set_distance (Drul_array items, - Real padding) +Separation_item::is_empty (Grob *me) { - set_skyline_distance (items, padding); - return true; + Skyline_pair *sky = Skyline_pair::unsmob (me->get_property ("horizontal-skylines")); + return (!sky || sky->is_empty ()); } /* @@ -68,7 +72,7 @@ Separation_item::conditional_skyline (Grob *me, Grob *left) } -MAKE_SCHEME_CALLBACK(Separation_item,calc_skylines,1); +MAKE_SCHEME_CALLBACK (Separation_item, calc_skylines,1); SCM Separation_item::calc_skylines (SCM smob) { @@ -95,7 +99,7 @@ Separation_item::boxes (Grob *me, Grob *left) vector elts; if (left) - elts = Accidental_placement::get_break_reminder_accidentals (read_only_elts, left); + elts = Accidental_placement::get_relevant_accidentals (read_only_elts, left); else elts = read_only_elts; @@ -105,86 +109,59 @@ Separation_item::boxes (Grob *me, Grob *left) { Item *il = dynamic_cast (elts[i]); if (pc != il->get_column ()) - { - continue; - } + continue; - if (to_boolean (il->get_property ("no-spacing-rods"))) + /* 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)); - SCM padding = elts[i]->get_property ("padding"); - x.widen (robust_scm2double (padding, 0)); + 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 out; } -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) -{ - 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) +extern bool debug_skylines; +MAKE_SCHEME_CALLBACK (Separation_item, print, 1) +SCM +Separation_item::print (SCM smob) { - Grob *col = dynamic_cast (me)->get_column (); - last_ext->set_empty (); - Grob *last_grob = 0; + if (!debug_skylines) + return SCM_BOOL_F; - extract_grob_set (me, "elements", elts); - for (vsize i = elts.size (); i--;) + Grob *me = unsmob_grob (smob); + Stencil ret; + if (Skyline_pair *s = Skyline_pair::unsmob (me->get_property ("horizontal-skylines"))) { - 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; - } + 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, "Item that computes widths to generate spacing rods. " - "This is done in concert with @ref{separating-group-spanner-interface}.", + , "X-extent " "conditional-elements " "elements " "padding " - "skylines " + "horizontal-skylines " );