#include "auto-beam-engraver.hh"
#include "musical-request.hh"
+#include "bar.hh"
#include "beam.hh"
-#include "grouping.hh"
+#include "rhythmic-grouping.hh"
#include "rest.hh"
#include "stem.hh"
#include "debug.hh"
Auto_beam_engraver::Auto_beam_engraver ()
{
- beam_p_ = 0;
+ stem_l_arr_p_ = 0;
+ shortest_mom_ = 1;
finished_beam_p_ = 0;
finished_grouping_p_ = 0;
grouping_p_ = 0;
void
Auto_beam_engraver::do_process_requests ()
+{
+ consider_end_and_begin ();
+}
+
+void
+Auto_beam_engraver::consider_end_and_begin ()
{
Time_description const *time = get_staff_info().time_C_;
+ int num = time->whole_per_measure_ / time->one_beat_;
+ int den = time->one_beat_.den_i ();
+ String time_str = String ("time") + to_str (num) + "_" + to_str (den);
+ String type_str;
+ if (shortest_mom_.num () != 1)
+ type_str = to_str (shortest_mom_.num ());
+ if (shortest_mom_.den () != 1)
+ type_str = type_str + "_" + to_str (shortest_mom_.den ());
- //Moment begin_mom;
- Real begin_f;
- Scalar begin = get_property ("beamAutoBegin", 0);
- if (begin.isnum_b ())
- // brrr.
- // begin_mom = (Real)begin;
- begin_f = (Real)begin;
- else
- return;
-
- Scalar end = get_property ("beamAutoEnd", 0);
- //Moment end_mom;
- Real end_f;
- if (end.isnum_b ())
- // brrr.
- // end_mom = (Real)end;
- end_f = (Real)end;
- else
- return;
+ /*
+ Determine end moment for auto beaming (and begin, mostly 0==anywhere)
+ In order of increasing priority:
+
+ i. every beat <den>
+ ii. time<num>_<den>beamAutoEnd
+ iii. time<num>_<den>beamAutoEnd<type>
+ iv. beamAutoEnd
+ v. beamAutoEnd<type>
+
+
+ Rationale:
+
+ [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
+
+ [user override]
+ iv. generic override
+ v. override for specific duration type
+
+ The user overrides should be required for common cases.
+ */
- Real epsilon_f = Moment (1, 512);
- Real f;
- if (beam_p_ && ((f=abs (fmod (time->whole_in_measure_, end_f))) < epsilon_f))
+ /*
+ first guess: begin beam at any position
+ */
+ Moment begin_mom (0);
+ /*
+ first guess: end beam at end of beat
+ */
+ Moment end_mom = time->one_beat_;
+
+ /*
+ second guess: property generic time exception
+ */
+ Scalar begin = get_property (time_str + "beamAutoBegin", 0);
+ if (begin.length_i ())
+ begin_mom = begin.to_rat ();
+
+ Scalar end = get_property (time_str + "beamAutoEnd", 0);
+ if (end.length_i ())
+ end_mom = end.to_rat ();
+
+ /*
+ third guess: property time exception, specific for duration type
+ */
+ if (type_str.length_i ())
{
- DOUT << String ("ending autobeam at: ") + now_moment ().str ();
- if (beam_p_->stems_.size () < 2)
- {
- DOUT << "junking autombeam: less than two stems";
- unbeam ();
- }
- else
- {
- finished_beam_p_ = beam_p_;
- finished_grouping_p_ = grouping_p_;
- beam_p_ = 0;
- grouping_p_ = 0;
- }
+ Scalar end_mult = get_property (time_str + "beamAutoEnd" + type_str, 0);
+ if (end_mult.length_i ())
+ end_mom = end_mult.to_rat ();
+ Scalar begin_mult = get_property (time_str + "beamAutoBegin" + type_str, 0);
+ if (begin_mult.length_i ())
+ begin_mom = begin_mult.to_rat ();
}
+
+ /*
+ fourth guess [user override]: property plain generic
+ */
+ begin = get_property ("beamAutoBegin", 0);
+ if (begin.length_i ())
+ begin_mom = begin.to_rat ();
+ end = get_property ("beamAutoEnd", 0);
+ if (end.length_i ())
+ end_mom = end.to_rat ();
+
+ /*
+ fifth guess [user override]: property plain, specific for duration type
+ */
+ if (type_str.length_i ())
+ {
+ Scalar end_mult = get_property (String ("beamAutoEnd") + type_str, 0);
+ if (end_mult.length_i ())
+ end_mom = end_mult.to_rat ();
+ Scalar begin_mult = get_property (String ("beamAutoBegin") + type_str, 0);
+ if (begin_mult.length_i ())
+ begin_mom = begin_mult.to_rat ();
+ }
+
+ Rational r;
+ if (end_mom)
+ r = time->whole_in_measure_.mod_rat (end_mom);
+ else
+ r = Moment (1);
+
+ if (stem_l_arr_p_ && !r)
+ end_beam ();
+
/*
Allow already started autobeam to end
*/
if (!on.to_bool ())
return;
- if (!beam_p_ && ((f=abs (fmod (time->whole_in_measure_, begin_f))) < epsilon_f))
- {
- DOUT << String ("starting autobeam at: ") + now_moment ().str ();
- beam_p_ = new Beam;
- grouping_p_ = new Rhythmic_grouping;
-
- /* urg, copied from Beam_engraver */
- Scalar prop = get_property ("beamslopedamping", 0);
- if (prop.isnum_b ())
- beam_p_->damping_i_ = prop;
-
- prop = get_property ("beamquantisation", 0);
- if (prop.isnum_b ())
- beam_p_->quantisation_ = (Beam::Quantisation)(int)prop;
-
- // must set minVerticalAlign = = maxVerticalAlign to get sane results
- // see input/test/beam-interstaff.ly
- prop = get_property ("minVerticalAlign", 0);
- if (prop.isnum_b ())
- beam_p_->vertical_align_drul_[MIN] = prop;
+ if (begin_mom)
+ r = time->whole_in_measure_.mod_rat (begin_mom);
+ if (!stem_l_arr_p_ && (!begin_mom || !r))
+ begin_beam ();
+}
- prop = get_property ("maxVerticalAlign", 0);
- if (prop.isnum_b ())
- beam_p_->vertical_align_drul_[MAX] = prop;
+
+void
+Auto_beam_engraver::begin_beam ()
+{
+ // DOUT << String ("starting autobeam at: ") + now_mom ().str () + "\n";
+ assert (!stem_l_arr_p_);
+ stem_l_arr_p_ = new Array<Stem*>;
+ assert (!grouping_p_);
+ grouping_p_ = new Rhythmic_grouping;
+}
- announce_element (Score_element_info (beam_p_, 0));
- }
+Beam*
+Auto_beam_engraver::create_beam_p ()
+{
+ Beam* beam_p = new Beam;
+
+ for (int i = 0; i < stem_l_arr_p_->size (); i++)
+ beam_p->add_stem ((*stem_l_arr_p_)[i]);
+
+ /* urg, copied from Beam_engraver */
+ Scalar prop = get_property ("beamslopedamping", 0);
+ if (prop.isnum_b ())
+ beam_p->set_elt_property (damping_scm_sym, gh_int2scm( prop));
+
+ prop = get_property ("beamquantisation", 0);
+ if (prop.isnum_b ())
+ beam_p->quantisation_ = (Beam::Quantisation)(int)prop;
+
+ announce_element (Score_element_info (beam_p, 0));
+ return beam_p;
}
+void
+Auto_beam_engraver::end_beam ()
+{
+ if (stem_l_arr_p_->size () < 2)
+ {
+ junk_beam ();
+ }
+ else
+ {
+ finished_beam_p_ = create_beam_p ();
+ finished_grouping_p_ = grouping_p_;
+ delete stem_l_arr_p_;
+ stem_l_arr_p_ = 0;
+ grouping_p_ = 0;
+ shortest_mom_ = 1;
+ }
+}
+
void
Auto_beam_engraver::typeset_beam ()
{
Auto_beam_engraver::do_removal_processing ()
{
typeset_beam ();
- if (beam_p_)
+ if (stem_l_arr_p_ && stem_l_arr_p_->size ())
{
- DOUT << "Unfinished beam";
- unbeam ();
+ junk_beam ();
}
}
{
if (Beam *b = dynamic_cast<Beam *> (info.elem_l_))
{
- if (beam_p_)
+ if (stem_l_arr_p_)
+ {
+ junk_beam ();
+ }
+ }
+ if (Bar *b = dynamic_cast<Bar *> (info.elem_l_))
+ {
+ if (stem_l_arr_p_)
{
- DOUT << "junking autobeam: beam encountered";
- unbeam ();
+ junk_beam ();
}
}
- if (beam_p_)
+ if (stem_l_arr_p_)
{
Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
if (!rhythmic_req)
if (dynamic_cast<Rest *> (info.elem_l_))
{
- DOUT << "junking autobeam: rest encountered";
- unbeam ();
+ end_beam ();
return;
}
if (!stem_l)
return;
- if (stem_l->beam_l_ && (stem_l->beam_l_ != beam_p_))
+ if (stem_l->beam_l_)
{
- DOUT << "junking autobeam: beamed stem encountered";
- unbeam ();
+ junk_beam ();
return;
}
/*
now that we have last_add_mom_, perhaps we can (should) do away
- with these individual unbeams
+ with these individual junk_beams
*/
- if (rhythmic_req->duration_.durlog_i_<= 2)
+ if (rhythmic_req->duration_.durlog_i_ <= 2)
{
- DOUT << "stem doesn't fit in beam";
- unbeam ();
+ end_beam ();
return;
}
Moment start = get_staff_info().time_C_->whole_in_measure_;
if (!grouping_p_->child_fit_b (start))
{
- unbeam ();
+ end_beam ();
}
else
{
- grouping_p_->add_child (start, rhythmic_req->duration ());
- stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
- beam_p_->add_stem (stem_l);
- Moment now = now_moment ();
+ /*
+ if shortest duration would change
+ reconsider ending/starting beam first.
+ */
+ Moment mom = rhythmic_req->duration_.length_mom ();
+ if (mom < shortest_mom_)
+ {
+ shortest_mom_ = mom;
+ consider_end_and_begin ();
+ }
+ grouping_p_->add_child (start, rhythmic_req->length_mom ());
+
+ //stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
+
+ stem_l_arr_p_->push (stem_l);
+ Moment now = now_mom ();
last_add_mom_ = now;
- extend_mom_ = extend_mom_ >? now + rhythmic_req->duration ();
+ extend_mom_ = extend_mom_ >? now + rhythmic_req->length_mom ();
}
}
}
void
-Auto_beam_engraver::unbeam ()
+Auto_beam_engraver::junk_beam ()
{
- assert (beam_p_);
- for (int i=0; i < beam_p_->stems_.size (); i++)
- {
- Stem* s = beam_p_->stems_[i];
- s->beams_i_drul_[LEFT] = 0;
- s->beams_i_drul_[RIGHT] = 0;
- s->mult_i_ = 0;
- s->beam_l_ = 0;
- }
+ assert (stem_l_arr_p_);
+ /* for (int i = 0; i < stem_l_arr_p_->size (); i++)
+ (*stem_l_arr_p_)[i]->flag_i_ = 0;*/
- beam_p_->unlink ();
- beam_p_ = 0;
+ delete stem_l_arr_p_;
+ stem_l_arr_p_ = 0;
delete grouping_p_;
grouping_p_ = 0;
+ shortest_mom_ = 1;
}
void
Auto_beam_engraver::process_acknowledged ()
{
- if (beam_p_)
+ if (stem_l_arr_p_)
{
- Moment now = now_moment ();
+ Moment now = now_mom ();
if ((extend_mom_ < now)
|| ((extend_mom_ == now) && (last_add_mom_ != now )))
{
- DOUT << String ("junking autobeam: no stem added since: ")
- + last_add_mom_.str ();
- unbeam ();
+ end_beam ();
}
- else if (!beam_p_->stems_.size ())
+ else if (!stem_l_arr_p_->size ())
{
- DOUT << "junking started autobeam: no stems";
- unbeam ();
+ junk_beam ();
}
}
}
projects / lilypond.git / blobdiff