#include <cmath> // ceil.
using namespace std;
-#include "warn.hh"
+#include "directional-element-interface.hh"
+#include "duration.hh"
+#include "international.hh"
#include "note-column.hh"
-#include "stem.hh"
-#include "rhythmic-head.hh"
#include "output-def.hh"
-#include "rest.hh"
#include "pointer-group-interface.hh"
+#include "rest.hh"
+#include "rhythmic-head.hh"
#include "staff-symbol-referencer.hh"
-#include "duration.hh"
-#include "directional-element-interface.hh"
+#include "stem.hh"
+#include "grob.hh"
+#include "warn.hh"
MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);
SCM
return scm_from_double (0.0);
}
-MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback_rest, 2);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1);
SCM
Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
{
translate REST; we need the result of this translation later on,
while the offset probably still is 0/calculation-in-progress.
*/
- rest_grob->translate_axis (scm_to_double (offset), Y_AXIS);
+ if (scm_is_number (offset))
+ rest_grob->translate_axis (scm_to_double (offset), Y_AXIS);
if (Note_column::has_interface (parent))
force_shift_callback (parent->self_scm ());
Grob *me = unsmob_grob (smob);
extract_grob_set (me, "elements", elts);
- Link_array<Grob> rests;
- Link_array<Grob> notes;
+ vector<Grob*> rests;
+ vector<Grob*> notes;
- for (int i = 0; i < elts.size (); i++)
+ for (vsize i = 0; i < elts.size (); i++)
{
Grob *e = elts[i];
if (unsmob_grob (e->get_object ("rest")))
if (st && unsmob_grob (st->get_object ("beam")))
continue;
- rests.push (e);
+ rests.push_back (e);
}
else
- notes.push (e);
+ notes.push_back (e);
}
/*
This is incomplete: in case of an uneven number of rests, the
center one should be centered on the staff.
*/
- Drul_array<Link_array<Grob> > ordered_rests;
- for (int i = 0; i < rests.size (); i++)
+ Drul_array<vector<Grob*> > ordered_rests;
+ for (vsize i = 0; i < rests.size (); i++)
{
Grob *r = Note_column::get_rest (rests[i]);
Direction d = get_grob_direction (r);
if (d)
- ordered_rests[d].push (rests[i]);
+ ordered_rests[d].push_back (rests[i]);
else
rests[d]->warning (_ ("can't resolve rest collision: rest direction not set"));
}
Direction d = LEFT;
do
- ordered_rests[d].sort (Note_column::shift_compare);
+ vector_sort (ordered_rests[d], Note_column::shift_less);
while (flip (&d) != LEFT)
;
common = common_refpoint_of_array (ordered_rests[UP], common, Y_AXIS);
Real diff
- = (ordered_rests[DOWN].top ()->extent (common, Y_AXIS)[UP]
- - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) / staff_space;
+ = (ordered_rests[DOWN].back ()->extent (common, Y_AXIS)[UP]
+ - ordered_rests[UP].back ()->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 (),
+ Note_column::translate_rests (ordered_rests[DOWN].back (),
-2 * amount_down);
if (diff > 0)
- Note_column::translate_rests (ordered_rests[UP].top (),
+ Note_column::translate_rests (ordered_rests[UP].back (),
2 * int (ceil (diff)));
}
do
{
- for (int i = ordered_rests[d].size () -1; i-- > 0;)
+ for (vsize 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];
Grob *rcol = 0;
Direction dir = CENTER;
- for (int i = rests.size (); !rcol && i--;)
+ for (vsize i = rests.size (); !rcol && i--;)
if (Note_column::dir (rests[i]))
{
- dir = Note_column::dir (rests[i]);
rcol = rests[i];
+ dir = Note_column::dir (rcol);
}
if (!rcol)
return SCM_UNSPECIFIED;
+ Grob *rest = Note_column::get_rest (rcol);
Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
Interval restdim = rcol->extent (common, Y_AXIS);
Real minimum_dist = robust_scm2double (me->get_property ("minimum-distance"), 1.0) * staff_space;
Interval notedim;
- for (int i = 0; i < notes.size (); i++)
+ for (vsize i = 0; i < notes.size (); i++)
notedim.unite (notes[i]->extent (common, Y_AXIS));
- Real dist
- = minimum_dist + dir * max (notedim[dir] - restdim[-dir], 0.0);
+ Real y = dir * max (0.0,
+ -dir * restdim[-dir] + dir * notedim[dir] + minimum_dist);
+
int stafflines = Staff_symbol_referencer::line_count (me);
if (!stafflines)
{
}
// move discretely by half spaces.
- int discrete_dist = int (ceil (dist / (0.5 * staff_space)));
+ int discrete_y = dir * int (ceil (y / (0.5 * dir * staff_space)));
// move by whole spaces inside the staff.
- if (discrete_dist < stafflines + 1)
- discrete_dist = int (ceil (discrete_dist / 2.0) * 2.0);
+ if (fabs (Staff_symbol_referencer::get_position (rest)
+ + discrete_y) < stafflines + 1)
+ {
+ discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0);
+ }
- Note_column::translate_rests (rcol, dir * discrete_dist);
+ Note_column::translate_rests (rcol, discrete_y);
}
return SCM_UNSPECIFIED;
}
-ADD_INTERFACE (Rest_collision, "rest-collision-interface",
+ADD_INTERFACE (Rest_collision,
"Move around ordinary rests (not multi-measure-rests) to avoid "
"conflicts.",
projects / lilypond.git / blobdiff