-/*
- beam-engraver.cc -- implement Beam_engraver
-
+/*
+ beam-engraver.cc -- implement Beam_engraver
+
source file of the GNU LilyPond music typesetter
-
- (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "engraver.hh"
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
#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 "score-context.hh"
#include "spanner.hh"
-#include "context.hh"
+#include "stem.hh"
+#include "warn.hh"
+
+#include "translator.icc"
class Beam_engraver : public Engraver
{
-protected:
- Music * start_ev_;
-
+public:
+ DECLARE_ACKNOWLEDGER (stem);
+ DECLARE_ACKNOWLEDGER (rest);
+protected:
+ Music *start_ev_;
+
Spanner *finished_beam_;
Spanner *beam_;
- Music * prev_start_ev_;
+ Music *prev_start_ev_;
- Music * now_stop_ev_;
-
- Beaming_info_list * beam_info_;
- Beaming_info_list * finished_beam_info_;
+ Music *now_stop_ev_;
+
+ Beaming_pattern *beam_info_;
+ Beaming_pattern *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 start_translation_timestep ();
+ void stop_translation_timestep ();
+ void start_translation_timestep ();
virtual void finalize ();
- virtual void acknowledge_grob (Grob_info);
- virtual bool try_music (Music*);
- virtual void process_music ();
+ virtual bool try_music (Music *);
+ void process_music ();
virtual bool valid_start_point ();
virtual bool valid_end_point ();
-
+
public:
TRANSLATOR_DECLARATIONS (Beam_engraver);
};
-
/*
Hmm. this isn't necessary, since grace beams and normal beams are
always nested.
- */
+*/
bool
Beam_engraver::valid_start_point ()
{
{
beam_ = 0;
finished_beam_ = 0;
- finished_beam_info_= 0;
+ finished_beam_info_ = 0;
beam_info_ = 0;
now_stop_ev_ = 0;
start_ev_ = 0;
return false;
if (d == START)
- {
- start_ev_ = m;
- }
- else if (d==STOP)
- {
- now_stop_ev_ = m;
- }
+ start_ev_ = m;
+ else if (d == STOP)
+ now_stop_ev_ = m;
return true;
}
return false;
{
SCM b = get_property ("autoBeaming");
if (!to_boolean (b))
- context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+ context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
}
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 */
}
-
}
-
void
Beam_engraver::typeset_beam ()
{
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_;
finished_beam_info_ = 0;
finished_beam_ = 0;
Beam_engraver::start_translation_timestep ()
{
start_ev_ = 0;
-
+
if (beam_)
{
set_melisma (true);
-
- subdivide_beams_ = to_boolean (get_property ("subdivideBeams"));
- beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1,4));
}
}
Beam_engraver::stop_translation_timestep ()
{
typeset_beam ();
- if (now_stop_ev_ )
+ if (now_stop_ev_)
{
finished_beam_ = beam_;
finished_beam_info_ = beam_info_;
}
void
-Beam_engraver::acknowledge_grob (Grob_info info)
+Beam_engraver::acknowledge_rest (Grob_info info)
{
if (beam_)
{
- if (Rest::has_interface (info.grob_))
- {
- info.grob_->add_offset_callback (Beam::rest_collision_callback_proc, Y_AXIS);
- }
- else if (Stem::has_interface (info.grob_))
- {
- Moment now = now_mom ();
-
- if (!valid_start_point ())
- return ;
-
- Item *stem = dynamic_cast<Item*> (info.grob_);
- if (Stem::get_beam (stem))
- return;
-
- Music* m = info.music_cause ();
- if (!m->is_mus_type ("rhythmic-event"))
- {
- String s = _ ("stem must have Rhythmic structure");
- if (info.music_cause ())
- info.music_cause ()->origin ()->warning (s);
- else
- ::warning (s);
-
- return;
- }
-
-
- last_stem_added_at_ = now;
- int durlog = unsmob_duration (m->get_property ("duration"))-> duration_log ();
- if (durlog <= 2)
- {
- m->origin ()->warning (_ ("stem doesn't fit in beam"));
- prev_start_ev_->origin ()->warning (_ ("beam was started here"));
- /*
- don't return, since
-
- [r4 c8] can just as well be modern notation.
- */
- }
-
- stem->set_property ("duration-log",
- scm_int2num (durlog));
- Moment stem_location = now - beam_start_mom_ + beam_start_location_;
- beam_info_->add_stem (stem_location,
- (durlog- 2) >? 0);
- Beam::add_stem (beam_, stem);
- }
+ chain_offset_callback (info.grob(),
+ Beam::rest_collision_callback_proc, Y_AXIS);
}
}
+void
+Beam_engraver::acknowledge_stem (Grob_info info)
+{
+ if (!beam_)
+ return;
+
+ Moment now = now_mom ();
+ if (!valid_start_point ())
+ return;
+ Item *stem = dynamic_cast<Item *> (info.grob ());
+ if (Stem::get_beam (stem))
+ return;
-ENTER_DESCRIPTION (Beam_engraver,
-/* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be "
-"printed with flags instead of beams.",
-/* creats*/ "Beam",
-/* accepts */ "beam-event",
-/* acks */ "stem-interface rest-interface",
-/* reads */ "beamMelismaBusy beatLength subdivideBeams",
-/* write */ "");
+
+
+ Music *m = info.ultimate_music_cause ();
+ if (!m->is_mus_type ("rhythmic-event"))
+ {
+ string s = _ ("stem must have Rhythmic structure");
+ if (info.music_cause ())
+ info.music_cause ()->origin ()->warning (s);
+ else
+ ::warning (s);
+
+ return;
+ }
+
+ last_stem_added_at_ = now;
+ int durlog = unsmob_duration (m->get_property ("duration"))->duration_log ();
+ if (durlog <= 2)
+ {
+ m->origin ()->warning (_ ("stem doesn't fit in beam"));
+ prev_start_ev_->origin ()->warning (_ ("beam was started here"));
+ /*
+ don't return, since
+
+ [r4 c8] can just as well be modern notation.
+ */
+ }
+ stem->set_property ("duration-log",
+ scm_from_int (durlog));
+ Moment stem_location = now - beam_start_mom_ + beam_start_location_;
+ beam_info_->add_stem (stem_location,
+ max (durlog- 2, 0));
+ Beam::add_stem (beam_, stem);
+}
+
+ADD_ACKNOWLEDGER (Beam_engraver, stem);
+ADD_ACKNOWLEDGER (Beam_engraver, rest);
+
+ADD_TRANSLATOR (Beam_engraver,
+ /* 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 */
+ "forbidBreak");
class Grace_beam_engraver : public Beam_engraver
{
public:
- TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
+ TRANSLATOR_DECLARATIONS (Grace_beam_engraver);
protected:
virtual bool valid_start_point ();
return n.grace_part_ != Rational (0);
}
-
bool
Grace_beam_engraver::valid_end_point ()
{
return beam_ && valid_start_point ();
}
-
-
-ENTER_DESCRIPTION (Grace_beam_engraver,
-/* 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",
-/* accepts */ "beam-event",
-/* acks */ "stem-interface rest-interface",
-/* reads */ "beamMelismaBusy beatLength allowBeamBreak subdivideBeams",
-/* write */ "");
+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 "
+ "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 "
+ ,
+ /* write */ "");
projects / lilypond.git / blobdiff