(c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "engraver.hh"
#include "beam.hh"
-#include "stem.hh"
-#include "warn.hh"
-#include "beaming.hh"
-#include "score-engraver.hh"
-#include "rest.hh"
+#include "beaming-pattern.hh"
+#include "context.hh"
#include "drul-array.hh"
+#include "duration.hh"
+#include "engraver.hh"
+#include "international.hh"
#include "item.hh"
+#include "rest.hh"
#include "spanner.hh"
-#include "context.hh"
-#include "duration.hh"
+#include "stream-event.hh"
+#include "stem.hh"
+#include "warn.hh"
#include "translator.icc"
DECLARE_ACKNOWLEDGER (stem);
DECLARE_ACKNOWLEDGER (rest);
protected:
- Music *start_ev_;
+ Stream_event *start_ev_;
Spanner *finished_beam_;
Spanner *beam_;
- Music *prev_start_ev_;
+ Stream_event *prev_start_ev_;
- Music *now_stop_ev_;
+ Stream_event *now_stop_ev_;
- Beaming_info_list *beam_info_;
- Beaming_info_list *finished_beam_info_;
+ Beaming_pattern *beam_info_;
+ Beaming_pattern *finished_beam_info_;
/// location within measure where beam started.
Moment beam_start_location_;
void start_translation_timestep ();
virtual void finalize ();
- virtual bool try_music (Music *);
void process_music ();
virtual bool valid_start_point ();
virtual bool valid_end_point ();
+ DECLARE_TRANSLATOR_LISTENER (beam);
public:
TRANSLATOR_DECLARATIONS (Beam_engraver);
};
prev_start_ev_ = 0;
}
-bool
-Beam_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Beam_engraver, beam);
+void
+Beam_engraver::listen_beam (Stream_event *ev)
{
- if (m->is_mus_type ("beam-event"))
- {
- Direction d = to_dir (m->get_property ("span-direction"));
- if (d == START && !valid_start_point ())
- return false;
- if (d == STOP && !valid_end_point ())
- return false;
-
- if (d == START)
- start_ev_ = m;
- else if (d == STOP)
- now_stop_ev_ = m;
- return true;
- }
- return false;
+ Direction d = to_dir (ev->get_property ("span-direction"));
+
+ if (d == START && valid_start_point ())
+ ASSIGN_EVENT_ONCE (start_ev_, ev);
+ else if (d == STOP && valid_end_point ())
+ ASSIGN_EVENT_ONCE (now_stop_ev_, ev);
}
void
Beam_engraver::process_music ()
{
if (beam_ && !to_boolean (get_property ("allowBeamBreak")))
- get_score_engraver ()->forbid_breaks ();
+ context ()->get_score_context ()->set_property ("forbidBreak", SCM_BOOL_T);
if (start_ev_)
{
beam_start_location_ = mp;
beam_start_mom_ = now_mom ();
- beam_info_ = new Beaming_info_list;
-
+ beam_info_ = new Beaming_pattern;
/* urg, must copy to Auto_beam_engraver too */
}
}
{
if (finished_beam_)
{
- finished_beam_info_->beamify (beat_length_, subdivide_beams_);
+ if (!finished_beam_->get_bound (RIGHT))
+ finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
+
+ finished_beam_info_->beamify (context ());
Beam::set_beaming (finished_beam_, finished_beam_info_);
delete finished_beam_info_;
if (beam_)
{
set_melisma (true);
-
- subdivide_beams_ = to_boolean (get_property ("subdivideBeams"));
- beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1, 4));
}
}
void
Beam_engraver::acknowledge_rest (Grob_info info)
{
- if (beam_)
+ if (beam_
+ && !scm_is_number (info.grob ()->get_property_data ("staff-position")))
{
chain_offset_callback (info.grob(),
Beam::rest_collision_callback_proc, Y_AXIS);
- Music *m = info.ultimate_music_cause ();
- if (!m->is_mus_type ("rhythmic-event"))
+ Stream_event *ev = info.ultimate_event_cause ();
+ if (!ev->in_event_class ("rhythmic-event"))
{
- String s = _ ("stem must have Rhythmic structure");
- if (info.music_cause ())
- info.music_cause ()->origin ()->warning (s);
- else
- ::warning (s);
-
+ info.grob ()->warning (_ ("stem must have Rhythmic structure"));
return;
}
last_stem_added_at_ = now;
- int durlog = unsmob_duration (m->get_property ("duration"))->duration_log ();
+ int durlog = unsmob_duration (ev->get_property ("duration"))->duration_log ();
if (durlog <= 2)
{
- m->origin ()->warning (_ ("stem doesn't fit in beam"));
+ ev->origin ()->warning (_ ("stem does not fit in beam"));
prev_start_ev_->origin ()->warning (_ ("beam was started here"));
/*
don't return, since
ADD_ACKNOWLEDGER (Beam_engraver, rest);
ADD_TRANSLATOR (Beam_engraver,
- /* doc */ "Handles Beam events by engraving Beams. If omitted, then notes will be "
+ /* doc */
+
+ "Handles Beam events by engraving Beams. If omitted, then notes will be "
"printed with flags instead of beams.",
+
/* create */ "Beam",
- /* accept */ "beam-event",
- /* read */ "beamMelismaBusy beatLength subdivideBeams",
- /* write */ "");
+
+ /* read */
+ "beamMelismaBusy "
+ "beatLength "
+ "subdivideBeams "
+ ,
+ /* write */
+ "forbidBreak");
class Grace_beam_engraver : public Beam_engraver
{
public:
TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
+ DECLARE_TRANSLATOR_LISTENER (beam);
+
protected:
virtual bool valid_start_point ();
virtual bool valid_end_point ();
return beam_ && valid_start_point ();
}
+/*
+ Ugh, C&P code.
+ */
+IMPLEMENT_TRANSLATOR_LISTENER (Grace_beam_engraver, beam);
+void
+Grace_beam_engraver::listen_beam (Stream_event *ev)
+{
+ Direction d = to_dir (ev->get_property ("span-direction"));
+
+ if (d == START && valid_start_point ())
+ start_ev_ = ev;
+ else if (d == STOP && valid_end_point ())
+ now_stop_ev_ = ev;
+}
+
+
ADD_ACKNOWLEDGER (Grace_beam_engraver, stem);
ADD_ACKNOWLEDGER (Grace_beam_engraver, rest);
+
ADD_TRANSLATOR (Grace_beam_engraver,
- /* doc */ "Handles Beam events by engraving Beams. If omitted, then notes will "
+
+ /* doc */
+
+ "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. ",
+
/* create */ "Beam",
- /* accept */ "beam-event",
- /* read */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
+ /* read */
+ "beamMelismaBusy "
+ "beatLength "
+ "allowBeamBreak "
+ "subdivideBeams "
+ ,
/* write */ "");
projects / lilypond.git / blobdiff