* lily/ambitus-engraver.cc (create_ambitus): change name to

[lilypond.git] / lily / axis-group-interface.cc

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index b7ce9afd3d182f131551e21242801de50a4a9453..c38bfbb52ed0833611b7e57ef19bfb8ba0271d51 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -30,8 +30,6 @@ Axis_group_interface::has_axis (Grob*me,Axis a)
 {
   /*
     urg. FIXME, check for Hara_kiri_group_spanner shouldn't be necessary?
-
-    
    */
   return me->has_extent_callback (group_extent_callback_proc, a) ||
  (me->has_extent_callback (Hara_kiri_group_spanner::y_extent_proc, a));
@@ -41,7 +39,7 @@ Interval
 Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts)
 {
   Interval r;
-  for (SCM s = elts; ly_pair_p (s); s = ly_cdr (s))
+  for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s))
     {
       Grob * se = unsmob_grob (ly_car (s));
       Interval dims = se->extent (common, a);
@@ -75,7 +73,7 @@ Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2)
 
   SCM axes = me->get_property ("axes");
   
-  if (!ly_pair_p (axes)
+  if (!ly_c_pair_p (axes)
       || scm_c_memq (sa1, axes) == SCM_BOOL_F
       || scm_c_memq (sa2, axes) == SCM_BOOL_F)
     {
@@ -108,7 +106,7 @@ Axis_group_interface::get_children (Grob*me)
   if (!has_interface (me))
     return childs;
   
-  for (SCM ep = me->get_property ("elements"); ly_pair_p (ep); ep = ly_cdr (ep))
+  for (SCM ep = me->get_property ("elements"); ly_c_pair_p (ep); ep = ly_cdr (ep))
     {
       Grob* e = unsmob_grob (ly_car (ep));
       if (e)