class New_fingering_engraver : public Engraver
{
- std::vector<Finger_tuple> fingerings_;
- std::vector<Finger_tuple> articulations_;
- std::vector<Finger_tuple> string_numbers_;
+ vector<Finger_tuple> fingerings_;
+ vector<Finger_tuple> articulations_;
+ vector<Finger_tuple> string_numbers_;
- Link_array<Grob> heads_;
+ vector<Grob*> heads_;
Grob *stem_;
public:
void add_fingering (Grob *, Music *, Music *);
void add_script (Grob *, Music *, Music *);
void add_string (Grob *, Music *, Music *);
- void position_scripts (SCM orientations, std::vector<Finger_tuple> *);
+ void position_scripts (SCM orientations, vector<Finger_tuple> *);
};
void
void
New_fingering_engraver::position_scripts (SCM orientations,
- std::vector<Finger_tuple> *scripts)
+ vector<Finger_tuple> *scripts)
{
for (vsize i = 0; i < scripts->size (); i++)
- if (stem_ && to_boolean (scripts->elem (i).script_->get_property ("add-stem-support")))
- Side_position_interface::add_support (scripts->elem (i).script_, stem_);
+ if (stem_ && to_boolean (scripts->at (i).script_->get_property ("add-stem-support")))
+ Side_position_interface::add_support (scripts->at (i).script_, stem_);
/*
This is not extremely elegant, but we have to do a little
for (vsize j = heads_.size (); j--;)
Side_position_interface::add_support ((*scripts)[i].script_, heads_[j]);
- std::vector<Finger_tuple> up, down, horiz;
+ vector<Finger_tuple> up, down, horiz;
for (vsize i = scripts->size (); i--;)
{
SCM d = (*scripts)[i].finger_event_->get_property ("direction");
}
}
- scripts->sort (&Finger_tuple::compare);
+ vector_sort (*scripts, Finger_tuple::compare);
bool up_p = scm_c_memq (ly_symbol2scm ("up"), orientations) != SCM_BOOL_F;
bool down_p = scm_c_memq (ly_symbol2scm ("down"), orientations) != SCM_BOOL_F;
scripts->erase (scripts->begin ());
}
- horiz.concat (*scripts);
+ horiz.insert (horiz.end (), scripts->begin (), scripts->end ());
}
else if (up_p && down_p)
{
int center = scripts->size () / 2;
- down.concat (std::vector<Finger_tuple> (scripts->begin (),
- scripts->begin () + center));
- up.concat (std::vector<Finger_tuple> (scripts->begin () + center,
- scripts->end ()));
+ down.insert (down.end (), scripts->begin (), scripts->begin () + center);
+ up.insert (up.end (), scripts->begin () + center, scripts->end ());
}
else if (up_p)
{
- up.concat (*scripts);
+ up.insert (up.end (), scripts->begin (), scripts->end ());
scripts->clear ();
}
else
warning (_ ("no placement found for fingerings"));
warning (_ ("placing below"));
}
- down.concat (*scripts);
+ down.insert (down.end (), scripts->begin (), scripts->end ());
scripts->clear ();
}
int finger_prio = 200;
Direction d = DOWN;
- Drul_array< std::vector<Finger_tuple> > vertical (down, up);
+ Drul_array< vector<Finger_tuple> > vertical (down, up);
do
{
for (vsize i = 0; i < vertical[d].size (); i++)