The last commit was an accident. Revert 3 files that shouldn't have been

[lilypond.git] / lily / pitched-trill-engraver.cc

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 302c90b9f0d2c5424869d2167e08393135f14748..b514dfd10158e553744f12fff41e64123db25e4d 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -35,7 +35,7 @@ private:
   Item *trill_group_;
   Item *trill_accidental_;
 
-  Link_array<Grob> heads_;
+  vector<Grob*> heads_;
 
   void make_trill (Music *);
 };
@@ -50,12 +50,12 @@ Pitched_trill_engraver::Pitched_trill_engraver ()
 void
 Pitched_trill_engraver::acknowledge_dots (Grob_info info)
 {
-  heads_.push (info.grob ());
+  heads_.push_back (info.grob ());
 }
 void
 Pitched_trill_engraver::acknowledge_note_head (Grob_info info)
 {
-  heads_.push (info.grob ());
+  heads_.push_back (info.grob ());
 }
 
 void
@@ -82,8 +82,7 @@ Pitched_trill_engraver::make_trill (Music *mus)
 
   SCM handle = scm_assoc (key, keysig);
   bool print_acc
-    = (handle == SCM_BOOL_F)
-    || p->get_alteration () == 0;
+    = (handle == SCM_BOOL_F) || p->get_alteration () == 0;
 
   if (trill_head_)
     {
@@ -101,6 +100,7 @@ Pitched_trill_engraver::make_trill (Music *mus)
                                           + c0));
 
   trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ());
+  trill_group_->set_parent (trill_head_, Y_AXIS);
 
   Axis_group_interface::add_element (trill_group_, trill_head_);
 
@@ -112,9 +112,8 @@ Pitched_trill_engraver::make_trill (Music *mus)
       trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
       Side_position_interface::add_support (trill_accidental_, trill_head_);
       trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
-      trill_group_->set_parent (trill_head_, Y_AXIS);
-      Axis_group_interface::add_element (trill_group_, trill_accidental_);
       trill_accidental_->set_parent (trill_head_, Y_AXIS);
+      Axis_group_interface::add_element (trill_group_, trill_accidental_);
     }
 }
 
@@ -122,7 +121,7 @@ void
 Pitched_trill_engraver::stop_translation_timestep ()
 {
   if (trill_group_)
-    for (int i = 0; i < heads_.size (); i++)
+    for (vsize i = 0; i < heads_.size (); i++)
       Side_position_interface::add_support (trill_group_, heads_[i]);
 
   heads_.clear ();