* mf/merge.pe.in: Set font names, version, license GPL.

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 74797b2d6ca343466f4013aa1cd5d1b28a1532d8..02d1f4e7d7a7a7775d316588c12beaf86337adc5 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -6,10 +6,11 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "rest-collision.hh"
+
 #include <math.h>              // ceil.
 
 #include "warn.hh"
-#include "rest-collision.hh"
 #include "note-column.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
@@ -119,7 +120,7 @@ Rest_collision::do_shift (Grob *me)
        center one should be centered on the staff.
        */
       Drul_array< Link_array <Grob > > ordered_rests;
-      for (int i= 0; i < rests.size (); i++)
+      for (int i = 0; i < rests.size (); i++)
        {
          Grob * r = Note_column::get_rest (rests[i]);
          
@@ -189,7 +190,7 @@ Rest_collision::do_shift (Grob *me)
       Grob * rcol = 0;
       Direction dir = CENTER;
 
-      for (int i= rests.size (); !rcol && i--;)
+      for (int i = rests.size (); !rcol && i--;)
        if (Note_column::dir (rests[i]))
          {
            dir = Note_column::dir (rests[i]);