X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=46b15f18d319b1da2bba3214028ffa4ef7c54655;hb=7e79448be56dad04b97e89e0c49dce64bf16100e;hp=1362c1275e241435b5f01ce6117b2bd3d80034fe;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 1362c1275e..46b15f18d3 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -1,24 +1,28 @@
-/*   
-  axis-group-interface.cc --  implement Axis_group_interface
-  
+/*
+  axis-group-interface.cc -- implement Axis_group_interface
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "hara-kiri-group-spanner.hh"
+
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
 #include "axis-group-interface.hh"
-#include "grob.hh"
+#include "hara-kiri-group-spanner.hh"
 
 void
-Axis_group_interface::add_element (Grob*me,Grob *e)
+Axis_group_interface::add_element (Grob *me, Grob *e)
 {
-  for (SCM ax = me->get_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);
+
+      e->internal_set_property ((a == X_AXIS)
+				? ly_symbol2scm ("axis-group-parent-X")
+				: ly_symbol2scm ("axis-group-parent-Y"),
+				me->self_scm ());
     }
 
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), e);
@@ -26,24 +30,22 @@ Axis_group_interface::add_element (Grob*me,Grob *e)
 }
 
 bool
-Axis_group_interface::has_axis (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 (group_extent_callback_proc, a) ||
- (me->has_extent_callback (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.is_empty ())
 	r.unite (dims);
@@ -51,37 +53,37 @@ Axis_group_interface::relative_group_extent (Axis a, Grob *common, SCM elts)
   return r;
 }
 
-MAKE_SCHEME_CALLBACK (Axis_group_interface,group_extent_callback,2);
+MAKE_SCHEME_CALLBACK (Axis_group_interface, group_extent_callback, 2);
 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);
+  Axis a = (Axis) scm_to_int (scm_axis);
 
   SCM elts = me->get_property ("elements");
-  Grob * common = common_refpoint_of_list (elts, me, a);
+  Grob *common = common_refpoint_of_list (elts, me, a);
 
   Real my_coord = me->relative_coordinate (common, a);
-  Interval r (relative_group_extent (a, common,elts));
+  Interval r (relative_group_extent (a, common, elts));
 
   return ly_interval2scm (r - my_coord);
 }
 
 void
-Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2)
+Axis_group_interface::set_axes (Grob *me, Axis a1, Axis a2)
 {
-  SCM sa1= scm_int2num (a1);
+  SCM sa1 = scm_int2num (a1);
   SCM sa2 = scm_int2num (a2);
 
   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);
+	ax = scm_cons (sa2, ax);
       me->set_property ("axes", ax);
     }
 
@@ -91,35 +93,33 @@ Axis_group_interface::set_axes (Grob*me,Axis a1, Axis a2)
     me->set_extent (SCM_EOL, Y_AXIS);
 
   /*
-    why so convoluted ? (fixme/documentme?) 
-   */
+    why so convoluted ? (fixme/documentme?)
+  */
   if (me->has_extent_callback (Grob::stencil_extent_proc, a1))
-    me->set_extent (Axis_group_interface::group_extent_callback_proc,a1);
+    me->set_extent_callback (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);
+    me->set_extent_callback (Axis_group_interface::group_extent_callback_proc, a2);
 }
 
-Link_array<Grob> 
-Axis_group_interface::get_children (Grob*me)
+Link_array<Grob>
+Axis_group_interface::get_children (Grob *me)
 {
   Link_array<Grob> childs;
-  childs.push (me) ;
+  childs.push (me);
 
   if (!has_interface (me))
     return childs;
-  
-  for (SCM ep = me->get_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));
     }
-  
+
   return childs;
 }
 
-
-
 ADD_INTERFACE (Axis_group_interface, "axis-group-interface",
-  "An object that groups other layout objects.",
-  "axes");
+	       "An object that groups other layout objects.",
+	       "axes elements");