Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 64e7333f134d06bbbb0816ea819cb777bb56ba38..f3cc50d6cfc759ff7c1d313a56e542c8228d4b22 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -37,7 +37,7 @@ protected:
 
 ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
 ADD_TRANSLATOR (Vertical_align_engraver,
-               "Catch groups (staffs, lyrics lines, etc.) and stack "
+               "Catch groups (staves, lyrics lines, etc.) and stack "
                "them vertically.",
                /* create */ "VerticalAlignment",
                /* read */
@@ -92,6 +92,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);
 }