Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 481625606fa2056cd78c7ec46d64f9a8668f2ac4..7c9927d467eaf5713b0e563f80daf5e6842a0887 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -388,7 +388,7 @@ Auto_beam_engraver::acknowledge_stem (Grob_info info)
                       durlog - 2);
   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 +423,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 +440,6 @@ ADD_TRANSLATOR (Auto_beam_engraver,
                "beatLength "
                "subdivideBeams ",
                
-               /* write */ "");
+               /* write */
+               ""
+               );