* lily/open-type-font.cc (load_scheme_table): new function

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

diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc
index c9751f049bec5704c130836c317aaa7dafac57a1..21354a5f3245420b31b659964feaff19205be1d8 100644 (file)
--- a/lily/beaming-info.cc
+++ b/lily/beaming-info.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -33,12 +33,12 @@ Beaming_info_list::best_splitpoint_index (Moment &beat_length,bool subdivide) co
   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 ();
       if (infos_[i].beams_i_drul_[LEFT] == infos_[i-1].beams_i_drul_[RIGHT] && !subdivide)
-       den *= 4;
+       den *= 2;
       if (den < minden)
        {
          minidx = i;
@@ -46,7 +46,7 @@ Beaming_info_list::best_splitpoint_index (Moment &beat_length,bool subdivide) co
        }
     }
 
-  return minidx|(minden==1 && subdivide ? at_beat : 0);
+  return minidx|(minden ==1 && subdivide ? at_beat : 0);
 }
 
 int
@@ -88,9 +88,7 @@ Beaming_info_list::beamify (Moment &beat_length,bool subdivide)
   do
     {
       if (splits[d].infos_.size () != 1)
-       {
-         splits[d].infos_.boundary (-d, 0).beams_i_drul_[-d] = middle_beams;
-       }
+       splits[d].infos_.boundary (-d, 0).beams_i_drul_[-d] = middle_beams;
     }
   while (flip (&d) != LEFT);