release: 1.3.131

[lilypond.git] / lily / hara-kiri-group-spanner.cc

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 25680db3ef26eca41d0d08886515c6dfb4bf1530..53166be9e5927824442ca23aba487bb0daaa6e2b 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
@@ -13,45 +13,28 @@
 #include "debug.hh"
 #include "item.hh"
 
-void
-Hara_kiri_group_spanner::set_interface (Score_element*me)
-{
-  me->set_elt_property ("items-worth-living", SCM_EOL);
-  me->add_offset_callback (force_hara_kiri_callback, Y_AXIS);
-  me->set_interface (ly_symbol2scm ("hara-kiri-spanner-interface"));
-  me->set_extent_callback (Hara_kiri_group_spanner::y_extent, Y_AXIS);
-}
 
-Interval
-Hara_kiri_group_spanner::y_extent(Score_element*me, Axis a)
+MAKE_SCHEME_CALLBACK(Hara_kiri_group_spanner,y_extent,2);
+SCM
+Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis)
 {
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (scm_axis);
+
   assert (a == Y_AXIS);
   consider_suicide (me);
-  return  Axis_group_interface::group_extent_callback (me, a);
+  return  Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis);
 }
 
 
-bool
-Hara_kiri_group_spanner::has_interface (Score_element*me)
-{
-  return me->has_interface (ly_symbol2scm ("hara-kiri-spanner-interface"));
-}
-
-void 
-Hara_kiri_group_spanner::add_interesting_item (Score_element* me,Score_element* n)
-{
-  me->add_dependency (n);
-  Pointer_group_interface (me, "items-worth-living").add_element (n);
-}
-
 void
-Hara_kiri_group_spanner::consider_suicide(Score_element*me)
+Hara_kiri_group_spanner::consider_suicide(Grob*me)
 {
-  SCM worth = me->get_elt_property ("items-worth-living");
+  SCM worth = me->get_grob_property ("items-worth-living");
   if (gh_pair_p (worth))
     return ;
 
-  Link_array<Score_element> childs = Axis_group_interface::get_children (me);
+  Link_array<Grob> childs = Axis_group_interface::get_children (me);
   for (int i = 0; i < childs.size (); i++)
     childs[i]->suicide ();
 
@@ -68,26 +51,53 @@ Hara_kiri_group_spanner::consider_suicide(Score_element*me)
   We can't rely on offsets and dimensions of elements in a hara-kiri
   group. Use a callback to make sure that hara-kiri has been done
   before asking for offsets.  */
-Real
-Hara_kiri_group_spanner::force_hara_kiri_callback (Score_element *elt, Axis a)
+MAKE_SCHEME_CALLBACK(Hara_kiri_group_spanner,force_hara_kiri_callback,2);
+SCM
+Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis)
 {
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
   assert (a == Y_AXIS);
-  consider_suicide (elt);
-  return 0.0;
+  consider_suicide (me);
+  return gh_double2scm (0.0);
 }
 
 
-Real
-Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (Score_element*daughter, Axis a)
+MAKE_SCHEME_CALLBACK(Hara_kiri_group_spanner,force_hara_kiri_in_parent_callback,2);
+SCM
+Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM element_smob, SCM axis)
 {
+  Grob *daughter = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
   assert (a == Y_AXIS);
-  force_hara_kiri_callback (daughter->parent_l (a), Y_AXIS);
-  return 0.0;
+  force_hara_kiri_callback (daughter->parent_l (a)->self_scm (), axis);
+  return gh_double2scm ( 0.0);
 }
 
 void
-Hara_kiri_group_spanner::add_element (Score_element * me, Score_element *e)
+Hara_kiri_group_spanner::add_element (Grob * me, Grob *e)
 {
   //  e->add_offset_callback (force_hara_kiri_in_parent_callback, Y_AXIS);
   Axis_group_interface::add_element (me, e);
 }
+
+
+void
+Hara_kiri_group_spanner::set_interface (Grob*me)
+{
+  me->set_interface (ly_symbol2scm ("hara-kiri-group-interface"));
+}
+
+
+bool
+Hara_kiri_group_spanner::has_interface (Grob*me)
+{
+  return me->has_interface (ly_symbol2scm ("hara-kiri-group-interface"));
+}
+
+void 
+Hara_kiri_group_spanner::add_interesting_item (Grob* me,Grob* n)
+{
+  me->add_dependency (n);
+  Pointer_group_interface::add_element (me, "items-worth-living",n);
+}