#include "note-column.hh"
#include "slur.hh"
#include "spanner.hh"
-#include "tie.hh"
#include "warn.hh"
/*
{
Drul_array<Music *> events_;
Music *running_slur_start_;
- Link_array<Grob> slurs_;
- Link_array<Grob> end_slurs_;
+ vector<Grob*> slurs_;
+ vector<Grob*> end_slurs_;
void set_melisma (bool);
Slur_engraver::acknowledge_note_column (Grob_info info)
{
Grob *e = info.grob ();
- for (int i = slurs_.size (); i--;)
+ for (vsize i = slurs_.size (); i--;)
Slur::add_column (slurs_[i], e);
- for (int i = end_slurs_.size (); i--;)
+ for (vsize i = end_slurs_.size (); i--;)
Slur::add_column (end_slurs_[i], e);
}
void
Slur_engraver::acknowledge_extra_object (Grob_info info)
{
- if (slurs_.is_empty ()
- && end_slurs_.is_empty ())
- return ;
-
- Grob *e = info.grob ();
- SCM avoid = e->get_property ("avoid-slur");
- if (Tie::has_interface (e)
- || avoid == ly_symbol2scm ("inside"))
- {
- for (int i = slurs_.size (); i--;)
- Slur::add_extra_encompass (slurs_[i], e);
- for (int i = end_slurs_.size (); i--;)
- Slur::add_extra_encompass (end_slurs_[i], e);
- }
- else if (avoid == ly_symbol2scm ("outside")
- || avoid == ly_symbol2scm ("around"))
- {
- Grob *slur = slurs_.size () ? slurs_[0] : 0;
- slur = (end_slurs_.size () && !slur)
- ? end_slurs_[0] : slur;
-
- if (slur)
- {
- chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS);
- e->set_object ("slur", slur->self_scm ());
- }
- }
- else
- e->warning ("Ignoring grob for slur. avoid-slur not set?");
+ Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
}
void
void
Slur_engraver::acknowledge_script (Grob_info info)
{
- acknowledge_extra_object (info);
+ if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+ acknowledge_extra_object (info);
}
void
Slur_engraver::acknowledge_text_script (Grob_info info)
{
- // if (!info.grob ()->internal_has_interface (ly_symbol2scm ("DynamicText")))
acknowledge_extra_object (info);
}
if (slurs_.size () == 0)
events_[STOP]->origin ()->warning (_ ("can't end slur"));
+
end_slurs_ = slurs_;
slurs_.clear ();
}
- if (events_[START] && slurs_.is_empty ())
+ if (events_[START] && slurs_.empty ())
{
Music *ev = events_[START];
if (updown && !double_slurs)
set_grob_direction (slur, updown);
- slurs_.push (slur);
+ slurs_.push_back (slur);
if (double_slurs)
{
set_grob_direction (slur, DOWN);
slur = make_spanner ("Slur", events_[START]->self_scm ());
set_grob_direction (slur, UP);
- slurs_.push (slur);
+ slurs_.push_back (slur);
}
}
set_melisma (slurs_.size ());
void
Slur_engraver::stop_translation_timestep ()
{
+ for (vsize i = 0; i < end_slurs_.size (); i++)
+ announce_end_grob (end_slurs_[i], SCM_EOL);
end_slurs_.clear ();
events_[START] = events_[STOP] = 0;
}