* buildscripts/mf-to-table.py (base): remove AFM support.

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

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index c8ed412989304970bbba112465bdde5266285a29..88fb549dea0500a95096f6ca145138868626b539 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -6,10 +6,10 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "break-align-interface.hh"
 
-#include <cmath>
+#include <math.h>
 
+#include "break-align-interface.hh"
 #include <libc-extension.hh>   // isinf
 
 #include "self-alignment-interface.hh"
@@ -91,7 +91,7 @@ Break_align_interface::ordered_elements (Grob *grob)
     {
       SCM sym = scm_car (order);
       
-      for (SCM s =elts; scm_is_pair (s); s = scm_cdr (s))
+      for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
        {
          Grob *g = unsmob_grob (scm_car (s));
          if (g && sym == g->get_property ("break-align-symbol"))
@@ -120,7 +120,7 @@ Break_align_interface::do_alignment (Grob *grob)
   Array<Interval> extents;
 
   int last_nonempty = -1; 
-  for (int i=0; i < elems.size (); i++) 
+  for (int i = 0; i < elems.size (); i++) 
     {
       Interval y = elems[i]->extent (elems[i], X_AXIS);
       extents.push (y);
@@ -134,7 +134,7 @@ Break_align_interface::do_alignment (Grob *grob)
   
   Array<Real> offsets;
   offsets.set_size (elems.size ());
-  for (int i= 0; i < offsets.size ();i ++)
+  for (int i = 0; i < offsets.size ();i ++)
     offsets[i] = 0.0;
 
 
@@ -169,10 +169,10 @@ Break_align_interface::do_alignment (Grob *grob)
                == ly_symbol2scm ( "left-edge"))
              edge_idx = idx;
            
-           SCM l =elt->get_property ("space-alist");
+           SCM l = elt->get_property ("space-alist");
            if (scm_is_pair (l))
              {
-               alist= l;
+               alist = l;
                break;
              }
          }
@@ -187,7 +187,7 @@ Break_align_interface::do_alignment (Grob *grob)
       for (SCM s = r ? r->get_property ("elements") : SCM_EOL;
           !scm_is_symbol (rsym) && scm_is_pair (s); s = scm_cdr (s))
        {
-         Grob * elt =unsmob_grob (scm_car (s));
+         Grob * elt = unsmob_grob (scm_car (s));
 
          rsym = elt->get_property ("break-align-symbol");
        }
@@ -246,8 +246,8 @@ Break_align_interface::do_alignment (Grob *grob)
   Real here = 0.0;
   Interval total_extent;
 
-  Real alignment_off =0.0;  
-  for (int i =0 ; i < offsets.size (); i++)
+  Real alignment_off = 0.0;  
+  for (int i = 0 ; i < offsets.size (); i++)
     {
       here += offsets[i];
       if (i == edge_idx)
@@ -264,7 +264,7 @@ Break_align_interface::do_alignment (Grob *grob)
     alignment_off = -total_extent[LEFT];
 
   here = alignment_off;
-  for (int i =0 ; i < offsets.size (); i++)
+  for (int i = 0 ; i < offsets.size (); i++)
     {
       here += offsets[i];
       elems[i]->translate_axis (here, X_AXIS);