/*
slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "event.hh"
virtual bool try_music (Music*);
virtual void acknowledge_grob (Grob_info);
virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
virtual void finalize ();
- virtual void process_acknowledged_grobs ();
+ virtual void process_music ();
public:
TRANSLATOR_DECLARATIONS (Slur_engraver);
bool
Slur_engraver::try_music (Music *ev)
{
- if (ev->is_mus_type ("abort-event"))
- {
- for (int i = 0; i < slur_stack_.size (); i++)
- {
- slur_stack_[i]->suicide ();
- }
- slur_stack_.clear ();
- for (int i = 0; i < end_slurs_.size (); i++)
- {
- end_slurs_[i]->suicide ();
- }
- end_slurs_.clear ();
- events_.clear ();
- new_slur_evs_.clear ();
- }
- else if (ev->is_mus_type ("slur-event"))
+ if (ev->is_mus_type ("slur-event"))
{
/*
Let's not start more than one slur per moment.
*/
return true;
-
}
else if (d == STOP)
{
{
for (int i = 0; i < slur_stack_.size (); i++)
{
-#if 0
- typeset_grob (slur_stack_[i]);
-#else
/*
Let's not typeset unterminated stuff
*/
slur_stack_[i]->suicide ();
-#endif
}
slur_stack_.clear ();
}
void
-Slur_engraver::process_acknowledged_grobs ()
+Slur_engraver::process_music ()
{
Link_array<Grob> start_slurs;
for (int i=0; i< new_slur_evs_.size (); i++)
{
// push a new slur onto stack.
// (use temp. array to wait for all slur STOPs)
- Grob* slur = new Spanner (get_property ("Slur"));
+ Grob* slur = make_spanner ("Slur");
Slur::set_interface (slur); // cannot remove yet!
announce_grob (slur, slur_ev->self_scm ());
}
}
- for (int i=0; i < start_slurs.size (); i++)
- slur_stack_.push (start_slurs[i]);
+
+ slur_stack_.concat (start_slurs);
+
+ set_melisma (slur_stack_.size ());
+
new_slur_evs_.clear ();
}
typeset_grob (end_slurs_[i]);
}
end_slurs_.clear ();
-}
-
-void
-Slur_engraver::start_translation_timestep ()
-{
new_slur_evs_.clear ();
- SCM m = get_property ("automaticMelismata");
- if (to_boolean (m))
- {
- set_melisma (slur_stack_.size ());
- }
}