source file of the GNU LilyPond music typesetter
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver-group-engraver.hh"
{
Drul_array<Span_req*> reqs_drul_;
+ Link_array<Stem> stems_;
+
+
Spanner *finished_beam_p_;
Spanner *beam_p_;
Span_req * prev_start_req_;
void typeset_beam ();
void set_melisma (bool);
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 bool do_try_music (Music*);
- virtual void do_process_music ();
+ virtual void stop_translation_timestep ();
+ virtual void start_translation_timestep ();
+ virtual void finalize ();
+ virtual void create_grobs ();
+ virtual void acknowledge_grob (Grob_info);
+ virtual bool try_music (Music*);
+ virtual void process_music ();
+
public:
Beam_engraver ();
VIRTUAL_COPY_CONS (Translator);
}
bool
-Beam_engraver::do_try_music (Music *m)
+Beam_engraver::try_music (Music *m)
{
- if (Span_req * c = dynamic_cast<Span_req*>(m))
+ if (Span_req * c = dynamic_cast<Span_req*> (m))
{
- if (c->span_type_str_ == "abort")
+ if (scm_equal_p (c->get_mus_property ("span-type"),
+ ly_str02scm ("abort")) == SCM_BOOL_T)
{
reqs_drul_[START] = 0;
reqs_drul_[STOP] = 0;
beam_p_->suicide ();
beam_p_ = 0;
}
- else if (c->span_type_str_ == "beam")
+ else if (scm_equal_p (c->get_mus_property ("span-type"),
+ ly_str02scm ("beam")) == SCM_BOOL_T)
{
Direction d =c->get_span_dir ();
if (d == STOP && !beam_p_)
{
- m->origin ()->warning (_ ("can't find start of beam"));
+ m->origin ()->warning (_ ("can't find start of beam"));
return false;
}
- if(d == STOP)
+ if (d == STOP)
{
SCM m = get_property ("automaticMelismata");
- SCM b = get_property("noAutoBeaming");
- if (to_boolean (m) && to_boolean(b))
+ SCM b = get_property ("noAutoBeaming");
+ if (to_boolean (m) && to_boolean (b))
{
set_melisma (false);
}
daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
}
-
void
-Beam_engraver::do_process_music ()
+Beam_engraver::process_music ()
{
if (reqs_drul_[STOP])
{
if (!beam_p_)
- reqs_drul_[STOP]->origin ()->warning (_("can't find start of beam"));
+ reqs_drul_[STOP]->origin ()->warning (_ ("can't find start of beam"));
prev_start_req_ =0;
finished_beam_p_ = beam_p_;
finished_beam_info_p_ = beam_info_p_;
}
- if (beam_p_ && !to_boolean (get_property ("weAreGraceContext")))
+ if (beam_p_)
{
Score_engraver * e = 0;
Translator * t = daddy_grav_l ();
else
e->forbid_breaks ();
}
-
+}
+
+
+void
+Beam_engraver::create_grobs ()
+{
if (reqs_drul_[START])
{
if (beam_p_)
prev_start_req_ = reqs_drul_[START];
beam_p_ = new Spanner (get_property ("Beam"));
- Beam::set_interface (beam_p_);
-
SCM smp = get_property ("measurePosition");
- Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+ Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
beam_start_location_ = mp;
- beam_start_mom_ = now_mom();
- beam_info_p_ = new Beaming_info_list;
+ beam_start_mom_ = now_mom ();
+ beam_info_p_ = new Beaming_info_list;
/* urg, must copy to Auto_beam_engraver too */
- announce_element (beam_p_, reqs_drul_[START]);
+ announce_grob (beam_p_, reqs_drul_[START]);
}
+ reqs_drul_[STOP] = 0;
+ reqs_drul_[START] = 0;
}
void
finished_beam_info_p_->beamify ();
Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
- typeset_element (finished_beam_p_);
+ typeset_grob (finished_beam_p_);
delete finished_beam_info_p_;
finished_beam_info_p_ =0;
finished_beam_p_ = 0;
}
void
-Beam_engraver::do_post_move_processing ()
+Beam_engraver::start_translation_timestep ()
{
reqs_drul_ [START] =0;
- if(beam_p_) {
+ if (beam_p_) {
SCM m = get_property ("automaticMelismata");
- SCM b = get_property("noAutoBeaming");
- if (to_boolean (m) && to_boolean(b)) {
+ SCM b = get_property ("noAutoBeaming");
+ if (to_boolean (m) && to_boolean (b)) {
set_melisma (true);
}
}
}
void
-Beam_engraver::do_pre_move_processing ()
+Beam_engraver::stop_translation_timestep ()
{
typeset_beam ();
}
void
-Beam_engraver::do_removal_processing ()
+Beam_engraver::finalize ()
{
typeset_beam ();
if (beam_p_)
{
prev_start_req_->origin ()->warning (_ ("unterminated beam"));
-#if 0
- finished_beam_p_ = beam_p_;
- finished_beam_info_p_ = beam_info_p_;
- typeset_beam ();
-#else
+
+ /*
+ we don't typeset it, (we used to, but it was commented
+ out. Reason unknown) */
beam_p_->suicide ();
delete beam_info_p_;
-#endif
}
}
void
-Beam_engraver::acknowledge_element (Score_element_info info)
+Beam_engraver::acknowledge_grob (Grob_info info)
{
if (beam_p_)
{
}
else if (Stem::has_interface (info.elem_l_))
{
+ Moment now = now_mom();
+
+ if(bool (now.grace_mom_ ) != bool (beam_start_mom_.grace_mom_))
+ return ;
+
Item *stem_l = dynamic_cast<Item*> (info.elem_l_);
if (Stem::beam_l (stem_l))
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)
{
return;
}
- if (rhythmic_req->duration_.durlog_i_<= 2)
+ int durlog = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log ();
+ if (durlog <= 2)
{
rhythmic_req->origin ()->warning (_ ("stem doesn't fit in beam"));
prev_start_req_->origin ()->warning (_ ("beam was started here"));
*/
}
- 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_;
+ stem_l->set_grob_property ("duration-log",
+ gh_int2scm (durlog));
+ Moment stem_location = now - beam_start_mom_ + beam_start_location_;
beam_info_p_->add_stem (stem_location,
- (rhythmic_req->duration_.durlog_i_ - 2) >? 1);
+ (durlog- 2) >? 1);
Beam::add_stem (beam_p_, stem_l);
}
}
-ADD_THIS_TRANSLATOR(Beam_engraver);
+ADD_THIS_TRANSLATOR (Beam_engraver);