source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
#include "collision.hh"
#include "note-column.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
#include "paper-def.hh"
+#include "axis-group-interface.hh"
+#include "item.hh"
-#include "tuple.hh"
-
-Collision::Collision()
+void
+Collision::add_column (Score_element*me,Score_element* ncol_l)
{
- set_axes (X_AXIS, Y_AXIS);
+ ncol_l->add_offset_callback (force_shift_callback, X_AXIS);
+ Axis_group_interface::add_element (me, ncol_l);
+ me->add_dependency (ncol_l);
}
-void
-Collision::add_column (Note_column* ncol_l)
+Real
+Collision::force_shift_callback (Score_element * c, Axis a)
{
- clash_l_arr_.push (ncol_l);
- add_element (ncol_l);
- add_dependency (ncol_l);
+ assert (a == X_AXIS);
+
+ Score_element * me = c->parent_l (a);
+ /*
+ ugh. the way DONE is done is not clean
+ */
+ if (!unsmob_element (me->get_elt_property ("done")))
+ {
+ me->set_elt_property ("done", me->self_scm_);
+ do_shifts (me);
+ }
+
+ return 0.0;
}
+/*
+ TODO: make callback of this.
+ */
void
-Collision::do_pre_processing()
+Collision::do_shifts(Score_element* me)
{
- Array<Shift_tup> autos (automatic_shift ());
- Array<Shift_tup> hand (forced_shift ());
- Link_array<Note_column> done;
+ SCM autos (automatic_shift (me));
+ SCM hand (forced_shift (me));
+
+ Link_array<Score_element> done;
- Real wid = paper_l ()->get_var ("collision_note_width");
- for (int i=0; i < hand.size (); i++)
+ Real wid = me->paper_l ()->get_var ("collision_note_width"); // elt prop
+ for (; gh_pair_p (hand); hand =gh_cdr (hand))
{
- hand[i].e1_->translate_axis (hand[i].e2_ *wid, X_AXIS);
- done.push (hand[i].e1_);
+ Score_element * s = unsmob_element (gh_caar (hand));
+ Real amount = gh_scm2double (gh_cdar (hand));
+
+ s->translate_axis (amount *wid, X_AXIS);
+ done.push (s);
}
-
- for (int i=0; i < autos.size (); i++)
+ for (; gh_pair_p (autos); autos =gh_cdr (autos))
{
- if (!done.find_l (autos[i].e1_))
- autos[i].e1_->translate_axis (autos[i].e2_ * wid, X_AXIS);
+ Score_element * s = unsmob_element (gh_caar (autos));
+ Real amount = gh_scm2double (gh_cdar (autos));
+
+ if (!done.find_l (s))
+ s->translate_axis (amount * wid, X_AXIS);
}
}
/** This complicated routine moves note columns around horizontally to
ensure that notes don't clash.
- This should be done better, probably.
-
- TODO: forced hshift
-
+ This should be put into Scheme.
*/
-Array< Shift_tup >
-Collision::automatic_shift ()
+SCM
+Collision::automatic_shift (Score_element *me)
{
- Drul_array<Link_array<Note_column> > clash_groups;
+ Drul_array<Link_array<Score_element> > clash_groups;
Drul_array<Array<int> > shifts;
- Array<Shift_tup> tups;
+ SCM tups = SCM_EOL;
-
- for (int i=0; i < clash_l_arr_.size(); i++)
+ SCM s = me->get_elt_property ("elements");
+ for (; gh_pair_p (s); s = gh_cdr (s))
{
- clash_groups[clash_l_arr_[i]->dir ()].push (clash_l_arr_[i]);
+ SCM car = gh_car (s);
+
+ Score_element * se = unsmob_element (car);
+ if (Note_column::has_interface (se))
+ clash_groups[Note_column::dir (se)].push (se);
}
do
{
Array<int> & shift (shifts[d]);
- Link_array<Note_column> & clashes (clash_groups[d]);
+ Link_array<Score_element> & clashes (clash_groups[d]);
clashes.sort (Note_column::shift_compare);
for (int i=0; i < clashes.size (); i++)
{
SCM sh
- = clashes[i]->remove_elt_property ("horizontal-shift");
+ = clashes[i]->get_elt_property ("horizontal-shift");
if (gh_number_p (sh))
shift.push (gh_scm2int (sh));
{
for (int i=0; i < clash_groups[d].size (); i++)
{
- Slice s(clash_groups[d][i]->head_positions_interval ());
+ Slice s(Note_column::head_positions_interval (clash_groups[d][i]));
s[LEFT] --;
s[RIGHT]++;
extents[d].push (s);
all of them again. */
if (extents[UP].size () && extents[DOWN].size ())
{
- Note_column *cu_l =clash_groups[UP][0];
- Note_column *cd_l =clash_groups[DOWN][0];
- Note_head * nu_l= cu_l->head_l_arr_[0];
- Note_head * nd_l = cd_l->head_l_arr_.top();
- int downpos = cd_l->head_positions_interval ()[BIGGER];
- int uppos = cu_l->head_positions_interval ()[SMALLER];
+ Score_element *cu_l =clash_groups[UP][0];
+ Score_element *cd_l =clash_groups[DOWN][0];
+
+
+ /*
+ TODO.
+ */
+ Score_element * nu_l= Note_column::first_head(cu_l);
+ Score_element * nd_l = Note_column::first_head(cd_l);
+
+ int downpos = Note_column::head_positions_interval (cd_l)[BIGGER];
+ int uppos = Note_column::head_positions_interval (cu_l)[SMALLER];
bool merge =
downpos == uppos
- && nu_l->balltype_i_ == nd_l->balltype_i_
- && nu_l->dots_i () == nd_l->dots_i ();
+ && Rhythmic_head::balltype_i (nu_l) == Rhythmic_head::balltype_i (nd_l);
+
+
+ if (!to_boolean (me->get_elt_property ("merge-differently-dotted")))
+ merge = merge && Rhythmic_head::dot_count (nu_l) == Rhythmic_head::dot_count (nd_l);
/*
notes are close, but can not be merged. Shift
while ((flip (&d))!= UP);
}
-
do
{
for (int i=0; i < clash_groups[d].size (); i++)
- tups.push (Shift_tup (clash_groups[d][i], offsets[d][i]));
+ tups = gh_cons (gh_cons (clash_groups[d][i]->self_scm_, gh_double2scm (offsets[d][i])),
+ tups);
}
while (flip (&d) != UP);
return tups;
}
-Array <Shift_tup>
-Collision::forced_shift ()
+SCM
+Collision::forced_shift (Score_element *me)
{
- Array<Shift_tup> tups;
+ SCM tups = SCM_EOL;
- for (int i=0; i < clash_l_arr_.size (); i++)
+ SCM s = me->get_elt_property ("elements");
+ for (; gh_pair_p (s); s = gh_cdr (s))
{
- SCM force = clash_l_arr_[i]->remove_elt_property ("force-hshift");
- if (force != SCM_UNDEFINED)
+ Score_element * se = unsmob_element (gh_car (s));
+
+ SCM force = se->remove_elt_property ("force-hshift");
+ if (gh_number_p (force))
{
- tups. push (Shift_tup (clash_l_arr_[i], gh_scm2double (force)));
+ tups = gh_cons (gh_cons (se->self_scm_, force),
+ tups);
}
}
return tups;
}
-void
-Collision::do_substitute_element_pointer (Score_element*o_l,Score_element*n_l)
-{
- if (o_l)
- {
- clash_l_arr_.substitute (dynamic_cast<Note_column *> (o_l),
- dynamic_cast <Note_column *> (n_l));
-
- }
-}
projects / lilypond.git / blobdiff