* lily/include/group-interface.hh (extract_grob_array): rename

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 1fe7d172ba7beddd0826438ae0ea122f3053db05..89c19910771b013470895d1bbf9f32129816881e 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -1,25 +1,24 @@
 /*   
-  align-interface.cc --  implement Align_interface
+  align-interface.cc -- implement Align_interface
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "align-interface.hh"
-#include "grob.hh"
-#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);
+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")))
     {
@@ -28,12 +27,12 @@ Align_interface::alignment_callback (SCM element_smob, SCM axis)
   return scm_make_real (0.0);
 }
 
-MAKE_SCHEME_CALLBACK (Align_interface,fixed_distance_alignment_callback,2);
+MAKE_SCHEME_CALLBACK (Align_interface, fixed_distance_alignment_callback, 2);
 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,22 +51,22 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
   
   SCM d =   me->get_property ("stacking-dir");
   
-  Direction stacking_dir = is_number (d) ? to_dir (d) : CENTER;
+  Direction stacking_dir = scm_is_number (d) ? to_dir (d) : CENTER;
   if (!stacking_dir)
     stacking_dir = DOWN;
 
-  Real dy = robust_scm2double (me->get_property ("forced-distance"),0.0);
+  Real dy = robust_scm2double (me->get_property ("forced-distance"), 0.0);
   
   Link_array<Grob> elems
-    = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
+    = extract_grob_array (me, ly_symbol2scm ("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
@@ -82,11 +81,11 @@ 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);
     }
 
-  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);
@@ -94,7 +93,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
     }
 
   /*
-    TODO: support self-alignment-{Y,X}
+    TODO: support self-alignment-{Y, X}
    */
   for (int i = 0; i < translates.size (); i++)
     {
@@ -124,23 +123,24 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
   
   SCM d =   me->get_property ("stacking-dir");
   
-  Direction stacking_dir = is_number (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++) 
+    = extract_grob_array (me, ly_symbol2scm ("elements"));
+  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 (is_number (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,20 +226,20 @@ 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
-Align_interface::add_element (Grob*me,Grob* s, SCM cb)
+Align_interface::add_element (Grob*me, Grob* s, SCM cb)
 {
   s->add_offset_callback (cb, Align_interface::axis (me));
   Axis_group_interface::add_element (me, s);
 }
 
 void
-Align_interface::set_axis (Grob*me,Axis a)
+Align_interface::set_axis (Grob*me, Axis a)
 {
-  Axis_group_interface::set_axes (me, a,a);
+  Axis_group_interface::set_axes (me, a, a);
 }
 
 
@@ -253,7 +253,7 @@ find_fixed_alignment_parent  (Grob *g)
 {
   while (g)
     {
-      if (is_number (g->get_property ("forced-distance")))
+      if (scm_is_number (g->get_property ("forced-distance")))
        return g;
 
       g = g->get_parent (Y_AXIS);