* The grand 2005-2006 replace.

[lilypond.git] / lily / auto-beam-engraver.cc

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 2a90c3e3c50b8a8a982c6b3c4666530aa7c64530..54949f63b7d66a7b9d4177a7e4a637bc88331541 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -240,9 +240,7 @@ void
 Auto_beam_engraver::end_beam ()
 {
   if (stems_->size () < 2)
-    {
-      junk_beam ();
-    }
+    junk_beam ();
   else
     {
       finished_beam_ = create_beam ();
@@ -304,16 +302,13 @@ Auto_beam_engraver::finalize ()
 }
 
 
-
 void
 Auto_beam_engraver::acknowledge_beam (Grob_info info)
 {
   (void)info;
   check_bar_property ();
   if (stems_)
-    {
-      end_beam ();
-    }
+    end_beam ();
 }
 
 void
@@ -339,7 +334,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
 {
   check_bar_property ();
   Item *stem = dynamic_cast<Item *> (info.grob ());
-  Music *m = info.music_cause ();
+  Music *m = info.ultimate_music_cause ();
   if (!m->is_mus_type ("rhythmic-event"))
     {
       programming_error ("stem must have rhythmic structure");