X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=64e7333f134d06bbbb0816ea819cb777bb56ba38;hb=c74523f061cba5fb50d307ff04e3507c8b36f5c8;hp=d6f9ef5486b5219735df1def26cd89c873784758;hpb=77c7eccb319949accf3076b2a138e3ca16cf513e;p=lilypond.git

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index d6f9ef5486..64e7333f13 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -40,8 +40,10 @@ 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,9 +100,9 @@ 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 ()),
+      scm_hash_set_x (id_to_group_hashtab_, ly_string2scm (id),
 		      i.grob ()->self_scm ());
 
       SCM before_id = i.context ()->get_property ("alignAboveContext");
@@ -117,7 +119,7 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
       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 ();