X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=ab1776da867cb1f55f149e63745ac7921a592848;hb=b1e60c45c717d1af7c73e118d1ef97052f738ae5;hp=85e21bda285e58e3b231d13a8da6031aa4732bf6;hpb=38d60c0c4e8c29beccd4acfd07aadf1cdea74097;p=lilypond.git

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 85e21bda28..ab1776da86 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "hara-kiri-group-spanner.hh"
@@ -13,9 +13,9 @@
 void
 Axis_group_interface::add_element (Grob*me,Grob *e)
 {
-  for (SCM ax = me->get_grob_property ("axes"); ax != SCM_EOL ; ax = ly_cdr (ax))
+  for (SCM ax = me->get_property ("axes"); ax != SCM_EOL ; ax = scm_cdr (ax))
     {
-      Axis a = (Axis) gh_scm2int (ly_car (ax));
+      Axis a = (Axis) scm_to_int (scm_car (ax));
       
       if (!e->get_parent (a))
 	e->set_parent (me, a);
@@ -26,26 +26,24 @@ Axis_group_interface::add_element (Grob*me,Grob *e)
 }
 
 bool
-Axis_group_interface::axis_b (Grob*me,Axis a)
+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_b (group_extent_callback_proc, a) ||
- (me->has_extent_callback_b (Hara_kiri_group_spanner::y_extent_proc, a));
+  return me->has_extent_callback (group_extent_callback_proc, a) ||
+ (me->has_extent_callback (Hara_kiri_group_spanner::y_extent_proc, a));
 }
 
 Interval
 Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts)
 {
   Interval r;
-  for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s))
+  for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * se = unsmob_grob (ly_car (s));
+      Grob * se = unsmob_grob (scm_car (s));
       Interval dims = se->extent (common, a);
-      if (!dims.empty_b ())
+      if (!dims.is_empty ())
 	r.unite (dims);
     }
   return r;
@@ -56,18 +54,13 @@ SCM
 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;
+  Axis a = (Axis) scm_to_int (scm_axis);
 
-  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_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,34 +68,33 @@ 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");
+  SCM axes = me->get_property ("axes");
   
-  if (!gh_pair_p (axes)
-      || scm_memq (sa1, axes) == SCM_BOOL_F
-      || scm_memq (sa2, axes) == SCM_BOOL_F)
+  if (!scm_is_pair (axes)
+      || scm_c_memq (sa1, axes) == SCM_BOOL_F
+      || scm_c_memq (sa2, axes) == SCM_BOOL_F)
     {
-      SCM ax = gh_cons (sa1, SCM_EOL);
+      SCM ax = scm_cons (sa1, SCM_EOL);
       if (a1 != a2)
-	ax= gh_cons (sa2, ax);
-      me->set_grob_property ("axes", ax);
+	ax= scm_cons (sa2, ax);
+      me->set_property ("axes", ax);
     }
 
   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);
-  if (me->has_extent_callback_b (Grob::molecule_extent_proc, a2))
-    me->set_extent_callback (Axis_group_interface::group_extent_callback_proc,a2);
+  if (me->has_extent_callback (Grob::stencil_extent_proc, a1))
+    me->set_extent (Axis_group_interface::group_extent_callback_proc,a1);
+  if (me->has_extent_callback (Grob::stencil_extent_proc, a2))
+    me->set_extent (Axis_group_interface::group_extent_callback_proc,a2);
 }
 
 Link_array<Grob> 
@@ -114,9 +106,9 @@ Axis_group_interface::get_children (Grob*me)
   if (!has_interface (me))
     return childs;
   
-  for (SCM ep = me->get_grob_property ("elements"); gh_pair_p (ep); ep = ly_cdr (ep))
+  for (SCM ep = me->get_property ("elements"); scm_is_pair (ep); ep = scm_cdr (ep))
     {
-      Grob* e = unsmob_grob (ly_car (ep));
+      Grob* e = unsmob_grob (scm_car (ep));
       if (e)
 	childs.concat (Axis_group_interface::get_children (e));
     }
@@ -124,17 +116,8 @@ Axis_group_interface::get_children (Grob*me)
   return childs;
 }
 
-bool
-Axis_group_interface::has_interface (Grob*me)
-{
-  return me && me->has_interface (ly_symbol2scm ("axis-group-interface"));
-}
 
-void
-Axis_group_interface::set_interface (Grob*me)
-{
-  if (!has_interface (me))
-    {
-      me->set_interface (ly_symbol2scm ("axis-group-interface"));      
-    }
-}
+
+ADD_INTERFACE (Axis_group_interface, "axis-group-interface",
+  "An object that groups other layout objects.",
+  "axes elements");