source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "beam.hh"
-#include "debug.hh"
+
+#include <math.h> // ceil.
+
+#include "warn.hh"
#include "rest-collision.hh"
#include "note-column.hh"
#include "stem.hh"
-#include "note-head.hh"
-#include "collision.hh"
+#include "rhythmic-head.hh"
#include "paper-def.hh"
#include "rest.hh"
+#include "group-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "duration.hh"
+#include "directional-element-interface.hh"
+
+MAKE_SCHEME_CALLBACK (Rest_collision,force_shift_callback,2);
+SCM
+Rest_collision::force_shift_callback (SCM element_smob, SCM axis)
+{
+ Grob *them = unsmob_grob (element_smob);
+ Axis a = (Axis) gh_scm2int (axis);
+ assert (a == Y_AXIS);
+
+ Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision"));
+
+ if (rc && !to_boolean (rc->get_grob_property ("positioning-done")))
+ {
+ rc->set_grob_property ("positioning-done", SCM_BOOL_T);
+
+ do_shift (rc);
+ }
+
+ return gh_double2scm (0.0);
+}
+
+
void
-Rest_collision::add_column (Note_column *nc_l)
+Rest_collision::add_column (Grob*me,Grob *p)
+{
+ me->add_dependency (p);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
+
+ /*
+ only add callback for the rests, since we don't move anything
+ else.
+
+ (not?)
+ */
+ p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
+ p->set_grob_property ("rest-collision", me->self_scm ());
+}
+
+
+/*
+ Combination of dot-count and duration-log.
+ */
+static SCM
+head_characteristic (Grob * col)
{
- add_dependency (nc_l);
- if (nc_l->rest_b ())
- rest_l_arr_.push (nc_l);
+ Grob * s = unsmob_grob (col->get_grob_property ("rest"));
+
+ if (!s)
+ return SCM_BOOL_F;
else
- ncol_l_arr_.push (nc_l);
+ return gh_cons (s->get_grob_property ("duration-log"),
+ gh_int2scm (Rhythmic_head::dot_count (s)));
}
-void
-Rest_collision::do_pre_processing()
+/*
+ TODO: fixme, fucks up if called twice on the same set of rests.
+
+ TODO: look at horizontal-shift to determine ordering between rests
+ for more than two voices.
+
+
+ */
+SCM
+Rest_collision::do_shift (Grob *me)
{
+ SCM elts = me->get_grob_property ("elements");
+
+ Link_array<Grob> rests;
+ Link_array<Grob> notes;
+
+ for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s))
+ {
+ Grob * e = unsmob_grob (ly_car (s));
+ if (unsmob_grob (e->get_grob_property ("rest")))
+ {
+ /*
+ Ignore rests under beam.
+ */
+ Grob* st = unsmob_grob (e->get_grob_property ("stem"));
+ if (st && unsmob_grob (st->get_grob_property ("beam")))
+ continue;
+
+ rests.push (e);
+ }
+ else
+ notes.push (e);
+ }
+
+
/*
handle rest-rest and rest-note collisions
[todo]
* decide not to print rest if too crowded?
-
- * ignore rests under beams.
*/
- // no rests to collide
- if (!rest_l_arr_.size())
- return;
+ /*
+ no partners to collide with
+ */
+ if (rests.size () + notes.size () < 2)
+ return SCM_UNSPECIFIED;
- // no partners to collide with
- if (rest_l_arr_.size() + ncol_l_arr_.size () < 2)
- return;
- // meisjes met meisjes
- if (!ncol_l_arr_.size())
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ /*
+ only rests
+ */
+ if (!notes.size ())
{
+
/*
- UGH. Should get dims from table. Should have minimum dist.
+ This is incomplete: in case of an uneven number of rests, the
+ center one should be centered on the staff.
*/
- int dy = rest_l_arr_.size() > 2 ? 6 : 4;
-
- rest_l_arr_[0]->translate_rests (rest_l_arr_[0]->dir () *dy);
- rest_l_arr_.top()->translate_rests (rest_l_arr_.top ()->dir ()* dy);
- }
- // meisjes met jongetjes
- else
- {
- if (rest_l_arr_.size () > 1)
+ Drul_array< Link_array <Grob > > ordered_rests;
+ for (int i= 0; i < rests.size (); i++)
{
- warning (_("Too many colliding rests."));
+ Grob * r = Note_column::get_rest (rests[i]);
+
+ Direction d = get_grob_direction (r);
+ if (d)
+ {
+ ordered_rests[d].push (rests[i]);
+ }
+ else
+ rests[d]->warning (_("rest direction not set. Cannot resolve collision."));
}
- if (ncol_l_arr_.size () > 1)
- {
- warning (_("Too many notes for rest collision."));
- }
- Note_column * rcol = rest_l_arr_[0];
- // try to be opposite of noteheads.
- Direction dir = - ncol_l_arr_[0]->dir();
+ Direction d = LEFT;
+ do {
+ ordered_rests[d].sort (Note_column::shift_compare);
+ } while (flip (&d) != LEFT);
+
+ if (ordered_rests[UP].size () + ordered_rests[DOWN].size () < 2)
+ return SCM_UNSPECIFIED;
- Interval restdim;
- for (int i=0; i < rcol->rest_l_arr_.size(); i++)
- restdim.unite (rcol->rest_l_arr_[i]->extent (Y_AXIS));
+ Grob *common = common_refpoint_of_array (ordered_rests[DOWN], me, Y_AXIS);
+ common = common_refpoint_of_array (ordered_rests[UP], common, Y_AXIS);
- if (restdim.empty_b ())
- return;
-
- // staff ref'd?
- Real staff_space = rcol->rest_l_arr_[0]->staff_line_leading_f ();
- Real internote_f = staff_space/2;
- Real minimum_dist = paper_l ()->get_var ("restcollision_minimum_dist")
- * internote_f;
-
+ Real diff =
+ (ordered_rests[DOWN].top ()->extent (common, Y_AXIS)[UP]
+ - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) /staff_space;
+
+ if (diff > 0)
+ {
+ int amount_down = (int) ceil (diff / 2);
+ diff -= amount_down;
+ Note_column::translate_rests (ordered_rests[DOWN].top (),
+ -2 * amount_down);
+ if (diff > 0)
+ Note_column::translate_rests (ordered_rests[UP].top (),
+ 2 * int (ceil (diff)));
+ }
+
+ do {
+ for (int i = ordered_rests[d].size () -1; i-- > 0;)
+ {
+ Real last_y = ordered_rests[d][i+1]->extent (common, Y_AXIS)[d];
+ Real y = ordered_rests[d][i]->extent (common, Y_AXIS)[-d];
+
+ Real diff = d * ((last_y - y) /staff_space);
+ if (diff > 0)
+ Note_column::translate_rests (ordered_rests[d][i],d * (int) ceil (diff) * 2);
+ }
+ } while (flip (&d) != LEFT);
+ }
+ else
+ {
/*
- assumption: ref points are the same.
+ Rests and notes.
*/
- Interval notedim;
- for (int i = 0; i < ncol_l_arr_.size(); i++)
+ if (rests.size () > 1)
{
- notedim.unite (ncol_l_arr_[i]->extent (Y_AXIS));
+ warning (_ ("too many colliding rests"));
}
+ Grob * rcol = rests[0];
+ Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
+
+ Direction dir = Note_column::dir (rests[0]);
+
+ Interval restdim = rcol->extent (common, Y_AXIS);
+ if (restdim.is_empty ())
+ return SCM_UNSPECIFIED;
+
+ Real staff_space = Staff_symbol_referencer::staff_space (rcol);
+ Real minimum_dist = robust_scm2double (me->get_grob_property ("minimum-distance"), 1.0) * staff_space;
- Interval inter (notedim);
- inter.intersect (restdim);
+ Interval notedim;
+ for (int i = 0; i < notes.size (); i++)
+ {
+ notedim.unite (notes[i]->extent (common, Y_AXIS));
+ }
Real dist =
minimum_dist + dir * (notedim[dir] - restdim[-dir]) >? 0;
-
- int stafflines = rcol->rest_l_arr_[0]->lines_i ();
-
+ int stafflines = Staff_symbol_referencer::line_count (me);
+ if (!stafflines)
+ {
+ programming_error ("No staff line count ? ");
+ stafflines =5;
+ }
// move discretely by half spaces.
int discrete_dist = int (ceil (dist / (0.5 *staff_space)));
// move by whole spaces inside the staff.
if (discrete_dist < stafflines+1)
discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0);
-
- rcol->translate_rests (dir * discrete_dist);
+
+ Note_column::translate_rests (rcol,dir * discrete_dist);
}
+ return SCM_UNSPECIFIED;
}
-void
-Rest_collision::do_print() const
-{
-#ifndef NPRINT
- DOUT << "rests: " << rest_l_arr_.size() << ", ";
- DOUT << "cols: " << ncol_l_arr_.size();
-#endif
-}
-void
-Rest_collision::do_substitute_element_pointer (Score_element*o,Score_element*n)
-{
- if (Note_column *onl = dynamic_cast<Note_column *> (o))
- {
- Note_column *n_l = n?dynamic_cast<Note_column *> (n):0;
- rest_l_arr_.substitute (onl, n_l);
- ncol_l_arr_.substitute (onl, n_l);
- }
-}
+ADD_INTERFACE (Rest_collision,"rest-collision-interface",
+ "Move around ordinary rests (not multi-measure-rests) to avoid "
+"conflicts.",
+ "maximum-rest-count minimum-distance positioning-done elements");
-Rest_collision::Rest_collision()
-{
- set_elt_property (transparent_scm_sym, SCM_BOOL_T);
- set_empty (true);
-}
projects / lilypond.git / blobdiff