* scm/output-svg.scm:

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index b3bbf6a07c4f74ee25ec5fbaebadbb6477a0751c..31707ec3270874f273fb60ff1bc5bf9f154bd7d3 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -8,8 +8,7 @@
  */
 
 #include "align-interface.hh"
-#include "grob.hh"
-#include "group-interface.hh"
+
 #include "axis-group-interface.hh"
 #include "hara-kiri-group-spanner.hh"
 #include "output-def.hh"
@@ -19,7 +18,7 @@ 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 +32,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 +51,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;
 
@@ -61,13 +60,13 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
   Link_array<Grob> elems
     = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
 
-  Real where_f=0;
+  Real where_f = 0;
 
   Interval v;
   v.set_empty ();
   Array<Real> translates;
   
-  for (int j= elems.size (); j--; ) 
+  for (int j = elems.size (); j--; ) 
     {
       /*
        This is not very elegant, in that we need special support for
@@ -86,7 +85,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
        elems.del (j);
     }
 
-  for (int j =0; j < elems.size (); j++)
+  for (int j = 0; j < elems.size (); j++)
     {
       where_f += stacking_dir * dy;
       translates.push (where_f);
@@ -124,23 +123,24 @@ 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;
 
   Link_array<Grob> elems;
   Link_array<Grob> all_grobs
     = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
-  for (int i=0; i < all_grobs.size (); i++) 
+  for (int i = 0; i < all_grobs.size (); i++) 
     {
       Interval y = all_grobs[i]->extent (me, a);
       if (!y.is_empty ())
        {
-         Grob *e =dynamic_cast<Grob*> (all_grobs[i]);
+         Grob *e = dynamic_cast<Grob*> (all_grobs[i]);
 
          elems.push (e);
          dims.push (y);          
@@ -166,9 +166,9 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
   
   Array<Real> translates ;
   Interval total;
-  Real where_f=0;
+  Real where_f = 0;
   
-  for (int j=0 ;  j < elems.size (); j++) 
+  for (int j = 0 ;  j < elems.size (); j++) 
     {
       Real dy = -  dims[j][-stacking_dir];
       if (j)
@@ -198,8 +198,8 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
   Array<Real> all_translates;
   if (translates.size ())
     {
-      int i =0;
-      int j =0;
+      int i = 0;
+      int j = 0;
       Real w = translates[0];
       while (j  < all_grobs.size ())
        {
@@ -216,8 +216,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 +226,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 +253,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);