*** empty log message ***

[lilypond.git] / lily / cluster.cc

diff --git a/lily/cluster.cc b/lily/cluster.cc
index 6dfea67e99d0c7a980a61df8611d6ea1811dc02a..5eee6ee6db2bfd53413d507995c15b976aef6bdd 100644 (file)
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -9,17 +9,16 @@
 
 */
 
-#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 "paper-def.hh"
+#include "output-def.hh"
 #include "warn.hh"
 
 
@@ -32,7 +31,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
 {
   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);
@@ -41,7 +40,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
   SCM shape_scm = me->get_property ("style");
   String shape;
 
-  if (is_symbol (shape_scm))
+  if (scm_is_symbol (shape_scm))
     {
       shape = ly_symbol2string (shape_scm);
     }
@@ -53,7 +52,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
     }
 
 
-  Stencil out = Stencil ();
+  Stencil out;
   Array<Offset> points;
   points.clear ();
   int size = bottom_points.size ();
@@ -142,9 +141,9 @@ Cluster::print (SCM smob)
   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 ();
@@ -165,9 +164,9 @@ Cluster::print (SCM smob)
     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;
@@ -186,10 +185,10 @@ Cluster::print (SCM smob)
        {
          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;