* flower

[lilypond.git] / lily / beaming-info.cc

diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc
index 6e3841330cd51afb2293e5844a88970def7d2694..1e2f3f4f4deea677ad4f331ae248a1d6bd6b2347 100644 (file)
--- a/lily/beaming-info.cc
+++ b/lily/beaming-info.cc
@@ -1,11 +1,10 @@
-/*   
-     beaming-info.cc -- implement Beaming_info, Beaming_info_list
-  
+/*
+  beaming-info.cc -- implement Beaming_info, Beaming_info_list
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
 
 #include "beaming.hh"
 
@@ -13,14 +12,14 @@ Beaming_info::Beaming_info ()
 {
   start_mom_ = 0;
   beams_i_drul_[LEFT] = 0;
-  beams_i_drul_[RIGHT] = 0;  
+  beams_i_drul_[RIGHT] = 0;
 }
 
 Beaming_info::Beaming_info (Moment m, int i)
 {
   start_mom_ = m;
   beams_i_drul_[LEFT] = i;
-  beams_i_drul_[RIGHT] = i;  
+  beams_i_drul_[RIGHT] = i;
 }
 
 const int infinity_i = INT_MAX;        // guh.
@@ -37,7 +36,7 @@ Beaming_info_list::best_splitpoint_index (Moment &beat_length, bool subdivide) c
     {
       beat_pos = infos_[i].start_mom_ / beat_length;
       int den = beat_pos.den ();
-      if (infos_[i].beams_i_drul_[LEFT] == infos_[i-1].beams_i_drul_[RIGHT] && !subdivide)
+      if (infos_[i].beams_i_drul_[LEFT] == infos_[i - 1].beams_i_drul_[RIGHT] && !subdivide)
        den *= 2;
       if (den < minden)
        {
@@ -46,7 +45,7 @@ Beaming_info_list::best_splitpoint_index (Moment &beat_length, bool subdivide) c
        }
     }
 
-  return minidx|(minden ==1 && subdivide ? at_beat : 0);
+  return minidx| (minden ==1 && subdivide ? at_beat : 0);
 }
 
 int
@@ -55,9 +54,9 @@ Beaming_info_list::beam_extend_count (Direction d) const
   if (infos_.size () == 1)
     return infos_[0].beams_i_drul_[d];
 
-  Beaming_info thisbeam  = infos_.boundary (d, 0);
-  Beaming_info next  = infos_.boundary (d, 1);
-  
+  Beaming_info thisbeam = infos_.boundary (d, 0);
+  Beaming_info next = infos_.boundary (d, 1);
+
   return thisbeam.beams_i_drul_[-d] <? next.beams_i_drul_[d];
 }
 
@@ -66,15 +65,15 @@ Beaming_info_list::beamify (Moment &beat_length, bool subdivide)
 {
   if (infos_.size () <= 1)
     return;
-      
+
   Drul_array<Beaming_info_list> splits;
   int m = best_splitpoint_index (beat_length, subdivide);
-  bool split = subdivide && (m & at_beat);  m = m & ~at_beat;
+  bool split = subdivide && (m & at_beat); m = m & ~at_beat;
   splits[LEFT].infos_ = infos_.slice (0, m);
   splits[RIGHT].infos_ = infos_.slice (m, infos_.size ());
 
   Direction d = LEFT;
- 
+
   do
     {
       splits[d].beamify (beat_length, subdivide);