X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=82b5cfe37b2c3aea7378d1834a9b27bab17ecb20;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8f03b706a78b35e620be2ae500f5d6a055b01b21;hpb=5909b455a9173f6117086835c5e5a282f8fd31f8;p=lilypond.git diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 8f03b706a7..82b5cfe37b 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -1,39 +1,25 @@ -/* - 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--2003 Han-Wen Nienhuys - */ -#include "spanner.hh" -#include "paper-column.hh" + (c) 1999--2008 Han-Wen Nienhuys +*/ + +#include "axis-group-engraver.hh" + #include "axis-group-interface.hh" -#include "engraver.hh" -#include "engraver-group-engraver.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 () const; - virtual void add_element (Grob*) ; -public: - TRANSLATOR_DECLARATIONS(Axis_group_engraver); -}; +#include "translator.icc" Axis_group_engraver::Axis_group_engraver () { + must_be_last_ = true; staffline_ = 0; } @@ -43,67 +29,33 @@ Axis_group_engraver::process_music () if (!staffline_) { staffline_ = get_spanner (); - - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - - staffline_->set_bound (LEFT,it); - - announce_grob(staffline_, SCM_EOL); + Grob *it = unsmob_grob (get_property ("currentCommandColumn")); + staffline_->set_bound (LEFT, it); } -} +} -Spanner* -Axis_group_engraver::get_spanner () 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 () { - if (!staffline_) + if (staffline_) { - programming_error ("Huh? This context never lived?"); - return ; - } - - String type = get_daddy_grav ()->context_name (); - SCM dims = get_property ("verticalExtent"); - - if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) - && gh_number_p (ly_cdr (dims))) - { - staffline_->set_extent (Grob::preset_extent_proc, Y_AXIS); - staffline_->set_grob_property ("Y-extent", 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_->set_grob_property ("minimum-Y-extent", dims); - - dims = get_property ("extraVerticalExtent"); - if (gh_pair_p (dims) && gh_number_p (ly_car (dims)) - && gh_number_p (ly_cdr (dims))) - staffline_->set_grob_property ("extra-Y-extent", dims); - - Grob * it = unsmob_grob (get_property ("currentCommandColumn")); - - - staffline_->set_bound (RIGHT,it); - - typeset_grob (staffline_); - 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 ()); } /* @@ -111,100 +63,50 @@ 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 () { - /* UGH UGH UGH */ - for (int i=0; i < elts_.size (); i++) + if (!staffline_) + return; + + for (vsize i = 0; i < elts_.size (); i++) { - Grob *par = elts_[i]->get_parent (Y_AXIS); - - if (!par || !Axis_group_interface::has_interface (par)) - 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 + 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_engraver::add_element (Grob *e) { Axis_group_interface::add_element (staffline_, e); } -/****************************************************************/ - -/* - - 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 ()const; - 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 () const -{ - Spanner * sp = new Spanner (get_property ("RemoveEmptyVerticalGroup")); - - return sp; -} +ADD_ACKNOWLEDGER (Axis_group_engraver, grob); -void -Hara_kiri_engraver::acknowledge_grob (Grob_info i) -{ - Axis_group_engraver::acknowledge_grob (i); - if (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-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.", + /* create */ + "VerticalAxisGroup ", -Hara_kiri_engraver::Hara_kiri_engraver() -{ -} + /* read */ + "currentCommandColumn ", -ENTER_DESCRIPTION(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 */ ""); - -ENTER_DESCRIPTION(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 */ + "" + );