Merge branch 'stable'

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

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 481625606fa2056cd78c7ec46d64f9a8668f2ac4..af4f1fc2d9fc6ae4fae6ad689fe39bcb6df0ea80 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--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "bar-line.hh"
@@ -302,27 +302,24 @@ Auto_beam_engraver::finalize ()
 
 
 void
-Auto_beam_engraver::acknowledge_beam (Grob_info info)
+Auto_beam_engraver::acknowledge_beam (Grob_info /* info */)
 {
-  (void)info;
   check_bar_property ();
   if (stems_)
     end_beam ();
 }
 
 void
-Auto_beam_engraver::acknowledge_bar_line (Grob_info info)
+Auto_beam_engraver::acknowledge_bar_line (Grob_info /* info */)
 {
-  (void)info;
   check_bar_property ();
   if (stems_)
     end_beam ();
 }
 
 void
-Auto_beam_engraver::acknowledge_rest (Grob_info info)
+Auto_beam_engraver::acknowledge_rest (Grob_info /* info */)
 {
-  (void)info;
   check_bar_property ();
   if (stems_)
     end_beam ();
@@ -385,10 +382,11 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
     return;
 
   grouping_->add_stem (now - beam_start_moment_ + beam_start_location_,
-                      durlog - 2);
+                      durlog - 2,
+                      Stem::is_invisible (stem));
   stems_->push_back (stem);
   last_add_mom_ = now;
-  extend_mom_ = max (extend_mom_, now) + get_event_length (ev);
+  extend_mom_ = max (extend_mom_, now) + get_event_length (ev, now);
 }
 
 void
@@ -423,12 +421,16 @@ ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line);
 ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
 ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
 ADD_TRANSLATOR (Auto_beam_engraver,
-               /* doc */ "Generate beams based on measure characteristics and observed "
-               "Stems.  Uses beatLength, measureLength and measurePosition to decide "
-               "when to start and stop a beam.  Overriding beaming is done through "
-               "@ref{Stem_engraver} properties @code{stemLeftBeamCount} and "
-               "@code{stemRightBeamCount}. ",
-               /* create */ "Beam",
+               /* doc */
+               "Generate beams based on measure characteristics and observed"
+               " Stems.  Uses @code{beatLength}, @code{measureLength}, and"
+               " @code{measurePosition} to decide when to start and stop a"
+               " beam.  Overriding beaming is done through"
+               " @ref{Stem_engraver} properties @code{stemLeftBeamCount} and"
+               " @code{stemRightBeamCount}.",
+
+               /* create */
+               "Beam ",
 
                /* read */
                "autoBeaming "
@@ -436,4 +438,6 @@ ADD_TRANSLATOR (Auto_beam_engraver,
                "beatLength "
                "subdivideBeams ",
                
-               /* write */ "");
+               /* write */
+               ""
+               );