X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=0b491eefc93f3ce689edcd76475db8d430f4bffa;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=0881d72f64cddca5c11ad05a0232a44f7c5ca90f;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 0881d72f64..0b491eefc9 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -1,67 +1,185 @@ -/* - axis-group-engraver.cc -- implement Axis_group_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1999 Han-Wen Nienhuys - */ +/* + This file is part of LilyPond, the GNU music typesetter. -#include "axis-group-engraver.hh" -#include "axis-group-spanner.hh" -#include "paper-column.hh" + Copyright (C) 1999--2014 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#include "engraver.hh" + +#include "axis-group-interface.hh" +#include "hara-kiri-group-spanner.hh" +#include "pointer-group-interface.hh" +#include "context.hh" +#include "international.hh" +#include "spanner.hh" +#include "warn.hh" + +#include "translator.icc" + +/** + Put stuff in a Spanner with an Axis_group_interface. + Use as last element of a context. +*/ +class Axis_group_engraver : public Engraver +{ +protected: + bool active_; + Spanner *staffline_; + SCM interesting_; + vector elts_; + void process_music (); + virtual void initialize (); + virtual void finalize (); + DECLARE_ACKNOWLEDGER (grob); + void process_acknowledged (); + virtual Spanner *get_spanner (); + virtual void add_element (Grob *); + virtual bool must_be_last () const; + virtual void derived_mark () const; + +public: + TRANSLATOR_DECLARATIONS (Axis_group_engraver); +}; -ADD_THIS_TRANSLATOR (Axis_group_engraver); Axis_group_engraver::Axis_group_engraver () { - staffline_p_ = 0; + 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 +Axis_group_engraver::derived_mark () const +{ + scm_gc_mark (interesting_); +} + + +bool +Axis_group_engraver::must_be_last () const +{ + return true; } void -Axis_group_engraver::do_creation_processing () +Axis_group_engraver::process_music () { - staffline_p_ = get_spanner_p (); - staffline_p_->set_axes (Y_AXIS, Y_AXIS); - staffline_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ()); - announce_element (Score_element_info (staffline_p_, 0)); + if (!staffline_ && active_) + { + staffline_ = get_spanner (); + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (LEFT, it); + } + interesting_ = get_property ("keepAliveInterfaces"); } -Axis_group_spanner* -Axis_group_engraver::get_spanner_p () const +Spanner * +Axis_group_engraver::get_spanner () { - return new Axis_group_spanner; + return make_spanner ("VerticalAxisGroup", SCM_EOL); } + void -Axis_group_engraver::do_removal_processing () +Axis_group_engraver::finalize () { - staffline_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ()); - typeset_element (staffline_p_); - staffline_p_ = 0; + if (staffline_) + { + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (RIGHT, it); + + Pointer_group_interface::set_ordered (staffline_, ly_symbol2scm ("elements"), false); + } } void -Axis_group_engraver::acknowledge_element (Score_element_info i) +Axis_group_engraver::acknowledge_grob (Grob_info i) { - elts_.push (i.elem_l_); + if (staffline_) + elts_.push_back (i.grob ()); + + if (staffline_ && 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 ()); + } + } } +/* + maybe should check if our parent is set, because we now get a + cyclic parent relationship if we have two Axis_group_engravers in + the context. */ void Axis_group_engraver::process_acknowledged () { - /* UGH UGH UGH */ - for (int i=0; i < elts_.size (); i++) + if (!staffline_) + return; + + for (vsize i = 0; i < elts_.size (); i++) { - if (!elts_[i]->parent_l (Y_AXIS)) - staffline_p_->add_element (elts_[i]); - else - if ( - // elts_[i]->get_elt_property ("Axis_group_element::add_extra_element") == SCM_UNDEFINED && - ! dynamic_cast (elts_[i]->parent_l (Y_AXIS))) - - { - staffline_p_->add_element (elts_[i]); - } + if (!unsmob_grob (elts_[i]->get_object ("axis-group-parent-Y"))) + { + if (staffline_->get_parent (Y_AXIS) + && staffline_->get_parent (Y_AXIS) == elts_[i]) + { + staffline_->warning (_ ("Axis_group_engraver: vertical group already has a parent")); + staffline_->warning (_ ("are there two Axis_group_engravers?")); + staffline_->warning (_ ("removing this vertical group")); + staffline_->suicide (); + staffline_ = 0; + break; + } + add_element (elts_[i]); + } } elts_.clear (); } +void +Axis_group_engraver::add_element (Grob *e) +{ + Axis_group_interface::add_element (staffline_, e); +} + +ADD_ACKNOWLEDGER (Axis_group_engraver, grob); + +ADD_TRANSLATOR (Axis_group_engraver, + /* doc */ + "Group all objects created in this context in a" + " @code{VerticalAxisGroup} spanner.", + + /* create */ + "VerticalAxisGroup ", + + /* read */ + "currentCommandColumn " + "keepAliveInterfaces " + "hasAxisGroup ", + + /* write */ + "hasAxisGroup " + );