source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+#include "engraver.hh"
+
#include "context.hh"
#include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "slur.hh"
+#include "international.hh"
#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_;
protected:
virtual bool try_music (Music *);
}
else if (d == STOP)
{
- if (slurs_.is_empty ())
+ if (slurs_.empty ())
return false;
events_[STOP] = m;
Phrasing_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);
}
-/* FIXME: cut + paste job from Slur:: */
void
Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
{
- 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 ());
- }
- }
+ Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
}
void
slurs_.clear ();
}
- if (events_[START] && slurs_.is_empty ())
+ if (events_[START] && slurs_.empty ())
{
Music *ev = events_[START];
if (updown)
set_grob_direction (slur, updown);
- slurs_.push (slur);
+ slurs_.push_back (slur);
}
}