* lily/open-type-font.cc (load_scheme_table): new function

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

diff --git a/lily/self-aligment-interface.cc b/lily/self-aligment-interface.cc
index 2701772381ccea22eaeb8e739208316a0d7d0055..5035e1e616f094811ae590c697b433c485a7e4ef 100644 (file)
--- a/lily/self-aligment-interface.cc
+++ b/lily/self-aligment-interface.cc
@@ -7,6 +7,7 @@
 */
 
 #include "self-alignment-interface.hh"
+
 #include "warn.hh"
 
 /* Position centered on parent.  */
@@ -15,7 +16,7 @@ SCM
 Self_alignment_interface::centered_on_parent (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   Grob *him = me->get_parent (a);
   Interval he = him->extent (him, a);
   
@@ -27,19 +28,19 @@ SCM
 Self_alignment_interface::aligned_on_parent (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   Grob *him = me->get_parent (a);
   Interval he = him->extent (him, a);
   
-  SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
+  SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
     : ly_symbol2scm ("self-alignment-Y");
   SCM align_prop (me->internal_get_property (sym));
 
-  if (!ly_c_number_p (align_prop))
+  if (!scm_is_number (align_prop))
     return scm_int2num (0);
 
   Real x = 0.0;
-  Real align = ly_scm2double (align_prop);
+  Real align = scm_to_double (align_prop);
       
   Interval ext (me->extent (me, a));
   if (ext.is_empty ())
@@ -60,7 +61,7 @@ Self_alignment_interface::centered_on_other_axis_parent (SCM element_smob,
                                                         SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   Grob *him = me->get_parent (other_axis (a));
   Interval he = him->extent (him, a);
   
@@ -74,19 +75,19 @@ SCM
 Self_alignment_interface::aligned_on_self (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
 
-  SCM sym= (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
+  SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
     : ly_symbol2scm ("self-alignment-Y");
   
   SCM align (me->internal_get_property (sym));
-  if (ly_c_number_p (align))
+  if (scm_is_number (align))
     {
       Interval ext (me->extent (me, a));
       if (ext.is_empty ())
        programming_error ("I'm empty. Can't align on self");
       else
-       return scm_make_real (- ext.linear_combination (ly_scm2double (align)));
+       return scm_make_real (- ext.linear_combination (scm_to_double (align)));
     }
   return scm_make_real (0.0);
 }