brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_points)
{
#if 0
- Real blotdiameter = me->get_paper ()->get_var ("blotdiameter");
+ Real blotdiameter = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
#else
Real blotdiameter = Staff_symbol_referencer::staff_space (me)/2;
#endif
box.add_point (bottom_points[i] - hvpadding);
box.add_point (Offset(top_points[i + 1][X_AXIS],
top_points[i][Y_AXIS]) + hvpadding);
- out.add_molecule (Lookup::roundfilledbox (box, blotdiameter));
+ out.add_molecule (Lookup::round_filled_box (box, blotdiameter));
}
}
else if (String::compare (shape, "rightsided-stairs") == 0)
box.add_point (Offset(bottom_points[i][X_AXIS],
bottom_points[i + 1][Y_AXIS]) - hvpadding);
box.add_point (top_points[i + 1] + hvpadding);
- out.add_molecule (Lookup::roundfilledbox (box, blotdiameter));
+ out.add_molecule (Lookup::round_filled_box (box, blotdiameter));
}
}
else if (String::compare (shape, "centered-stairs") == 0)
hvpadding);
box.add_point (Offset (right_xmid, top_points[i][Y_AXIS]) +
hvpadding);
- out.add_molecule (Lookup::roundfilledbox (box, blotdiameter));
+ out.add_molecule (Lookup::round_filled_box (box, blotdiameter));
left_xmid = right_xmid;
}
Real right_xmid = bottom_points[size - 1][X_AXIS];
hvpadding);
box.add_point (Offset (right_xmid, top_points[size - 1][Y_AXIS]) +
hvpadding);
- out.add_molecule (Lookup::roundfilledbox (box, blotdiameter));
+ out.add_molecule (Lookup::round_filled_box (box, blotdiameter));
}
else if (String::compare (shape, "ramp") == 0)
{
SCM posns = col->get_grob_property ("positions");
Slice s (0,0);
- if (ly_number_pair_p (posns))
+ if (is_number_pair (posns))
s = Slice (gh_scm2int (gh_car (posns)),
gh_scm2int (gh_cdr (posns)));
SCM posns = col->get_grob_property ("positions");
Slice s (0,0);
- if (ly_number_pair_p (posns))
+ if (is_number_pair (posns))
s = Slice (gh_scm2int (gh_car (posns)),
gh_scm2int (gh_cdr (posns)));