Auto_beam_engraver::Auto_beam_engraver ()
{
- beam_p_ = 0;
- mult_i_ = 0;
+ stem_l_arr_p_ = 0;
+ shortest_mom_ = 1;
finished_beam_p_ = 0;
finished_grouping_p_ = 0;
grouping_p_ = 0;
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);
- int type = 1 << (mult_i_ + 2);
- String type_str = to_str (type);
+ 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 ());
/*
Determine end moment for auto beaming (and begin, mostly 0==anywhere)
/*
third guess: property time exception, specific for duration type
*/
- if (mult_i_)
+ if (type_str.length_i ())
{
Scalar end_mult = get_property (time_str + "beamAutoEnd" + type_str, 0);
if (end_mult.length_i ())
/*
fifth guess [user override]: property plain, specific for duration type
*/
- if (mult_i_)
+ if (type_str.length_i ())
{
Scalar end_mult = get_property (String ("beamAutoEnd") + type_str, 0);
if (end_mult.length_i ())
else
r = Moment (1);
- if (beam_p_ && !r)
+ if (stem_l_arr_p_ && !r)
end_beam ();
/*
if (begin_mom)
r = time->whole_in_measure_.mod_rat (begin_mom);
- if (!beam_p_ && (!begin_mom || !r))
+ if (!stem_l_arr_p_ && (!begin_mom || !r))
begin_beam ();
}
void
Auto_beam_engraver::begin_beam ()
{
- DOUT << String ("starting autobeam at: ") + now_mom ().str () + "\n";
- beam_p_ = new 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;
+}
+
+Beam*
+Auto_beam_engraver::create_beam_p ()
+{
+ Beam* beam_p = new Beam;
- /* urg, copied from Beam_engraver */
+ 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_->damping_i_ = prop;
+ 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;
+ 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;
-
- prop = get_property ("maxVerticalAlign", 0);
- if (prop.isnum_b ())
- beam_p_->vertical_align_drul_[MAX] = prop;
-
- announce_element (Score_element_info (beam_p_, 0));
+ announce_element (Score_element_info (beam_p, 0));
+ return beam_p;
}
void
Auto_beam_engraver::end_beam ()
{
- DOUT << String ("ending autobeam at: ") + now_mom ().str () + "\n";
- if (beam_p_->stems_.size () < 2)
+ if (stem_l_arr_p_->size () < 2)
{
- DOUT << "junking autombeam: less than two stems\n";
junk_beam ();
}
else
{
- finished_beam_p_ = beam_p_;
+ finished_beam_p_ = create_beam_p ();
finished_grouping_p_ = grouping_p_;
- beam_p_ = 0;
+ delete stem_l_arr_p_;
+ stem_l_arr_p_ = 0;
grouping_p_ = 0;
- mult_i_ = 0;
+ shortest_mom_ = 1;
}
}
Auto_beam_engraver::do_removal_processing ()
{
typeset_beam ();
- if (beam_p_)
+ if (stem_l_arr_p_ && stem_l_arr_p_->size ())
{
- DOUT << "Unfinished beam\n";
junk_beam ();
}
}
{
if (Beam *b = dynamic_cast<Beam *> (info.elem_l_))
{
- if (beam_p_)
+ if (stem_l_arr_p_)
{
- DOUT << "junking autobeam: beam encountered\n";
junk_beam ();
}
}
if (Bar *b = dynamic_cast<Bar *> (info.elem_l_))
{
- if (beam_p_)
+ if (stem_l_arr_p_)
{
- DOUT << "junking autobeam: bar encountered\n";
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\n";
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\n";
junk_beam ();
return;
}
now that we have last_add_mom_, perhaps we can (should) do away
with these individual junk_beams
*/
- if (rhythmic_req->duration_.durlog_i_<= 2)
+ if (rhythmic_req->duration_.durlog_i_ <= 2)
{
- DOUT << "ending autobeam: stem doesn't fit in beam\n";
end_beam ();
return;
}
Moment start = get_staff_info().time_C_->whole_in_measure_;
if (!grouping_p_->child_fit_b (start))
{
- DOUT << "ending autobeam: stem doesn't fit in group\n";
end_beam ();
}
else
{
- int m = (rhythmic_req->duration_.durlog_i_ - 2);
/*
- if multiplicity would become greater,
+ if shortest duration would change
reconsider ending/starting beam first.
*/
- if (m > mult_i_)
+ Moment mom = rhythmic_req->duration_.length_mom ();
+ if (mom < shortest_mom_)
{
- mult_i_ = m;
+ shortest_mom_ = mom;
consider_end_and_begin ();
}
- mult_i_ = m;
grouping_p_->add_child (start, rhythmic_req->length_mom ());
- stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
- beam_p_->add_stem (stem_l);
+
+ //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->length_mom ();
void
Auto_beam_engraver::junk_beam ()
{
- assert (beam_p_);
-#if 0
- 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;
- }
-#endif
+ 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;
- mult_i_ = 0;
+ shortest_mom_ = 1;
}
void
Auto_beam_engraver::process_acknowledged ()
{
- if (beam_p_)
+ if (stem_l_arr_p_)
{
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 () + "\n";
end_beam ();
}
- else if (!beam_p_->stems_.size ())
+ else if (!stem_l_arr_p_->size ())
{
- DOUT << "junking started autobeam: no stems\n";
junk_beam ();
}
}
projects / lilypond.git / blobdiff