/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "context.hh"
#include "paper-column.hh"
#include "align-interface.hh"
-#include "span-bar.hh"
#include "axis-group-interface.hh"
#include "engraver.hh"
+#include "international.hh"
#include "spanner.hh"
#include "pointer-group-interface.hh"
#include "grob-array.hh"
/* read */
"alignAboveContext "
- "alignBelowContext ",
+ "alignBelowContext "
+ "hasAxisGroup ",
/* write */
""
void
Vertical_align_engraver::process_music ()
{
- if (!valign_)
+ if (!valign_ && !scm_is_null (id_to_group_hashtab_))
{
+ if (to_boolean (get_property ("hasAxisGroup")))
+ {
+ warning (_ ("Ignoring Vertical_align_engraver in VerticalAxisGroup"));
+ id_to_group_hashtab_ = SCM_EOL;
+ return;
+ }
+
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")));
+ valign_->set_bound (LEFT, Grob::unsmob (get_property ("currentCommandColumn")));
Align_interface::set_ordered (valign_);
}
}
{
if (valign_)
{
- valign_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+ valign_->set_bound (RIGHT, Grob::unsmob (get_property ("currentCommandColumn")));
valign_ = 0;
}
}
void
Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
{
+ if (scm_is_null (id_to_group_hashtab_))
+ return;
+
if (top_level_ && qualifies (i))
{
string id = i.context ()->id_string ();
SCM before = scm_hash_ref (id_to_group_hashtab_, before_id, SCM_BOOL_F);
SCM after = scm_hash_ref (id_to_group_hashtab_, after_id, SCM_BOOL_F);
- Grob *before_grob = unsmob_grob (before);
- Grob *after_grob = unsmob_grob (after);
+ Grob *before_grob = Grob::unsmob (before);
+ Grob *after_grob = Grob::unsmob (after);
Align_interface::add_element (valign_, i.grob ());
if (before_grob || after_grob)
{
- Grob_array *ga = unsmob_grob_array (valign_->get_object ("elements"));
+ Grob_array *ga = Grob_array::unsmob (valign_->get_object ("elements"));
vector<Grob *> &arr = ga->array_reference ();
Grob *added = arr.back ();
else if (qualifies (i))
{
Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ());
- if (!unsmob_grob (i.grob ()->get_object ("staff-grouper")))
+ if (!Grob::unsmob (i.grob ()->get_object ("staff-grouper")))
i.grob ()->set_object ("staff-grouper", valign_->self_scm ());
}
}