source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include <math.h>
+
#include "warn.hh"
#include "note-collision.hh"
#include "note-column.hh"
#include "note-head.hh"
#include "rhythmic-head.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "axis-group-interface.hh"
#include "item.hh"
#include "stem.hh"
Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis)
{
Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) ly_scm2int (axis);
assert (a == X_AXIS);
me = me->get_parent (a);
- if (! to_boolean (me->get_grob_property ("positioning-done")))
+ if (! to_boolean (me->get_property ("positioning-done")))
{
- me->set_grob_property ("positioning-done", SCM_BOOL_T);
+ me->set_property ("positioning-done", SCM_BOOL_T);
do_shifts (me);
}
- return gh_double2scm (0.0);
+ return scm_make_real (0.0);
}
// FIXME: what's this?
bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ());
+
+
+ /* Do not merge notes typeset in different style. */
+ if ( !ly_c_equal_p (nu->get_property ("style"),
+ nd->get_property ("style") ) )
+ merge_possible = false;
+
int upball_type = Note_head::get_balltype (nu);
int dnball_type = Note_head::get_balltype (nd);
if (merge_possible
&& Rhythmic_head::dot_count (nu) != Rhythmic_head::dot_count (nd)
- && !to_boolean (me->get_grob_property ("merge-differently-dotted")))
+ && !to_boolean (me->get_property ("merge-differently-dotted")))
merge_possible = false;
/* Can only merge different heads if merge-differently-headed is
set. */
if (merge_possible
&& upball_type != dnball_type
- && !to_boolean (me->get_grob_property ("merge-differently-headed")))
+ && !to_boolean (me->get_property ("merge-differently-headed")))
merge_possible = false;
- /* Can never merge quarter and half notes. */
+ /* Should never merge quarter and half notes, as this would make
+ them indistinguishable. */
if (merge_possible
&& ((Rhythmic_head::duration_log (nu) == 1
&& Rhythmic_head::duration_log (nd) == 2)
}
}
+ full_collide = full_collide || (close_half_collide
+ && distant_half_collide);
+
Drul_array<Real> center_note_shifts;
center_note_shifts[LEFT] = 0.0;
center_note_shifts[RIGHT] = 0.0;
Real shift_amount = 1;
- bool touch = (ups[0] - dps.top () >= 0);
+ bool touch = (ups[0] >= dps.top ());
if (touch)
shift_amount *= -1;
/* For full collisions, the right hand head may obscure dots, so
make sure the dotted heads go to the right. */
- if (Rhythmic_head::dot_count (nu) > Rhythmic_head::dot_count (nd)
- && full_collide)
- shift_amount = 1;
-
+ bool stem_to_stem = false;
+ if (full_collide)
+ if (Rhythmic_head::dot_count (nu) > Rhythmic_head::dot_count (nd))
+ shift_amount = 1;
+ else if (Rhythmic_head::dot_count (nu) < Rhythmic_head::dot_count (nd))
+ stem_to_stem = true;
+
if (merge_possible)
{
shift_amount = 0;
- /* Wipe shortest head, or head with smallest amount of dots.
- Note: when merging different heads, dots on shortest
- disappear. */
-
- Grob *wipe_ball = nu;
+
+ /* If possible, don't wipe any heads. Else, wipe shortest head,
+ or head with smallest amount of dots. Note: when merging
+ different heads, dots on the smaller one disappear. */
+ Grob *wipe_ball = 0;
+ Grob *dot_wipe_head = nu;
if (upball_type == dnball_type)
{
if (Rhythmic_head::dot_count (nd) < Rhythmic_head::dot_count (nu))
- wipe_ball = nd;
+ {
+ wipe_ball = nd;
+ dot_wipe_head = nd;
+ }
+ else if (Rhythmic_head::dot_count (nd) > Rhythmic_head::dot_count (nu))
+ {
+ dot_wipe_head = nu;
+ wipe_ball = nu;
+ }
+ else
+ {
+ dot_wipe_head = nu;
+ }
}
else if (dnball_type > upball_type)
- wipe_ball = nd;
-
- if (wipe_ball->live ())
{
- wipe_ball->set_grob_property ("transparent", SCM_BOOL_T);
- wipe_ball->set_grob_property ("molecule", SCM_EOL);
+ wipe_ball = nd;
+ dot_wipe_head = nd;
+ }
+ else if (dnball_type < upball_type)
+ {
+ wipe_ball = nu;
+ dot_wipe_head = nu;
+ }
- if (Grob *d = unsmob_grob (wipe_ball->get_grob_property ("dot")))
+ if (dot_wipe_head)
+ {
+ if (Grob *d = unsmob_grob (dot_wipe_head->get_property ("dot")))
d->suicide ();
}
+
+ if (wipe_ball && wipe_ball->is_live ())
+ {
+ wipe_ball->set_property ("transparent", SCM_BOOL_T);
+ wipe_ball->set_property ("stencil", SCM_EOL);
+ }
}
/* TODO: these numbers are magic; should devise a set of grob props
to tune this behavior. */
+ else if (stem_to_stem)
+ shift_amount = -abs (shift_amount) * 0.65;
else if (close_half_collide && !touch)
shift_amount *= 0.52;
else if (distant_half_collide && !touch)
&& Rhythmic_head::dot_count (nd) > Rhythmic_head::dot_count (nu)
&& (full_collide || close_half_collide))
{
- Grob *d = unsmob_grob (nd->get_grob_property ("dot"));
+ Grob *d = unsmob_grob (nd->get_property ("dot"));
Grob *parent = d->get_parent (X_AXIS);
+
+
+ /*
+ FIXME:
+
+ |
+ x . o
+ |
+
+
+ the . is put right of o which is erroneous o force-shifted
+ far to the right.
+ */
if (Dot_column::has_interface (parent))
Side_position_interface::add_support (parent, nu);
}
SCM autos (automatic_shift (me, cg));
SCM hand (forced_shift (me));
-
-
Direction d = UP;
Real wid = 0.0;
do
{
- if(cg[d].size())
+ if (cg[d].size ())
{
Grob *h = cg[d][0];
- wid = Note_column::first_head(h)->extent(h,X_AXIS).length() ;
+ wid = Note_column::first_head (h)->extent (h,X_AXIS).length () ;
}
}
-
while (flip (&d) != UP);
-
Link_array<Grob> done;
- for (; gh_pair_p (hand); hand =ly_cdr (hand))
+ Real left_most = 1e6;
+
+ Array<Real> amounts;
+ for (; ly_c_pair_p (hand); hand =ly_cdr (hand))
{
Grob * s = unsmob_grob (ly_caar (hand));
- Real amount = gh_scm2double (ly_cdar (hand));
-
- s->translate_axis (amount *wid, X_AXIS);
+ Real amount = ly_scm2double (ly_cdar (hand)) * wid;
+
done.push (s);
+ amounts.push (amount);
+ if (amount < left_most)
+ left_most = amount;
+
}
- for (; gh_pair_p (autos); autos =ly_cdr (autos))
+ for (; ly_c_pair_p (autos); autos =ly_cdr (autos))
{
Grob * s = unsmob_grob (ly_caar (autos));
- Real amount = gh_scm2double (ly_cdar (autos));
+ Real amount = ly_scm2double (ly_cdar (autos)) *wid;
if (!done.find (s))
- s->translate_axis (amount * wid, X_AXIS);
+ {
+ done.push (s);
+ amounts.push (amount);
+ if (amount < left_most)
+ left_most = amount;
+ }
+ }
+
+ for (int i = 0; i < amounts.size(); i++)
+ {
+ done[i]->translate_axis (amounts[i] - left_most, X_AXIS);
}
}
{
Drul_array<Link_array<Grob> > clash_groups;
- SCM s = me->get_grob_property ("elements");
- for (; gh_pair_p (s); s = ly_cdr (s))
+ SCM s = me->get_property ("elements");
+ for (; ly_c_pair_p (s); s = ly_cdr (s))
{
SCM car = ly_car (s);
for (int i=0; i < clashes.size (); i++)
{
SCM sh
- = clashes[i]->get_grob_property ("horizontal-shift");
+ = clashes[i]->get_property ("horizontal-shift");
- if (gh_number_p (sh))
- shift.push (gh_scm2int (sh));
+ if (ly_c_number_p (sh))
+ shift.push (ly_scm2int (sh));
else
shift.push (0);
}
do
{
for (int i=0; i < clash_groups[d].size (); i++)
- tups = gh_cons (gh_cons (clash_groups[d][i]->self_scm (),
- gh_double2scm (offsets[d][i])),
+ tups = scm_cons (scm_cons (clash_groups[d][i]->self_scm (),
+ scm_make_real (offsets[d][i])),
tups);
}
while (flip (&d) != UP);
{
SCM tups = SCM_EOL;
- SCM s = me->get_grob_property ("elements");
- for (; gh_pair_p (s); s = ly_cdr (s))
+ SCM s = me->get_property ("elements");
+ for (; ly_c_pair_p (s); s = ly_cdr (s))
{
Grob * se = unsmob_grob (ly_car (s));
- SCM force = se->get_grob_property ("force-hshift");
- if (gh_number_p (force))
+ SCM force = se->get_property ("force-hshift");
+ if (ly_c_number_p (force))
{
- tups = gh_cons (gh_cons (se->self_scm (), force),
+ tups = scm_cons (scm_cons (se->self_scm (), force),
tups);
}
}
ADD_INTERFACE (Note_collision_interface, "note-collision-interface",
- "An object that handles collisions between notes with different stem "
-"directions and horizontal shifts. Most of the interesting properties "
-"are to be set in @ref{note-column-interface}: these are "
-"@code{force-hshift} and @code{horizontal-shift}. ",
- "merge-differently-dotted merge-differently-headed positioning-done");
+ "An object that handles collisions between notes with different stem "
+ "directions and horizontal shifts. Most of the interesting properties "
+ "are to be set in @ref{note-column-interface}: these are "
+ "@code{force-hshift} and @code{horizontal-shift}."
+
+ ,
+
+ "merge-differently-dotted merge-differently-headed positioning-done");
projects / lilypond.git / blobdiff