*** empty log message ***

[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 f49a83566e9e22c82034bbdb18f7ba9fdd638ee7..1907f56bf3a2e1f29f597bfcdf4dd5c3acb4d14a 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -7,19 +7,19 @@
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "hara-kiri-group-spanner.hh"
+
 #include "axis-group-interface.hh"
 #include "spanner.hh"
-#include "hara-kiri-group-spanner.hh"
 #include "warn.hh"
 #include "item.hh"
 
-
 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) ly_scm2int (scm_axis);
+  Axis a = (Axis) scm_to_int (scm_axis);
 
   assert (a == Y_AXIS);
   consider_suicide (me);
@@ -32,7 +32,7 @@ Hara_kiri_group_spanner::consider_suicide (Grob*me)
 {
   Spanner*sp = dynamic_cast<Spanner*> (me);
   SCM worth = me->get_property ("items-worth-living");
-  if (is_pair (worth))
+  if (scm_is_pair (worth))
     return ;
 
   if (!to_boolean (me->get_property ("remove-first"))
@@ -63,7 +63,7 @@ SCM
 Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == Y_AXIS);
   consider_suicide (me);
   return scm_make_real (0.0);
@@ -75,7 +75,7 @@ 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) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == Y_AXIS);
   force_hara_kiri_callback (daughter->get_parent (a)->self_scm (), axis);
   return scm_make_real (0.0);