X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fauto-beam-engraver.cc;h=4c813a7038264d3fb0a30b14fbe29e1439a83aed;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=a98b05f48d953384474d5e5996fb023062b02eb1;hpb=bcb3c657a4c434934327edf0fcdbdbaf7d5667dd;p=lilypond.git diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index a98b05f48d..4c813a7038 100644 --- 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 + (c) 1999--2009 Jan Nieuwenhuizen */ #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,7 +382,8 @@ 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, now); @@ -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 */ + "" + );