source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "context.hh"
void process_music ();
virtual void finalize ();
virtual void initialize ();
+
+ bool top_level_;
};
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 */ "",
- /* write */ "");
+ /* doc */
+ "Catch groups (staves, lyrics lines, etc.) and stack them"
+ " vertically.",
+
+ /* create */
+ "VerticalAlignment ",
+
+ /* read */
+ "alignAboveContext "
+ "alignBelowContext ",
+
+ /* write */
+ ""
+ );
Vertical_align_engraver::Vertical_align_engraver ()
{
valign_ = 0;
id_to_group_hashtab_ = SCM_EOL;
+ top_level_ = false;
}
void
{
if (!valign_)
{
- valign_ = make_spanner ("VerticalAlignment", SCM_EOL);
+ top_level_ = to_boolean (get_property ("topLevelAlignment"));
+
+ valign_ = make_spanner (top_level_ ? "VerticalAlignment" : "StaffGrouper", SCM_EOL);
valign_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
Align_interface::set_ordered (valign_);
}
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);
}
void
Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
{
- if (qualifies (i))
+ if (top_level_ && qualifies (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");
}
}
}
+ else if (!top_level_)
+ {
+ Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ());
+ i.grob ()->set_object ("staff-grouper", valign_->self_scm ());
+ }
}