X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeaming-info.cc;h=63f845489b09b96866dc961f66a22edc19050c47;hb=4348b2762d1101d731add0c01bb77a9ce162efec;hp=1e2f3f4f4deea677ad4f331ae248a1d6bd6b2347;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc
index 1e2f3f4f4d..63f845489b 100644
--- a/lily/beaming-info.cc
+++ b/lily/beaming-info.cc
@@ -22,17 +22,16 @@ Beaming_info::Beaming_info (Moment m, int i)
   beams_i_drul_[RIGHT] = i;
 }
 
-const int infinity_i = INT_MAX;	// guh.
-const int at_beat = 1<<15;
+const int at_beat = 1 << 15;
 
 int
 Beaming_info_list::best_splitpoint_index (Moment &beat_length, bool subdivide) const
 {
-  int minden = infinity_i;
+  int minden = INT_MAX;
   int minidx = -1;
   Moment beat_pos;
 
-  for (int i =1; i < infos_.size (); i++)
+  for (int i = 1; i < infos_.size (); i++)
     {
       beat_pos = infos_[i].start_mom_ / beat_length;
       int den = beat_pos.den ();
@@ -45,7 +44,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
@@ -57,7 +56,7 @@ Beaming_info_list::beam_extend_count (Direction d) const
   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];
+  return min (thisbeam.beams_i_drul_[-d], next.beams_i_drul_[d]);
 }
 
 void
@@ -75,14 +74,13 @@ Beaming_info_list::beamify (Moment &beat_length, bool subdivide)
   Direction d = LEFT;
 
   do
-    {
-      splits[d].beamify (beat_length, subdivide);
-    }
-  while (flip (&d) != LEFT);
+    splits[d].beamify (beat_length, subdivide);
+  while (flip (&d) != LEFT)
+    ;
 
-  int middle_beams = (split ? 1 :
-		      splits[RIGHT].beam_extend_count (LEFT) <?
-		      splits[LEFT].beam_extend_count (RIGHT));
+  int middle_beams = (split ? 1
+		      : min (splits[RIGHT].beam_extend_count (LEFT),
+			     splits[LEFT].beam_extend_count (RIGHT)));
 
   do
     {
@@ -93,6 +91,8 @@ Beaming_info_list::beamify (Moment &beat_length, bool subdivide)
 
   infos_ = splits[LEFT].infos_;
   infos_.concat (splits[RIGHT].infos_);
+
+  clip_edges ();
 }
 
 void
@@ -100,3 +100,13 @@ Beaming_info_list::add_stem (Moment m, int b)
 {
   infos_.push (Beaming_info (m, b));
 }
+
+void
+Beaming_info_list::clip_edges ()
+{
+  if (infos_.size ())
+    {
+      infos_[0].beams_i_drul_[LEFT] = 0;
+      infos_.top().beams_i_drul_[RIGHT] = 0;
+    }
+}