new file.

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index cd40632eb825a93a8093a714e3e7fe636b97e9df..0486f09d3a68b2cf7a5e5f345f4920f85340d26f 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -1,20 +1,19 @@
 /*   
-  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 "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)
 {
@@ -28,7 +27,7 @@ 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)
 {
@@ -56,18 +55,18 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
   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");
 
-  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);
@@ -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++)
     {
@@ -136,12 +135,12 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
   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);          
@@ -167,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)
@@ -199,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 ())
        {
@@ -231,16 +230,16 @@ Align_interface::axis (Grob*me)
 }
 
 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);
 }