X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=b7ac5e3aacd787e5d7228f4094e4e6eb8d3eb2ac;hb=5cc390968095201b69f142ad01842ac3f08144a2;hp=10ffa7172a33835cd7af49543c402ee295c3c196;hpb=bfb10684605084baf1a898be8f42c0e463c5764a;p=lilypond.git

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 10ffa7172a..b7ac5e3aac 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "hara-kiri-group-spanner.hh"
@@ -45,7 +45,7 @@ Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts)
     {
       Grob * se = unsmob_grob (ly_car (s));
       Interval dims = se->extent (common, a);
-      if (!dims.empty_b ())
+      if (!dims.is_empty ())
 	r.unite (dims);
     }
   return r;
@@ -58,16 +58,11 @@ Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
   Grob *me = unsmob_grob (element_smob);
   Axis a = (Axis) gh_scm2int (scm_axis);
 
-  Grob * common = (Grob*) me;
-
-  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
-    {
-      Grob * se = unsmob_grob (ly_car (s));
-      common = se->common_refpoint (common, a);
-    }
+  SCM elts = me->get_grob_property ("elements");
+  Grob * common = common_refpoint_of_list (elts, me, a);
 
   Real my_coord = me->relative_coordinate (common, a);
-  Interval r (relative_group_extent (a, common, me->get_grob_property ("elements")));
+  Interval r (relative_group_extent (a, common,elts));
 
   return ly_interval2scm (r - my_coord);
 }
@@ -75,9 +70,8 @@ Axis_group_interface::group_extent_callback (SCM element_smob, SCM scm_axis)
 void
 Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2)
 {
-  // set_interface () ?
-  SCM sa1= gh_int2scm (a1);
-  SCM sa2 = gh_int2scm (a2);
+  SCM sa1= scm_int2num (a1);
+  SCM sa2 = scm_int2num (a2);
 
   SCM axes = me->get_grob_property ("axes");
   
@@ -92,17 +86,17 @@ Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2)
     }
 
   if (a1 != X_AXIS && a2 != X_AXIS)
-    me->set_extent_callback (SCM_EOL, X_AXIS);
+    me->set_extent (SCM_EOL, X_AXIS);
   if (a1 != Y_AXIS && a2 != Y_AXIS)
-    me->set_extent_callback (SCM_EOL, Y_AXIS);
+    me->set_extent (SCM_EOL, Y_AXIS);
 
   /*
     why so convoluted ? (fixme/documentme?) 
    */
   if (me->has_extent_callback_b (Grob::molecule_extent_proc, a1))
-    me->set_extent_callback (Axis_group_interface::group_extent_callback_proc,a1);
+    me->set_extent (Axis_group_interface::group_extent_callback_proc,a1);
   if (me->has_extent_callback_b (Grob::molecule_extent_proc, a2))
-    me->set_extent_callback (Axis_group_interface::group_extent_callback_proc,a2);
+    me->set_extent (Axis_group_interface::group_extent_callback_proc,a2);
 }
 
 Link_array<Grob>