/*
- rest-collision.cc -- implement Rest_collision
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rest-collision.hh"
#include "directional-element-interface.hh"
#include "duration.hh"
#include "international.hh"
+#include "item.hh"
#include "note-column.hh"
#include "output-def.hh"
#include "pointer-group-interface.hh"
#include "grob.hh"
#include "warn.hh"
-MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);
-SCM
-Rest_collision::force_shift_callback (SCM smob)
-{
- Grob *them = unsmob_grob (smob);
- if (Note_column::has_rests (them))
- {
- Grob *collision = unsmob_grob (them->get_object ("rest-collision"));
-
- if (collision)
- {
- (void) collision->get_property ("positioning-done");
- }
- }
- return scm_from_double (0.0);
-}
-
MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, "");
SCM
Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
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 ());
+ if (Note_column::has_interface (parent) && Note_column::has_rests (parent))
+ {
+ Grob *collision = unsmob_grob (parent->get_object ("rest-collision"));
+
+ if (collision)
+ (void) collision->get_property ("positioning-done");
+ }
return scm_from_double (0.0);
}
{
Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
- /*
- only add callback for the rests, since we don't move anything
- else.
-
- (not?)
- */
- add_offset_callback (p, Rest_collision::force_shift_callback_proc, Y_AXIS);
p->set_object ("rest-collision", me->self_scm ());
Grob *rest = unsmob_grob (p->get_object ("rest"));
}
}
+static bool
+rest_shift_less (Grob *const &r1, Grob *const &r2)
+{
+ Grob *col1 = r1->get_parent (X_AXIS);
+ Grob *col2 = r2->get_parent (X_AXIS);
+ return Note_column::shift_less (col1, col2);
+}
+
/*
TODO: look at horizontal-shift to determine ordering between rests
for more than two voices.
Direction d = get_grob_direction (r);
if (d)
- ordered_rests[d].push_back (rests[i]);
+ ordered_rests[d].push_back (r);
else
rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set"));
}
Direction d = LEFT;
do
- vector_sort (ordered_rests[d], Note_column::shift_less);
+ vector_sort (ordered_rests[d], rest_shift_less);
while (flip (&d) != LEFT)
;
{
int amount_down = (int) ceil (diff / 2);
diff -= amount_down;
- Note_column::translate_rests (ordered_rests[DOWN].back (),
- -2 * amount_down);
+ Rest::translate (ordered_rests[DOWN].back (),
+ -2 * amount_down);
if (diff > 0)
- Note_column::translate_rests (ordered_rests[UP].back (),
- 2 * int (ceil (diff)));
+ Rest::translate (ordered_rests[UP].back (),
+ 2 * int (ceil (diff)));
}
do
{
- for (vsize 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];
Real diff = d * ((last_y - y) / staff_space);
if (diff > 0)
- Note_column::translate_rests (ordered_rests[d][i], d * (int) ceil (diff) * 2);
+ Rest::translate (ordered_rests[d][i], d * (int) ceil (diff) * 2);
}
}
while (flip (&d) != LEFT);
Grob *rest = Note_column::get_rest (rcol);
Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
- Interval restdim = rcol->extent (common, Y_AXIS);
+ Interval restdim = rest->extent (common, Y_AXIS);
if (restdim.is_empty ())
return SCM_BOOL_T;
Interval notedim;
for (vsize i = 0; i < notes.size (); i++)
{
- if (Note_column::dir (notes[i]) == -dir)
+ if (Note_column::dir (notes[i]) == -dir
+ // If the note has already happened (but it has a long duration, so there is a collision),
+ // don't look at the stem. If we do, the rest gets shifted down a lot and it looks bad.
+ || dynamic_cast<Item*> (notes[i])->get_column () != dynamic_cast<Item*> (rest)->get_column ())
{
/* try not to look at the stem, as looking at a beamed
note may trigger beam positioning prematurely.
discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0);
}
- Note_column::translate_rests (rcol, discrete_y);
+ Rest::translate (rest, discrete_y);
}
return SCM_BOOL_T;
}
projects / lilypond.git / blobdiff