* lily/context.cc (Context): take key argument in ctor.

[lilypond.git] / lily / align-interface.cc

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 3928ae8f6eb13cdd9184c1a5e27fa3b11bbdd0fe..cd40632eb825a93a8093a714e3e7fe636b97e9df 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -12,14 +12,14 @@
 #include "group-interface.hh"
 #include "axis-group-interface.hh"
 #include "hara-kiri-group-spanner.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 
 MAKE_SCHEME_CALLBACK (Align_interface,alignment_callback,2);
 SCM
 Align_interface::alignment_callback (SCM element_smob, SCM axis)
 {
   Grob * me = unsmob_grob (element_smob);
-  Axis ax = (Axis)ly_scm2int (axis);
+  Axis ax = (Axis)scm_to_int (axis);
   Grob * par = me->get_parent (ax);
   if (par && !to_boolean (par->get_property ("positioning-done")))
     {
@@ -33,7 +33,7 @@ SCM
 Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis)
 {
   Grob * me = unsmob_grob (element_smob);
-  Axis ax = (Axis)ly_scm2int (axis);
+  Axis ax = (Axis)scm_to_int (axis);
   Grob * par = me->get_parent (ax);
   if (par && !to_boolean (par->get_property ("positioning-done")))
     {
@@ -52,7 +52,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
   
   SCM d =   me->get_property ("stacking-dir");
   
-  Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
+  Direction stacking_dir = scm_is_number (d) ? to_dir (d) : CENTER;
   if (!stacking_dir)
     stacking_dir = DOWN;
 
@@ -82,7 +82,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
          && Hara_kiri_group_spanner::has_interface (elems[j]))
        Hara_kiri_group_spanner::consider_suicide (elems[j]);
 
-      if (!elems[j]->live ())
+      if (!elems[j]->is_live ())
        elems.del (j);
     }
 
@@ -124,11 +124,12 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
   
   SCM d =   me->get_property ("stacking-dir");
   
-  Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
+  Direction stacking_dir = scm_is_number (d) ? to_dir (d) : CENTER;
   if (!stacking_dir)
     stacking_dir = DOWN;
   
-  Interval threshold  = robust_scm2interval ( me->get_property ("threshold"), Interval (0, Interval::infinity ()));
+  Interval threshold = robust_scm2interval (me->get_property ("threshold"),
+                                           Interval (0, Interval::infinity ()));
   
   Array<Interval> dims;
 
@@ -216,8 +217,8 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
        FIXME: uncommenting freaks out the Y-alignment of
        line-of-score.
        */
-      if (ly_c_number_p (align))
-       center_offset = total.linear_combination (ly_scm2double (align));
+      if (scm_is_number (align))
+       center_offset = total.linear_combination (scm_to_double (align));
 
       for (int j = 0 ;  j < all_grobs.size (); j++)
        all_grobs[j]->translate_axis (all_translates[j] - center_offset, a);
@@ -226,7 +227,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
 Axis
 Align_interface::axis (Grob*me)
 {
-  return  Axis (ly_scm2int (ly_car (me->get_property ("axes"))));
+  return  Axis (scm_to_int (scm_car (me->get_property ("axes"))));
 }
 
 void
@@ -253,7 +254,7 @@ find_fixed_alignment_parent  (Grob *g)
 {
   while (g)
     {
-      if (ly_c_number_p (g->get_property ("forced-distance")))
+      if (scm_is_number (g->get_property ("forced-distance")))
        return g;
 
       g = g->get_parent (Y_AXIS);