lilypond-1.1.48

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 4e383675d7a8b154295f843f34a626c1cfdeaded..07cd63aa6ca845a1d8107be5c5c3ae2d879f1766 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -22,7 +22,6 @@ ADD_THIS_TRANSLATOR (Auto_beam_engraver);
 Auto_beam_engraver::Auto_beam_engraver ()
 {
   stem_l_arr_p_ = 0;
-  //shortest_mom_ = 1;
   shortest_mom_ = Moment (1, 8);
   finished_beam_p_ = 0;
   finished_grouping_p_ = 0;
@@ -156,7 +155,6 @@ Auto_beam_engraver::consider_end_and_begin ()
 void
 Auto_beam_engraver::begin_beam ()
 {
-  //  DOUT << String ("starting autobeam at: ") + now_mom ().str () + "\n";
   assert (!stem_l_arr_p_);
   stem_l_arr_p_ = new Array<Stem*>;
   assert (!grouping_p_);
@@ -198,7 +196,6 @@ Auto_beam_engraver::end_beam ()
       delete stem_l_arr_p_;
       stem_l_arr_p_ = 0;
       grouping_p_ = 0;
-      //shortest_mom_ = 1;
       shortest_mom_ = Moment (1, 8);
     }
 }
@@ -310,8 +307,6 @@ Auto_beam_engraver::acknowledge_element (Score_element_info info)
            }
          grouping_p_->add_child (start, rhythmic_req->length_mom ());
 
-         //stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
-         
          stem_l_arr_p_->push (stem_l);
          Moment now = now_mom ();
          last_add_mom_ = now;
@@ -331,7 +326,6 @@ Auto_beam_engraver::junk_beam ()
   stem_l_arr_p_ = 0;
   delete grouping_p_;
   grouping_p_ = 0;
-  //shortest_mom_ = 1;
   shortest_mom_ = Moment (1, 8);
 }
 

diff --git a/lily/slur.cc b/lily/slur.cc
index 5d04e5fae87775741b1b40c4a73ee96348e75e19..580974a888e19eac864cceab4a0201a1120f38f1 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -316,28 +316,34 @@ Slur::get_encompass_offset_arr () const
   int first = 1;
   int last = encompass_arr_.size () - 1;
 
+
+  Array<Offset> notes;
+  notes.push (Offset (0,0));
+
   // prebreak
   if (broken_edge_b (RIGHT))
     last++;
-
+  else
+    {
+      Encompass_info info (encompass_arr_.top (), dir_, this);
+      d[Y_AXIS] += info.interstaff_f_;
+    }
+  
   // postbreak
   if (broken_edge_b (LEFT))
     first--;
+  else
+    {
+      Encompass_info info (encompass_arr_[0], dir_, this);
+      notes[0][Y_AXIS] += info.interstaff_f_;
+    }
 
-  Array<Offset> notes;
-  notes.push (Offset (0,0));
-
-  Real dy =0.0;
-  for (int i = 0; i < last; i++)
+  for (int i = first; i < last; i++)
     {
       Encompass_info info (encompass_arr_[i], dir_, this);
-      if (i >= first)
-       notes.push (info.o_ - left);
-      else
-       dy = info.interstaff_f_;
+      notes.push (info.o_ - left);
     }
 
-  notes[0][Y_AXIS] += dy;
   notes.push (d);
   
   return notes;