X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=4a9eec3ea6291915d455a046a39792fccf69d0b0;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=642f9583c04674ca4c6ee70dd807067d47a49d09;hpb=540185fa480d770b4092ae0534ab1516b28582ac;p=lilypond.git diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 642f9583c0..4a9eec3ea6 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,18 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2007 Han-Wen Nienhuys + (c) 1998--2008 Han-Wen Nienhuys */ #include "separation-item.hh" +#include "accidental-placement.hh" +#include "axis-group-interface.hh" #include "lookup.hh" -#include "stencil.hh" -#include "skyline.hh" +#include "note-column.hh" +#include "note-head.hh" #include "paper-column.hh" -#include "warn.hh" #include "pointer-group-interface.hh" -#include "accidental-placement.hh" +#include "skyline-pair.hh" +#include "stencil.hh" +#include "warn.hh" void Separation_item::add_item (Grob *s, Item *i) @@ -29,13 +32,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 ("horizontal-skylines")), - Skyline_pair::unsmob (items[RIGHT]->get_property ("horizontal-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); @@ -43,19 +45,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 ()); } /* @@ -99,7 +102,18 @@ Separation_item::boxes (Grob *me, Grob *left) if (left) elts = Accidental_placement::get_relevant_accidentals (read_only_elts, left); else - elts = read_only_elts; + { + 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); + } + } Grob *ycommon = common_refpoint_of_array (elts, me, Y_AXIS); @@ -107,81 +121,37 @@ Separation_item::boxes (Grob *me, Grob *left) { Item *il = dynamic_cast (elts[i]); if (pc != il->get_column ()) - { - continue; - } - - 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)); - } - - 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) -{ - 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"))) + /* 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 ext = break_item->extent (col, X_AXIS); + Interval y (il->pure_height (ycommon, 0, very_large)); + Interval x (il->extent (pc, X_AXIS)); - if (ext.is_empty ()) - continue; + 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)); - if (!last_grob - || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0)) - { - *last_ext = ext; - last_grob = break_item; - } + 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)); } - return last_grob; + return out; } -extern bool debug_skylines; MAKE_SCHEME_CALLBACK (Separation_item, print, 1) SCM Separation_item::print (SCM smob) @@ -200,9 +170,9 @@ Separation_item::print (SCM smob) } ADD_INTERFACE (Separation_item, - "Item that computes widths to generate spacing rods. " - , + "Item that computes widths to generate spacing rods.", + /* properties */ "X-extent " "conditional-elements " "elements "