Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / vertical-align-engraver.cc

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index de78c3f835a7e2a9da837588bbd9ee9bcb13b8e6..8b8d04ea0cb8cc6cbab90c8b81f11828bcfe9ac6 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -98,7 +98,7 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
 {
   if (qualifies (i))
     {
-      std::string id = i.context ()->id_string ();
+      string id = i.context ()->id_string ();
 
       scm_hash_set_x (id_to_group_hashtab_, scm_makfrom0str (id.c_str ()),
                      i.grob ()->self_scm ());
@@ -113,13 +113,14 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
       Grob *after_grob = unsmob_grob (after);
 
       Align_interface::add_element (valign_, i.grob ());
-
+       
       if (before_grob || after_grob)
        {
          Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements"));
-         Link_array<Grob> &arr = ga->array_reference ();
+         vector<Grob*> &arr = ga->array_reference ();
 
-         Grob *added = arr.pop ();
+         Grob *added = arr.back ();
+         arr.pop_back ();
          for (vsize i = 0; i < arr.size (); i++)
            {
              if (arr[i] == before_grob)