-/*
- auto-beam-engraver.cc -- implement Auto_beam_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-
- */
-
-#include "beaming.hh"
-#include "musical-request.hh"
+/*
+ This file is part of LilyPond, the GNU music typesetter.
+
+ Copyright (C) 1999--2015 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "beaming-pattern.hh"
#include "beam.hh"
-#include "stem.hh"
-#include "debug.hh"
-#include "engraver-group-engraver.hh"
-#include "bar.hh"
-#include "rest.hh"
+#include "context.hh"
+#include "context-handle.hh"
+#include "duration.hh"
#include "engraver.hh"
+#include "grob-properties.hh"
#include "item.hh"
+#include "rest.hh"
#include "spanner.hh"
+#include "stream-event.hh"
+#include "stem.hh"
+#include "warn.hh"
+
+#include "translator.icc"
-/*
- TODO: figure what to do in grace?
- */
class Auto_beam_engraver : public Engraver
{
-public:
- Auto_beam_engraver ();
- VIRTUAL_COPY_CONS (Translator);
+ TRANSLATOR_DECLARATIONS (Auto_beam_engraver);
protected:
- virtual void do_pre_move_processing ();
- virtual void do_post_move_processing ();
- virtual void do_removal_processing ();
- virtual void acknowledge_element (Score_element_info);
- virtual void process_acknowledged ();
+ void stop_translation_timestep ();
+ void process_acknowledged ();
+
+ virtual void process_music ();
+ virtual void finalize ();
+ virtual void derived_mark () const;
+
+ DECLARE_ACKNOWLEDGER (rest);
+ DECLARE_ACKNOWLEDGER (beam);
+ DECLARE_ACKNOWLEDGER (bar_line);
+ DECLARE_ACKNOWLEDGER (breathing_sign);
+ DECLARE_ACKNOWLEDGER (stem);
+ DECLARE_TRANSLATOR_LISTENER (beam_forbid);
private:
+ virtual bool test_moment (Direction, Moment, Moment);
+ void consider_begin (Moment, Moment);
+ void consider_end (Moment, Moment);
+ Spanner *create_beam ();
void begin_beam ();
- void consider_end_and_begin (Moment test_mom);
- Spanner* create_beam_p ();
void end_beam ();
void junk_beam ();
- bool same_grace_state_b (Score_element* e);
+ virtual bool is_same_grace_state (Moment, Moment);
+ void recheck_beam ();
void typeset_beam ();
+ vector<Item *> *remove_end_stems (vsize);
+ Stream_event *forbid_;
+ /*
+ shortest_mom_ is the shortest note in the beam.
+ */
Moment shortest_mom_;
- Spanner *finished_beam_p_;
- Link_array<Item>* stem_l_arr_p_;
-
+ Spanner *finished_beam_;
+ vector<Item *> *stems_;
+
+ int process_acknowledged_count_;
Moment last_add_mom_;
+ /*
+ Projected ending of the beam we're working on.
+ */
Moment extend_mom_;
Moment beam_start_moment_;
Moment beam_start_location_;
-
+ /*
+ Handle on the starting staff keeps it alive until beam is comlete
+ */
+ Context_handle beam_start_context_;
+
// We act as if beam were created, and start a grouping anyway.
- Beaming_info_list*grouping_p_;
- Beaming_info_list*finished_grouping_p_;
-};
+ Beaming_pattern *grouping_;
+ SCM beam_settings_;
-ADD_THIS_TRANSLATOR (Auto_beam_engraver);
+ Beaming_pattern *finished_grouping_;
-Auto_beam_engraver::Auto_beam_engraver ()
+ Beaming_options beaming_options_;
+ Beaming_options finished_beaming_options_;
+
+ void check_bar_property ();
+};
+
+void
+Auto_beam_engraver::derived_mark () const
{
- stem_l_arr_p_ = 0;
- shortest_mom_ = Moment (1, 8);
- finished_beam_p_ = 0;
- finished_grouping_p_ = 0;
- grouping_p_ = 0;
+ scm_gc_mark (beam_settings_);
}
void
-Auto_beam_engraver::consider_end_and_begin (Moment test_mom)
+Auto_beam_engraver::check_bar_property ()
{
- SCM wild = gh_list (ly_symbol2scm ("*"), ly_symbol2scm ("*"), SCM_UNDEFINED);
- SCM b = gh_list (ly_symbol2scm ("begin"), SCM_UNDEFINED);
- SCM e = gh_list (ly_symbol2scm ("end"), SCM_UNDEFINED);
-
- Moment one_beat = *unsmob_moment( get_property ("beatLength"));
- int num = *unsmob_moment (get_property("measureLength")) / one_beat;
- int den = one_beat.den_i ();
- SCM time = gh_list (gh_int2scm (num), gh_int2scm (den), SCM_UNDEFINED);
+ /* Duplicated from process_music (), since
+ Repeat_acknowledge_engraver::process_music () may also set whichBar. */
- SCM type = gh_list (gh_int2scm (test_mom.num_i ()),
- gh_int2scm (test_mom.den_i ()), SCM_UNDEFINED);
+ Moment now = now_mom ();
+ if (scm_is_string (get_property ("whichBar"))
+ && beam_start_moment_ < now)
+ {
+ consider_end (measure_position (context ()), shortest_mom_);
+ junk_beam ();
+ }
+}
- SCM settings = get_property ("autoBeamSettings");
-
+void
+Auto_beam_engraver::process_music ()
+{
+ Moment now = now_mom ();
/*
- Determine end moment for auto beaming (and begin, mostly 0==anywhere)
- In order of increasing priority:
+ don't beam over skips
+ */
+ if (stems_)
+ {
+ if (extend_mom_ < now)
+ end_beam ();
+ }
- i. every beat
- ii. end * <num> <den>
- iii. end <type> <num> <den>
+ if (scm_is_string (get_property ("whichBar")))
+ {
+ consider_end (measure_position (context ()), shortest_mom_);
+ junk_beam ();
+ }
- iv. end * * *
- v. end <type> * *
+ if (forbid_)
+ {
+ if (stems_)
+ end_beam ();
+ else
+ junk_beam ();
+ }
+}
+Auto_beam_engraver::Auto_beam_engraver ()
+{
+ forbid_ = 0;
+ process_acknowledged_count_ = 0;
+ stems_ = 0;
+ shortest_mom_ = Moment (Rational (1, 4));
+ extend_mom_ = Moment (-1);
+ finished_beam_ = 0;
+ finished_grouping_ = 0;
+ grouping_ = 0;
+ beam_settings_ = SCM_EOL;
+}
- Rationale:
+IMPLEMENT_TRANSLATOR_LISTENER (Auto_beam_engraver, beam_forbid);
+void
+Auto_beam_engraver::listen_beam_forbid (Stream_event *ev)
+{
+ ASSIGN_EVENT_ONCE (forbid_, ev);
+}
- [to be defined in config file]
- i. easy catch-all rule
- ii. exceptions for time signature
- iii. exceptions for time signature, for specific duration type
+bool
+Auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment dur)
+{
+ return scm_is_true (scm_call_4 (get_property ("autoBeamCheck"),
+ context ()->self_scm (),
+ scm_from_int (dir),
+ test_mom.smobbed_copy (),
+ dur.smobbed_copy ()));
+}
- [user override]
- iv. generic override
- v. override for specific duration type
+void
+Auto_beam_engraver::consider_begin (Moment test_mom, Moment dur)
+{
+ bool on = to_boolean (get_property ("autoBeaming"));
+ if (!stems_ && on
+ && !forbid_)
+ {
+ bool b = test_moment (START, test_mom, dur);
+ if (b)
+ begin_beam ();
+ }
+}
- */
-
+void
+Auto_beam_engraver::consider_end (Moment test_mom, Moment dur)
+{
+ if (stems_)
+ {
+ /* Allow already started autobeam to end:
+ don't check for autoBeaming */
+ bool b = test_moment (STOP, test_mom, dur);
+ if (b)
+ end_beam ();
+ }
+}
- /*
- first guess: begin beam at any position
- */
- Moment begin_mom (0);
- /*
- first guess: end beam at end of beat
- */
- SCM one (get_property ("beatLength"));
+Spanner *
+Auto_beam_engraver::create_beam ()
+{
+ if (to_boolean (get_property ("skipTypesetting")))
+ return 0;
- Moment end_mom;
- if (unsmob_moment (one))
- end_mom = *unsmob_moment (one);
+ for (vsize i = 0; i < stems_->size (); i++)
+ if (Stem::get_beam ((*stems_)[i]))
+ return 0;
/*
- second guess: property generic time exception
+ Can't use make_spanner () because we have to use
+ beam_settings_.
*/
- SCM begin = gh_assoc (gh_append3 (b, wild, time), settings);
-
- if (begin != SCM_BOOL_F && unsmob_moment (gh_cdr (begin)))
- begin_mom = * unsmob_moment (gh_cdr (begin));
+ Spanner *beam = new Spanner (beam_settings_);
- SCM end = gh_assoc (gh_append3 (e, wild, time), settings);
- if (end != SCM_BOOL_F && unsmob_moment (gh_cdr (end)))
- end_mom = * unsmob_moment (gh_cdr (end));
+ for (vsize i = 0; i < stems_->size (); i++)
+ Beam::add_stem (beam, (*stems_)[i]);
- /*
- third guess: property time exception, specific for duration type
- */
- SCM begin_mult = gh_assoc (gh_append3 (b, type, time), settings);
- if (begin_mult != SCM_BOOL_F && unsmob_moment (gh_cdr (begin_mult)))
- begin_mom = * unsmob_moment (gh_cdr (begin_mult));
-
- SCM end_mult = gh_assoc (gh_append3 (e, type, time), settings);
- if (end_mult != SCM_BOOL_F && unsmob_moment (gh_cdr (end_mult)))
- end_mom = * unsmob_moment (gh_cdr (end_mult));
+ Grob_info i = make_grob_info (beam, (*stems_)[0]->self_scm ());
+ i.rerouting_daddy_context_ = beam_start_context_.get_context ();
+ announce_grob (i);
- /*
- fourth guess [user override]: property plain generic
- */
- begin = gh_assoc (gh_append3 (b, wild, wild), settings);
- if (begin != SCM_BOOL_F && unsmob_moment (gh_cdr (begin)))
- begin_mom = * unsmob_moment (gh_cdr (begin));
+ return beam;
+}
- end = gh_assoc (gh_append3 (e, wild, wild), settings);
- if (end != SCM_BOOL_F && unsmob_moment (gh_cdr (end)))
- end_mom = * unsmob_moment (gh_cdr (end));
+void
+Auto_beam_engraver::begin_beam ()
+{
+ if (stems_ || grouping_)
+ {
+ programming_error ("already have autobeam");
+ return;
+ }
- /*
- fifth guess [user override]: property plain, specific for duration type
- */
- begin_mult = gh_assoc (gh_append3 (b, type, wild), settings);
- if (begin_mult != SCM_BOOL_F && unsmob_moment (gh_cdr (begin_mult)))
- begin_mom = * unsmob_moment (gh_cdr (begin_mult));
-
- end_mult = gh_assoc (gh_append3 (e, type, wild), settings);
- if (end_mult != SCM_BOOL_F && unsmob_moment (gh_cdr (end_mult)))
- end_mom = * unsmob_moment (gh_cdr (end_mult));
-
- Rational r;
- if (end_mom)
- r = unsmob_moment (get_property ("measurePosition"))->mod_rat (end_mom);
- else
- r = Moment (1);
+ stems_ = new vector<Item *>;
+ grouping_ = new Beaming_pattern ();
+ beaming_options_.from_context (context ());
+ beam_settings_ = Grob_property_info (context (), ly_symbol2scm ("Beam")).updated ();
- if (stem_l_arr_p_ && stem_l_arr_p_->size () > 1 && !r)
- end_beam ();
+ beam_start_context_.set_context (context ()->get_parent_context ());
+ beam_start_moment_ = now_mom ();
+ beam_start_location_
+ = robust_scm2moment (get_property ("measurePosition"), Moment (0));
+}
- /*
- Allow already started autobeam to end
- */
- SCM on = get_property ("noAutoBeaming");
- if (to_boolean (on))
+void
+Auto_beam_engraver::junk_beam ()
+{
+ if (!stems_)
return;
- if (begin_mom)
- r = unsmob_moment (get_property ("measurePosition"))->mod_rat (begin_mom);
- if (!stem_l_arr_p_ && (!begin_mom || !r))
- begin_beam ();
+ delete stems_;
+ stems_ = 0;
+ delete grouping_;
+ grouping_ = 0;
+ beam_settings_ = SCM_EOL;
+
+ shortest_mom_ = Moment (Rational (1, 4));
+}
+
+bool
+Auto_beam_engraver::is_same_grace_state (Moment start, Moment now)
+{
+ return bool (start.grace_part_) == bool (now.grace_part_);
}
-
-Spanner*
-Auto_beam_engraver::create_beam_p ()
+
+
+void
+Auto_beam_engraver::end_beam ()
{
- Spanner* beam_p = new Spanner (get_property ("Beam"));
- Beam::set_interface (beam_p);
+ if (stems_->size () < 2)
+ junk_beam ();
+ else
+ {
+ finished_beam_ = create_beam ();
+
+ if (finished_beam_)
+ {
+ Grob_info i = make_grob_info (finished_beam_, SCM_EOL);
+ i.rerouting_daddy_context_ = beam_start_context_.get_context ();
+
+ announce_end_grob (i);
+ finished_grouping_ = grouping_;
+ finished_beaming_options_ = beaming_options_;
+ }
+ delete stems_;
+ stems_ = 0;
+ grouping_ = 0;
+ beam_settings_ = SCM_EOL;
+ }
- for (int i = 0; i < stem_l_arr_p_->size (); i++)
+ beam_start_context_.set_context (NULL);
+ shortest_mom_ = Moment (Rational (1, 4));
+}
+
+void
+Auto_beam_engraver::typeset_beam ()
+{
+ if (finished_beam_)
{
- /*
- watch out for stem tremolos and abbreviation beams
- */
- if (Stem::beam_l ((*stem_l_arr_p_)[i]))
- {
- return 0;
- }
- Beam::add_stem (beam_p,(*stem_l_arr_p_)[i]);
+ if (!finished_beam_->get_bound (RIGHT))
+ finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
+
+ finished_grouping_->beamify (finished_beaming_options_);
+ Beam::set_beaming (finished_beam_, finished_grouping_);
+ finished_beam_ = 0;
+
+ delete finished_grouping_;
+ finished_grouping_ = 0;
}
-
- announce_element (beam_p, 0);
+}
- return beam_p;
+void
+Auto_beam_engraver::stop_translation_timestep ()
+{
+ typeset_beam ();
+ process_acknowledged_count_ = 0;
+ forbid_ = 0;
}
void
-Auto_beam_engraver::begin_beam ()
+Auto_beam_engraver::finalize ()
{
- assert (!stem_l_arr_p_);
- stem_l_arr_p_ = new Link_array<Item>;
- assert (!grouping_p_);
- grouping_p_ = new Beaming_info_list;
- beam_start_moment_ = now_mom ();
- beam_start_location_ = *unsmob_moment (get_property ("measurePosition"));
+ /* finished beams may be typeset */
+ typeset_beam ();
+ /* but unfinished may need another announce/acknowledge pass */
+ if (stems_)
+ junk_beam ();
+}
+
+void
+Auto_beam_engraver::acknowledge_beam (Grob_info /* info */)
+{
+ check_bar_property ();
+ if (stems_)
+ end_beam ();
}
+void
+Auto_beam_engraver::acknowledge_bar_line (Grob_info /* info */)
+{
+ check_bar_property ();
+ if (stems_)
+ end_beam ();
+}
void
-Auto_beam_engraver::junk_beam ()
+Auto_beam_engraver::acknowledge_breathing_sign (Grob_info /* info */)
{
- assert (stem_l_arr_p_);
-
- delete stem_l_arr_p_;
- stem_l_arr_p_ = 0;
- delete grouping_p_;
- grouping_p_ = 0;
- shortest_mom_ = Moment (1, 8);
+ check_bar_property ();
+ if (stems_)
+ end_beam ();
}
void
-Auto_beam_engraver::end_beam ()
+Auto_beam_engraver::acknowledge_rest (Grob_info /* info */)
{
- if (stem_l_arr_p_->size () < 2)
+ check_bar_property ();
+ if (stems_)
+ end_beam ();
+}
+
+void
+Auto_beam_engraver::acknowledge_stem (Grob_info info)
+{
+ check_bar_property ();
+ Item *stem = dynamic_cast<Item *> (info.grob ());
+ Stream_event *ev = info.ultimate_event_cause ();
+ if (!ev->in_event_class ("rhythmic-event"))
{
- junk_beam ();
+ programming_error ("stem must have rhythmic structure");
+ return;
}
- else
+
+ /*
+ Don't (start) auto-beam over empty stems; skips or rests
+ */
+ if (!Stem::head_count (stem))
{
- finished_beam_p_ = create_beam_p ();
- if (finished_beam_p_)
- finished_grouping_p_ = grouping_p_;
- delete stem_l_arr_p_;
- stem_l_arr_p_ = 0;
- grouping_p_ = 0;
- shortest_mom_ = Moment (1, 8);
+ if (stems_)
+ end_beam ();
+ return;
}
-}
-void
-Auto_beam_engraver::typeset_beam ()
-{
- if (finished_beam_p_)
+ if (Stem::get_beam (stem))
+ {
+ if (stems_)
+ junk_beam ();
+ return;
+ }
+
+ int durlog = unsmob<Duration> (ev->get_property ("duration"))->duration_log ();
+
+ if (durlog <= 2)
+ {
+ if (stems_)
+ end_beam ();
+ return;
+ }
+
+ /*
+ ignore interspersed grace notes.
+ */
+ Moment now = now_mom ();
+ if (!is_same_grace_state (beam_start_location_, now))
+ return;
+
+ Duration *stem_duration = unsmob<Duration> (ev->get_property ("duration"));
+ Moment dur = stem_duration->get_length ();
+
+ //Moment dur = unsmob<Duration> (ev->get_property ("duration"))->get_length ();
+ Moment measure_now = measure_position (context ());
+ bool recheck_needed = false;
+
+ if (dur < shortest_mom_)
{
- finished_grouping_p_->beamify ();
- Beam::set_beaming (finished_beam_p_, finished_grouping_p_);
- typeset_element (finished_beam_p_);
- finished_beam_p_ = 0;
-
- delete finished_grouping_p_;
- finished_grouping_p_= 0;
+ /* new shortest moment, so store it and set recheck_needed */
+ shortest_mom_ = dur;
+ recheck_needed = true;
}
+
+ /* end should be based on shortest_mom_, begin should be
+ based on current duration */
+ consider_end (measure_now, shortest_mom_);
+ consider_begin (measure_now, dur);
+
+ if (!stems_)
+ return;
+
+ grouping_->add_stem (now - beam_start_moment_ + beam_start_location_,
+ durlog - 2,
+ Stem::is_invisible (stem),
+ stem_duration->factor (),
+ (to_boolean (stem->get_property ("tuplet-start"))));
+ stems_->push_back (stem);
+ last_add_mom_ = now;
+ extend_mom_ = max (extend_mom_, now) + get_event_length (ev, now);
+ if (recheck_needed)
+ recheck_beam ();
}
void
-Auto_beam_engraver::do_post_move_processing ()
+Auto_beam_engraver::recheck_beam ()
{
/*
- don't beam over skips
- */
- if (stem_l_arr_p_)
+ Recheck the beam after the shortest duration has changed
+ If shorter duration has created a new break, typeset the
+ first part of the beam and reset the current beam to just
+ the last part of the beam
+ */
+ Beaming_pattern *new_grouping_ = 0;
+ vector<Item *> *new_stems_ = 0;
+ Moment temporary_shortest_mom;
+ SCM temporary_beam_settings;
+
+ bool found_end;
+
+ for (vsize i = 0; i < stems_->size () - 1;)
{
- Moment now = now_mom ();
- if (extend_mom_ < now)
- {
- end_beam ();
- }
+ found_end = test_moment (STOP,
+ grouping_->end_moment (i),
+ shortest_mom_);
+ if (!found_end)
+ i++;
+ else
+ {
+ /*
+ Save the current beam settings and shortest_mom_
+ Necessary because end_beam destroys them
+ */
+ temporary_shortest_mom = shortest_mom_;
+ temporary_beam_settings = beam_settings_;
+
+ /* Eliminate (and save) the items no longer part of the first beam */
+
+ new_grouping_ = grouping_->split_pattern (i);
+ new_stems_ = remove_end_stems (i);
+
+ end_beam ();
+ typeset_beam ();
+
+ /* now recreate the unbeamed data structures */
+ stems_ = new_stems_;
+ grouping_ = new_grouping_;
+ shortest_mom_ = temporary_shortest_mom;
+ beam_settings_ = temporary_beam_settings;
+
+ i = 0;
+ }
+
}
+
+}
+
+/*
+ Remove all stems with an index greater than split_index
+ from stems_, and return a vector containing all of the
+ removed stems
+*/
+vector <Item *> *
+Auto_beam_engraver::remove_end_stems (vsize split_index)
+{
+ vector <Item *> *removed_stems = 0;
+ removed_stems = new vector <Item *>;
+
+ for (vsize j = split_index + 1; j < stems_->size (); j++)
+ removed_stems->push_back ((*stems_).at (j));
+ for (vsize j = split_index + 1; j < stems_->size ();)
+ stems_->pop_back ();
+ return removed_stems;
}
void
-Auto_beam_engraver::do_pre_move_processing ()
+Auto_beam_engraver::process_acknowledged ()
{
- if (stem_l_arr_p_)
+ Moment now = now_mom ();
+ if (extend_mom_ > now)
+ return;
+
+ if (!process_acknowledged_count_)
{
- Moment now = now_mom ();
- if ((extend_mom_ < now)
- || ((extend_mom_ == now) && (last_add_mom_ != now )))
- {
- end_beam ();
- }
- else if (!stem_l_arr_p_->size ())
- {
- junk_beam ();
- }
+ Moment measure_now = measure_position (context ());
+ consider_end (measure_now, shortest_mom_);
}
- typeset_beam ();
+ else if (process_acknowledged_count_ > 1)
+ {
+ if (stems_)
+ {
+ if ((extend_mom_ < now)
+ || ((extend_mom_ == now) && (last_add_mom_ != now)))
+ end_beam ();
+ else if (!stems_->size ())
+ junk_beam ();
+ }
+ }
+
+ process_acknowledged_count_++;
+}
+
+ADD_ACKNOWLEDGER (Auto_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, breathing_sign);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
+ADD_TRANSLATOR (Auto_beam_engraver,
+ /* doc */
+ "Generate beams based on measure characteristics and observed"
+ " Stems. Uses @code{baseMoment}, @code{beatStructure},"
+ " @code{beamExceptions}, @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 "
+ "baseMoment "
+ "beamExceptions "
+ "beamHalfMeasure "
+ "beatStructure "
+ "subdivideBeams ",
+
+ /* write */
+ ""
+ );
+
+class Grace_auto_beam_engraver : public Auto_beam_engraver
+{
+ TRANSLATOR_DECLARATIONS (Grace_auto_beam_engraver);
+ DECLARE_TRANSLATOR_LISTENER (beam_forbid);
+
+private:
+ Moment last_grace_start_; // Full starting time of last grace group
+ Moment last_grace_position_; // Measure position of same
+ virtual void process_music ();
+ virtual bool is_same_grace_state (Moment, Moment);
+ virtual bool test_moment (Direction, Moment, Moment);
+};
+
+Grace_auto_beam_engraver::Grace_auto_beam_engraver ()
+{
+ last_grace_start_.main_part_.set_infinite (-1);
+ // grace_part_ is zero -> test_moment is false, last_grace_position_
+ // not considered.
}
+IMPLEMENT_TRANSLATOR_LISTENER (Grace_auto_beam_engraver, beam_forbid);
void
-Auto_beam_engraver::do_removal_processing ()
+Grace_auto_beam_engraver::listen_beam_forbid (Stream_event *ev)
{
- /* finished beams may be typeset */
- typeset_beam ();
- /* but unfinished may need another announce/acknowledge pass */
- if (stem_l_arr_p_)
- junk_beam ();
+ Auto_beam_engraver::listen_beam_forbid (ev);
}
bool
-Auto_beam_engraver::same_grace_state_b (Score_element* e)
+Grace_auto_beam_engraver::is_same_grace_state (Moment, Moment)
{
- bool gr = e->get_elt_property ("grace") == SCM_BOOL_T;
- SCM wg =get_property ("weAreGraceContext");
- return (to_boolean (wg)) == gr;
+ // This is for ignoring interspersed grace notes in main note
+ // beaming. We never want to ignore something inside of grace note
+ // beaming, so return true.
+ return true;
}
void
-Auto_beam_engraver::acknowledge_element (Score_element_info info)
+Grace_auto_beam_engraver::process_music ()
{
- if (!same_grace_state_b (info.elem_l_))
- return;
-
- if (stem_l_arr_p_)
- {
- if (Beam::has_interface (info.elem_l_))
- {
- end_beam ();
- }
- else if (Bar::has_interface (info.elem_l_))
- {
- end_beam ();
- }
- else if (Rest::has_interface (info.elem_l_))
- {
- end_beam ();
- }
- }
-
- if (Stem::has_interface (info.elem_l_))
+ Moment now = now_mom ();
+ // Update last_grace_start_ and last_grace_position_ only when the
+ // main time advances.
+ if (now.main_part_ > last_grace_start_.main_part_)
{
- Item* stem_l = dynamic_cast<Item *> (info.elem_l_);
-
- Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
- if (!rhythmic_req)
- {
- programming_error ("Stem must have rhythmic structure");
- return;
- }
-
- /*
- Don't (start) auto-beam over empty stems; skips or rests
- */
- if (!Stem::heads_i (stem_l))
- {
- if (stem_l_arr_p_)
- end_beam ();
- return;
- }
-
- if (Stem::beam_l (stem_l))
- {
- if (stem_l_arr_p_)
- junk_beam ();
- return ;
- }
-
- int durlog = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->duration_log ();
-
- if (durlog <= 2)
- {
- if (stem_l_arr_p_)
- end_beam ();
- return;
- }
-
- /*
- if shortest duration would change
- reconsider ending/starting beam first.
- */
- Moment mom = unsmob_duration (rhythmic_req->get_mus_property ("duration"))->length_mom ();
- consider_end_and_begin (mom);
- if (!stem_l_arr_p_)
- return;
- if (mom < shortest_mom_)
- {
- if (stem_l_arr_p_->size ())
- {
- shortest_mom_ = mom;
- consider_end_and_begin (shortest_mom_);
- if (!stem_l_arr_p_)
- return;
- }
- shortest_mom_ = mom;
- }
- Moment now = now_mom ();
-
- grouping_p_->add_stem (now - beam_start_moment_ + beam_start_location_,
- durlog - 2);
- stem_l_arr_p_->push (stem_l);
- last_add_mom_ = now;
- extend_mom_ = extend_mom_ >? now + rhythmic_req->length_mom ();
+ last_grace_start_ = now;
+ last_grace_position_ = measure_position (context ());
}
+
+ Auto_beam_engraver::process_music ();
}
-void
-Auto_beam_engraver::process_acknowledged ()
+bool
+Grace_auto_beam_engraver::test_moment (Direction dir, Moment test_mom, Moment)
{
- if (!stem_l_arr_p_)
- consider_end_and_begin (shortest_mom_);
+ // If no grace group started this main moment, we have no business
+ // beaming. Same if we have left the original main time step.
+ if (!last_grace_start_.grace_part_
+ || last_grace_position_.main_part_ != test_mom.main_part_)
+ return false;
+ // Autobeam start only when at the start of the grace group.
+ if (dir == START)
+ return last_grace_position_ == test_mom;
+ // Autobeam end only when the grace part is finished.
+ return !test_mom.grace_part_;
}
+
+ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, bar_line);
+ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, beam);
+ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, breathing_sign);
+ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, rest);
+ADD_TRANSLATOR (Grace_auto_beam_engraver,
+ /* doc */
+ "Generates one autobeam group across an entire grace phrase. "
+ " As usual, any manual beaming or @code{\\noBeam} will block"
+ " autobeaming, just like setting the context property"
+ " @samp{autoBeaming} to @code{##f}.",
+
+ /* create */
+ "Beam ",
+
+ /* read */
+ "autoBeaming ",
+
+ /* write */
+ ""
+ );
projects / lilypond.git / blobdiff