*/
-#include <stdio.h>
-
#include "cluster.hh"
+
+#include <cstdio>
+
#include "spanner.hh"
#include "item.hh"
#include "pitch.hh"
#include "staff-symbol-referencer.hh"
#include "lookup.hh"
-#include "box.hh"
-#include "interval.hh"
#include "output-def.hh"
#include "warn.hh"
{
Real blotdiameter = Staff_symbol_referencer::staff_space (me)/2;
- Real padding =robust_scm2double ( me->get_property ("padding"), 0.0);
+ Real padding = robust_scm2double ( me->get_property ("padding"), 0.0);
Offset vpadding = Offset (0, padding);
Offset hpadding = Offset (0.5 * blotdiameter, 0);
SCM shape_scm = me->get_property ("style");
String shape;
- if (ly_c_symbol_p (shape_scm))
+ if (scm_is_symbol (shape_scm))
{
shape = ly_symbol2string (shape_scm);
}
Item *right_bound = spanner->get_bound (RIGHT);
Grob *commonx = left_bound->common_refpoint (right_bound, X_AXIS);
- SCM cols =me->get_property ("columns");
+ SCM cols = me->get_property ("columns");
- if (!ly_c_pair_p (cols))
+ if (!scm_is_pair (cols))
{
me->warning ("junking empty cluster");
me->suicide ();
line with the center of the note heads?
*/
- for (SCM s = cols; ly_c_pair_p (s); s = ly_cdr (s))
+ for (SCM s = cols; scm_is_pair (s); s = scm_cdr (s))
{
- Grob * col = unsmob_grob (ly_car (s));
+ Grob * col = unsmob_grob (scm_car (s));
Interval yext = col->extent (commony, Y_AXIS);
Real x = col->relative_coordinate (commonx, X_AXIS) - left_coord;
{
Spanner * next = orig->broken_intos_[spanner->get_break_index () + 1];
SCM cols = next->get_property ("columns");
- if (ly_c_pair_p (cols))
+ if (scm_is_pair (cols))
{
Grob *next_commony = common_refpoint_of_list (cols, next, Y_AXIS);
- Grob * col = unsmob_grob (ly_car (scm_last_pair (cols)));
+ Grob * col = unsmob_grob (scm_car (scm_last_pair (cols)));
Interval v = col->extent (next_commony, Y_AXIS);
Real x = right_bound->relative_coordinate (commonx, X_AXIS) - left_coord;