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);
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);
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))
+ for (; ly_c_pair_p (hand); hand =ly_cdr (hand))
{
Grob * s = unsmob_grob (ly_caar (hand));
- Real amount = gh_scm2double (ly_cdar (hand));
+ Real amount = ly_scm2double (ly_cdar (hand));
s->translate_axis (amount *wid, X_AXIS);
done.push (s);
}
- 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));
if (!done.find (s))
s->translate_axis (amount * wid, X_AXIS);
Drul_array<Link_array<Grob> > clash_groups;
SCM s = me->get_property ("elements");
- for (; gh_pair_p (s); s = ly_cdr (s))
+ for (; ly_c_pair_p (s); s = ly_cdr (s))
{
SCM car = ly_car (s);
SCM sh
= 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_property ("elements");
- for (; gh_pair_p (s); s = ly_cdr (s))
+ for (; ly_c_pair_p (s); s = ly_cdr (s))
{
Grob * se = unsmob_grob (ly_car (s));
SCM force = se->get_property ("force-hshift");
- if (gh_number_p (force))
+ 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);
}
}