source file of the GNU LilyPond music typesetter
- (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
+#include "timing-engraver.hh"
+#include "engraver-group-engraver.hh"
#include "beam-engraver.hh"
#include "musical-request.hh"
#include "beam.hh"
-#include "rhythmic-grouping.hh"
#include "stem.hh"
#include "warn.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
+#include "beaming.hh"
+#include "score-engraver.hh"
Beam_engraver::Beam_engraver ()
{
beam_p_ = 0;
finished_beam_p_ =0;
- finished_grouping_p_ = 0;
- grouping_p_ =0;
+ finished_beam_info_p_=0;
+ beam_info_p_ =0;
reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
prev_start_req_ =0;
}
if (d == STOP && !beam_p_)
{
- m->warning (_ ("No Beam to end"));
+ m->warning (_ ("no beam to end"));
return false;
}
reqs_drul_[d ] = c;
if (reqs_drul_[STOP])
{
if (!beam_p_)
- reqs_drul_[STOP]->warning (_("No beam to end"));
+ reqs_drul_[STOP]->warning (_("no beam to end"));
prev_start_req_ =0;
finished_beam_p_ = beam_p_;
- finished_grouping_p_ = grouping_p_;
+ finished_beam_info_p_ = beam_info_p_;
+ beam_info_p_ =0;
beam_p_ = 0;
- grouping_p_ = 0;
+ }
+
+
+ if (beam_p_)
+ {
+ Score_engraver * e = 0;
+ Translator * t = daddy_grav_l ();
+ for (; !e && t; t = t->daddy_trans_l_)
+ {
+ e = dynamic_cast<Score_engraver*> (t);
+ }
+
+ if (!e)
+ programming_error ("No score engraver!");
+ else
+ e->forbid_breaks ();
}
if (reqs_drul_[START])
{
if (beam_p_)
{
- reqs_drul_[START]->warning (_ ("Already have a Beam"));
+ reqs_drul_[START]->warning (_ ("Already have a beam"));
return;
}
prev_start_req_ = reqs_drul_[START];
beam_p_ = new Beam;
- grouping_p_ = new Rhythmic_grouping;
- Scalar prop = get_property ("beamslopedamping", 0);
- if (prop.isnum_b ())
- beam_p_->set_elt_property (damping_scm_sym, gh_int2scm( prop));
+ Translator * t = daddy_grav_l ()->get_simple_translator ("Timing_engraver");
+ Timing_engraver *timer = dynamic_cast<Timing_engraver*> (t);
+ beam_start_location_ = (t) ? timer->measure_position () : Moment (0);
+ beam_start_mom_ = now_mom();
+ beam_info_p_ = new Beaming_info_list;
+
- prop = get_property ("beamquantisation", 0);
- if (prop.isnum_b ())
- beam_p_->quantisation_ = (Beam::Quantisation)(int)prop;
+ /* urg, must copy to Auto_beam_engraver too */
announce_element (Score_element_info (beam_p_, reqs_drul_[START]));
}
{
if (finished_beam_p_)
{
- Rhythmic_grouping const * rg_C = get_staff_info().rhythmic_C_;
- rg_C->extend (finished_grouping_p_->interval());
- finished_beam_p_->set_grouping (*rg_C, *finished_grouping_p_);
+ finished_beam_info_p_->beamify ();
+
+ finished_beam_p_->set_beaming (finished_beam_info_p_);
typeset_element (finished_beam_p_);
+ delete finished_beam_info_p_;
+ finished_beam_info_p_ =0;
finished_beam_p_ = 0;
- delete finished_grouping_p_;
- finished_grouping_p_= 0;
-
reqs_drul_[STOP] = 0;
}
}
typeset_beam ();
if (beam_p_)
{
- prev_start_req_->warning (_ ("Unfinished beam"));
+ prev_start_req_->warning (_ ("unfinished beam"));
finished_beam_p_ = beam_p_;
- finished_grouping_p_ = grouping_p_;
+ finished_beam_info_p_ = beam_info_p_;
typeset_beam ();
}
}
if (beam_p_)
{
Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_);
- if (!stem_l || stem_l->beam_l_)
+ if (!stem_l || stem_l->beam_l ())
return;
- bool self_grace = beam_p_->get_elt_property (grace_scm_sym) != SCM_BOOL_F;
- bool stem_grace = stem_l->get_elt_property (grace_scm_sym) != SCM_BOOL_F;
- if (!self_grace && stem_grace)
- return;
+ bool stem_grace = stem_l->get_elt_property ("grace") == SCM_BOOL_T;
+
+ SCM wg =get_property ("weAreGraceContext");
+ bool wgb= to_boolean (wg);
+
+ if (wgb!= stem_grace)
+ return;
Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
if (!rhythmic_req)
{
- String s = _ ("Stem must have Rhythmic structure.");
+ String s = _ ("Stem must have Rhythmic structure");
if (info.req_l_)
info.req_l_->warning (s);
else
return;
}
-
if (rhythmic_req->duration_.durlog_i_<= 2)
{
- rhythmic_req->warning (_ ("stem doesn't fit in beam"));
- prev_start_req_->warning (_ ("beam was started here"));
- return;
- }
-
- /*
- TODO: do something sensible if it doesn't fit in the beam.
- */
- Moment start = get_staff_info().time_C_->whole_in_measure_;
-
- if (!grouping_p_->child_fit_b (start))
- {
- String s (_ ("please fix me") + ": "
- + _f ("stem at %s doesn't fit in beam", now_mom ().str ()));
+ rhythmic_req->warning (_ ("Stem doesn't fit in beam"));
+ prev_start_req_->warning (_ ("Beam was started here"));
+ /*
+ don't return, since
- if (info.req_l_)
- info.req_l_->warning(s);
- else
- warning (s);
- }
- else
- {
- grouping_p_->add_child (start, rhythmic_req->length_mom ());
- stem_l->flag_i_ = rhythmic_req->duration_.durlog_i_;
- beam_p_->add_stem (stem_l);
+ [r4 c8] can just as well be modern notation.
+ */
}
+
+ stem_l->set_elt_property ("duration-log",
+ gh_int2scm (rhythmic_req->duration_.durlog_i_));
+ Moment stem_location = now_mom () - beam_start_mom_ + beam_start_location_;
+ beam_info_p_->add_stem (stem_location,
+ (rhythmic_req->duration_.durlog_i_ - 2) >? 1);
+ beam_p_->add_stem (stem_l);
}
}
ADD_THIS_TRANSLATOR(Beam_engraver);
+
projects / lilypond.git / blobdiff