X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=87fcd2817d5db6f9a1bb16442f192e09120411d4;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=3c1679614737daee928ef2d242583073dd4b730e;hpb=f68bbd7a1ed1b0e7146bbbffcbcbb7f9c9bda3cc;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 3c16796147..87fcd2817d 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -1,166 +1,104 @@ -/* - axis-group-engraver.cc -- implement Axis_group_engraver - +/* + axis-group-engraver.cc -- implement Axis_group_engraver + source file of the GNU LilyPond music typesetter - - (c) 1999--2001 Han-Wen Nienhuys - */ + + (c) 1999--2006 Han-Wen Nienhuys +*/ + +#include "axis-group-engraver.hh" #include "spanner.hh" -#include "paper-column.hh" #include "axis-group-interface.hh" -#include "engraver.hh" -#include "engraver-group-engraver.hh" - -/** - Put stuff in a Spanner with an Axis_group_interface. - Use as last element of a context. - */ -class Axis_group_engraver : public Engraver -{ -protected: - Spanner *staffline_p_; - Link_array elts_; - virtual void initialize (); - virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); - virtual Spanner* get_spanner_p () const; - virtual void add_element (Grob*) ; -public: - VIRTUAL_COPY_CONS (Translator); - Axis_group_engraver (); -}; - -ADD_THIS_TRANSLATOR (Axis_group_engraver); +#include "warn.hh" +#include "context.hh" + +#include "translator.icc" Axis_group_engraver::Axis_group_engraver () { - staffline_p_ = 0; + must_be_last_ = true; + staffline_ = 0; } void -Axis_group_engraver::initialize () +Axis_group_engraver::process_music () { - staffline_p_ = get_spanner_p (); - Axis_group_interface::set_interface (staffline_p_); - Axis_group_interface::set_axes (staffline_p_, Y_AXIS, Y_AXIS); - - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - - staffline_p_->set_bound (LEFT,it); - - announce_grob (staffline_p_, 0); + if (!staffline_) + { + staffline_ = get_spanner (); + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (LEFT, it); + } } -Spanner* -Axis_group_engraver::get_spanner_p () const +Spanner * +Axis_group_engraver::get_spanner () { - return new Spanner (get_property ("VerticalAxisGroup")); + return make_spanner ("VerticalAxisGroup", SCM_EOL); } +/* + TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? +*/ + void Axis_group_engraver::finalize () { - String type = daddy_grav_l ()->type_str_ ; - SCM dims = get_property ("VerticalExtent"); - - if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) - && gh_number_p (ly_cdr (dims))) + if (staffline_) { - staffline_p_->set_extent_callback (Grob::preset_extent_proc, Y_AXIS); - staffline_p_->set_grob_property ("extent-Y", dims); + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (RIGHT, it); } - - dims = get_property ("MinimumVerticalExtent"); - if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) - && gh_number_p (ly_cdr (dims))) - staffline_p_->set_grob_property ("minimum-extent-Y", dims); - - dims = get_property ("ExtraVerticalExtent"); - if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) - && gh_number_p (ly_cdr (dims))) - staffline_p_->set_grob_property ("extra-extent-Y", dims); - - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - - - staffline_p_->set_bound (RIGHT,it); - - typeset_grob (staffline_p_); - staffline_p_ = 0; } void Axis_group_engraver::acknowledge_grob (Grob_info i) { - elts_.push (i.elem_l_); + elts_.push (i.grob ()); } /* - maybe should check if our parent_l is set, because we now get a + 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::create_grobs () +Axis_group_engraver::process_acknowledged () { - /* UGH UGH UGH */ - for (int i=0; i < elts_.size (); i++) - { - Grob *par = elts_[i]->parent_l (Y_AXIS); + if (!staffline_) + return; - if ((!par || !Axis_group_interface::has_interface (par)) - && ! elts_[i]->empty_b (Y_AXIS)) - add_element (elts_[i]); + for (int i = 0; i < elts_.size (); 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_p_, e); -} - -//////////////////////////////////////////////////////// -// maybenot such a good idea after all., to put classes in .cc - -#include "hara-kiri-group-spanner.hh" -#include "rhythmic-head.hh" - -class Hara_kiri_engraver : public Axis_group_engraver -{ -protected: - virtual Spanner*get_spanner_p ()const; - virtual void acknowledge_grob (Grob_info); - virtual void add_element (Grob *e); -public: - VIRTUAL_COPY_CONS (Translator); -}; - -void -Hara_kiri_engraver::add_element (Grob*e) +Axis_group_engraver::add_element (Grob *e) { - Hara_kiri_group_spanner::add_element (staffline_p_, e); + Axis_group_interface::add_element (staffline_, e); } +ADD_ACKNOWLEDGER (Axis_group_engraver, grob); -Spanner* -Hara_kiri_engraver::get_spanner_p () const -{ - Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup")); - Hara_kiri_group_spanner::set_interface (sp); - return sp; -} - -void -Hara_kiri_engraver::acknowledge_grob (Grob_info i) -{ - Axis_group_engraver::acknowledge_grob (i); - if (Rhythmic_head::has_interface (i.elem_l_) - || i.elem_l_->has_interface (ly_symbol2scm ("lyric-syllable-interface"))) - { - Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.elem_l_); - } -} -ADD_THIS_TRANSLATOR (Hara_kiri_engraver); +ADD_TRANSLATOR (Axis_group_engraver, + /* doc */ "Group all objects created in this context in a VerticalAxisGroup spanner.", + /* create */ "VerticalAxisGroup", + /* accept */ "", + /* read */ "verticalExtent minimumVerticalExtent extraVerticalExtent", + /* write */ "");