/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2015 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
class Axis_group_engraver : public Engraver
{
protected:
+ bool active_;
Spanner *staffline_;
SCM interesting_;
vector<Grob *> elts_;
void process_music ();
+ virtual void initialize ();
virtual void finalize ();
- DECLARE_ACKNOWLEDGER (grob);
+ void acknowledge_grob (Grob_info);
void process_acknowledged ();
virtual Spanner *get_spanner ();
virtual void add_element (Grob *);
};
-Axis_group_engraver::Axis_group_engraver ()
+Axis_group_engraver::Axis_group_engraver (Context *c)
+ : Engraver (c)
{
staffline_ = 0;
interesting_ = SCM_EOL;
+ active_ = false;
+}
+
+void
+Axis_group_engraver::initialize ()
+{
+ active_ = !to_boolean (get_property ("hasAxisGroup"));
+ if (active_)
+ context ()->set_property ("hasAxisGroup", SCM_BOOL_T);
}
void
void
Axis_group_engraver::process_music ()
{
- if (!staffline_)
+ if (!staffline_ && active_)
{
staffline_ = get_spanner ();
- Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
+ Grob *it = unsmob<Grob> (get_property ("currentCommandColumn"));
staffline_->set_bound (LEFT, it);
}
interesting_ = get_property ("keepAliveInterfaces");
{
if (staffline_)
{
- Grob *it = unsmob_grob (get_property ("currentCommandColumn"));
+ Grob *it = unsmob<Grob> (get_property ("currentCommandColumn"));
staffline_->set_bound (RIGHT, it);
Pointer_group_interface::set_ordered (staffline_, ly_symbol2scm ("elements"), false);
{
if (!staffline_)
return;
- if (i.grob ()->name () == "VerticalAxisGroup") {
- i.grob ()->programming_error ("duplicate axis group");
- if (staffline_->is_live ())
- staffline_->suicide ();
- staffline_ = 0;
- elts_.clear ();
- return;
- }
+
elts_.push_back (i.grob ());
- if (staffline_ && to_boolean(staffline_->get_property("remove-empty")))
+ if (to_boolean (staffline_->get_property ("remove-empty")))
{
for (SCM s = interesting_; scm_is_pair (s); s = scm_cdr (s))
{
if (i.grob ()->internal_has_interface (scm_car (s)))
- Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ());
+ {
+ Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ());
+ break;
+ }
}
}
}
for (vsize i = 0; i < elts_.size (); i++)
{
- if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y")))
+ if (!unsmob<Grob> (elts_[i]->get_object ("axis-group-parent-Y")))
{
if (staffline_->get_parent (Y_AXIS)
&& staffline_->get_parent (Y_AXIS) == elts_[i])
Axis_group_interface::add_element (staffline_, e);
}
-ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
+
+void
+Axis_group_engraver::boot ()
+{
+ ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
+}
ADD_TRANSLATOR (Axis_group_engraver,
/* doc */
/* read */
"currentCommandColumn "
- "keepAliveInterfaces ",
-
+ "keepAliveInterfaces "
+ "hasAxisGroup ",
+
/* write */
- ""
+ "hasAxisGroup "
);