X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=1a02e6a5ea1958da6a7bb55985ac56a97a41f74b;hb=0fcd8c283c45644a92d2308f1cd0d82a1e63380b;hp=644366f5a9917a01065329a68bc7834f0295bbd4;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 644366f5a9..1a02e6a5ea 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -1,110 +1,117 @@ -/* - separating-group-spanner.cc -- implement Separating_group_spanner - +/* + separating-group-spanner.cc -- implement Separating_group_spanner + source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ + + (c) 1998--2005 Han-Wen Nienhuys +*/ #include "separating-group-spanner.hh" + #include "separation-item.hh" #include "paper-column.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "dimensions.hh" #include "group-interface.hh" -static void -do_rod (Item *l, Item *r) +void +Separating_group_spanner::find_rods (Item *r, SCM next, Real padding) { - Rod rod; - Interval li (Separation_item::my_width (l)); - Interval ri (Separation_item::my_width (r)); + /* + This is an inner loop: look for the first normal (unbroken) Left + grob. This looks like an inner loop (ie. quadratic total), but in + most cases, the interesting L will just be the first entry of + NEXT, making it linear in most of the cases. + */ + if (Separation_item::width (r).is_empty ()) + return; + + for (; scm_is_pair (next); next = scm_cdr (next)) + { + Item *l = dynamic_cast (unsmob_grob (scm_car (next))); + Item *lb = l->find_prebroken_piece (RIGHT); + + if (lb) + { + Interval li (Separation_item::width (lb)); + Interval ri (Separation_item::conditional_width (r, lb)); + if (!li.is_empty () && !ri.is_empty ()) + { + Rod rod; + + rod.item_drul_[LEFT] = lb; + rod.item_drul_[RIGHT] = r; - rod.item_l_drul_[LEFT] =l; - rod.item_l_drul_[RIGHT]=r; + rod.distance_ = li[RIGHT] - ri[LEFT] + padding; + rod.add_to_cols (); + } + } + + Interval li (Separation_item::width (l)); + Interval ri (Separation_item::conditional_width (r, l)); + if (!li.is_empty () && !ri.is_empty ()) + { + Rod rod; - if (li.empty_b () || ri.empty_b ()) - rod.distance_f_ = 0; - else - rod.distance_f_ = li[RIGHT] - ri[LEFT]; + rod.item_drul_[LEFT] = l; + rod.item_drul_[RIGHT] = r; + + rod.distance_ = li[RIGHT] - ri[LEFT] + padding; + + if (rod.distance_ > 0.0) + rod.add_to_cols (); + break; + } - rod.columnize (); - rod.add_to_cols (); + /* + this grob doesn't cause a constraint. We look further until we + find one that does. + */ + } } - -MAKE_SCHEME_CALLBACK(Separating_group_spanner,set_spacing_rods,1); + +MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1); SCM Separating_group_spanner::set_spacing_rods (SCM smob) { - Score_element*me = unsmob_element (smob); - - for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s)) + Grob *me = unsmob_grob (smob); + + /* + Ugh: padding is added doubly, also for SeparationItem + */ + Real padding = robust_scm2double (me->get_property ("padding"), 0.1); + + for (SCM s = me->get_property ("elements"); scm_is_pair (s) && scm_is_pair (scm_cdr (s)); s = scm_cdr (s)) { /* Order of elements is reversed! - */ - SCM elt = gh_cadr (s); - SCM next_elt = gh_car (s); - - Item *l = dynamic_cast (unsmob_element (elt)); - Item *r = dynamic_cast (unsmob_element ( next_elt)); + */ + SCM elt = scm_car (s); + Item *r = unsmob_item (elt); - if (!r || !l) + if (!r) continue; - - Item *lb - = dynamic_cast(l->find_prebroken_piece (RIGHT)); Item *rb - = dynamic_cast(r->find_prebroken_piece (LEFT)); - - do_rod(l, r); - if (lb) - { - do_rod (lb, r); - } - - if (rb) - { - do_rod (l, rb); - } - - if (lb && rb) - { - do_rod (lb, rb); + = dynamic_cast (r->find_prebroken_piece (LEFT)); - } + find_rods (r, scm_cdr (s), padding); + if (rb) + find_rods (rb, scm_cdr (s), padding); } - /* - We've done our job, so we get lost. - */ - for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s)) - { - Item * it =dynamic_cast(unsmob_element (gh_car (s))); - if (it && it->broken_b ()) - { - it->find_prebroken_piece (LEFT) ->suicide (); - it->find_prebroken_piece (RIGHT)->suicide (); - } - it->suicide (); - } - me->suicide (); - return SCM_UNSPECIFIED ; + return SCM_UNSPECIFIED; } void -Separating_group_spanner::add_spacing_unit (Score_element* me ,Item*i) +Separating_group_spanner::add_spacing_unit (Grob *me, Item *i) { - Pointer_group_interface (me, "elements").add_element (i); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), i); me->add_dependency (i); } - -void -Separating_group_spanner::set_interface (Score_element*me) -{ - -} +ADD_INTERFACE (Separating_group_spanner, "separation-spanner-interface", + "A spanner that calculates spacing constraints (\"rods\") " + "using the @code{separation-item-interface} grobs in @code{elements}.", + "elements padding");