source file of the GNU LilyPond music typesetter
- (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
void
Separating_group_spanner::find_rods (Item * r, SCM next)
{
- 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. */
+ 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).empty_b ())
+ return;
+
for(; gh_pair_p (next); next = ly_cdr (next))
{
Item *l = dynamic_cast<Item*> (unsmob_grob (ly_car( next)));
if (lb)
{
- Interval li (Separation_item::my_width (lb));
-
- if (!li.empty_b ())
+ Interval li (Separation_item::width (lb));
+ Interval ri (Separation_item::conditional_width (r, lb));
+ if (!li.empty_b () && !ri.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.distance_ = li[RIGHT] - ri[LEFT];
rod.add_to_cols ();
}
}
- Interval li (Separation_item::my_width (l));
- if (!li.empty_b ())
+ Interval li (Separation_item::width (l));
+ Interval ri (Separation_item::conditional_width (r, l));
+ if (!li.empty_b () && !ri.empty_b())
{
Rod rod;
rod.item_l_drul_[LEFT] =l;
rod.item_l_drul_[RIGHT]=r;
- rod.distance_f_ = li[RIGHT] - ri[LEFT];
+ rod.distance_ = 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.
+ */
+
}
}
Separating_group_spanner::set_spacing_rods_and_seqs (SCM smob)
{
set_spacing_rods (smob);
- find_musical_sequences (unsmob_grob (smob));
+
return SCM_UNSPECIFIED;
}
if (rb)
find_rods (rb, ly_cdr (s));
}
- find_musical_sequences (me);
-#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<Item*> (unsmob_grob (ly_car (s)));
- if (it && it->broken_b ())
- {
- it->find_prebroken_piece (LEFT) ->suicide ();
- it->find_prebroken_piece (RIGHT)->suicide ();
- }
- it->suicide ();
- }
- me->suicide ();
-#endif
return SCM_UNSPECIFIED ;
}
}
-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<Item*> (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<Item*> (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<Item*> (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;
- }
-}
-
-#if 0
-void
-Separating_group_spanner::set_loose_rods ()
-{
- // loose columns should also generate minimum distances.
- // TODO
-}
-#endif
-
-
-void
-Separating_group_spanner::set_interface (Grob*)
-{
-}
-
-bool
-Separating_group_spanner::has_interface (Grob*)
-{//todo
- assert (false);
-}
+ADD_INTERFACE (Separating_group_spanner,"separation-spanner-interface",
+ "Spanner that containing @code{separation-item-interface} grobs to calculate rods",
+ "");