* lily/include/lily-guile.hh: many new ly_ functions. Thanks to

[lilypond.git] / lily / self-aligment-interface.cc

diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index 7ef7b6f52ab7ec7411e5a5a91c220107fbcfe821..386f5a662673dff5438aab6200501187fd5ec5f0 100644 (file)
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -9,11 +9,11 @@ SCM
 Self_alignment_interface::centered_on_parent (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) ly_scm2int (axis);
   Grob *him = me->get_parent (a);
   Interval he = him->extent (him,a);
   
-  return  gh_double2scm (he.is_empty () ? 0.0 : he.center ());
+  return  scm_make_real (he.is_empty () ? 0.0 : he.center ());
 }
 
 MAKE_SCHEME_CALLBACK (Self_alignment_interface,aligned_on_parent,2);
@@ -21,19 +21,19 @@ SCM
 Self_alignment_interface::aligned_on_parent (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) ly_scm2int (axis);
   Grob *him = me->get_parent (a);
   Interval he = him->extent (him,a);
   
   SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X"): ly_symbol2scm ("self-alignment-Y");
   SCM align_prop (me->internal_get_property (sym));
 
-  if (!gh_number_p (align_prop))
-    return gh_int2scm (0);
+  if (!ly_number_p (align_prop))
+    return scm_int2num (0);
 
   Real x = 0.0;
 
-  Real align = gh_scm2double (align_prop);
+  Real align = ly_scm2double (align_prop);
       
   Interval ext (me->extent (me,a));
   if (ext.is_empty ())
@@ -49,7 +49,7 @@ Self_alignment_interface::aligned_on_parent (SCM element_smob, SCM axis)
       x += he.linear_combination (align);
     }
 
-  return gh_double2scm (x);
+  return scm_make_real (x);
 }
 
 /*
@@ -61,11 +61,11 @@ Self_alignment_interface::centered_on_other_axis_parent (SCM element_smob,
                                                         SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) ly_scm2int (axis);
   Grob *him = me->get_parent (other_axis (a));
   Interval he = him->extent (him,a);
   
-  return  gh_double2scm (he.is_empty () ? 0.0 : he.center ());
+  return  scm_make_real (he.is_empty () ? 0.0 : he.center ());
 }
 
 
@@ -81,26 +81,26 @@ SCM
 Self_alignment_interface::aligned_on_self (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
+  Axis a = (Axis) ly_scm2int (axis);
 
   SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X"): ly_symbol2scm ("self-alignment-Y");
   
   SCM align (me->internal_get_property (sym));
-  if (gh_number_p (align))
+  if (ly_number_p (align))
     {
       Interval ext (me->extent (me,a));
 
       if (ext.is_empty ())
        {
          programming_error ("I'm empty. Can't align on self");
-         return gh_double2scm (0.0);
+         return scm_make_real (0.0);
        }
       else
        {
-         return gh_double2scm (- ext.linear_combination (gh_scm2double (align)));
+         return scm_make_real (- ext.linear_combination (ly_scm2double (align)));
        }
     }
-  return gh_double2scm (0.0);
+  return scm_make_real (0.0);
 }