X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fseparating-group-spanner.cc;h=7de9341e397868b8f24c812910a37dfef0f60b12;hb=00e3e15364b9d3c94cda1bcab9f889bb95f6832d;hp=6b5e98dbc63c93b1960ea1501e29699f33970e82;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 6b5e98dbc6..7de9341e39 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -1,245 +1,101 @@ -/* - 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--2002 Han-Wen Nienhuys - - */ + + (c) 1998--2007 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" +#include "pointer-group-interface.hh" +#include "moment.hh" void -Separating_group_spanner::find_rods (Item * r, SCM next) +Separating_group_spanner::find_rods (Item *r, + vector const &separators, + vsize idx, + Real padding) { - Interval ri (Separation_item::my_width (r)); - if (ri.empty_b ()) - return; /* - This is an inner loop, however, in most cases, the interesting L - will just be the first entry of NEXT, making it linear in most of - the cases. */ - for(; gh_pair_p (next); next = ly_cdr (next)) + 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. + */ + for (; idx != VPOS; idx--) { - Item *l = dynamic_cast (unsmob_grob (ly_car( next))); + Item *l = dynamic_cast (separators[idx]); Item *lb = l->find_prebroken_piece (RIGHT); if (lb) { - Interval li (Separation_item::my_width (lb)); - - if (!li.empty_b ()) - { - Rod rod; - - rod.item_l_drul_[LEFT] = lb; - rod.item_l_drul_[RIGHT] = r; - - rod.distance_f_ = li[RIGHT] - ri[LEFT]; - - rod.columnize (); - rod.add_to_cols (); - } + Separation_item::set_distance (Drul_array (lb, r), padding); } - Interval li (Separation_item::my_width (l)); - if (!li.empty_b ()) - { - Rod rod; + if (Separation_item::set_distance (Drul_array (l, r), padding) + /* + This check is because grace notes are set very tight, and + the accidentals of main note may stick out so far to cover + a barline preceding the grace note. + */ + && spanned_time_interval (l, r).length ().main_part_ > Rational (0)) + break; - rod.item_l_drul_[LEFT] =l; - rod.item_l_drul_[RIGHT]=r; - - rod.distance_f_ = li[RIGHT] - ri[LEFT]; - - rod.columnize (); - rod.add_to_cols (); - - break; - } - else - /* - this grob doesn't cause a constraint. We look further until we - find one that does. */ - ; + /* + 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_and_seqs,1); -SCM -Separating_group_spanner::set_spacing_rods_and_seqs (SCM smob) -{ - set_spacing_rods (smob); - find_musical_sequences (unsmob_grob (smob)); - return SCM_UNSPECIFIED; -} - -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) { - Grob*me = unsmob_grob (smob); - - for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (ly_cdr (s)); s = ly_cdr (s)) - { - /* - Order of elements is reversed! - */ - SCM elt = ly_car (s); - Item *r = unsmob_item (elt); + Grob *me = unsmob_grob (smob); + + /* + Ugh: padding is added doubly, also for SeparationItem + */ + Real padding = robust_scm2double (me->get_property ("padding"), 0.1); + extract_grob_set (me, "elements", elts); + for (vsize i = elts.size (); i-- > 1;) + { + Item *r = dynamic_cast (elts[i]); if (!r) continue; + if (Separation_item::width (r).is_empty ()) + continue; + Item *rb - = dynamic_cast (r->find_prebroken_piece (LEFT)); - - find_rods (r, ly_cdr (s)); - if (rb) - find_rods (rb, ly_cdr (s)); - } - find_musical_sequences (me); + = dynamic_cast (r->find_prebroken_piece (LEFT)); -#if 0 - /* - TODO; restore this. - */ - /* - We've done our job, so we get lost. - */ - for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s)) - { - Item * it =dynamic_cast (unsmob_grob (ly_car (s))); - if (it && it->broken_b ()) - { - it->find_prebroken_piece (LEFT) ->suicide (); - it->find_prebroken_piece (RIGHT)->suicide (); - } - it->suicide (); + find_rods (r, elts, i - 1, padding); + if (rb) + find_rods (rb, elts, i - 1, padding); } - me->suicide (); -#endif - return SCM_UNSPECIFIED ; -} - -void -Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i) -{ - Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), i); - me->add_dependency (i); -} - -void -Separating_group_spanner::find_musical_sequences (Grob *me) -{ - Item *last = 0; - Item *llast = 0; - for (SCM s = me->get_grob_property ("elements"); - gh_pair_p (s); s = ly_cdr (s)) - { - Item *it = dynamic_cast (unsmob_grob (ly_car (s))); - if (last) - { - Item *lcol = last->column_l (); - Item *col = it->column_l (); - - int lrank = Paper_column::rank_i (lcol); - int rank = Paper_column ::rank_i (col); - - bool mus = Paper_column::musical_b (col); - bool lmus = Paper_column::musical_b (lcol); - - if ((lrank - rank == 2) && lmus && mus) - { - SCM seq = col->get_grob_property ("spacing-sequence"); - col->set_grob_property ("spacing-sequence", - gh_cons (gh_cons (it->self_scm (), last->self_scm ()), seq)); - } - - if (llast && !Paper_column::breakable_b (last)) - { - Item *llcol = llast->column_l (); - int llrank = Paper_column::rank_i (llcol); - bool llmus= Paper_column::musical_b (llcol); - if (llrank - lrank == 1 - && lrank - rank == 1 - && llmus && !lmus && mus) - { - /* - these columns are adjacent, so set spacing-sequence in - IT. - - Q Q+1 Q+2 (rank) - Note Clef Note - - IT LAST LLAST - - */ - SCM seq = col->get_grob_property ("spacing-sequence"); - col->set_grob_property ("spacing-sequence", - gh_cons (gh_cons (it->self_scm (), last->self_scm ()), seq)); - - /* - lcol can not be a loose column, so we make sure - that is and will not be marked as such. - */ - lcol->set_grob_property ("between-cols" , SCM_BOOL_F); - } - else if (!lmus) - { - SCM between = lcol->get_grob_property ("between-cols"); - - if (between == SCM_BOOL_F) - continue; - - if (!gh_pair_p (between)) - { - between = gh_cons (it->self_scm (), llast->self_scm ()); - lcol ->set_grob_property ("between-cols", between); - } - - Item * left - = dynamic_cast (unsmob_grob (ly_car (between))); - if(Paper_column::rank_i (left->column_l ()) < rank) - gh_set_car_x (between, col->self_scm()); - - Item * right - = dynamic_cast (unsmob_grob (ly_cdr (between))); - if (Paper_column::rank_i (right->column_l ()) > llrank ) - gh_set_cdr_x (between, llcol->self_scm ()); - } - } - } - - llast = last; - last = it; - } + return SCM_UNSPECIFIED; } -#if 0 void -Separating_group_spanner::set_loose_rods () +Separating_group_spanner::add_spacing_unit (Grob *me, Item *i) { - // loose columns should also generate minimum distances. - // TODO + Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("elements"), i); } -#endif - -void -Separating_group_spanner::set_interface (Grob*) -{ -} +ADD_INTERFACE (Separating_group_spanner, + "A spanner that calculates spacing constraints (\"rods\") " + "using the @code{separation-item-interface} grobs in @code{elements}.", -bool -Separating_group_spanner::has_interface (Grob*) -{//todo - assert (false); -} + /* properties */ + "elements " + "padding ");