X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=9a2618a5ba1657c7f84a40354fee12e900d22e7c;hb=22b0cf5fe325867b7af993d2af1dfa9330d299dc;hp=946914e6555de1d38efbde77fcbff1fe263d835d;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 946914e655..9a2618a5ba 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,34 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2005 Han-Wen Nienhuys + (c) 1999--2007 Han-Wen Nienhuys */ -#include "spanner.hh" -#include "paper-column.hh" +#include "axis-group-engraver.hh" + #include "axis-group-interface.hh" -#include "engraver-group-engraver.hh" -#include "warn.hh" +#include "pointer-group-interface.hh" #include "context.hh" +#include "international.hh" +#include "spanner.hh" +#include "warn.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_; - Link_array elts_; - virtual void process_music (); - virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual void process_acknowledged_grobs (); - virtual Spanner *get_spanner (); - virtual void add_element (Grob *); -public: - TRANSLATOR_DECLARATIONS (Axis_group_engraver); -}; +#include "translator.icc" Axis_group_engraver::Axis_group_engraver () { @@ -55,41 +40,22 @@ Axis_group_engraver::get_spanner () return make_spanner ("VerticalAxisGroup", SCM_EOL); } -/* - TODO: should we junk minimumVerticalExtent/extraVerticalExtent ? -*/ - void Axis_group_engraver::finalize () { - if (!staffline_) - return; - - String type = context ()->context_name (); - SCM dims = get_property ("verticalExtent"); - - if (is_number_pair (dims)) - staffline_->set_extent (dims, Y_AXIS); - - dims = get_property ("minimumVerticalExtent"); - if (is_number_pair (dims)) - staffline_->set_property ("minimum-Y-extent", dims); - - dims = get_property ("extraVerticalExtent"); - if (is_number_pair (dims)) - staffline_->set_property ("extra-Y-extent", dims); - - Grob *it = unsmob_grob (get_property ("currentCommandColumn")); - - staffline_->set_bound (RIGHT, it); + if (staffline_) + { + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (RIGHT, it); - staffline_ = 0; + Pointer_group_interface::set_ordered (staffline_, ly_symbol2scm ("elements"), false); + } } void Axis_group_engraver::acknowledge_grob (Grob_info i) { - elts_.push (i.grob_); + elts_.push_back (i.grob ()); } /* @@ -97,37 +63,26 @@ Axis_group_engraver::acknowledge_grob (Grob_info i) cyclic parent relationship if we have two Axis_group_engravers in the context. */ void -Axis_group_engraver::process_acknowledged_grobs () +Axis_group_engraver::process_acknowledged () { if (!staffline_) return; - for (int i = 0; i < elts_.size (); i++) + for (vsize i = 0; i < elts_.size (); i++) { - if (!unsmob_grob (elts_[i]->get_property ("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]) { - String msg = _ ("Axis_group_engraver: vertical group already has a parent.\n" - "Do you have two Axis_group_engravers?\n" - "Killing this vertical group."); - staffline_->warning (msg); + 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; } - else if (elts_[i]->is_empty (Y_AXIS)) - { - /* - We have to do _something_, otherwise staff objects will - end up with System as parent. - - */ - elts_[i]->set_parent (staffline_, Y_AXIS); - } - else - add_element (elts_[i]); + add_element (elts_[i]); } } elts_.clear (); @@ -139,69 +94,19 @@ Axis_group_engraver::add_element (Grob *e) Axis_group_interface::add_element (staffline_, e); } -/****************************************************************/ +ADD_ACKNOWLEDGER (Axis_group_engraver, grob); -/* - maybenot such a good idea after all., to put class declarations 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 (); - virtual void acknowledge_grob (Grob_info); - virtual void add_element (Grob *e); -public: - TRANSLATOR_DECLARATIONS (Hara_kiri_engraver); -}; - -void -Hara_kiri_engraver::add_element (Grob *e) -{ - Hara_kiri_group_spanner::add_element (staffline_, e); -} - -Spanner * -Hara_kiri_engraver::get_spanner () -{ - Spanner *sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL); - - return sp; -} - -void -Hara_kiri_engraver::acknowledge_grob (Grob_info i) -{ - Axis_group_engraver::acknowledge_grob (i); - if (staffline_ - && (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface")) - || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface")))) - { - Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_); - } -} +ADD_TRANSLATOR (Axis_group_engraver, + /* doc */ + "Group all objects created in this context in a" + " @code{VerticalAxisGroup} spanner.", -Hara_kiri_engraver::Hara_kiri_engraver () -{ -} + /* create */ + "VerticalAxisGroup ", -ADD_TRANSLATOR (Hara_kiri_engraver, - /* descr */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add " - "interesting items (ie. note heads, lyric syllables and normal rests) ", - /* creats*/ "RemoveEmptyVerticalGroup", - /* accepts */ "", - /* acks */ "grob-interface", - /* reads */ "", - /* write */ ""); + /* read */ + "currentCommandColumn ", -ADD_TRANSLATOR (Axis_group_engraver, - /* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.", - /* creats*/ "VerticalAxisGroup", - /* accepts */ "", - /* acks */ "grob-interface", - /* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent", - /* write */ ""); + /* write */ + "" + );