Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/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 9523d3c6a8e1c72007e47d71f87dfaa685eefb89..64e7333f134d06bbbb0816ea819cb777bb56ba38 100644 (file)
--- 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 */ "alignAboveContext alignBelowContext",
+               /* read */
+               "alignAboveContext "
+               "alignBelowContext ",
+
                /* write */ "");
 
 Vertical_align_engraver::Vertical_align_engraver ()
@@ -100,7 +102,7 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
     {
       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");