* mf/GNUmakefile: always trace pfa fonts.

[lilypond.git] / lily / cluster.cc

diff --git a/lily/cluster.cc b/lily/cluster.cc
index af858ada863d9cb9bcd9ad9c4ba9d520a628c946..a6caf0a7d5b15fa9c91bd9156e2b9939b2af4b8a 100644 (file)
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -73,7 +73,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
          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)
@@ -84,7 +84,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
          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)
@@ -99,7 +99,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
                         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];
@@ -108,7 +108,7 @@ brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<Offset> top_poi
                     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)
     {
@@ -180,7 +180,7 @@ Cluster::brew_molecule (SCM smob)
       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)));
 
@@ -206,7 +206,7 @@ Cluster::brew_molecule (SCM smob)
              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)));