Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 2b2930e9b17dbf2511ff635cdc49af39fc4a127f..cbd79dad9acfba8556eb8069fe20834caca27173 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -40,8 +40,7 @@ ADD_TRANSLATOR (Vertical_align_engraver,
                "Catch groups (staffs, lyrics lines, etc.) and stack "
                "them vertically.",
                /* create */ "VerticalAlignment",
-               /* accept */ "",
-               /* read */ "",
+               /* read */ "alignAboveContext alignBelowContext",
                /* write */ "");
 
 Vertical_align_engraver::Vertical_align_engraver ()
@@ -98,7 +97,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,11 +112,11 @@ 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.back ();
          arr.pop_back ();