source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
-#include "beaming.hh"
+#include "beaming-pattern.hh"
#include "beam.hh"
#include "stem.hh"
#include "warn.hh"
#include "translator.icc"
-
class Auto_beam_engraver : public Engraver
{
TRANSLATOR_DECLARATIONS (Auto_beam_engraver);
protected:
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
- PRECOMPUTED_VIRTUAL void start_translation_timestep ();
- PRECOMPUTED_VIRTUAL void process_music ();
+ void stop_translation_timestep ();
+ void start_translation_timestep ();
+ void process_music ();
virtual bool try_music (Music *);
virtual void finalize ();
+ virtual void derived_mark () const;
+
+ DECLARE_ACKNOWLEDGER (rest);
+ DECLARE_ACKNOWLEDGER (beam);
+ DECLARE_ACKNOWLEDGER (bar_line);
+ DECLARE_ACKNOWLEDGER (stem);
- DECLARE_ACKNOWLEDGER(rest);
- DECLARE_ACKNOWLEDGER(beam);
- DECLARE_ACKNOWLEDGER(bar_line);
- DECLARE_ACKNOWLEDGER(stem);
-
- PRECOMPUTED_VIRTUAL void process_acknowledged ();
+ void process_acknowledged ();
private:
bool test_moment (Direction, Moment);
*/
Moment shortest_mom_;
Spanner *finished_beam_;
- Link_array<Item> *stems_;
+ vector<Item*> *stems_;
int process_acknowledged_count_;
Moment last_add_mom_;
Moment beat_length_;
// We act as if beam were created, and start a grouping anyway.
- Beaming_info_list *grouping_;
- SCM beam_settings_; // ugh. should protect ?
+ Beaming_pattern *grouping_;
+ SCM beam_settings_;
- Beaming_info_list *finished_grouping_;
+ Beaming_pattern *finished_grouping_;
void check_bar_property ();
};
+void
+Auto_beam_engraver::derived_mark () const
+{
+ scm_gc_mark (beam_settings_);
+}
void
Auto_beam_engraver::check_bar_property ()
Auto_beam_engraver::Auto_beam_engraver ()
{
forbid_ = 0;
-process_acknowledged_count_ = 0;
+ process_acknowledged_count_ = 0;
stems_ = 0;
shortest_mom_ = Moment (Rational (1, 8));
finished_beam_ = 0;
test.smobbed_copy ())
!= SCM_BOOL_F;
}
-
+
void
Auto_beam_engraver::consider_begin (Moment test_mom)
{
if (to_boolean (get_property ("skipTypesetting")))
return 0;
- Spanner *beam = new Spanner (beam_settings_, context ()->get_grob_key ("Beam"));
- for (int i = 0; i < stems_->size (); i++)
- {
- /*
- watch out for stem tremolos and abbreviation beams
- */
- if (Stem::get_beam ((*stems_)[i]))
- {
- scm_gc_unprotect_object (beam->self_scm ());
- return 0;
- }
- Beam::add_stem (beam, (*stems_)[i]);
- }
+ for (vsize i = 0; i < stems_->size (); i++)
+ if (Stem::get_beam ((*stems_)[i]))
+ return 0;
+
+ /*
+ Can't use make_spanner_from_properties() because we have to use
+ beam_settings_.
+ */
+ Spanner *beam = new Spanner (beam_settings_,
+ context ()->get_grob_key ("Beam"));
+
+ for (vsize i = 0; i < stems_->size (); i++)
+ Beam::add_stem (beam, (*stems_)[i]);
announce_grob (beam, (*stems_)[0]->self_scm ());
return;
}
- stems_ = new Link_array<Item>;
- grouping_ = new Beaming_info_list;
+ stems_ = new vector<Item*>;
+ grouping_ = new Beaming_pattern ();
beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
beam_start_moment_ = now_mom ();
beam_start_location_
= robust_scm2moment (get_property ("measurePosition"), Moment (0));
- subdivide_beams_ = ly_scm2bool (get_property ("subdivideBeams"));
- beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment (1, 4));
}
void
Auto_beam_engraver::end_beam ()
{
if (stems_->size () < 2)
- {
- junk_beam ();
- }
+ junk_beam ();
else
{
finished_beam_ = create_beam ();
{
if (finished_beam_)
{
- finished_grouping_->beamify (beat_length_, subdivide_beams_);
+ if (!finished_beam_->get_bound (RIGHT))
+ finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
+
+ finished_grouping_->beamify (context ());
Beam::set_beaming (finished_beam_, finished_grouping_);
finished_beam_ = 0;
{
Moment now = now_mom ();
if (extend_mom_ < now)
- {
- end_beam ();
- }
+ end_beam ();
}
forbid_ = 0;
}
}
-
-
void
Auto_beam_engraver::acknowledge_beam (Grob_info info)
{
+ (void)info;
check_bar_property ();
if (stems_)
- {
- end_beam ();
- }
+ end_beam ();
}
-
+
void
Auto_beam_engraver::acknowledge_bar_line (Grob_info info)
{
+ (void)info;
check_bar_property ();
if (stems_)
end_beam ();
void
Auto_beam_engraver::acknowledge_rest (Grob_info info)
{
+ (void)info;
check_bar_property ();
if (stems_)
end_beam ();
{
check_bar_property ();
Item *stem = dynamic_cast<Item *> (info.grob ());
- Music *m = info.music_cause ();
+ Music *m = info.ultimate_music_cause ();
if (!m->is_mus_type ("rhythmic-event"))
{
programming_error ("stem must have rhythmic structure");
grouping_->add_stem (now - beam_start_moment_ + beam_start_location_,
durlog - 2);
- stems_->push (stem);
+ stems_->push_back (stem);
last_add_mom_ = now;
extend_mom_ = max (extend_mom_, now) + m->get_length ();
}
Auto_beam_engraver::process_acknowledged ()
{
if (extend_mom_ > now_mom ())
- return ;
+ return;
if (!process_acknowledged_count_)
{
Moment now = now_mom ();
if ((extend_mom_ < now)
|| ((extend_mom_ == now) && (last_add_mom_ != now)))
- {
- end_beam ();
- }
+ end_beam ();
else if (!stems_->size ())
- {
- junk_beam ();
- }
+ junk_beam ();
}
}
process_acknowledged_count_++;
}
-ADD_ACKNOWLEDGER(Auto_beam_engraver,stem);
-ADD_ACKNOWLEDGER(Auto_beam_engraver,bar_line);
-ADD_ACKNOWLEDGER(Auto_beam_engraver,beam);
-ADD_ACKNOWLEDGER(Auto_beam_engraver,rest);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, stem);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
+ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
ADD_TRANSLATOR (Auto_beam_engraver,
- /* descr */ "Generate beams based on measure characteristics and observed "
+ /* doc */ "Generate beams based on measure characteristics and observed "
"Stems. Uses beatLength, measureLength and measurePosition to decide "
"when to start and stop a beam. Overriding beaming is done through "
"@ref{Stem_engraver} properties @code{stemLeftBeamCount} and "
"@code{stemRightBeamCount}. ",
- /* creats*/ "Beam",
- /* accepts */ "beam-forbid-event",
- /* acks */ "",
- /* reads */ "autoBeaming autoBeamSettings beatLength subdivideBeams",
+ /* create */ "Beam",
+ /* accept */ "beam-forbid-event",
+ /* read */ "autoBeaming autoBeamSettings beatLength subdivideBeams",
/* write */ "");