From: Han-Wen Nienhuys Date: Wed, 31 Jan 2007 16:30:36 +0000 (+0100) Subject: remove Auto_beam_engraver::start_translation_timestep. X-Git-Tag: release/2.11.15-1~13 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7ee8350606adbc387625e8a1b272a9837a73b73b;p=lilypond.git remove Auto_beam_engraver::start_translation_timestep. Fold into process_music() and stop_translation_timestep() --- diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index e2fdcc9595..cd5402b2a0 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -89,10 +89,7 @@ void Ambitus_engraver::process_music () { /* - * Ensure that ambitus is created in the very first timestep (on - * which lily does not call start_translation_timestep ()). - * Otherwise, if a voice begins with a rest, the ambitus grob will - * be placed after the rest. + * Ensure that ambitus is created in the very first timestep */ if (!ambitus_) create_ambitus (); diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 9f5e53da69..481625606f 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -27,7 +27,6 @@ class Auto_beam_engraver : public Engraver protected: void stop_translation_timestep (); - void start_translation_timestep (); void process_music (); virtual void finalize (); virtual void derived_mark () const; @@ -106,6 +105,16 @@ Auto_beam_engraver::check_bar_property () void Auto_beam_engraver::process_music () { + /* + don't beam over skips + */ + if (stems_) + { + Moment now = now_mom (); + if (extend_mom_ < now) + end_beam (); + } + if (scm_is_string (get_property ("whichBar"))) { consider_end (shortest_mom_); @@ -273,26 +282,12 @@ Auto_beam_engraver::typeset_beam () } } -void -Auto_beam_engraver::start_translation_timestep () -{ - process_acknowledged_count_ = 0; - /* - don't beam over skips - */ - if (stems_) - { - Moment now = now_mom (); - if (extend_mom_ < now) - end_beam (); - } - forbid_ = 0; -} - void Auto_beam_engraver::stop_translation_timestep () { typeset_beam (); + process_acknowledged_count_ = 0; + forbid_ = 0; } void