source file of the GNU LilyPond music typesetter
- (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver-group-engraver.hh"
#include "engraver.hh"
-#include "musical-request.hh"
+#include "event.hh"
#include "beam.hh"
#include "stem.hh"
#include "warn.hh"
class Beam_engraver : public Engraver
{
protected:
- Drul_array<Span_req*> reqs_drul_;
+ Drul_array<Music*> evs_drul_;
- Spanner *finished_beam_p_;
- Spanner *beam_p_;
- Span_req * prev_start_req_;
+ Spanner *finished_beam_;
+ Spanner *beam_;
+ Music * prev_start_ev_;
- Beaming_info_list * beam_info_p_;
- Beaming_info_list * finished_beam_info_p_;
+ Music * now_stop_ev_;
+
+ Beaming_info_list * beam_info_;
+ Beaming_info_list * finished_beam_info_;
/// location within measure where beam started.
Moment beam_start_location_;
void set_melisma (bool);
Moment last_stem_added_at_;
-
-
-
- virtual void stop_translation_timestep ();
+ virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
virtual void finalize ();
Beam_engraver::Beam_engraver ()
{
- beam_p_ = 0;
- finished_beam_p_ =0;
- finished_beam_info_p_=0;
- beam_info_p_ =0;
- reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
- prev_start_req_ =0;
-
+ beam_ = 0;
+ finished_beam_ =0;
+ finished_beam_info_=0;
+ beam_info_ =0;
+ now_stop_ev_ = 0;
+ evs_drul_[LEFT] = evs_drul_[RIGHT] =0;
+ prev_start_ev_ =0;
}
bool
Beam_engraver::try_music (Music *m)
{
- if (Span_req * c = dynamic_cast<Span_req*> (m))
+ if (m->is_mus_type ("abort-event"))
{
- if (scm_equal_p (c->get_mus_property ("span-type"),
- ly_str02scm ("abort")) == SCM_BOOL_T)
- {
- reqs_drul_[START] = 0;
- reqs_drul_[STOP] = 0;
- if (beam_p_)
- beam_p_->suicide ();
- beam_p_ = 0;
- }
- else if (scm_equal_p (c->get_mus_property ("span-type"),
- ly_str02scm ("beam")) == SCM_BOOL_T)
- {
- Direction d =c->get_span_dir ();
-
+ evs_drul_[START] = 0;
+ evs_drul_[STOP] = 0;
+ if (beam_)
+ beam_->suicide ();
+ beam_ = 0;
+ }
+ else if (m->is_mus_type ("beam-event"))
+ {
+ Direction d = to_dir (m->get_mus_property ("span-direction"));
- if (d == STOP && !valid_end_moment())
- return false;
+ if (d == STOP && !valid_end_moment())
+ return false;
- if (d == START && !valid_start_moment ())
- return false;
+ if (d == START && !valid_start_moment ())
+ return false;
- if (d == STOP)
+ if (d == STOP)
+ {
+ SCM m = get_property ("automaticMelismata");
+ SCM b = get_property ("autoBeaming");
+ if (to_boolean (m) && !to_boolean (b))
{
- SCM m = get_property ("automaticMelismata");
- SCM b = get_property ("autoBeaming");
- if (to_boolean (m) && !to_boolean (b))
- {
- set_melisma (false);
- }
+ set_melisma (false);
}
-
- reqs_drul_[d ] = c;
- return true;
}
+
+ evs_drul_[d ] = m;
+ return true;
+ }
+ else if (m->is_mus_type ("new-beam-event"))
+ {
+ Direction d = to_dir (m->get_mus_property ("span-direction"));
+ if (d == START && !valid_start_moment ())
+ return false;
+ if (d == STOP && !valid_end_moment ())
+ return false;
+
+ if (d == START)
+ evs_drul_[d] = m;
+ else if (d==STOP)
+ now_stop_ev_ = m;
+
+ return true;
}
return false;
}
void
Beam_engraver::set_melisma (bool m)
{
- daddy_trans_l_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+ daddy_trans_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
}
void
Beam_engraver::process_music ()
{
- if (reqs_drul_[STOP])
+ if (evs_drul_[STOP])
{
- prev_start_req_ =0;
- finished_beam_p_ = beam_p_;
- finished_beam_info_p_ = beam_info_p_;
+ prev_start_ev_ =0;
+ finished_beam_ = beam_;
+ finished_beam_info_ = beam_info_;
- beam_info_p_ =0;
- beam_p_ = 0;
+ beam_info_ =0;
+ beam_ = 0;
}
-
- if (beam_p_)
+ if (beam_)
{
top_engraver ()->forbid_breaks ();
}
- if (reqs_drul_[START])
+ if (evs_drul_[START])
{
- if (beam_p_)
+ if (beam_)
{
- reqs_drul_[START]->origin ()->warning (_ ("already have a beam"));
+ evs_drul_[START]->origin ()->warning (_ ("already have a beam"));
return;
}
- prev_start_req_ = reqs_drul_[START];
- beam_p_ = new Spanner (get_property ("Beam"));
+ prev_start_ev_ = evs_drul_[START];
+ beam_ = new Spanner (get_property ("Beam"));
SCM smp = get_property ("measurePosition");
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_info_ = new Beaming_info_list;
/* urg, must copy to Auto_beam_engraver too */
- announce_grob(beam_p_, reqs_drul_[START]->self_scm());
+ announce_grob(beam_, evs_drul_[START]->self_scm());
}
}
void
Beam_engraver::typeset_beam ()
{
- if (finished_beam_p_)
+ if (finished_beam_)
{
- finished_beam_info_p_->beamify(beat_length_, subdivide_beams_);
- Beam::set_beaming (finished_beam_p_, finished_beam_info_p_);
- typeset_grob (finished_beam_p_);
- delete finished_beam_info_p_;
- finished_beam_info_p_ =0;
- finished_beam_p_ = 0;
+ finished_beam_info_->beamify(beat_length_, subdivide_beams_);
+ Beam::set_beaming (finished_beam_, finished_beam_info_);
+ typeset_grob (finished_beam_);
+ delete finished_beam_info_;
+ finished_beam_info_ =0;
+ finished_beam_ = 0;
}
}
void
Beam_engraver::start_translation_timestep ()
{
- reqs_drul_ [START] =0;
- reqs_drul_[STOP] = 0;
+ evs_drul_ [START] =0;
+ evs_drul_[STOP] = 0;
- if (beam_p_)
+ if (beam_)
{
SCM m = get_property ("automaticMelismata");
SCM b = get_property ("autoBeaming");
Beam_engraver::stop_translation_timestep ()
{
typeset_beam ();
+ if (now_stop_ev_ )
+ {
+ finished_beam_ = beam_;
+ finished_beam_info_ = beam_info_;
+
+ now_stop_ev_ = 0;
+ beam_ = 0;
+ beam_info_ = 0;
+ typeset_beam();
+ }
}
void
Beam_engraver::finalize ()
{
typeset_beam ();
- if (beam_p_)
+ if (beam_)
{
- prev_start_req_->origin ()->warning (_ ("unterminated beam"));
+ prev_start_ev_->origin ()->warning (_ ("unterminated beam"));
/*
we don't typeset it, (we used to, but it was commented
out. Reason unknown) */
- beam_p_->suicide ();
- delete beam_info_p_;
+ beam_->suicide ();
+ delete beam_info_;
}
}
void
Beam_engraver::acknowledge_grob (Grob_info info)
{
- if (beam_p_)
+ if (beam_)
{
- if (Rest::has_interface (info.grob_l_))
+ if (Rest::has_interface (info.grob_))
{
- info.grob_l_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
+ info.grob_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
}
- else if (Stem::has_interface (info.grob_l_))
+ else if (Stem::has_interface (info.grob_))
{
Moment now = now_mom();
if (!valid_start_moment ())
return ;
- Item *stem_l = dynamic_cast<Item*> (info.grob_l_);
- if (Stem::beam_l (stem_l))
+ Item *stem = dynamic_cast<Item*> (info.grob_);
+ if (Stem::get_beam (stem))
return;
- Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.music_cause ());
- if (!rhythmic_req)
+ Music* m = info.music_cause();
+ if (!m->is_mus_type ("rhythmic-event"))
{
String s = _ ("stem must have Rhythmic structure");
if (info.music_cause ())
last_stem_added_at_ = now;
- int durlog = unsmob_duration (rhythmic_req->get_mus_property ("duration"))-> duration_log ();
+ int durlog = unsmob_duration (m->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"));
+ m->origin ()->warning (_ ("stem doesn't fit in beam"));
+ prev_start_ev_->origin ()->warning (_ ("beam was started here"));
/*
don't return, since
*/
}
- stem_l->set_grob_property ("duration-log",
- gh_int2scm (durlog));
+ stem->set_grob_property ("duration-log",
+ scm_int2num (durlog));
Moment stem_location = now - beam_start_mom_ + beam_start_location_;
- beam_info_p_->add_stem (stem_location,
+ beam_info_->add_stem (stem_location,
(durlog- 2) >? 0);
- Beam::add_stem (beam_p_, stem_l);
+ Beam::add_stem (beam_, stem);
}
}
}
ENTER_DESCRIPTION(Beam_engraver,
-/* descr */ "Handles Beam_requests by engraving Beams. If omitted, then notes will be
-printed with flags instead of beams.",
+/* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be "
+"printed with flags instead of beams.",
/* creats*/ "Beam",
-/* acks */ "stem-interface rest-interface",
+/* accepts */ "beam-event new-beam-event abort-event",
+/* acks */ "stem-interface rest-interface",
/* reads */ "beamMelismaBusy beatLength subdivideBeams",
/* write */ "");
bool
Grace_beam_engraver::valid_end_moment ()
{
- return beam_p_ && last_stem_added_at_.grace_part_ != Rational(0);
+ return beam_ && last_stem_added_at_.grace_part_ != Rational(0);
}
ENTER_DESCRIPTION(Grace_beam_engraver,
-/* descr */ "Handles Beam_requests by engraving Beams. If omitted, then notes will
-be printed with flags instead of beams. Only engraves beams when we
-are at grace points in time.
-",
+/* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will "
+"be printed with flags instead of beams. Only engraves beams when we "
+" are at grace points in time. "
+,
/* creats*/ "Beam",
-/* acks */ "stem-interface rest-interface",
+/* accepts */ "beam-event abort-event new-beam-event",
+/* acks */ "stem-interface rest-interface",
/* reads */ "beamMelismaBusy beatLength subdivideBeams",
/* write */ "");
projects / lilypond.git / blobdiff