X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvertical-align-engraver.cc;h=365c35cb4870659be13a50f311e06dcd1a0b351c;hb=128e91673163c6beeea6b9328e507d87be7175c9;hp=9523d3c6a8e1c72007e47d71f87dfaa685eefb89;hpb=5d1d077e3d4f49fd822d3c04e785eee4be06a7fc;p=lilypond.git diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 9523d3c6a8..365c35cb48 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 + (c) 1997--2009 Han-Wen Nienhuys */ #include "context.hh" @@ -37,12 +37,20 @@ protected: ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group); ADD_TRANSLATOR (Vertical_align_engraver, - "Catch groups (staffs, lyrics lines, etc.) and stack " - "them vertically.", - /* create */ "VerticalAlignment", - /* accept */ "", - /* read */ "alignAboveContext alignBelowContext", - /* write */ ""); + /* doc */ + "Catch groups (staves, lyrics lines, etc.) and stack them" + " vertically.", + + /* create */ + "VerticalAlignment ", + + /* read */ + "alignAboveContext " + "alignBelowContext ", + + /* write */ + "" + ); Vertical_align_engraver::Vertical_align_engraver () { @@ -90,6 +98,7 @@ Vertical_align_engraver::qualifies (Grob_info i) const return sz > 0 && Axis_group_interface::has_interface (i.grob ()) && !i.grob ()->get_parent (Y_AXIS) + && !to_boolean (i.grob ()->get_property ("no-alignment")) && Axis_group_interface::has_axis (i.grob (), Y_AXIS); } @@ -100,7 +109,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");