source file of the GNU LilyPond music typesetter
- (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2004 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"
#include "drul-array.hh"
#include "item.hh"
#include "spanner.hh"
+#include "context.hh"
class Beam_engraver : public Engraver
{
protected:
- Drul_array<Span_req*> reqs_drul_;
+ Music * start_ev_;
Spanner *finished_beam_;
Spanner *beam_;
- Span_req * prev_start_req_;
+ Music * prev_start_ev_;
+ Music * now_stop_ev_;
+
Beaming_info_list * beam_info_;
Beaming_info_list * finished_beam_info_;
void set_melisma (bool);
Moment last_stem_added_at_;
-
-
-
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
virtual void finalize ();
virtual bool try_music (Music*);
virtual void process_music ();
- virtual bool valid_start_moment();
- virtual bool valid_end_moment ();
+ virtual bool valid_start_point();
+ virtual bool valid_end_point ();
public:
- TRANSLATOR_DECLARATIONS( Beam_engraver );
+ TRANSLATOR_DECLARATIONS(Beam_engraver);
};
always nested.
*/
bool
-Beam_engraver::valid_start_moment()
+Beam_engraver::valid_start_point()
{
Moment n = now_mom ();
}
bool
-Beam_engraver::valid_end_moment()
+Beam_engraver::valid_end_point()
{
- return last_stem_added_at_.grace_part_ == Rational(0);
+ return valid_start_point ();
}
-
Beam_engraver::Beam_engraver ()
{
beam_ = 0;
finished_beam_ =0;
finished_beam_info_=0;
beam_info_ =0;
- reqs_drul_[LEFT] = reqs_drul_[RIGHT] =0;
- prev_start_req_ =0;
-
+ now_stop_ev_ = 0;
+ start_ev_ = 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 ("beam-event"))
{
- if (scm_equal_p (c->get_mus_property ("span-type"),
- scm_makfrom0str ("abort")) == SCM_BOOL_T)
+ Direction d = to_dir (m->get_mus_property ("span-direction"));
+ if (d == START && !valid_start_point ())
+ return false;
+ if (d == STOP && !valid_end_point ())
+ return false;
+
+ if (d == START)
{
- reqs_drul_[START] = 0;
- reqs_drul_[STOP] = 0;
- if (beam_)
- beam_->suicide ();
- beam_ = 0;
+ start_ev_ = m;
}
- else if (scm_equal_p (c->get_mus_property ("span-type"),
- scm_makfrom0str ("beam")) == SCM_BOOL_T)
+ else if (d==STOP)
{
- Direction d =c->get_span_dir ();
-
-
- if (d == STOP && !valid_end_moment())
- return false;
-
- if (d == START && !valid_start_moment ())
- return false;
-
- if (d == STOP)
- {
- SCM m = get_property ("automaticMelismata");
- SCM b = get_property ("autoBeaming");
- if (to_boolean (m) && !to_boolean (b))
- {
- set_melisma (false);
- }
- }
-
- reqs_drul_[d ] = c;
- return true;
+ now_stop_ev_ = m;
}
+ return true;
}
return false;
}
void
-Beam_engraver::set_melisma (bool m)
+Beam_engraver::set_melisma (bool ml)
{
- daddy_trans_->set_property ("beamMelismaBusy", m ? SCM_BOOL_T :SCM_BOOL_F);
+ SCM b = get_property ("autoBeaming");
+ if (!to_boolean (b))
+ daddy_context_->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
}
void
Beam_engraver::process_music ()
{
- if (reqs_drul_[STOP])
+ if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
{
- prev_start_req_ =0;
- finished_beam_ = beam_;
- finished_beam_info_ = beam_info_;
-
- beam_info_ =0;
- beam_ = 0;
+ get_score_engraver ()->forbid_breaks ();
}
-
- if (beam_)
- {
- top_engraver ()->forbid_breaks ();
- }
- if (reqs_drul_[START])
+ if (start_ev_)
{
if (beam_)
{
- reqs_drul_[START]->origin ()->warning (_ ("already have a beam"));
+ start_ev_->origin ()->warning (_ ("already have a beam"));
return;
}
- prev_start_req_ = reqs_drul_[START];
- beam_ = new Spanner (get_property ("Beam"));
+ set_melisma (true);
+ prev_start_ev_ = start_ev_;
+ beam_ = make_spanner ("Beam");
SCM smp = get_property ("measurePosition");
Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
beam_info_ = new Beaming_info_list;
/* urg, must copy to Auto_beam_engraver too */
-
- announce_grob(beam_, reqs_drul_[START]->self_scm());
+ announce_grob (beam_, start_ev_->self_scm());
}
}
void
Beam_engraver::start_translation_timestep ()
{
- reqs_drul_ [START] =0;
- reqs_drul_[STOP] = 0;
+ start_ev_ = 0;
if (beam_)
{
- SCM m = get_property ("automaticMelismata");
- SCM b = get_property ("autoBeaming");
- if (to_boolean (m) && !to_boolean (b))
- {
- set_melisma (true);
- }
+ set_melisma (true);
+
subdivide_beams_ = to_boolean(get_property("subdivideBeams"));
beat_length_ = *unsmob_moment (get_property ("beatLength"));
}
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();
+ set_melisma (false);
+ }
}
void
typeset_beam ();
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
{
Moment now = now_mom();
- if (!valid_start_moment ())
+ if (!valid_start_point ())
return ;
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->set_grob_property ("duration-log",
- gh_int2scm (durlog));
+ scm_int2num (durlog));
Moment stem_location = now - beam_start_mom_ + beam_start_location_;
beam_info_->add_stem (stem_location,
(durlog- 2) >? 0);
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",
+/* acks */ "stem-interface rest-interface",
/* reads */ "beamMelismaBusy beatLength subdivideBeams",
/* write */ "");
TRANSLATOR_DECLARATIONS(Grace_beam_engraver);
protected:
- virtual bool valid_start_moment();
- virtual bool valid_end_moment ();
+ virtual bool valid_start_point();
+ virtual bool valid_end_point ();
};
Grace_beam_engraver::Grace_beam_engraver()
}
bool
-Grace_beam_engraver::valid_start_moment()
+Grace_beam_engraver::valid_start_point()
{
Moment n = now_mom ();
bool
-Grace_beam_engraver::valid_end_moment ()
+Grace_beam_engraver::valid_end_point ()
{
- return beam_ && last_stem_added_at_.grace_part_ != Rational(0);
+ return beam_ && valid_start_point ();
}
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",
-/* reads */ "beamMelismaBusy beatLength subdivideBeams",
+/* accepts */ "beam-event",
+/* acks */ "stem-interface rest-interface",
+/* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
/* write */ "");
projects / lilypond.git / blobdiff